summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/conf/distro/include/tcmode-default.inc2
-rw-r--r--meta/recipes-devtools/binutils/binutils-2.34.inc (renamed from meta/recipes-devtools/binutils/binutils-2.33.inc)37
-rw-r--r--meta/recipes-devtools/binutils/binutils-cross-canadian_2.34.bb (renamed from meta/recipes-devtools/binutils/binutils-cross-canadian_2.33.bb)0
-rw-r--r--meta/recipes-devtools/binutils/binutils-cross-testsuite_2.34.bb (renamed from meta/recipes-devtools/binutils/binutils-cross-testsuite_2.33.bb)0
-rw-r--r--meta/recipes-devtools/binutils/binutils-cross_2.34.bb (renamed from meta/recipes-devtools/binutils/binutils-cross_2.33.bb)0
-rw-r--r--meta/recipes-devtools/binutils/binutils-crosssdk_2.34.bb (renamed from meta/recipes-devtools/binutils/binutils-crosssdk_2.33.bb)0
-rw-r--r--meta/recipes-devtools/binutils/binutils.inc26
-rw-r--r--meta/recipes-devtools/binutils/binutils/0001-binutils-crosssdk-Generate-relocatable-SDKs.patch16
-rw-r--r--meta/recipes-devtools/binutils/binutils/0002-binutils-cross-Do-not-generate-linker-script-directo.patch4
-rw-r--r--meta/recipes-devtools/binutils/binutils/0003-binutils-nativesdk-Search-for-alternative-ld.so.conf.patch (renamed from meta/recipes-devtools/binutils/binutils/nativesdk-relocation.patch)75
-rw-r--r--meta/recipes-devtools/binutils/binutils/0003-configure-widen-the-regexp-for-SH-architectures.patch44
-rw-r--r--meta/recipes-devtools/binutils/binutils/0004-configure-widen-the-regexp-for-SH-architectures.patch41
-rw-r--r--meta/recipes-devtools/binutils/binutils/0005-Point-scripts-location-to-libdir.patch (renamed from meta/recipes-devtools/binutils/binutils/0004-Point-scripts-location-to-libdir.patch)10
-rw-r--r--meta/recipes-devtools/binutils/binutils/0006-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch (renamed from meta/recipes-devtools/binutils/binutils/0005-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch)30
-rw-r--r--meta/recipes-devtools/binutils/binutils/0006-Use-libtool-2.4.patch21203
-rw-r--r--meta/recipes-devtools/binutils/binutils/0007-Use-libtool-2.4.patch7115
-rw-r--r--meta/recipes-devtools/binutils/binutils/0008-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch (renamed from meta/recipes-devtools/binutils/binutils/0007-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch)6
-rw-r--r--meta/recipes-devtools/binutils/binutils/0009-warn-for-uses-of-system-directories-when-cross-linki.patch (renamed from meta/recipes-devtools/binutils/binutils/0008-warn-for-uses-of-system-directories-when-cross-linki.patch)40
-rw-r--r--meta/recipes-devtools/binutils/binutils/0010-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch (renamed from meta/recipes-devtools/binutils/binutils/0009-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch)2
-rw-r--r--meta/recipes-devtools/binutils/binutils/0011-Change-default-emulation-for-mips64-linux.patch (renamed from meta/recipes-devtools/binutils/binutils/0010-Change-default-emulation-for-mips64-linux.patch)23
-rw-r--r--meta/recipes-devtools/binutils/binutils/0012-Add-support-for-Netlogic-XLP.patch (renamed from meta/recipes-devtools/binutils/binutils/0011-Add-support-for-Netlogic-XLP.patch)112
-rw-r--r--meta/recipes-devtools/binutils/binutils/0013-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch (renamed from meta/recipes-devtools/binutils/binutils/0012-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch)4
-rw-r--r--meta/recipes-devtools/binutils/binutils/0014-Detect-64-bit-MIPS-targets.patch (renamed from meta/recipes-devtools/binutils/binutils/0013-Detect-64-bit-MIPS-targets.patch)4
-rw-r--r--meta/recipes-devtools/binutils/binutils/0015-binutils-enable-x86_64-pep-for-producing-EFI-binarie.patch46
-rw-r--r--meta/recipes-devtools/binutils/binutils/0015-sync-with-OE-libtool-changes.patch (renamed from meta/recipes-devtools/binutils/binutils/0014-sync-with-OE-libtool-changes.patch)2
-rw-r--r--meta/recipes-devtools/binutils/binutils/CVE-2019-17450.patch94
-rw-r--r--meta/recipes-devtools/binutils/binutils/CVE-2019-17451.patch46
-rw-r--r--meta/recipes-devtools/binutils/binutils_2.34.bb (renamed from meta/recipes-devtools/binutils/binutils_2.33.bb)4
28 files changed, 7396 insertions, 21590 deletions
diff --git a/meta/conf/distro/include/tcmode-default.inc b/meta/conf/distro/include/tcmode-default.inc
index 82530f5e7b..e957e3a9bb 100644
--- a/meta/conf/distro/include/tcmode-default.inc
+++ b/meta/conf/distro/include/tcmode-default.inc
@@ -18,7 +18,7 @@ PREFERRED_PROVIDER_virtual/gettext ??= "gettext"
18 18
19GCCVERSION ?= "9.%" 19GCCVERSION ?= "9.%"
20SDKGCCVERSION ?= "${GCCVERSION}" 20SDKGCCVERSION ?= "${GCCVERSION}"
21BINUVERSION ?= "2.33%" 21BINUVERSION ?= "2.34%"
22GDBVERSION ?= "9.%" 22GDBVERSION ?= "9.%"
23GLIBCVERSION ?= "2.31" 23GLIBCVERSION ?= "2.31"
24LINUXLIBCVERSION ?= "5.4%" 24LINUXLIBCVERSION ?= "5.4%"
diff --git a/meta/recipes-devtools/binutils/binutils-2.33.inc b/meta/recipes-devtools/binutils/binutils-2.34.inc
index 84a9ec8fc3..eaaa5ed2ac 100644
--- a/meta/recipes-devtools/binutils/binutils-2.33.inc
+++ b/meta/recipes-devtools/binutils/binutils-2.34.inc
@@ -14,35 +14,32 @@ def binutils_branch_version(d):
14 pvsplit = d.getVar('PV').split('.') 14 pvsplit = d.getVar('PV').split('.')
15 return pvsplit[0] + "_" + pvsplit[1] 15 return pvsplit[0] + "_" + pvsplit[1]
16 16
17# When upgrading to 2.33, please make sure there is no trailing .0, so 17# When upgrading to 2.35, please make sure there is no trailing .0, so
18# that upstream version check can work correctly. 18# that upstream version check can work correctly.
19PV = "2.33.1" 19PV = "2.34"
20CVE_VERSION = "2.33" 20CVE_VERSION = "2.34"
21BINUPV = "${@binutils_branch_version(d)}" 21BINUPV = "${@binutils_branch_version(d)}"
22#BRANCH = "binutils-${BINUPV}-branch" 22#BRANCH = "binutils-${BINUPV}-branch"
23BRANCH ?= "binutils-2_33-branch" 23BRANCH ?= "binutils-2_34-branch"
24 24
25UPSTREAM_CHECK_GITTAGREGEX = "binutils-(?P<pver>\d+_(\d_?)*)" 25UPSTREAM_CHECK_GITTAGREGEX = "binutils-(?P<pver>\d+_(\d_?)*)"
26 26
27SRCREV ?= "c656f9a430636a6a7fc7a08c0e08f0098a729a02" 27SRCREV ?= "d4b50999b3b287b5f984ade2f8734aa8c9359440"
28BINUTILS_GIT_URI ?= "git://sourceware.org/git/binutils-gdb.git;branch=${BRANCH};protocol=git" 28BINUTILS_GIT_URI ?= "git://sourceware.org/git/binutils-gdb.git;branch=${BRANCH};protocol=git"
29SRC_URI = "\ 29SRC_URI = "\
30 ${BINUTILS_GIT_URI} \ 30 ${BINUTILS_GIT_URI} \
31 file://0003-configure-widen-the-regexp-for-SH-architectures.patch \ 31 file://0004-configure-widen-the-regexp-for-SH-architectures.patch \
32 file://0004-Point-scripts-location-to-libdir.patch \ 32 file://0005-Point-scripts-location-to-libdir.patch \
33 file://0005-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch \ 33 file://0006-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch \
34 file://0006-Use-libtool-2.4.patch \ 34 file://0007-Use-libtool-2.4.patch \
35 file://0007-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch \ 35 file://0008-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch \
36 file://0008-warn-for-uses-of-system-directories-when-cross-linki.patch \ 36 file://0009-warn-for-uses-of-system-directories-when-cross-linki.patch \
37 file://0009-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch \ 37 file://0010-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch \
38 file://0010-Change-default-emulation-for-mips64-linux.patch \ 38 file://0011-Change-default-emulation-for-mips64-linux.patch \
39 file://0011-Add-support-for-Netlogic-XLP.patch \ 39 file://0012-Add-support-for-Netlogic-XLP.patch \
40 file://0012-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch \ 40 file://0013-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch \
41 file://0013-Detect-64-bit-MIPS-targets.patch \ 41 file://0014-Detect-64-bit-MIPS-targets.patch \
42 file://0014-sync-with-OE-libtool-changes.patch \ 42 file://0015-sync-with-OE-libtool-changes.patch \
43 file://0015-binutils-enable-x86_64-pep-for-producing-EFI-binarie.patch \
44 file://CVE-2019-17450.patch \
45 file://CVE-2019-17451.patch \
46" 43"
47S = "${WORKDIR}/git" 44S = "${WORKDIR}/git"
48 45
diff --git a/meta/recipes-devtools/binutils/binutils-cross-canadian_2.33.bb b/meta/recipes-devtools/binutils/binutils-cross-canadian_2.34.bb
index 5dbaa03017..5dbaa03017 100644
--- a/meta/recipes-devtools/binutils/binutils-cross-canadian_2.33.bb
+++ b/meta/recipes-devtools/binutils/binutils-cross-canadian_2.34.bb
diff --git a/meta/recipes-devtools/binutils/binutils-cross-testsuite_2.33.bb b/meta/recipes-devtools/binutils/binutils-cross-testsuite_2.34.bb
index 07a8e7c417..07a8e7c417 100644
--- a/meta/recipes-devtools/binutils/binutils-cross-testsuite_2.33.bb
+++ b/meta/recipes-devtools/binutils/binutils-cross-testsuite_2.34.bb
diff --git a/meta/recipes-devtools/binutils/binutils-cross_2.33.bb b/meta/recipes-devtools/binutils/binutils-cross_2.34.bb
index fbd1f7d25a..fbd1f7d25a 100644
--- a/meta/recipes-devtools/binutils/binutils-cross_2.33.bb
+++ b/meta/recipes-devtools/binutils/binutils-cross_2.34.bb
diff --git a/meta/recipes-devtools/binutils/binutils-crosssdk_2.33.bb b/meta/recipes-devtools/binutils/binutils-crosssdk_2.34.bb
index 37f4d6d2e9..37f4d6d2e9 100644
--- a/meta/recipes-devtools/binutils/binutils-crosssdk_2.33.bb
+++ b/meta/recipes-devtools/binutils/binutils-crosssdk_2.34.bb
diff --git a/meta/recipes-devtools/binutils/binutils.inc b/meta/recipes-devtools/binutils/binutils.inc
index a4b9aa586d..5b4a339209 100644
--- a/meta/recipes-devtools/binutils/binutils.inc
+++ b/meta/recipes-devtools/binutils/binutils.inc
@@ -13,17 +13,12 @@ LICENSE = "GPLv3"
13 13
14DEPENDS = "flex-native bison-native zlib-native gnu-config-native autoconf-native" 14DEPENDS = "flex-native bison-native zlib-native gnu-config-native autoconf-native"
15 15
16#
17# we need chrpath > 0.14 and some distros like centos 7 still have older chrpath
18#
19DEPENDS_append_class-target = " chrpath-replacement-native"
20EXTRANATIVEPATH_append_class-target = " chrpath-native"
21
22inherit autotools gettext multilib_header texinfo 16inherit autotools gettext multilib_header texinfo
23 17
24FILES_${PN} = " \ 18FILES_${PN} = " \
25 ${bindir}/${TARGET_PREFIX}* \ 19 ${bindir}/${TARGET_PREFIX}* \
26 ${libdir}/lib*-*.so \ 20 ${libdir}/lib*.so.* \
21 ${libdir}/lib*-${PV}*.so \
27 ${prefix}/${TARGET_SYS}/bin/* \ 22 ${prefix}/${TARGET_SYS}/bin/* \
28 ${bindir}/embedspu" 23 ${bindir}/embedspu"
29 24
@@ -33,6 +28,8 @@ FILES_${PN}-dev = " \
33 ${includedir} \ 28 ${includedir} \
34 ${libdir}/*.la \ 29 ${libdir}/*.la \
35 ${libdir}/libbfd.so \ 30 ${libdir}/libbfd.so \
31 ${libdir}/libctf.so \
32 ${libdir}/libctf-nobfd.so \
36 ${libdir}/libopcodes.so" 33 ${libdir}/libopcodes.so"
37 34
38# Rather than duplicating multiple entries for these, make one 35# Rather than duplicating multiple entries for these, make one
@@ -80,6 +77,8 @@ EXTRA_OECONF = "--program-prefix=${TARGET_PREFIX} \
80 ${LDGOLD} \ 77 ${LDGOLD} \
81 ${@bb.utils.contains('DISTRO_FEATURES', 'multiarch', '--enable-64-bit-bfd', '', d)}" 78 ${@bb.utils.contains('DISTRO_FEATURES', 'multiarch', '--enable-64-bit-bfd', '', d)}"
82 79
80EXTRA_OECONF_append_x86-64 = " --enable-targets=x86_64-pe,x86_64-pep "
81
83LDGOLD_class-native = "" 82LDGOLD_class-native = ""
84LDGOLD_class-crosssdk = "" 83LDGOLD_class-crosssdk = ""
85LDGOLD ?= "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', '--enable-gold=default --enable-threads', '--enable-gold --enable-ld=default --enable-threads', d)}" 84LDGOLD ?= "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', '--enable-gold=default --enable-threads', '--enable-gold --enable-ld=default --enable-threads', d)}"
@@ -112,7 +111,14 @@ export CC_FOR_BUILD = "LD_LIBRARY_PATH= ${BUILD_CC}"
112MULTIARCH := "${@bb.utils.contains("DISTRO_FEATURES", "multiarch", "yes", "no", d)}" 111MULTIARCH := "${@bb.utils.contains("DISTRO_FEATURES", "multiarch", "yes", "no", d)}"
113do_configure[vardeps] += "MULTIARCH" 112do_configure[vardeps] += "MULTIARCH"
114do_configure () { 113do_configure () {
115 (cd ${S}; gnu-configize) || die "Failed to run gnu-configize" 114 (for d in . bfd binutils gas gold gprof ld libctf opcodes; do
115 cd ${S}/$d
116 autoconf
117 rm -rf autom4te.cache
118 done
119 cd ${S}
120 gnu-configize)
121
116 oe_runconf 122 oe_runconf
117# 123#
118# must prime config.cache to ensure the build of libiberty 124# must prime config.cache to ensure the build of libiberty
@@ -123,10 +129,6 @@ do_configure () {
123 done 129 done
124} 130}
125 131
126do_compile_append_class-target() {
127 chrpath -d ${B}/binutils/elfedit
128 chrpath -d ${B}/binutils/readelf
129}
130do_install () { 132do_install () {
131 autotools_do_install 133 autotools_do_install
132 134
diff --git a/meta/recipes-devtools/binutils/binutils/0001-binutils-crosssdk-Generate-relocatable-SDKs.patch b/meta/recipes-devtools/binutils/binutils/0001-binutils-crosssdk-Generate-relocatable-SDKs.patch
index 3a9461bf4a..14e84215e0 100644
--- a/meta/recipes-devtools/binutils/binutils/0001-binutils-crosssdk-Generate-relocatable-SDKs.patch
+++ b/meta/recipes-devtools/binutils/binutils/0001-binutils-crosssdk-Generate-relocatable-SDKs.patch
@@ -1,6 +1,6 @@
1From c9aed4cb3c02715b2ba1fc70949043849f202f46 Mon Sep 17 00:00:00 2001 1From b05f0be13aadf0b26a0b39dfe7daf2c47a300338 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Sun, 8 Dec 2019 00:31:35 -0800 3Date: Mon, 2 Mar 2015 01:58:54 +0000
4Subject: [PATCH] binutils-crosssdk: Generate relocatable SDKs 4Subject: [PATCH] binutils-crosssdk: Generate relocatable SDKs
5 5
6This patch will modify the ELF linker scripts so that the crosssdk 6This patch will modify the ELF linker scripts so that the crosssdk
@@ -18,23 +18,23 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
18 2 files changed, 5 insertions(+), 2 deletions(-) 18 2 files changed, 5 insertions(+), 2 deletions(-)
19 19
20diff --git a/ld/genscripts.sh b/ld/genscripts.sh 20diff --git a/ld/genscripts.sh b/ld/genscripts.sh
21index cb2b081e9e..db2e9fd569 100755 21index 03392d265c..435689ea14 100755
22--- a/ld/genscripts.sh 22--- a/ld/genscripts.sh
23+++ b/ld/genscripts.sh 23+++ b/ld/genscripts.sh
24@@ -325,6 +325,7 @@ DATA_ALIGNMENT_u="${DATA_ALIGNMENT_u-${DATA_ALIGNMENT_r}}" 24@@ -304,6 +304,7 @@ DATA_ALIGNMENT_u="${DATA_ALIGNMENT_u-${DATA_ALIGNMENT_r}}"
25 LD_FLAG=r 25 LD_FLAG=r
26 DATA_ALIGNMENT=${DATA_ALIGNMENT_r} 26 DATA_ALIGNMENT=${DATA_ALIGNMENT_r}
27 DEFAULT_DATA_ALIGNMENT="ALIGN(${SEGMENT_SIZE})" 27 DEFAULT_DATA_ALIGNMENT="ALIGN(${SEGMENT_SIZE})"
28+PARTIAL_LINKING=" " 28+PARTIAL_LINKING=" "
29 ( echo "/* Script for ld -r: link without relocation */" 29 ( echo "/* Script for -r */"
30 source_sh ${CUSTOMIZER_SCRIPT} 30 source_sh ${CUSTOMIZER_SCRIPT}
31 source_sh ${srcdir}/scripttempl/${SCRIPT_NAME}.sc 31 source_sh ${srcdir}/scripttempl/${SCRIPT_NAME}.sc
32@@ -333,10 +334,12 @@ DEFAULT_DATA_ALIGNMENT="ALIGN(${SEGMENT_SIZE})" 32@@ -312,10 +313,12 @@ DEFAULT_DATA_ALIGNMENT="ALIGN(${SEGMENT_SIZE})"
33 LD_FLAG=u 33 LD_FLAG=u
34 DATA_ALIGNMENT=${DATA_ALIGNMENT_u} 34 DATA_ALIGNMENT=${DATA_ALIGNMENT_u}
35 CONSTRUCTING=" " 35 CONSTRUCTING=" "
36+PARTIAL_LINKING=" " 36+PARTIAL_LINKING=" "
37 ( echo "/* Script for ld -Ur: link w/out relocation, do create constructors */" 37 ( echo "/* Script for -Ur */"
38 source_sh ${CUSTOMIZER_SCRIPT} 38 source_sh ${CUSTOMIZER_SCRIPT}
39 source_sh ${srcdir}/scripttempl/${SCRIPT_NAME}.sc 39 source_sh ${srcdir}/scripttempl/${SCRIPT_NAME}.sc
40 ) | sed -e '/^ *$/d;s/[ ]*$//' > ldscripts/${EMULATION_NAME}.xu 40 ) | sed -e '/^ *$/d;s/[ ]*$//' > ldscripts/${EMULATION_NAME}.xu
@@ -43,7 +43,7 @@ index cb2b081e9e..db2e9fd569 100755
43 DATA_ALIGNMENT=${DATA_ALIGNMENT_} 43 DATA_ALIGNMENT=${DATA_ALIGNMENT_}
44 RELOCATING=" " 44 RELOCATING=" "
45diff --git a/ld/scripttempl/elf.sc b/ld/scripttempl/elf.sc 45diff --git a/ld/scripttempl/elf.sc b/ld/scripttempl/elf.sc
46index f9f0f7d402..9e469dca86 100644 46index 0b8b32a440..ee6b71075d 100644
47--- a/ld/scripttempl/elf.sc 47--- a/ld/scripttempl/elf.sc
48+++ b/ld/scripttempl/elf.sc 48+++ b/ld/scripttempl/elf.sc
49@@ -140,8 +140,8 @@ if test -z "$DATA_SEGMENT_ALIGN"; then 49@@ -140,8 +140,8 @@ if test -z "$DATA_SEGMENT_ALIGN"; then
diff --git a/meta/recipes-devtools/binutils/binutils/0002-binutils-cross-Do-not-generate-linker-script-directo.patch b/meta/recipes-devtools/binutils/binutils/0002-binutils-cross-Do-not-generate-linker-script-directo.patch
index 1b499a4504..91de94b768 100644
--- a/meta/recipes-devtools/binutils/binutils/0002-binutils-cross-Do-not-generate-linker-script-directo.patch
+++ b/meta/recipes-devtools/binutils/binutils/0002-binutils-cross-Do-not-generate-linker-script-directo.patch
@@ -1,4 +1,4 @@
1From 9fe5a2dd03fdf2986c89dd58ae48c0095f1c0411 Mon Sep 17 00:00:00 2001 1From 6d79f81336e7cbe727b5a51134f5d314a455379d Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 6 Mar 2017 23:37:05 -0800 3Date: Mon, 6 Mar 2017 23:37:05 -0800
4Subject: [PATCH] binutils-cross: Do not generate linker script directories 4Subject: [PATCH] binutils-cross: Do not generate linker script directories
@@ -22,7 +22,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
22 1 file changed, 25 deletions(-) 22 1 file changed, 25 deletions(-)
23 23
24diff --git a/ld/genscripts.sh b/ld/genscripts.sh 24diff --git a/ld/genscripts.sh b/ld/genscripts.sh
25index c90f38a63c..97ad1a24d6 100755 25index 435689ea14..cff8a1467f 100755
26--- a/ld/genscripts.sh 26--- a/ld/genscripts.sh
27+++ b/ld/genscripts.sh 27+++ b/ld/genscripts.sh
28@@ -235,31 +235,6 @@ append_to_lib_path() 28@@ -235,31 +235,6 @@ append_to_lib_path()
diff --git a/meta/recipes-devtools/binutils/binutils/nativesdk-relocation.patch b/meta/recipes-devtools/binutils/binutils/0003-binutils-nativesdk-Search-for-alternative-ld.so.conf.patch
index 408f7d18b7..8b59ba5dec 100644
--- a/meta/recipes-devtools/binutils/binutils/nativesdk-relocation.patch
+++ b/meta/recipes-devtools/binutils/binutils/0003-binutils-nativesdk-Search-for-alternative-ld.so.conf.patch
@@ -1,4 +1,10 @@
1We need binutils to look at our ld.so.conf file within the SDK to ensure 1From d057b215f114f6158b4010ab44a19cae9dcc8386 Mon Sep 17 00:00:00 2001
2From: Richard Purdie <richard.purdie@linuxfoundation.org>
3Date: Wed, 19 Feb 2020 09:51:16 -0800
4Subject: [PATCH] binutils-nativesdk: Search for alternative ld.so.conf in SDK
5 installation
6
7We need binutils to look at our ld.so.conf file within the SDK to ensure
2we search the SDK's libdirs as well as those from the host system. 8we search the SDK's libdirs as well as those from the host system.
3 9
4We therefore pass in the directory to the code using a define, then add 10We therefore pass in the directory to the code using a define, then add
@@ -6,18 +12,27 @@ it to a section we relocate in a similar way to the way we relocate the
6gcc internal paths. This ensures that ld works correctly in our buildtools 12gcc internal paths. This ensures that ld works correctly in our buildtools
7tarball. 13tarball.
8 14
9Standard sysroot relocation doesn't work since we're not in a sysroot, 15Standard sysroot relocation doesn't work since we're not in a sysroot,
10we want to use both the host system and SDK libs. 16we want to use both the host system and SDK libs.
11 17
12Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> 18Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
132020/1/17 192020/1/17
14Upstream-Status: Inappropriate [OE specific tweak] 20Upstream-Status: Inappropriate [OE specific tweak]
15 21
16Index: git/ld/Makefile.am 22Signed-off-by: Khem Raj <raj.khem@gmail.com>
17=================================================================== 23---
18--- git.orig/ld/Makefile.am 24 ld/Makefile.am | 3 ++-
19+++ git/ld/Makefile.am 25 ld/Makefile.in | 3 ++-
20@@ -36,7 +36,8 @@ am__skipyacc = 26 ld/ldelf.c | 2 +-
27 ld/ldmain.c | 1 +
28 ld/ldmain.h | 1 +
29 5 files changed, 7 insertions(+), 3 deletions(-)
30
31diff --git a/ld/Makefile.am b/ld/Makefile.am
32index 4a9b8404b7..1c132d3ce4 100644
33--- a/ld/Makefile.am
34+++ b/ld/Makefile.am
35@@ -42,7 +42,8 @@ ZLIBINC = @zlibinc@
21 36
22 ELF_CLFAGS=-DELF_LIST_OPTIONS=@elf_list_options@ \ 37 ELF_CLFAGS=-DELF_LIST_OPTIONS=@elf_list_options@ \
23 -DELF_SHLIB_LIST_OPTIONS=@elf_shlib_list_options@ \ 38 -DELF_SHLIB_LIST_OPTIONS=@elf_shlib_list_options@ \
@@ -27,12 +42,12 @@ Index: git/ld/Makefile.am
27 WARN_CFLAGS = @WARN_CFLAGS@ 42 WARN_CFLAGS = @WARN_CFLAGS@
28 NO_WERROR = @NO_WERROR@ 43 NO_WERROR = @NO_WERROR@
29 AM_CFLAGS = $(WARN_CFLAGS) $(ELF_CLFAGS) 44 AM_CFLAGS = $(WARN_CFLAGS) $(ELF_CLFAGS)
30Index: git/ld/Makefile.in 45diff --git a/ld/Makefile.in b/ld/Makefile.in
31=================================================================== 46index 46d9b14077..e453bc1b33 100644
32--- git.orig/ld/Makefile.in 47--- a/ld/Makefile.in
33+++ git/ld/Makefile.in 48+++ b/ld/Makefile.in
34@@ -546,7 +546,8 @@ am__skiplex = 49@@ -555,7 +555,8 @@ ZLIB = @zlibdir@ -lz
35 am__skipyacc = 50 ZLIBINC = @zlibinc@
36 ELF_CLFAGS = -DELF_LIST_OPTIONS=@elf_list_options@ \ 51 ELF_CLFAGS = -DELF_LIST_OPTIONS=@elf_list_options@ \
37 -DELF_SHLIB_LIST_OPTIONS=@elf_shlib_list_options@ \ 52 -DELF_SHLIB_LIST_OPTIONS=@elf_shlib_list_options@ \
38- -DELF_PLT_UNWIND_LIST_OPTIONS=@elf_plt_unwind_list_options@ 53- -DELF_PLT_UNWIND_LIST_OPTIONS=@elf_plt_unwind_list_options@
@@ -41,24 +56,24 @@ Index: git/ld/Makefile.in
41 56
42 AM_CFLAGS = $(WARN_CFLAGS) $(ELF_CLFAGS) 57 AM_CFLAGS = $(WARN_CFLAGS) $(ELF_CLFAGS)
43 @ENABLE_PLUGINS_FALSE@PLUGIN_C = 58 @ENABLE_PLUGINS_FALSE@PLUGIN_C =
44Index: git/ld/emultempl/elf32.em 59diff --git a/ld/ldelf.c b/ld/ldelf.c
45=================================================================== 60index 2e27cf48a8..a095d6aac5 100644
46--- git.orig/ld/emultempl/elf32.em 61--- a/ld/ldelf.c
47+++ git/ld/emultempl/elf32.em 62+++ b/ld/ldelf.c
48@@ -1024,7 +1024,7 @@ gld${EMULATION_NAME}_check_ld_so_conf (c 63@@ -907,7 +907,7 @@ ldelf_check_ld_so_conf (const struct bfd_link_needed_list *l, int force,
49 64
50 info.path = NULL; 65 info.path = NULL;
51 info.len = info.alloc = 0; 66 info.len = info.alloc = 0;
52- tmppath = concat (ld_sysroot, "${prefix}/etc/ld.so.conf", 67- tmppath = concat (ld_sysroot, prefix, "/etc/ld.so.conf",
53+ tmppath = concat (ld_sysconfdir, "/ld.so.conf", 68+ tmppath = concat (ld_sysconfdir, "/etc/ld.so.conf",
54 (const char *) NULL); 69 (const char *) NULL);
55 if (!gld${EMULATION_NAME}_parse_ld_so_conf (&info, tmppath)) 70 if (!ldelf_parse_ld_so_conf (&info, tmppath))
56 { 71 {
57Index: git/ld/ldmain.c 72diff --git a/ld/ldmain.c b/ld/ldmain.c
58=================================================================== 73index c4af10f4e9..da1ad17763 100644
59--- git.orig/ld/ldmain.c 74--- a/ld/ldmain.c
60+++ git/ld/ldmain.c 75+++ b/ld/ldmain.c
61@@ -68,6 +68,7 @@ char *program_name; 76@@ -69,6 +69,7 @@ char *program_name;
62 77
63 /* The prefix for system library directories. */ 78 /* The prefix for system library directories. */
64 const char *ld_sysroot; 79 const char *ld_sysroot;
@@ -66,10 +81,10 @@ Index: git/ld/ldmain.c
66 81
67 /* The canonical representation of ld_sysroot. */ 82 /* The canonical representation of ld_sysroot. */
68 char *ld_canon_sysroot; 83 char *ld_canon_sysroot;
69Index: git/ld/ldmain.h 84diff --git a/ld/ldmain.h b/ld/ldmain.h
70=================================================================== 85index 0f05821d1e..54c36a94ce 100644
71--- git.orig/ld/ldmain.h 86--- a/ld/ldmain.h
72+++ git/ld/ldmain.h 87+++ b/ld/ldmain.h
73@@ -23,6 +23,7 @@ 88@@ -23,6 +23,7 @@
74 89
75 extern char *program_name; 90 extern char *program_name;
diff --git a/meta/recipes-devtools/binutils/binutils/0003-configure-widen-the-regexp-for-SH-architectures.patch b/meta/recipes-devtools/binutils/binutils/0003-configure-widen-the-regexp-for-SH-architectures.patch
deleted file mode 100644
index 4a6b107126..0000000000
--- a/meta/recipes-devtools/binutils/binutils/0003-configure-widen-the-regexp-for-SH-architectures.patch
+++ /dev/null
@@ -1,44 +0,0 @@
1From aecded290b2ec0b469c70fc6b062bd5ee6ba5e3a Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 2 Mar 2015 01:07:33 +0000
4Subject: [PATCH] configure: widen the regexp for SH architectures
5
6gprof needs to know about uclibc
7
8Upstream-Status: Pending
9
10Signed-off-by: Khem Raj <raj.khem@gmail.com>
11---
12 configure | 2 +-
13 gprof/configure | 5 +++++
14 2 files changed, 6 insertions(+), 1 deletion(-)
15
16diff --git a/configure b/configure
17index 6a9719f609..001523eebf 100755
18--- a/configure
19+++ b/configure
20@@ -3865,7 +3865,7 @@ case "${target}" in
21 nvptx*-*-*)
22 noconfigdirs="$noconfigdirs target-libssp target-libstdc++-v3 target-libobjc"
23 ;;
24- sh-*-*)
25+ sh*-*-* | sh64-*-*)
26 case "${target}" in
27 sh*-*-elf)
28 ;;
29diff --git a/gprof/configure b/gprof/configure
30index cbb3aced46..b5eabceb77 100755
31--- a/gprof/configure
32+++ b/gprof/configure
33@@ -6162,6 +6162,11 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu)
34 lt_cv_deplibs_check_method=pass_all
35 ;;
36
37+linux-uclibc*)
38+ lt_cv_deplibs_check_method=pass_all
39+ lt_cv_file_magic_test_file=`echo /lib/libuClibc-*.so`
40+ ;;
41+
42 netbsd*)
43 if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
44 lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
diff --git a/meta/recipes-devtools/binutils/binutils/0004-configure-widen-the-regexp-for-SH-architectures.patch b/meta/recipes-devtools/binutils/binutils/0004-configure-widen-the-regexp-for-SH-architectures.patch
new file mode 100644
index 0000000000..d10a144ed5
--- /dev/null
+++ b/meta/recipes-devtools/binutils/binutils/0004-configure-widen-the-regexp-for-SH-architectures.patch
@@ -0,0 +1,41 @@
1From f7ad8a44c10f01e03680f093fd7af71c9f5e8606 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 2 Mar 2015 01:07:33 +0000
4Subject: [PATCH] configure: widen the regexp for SH architectures
5
6gprof needs to know about uclibc
7
8Upstream-Status: Pending
9
10Signed-off-by: Khem Raj <raj.khem@gmail.com>
11---
12 configure | 2 +-
13 configure.ac | 2 +-
14 2 files changed, 2 insertions(+), 2 deletions(-)
15
16diff --git a/configure b/configure
17index 91dc42f6c7..7c1b747e7c 100755
18--- a/configure
19+++ b/configure
20@@ -3915,7 +3915,7 @@ case "${target}" in
21 nvptx*-*-*)
22 noconfigdirs="$noconfigdirs target-libssp target-libstdc++-v3 target-libobjc"
23 ;;
24- sh-*-*)
25+ sh*-*-* | sh64-*-*)
26 case "${target}" in
27 sh*-*-elf)
28 ;;
29diff --git a/configure.ac b/configure.ac
30index 4bd869a63a..7187b34dfc 100644
31--- a/configure.ac
32+++ b/configure.ac
33@@ -1159,7 +1159,7 @@ case "${target}" in
34 nvptx*-*-*)
35 noconfigdirs="$noconfigdirs target-libssp target-libstdc++-v3 target-libobjc"
36 ;;
37- sh-*-*)
38+ sh*-*-* | sh64-*-*)
39 case "${target}" in
40 sh*-*-elf)
41 ;;
diff --git a/meta/recipes-devtools/binutils/binutils/0004-Point-scripts-location-to-libdir.patch b/meta/recipes-devtools/binutils/binutils/0005-Point-scripts-location-to-libdir.patch
index 8318bd3899..3ba0ba63f1 100644
--- a/meta/recipes-devtools/binutils/binutils/0004-Point-scripts-location-to-libdir.patch
+++ b/meta/recipes-devtools/binutils/binutils/0005-Point-scripts-location-to-libdir.patch
@@ -1,4 +1,4 @@
1From a9332107872ada73e72e92872ea2998a4e1495e0 Mon Sep 17 00:00:00 2001 1From 08b088b7dd3d9707ed66948a7271ffb438eeddf5 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 2 Mar 2015 01:09:58 +0000 3Date: Mon, 2 Mar 2015 01:09:58 +0000
4Subject: [PATCH] Point scripts location to libdir 4Subject: [PATCH] Point scripts location to libdir
@@ -12,10 +12,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
12 2 files changed, 2 insertions(+), 2 deletions(-) 12 2 files changed, 2 insertions(+), 2 deletions(-)
13 13
14diff --git a/ld/Makefile.am b/ld/Makefile.am 14diff --git a/ld/Makefile.am b/ld/Makefile.am
15index ddc7a78368..6fa7bf2583 100644 15index 1c132d3ce4..8d82cf2e16 100644
16--- a/ld/Makefile.am 16--- a/ld/Makefile.am
17+++ b/ld/Makefile.am 17+++ b/ld/Makefile.am
18@@ -63,7 +63,7 @@ endif 18@@ -64,7 +64,7 @@ endif
19 # We put the scripts in the directory $(scriptdir)/ldscripts. 19 # We put the scripts in the directory $(scriptdir)/ldscripts.
20 # We can't put the scripts in $(datadir) because the SEARCH_DIR 20 # We can't put the scripts in $(datadir) because the SEARCH_DIR
21 # directives need to be different for native and cross linkers. 21 # directives need to be different for native and cross linkers.
@@ -25,10 +25,10 @@ index ddc7a78368..6fa7bf2583 100644
25 EMUL = @EMUL@ 25 EMUL = @EMUL@
26 EMULATION_OFILES = @EMULATION_OFILES@ 26 EMULATION_OFILES = @EMULATION_OFILES@
27diff --git a/ld/Makefile.in b/ld/Makefile.in 27diff --git a/ld/Makefile.in b/ld/Makefile.in
28index fdf06128b2..5c108b9e05 100644 28index e453bc1b33..2dcd72f809 100644
29--- a/ld/Makefile.in 29--- a/ld/Makefile.in
30+++ b/ld/Makefile.in 30+++ b/ld/Makefile.in
31@@ -572,7 +572,7 @@ AM_CFLAGS = $(WARN_CFLAGS) $(ELF_CLFAGS) 31@@ -573,7 +573,7 @@ AM_CFLAGS = $(WARN_CFLAGS) $(ELF_CLFAGS)
32 # We put the scripts in the directory $(scriptdir)/ldscripts. 32 # We put the scripts in the directory $(scriptdir)/ldscripts.
33 # We can't put the scripts in $(datadir) because the SEARCH_DIR 33 # We can't put the scripts in $(datadir) because the SEARCH_DIR
34 # directives need to be different for native and cross linkers. 34 # directives need to be different for native and cross linkers.
diff --git a/meta/recipes-devtools/binutils/binutils/0005-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch b/meta/recipes-devtools/binutils/binutils/0006-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch
index 214ae06344..d920729204 100644
--- a/meta/recipes-devtools/binutils/binutils/0005-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch
+++ b/meta/recipes-devtools/binutils/binutils/0006-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch
@@ -1,4 +1,4 @@
1From 65fb7a33aba30dec8690e0a237efaa3b9649154c Mon Sep 17 00:00:00 2001 1From 13791636abf518f0db209dc51c29445d80421f2e Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 2 Mar 2015 01:27:17 +0000 3Date: Mon, 2 Mar 2015 01:27:17 +0000
4Subject: [PATCH] Only generate an RPATH entry if LD_RUN_PATH is not empty 4Subject: [PATCH] Only generate an RPATH entry if LD_RUN_PATH is not empty
@@ -10,21 +10,23 @@ Upstream-Status: Pending
10Signed-off-by: Chris Chimelis <chris@debian.org> 10Signed-off-by: Chris Chimelis <chris@debian.org>
11Signed-off-by: Khem Raj <raj.khem@gmail.com> 11Signed-off-by: Khem Raj <raj.khem@gmail.com>
12--- 12---
13 ld/emultempl/elf32.em | 4 ++++ 13 ld/ldelf.c | 4 ++++
14 1 file changed, 4 insertions(+) 14 1 file changed, 4 insertions(+)
15 15
16--- a/ld/emultempl/elf32.em 16diff --git a/ld/ldelf.c b/ld/ldelf.c
17+++ b/ld/emultempl/elf32.em 17index a095d6aac5..a2455a8793 100644
18@@ -1470,6 +1470,8 @@ fragment <<EOF 18--- a/ld/ldelf.c
19 && command_line.rpath == NULL) 19+++ b/ld/ldelf.c
20 { 20@@ -1229,6 +1229,8 @@ ldelf_after_open (int use_libpath, int native, int is_linux, int is_freebsd,
21 path = (const char *) getenv ("LD_RUN_PATH"); 21 && command_line.rpath == NULL)
22+ if ((path) && (strlen (path) == 0)) 22 {
23+ path = NULL; 23 path = (const char *) getenv ("LD_RUN_PATH");
24 if (path 24+ if ((path) && (strlen (path) == 0))
25 && gld${EMULATION_NAME}_search_needed (path, &n, force)) 25+ path = NULL;
26 break; 26 if (path
27@@ -1745,6 +1747,8 @@ gld${EMULATION_NAME}_before_allocation ( 27 && ldelf_search_needed (path, &n, force,
28 is_linux, elfsize))
29@@ -1573,6 +1575,8 @@ ldelf_before_allocation (char *audit, char *depaudit,
28 rpath = command_line.rpath; 30 rpath = command_line.rpath;
29 if (rpath == NULL) 31 if (rpath == NULL)
30 rpath = (const char *) getenv ("LD_RUN_PATH"); 32 rpath = (const char *) getenv ("LD_RUN_PATH");
diff --git a/meta/recipes-devtools/binutils/binutils/0006-Use-libtool-2.4.patch b/meta/recipes-devtools/binutils/binutils/0006-Use-libtool-2.4.patch
deleted file mode 100644
index 135eb8877c..0000000000
--- a/meta/recipes-devtools/binutils/binutils/0006-Use-libtool-2.4.patch
+++ /dev/null
@@ -1,21203 +0,0 @@
1From 9cebc65f222dfd4e0b3072b53f46ffcf328e9fe4 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Sun, 14 Feb 2016 17:04:07 +0000
4Subject: [PATCH] Use libtool 2.4
5
6get libtool sysroot support
7
8Upstream-Status: Pending
9
10Signed-off-by: Khem Raj <raj.khem@gmail.com>
11---
12 bfd/configure | 1322 ++++++++++++++-----
13 bfd/configure.ac | 2 +-
14 binutils/configure | 1320 ++++++++++++++-----
15 gas/configure | 1320 ++++++++++++++-----
16 gprof/configure | 1321 ++++++++++++++-----
17 ld/configure | 1695 ++++++++++++++++++------
18 libtool.m4 | 1080 +++++++++++-----
19 ltmain.sh | 2925 ++++++++++++++++++++++++++++--------------
20 ltoptions.m4 | 2 +-
21 ltversion.m4 | 12 +-
22 lt~obsolete.m4 | 2 +-
23 opcodes/configure | 1322 ++++++++++++++-----
24 opcodes/configure.ac | 2 +-
25 zlib/configure | 1320 ++++++++++++++-----
26 14 files changed, 9940 insertions(+), 3705 deletions(-)
27
28--- a/bfd/configure
29+++ b/bfd/configure
30@@ -704,6 +704,9 @@ OTOOL
31 LIPO
32 NMEDIT
33 DSYMUTIL
34+MANIFEST_TOOL
35+ac_ct_AR
36+DLLTOOL
37 OBJDUMP
38 LN_S
39 NM
40@@ -822,6 +825,7 @@ enable_static
41 with_pic
42 enable_fast_install
43 with_gnu_ld
44+with_libtool_sysroot
45 enable_libtool_lock
46 enable_plugins
47 enable_largefile
48@@ -1504,6 +1508,8 @@ Optional Packages:
49 --with-pic try to use only PIC/non-PIC objects [default=use
50 both]
51 --with-gnu-ld assume the C compiler uses GNU ld [default=no]
52+ --with-libtool-sysroot=DIR Search for dependent libraries within DIR
53+ (or the compiler's sysroot if not specified).
54 --with-mmap try using mmap for BFD input files if available
55 --with-separate-debug-dir=DIR
56 Look for global separate debug info in DIR
57@@ -5693,8 +5699,8 @@ esac
58
59
60
61-macro_version='2.2.7a'
62-macro_revision='1.3134'
63+macro_version='2.4'
64+macro_revision='1.3293'
65
66
67
68@@ -5734,7 +5740,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
69 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
70 $as_echo_n "checking how to print strings... " >&6; }
71 # Test print first, because it will be a builtin if present.
72-if test "X`print -r -- -n 2>/dev/null`" = X-n && \
73+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
74 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
75 ECHO='print -r --'
76 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
77@@ -6420,8 +6426,8 @@ $as_echo_n "checking whether the shell u
78 # Try some XSI features
79 xsi_shell=no
80 ( _lt_dummy="a/b/c"
81- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
82- = c,a/b,, \
83+ test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
84+ = c,a/b,b/c, \
85 && eval 'test $(( 1 + 1 )) -eq 2 \
86 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
87 && xsi_shell=yes
88@@ -6470,6 +6476,80 @@ esac
89
90
91
92+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5
93+$as_echo_n "checking how to convert $build file names to $host format... " >&6; }
94+if ${lt_cv_to_host_file_cmd+:} false; then :
95+ $as_echo_n "(cached) " >&6
96+else
97+ case $host in
98+ *-*-mingw* )
99+ case $build in
100+ *-*-mingw* ) # actually msys
101+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
102+ ;;
103+ *-*-cygwin* )
104+ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
105+ ;;
106+ * ) # otherwise, assume *nix
107+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
108+ ;;
109+ esac
110+ ;;
111+ *-*-cygwin* )
112+ case $build in
113+ *-*-mingw* ) # actually msys
114+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
115+ ;;
116+ *-*-cygwin* )
117+ lt_cv_to_host_file_cmd=func_convert_file_noop
118+ ;;
119+ * ) # otherwise, assume *nix
120+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
121+ ;;
122+ esac
123+ ;;
124+ * ) # unhandled hosts (and "normal" native builds)
125+ lt_cv_to_host_file_cmd=func_convert_file_noop
126+ ;;
127+esac
128+
129+fi
130+
131+to_host_file_cmd=$lt_cv_to_host_file_cmd
132+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5
133+$as_echo "$lt_cv_to_host_file_cmd" >&6; }
134+
135+
136+
137+
138+
139+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5
140+$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; }
141+if ${lt_cv_to_tool_file_cmd+:} false; then :
142+ $as_echo_n "(cached) " >&6
143+else
144+ #assume ordinary cross tools, or native build.
145+lt_cv_to_tool_file_cmd=func_convert_file_noop
146+case $host in
147+ *-*-mingw* )
148+ case $build in
149+ *-*-mingw* ) # actually msys
150+ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
151+ ;;
152+ esac
153+ ;;
154+esac
155+
156+fi
157+
158+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
159+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5
160+$as_echo "$lt_cv_to_tool_file_cmd" >&6; }
161+
162+
163+
164+
165+
166 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
167 $as_echo_n "checking for $LD option to reload object files... " >&6; }
168 if ${lt_cv_ld_reload_flag+:} false; then :
169@@ -6486,6 +6566,11 @@ case $reload_flag in
170 esac
171 reload_cmds='$LD$reload_flag -o $output$reload_objs'
172 case $host_os in
173+ cygwin* | mingw* | pw32* | cegcc*)
174+ if test "$GCC" != yes; then
175+ reload_cmds=false
176+ fi
177+ ;;
178 darwin*)
179 if test "$GCC" = yes; then
180 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
181@@ -6654,7 +6739,8 @@ mingw* | pw32*)
182 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
183 lt_cv_file_magic_cmd='func_win32_libid'
184 else
185- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
186+ # Keep this pattern in sync with the one in func_win32_libid.
187+ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
188 lt_cv_file_magic_cmd='$OBJDUMP -f'
189 fi
190 ;;
191@@ -6808,6 +6894,21 @@ esac
192 fi
193 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
194 $as_echo "$lt_cv_deplibs_check_method" >&6; }
195+
196+file_magic_glob=
197+want_nocaseglob=no
198+if test "$build" = "$host"; then
199+ case $host_os in
200+ mingw* | pw32*)
201+ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
202+ want_nocaseglob=yes
203+ else
204+ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"`
205+ fi
206+ ;;
207+ esac
208+fi
209+
210 file_magic_cmd=$lt_cv_file_magic_cmd
211 deplibs_check_method=$lt_cv_deplibs_check_method
212 test -z "$deplibs_check_method" && deplibs_check_method=unknown
213@@ -6823,9 +6924,162 @@ test -z "$deplibs_check_method" && depli
214
215
216
217+
218+
219+
220+
221+
222+
223+
224+
225+
226+
227 if test -n "$ac_tool_prefix"; then
228- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
229-set dummy ${ac_tool_prefix}ar; ac_word=$2
230+ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
231+set dummy ${ac_tool_prefix}dlltool; ac_word=$2
232+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
233+$as_echo_n "checking for $ac_word... " >&6; }
234+if ${ac_cv_prog_DLLTOOL+:} false; then :
235+ $as_echo_n "(cached) " >&6
236+else
237+ if test -n "$DLLTOOL"; then
238+ ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
239+else
240+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
241+for as_dir in $PATH
242+do
243+ IFS=$as_save_IFS
244+ test -z "$as_dir" && as_dir=.
245+ for ac_exec_ext in '' $ac_executable_extensions; do
246+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
247+ ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
248+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
249+ break 2
250+ fi
251+done
252+ done
253+IFS=$as_save_IFS
254+
255+fi
256+fi
257+DLLTOOL=$ac_cv_prog_DLLTOOL
258+if test -n "$DLLTOOL"; then
259+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
260+$as_echo "$DLLTOOL" >&6; }
261+else
262+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
263+$as_echo "no" >&6; }
264+fi
265+
266+
267+fi
268+if test -z "$ac_cv_prog_DLLTOOL"; then
269+ ac_ct_DLLTOOL=$DLLTOOL
270+ # Extract the first word of "dlltool", so it can be a program name with args.
271+set dummy dlltool; ac_word=$2
272+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
273+$as_echo_n "checking for $ac_word... " >&6; }
274+if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then :
275+ $as_echo_n "(cached) " >&6
276+else
277+ if test -n "$ac_ct_DLLTOOL"; then
278+ ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
279+else
280+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
281+for as_dir in $PATH
282+do
283+ IFS=$as_save_IFS
284+ test -z "$as_dir" && as_dir=.
285+ for ac_exec_ext in '' $ac_executable_extensions; do
286+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
287+ ac_cv_prog_ac_ct_DLLTOOL="dlltool"
288+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
289+ break 2
290+ fi
291+done
292+ done
293+IFS=$as_save_IFS
294+
295+fi
296+fi
297+ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
298+if test -n "$ac_ct_DLLTOOL"; then
299+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
300+$as_echo "$ac_ct_DLLTOOL" >&6; }
301+else
302+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
303+$as_echo "no" >&6; }
304+fi
305+
306+ if test "x$ac_ct_DLLTOOL" = x; then
307+ DLLTOOL="false"
308+ else
309+ case $cross_compiling:$ac_tool_warned in
310+yes:)
311+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
312+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
313+ac_tool_warned=yes ;;
314+esac
315+ DLLTOOL=$ac_ct_DLLTOOL
316+ fi
317+else
318+ DLLTOOL="$ac_cv_prog_DLLTOOL"
319+fi
320+
321+test -z "$DLLTOOL" && DLLTOOL=dlltool
322+
323+
324+
325+
326+
327+
328+
329+
330+
331+
332+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5
333+$as_echo_n "checking how to associate runtime and link libraries... " >&6; }
334+if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then :
335+ $as_echo_n "(cached) " >&6
336+else
337+ lt_cv_sharedlib_from_linklib_cmd='unknown'
338+
339+case $host_os in
340+cygwin* | mingw* | pw32* | cegcc*)
341+ # two different shell functions defined in ltmain.sh
342+ # decide which to use based on capabilities of $DLLTOOL
343+ case `$DLLTOOL --help 2>&1` in
344+ *--identify-strict*)
345+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
346+ ;;
347+ *)
348+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
349+ ;;
350+ esac
351+ ;;
352+*)
353+ # fallback: assume linklib IS sharedlib
354+ lt_cv_sharedlib_from_linklib_cmd="$ECHO"
355+ ;;
356+esac
357+
358+fi
359+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5
360+$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; }
361+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
362+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
363+
364+
365+
366+
367+
368+
369+
370+if test -n "$ac_tool_prefix"; then
371+ for ac_prog in ar
372+ do
373+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
374+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
375 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
376 $as_echo_n "checking for $ac_word... " >&6; }
377 if ${ac_cv_prog_AR+:} false; then :
378@@ -6841,7 +7095,7 @@ do
379 test -z "$as_dir" && as_dir=.
380 for ac_exec_ext in '' $ac_executable_extensions; do
381 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
382- ac_cv_prog_AR="${ac_tool_prefix}ar"
383+ ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
384 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
385 break 2
386 fi
387@@ -6861,11 +7115,15 @@ $as_echo "no" >&6; }
388 fi
389
390
391+ test -n "$AR" && break
392+ done
393 fi
394-if test -z "$ac_cv_prog_AR"; then
395+if test -z "$AR"; then
396 ac_ct_AR=$AR
397- # Extract the first word of "ar", so it can be a program name with args.
398-set dummy ar; ac_word=$2
399+ for ac_prog in ar
400+do
401+ # Extract the first word of "$ac_prog", so it can be a program name with args.
402+set dummy $ac_prog; ac_word=$2
403 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
404 $as_echo_n "checking for $ac_word... " >&6; }
405 if ${ac_cv_prog_ac_ct_AR+:} false; then :
406@@ -6881,7 +7139,7 @@ do
407 test -z "$as_dir" && as_dir=.
408 for ac_exec_ext in '' $ac_executable_extensions; do
409 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
410- ac_cv_prog_ac_ct_AR="ar"
411+ ac_cv_prog_ac_ct_AR="$ac_prog"
412 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
413 break 2
414 fi
415@@ -6900,6 +7158,10 @@ else
416 $as_echo "no" >&6; }
417 fi
418
419+
420+ test -n "$ac_ct_AR" && break
421+done
422+
423 if test "x$ac_ct_AR" = x; then
424 AR="false"
425 else
426@@ -6911,16 +7173,72 @@ ac_tool_warned=yes ;;
427 esac
428 AR=$ac_ct_AR
429 fi
430-else
431- AR="$ac_cv_prog_AR"
432 fi
433
434-test -z "$AR" && AR=ar
435-test -z "$AR_FLAGS" && AR_FLAGS=cru
436+: ${AR=ar}
437+: ${AR_FLAGS=cru}
438+
439+
440+
441+
442+
443+
444+
445+
446+
447+
448
449+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
450+$as_echo_n "checking for archiver @FILE support... " >&6; }
451+if ${lt_cv_ar_at_file+:} false; then :
452+ $as_echo_n "(cached) " >&6
453+else
454+ lt_cv_ar_at_file=no
455+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
456+/* end confdefs.h. */
457
458+int
459+main ()
460+{
461
462+ ;
463+ return 0;
464+}
465+_ACEOF
466+if ac_fn_c_try_compile "$LINENO"; then :
467+ echo conftest.$ac_objext > conftest.lst
468+ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5'
469+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
470+ (eval $lt_ar_try) 2>&5
471+ ac_status=$?
472+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
473+ test $ac_status = 0; }
474+ if test "$ac_status" -eq 0; then
475+ # Ensure the archiver fails upon bogus file names.
476+ rm -f conftest.$ac_objext libconftest.a
477+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
478+ (eval $lt_ar_try) 2>&5
479+ ac_status=$?
480+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
481+ test $ac_status = 0; }
482+ if test "$ac_status" -ne 0; then
483+ lt_cv_ar_at_file=@
484+ fi
485+ fi
486+ rm -f conftest.* libconftest.a
487
488+fi
489+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
490+
491+fi
492+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
493+$as_echo "$lt_cv_ar_at_file" >&6; }
494+
495+if test "x$lt_cv_ar_at_file" = xno; then
496+ archiver_list_spec=
497+else
498+ archiver_list_spec=$lt_cv_ar_at_file
499+fi
500
501
502
503@@ -7262,8 +7580,8 @@ esac
504 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
505
506 # Transform an extracted symbol line into symbol name and symbol address
507-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
508-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'"
509+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
510+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'"
511
512 # Handle CRLF in mingw tool chain
513 opt_cr=
514@@ -7299,6 +7617,7 @@ for ac_symprfx in "" "_"; do
515 else
516 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
517 fi
518+ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
519
520 # Check to see that the pipe works correctly.
521 pipe_works=no
522@@ -7340,6 +7659,18 @@ _LT_EOF
523 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
524 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
525 cat <<_LT_EOF > conftest.$ac_ext
526+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */
527+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
528+/* DATA imports from DLLs on WIN32 con't be const, because runtime
529+ relocations are performed -- see ld's documentation on pseudo-relocs. */
530+# define LT_DLSYM_CONST
531+#elif defined(__osf__)
532+/* This system does not cope well with relocations in const data. */
533+# define LT_DLSYM_CONST
534+#else
535+# define LT_DLSYM_CONST const
536+#endif
537+
538 #ifdef __cplusplus
539 extern "C" {
540 #endif
541@@ -7351,7 +7682,7 @@ _LT_EOF
542 cat <<_LT_EOF >> conftest.$ac_ext
543
544 /* The mapping between symbol names and symbols. */
545-const struct {
546+LT_DLSYM_CONST struct {
547 const char *name;
548 void *address;
549 }
550@@ -7377,8 +7708,8 @@ static const void *lt_preloaded_setup()
551 _LT_EOF
552 # Now try linking the two files.
553 mv conftest.$ac_objext conftstm.$ac_objext
554- lt_save_LIBS="$LIBS"
555- lt_save_CFLAGS="$CFLAGS"
556+ lt_globsym_save_LIBS=$LIBS
557+ lt_globsym_save_CFLAGS=$CFLAGS
558 LIBS="conftstm.$ac_objext"
559 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
560 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
561@@ -7388,8 +7719,8 @@ _LT_EOF
562 test $ac_status = 0; } && test -s conftest${ac_exeext}; then
563 pipe_works=yes
564 fi
565- LIBS="$lt_save_LIBS"
566- CFLAGS="$lt_save_CFLAGS"
567+ LIBS=$lt_globsym_save_LIBS
568+ CFLAGS=$lt_globsym_save_CFLAGS
569 else
570 echo "cannot find nm_test_func in $nlist" >&5
571 fi
572@@ -7426,6 +7757,20 @@ else
573 $as_echo "ok" >&6; }
574 fi
575
576+# Response file support.
577+if test "$lt_cv_nm_interface" = "MS dumpbin"; then
578+ nm_file_list_spec='@'
579+elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then
580+ nm_file_list_spec='@'
581+fi
582+
583+
584+
585+
586+
587+
588+
589+
590
591
592
593@@ -7445,6 +7790,41 @@ fi
594
595
596
597+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
598+$as_echo_n "checking for sysroot... " >&6; }
599+
600+# Check whether --with-libtool-sysroot was given.
601+if test "${with_libtool_sysroot+set}" = set; then :
602+ withval=$with_libtool_sysroot;
603+else
604+ with_libtool_sysroot=no
605+fi
606+
607+
608+lt_sysroot=
609+case ${with_libtool_sysroot} in #(
610+ yes)
611+ if test "$GCC" = yes; then
612+ lt_sysroot=`$CC --print-sysroot 2>/dev/null`
613+ fi
614+ ;; #(
615+ /*)
616+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"`
617+ ;; #(
618+ no|'')
619+ ;; #(
620+ *)
621+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5
622+$as_echo "${with_libtool_sysroot}" >&6; }
623+ as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5
624+ ;;
625+esac
626+
627+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
628+$as_echo "${lt_sysroot:-no}" >&6; }
629+
630+
631+
632
633
634 # Check whether --enable-libtool-lock was given.
635@@ -7653,6 +8033,123 @@ esac
636
637 need_locks="$enable_libtool_lock"
638
639+if test -n "$ac_tool_prefix"; then
640+ # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args.
641+set dummy ${ac_tool_prefix}mt; ac_word=$2
642+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
643+$as_echo_n "checking for $ac_word... " >&6; }
644+if ${ac_cv_prog_MANIFEST_TOOL+:} false; then :
645+ $as_echo_n "(cached) " >&6
646+else
647+ if test -n "$MANIFEST_TOOL"; then
648+ ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test.
649+else
650+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
651+for as_dir in $PATH
652+do
653+ IFS=$as_save_IFS
654+ test -z "$as_dir" && as_dir=.
655+ for ac_exec_ext in '' $ac_executable_extensions; do
656+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
657+ ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
658+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
659+ break 2
660+ fi
661+done
662+ done
663+IFS=$as_save_IFS
664+
665+fi
666+fi
667+MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL
668+if test -n "$MANIFEST_TOOL"; then
669+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5
670+$as_echo "$MANIFEST_TOOL" >&6; }
671+else
672+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
673+$as_echo "no" >&6; }
674+fi
675+
676+
677+fi
678+if test -z "$ac_cv_prog_MANIFEST_TOOL"; then
679+ ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL
680+ # Extract the first word of "mt", so it can be a program name with args.
681+set dummy mt; ac_word=$2
682+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
683+$as_echo_n "checking for $ac_word... " >&6; }
684+if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then :
685+ $as_echo_n "(cached) " >&6
686+else
687+ if test -n "$ac_ct_MANIFEST_TOOL"; then
688+ ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test.
689+else
690+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
691+for as_dir in $PATH
692+do
693+ IFS=$as_save_IFS
694+ test -z "$as_dir" && as_dir=.
695+ for ac_exec_ext in '' $ac_executable_extensions; do
696+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
697+ ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
698+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
699+ break 2
700+ fi
701+done
702+ done
703+IFS=$as_save_IFS
704+
705+fi
706+fi
707+ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL
708+if test -n "$ac_ct_MANIFEST_TOOL"; then
709+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5
710+$as_echo "$ac_ct_MANIFEST_TOOL" >&6; }
711+else
712+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
713+$as_echo "no" >&6; }
714+fi
715+
716+ if test "x$ac_ct_MANIFEST_TOOL" = x; then
717+ MANIFEST_TOOL=":"
718+ else
719+ case $cross_compiling:$ac_tool_warned in
720+yes:)
721+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
722+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
723+ac_tool_warned=yes ;;
724+esac
725+ MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL
726+ fi
727+else
728+ MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL"
729+fi
730+
731+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
732+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5
733+$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; }
734+if ${lt_cv_path_mainfest_tool+:} false; then :
735+ $as_echo_n "(cached) " >&6
736+else
737+ lt_cv_path_mainfest_tool=no
738+ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5
739+ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
740+ cat conftest.err >&5
741+ if $GREP 'Manifest Tool' conftest.out > /dev/null; then
742+ lt_cv_path_mainfest_tool=yes
743+ fi
744+ rm -f conftest*
745+fi
746+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5
747+$as_echo "$lt_cv_path_mainfest_tool" >&6; }
748+if test "x$lt_cv_path_mainfest_tool" != xyes; then
749+ MANIFEST_TOOL=:
750+fi
751+
752+
753+
754+
755+
756
757 case $host_os in
758 rhapsody* | darwin*)
759@@ -8216,6 +8713,8 @@ _LT_EOF
760 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
761 echo "$AR cru libconftest.a conftest.o" >&5
762 $AR cru libconftest.a conftest.o 2>&5
763+ echo "$RANLIB libconftest.a" >&5
764+ $RANLIB libconftest.a 2>&5
765 cat > conftest.c << _LT_EOF
766 int main() { return 0;}
767 _LT_EOF
768@@ -8380,7 +8879,8 @@ fi
769 LIBTOOL_DEPS="$ltmain"
770
771 # Always use our own libtool.
772-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
773+LIBTOOL='$(SHELL) $(top_builddir)'
774+LIBTOOL="$LIBTOOL/${host_alias}-libtool"
775
776
777
778@@ -8469,7 +8969,7 @@ aix3*)
779 esac
780
781 # Global variables:
782-ofile=libtool
783+ofile=${host_alias}-libtool
784 can_build_shared=yes
785
786 # All known linkers require a `.a' archive for static linking (except MSVC,
787@@ -8767,8 +9267,6 @@ fi
788 lt_prog_compiler_pic=
789 lt_prog_compiler_static=
790
791-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
792-$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
793
794 if test "$GCC" = yes; then
795 lt_prog_compiler_wl='-Wl,'
796@@ -8934,6 +9432,12 @@ $as_echo_n "checking for $compiler optio
797 lt_prog_compiler_pic='--shared'
798 lt_prog_compiler_static='--static'
799 ;;
800+ nagfor*)
801+ # NAG Fortran compiler
802+ lt_prog_compiler_wl='-Wl,-Wl,,'
803+ lt_prog_compiler_pic='-PIC'
804+ lt_prog_compiler_static='-Bstatic'
805+ ;;
806 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
807 # Portland Group compilers (*not* the Pentium gcc compiler,
808 # which looks to be a dead project)
809@@ -8996,7 +9500,7 @@ $as_echo_n "checking for $compiler optio
810 lt_prog_compiler_pic='-KPIC'
811 lt_prog_compiler_static='-Bstatic'
812 case $cc_basename in
813- f77* | f90* | f95*)
814+ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
815 lt_prog_compiler_wl='-Qoption ld ';;
816 *)
817 lt_prog_compiler_wl='-Wl,';;
818@@ -9053,13 +9557,17 @@ case $host_os in
819 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
820 ;;
821 esac
822-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5
823-$as_echo "$lt_prog_compiler_pic" >&6; }
824-
825-
826-
827-
828
829+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
830+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
831+if ${lt_cv_prog_compiler_pic+:} false; then :
832+ $as_echo_n "(cached) " >&6
833+else
834+ lt_cv_prog_compiler_pic=$lt_prog_compiler_pic
835+fi
836+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
837+$as_echo "$lt_cv_prog_compiler_pic" >&6; }
838+lt_prog_compiler_pic=$lt_cv_prog_compiler_pic
839
840 #
841 # Check to make sure the PIC flag actually works.
842@@ -9120,6 +9628,11 @@ fi
843
844
845
846+
847+
848+
849+
850+
851 #
852 # Check to make sure the static flag actually works.
853 #
854@@ -9470,7 +9983,8 @@ _LT_EOF
855 allow_undefined_flag=unsupported
856 always_export_symbols=no
857 enable_shared_with_static_runtimes=yes
858- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
859+ 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'
860+ exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
861
862 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
863 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
864@@ -9569,12 +10083,12 @@ _LT_EOF
865 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
866 hardcode_libdir_flag_spec=
867 hardcode_libdir_flag_spec_ld='-rpath $libdir'
868- archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
869+ archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
870 if test "x$supports_anon_versioning" = xyes; then
871 archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
872 cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
873 echo "local: *; };" >> $output_objdir/$libname.ver~
874- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
875+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
876 fi
877 ;;
878 esac
879@@ -9588,8 +10102,8 @@ _LT_EOF
880 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
881 wlarc=
882 else
883- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
884- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
885+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
886+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
887 fi
888 ;;
889
890@@ -9607,8 +10121,8 @@ _LT_EOF
891
892 _LT_EOF
893 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
894- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
895- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
896+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
897+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
898 else
899 ld_shlibs=no
900 fi
901@@ -9654,8 +10168,8 @@ _LT_EOF
902
903 *)
904 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
905- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
906- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
907+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
908+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
909 else
910 ld_shlibs=no
911 fi
912@@ -9785,7 +10299,13 @@ _LT_EOF
913 allow_undefined_flag='-berok'
914 # Determine the default libpath from the value encoded in an
915 # empty executable.
916- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
917+ if test "${lt_cv_aix_libpath+set}" = set; then
918+ aix_libpath=$lt_cv_aix_libpath
919+else
920+ if ${lt_cv_aix_libpath_+:} false; then :
921+ $as_echo_n "(cached) " >&6
922+else
923+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
924 /* end confdefs.h. */
925
926 int
927@@ -9798,22 +10318,29 @@ main ()
928 _ACEOF
929 if ac_fn_c_try_link "$LINENO"; then :
930
931-lt_aix_libpath_sed='
932- /Import File Strings/,/^$/ {
933- /^0/ {
934- s/^0 *\(.*\)$/\1/
935- p
936- }
937- }'
938-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
939-# Check for a 64-bit object if we didn't find anything.
940-if test -z "$aix_libpath"; then
941- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
942-fi
943+ lt_aix_libpath_sed='
944+ /Import File Strings/,/^$/ {
945+ /^0/ {
946+ s/^0 *\([^ ]*\) *$/\1/
947+ p
948+ }
949+ }'
950+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
951+ # Check for a 64-bit object if we didn't find anything.
952+ if test -z "$lt_cv_aix_libpath_"; then
953+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
954+ fi
955 fi
956 rm -f core conftest.err conftest.$ac_objext \
957 conftest$ac_exeext conftest.$ac_ext
958-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
959+ if test -z "$lt_cv_aix_libpath_"; then
960+ lt_cv_aix_libpath_="/usr/lib:/lib"
961+ fi
962+
963+fi
964+
965+ aix_libpath=$lt_cv_aix_libpath_
966+fi
967
968 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
969 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"
970@@ -9825,7 +10352,13 @@ if test -z "$aix_libpath"; then aix_libp
971 else
972 # Determine the default libpath from the value encoded in an
973 # empty executable.
974- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
975+ if test "${lt_cv_aix_libpath+set}" = set; then
976+ aix_libpath=$lt_cv_aix_libpath
977+else
978+ if ${lt_cv_aix_libpath_+:} false; then :
979+ $as_echo_n "(cached) " >&6
980+else
981+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
982 /* end confdefs.h. */
983
984 int
985@@ -9838,22 +10371,29 @@ main ()
986 _ACEOF
987 if ac_fn_c_try_link "$LINENO"; then :
988
989-lt_aix_libpath_sed='
990- /Import File Strings/,/^$/ {
991- /^0/ {
992- s/^0 *\(.*\)$/\1/
993- p
994- }
995- }'
996-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
997-# Check for a 64-bit object if we didn't find anything.
998-if test -z "$aix_libpath"; then
999- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
1000-fi
1001+ lt_aix_libpath_sed='
1002+ /Import File Strings/,/^$/ {
1003+ /^0/ {
1004+ s/^0 *\([^ ]*\) *$/\1/
1005+ p
1006+ }
1007+ }'
1008+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
1009+ # Check for a 64-bit object if we didn't find anything.
1010+ if test -z "$lt_cv_aix_libpath_"; then
1011+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
1012+ fi
1013 fi
1014 rm -f core conftest.err conftest.$ac_objext \
1015 conftest$ac_exeext conftest.$ac_ext
1016-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
1017+ if test -z "$lt_cv_aix_libpath_"; then
1018+ lt_cv_aix_libpath_="/usr/lib:/lib"
1019+ fi
1020+
1021+fi
1022+
1023+ aix_libpath=$lt_cv_aix_libpath_
1024+fi
1025
1026 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
1027 # Warning - without using the other run time loading flags,
1028@@ -9898,20 +10438,63 @@ if test -z "$aix_libpath"; then aix_libp
1029 # Microsoft Visual C++.
1030 # hardcode_libdir_flag_spec is actually meaningless, as there is
1031 # no search path for DLLs.
1032- hardcode_libdir_flag_spec=' '
1033- allow_undefined_flag=unsupported
1034- # Tell ltmain to make .lib files, not .a files.
1035- libext=lib
1036- # Tell ltmain to make .dll files, not .so files.
1037- shrext_cmds=".dll"
1038- # FIXME: Setting linknames here is a bad hack.
1039- archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
1040- # The linker will automatically build a .lib file if we build a DLL.
1041- old_archive_from_new_cmds='true'
1042- # FIXME: Should let the user specify the lib program.
1043- old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
1044- fix_srcfile_path='`cygpath -w "$srcfile"`'
1045- enable_shared_with_static_runtimes=yes
1046+ case $cc_basename in
1047+ cl*)
1048+ # Native MSVC
1049+ hardcode_libdir_flag_spec=' '
1050+ allow_undefined_flag=unsupported
1051+ always_export_symbols=yes
1052+ file_list_spec='@'
1053+ # Tell ltmain to make .lib files, not .a files.
1054+ libext=lib
1055+ # Tell ltmain to make .dll files, not .so files.
1056+ shrext_cmds=".dll"
1057+ # FIXME: Setting linknames here is a bad hack.
1058+ archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
1059+ archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
1060+ sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
1061+ else
1062+ sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
1063+ fi~
1064+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
1065+ linknames='
1066+ # The linker will not automatically build a static lib if we build a DLL.
1067+ # _LT_TAGVAR(old_archive_from_new_cmds, )='true'
1068+ enable_shared_with_static_runtimes=yes
1069+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
1070+ # Don't use ranlib
1071+ old_postinstall_cmds='chmod 644 $oldlib'
1072+ postlink_cmds='lt_outputfile="@OUTPUT@"~
1073+ lt_tool_outputfile="@TOOL_OUTPUT@"~
1074+ case $lt_outputfile in
1075+ *.exe|*.EXE) ;;
1076+ *)
1077+ lt_outputfile="$lt_outputfile.exe"
1078+ lt_tool_outputfile="$lt_tool_outputfile.exe"
1079+ ;;
1080+ esac~
1081+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
1082+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
1083+ $RM "$lt_outputfile.manifest";
1084+ fi'
1085+ ;;
1086+ *)
1087+ # Assume MSVC wrapper
1088+ hardcode_libdir_flag_spec=' '
1089+ allow_undefined_flag=unsupported
1090+ # Tell ltmain to make .lib files, not .a files.
1091+ libext=lib
1092+ # Tell ltmain to make .dll files, not .so files.
1093+ shrext_cmds=".dll"
1094+ # FIXME: Setting linknames here is a bad hack.
1095+ archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
1096+ # The linker will automatically build a .lib file if we build a DLL.
1097+ old_archive_from_new_cmds='true'
1098+ # FIXME: Should let the user specify the lib program.
1099+ old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
1100+ enable_shared_with_static_runtimes=yes
1101+ ;;
1102+ esac
1103 ;;
1104
1105 darwin* | rhapsody*)
1106@@ -9972,7 +10555,7 @@ if test -z "$aix_libpath"; then aix_libp
1107
1108 # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
1109 freebsd* | dragonfly*)
1110- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
1111+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
1112 hardcode_libdir_flag_spec='-R$libdir'
1113 hardcode_direct=yes
1114 hardcode_shlibpath_var=no
1115@@ -9980,7 +10563,7 @@ if test -z "$aix_libpath"; then aix_libp
1116
1117 hpux9*)
1118 if test "$GCC" = yes; then
1119- 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'
1120+ 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'
1121 else
1122 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'
1123 fi
1124@@ -9996,7 +10579,7 @@ if test -z "$aix_libpath"; then aix_libp
1125
1126 hpux10*)
1127 if test "$GCC" = yes && test "$with_gnu_ld" = no; then
1128- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
1129+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
1130 else
1131 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
1132 fi
1133@@ -10020,10 +10603,10 @@ if test -z "$aix_libpath"; then aix_libp
1134 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
1135 ;;
1136 ia64*)
1137- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
1138+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
1139 ;;
1140 *)
1141- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
1142+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
1143 ;;
1144 esac
1145 else
1146@@ -10102,23 +10685,36 @@ fi
1147
1148 irix5* | irix6* | nonstopux*)
1149 if test "$GCC" = yes; then
1150- 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'
1151+ 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'
1152 # Try to use the -exported_symbol ld option, if it does not
1153 # work, assume that -exports_file does not work either and
1154 # implicitly export all symbols.
1155- save_LDFLAGS="$LDFLAGS"
1156- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
1157- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
1158+ # This should be the same for all languages, so no per-tag cache variable.
1159+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5
1160+$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; }
1161+if ${lt_cv_irix_exported_symbol+:} false; then :
1162+ $as_echo_n "(cached) " >&6
1163+else
1164+ save_LDFLAGS="$LDFLAGS"
1165+ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
1166+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
1167 /* end confdefs.h. */
1168-int foo(void) {}
1169+int foo (void) { return 0; }
1170 _ACEOF
1171 if ac_fn_c_try_link "$LINENO"; then :
1172- 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'
1173-
1174+ lt_cv_irix_exported_symbol=yes
1175+else
1176+ lt_cv_irix_exported_symbol=no
1177 fi
1178 rm -f core conftest.err conftest.$ac_objext \
1179 conftest$ac_exeext conftest.$ac_ext
1180- LDFLAGS="$save_LDFLAGS"
1181+ LDFLAGS="$save_LDFLAGS"
1182+fi
1183+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5
1184+$as_echo "$lt_cv_irix_exported_symbol" >&6; }
1185+ if test "$lt_cv_irix_exported_symbol" = yes; then
1186+ 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'
1187+ fi
1188 else
1189 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'
1190 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'
1191@@ -10203,7 +10799,7 @@ rm -f core conftest.err conftest.$ac_obj
1192 osf4* | osf5*) # as osf3* with the addition of -msym flag
1193 if test "$GCC" = yes; then
1194 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
1195- 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'
1196+ 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'
1197 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
1198 else
1199 allow_undefined_flag=' -expect_unresolved \*'
1200@@ -10222,9 +10818,9 @@ rm -f core conftest.err conftest.$ac_obj
1201 no_undefined_flag=' -z defs'
1202 if test "$GCC" = yes; then
1203 wlarc='${wl}'
1204- archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
1205+ archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
1206 archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
1207- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
1208+ $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'
1209 else
1210 case `$CC -V 2>&1` in
1211 *"Compilers 5.0"*)
1212@@ -10800,8 +11396,9 @@ cygwin* | mingw* | pw32* | cegcc*)
1213 need_version=no
1214 need_lib_prefix=no
1215
1216- case $GCC,$host_os in
1217- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
1218+ case $GCC,$cc_basename in
1219+ yes,*)
1220+ # gcc
1221 library_names_spec='$libname.dll.a'
1222 # DLL is installed to $(libdir)/../bin by postinstall_cmds
1223 postinstall_cmds='base_file=`basename \${file}`~
1224@@ -10834,13 +11431,71 @@ cygwin* | mingw* | pw32* | cegcc*)
1225 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
1226 ;;
1227 esac
1228+ dynamic_linker='Win32 ld.exe'
1229+ ;;
1230+
1231+ *,cl*)
1232+ # Native MSVC
1233+ libname_spec='$name'
1234+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
1235+ library_names_spec='${libname}.dll.lib'
1236+
1237+ case $build_os in
1238+ mingw*)
1239+ sys_lib_search_path_spec=
1240+ lt_save_ifs=$IFS
1241+ IFS=';'
1242+ for lt_path in $LIB
1243+ do
1244+ IFS=$lt_save_ifs
1245+ # Let DOS variable expansion print the short 8.3 style file name.
1246+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
1247+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
1248+ done
1249+ IFS=$lt_save_ifs
1250+ # Convert to MSYS style.
1251+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
1252+ ;;
1253+ cygwin*)
1254+ # Convert to unix form, then to dos form, then back to unix form
1255+ # but this time dos style (no spaces!) so that the unix form looks
1256+ # like /cygdrive/c/PROGRA~1:/cygdr...
1257+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
1258+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
1259+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
1260+ ;;
1261+ *)
1262+ sys_lib_search_path_spec="$LIB"
1263+ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
1264+ # It is most probably a Windows format PATH.
1265+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
1266+ else
1267+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
1268+ fi
1269+ # FIXME: find the short name or the path components, as spaces are
1270+ # common. (e.g. "Program Files" -> "PROGRA~1")
1271+ ;;
1272+ esac
1273+
1274+ # DLL is installed to $(libdir)/../bin by postinstall_cmds
1275+ postinstall_cmds='base_file=`basename \${file}`~
1276+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
1277+ dldir=$destdir/`dirname \$dlpath`~
1278+ test -d \$dldir || mkdir -p \$dldir~
1279+ $install_prog $dir/$dlname \$dldir/$dlname'
1280+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
1281+ dlpath=$dir/\$dldll~
1282+ $RM \$dlpath'
1283+ shlibpath_overrides_runpath=yes
1284+ dynamic_linker='Win32 link.exe'
1285 ;;
1286
1287 *)
1288+ # Assume MSVC wrapper
1289 library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
1290+ dynamic_linker='Win32 ld.exe'
1291 ;;
1292 esac
1293- dynamic_linker='Win32 ld.exe'
1294 # FIXME: first we should search . and the directory the executable is in
1295 shlibpath_var=PATH
1296 ;;
1297@@ -10932,7 +11587,7 @@ haiku*)
1298 soname_spec='${libname}${release}${shared_ext}$major'
1299 shlibpath_var=LIBRARY_PATH
1300 shlibpath_overrides_runpath=yes
1301- sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib'
1302+ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
1303 hardcode_into_libs=yes
1304 ;;
1305
1306@@ -11728,7 +12383,7 @@ else
1307 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
1308 lt_status=$lt_dlunknown
1309 cat > conftest.$ac_ext <<_LT_EOF
1310-#line 11731 "configure"
1311+#line $LINENO "configure"
1312 #include "confdefs.h"
1313
1314 #if HAVE_DLFCN_H
1315@@ -11772,10 +12427,10 @@ else
1316 /* When -fvisbility=hidden is used, assume the code has been annotated
1317 correspondingly for the symbols needed. */
1318 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
1319-void fnord () __attribute__((visibility("default")));
1320+int fnord () __attribute__((visibility("default")));
1321 #endif
1322
1323-void fnord () { int i=42; }
1324+int fnord () { return 42; }
1325 int main ()
1326 {
1327 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
1328@@ -11834,7 +12489,7 @@ else
1329 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
1330 lt_status=$lt_dlunknown
1331 cat > conftest.$ac_ext <<_LT_EOF
1332-#line 11837 "configure"
1333+#line $LINENO "configure"
1334 #include "confdefs.h"
1335
1336 #if HAVE_DLFCN_H
1337@@ -11878,10 +12533,10 @@ else
1338 /* When -fvisbility=hidden is used, assume the code has been annotated
1339 correspondingly for the symbols needed. */
1340 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
1341-void fnord () __attribute__((visibility("default")));
1342+int fnord () __attribute__((visibility("default")));
1343 #endif
1344
1345-void fnord () { int i=42; }
1346+int fnord () { return 42; }
1347 int main ()
1348 {
1349 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
1350@@ -14554,7 +15209,7 @@ SHARED_LDFLAGS=
1351 if test "$enable_shared" = "yes"; then
1352 x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'`
1353 if test -n "$x"; then
1354- SHARED_LIBADD="-L`pwd`/../libiberty/pic -liberty"
1355+ SHARED_LIBADD="`pwd`/../libiberty/pic/libiberty.a"
1356 fi
1357
1358 case "${host}" in
1359@@ -17177,13 +17832,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_
1360 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
1361 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
1362 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
1363+lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`'
1364+lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`'
1365 reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
1366 reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
1367 OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
1368 deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`'
1369 file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`'
1370+file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`'
1371+want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`'
1372+DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`'
1373+sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`'
1374 AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`'
1375 AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`'
1376+archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`'
1377 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
1378 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
1379 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
1380@@ -17198,14 +17860,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$l
1381 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
1382 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
1383 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"`'
1384+nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`'
1385+lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`'
1386 objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`'
1387 MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`'
1388 lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`'
1389-lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
1390 lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`'
1391+lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
1392 lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`'
1393 lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`'
1394 need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`'
1395+MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`'
1396 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
1397 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
1398 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
1399@@ -17238,12 +17903,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcod
1400 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
1401 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
1402 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
1403-fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`'
1404 always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`'
1405 export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`'
1406 exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`'
1407 include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`'
1408 prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`'
1409+postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`'
1410 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
1411 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
1412 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
1413@@ -17298,8 +17963,13 @@ reload_flag \
1414 OBJDUMP \
1415 deplibs_check_method \
1416 file_magic_cmd \
1417+file_magic_glob \
1418+want_nocaseglob \
1419+DLLTOOL \
1420+sharedlib_from_linklib_cmd \
1421 AR \
1422 AR_FLAGS \
1423+archiver_list_spec \
1424 STRIP \
1425 RANLIB \
1426 CC \
1427@@ -17309,12 +17979,14 @@ lt_cv_sys_global_symbol_pipe \
1428 lt_cv_sys_global_symbol_to_cdecl \
1429 lt_cv_sys_global_symbol_to_c_name_address \
1430 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
1431+nm_file_list_spec \
1432 lt_prog_compiler_no_builtin_flag \
1433-lt_prog_compiler_wl \
1434 lt_prog_compiler_pic \
1435+lt_prog_compiler_wl \
1436 lt_prog_compiler_static \
1437 lt_cv_prog_compiler_c_o \
1438 need_locks \
1439+MANIFEST_TOOL \
1440 DSYMUTIL \
1441 NMEDIT \
1442 LIPO \
1443@@ -17330,7 +18002,6 @@ no_undefined_flag \
1444 hardcode_libdir_flag_spec \
1445 hardcode_libdir_flag_spec_ld \
1446 hardcode_libdir_separator \
1447-fix_srcfile_path \
1448 exclude_expsyms \
1449 include_expsyms \
1450 file_list_spec \
1451@@ -17366,6 +18037,7 @@ module_cmds \
1452 module_expsym_cmds \
1453 export_symbols_cmds \
1454 prelink_cmds \
1455+postlink_cmds \
1456 postinstall_cmds \
1457 postuninstall_cmds \
1458 finish_cmds \
1459@@ -18154,7 +18826,8 @@ $as_echo X"$file" |
1460 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
1461 #
1462 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
1463-# 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
1464+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
1465+# Inc.
1466 # Written by Gordon Matzigkeit, 1996
1467 #
1468 # This file is part of GNU Libtool.
1469@@ -18257,19 +18930,42 @@ SP2NL=$lt_lt_SP2NL
1470 # turn newlines into spaces.
1471 NL2SP=$lt_lt_NL2SP
1472
1473+# convert \$build file names to \$host format.
1474+to_host_file_cmd=$lt_cv_to_host_file_cmd
1475+
1476+# convert \$build files to toolchain format.
1477+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
1478+
1479 # An object symbol dumper.
1480 OBJDUMP=$lt_OBJDUMP
1481
1482 # Method to check whether dependent libraries are shared objects.
1483 deplibs_check_method=$lt_deplibs_check_method
1484
1485-# Command to use when deplibs_check_method == "file_magic".
1486+# Command to use when deplibs_check_method = "file_magic".
1487 file_magic_cmd=$lt_file_magic_cmd
1488
1489+# How to find potential files when deplibs_check_method = "file_magic".
1490+file_magic_glob=$lt_file_magic_glob
1491+
1492+# Find potential files using nocaseglob when deplibs_check_method = "file_magic".
1493+want_nocaseglob=$lt_want_nocaseglob
1494+
1495+# DLL creation program.
1496+DLLTOOL=$lt_DLLTOOL
1497+
1498+# Command to associate shared and link libraries.
1499+sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd
1500+
1501 # The archiver.
1502 AR=$lt_AR
1503+
1504+# Flags to create an archive.
1505 AR_FLAGS=$lt_AR_FLAGS
1506
1507+# How to feed a file listing to the archiver.
1508+archiver_list_spec=$lt_archiver_list_spec
1509+
1510 # A symbol stripping program.
1511 STRIP=$lt_STRIP
1512
1513@@ -18299,6 +18995,12 @@ global_symbol_to_c_name_address=$lt_lt_c
1514 # Transform the output of nm in a C name address pair when lib prefix is needed.
1515 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
1516
1517+# Specify filename containing input files for \$NM.
1518+nm_file_list_spec=$lt_nm_file_list_spec
1519+
1520+# The root where to search for dependent libraries,and in which our libraries should be installed.
1521+lt_sysroot=$lt_sysroot
1522+
1523 # The name of the directory that contains temporary libtool files.
1524 objdir=$objdir
1525
1526@@ -18308,6 +19010,9 @@ MAGIC_CMD=$MAGIC_CMD
1527 # Must we lock files when doing compilation?
1528 need_locks=$lt_need_locks
1529
1530+# Manifest tool.
1531+MANIFEST_TOOL=$lt_MANIFEST_TOOL
1532+
1533 # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
1534 DSYMUTIL=$lt_DSYMUTIL
1535
1536@@ -18422,12 +19127,12 @@ with_gcc=$GCC
1537 # Compiler flag to turn off builtin functions.
1538 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
1539
1540-# How to pass a linker flag through the compiler.
1541-wl=$lt_lt_prog_compiler_wl
1542-
1543 # Additional compiler flags for building library objects.
1544 pic_flag=$lt_lt_prog_compiler_pic
1545
1546+# How to pass a linker flag through the compiler.
1547+wl=$lt_lt_prog_compiler_wl
1548+
1549 # Compiler flag to prevent dynamic linking.
1550 link_static_flag=$lt_lt_prog_compiler_static
1551
1552@@ -18514,9 +19219,6 @@ inherit_rpath=$inherit_rpath
1553 # Whether libtool must link a program against all its dependency libraries.
1554 link_all_deplibs=$link_all_deplibs
1555
1556-# Fix the shell variable \$srcfile for the compiler.
1557-fix_srcfile_path=$lt_fix_srcfile_path
1558-
1559 # Set to "yes" if exported symbols are required.
1560 always_export_symbols=$always_export_symbols
1561
1562@@ -18532,6 +19234,9 @@ include_expsyms=$lt_include_expsyms
1563 # Commands necessary for linking programs (against libraries) with templates.
1564 prelink_cmds=$lt_prelink_cmds
1565
1566+# Commands necessary for finishing linking programs.
1567+postlink_cmds=$lt_postlink_cmds
1568+
1569 # Specify filename containing input files.
1570 file_list_spec=$lt_file_list_spec
1571
1572@@ -18564,210 +19269,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
1573 # if finds mixed CR/LF and LF-only lines. Since sed operates in
1574 # text mode, it properly converts lines to CR/LF. This bash problem
1575 # is reportedly fixed, but why not run on old versions too?
1576- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
1577- || (rm -f "$cfgfile"; exit 1)
1578-
1579- case $xsi_shell in
1580- yes)
1581- cat << \_LT_EOF >> "$cfgfile"
1582-
1583-# func_dirname file append nondir_replacement
1584-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
1585-# otherwise set result to NONDIR_REPLACEMENT.
1586-func_dirname ()
1587-{
1588- case ${1} in
1589- */*) func_dirname_result="${1%/*}${2}" ;;
1590- * ) func_dirname_result="${3}" ;;
1591- esac
1592-}
1593-
1594-# func_basename file
1595-func_basename ()
1596-{
1597- func_basename_result="${1##*/}"
1598-}
1599-
1600-# func_dirname_and_basename file append nondir_replacement
1601-# perform func_basename and func_dirname in a single function
1602-# call:
1603-# dirname: Compute the dirname of FILE. If nonempty,
1604-# add APPEND to the result, otherwise set result
1605-# to NONDIR_REPLACEMENT.
1606-# value returned in "$func_dirname_result"
1607-# basename: Compute filename of FILE.
1608-# value retuned in "$func_basename_result"
1609-# Implementation must be kept synchronized with func_dirname
1610-# and func_basename. For efficiency, we do not delegate to
1611-# those functions but instead duplicate the functionality here.
1612-func_dirname_and_basename ()
1613-{
1614- case ${1} in
1615- */*) func_dirname_result="${1%/*}${2}" ;;
1616- * ) func_dirname_result="${3}" ;;
1617- esac
1618- func_basename_result="${1##*/}"
1619-}
1620-
1621-# func_stripname prefix suffix name
1622-# strip PREFIX and SUFFIX off of NAME.
1623-# PREFIX and SUFFIX must not contain globbing or regex special
1624-# characters, hashes, percent signs, but SUFFIX may contain a leading
1625-# dot (in which case that matches only a dot).
1626-func_stripname ()
1627-{
1628- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
1629- # positional parameters, so assign one to ordinary parameter first.
1630- func_stripname_result=${3}
1631- func_stripname_result=${func_stripname_result#"${1}"}
1632- func_stripname_result=${func_stripname_result%"${2}"}
1633-}
1634-
1635-# func_opt_split
1636-func_opt_split ()
1637-{
1638- func_opt_split_opt=${1%%=*}
1639- func_opt_split_arg=${1#*=}
1640-}
1641-
1642-# func_lo2o object
1643-func_lo2o ()
1644-{
1645- case ${1} in
1646- *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
1647- *) func_lo2o_result=${1} ;;
1648- esac
1649-}
1650-
1651-# func_xform libobj-or-source
1652-func_xform ()
1653-{
1654- func_xform_result=${1%.*}.lo
1655-}
1656-
1657-# func_arith arithmetic-term...
1658-func_arith ()
1659-{
1660- func_arith_result=$(( $* ))
1661-}
1662-
1663-# func_len string
1664-# STRING may not start with a hyphen.
1665-func_len ()
1666-{
1667- func_len_result=${#1}
1668-}
1669-
1670-_LT_EOF
1671- ;;
1672- *) # Bourne compatible functions.
1673- cat << \_LT_EOF >> "$cfgfile"
1674-
1675-# func_dirname file append nondir_replacement
1676-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
1677-# otherwise set result to NONDIR_REPLACEMENT.
1678-func_dirname ()
1679-{
1680- # Extract subdirectory from the argument.
1681- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
1682- if test "X$func_dirname_result" = "X${1}"; then
1683- func_dirname_result="${3}"
1684- else
1685- func_dirname_result="$func_dirname_result${2}"
1686- fi
1687-}
1688-
1689-# func_basename file
1690-func_basename ()
1691-{
1692- func_basename_result=`$ECHO "${1}" | $SED "$basename"`
1693-}
1694-
1695-
1696-# func_stripname prefix suffix name
1697-# strip PREFIX and SUFFIX off of NAME.
1698-# PREFIX and SUFFIX must not contain globbing or regex special
1699-# characters, hashes, percent signs, but SUFFIX may contain a leading
1700-# dot (in which case that matches only a dot).
1701-# func_strip_suffix prefix name
1702-func_stripname ()
1703-{
1704- case ${2} in
1705- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
1706- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
1707- esac
1708-}
1709-
1710-# sed scripts:
1711-my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q'
1712-my_sed_long_arg='1s/^-[^=]*=//'
1713-
1714-# func_opt_split
1715-func_opt_split ()
1716-{
1717- func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"`
1718- func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"`
1719-}
1720-
1721-# func_lo2o object
1722-func_lo2o ()
1723-{
1724- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
1725-}
1726-
1727-# func_xform libobj-or-source
1728-func_xform ()
1729-{
1730- func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`
1731-}
1732-
1733-# func_arith arithmetic-term...
1734-func_arith ()
1735-{
1736- func_arith_result=`expr "$@"`
1737-}
1738-
1739-# func_len string
1740-# STRING may not start with a hyphen.
1741-func_len ()
1742-{
1743- func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len`
1744-}
1745-
1746-_LT_EOF
1747-esac
1748-
1749-case $lt_shell_append in
1750- yes)
1751- cat << \_LT_EOF >> "$cfgfile"
1752-
1753-# func_append var value
1754-# Append VALUE to the end of shell variable VAR.
1755-func_append ()
1756-{
1757- eval "$1+=\$2"
1758-}
1759-_LT_EOF
1760- ;;
1761- *)
1762- cat << \_LT_EOF >> "$cfgfile"
1763-
1764-# func_append var value
1765-# Append VALUE to the end of shell variable VAR.
1766-func_append ()
1767-{
1768- eval "$1=\$$1\$2"
1769-}
1770-
1771-_LT_EOF
1772- ;;
1773- esac
1774+ sed '$q' "$ltmain" >> "$cfgfile" \
1775+ || (rm -f "$cfgfile"; exit 1)
1776
1777+ if test x"$xsi_shell" = xyes; then
1778+ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\
1779+func_dirname ()\
1780+{\
1781+\ case ${1} in\
1782+\ */*) func_dirname_result="${1%/*}${2}" ;;\
1783+\ * ) func_dirname_result="${3}" ;;\
1784+\ esac\
1785+} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \
1786+ && mv -f "$cfgfile.tmp" "$cfgfile" \
1787+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
1788+test 0 -eq $? || _lt_function_replace_fail=:
1789+
1790+
1791+ sed -e '/^func_basename ()$/,/^} # func_basename /c\
1792+func_basename ()\
1793+{\
1794+\ func_basename_result="${1##*/}"\
1795+} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \
1796+ && mv -f "$cfgfile.tmp" "$cfgfile" \
1797+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
1798+test 0 -eq $? || _lt_function_replace_fail=:
1799+
1800+
1801+ sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\
1802+func_dirname_and_basename ()\
1803+{\
1804+\ case ${1} in\
1805+\ */*) func_dirname_result="${1%/*}${2}" ;;\
1806+\ * ) func_dirname_result="${3}" ;;\
1807+\ esac\
1808+\ func_basename_result="${1##*/}"\
1809+} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \
1810+ && mv -f "$cfgfile.tmp" "$cfgfile" \
1811+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
1812+test 0 -eq $? || _lt_function_replace_fail=:
1813+
1814+
1815+ sed -e '/^func_stripname ()$/,/^} # func_stripname /c\
1816+func_stripname ()\
1817+{\
1818+\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\
1819+\ # positional parameters, so assign one to ordinary parameter first.\
1820+\ func_stripname_result=${3}\
1821+\ func_stripname_result=${func_stripname_result#"${1}"}\
1822+\ func_stripname_result=${func_stripname_result%"${2}"}\
1823+} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \
1824+ && mv -f "$cfgfile.tmp" "$cfgfile" \
1825+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
1826+test 0 -eq $? || _lt_function_replace_fail=:
1827+
1828+
1829+ sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\
1830+func_split_long_opt ()\
1831+{\
1832+\ func_split_long_opt_name=${1%%=*}\
1833+\ func_split_long_opt_arg=${1#*=}\
1834+} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \
1835+ && mv -f "$cfgfile.tmp" "$cfgfile" \
1836+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
1837+test 0 -eq $? || _lt_function_replace_fail=:
1838+
1839+
1840+ sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\
1841+func_split_short_opt ()\
1842+{\
1843+\ func_split_short_opt_arg=${1#??}\
1844+\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\
1845+} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \
1846+ && mv -f "$cfgfile.tmp" "$cfgfile" \
1847+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
1848+test 0 -eq $? || _lt_function_replace_fail=:
1849+
1850+
1851+ sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\
1852+func_lo2o ()\
1853+{\
1854+\ case ${1} in\
1855+\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\
1856+\ *) func_lo2o_result=${1} ;;\
1857+\ esac\
1858+} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \
1859+ && mv -f "$cfgfile.tmp" "$cfgfile" \
1860+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
1861+test 0 -eq $? || _lt_function_replace_fail=:
1862+
1863+
1864+ sed -e '/^func_xform ()$/,/^} # func_xform /c\
1865+func_xform ()\
1866+{\
1867+ func_xform_result=${1%.*}.lo\
1868+} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \
1869+ && mv -f "$cfgfile.tmp" "$cfgfile" \
1870+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
1871+test 0 -eq $? || _lt_function_replace_fail=:
1872+
1873+
1874+ sed -e '/^func_arith ()$/,/^} # func_arith /c\
1875+func_arith ()\
1876+{\
1877+ func_arith_result=$(( $* ))\
1878+} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \
1879+ && mv -f "$cfgfile.tmp" "$cfgfile" \
1880+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
1881+test 0 -eq $? || _lt_function_replace_fail=:
1882+
1883+
1884+ sed -e '/^func_len ()$/,/^} # func_len /c\
1885+func_len ()\
1886+{\
1887+ func_len_result=${#1}\
1888+} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \
1889+ && mv -f "$cfgfile.tmp" "$cfgfile" \
1890+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
1891+test 0 -eq $? || _lt_function_replace_fail=:
1892+
1893+fi
1894+
1895+if test x"$lt_shell_append" = xyes; then
1896+ sed -e '/^func_append ()$/,/^} # func_append /c\
1897+func_append ()\
1898+{\
1899+ eval "${1}+=\\${2}"\
1900+} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \
1901+ && mv -f "$cfgfile.tmp" "$cfgfile" \
1902+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
1903+test 0 -eq $? || _lt_function_replace_fail=:
1904+
1905+
1906+ sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\
1907+func_append_quoted ()\
1908+{\
1909+\ func_quote_for_eval "${2}"\
1910+\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\
1911+} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \
1912+ && mv -f "$cfgfile.tmp" "$cfgfile" \
1913+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
1914+test 0 -eq $? || _lt_function_replace_fail=:
1915+
1916+
1917+ # Save a `func_append' function call where possible by direct use of '+='
1918+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
1919+ && mv -f "$cfgfile.tmp" "$cfgfile" \
1920+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
1921+ test 0 -eq $? || _lt_function_replace_fail=:
1922+else
1923+ # Save a `func_append' function call even when '+=' is not available
1924+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
1925+ && mv -f "$cfgfile.tmp" "$cfgfile" \
1926+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
1927+ test 0 -eq $? || _lt_function_replace_fail=:
1928+fi
1929+
1930+if test x"$_lt_function_replace_fail" = x":"; then
1931+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5
1932+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;}
1933+fi
1934
1935- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
1936- || (rm -f "$cfgfile"; exit 1)
1937
1938- mv -f "$cfgfile" "$ofile" ||
1939+ mv -f "$cfgfile" "$ofile" ||
1940 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
1941 chmod +x "$ofile"
1942
1943--- a/bfd/configure.ac
1944+++ b/bfd/configure.ac
1945@@ -290,7 +290,7 @@ changequote(,)dnl
1946 x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'`
1947 changequote([,])dnl
1948 if test -n "$x"; then
1949- SHARED_LIBADD="-L`pwd`/../libiberty/pic -liberty"
1950+ SHARED_LIBADD="`pwd`/../libiberty/pic/libiberty.a"
1951 fi
1952
1953 case "${host}" in
1954--- a/binutils/configure
1955+++ b/binutils/configure
1956@@ -689,8 +689,11 @@ OTOOL
1957 LIPO
1958 NMEDIT
1959 DSYMUTIL
1960+MANIFEST_TOOL
1961 RANLIB
1962+ac_ct_AR
1963 AR
1964+DLLTOOL
1965 OBJDUMP
1966 LN_S
1967 NM
1968@@ -807,6 +810,7 @@ enable_static
1969 with_pic
1970 enable_fast_install
1971 with_gnu_ld
1972+with_libtool_sysroot
1973 enable_libtool_lock
1974 enable_plugins
1975 enable_largefile
1976@@ -1483,6 +1487,8 @@ Optional Packages:
1977 --with-pic try to use only PIC/non-PIC objects [default=use
1978 both]
1979 --with-gnu-ld assume the C compiler uses GNU ld [default=no]
1980+ --with-libtool-sysroot=DIR Search for dependent libraries within DIR
1981+ (or the compiler's sysroot if not specified).
1982 --with-system-zlib use installed libz
1983 --with-gnu-ld assume the C compiler uses GNU ld default=no
1984 --with-libiconv-prefix[=DIR] search for libiconv in DIR/include and DIR/lib
1985@@ -5457,8 +5463,8 @@ esac
1986
1987
1988
1989-macro_version='2.2.7a'
1990-macro_revision='1.3134'
1991+macro_version='2.4'
1992+macro_revision='1.3293'
1993
1994
1995
1996@@ -5498,7 +5504,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
1997 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
1998 $as_echo_n "checking how to print strings... " >&6; }
1999 # Test print first, because it will be a builtin if present.
2000-if test "X`print -r -- -n 2>/dev/null`" = X-n && \
2001+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
2002 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
2003 ECHO='print -r --'
2004 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
2005@@ -6184,8 +6190,8 @@ $as_echo_n "checking whether the shell u
2006 # Try some XSI features
2007 xsi_shell=no
2008 ( _lt_dummy="a/b/c"
2009- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
2010- = c,a/b,, \
2011+ test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
2012+ = c,a/b,b/c, \
2013 && eval 'test $(( 1 + 1 )) -eq 2 \
2014 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
2015 && xsi_shell=yes
2016@@ -6234,6 +6240,80 @@ esac
2017
2018
2019
2020+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5
2021+$as_echo_n "checking how to convert $build file names to $host format... " >&6; }
2022+if ${lt_cv_to_host_file_cmd+:} false; then :
2023+ $as_echo_n "(cached) " >&6
2024+else
2025+ case $host in
2026+ *-*-mingw* )
2027+ case $build in
2028+ *-*-mingw* ) # actually msys
2029+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
2030+ ;;
2031+ *-*-cygwin* )
2032+ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
2033+ ;;
2034+ * ) # otherwise, assume *nix
2035+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
2036+ ;;
2037+ esac
2038+ ;;
2039+ *-*-cygwin* )
2040+ case $build in
2041+ *-*-mingw* ) # actually msys
2042+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
2043+ ;;
2044+ *-*-cygwin* )
2045+ lt_cv_to_host_file_cmd=func_convert_file_noop
2046+ ;;
2047+ * ) # otherwise, assume *nix
2048+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
2049+ ;;
2050+ esac
2051+ ;;
2052+ * ) # unhandled hosts (and "normal" native builds)
2053+ lt_cv_to_host_file_cmd=func_convert_file_noop
2054+ ;;
2055+esac
2056+
2057+fi
2058+
2059+to_host_file_cmd=$lt_cv_to_host_file_cmd
2060+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5
2061+$as_echo "$lt_cv_to_host_file_cmd" >&6; }
2062+
2063+
2064+
2065+
2066+
2067+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5
2068+$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; }
2069+if ${lt_cv_to_tool_file_cmd+:} false; then :
2070+ $as_echo_n "(cached) " >&6
2071+else
2072+ #assume ordinary cross tools, or native build.
2073+lt_cv_to_tool_file_cmd=func_convert_file_noop
2074+case $host in
2075+ *-*-mingw* )
2076+ case $build in
2077+ *-*-mingw* ) # actually msys
2078+ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
2079+ ;;
2080+ esac
2081+ ;;
2082+esac
2083+
2084+fi
2085+
2086+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
2087+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5
2088+$as_echo "$lt_cv_to_tool_file_cmd" >&6; }
2089+
2090+
2091+
2092+
2093+
2094 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
2095 $as_echo_n "checking for $LD option to reload object files... " >&6; }
2096 if ${lt_cv_ld_reload_flag+:} false; then :
2097@@ -6250,6 +6330,11 @@ case $reload_flag in
2098 esac
2099 reload_cmds='$LD$reload_flag -o $output$reload_objs'
2100 case $host_os in
2101+ cygwin* | mingw* | pw32* | cegcc*)
2102+ if test "$GCC" != yes; then
2103+ reload_cmds=false
2104+ fi
2105+ ;;
2106 darwin*)
2107 if test "$GCC" = yes; then
2108 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
2109@@ -6418,7 +6503,8 @@ mingw* | pw32*)
2110 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
2111 lt_cv_file_magic_cmd='func_win32_libid'
2112 else
2113- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
2114+ # Keep this pattern in sync with the one in func_win32_libid.
2115+ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
2116 lt_cv_file_magic_cmd='$OBJDUMP -f'
2117 fi
2118 ;;
2119@@ -6572,6 +6658,21 @@ esac
2120 fi
2121 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
2122 $as_echo "$lt_cv_deplibs_check_method" >&6; }
2123+
2124+file_magic_glob=
2125+want_nocaseglob=no
2126+if test "$build" = "$host"; then
2127+ case $host_os in
2128+ mingw* | pw32*)
2129+ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
2130+ want_nocaseglob=yes
2131+ else
2132+ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"`
2133+ fi
2134+ ;;
2135+ esac
2136+fi
2137+
2138 file_magic_cmd=$lt_cv_file_magic_cmd
2139 deplibs_check_method=$lt_cv_deplibs_check_method
2140 test -z "$deplibs_check_method" && deplibs_check_method=unknown
2141@@ -6587,9 +6688,162 @@ test -z "$deplibs_check_method" && depli
2142
2143
2144
2145+
2146+
2147+
2148+
2149+
2150+
2151+
2152+
2153+
2154+
2155+if test -n "$ac_tool_prefix"; then
2156+ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
2157+set dummy ${ac_tool_prefix}dlltool; ac_word=$2
2158+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
2159+$as_echo_n "checking for $ac_word... " >&6; }
2160+if ${ac_cv_prog_DLLTOOL+:} false; then :
2161+ $as_echo_n "(cached) " >&6
2162+else
2163+ if test -n "$DLLTOOL"; then
2164+ ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
2165+else
2166+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
2167+for as_dir in $PATH
2168+do
2169+ IFS=$as_save_IFS
2170+ test -z "$as_dir" && as_dir=.
2171+ for ac_exec_ext in '' $ac_executable_extensions; do
2172+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
2173+ ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
2174+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
2175+ break 2
2176+ fi
2177+done
2178+ done
2179+IFS=$as_save_IFS
2180+
2181+fi
2182+fi
2183+DLLTOOL=$ac_cv_prog_DLLTOOL
2184+if test -n "$DLLTOOL"; then
2185+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
2186+$as_echo "$DLLTOOL" >&6; }
2187+else
2188+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
2189+$as_echo "no" >&6; }
2190+fi
2191+
2192+
2193+fi
2194+if test -z "$ac_cv_prog_DLLTOOL"; then
2195+ ac_ct_DLLTOOL=$DLLTOOL
2196+ # Extract the first word of "dlltool", so it can be a program name with args.
2197+set dummy dlltool; ac_word=$2
2198+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
2199+$as_echo_n "checking for $ac_word... " >&6; }
2200+if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then :
2201+ $as_echo_n "(cached) " >&6
2202+else
2203+ if test -n "$ac_ct_DLLTOOL"; then
2204+ ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
2205+else
2206+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
2207+for as_dir in $PATH
2208+do
2209+ IFS=$as_save_IFS
2210+ test -z "$as_dir" && as_dir=.
2211+ for ac_exec_ext in '' $ac_executable_extensions; do
2212+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
2213+ ac_cv_prog_ac_ct_DLLTOOL="dlltool"
2214+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
2215+ break 2
2216+ fi
2217+done
2218+ done
2219+IFS=$as_save_IFS
2220+
2221+fi
2222+fi
2223+ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
2224+if test -n "$ac_ct_DLLTOOL"; then
2225+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
2226+$as_echo "$ac_ct_DLLTOOL" >&6; }
2227+else
2228+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
2229+$as_echo "no" >&6; }
2230+fi
2231+
2232+ if test "x$ac_ct_DLLTOOL" = x; then
2233+ DLLTOOL="false"
2234+ else
2235+ case $cross_compiling:$ac_tool_warned in
2236+yes:)
2237+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
2238+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
2239+ac_tool_warned=yes ;;
2240+esac
2241+ DLLTOOL=$ac_ct_DLLTOOL
2242+ fi
2243+else
2244+ DLLTOOL="$ac_cv_prog_DLLTOOL"
2245+fi
2246+
2247+test -z "$DLLTOOL" && DLLTOOL=dlltool
2248+
2249+
2250+
2251+
2252+
2253+
2254+
2255+
2256+
2257+
2258+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5
2259+$as_echo_n "checking how to associate runtime and link libraries... " >&6; }
2260+if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then :
2261+ $as_echo_n "(cached) " >&6
2262+else
2263+ lt_cv_sharedlib_from_linklib_cmd='unknown'
2264+
2265+case $host_os in
2266+cygwin* | mingw* | pw32* | cegcc*)
2267+ # two different shell functions defined in ltmain.sh
2268+ # decide which to use based on capabilities of $DLLTOOL
2269+ case `$DLLTOOL --help 2>&1` in
2270+ *--identify-strict*)
2271+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
2272+ ;;
2273+ *)
2274+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
2275+ ;;
2276+ esac
2277+ ;;
2278+*)
2279+ # fallback: assume linklib IS sharedlib
2280+ lt_cv_sharedlib_from_linklib_cmd="$ECHO"
2281+ ;;
2282+esac
2283+
2284+fi
2285+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5
2286+$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; }
2287+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
2288+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
2289+
2290+
2291+
2292+
2293+
2294+
2295+
2296 if test -n "$ac_tool_prefix"; then
2297- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
2298-set dummy ${ac_tool_prefix}ar; ac_word=$2
2299+ for ac_prog in ar
2300+ do
2301+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
2302+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
2303 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
2304 $as_echo_n "checking for $ac_word... " >&6; }
2305 if ${ac_cv_prog_AR+:} false; then :
2306@@ -6605,7 +6859,7 @@ do
2307 test -z "$as_dir" && as_dir=.
2308 for ac_exec_ext in '' $ac_executable_extensions; do
2309 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
2310- ac_cv_prog_AR="${ac_tool_prefix}ar"
2311+ ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
2312 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
2313 break 2
2314 fi
2315@@ -6625,11 +6879,15 @@ $as_echo "no" >&6; }
2316 fi
2317
2318
2319+ test -n "$AR" && break
2320+ done
2321 fi
2322-if test -z "$ac_cv_prog_AR"; then
2323+if test -z "$AR"; then
2324 ac_ct_AR=$AR
2325- # Extract the first word of "ar", so it can be a program name with args.
2326-set dummy ar; ac_word=$2
2327+ for ac_prog in ar
2328+do
2329+ # Extract the first word of "$ac_prog", so it can be a program name with args.
2330+set dummy $ac_prog; ac_word=$2
2331 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
2332 $as_echo_n "checking for $ac_word... " >&6; }
2333 if ${ac_cv_prog_ac_ct_AR+:} false; then :
2334@@ -6645,7 +6903,7 @@ do
2335 test -z "$as_dir" && as_dir=.
2336 for ac_exec_ext in '' $ac_executable_extensions; do
2337 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
2338- ac_cv_prog_ac_ct_AR="ar"
2339+ ac_cv_prog_ac_ct_AR="$ac_prog"
2340 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
2341 break 2
2342 fi
2343@@ -6664,6 +6922,10 @@ else
2344 $as_echo "no" >&6; }
2345 fi
2346
2347+
2348+ test -n "$ac_ct_AR" && break
2349+done
2350+
2351 if test "x$ac_ct_AR" = x; then
2352 AR="false"
2353 else
2354@@ -6675,12 +6937,10 @@ ac_tool_warned=yes ;;
2355 esac
2356 AR=$ac_ct_AR
2357 fi
2358-else
2359- AR="$ac_cv_prog_AR"
2360 fi
2361
2362-test -z "$AR" && AR=ar
2363-test -z "$AR_FLAGS" && AR_FLAGS=cru
2364+: ${AR=ar}
2365+: ${AR_FLAGS=cru}
2366
2367
2368
2369@@ -6692,6 +6952,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru
2370
2371
2372
2373+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
2374+$as_echo_n "checking for archiver @FILE support... " >&6; }
2375+if ${lt_cv_ar_at_file+:} false; then :
2376+ $as_echo_n "(cached) " >&6
2377+else
2378+ lt_cv_ar_at_file=no
2379+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
2380+/* end confdefs.h. */
2381+
2382+int
2383+main ()
2384+{
2385+
2386+ ;
2387+ return 0;
2388+}
2389+_ACEOF
2390+if ac_fn_c_try_compile "$LINENO"; then :
2391+ echo conftest.$ac_objext > conftest.lst
2392+ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5'
2393+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
2394+ (eval $lt_ar_try) 2>&5
2395+ ac_status=$?
2396+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
2397+ test $ac_status = 0; }
2398+ if test "$ac_status" -eq 0; then
2399+ # Ensure the archiver fails upon bogus file names.
2400+ rm -f conftest.$ac_objext libconftest.a
2401+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
2402+ (eval $lt_ar_try) 2>&5
2403+ ac_status=$?
2404+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
2405+ test $ac_status = 0; }
2406+ if test "$ac_status" -ne 0; then
2407+ lt_cv_ar_at_file=@
2408+ fi
2409+ fi
2410+ rm -f conftest.* libconftest.a
2411+
2412+fi
2413+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
2414+
2415+fi
2416+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
2417+$as_echo "$lt_cv_ar_at_file" >&6; }
2418+
2419+if test "x$lt_cv_ar_at_file" = xno; then
2420+ archiver_list_spec=
2421+else
2422+ archiver_list_spec=$lt_cv_ar_at_file
2423+fi
2424+
2425+
2426+
2427+
2428+
2429+
2430+
2431 if test -n "$ac_tool_prefix"; then
2432 # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
2433 set dummy ${ac_tool_prefix}strip; ac_word=$2
2434@@ -7026,8 +7344,8 @@ esac
2435 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
2436
2437 # Transform an extracted symbol line into symbol name and symbol address
2438-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
2439-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'"
2440+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
2441+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'"
2442
2443 # Handle CRLF in mingw tool chain
2444 opt_cr=
2445@@ -7063,6 +7381,7 @@ for ac_symprfx in "" "_"; do
2446 else
2447 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
2448 fi
2449+ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
2450
2451 # Check to see that the pipe works correctly.
2452 pipe_works=no
2453@@ -7104,6 +7423,18 @@ _LT_EOF
2454 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
2455 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
2456 cat <<_LT_EOF > conftest.$ac_ext
2457+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */
2458+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
2459+/* DATA imports from DLLs on WIN32 con't be const, because runtime
2460+ relocations are performed -- see ld's documentation on pseudo-relocs. */
2461+# define LT_DLSYM_CONST
2462+#elif defined(__osf__)
2463+/* This system does not cope well with relocations in const data. */
2464+# define LT_DLSYM_CONST
2465+#else
2466+# define LT_DLSYM_CONST const
2467+#endif
2468+
2469 #ifdef __cplusplus
2470 extern "C" {
2471 #endif
2472@@ -7115,7 +7446,7 @@ _LT_EOF
2473 cat <<_LT_EOF >> conftest.$ac_ext
2474
2475 /* The mapping between symbol names and symbols. */
2476-const struct {
2477+LT_DLSYM_CONST struct {
2478 const char *name;
2479 void *address;
2480 }
2481@@ -7141,8 +7472,8 @@ static const void *lt_preloaded_setup()
2482 _LT_EOF
2483 # Now try linking the two files.
2484 mv conftest.$ac_objext conftstm.$ac_objext
2485- lt_save_LIBS="$LIBS"
2486- lt_save_CFLAGS="$CFLAGS"
2487+ lt_globsym_save_LIBS=$LIBS
2488+ lt_globsym_save_CFLAGS=$CFLAGS
2489 LIBS="conftstm.$ac_objext"
2490 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
2491 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
2492@@ -7152,8 +7483,8 @@ _LT_EOF
2493 test $ac_status = 0; } && test -s conftest${ac_exeext}; then
2494 pipe_works=yes
2495 fi
2496- LIBS="$lt_save_LIBS"
2497- CFLAGS="$lt_save_CFLAGS"
2498+ LIBS=$lt_globsym_save_LIBS
2499+ CFLAGS=$lt_globsym_save_CFLAGS
2500 else
2501 echo "cannot find nm_test_func in $nlist" >&5
2502 fi
2503@@ -7190,6 +7521,18 @@ else
2504 $as_echo "ok" >&6; }
2505 fi
2506
2507+# Response file support.
2508+if test "$lt_cv_nm_interface" = "MS dumpbin"; then
2509+ nm_file_list_spec='@'
2510+elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then
2511+ nm_file_list_spec='@'
2512+fi
2513+
2514+
2515+
2516+
2517+
2518+
2519
2520
2521
2522@@ -7211,6 +7554,43 @@ fi
2523
2524
2525
2526+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
2527+$as_echo_n "checking for sysroot... " >&6; }
2528+
2529+# Check whether --with-libtool-sysroot was given.
2530+if test "${with_libtool_sysroot+set}" = set; then :
2531+ withval=$with_libtool_sysroot;
2532+else
2533+ with_libtool_sysroot=no
2534+fi
2535+
2536+
2537+lt_sysroot=
2538+case ${with_libtool_sysroot} in #(
2539+ yes)
2540+ if test "$GCC" = yes; then
2541+ lt_sysroot=`$CC --print-sysroot 2>/dev/null`
2542+ fi
2543+ ;; #(
2544+ /*)
2545+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"`
2546+ ;; #(
2547+ no|'')
2548+ ;; #(
2549+ *)
2550+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5
2551+$as_echo "${with_libtool_sysroot}" >&6; }
2552+ as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5
2553+ ;;
2554+esac
2555+
2556+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
2557+$as_echo "${lt_sysroot:-no}" >&6; }
2558+
2559+
2560+
2561+
2562+
2563 # Check whether --enable-libtool-lock was given.
2564 if test "${enable_libtool_lock+set}" = set; then :
2565 enableval=$enable_libtool_lock;
2566@@ -7417,6 +7797,123 @@ esac
2567
2568 need_locks="$enable_libtool_lock"
2569
2570+if test -n "$ac_tool_prefix"; then
2571+ # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args.
2572+set dummy ${ac_tool_prefix}mt; ac_word=$2
2573+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
2574+$as_echo_n "checking for $ac_word... " >&6; }
2575+if ${ac_cv_prog_MANIFEST_TOOL+:} false; then :
2576+ $as_echo_n "(cached) " >&6
2577+else
2578+ if test -n "$MANIFEST_TOOL"; then
2579+ ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test.
2580+else
2581+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
2582+for as_dir in $PATH
2583+do
2584+ IFS=$as_save_IFS
2585+ test -z "$as_dir" && as_dir=.
2586+ for ac_exec_ext in '' $ac_executable_extensions; do
2587+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
2588+ ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
2589+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
2590+ break 2
2591+ fi
2592+done
2593+ done
2594+IFS=$as_save_IFS
2595+
2596+fi
2597+fi
2598+MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL
2599+if test -n "$MANIFEST_TOOL"; then
2600+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5
2601+$as_echo "$MANIFEST_TOOL" >&6; }
2602+else
2603+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
2604+$as_echo "no" >&6; }
2605+fi
2606+
2607+
2608+fi
2609+if test -z "$ac_cv_prog_MANIFEST_TOOL"; then
2610+ ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL
2611+ # Extract the first word of "mt", so it can be a program name with args.
2612+set dummy mt; ac_word=$2
2613+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
2614+$as_echo_n "checking for $ac_word... " >&6; }
2615+if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then :
2616+ $as_echo_n "(cached) " >&6
2617+else
2618+ if test -n "$ac_ct_MANIFEST_TOOL"; then
2619+ ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test.
2620+else
2621+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
2622+for as_dir in $PATH
2623+do
2624+ IFS=$as_save_IFS
2625+ test -z "$as_dir" && as_dir=.
2626+ for ac_exec_ext in '' $ac_executable_extensions; do
2627+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
2628+ ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
2629+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
2630+ break 2
2631+ fi
2632+done
2633+ done
2634+IFS=$as_save_IFS
2635+
2636+fi
2637+fi
2638+ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL
2639+if test -n "$ac_ct_MANIFEST_TOOL"; then
2640+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5
2641+$as_echo "$ac_ct_MANIFEST_TOOL" >&6; }
2642+else
2643+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
2644+$as_echo "no" >&6; }
2645+fi
2646+
2647+ if test "x$ac_ct_MANIFEST_TOOL" = x; then
2648+ MANIFEST_TOOL=":"
2649+ else
2650+ case $cross_compiling:$ac_tool_warned in
2651+yes:)
2652+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
2653+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
2654+ac_tool_warned=yes ;;
2655+esac
2656+ MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL
2657+ fi
2658+else
2659+ MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL"
2660+fi
2661+
2662+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
2663+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5
2664+$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; }
2665+if ${lt_cv_path_mainfest_tool+:} false; then :
2666+ $as_echo_n "(cached) " >&6
2667+else
2668+ lt_cv_path_mainfest_tool=no
2669+ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5
2670+ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
2671+ cat conftest.err >&5
2672+ if $GREP 'Manifest Tool' conftest.out > /dev/null; then
2673+ lt_cv_path_mainfest_tool=yes
2674+ fi
2675+ rm -f conftest*
2676+fi
2677+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5
2678+$as_echo "$lt_cv_path_mainfest_tool" >&6; }
2679+if test "x$lt_cv_path_mainfest_tool" != xyes; then
2680+ MANIFEST_TOOL=:
2681+fi
2682+
2683+
2684+
2685+
2686+
2687
2688 case $host_os in
2689 rhapsody* | darwin*)
2690@@ -7980,6 +8477,8 @@ _LT_EOF
2691 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
2692 echo "$AR cru libconftest.a conftest.o" >&5
2693 $AR cru libconftest.a conftest.o 2>&5
2694+ echo "$RANLIB libconftest.a" >&5
2695+ $RANLIB libconftest.a 2>&5
2696 cat > conftest.c << _LT_EOF
2697 int main() { return 0;}
2698 _LT_EOF
2699@@ -8175,7 +8674,8 @@ fi
2700 LIBTOOL_DEPS="$ltmain"
2701
2702 # Always use our own libtool.
2703-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
2704+LIBTOOL='$(SHELL) $(top_builddir)'
2705+LIBTOOL="$LIBTOOL/${host_alias}-libtool"
2706
2707
2708
2709@@ -8264,7 +8764,7 @@ aix3*)
2710 esac
2711
2712 # Global variables:
2713-ofile=libtool
2714+ofile=${host_alias}-libtool
2715 can_build_shared=yes
2716
2717 # All known linkers require a `.a' archive for static linking (except MSVC,
2718@@ -8562,8 +9062,6 @@ fi
2719 lt_prog_compiler_pic=
2720 lt_prog_compiler_static=
2721
2722-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
2723-$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
2724
2725 if test "$GCC" = yes; then
2726 lt_prog_compiler_wl='-Wl,'
2727@@ -8729,6 +9227,12 @@ $as_echo_n "checking for $compiler optio
2728 lt_prog_compiler_pic='--shared'
2729 lt_prog_compiler_static='--static'
2730 ;;
2731+ nagfor*)
2732+ # NAG Fortran compiler
2733+ lt_prog_compiler_wl='-Wl,-Wl,,'
2734+ lt_prog_compiler_pic='-PIC'
2735+ lt_prog_compiler_static='-Bstatic'
2736+ ;;
2737 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
2738 # Portland Group compilers (*not* the Pentium gcc compiler,
2739 # which looks to be a dead project)
2740@@ -8791,7 +9295,7 @@ $as_echo_n "checking for $compiler optio
2741 lt_prog_compiler_pic='-KPIC'
2742 lt_prog_compiler_static='-Bstatic'
2743 case $cc_basename in
2744- f77* | f90* | f95*)
2745+ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
2746 lt_prog_compiler_wl='-Qoption ld ';;
2747 *)
2748 lt_prog_compiler_wl='-Wl,';;
2749@@ -8848,13 +9352,17 @@ case $host_os in
2750 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
2751 ;;
2752 esac
2753-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5
2754-$as_echo "$lt_prog_compiler_pic" >&6; }
2755-
2756-
2757-
2758-
2759
2760+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
2761+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
2762+if ${lt_cv_prog_compiler_pic+:} false; then :
2763+ $as_echo_n "(cached) " >&6
2764+else
2765+ lt_cv_prog_compiler_pic=$lt_prog_compiler_pic
2766+fi
2767+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
2768+$as_echo "$lt_cv_prog_compiler_pic" >&6; }
2769+lt_prog_compiler_pic=$lt_cv_prog_compiler_pic
2770
2771 #
2772 # Check to make sure the PIC flag actually works.
2773@@ -8915,6 +9423,11 @@ fi
2774
2775
2776
2777+
2778+
2779+
2780+
2781+
2782 #
2783 # Check to make sure the static flag actually works.
2784 #
2785@@ -9265,7 +9778,8 @@ _LT_EOF
2786 allow_undefined_flag=unsupported
2787 always_export_symbols=no
2788 enable_shared_with_static_runtimes=yes
2789- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
2790+ 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'
2791+ exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
2792
2793 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
2794 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
2795@@ -9364,12 +9878,12 @@ _LT_EOF
2796 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
2797 hardcode_libdir_flag_spec=
2798 hardcode_libdir_flag_spec_ld='-rpath $libdir'
2799- archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
2800+ archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
2801 if test "x$supports_anon_versioning" = xyes; then
2802 archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
2803 cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
2804 echo "local: *; };" >> $output_objdir/$libname.ver~
2805- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
2806+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
2807 fi
2808 ;;
2809 esac
2810@@ -9383,8 +9897,8 @@ _LT_EOF
2811 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
2812 wlarc=
2813 else
2814- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
2815- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
2816+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
2817+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
2818 fi
2819 ;;
2820
2821@@ -9402,8 +9916,8 @@ _LT_EOF
2822
2823 _LT_EOF
2824 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
2825- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
2826- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
2827+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
2828+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
2829 else
2830 ld_shlibs=no
2831 fi
2832@@ -9449,8 +9963,8 @@ _LT_EOF
2833
2834 *)
2835 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
2836- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
2837- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
2838+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
2839+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
2840 else
2841 ld_shlibs=no
2842 fi
2843@@ -9580,7 +10094,13 @@ _LT_EOF
2844 allow_undefined_flag='-berok'
2845 # Determine the default libpath from the value encoded in an
2846 # empty executable.
2847- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
2848+ if test "${lt_cv_aix_libpath+set}" = set; then
2849+ aix_libpath=$lt_cv_aix_libpath
2850+else
2851+ if ${lt_cv_aix_libpath_+:} false; then :
2852+ $as_echo_n "(cached) " >&6
2853+else
2854+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
2855 /* end confdefs.h. */
2856
2857 int
2858@@ -9593,22 +10113,29 @@ main ()
2859 _ACEOF
2860 if ac_fn_c_try_link "$LINENO"; then :
2861
2862-lt_aix_libpath_sed='
2863- /Import File Strings/,/^$/ {
2864- /^0/ {
2865- s/^0 *\(.*\)$/\1/
2866- p
2867- }
2868- }'
2869-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
2870-# Check for a 64-bit object if we didn't find anything.
2871-if test -z "$aix_libpath"; then
2872- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
2873-fi
2874+ lt_aix_libpath_sed='
2875+ /Import File Strings/,/^$/ {
2876+ /^0/ {
2877+ s/^0 *\([^ ]*\) *$/\1/
2878+ p
2879+ }
2880+ }'
2881+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
2882+ # Check for a 64-bit object if we didn't find anything.
2883+ if test -z "$lt_cv_aix_libpath_"; then
2884+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
2885+ fi
2886 fi
2887 rm -f core conftest.err conftest.$ac_objext \
2888 conftest$ac_exeext conftest.$ac_ext
2889-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
2890+ if test -z "$lt_cv_aix_libpath_"; then
2891+ lt_cv_aix_libpath_="/usr/lib:/lib"
2892+ fi
2893+
2894+fi
2895+
2896+ aix_libpath=$lt_cv_aix_libpath_
2897+fi
2898
2899 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
2900 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"
2901@@ -9620,7 +10147,13 @@ if test -z "$aix_libpath"; then aix_libp
2902 else
2903 # Determine the default libpath from the value encoded in an
2904 # empty executable.
2905- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
2906+ if test "${lt_cv_aix_libpath+set}" = set; then
2907+ aix_libpath=$lt_cv_aix_libpath
2908+else
2909+ if ${lt_cv_aix_libpath_+:} false; then :
2910+ $as_echo_n "(cached) " >&6
2911+else
2912+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
2913 /* end confdefs.h. */
2914
2915 int
2916@@ -9633,22 +10166,29 @@ main ()
2917 _ACEOF
2918 if ac_fn_c_try_link "$LINENO"; then :
2919
2920-lt_aix_libpath_sed='
2921- /Import File Strings/,/^$/ {
2922- /^0/ {
2923- s/^0 *\(.*\)$/\1/
2924- p
2925- }
2926- }'
2927-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
2928-# Check for a 64-bit object if we didn't find anything.
2929-if test -z "$aix_libpath"; then
2930- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
2931-fi
2932+ lt_aix_libpath_sed='
2933+ /Import File Strings/,/^$/ {
2934+ /^0/ {
2935+ s/^0 *\([^ ]*\) *$/\1/
2936+ p
2937+ }
2938+ }'
2939+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
2940+ # Check for a 64-bit object if we didn't find anything.
2941+ if test -z "$lt_cv_aix_libpath_"; then
2942+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
2943+ fi
2944 fi
2945 rm -f core conftest.err conftest.$ac_objext \
2946 conftest$ac_exeext conftest.$ac_ext
2947-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
2948+ if test -z "$lt_cv_aix_libpath_"; then
2949+ lt_cv_aix_libpath_="/usr/lib:/lib"
2950+ fi
2951+
2952+fi
2953+
2954+ aix_libpath=$lt_cv_aix_libpath_
2955+fi
2956
2957 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
2958 # Warning - without using the other run time loading flags,
2959@@ -9693,20 +10233,63 @@ if test -z "$aix_libpath"; then aix_libp
2960 # Microsoft Visual C++.
2961 # hardcode_libdir_flag_spec is actually meaningless, as there is
2962 # no search path for DLLs.
2963- hardcode_libdir_flag_spec=' '
2964- allow_undefined_flag=unsupported
2965- # Tell ltmain to make .lib files, not .a files.
2966- libext=lib
2967- # Tell ltmain to make .dll files, not .so files.
2968- shrext_cmds=".dll"
2969- # FIXME: Setting linknames here is a bad hack.
2970- archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
2971- # The linker will automatically build a .lib file if we build a DLL.
2972- old_archive_from_new_cmds='true'
2973- # FIXME: Should let the user specify the lib program.
2974- old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
2975- fix_srcfile_path='`cygpath -w "$srcfile"`'
2976- enable_shared_with_static_runtimes=yes
2977+ case $cc_basename in
2978+ cl*)
2979+ # Native MSVC
2980+ hardcode_libdir_flag_spec=' '
2981+ allow_undefined_flag=unsupported
2982+ always_export_symbols=yes
2983+ file_list_spec='@'
2984+ # Tell ltmain to make .lib files, not .a files.
2985+ libext=lib
2986+ # Tell ltmain to make .dll files, not .so files.
2987+ shrext_cmds=".dll"
2988+ # FIXME: Setting linknames here is a bad hack.
2989+ archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
2990+ archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
2991+ sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
2992+ else
2993+ sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
2994+ fi~
2995+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
2996+ linknames='
2997+ # The linker will not automatically build a static lib if we build a DLL.
2998+ # _LT_TAGVAR(old_archive_from_new_cmds, )='true'
2999+ enable_shared_with_static_runtimes=yes
3000+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
3001+ # Don't use ranlib
3002+ old_postinstall_cmds='chmod 644 $oldlib'
3003+ postlink_cmds='lt_outputfile="@OUTPUT@"~
3004+ lt_tool_outputfile="@TOOL_OUTPUT@"~
3005+ case $lt_outputfile in
3006+ *.exe|*.EXE) ;;
3007+ *)
3008+ lt_outputfile="$lt_outputfile.exe"
3009+ lt_tool_outputfile="$lt_tool_outputfile.exe"
3010+ ;;
3011+ esac~
3012+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
3013+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
3014+ $RM "$lt_outputfile.manifest";
3015+ fi'
3016+ ;;
3017+ *)
3018+ # Assume MSVC wrapper
3019+ hardcode_libdir_flag_spec=' '
3020+ allow_undefined_flag=unsupported
3021+ # Tell ltmain to make .lib files, not .a files.
3022+ libext=lib
3023+ # Tell ltmain to make .dll files, not .so files.
3024+ shrext_cmds=".dll"
3025+ # FIXME: Setting linknames here is a bad hack.
3026+ archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
3027+ # The linker will automatically build a .lib file if we build a DLL.
3028+ old_archive_from_new_cmds='true'
3029+ # FIXME: Should let the user specify the lib program.
3030+ old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
3031+ enable_shared_with_static_runtimes=yes
3032+ ;;
3033+ esac
3034 ;;
3035
3036 darwin* | rhapsody*)
3037@@ -9767,7 +10350,7 @@ if test -z "$aix_libpath"; then aix_libp
3038
3039 # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
3040 freebsd* | dragonfly*)
3041- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
3042+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
3043 hardcode_libdir_flag_spec='-R$libdir'
3044 hardcode_direct=yes
3045 hardcode_shlibpath_var=no
3046@@ -9775,7 +10358,7 @@ if test -z "$aix_libpath"; then aix_libp
3047
3048 hpux9*)
3049 if test "$GCC" = yes; then
3050- 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'
3051+ 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'
3052 else
3053 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'
3054 fi
3055@@ -9791,7 +10374,7 @@ if test -z "$aix_libpath"; then aix_libp
3056
3057 hpux10*)
3058 if test "$GCC" = yes && test "$with_gnu_ld" = no; then
3059- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
3060+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
3061 else
3062 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
3063 fi
3064@@ -9815,10 +10398,10 @@ if test -z "$aix_libpath"; then aix_libp
3065 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
3066 ;;
3067 ia64*)
3068- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
3069+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
3070 ;;
3071 *)
3072- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
3073+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
3074 ;;
3075 esac
3076 else
3077@@ -9897,23 +10480,36 @@ fi
3078
3079 irix5* | irix6* | nonstopux*)
3080 if test "$GCC" = yes; then
3081- 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'
3082+ 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'
3083 # Try to use the -exported_symbol ld option, if it does not
3084 # work, assume that -exports_file does not work either and
3085 # implicitly export all symbols.
3086- save_LDFLAGS="$LDFLAGS"
3087- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
3088- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
3089+ # This should be the same for all languages, so no per-tag cache variable.
3090+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5
3091+$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; }
3092+if ${lt_cv_irix_exported_symbol+:} false; then :
3093+ $as_echo_n "(cached) " >&6
3094+else
3095+ save_LDFLAGS="$LDFLAGS"
3096+ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
3097+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
3098 /* end confdefs.h. */
3099-int foo(void) {}
3100+int foo (void) { return 0; }
3101 _ACEOF
3102 if ac_fn_c_try_link "$LINENO"; then :
3103- 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'
3104-
3105+ lt_cv_irix_exported_symbol=yes
3106+else
3107+ lt_cv_irix_exported_symbol=no
3108 fi
3109 rm -f core conftest.err conftest.$ac_objext \
3110 conftest$ac_exeext conftest.$ac_ext
3111- LDFLAGS="$save_LDFLAGS"
3112+ LDFLAGS="$save_LDFLAGS"
3113+fi
3114+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5
3115+$as_echo "$lt_cv_irix_exported_symbol" >&6; }
3116+ if test "$lt_cv_irix_exported_symbol" = yes; then
3117+ 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'
3118+ fi
3119 else
3120 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'
3121 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'
3122@@ -9998,7 +10594,7 @@ rm -f core conftest.err conftest.$ac_obj
3123 osf4* | osf5*) # as osf3* with the addition of -msym flag
3124 if test "$GCC" = yes; then
3125 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
3126- 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'
3127+ 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'
3128 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
3129 else
3130 allow_undefined_flag=' -expect_unresolved \*'
3131@@ -10017,9 +10613,9 @@ rm -f core conftest.err conftest.$ac_obj
3132 no_undefined_flag=' -z defs'
3133 if test "$GCC" = yes; then
3134 wlarc='${wl}'
3135- archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
3136+ archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
3137 archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
3138- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
3139+ $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'
3140 else
3141 case `$CC -V 2>&1` in
3142 *"Compilers 5.0"*)
3143@@ -10595,8 +11191,9 @@ cygwin* | mingw* | pw32* | cegcc*)
3144 need_version=no
3145 need_lib_prefix=no
3146
3147- case $GCC,$host_os in
3148- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
3149+ case $GCC,$cc_basename in
3150+ yes,*)
3151+ # gcc
3152 library_names_spec='$libname.dll.a'
3153 # DLL is installed to $(libdir)/../bin by postinstall_cmds
3154 postinstall_cmds='base_file=`basename \${file}`~
3155@@ -10629,13 +11226,71 @@ cygwin* | mingw* | pw32* | cegcc*)
3156 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
3157 ;;
3158 esac
3159+ dynamic_linker='Win32 ld.exe'
3160+ ;;
3161+
3162+ *,cl*)
3163+ # Native MSVC
3164+ libname_spec='$name'
3165+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
3166+ library_names_spec='${libname}.dll.lib'
3167+
3168+ case $build_os in
3169+ mingw*)
3170+ sys_lib_search_path_spec=
3171+ lt_save_ifs=$IFS
3172+ IFS=';'
3173+ for lt_path in $LIB
3174+ do
3175+ IFS=$lt_save_ifs
3176+ # Let DOS variable expansion print the short 8.3 style file name.
3177+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
3178+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
3179+ done
3180+ IFS=$lt_save_ifs
3181+ # Convert to MSYS style.
3182+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
3183+ ;;
3184+ cygwin*)
3185+ # Convert to unix form, then to dos form, then back to unix form
3186+ # but this time dos style (no spaces!) so that the unix form looks
3187+ # like /cygdrive/c/PROGRA~1:/cygdr...
3188+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
3189+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
3190+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
3191+ ;;
3192+ *)
3193+ sys_lib_search_path_spec="$LIB"
3194+ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
3195+ # It is most probably a Windows format PATH.
3196+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
3197+ else
3198+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
3199+ fi
3200+ # FIXME: find the short name or the path components, as spaces are
3201+ # common. (e.g. "Program Files" -> "PROGRA~1")
3202+ ;;
3203+ esac
3204+
3205+ # DLL is installed to $(libdir)/../bin by postinstall_cmds
3206+ postinstall_cmds='base_file=`basename \${file}`~
3207+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
3208+ dldir=$destdir/`dirname \$dlpath`~
3209+ test -d \$dldir || mkdir -p \$dldir~
3210+ $install_prog $dir/$dlname \$dldir/$dlname'
3211+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
3212+ dlpath=$dir/\$dldll~
3213+ $RM \$dlpath'
3214+ shlibpath_overrides_runpath=yes
3215+ dynamic_linker='Win32 link.exe'
3216 ;;
3217
3218 *)
3219+ # Assume MSVC wrapper
3220 library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
3221+ dynamic_linker='Win32 ld.exe'
3222 ;;
3223 esac
3224- dynamic_linker='Win32 ld.exe'
3225 # FIXME: first we should search . and the directory the executable is in
3226 shlibpath_var=PATH
3227 ;;
3228@@ -10727,7 +11382,7 @@ haiku*)
3229 soname_spec='${libname}${release}${shared_ext}$major'
3230 shlibpath_var=LIBRARY_PATH
3231 shlibpath_overrides_runpath=yes
3232- sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib'
3233+ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
3234 hardcode_into_libs=yes
3235 ;;
3236
3237@@ -11523,7 +12178,7 @@ else
3238 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
3239 lt_status=$lt_dlunknown
3240 cat > conftest.$ac_ext <<_LT_EOF
3241-#line 11526 "configure"
3242+#line $LINENO "configure"
3243 #include "confdefs.h"
3244
3245 #if HAVE_DLFCN_H
3246@@ -11567,10 +12222,10 @@ else
3247 /* When -fvisbility=hidden is used, assume the code has been annotated
3248 correspondingly for the symbols needed. */
3249 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
3250-void fnord () __attribute__((visibility("default")));
3251+int fnord () __attribute__((visibility("default")));
3252 #endif
3253
3254-void fnord () { int i=42; }
3255+int fnord () { return 42; }
3256 int main ()
3257 {
3258 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
3259@@ -11629,7 +12284,7 @@ else
3260 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
3261 lt_status=$lt_dlunknown
3262 cat > conftest.$ac_ext <<_LT_EOF
3263-#line 11632 "configure"
3264+#line $LINENO "configure"
3265 #include "confdefs.h"
3266
3267 #if HAVE_DLFCN_H
3268@@ -11673,10 +12328,10 @@ else
3269 /* When -fvisbility=hidden is used, assume the code has been annotated
3270 correspondingly for the symbols needed. */
3271 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
3272-void fnord () __attribute__((visibility("default")));
3273+int fnord () __attribute__((visibility("default")));
3274 #endif
3275
3276-void fnord () { int i=42; }
3277+int fnord () { return 42; }
3278 int main ()
3279 {
3280 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
3281@@ -15936,13 +16591,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_
3282 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
3283 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
3284 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
3285+lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`'
3286+lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`'
3287 reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
3288 reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
3289 OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
3290 deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`'
3291 file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`'
3292+file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`'
3293+want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`'
3294+DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`'
3295+sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`'
3296 AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`'
3297 AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`'
3298+archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`'
3299 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
3300 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
3301 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
3302@@ -15957,14 +16619,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$l
3303 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
3304 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
3305 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"`'
3306+nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`'
3307+lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`'
3308 objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`'
3309 MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`'
3310 lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`'
3311-lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
3312 lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`'
3313+lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
3314 lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`'
3315 lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`'
3316 need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`'
3317+MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`'
3318 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
3319 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
3320 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
3321@@ -15997,12 +16662,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcod
3322 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
3323 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
3324 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
3325-fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`'
3326 always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`'
3327 export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`'
3328 exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`'
3329 include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`'
3330 prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`'
3331+postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`'
3332 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
3333 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
3334 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
3335@@ -16057,8 +16722,13 @@ reload_flag \
3336 OBJDUMP \
3337 deplibs_check_method \
3338 file_magic_cmd \
3339+file_magic_glob \
3340+want_nocaseglob \
3341+DLLTOOL \
3342+sharedlib_from_linklib_cmd \
3343 AR \
3344 AR_FLAGS \
3345+archiver_list_spec \
3346 STRIP \
3347 RANLIB \
3348 CC \
3349@@ -16068,12 +16738,14 @@ lt_cv_sys_global_symbol_pipe \
3350 lt_cv_sys_global_symbol_to_cdecl \
3351 lt_cv_sys_global_symbol_to_c_name_address \
3352 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
3353+nm_file_list_spec \
3354 lt_prog_compiler_no_builtin_flag \
3355-lt_prog_compiler_wl \
3356 lt_prog_compiler_pic \
3357+lt_prog_compiler_wl \
3358 lt_prog_compiler_static \
3359 lt_cv_prog_compiler_c_o \
3360 need_locks \
3361+MANIFEST_TOOL \
3362 DSYMUTIL \
3363 NMEDIT \
3364 LIPO \
3365@@ -16089,7 +16761,6 @@ no_undefined_flag \
3366 hardcode_libdir_flag_spec \
3367 hardcode_libdir_flag_spec_ld \
3368 hardcode_libdir_separator \
3369-fix_srcfile_path \
3370 exclude_expsyms \
3371 include_expsyms \
3372 file_list_spec \
3373@@ -16125,6 +16796,7 @@ module_cmds \
3374 module_expsym_cmds \
3375 export_symbols_cmds \
3376 prelink_cmds \
3377+postlink_cmds \
3378 postinstall_cmds \
3379 postuninstall_cmds \
3380 finish_cmds \
3381@@ -16891,7 +17563,8 @@ $as_echo X"$file" |
3382 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
3383 #
3384 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
3385-# 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
3386+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
3387+# Inc.
3388 # Written by Gordon Matzigkeit, 1996
3389 #
3390 # This file is part of GNU Libtool.
3391@@ -16994,19 +17667,42 @@ SP2NL=$lt_lt_SP2NL
3392 # turn newlines into spaces.
3393 NL2SP=$lt_lt_NL2SP
3394
3395+# convert \$build file names to \$host format.
3396+to_host_file_cmd=$lt_cv_to_host_file_cmd
3397+
3398+# convert \$build files to toolchain format.
3399+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
3400+
3401 # An object symbol dumper.
3402 OBJDUMP=$lt_OBJDUMP
3403
3404 # Method to check whether dependent libraries are shared objects.
3405 deplibs_check_method=$lt_deplibs_check_method
3406
3407-# Command to use when deplibs_check_method == "file_magic".
3408+# Command to use when deplibs_check_method = "file_magic".
3409 file_magic_cmd=$lt_file_magic_cmd
3410
3411+# How to find potential files when deplibs_check_method = "file_magic".
3412+file_magic_glob=$lt_file_magic_glob
3413+
3414+# Find potential files using nocaseglob when deplibs_check_method = "file_magic".
3415+want_nocaseglob=$lt_want_nocaseglob
3416+
3417+# DLL creation program.
3418+DLLTOOL=$lt_DLLTOOL
3419+
3420+# Command to associate shared and link libraries.
3421+sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd
3422+
3423 # The archiver.
3424 AR=$lt_AR
3425+
3426+# Flags to create an archive.
3427 AR_FLAGS=$lt_AR_FLAGS
3428
3429+# How to feed a file listing to the archiver.
3430+archiver_list_spec=$lt_archiver_list_spec
3431+
3432 # A symbol stripping program.
3433 STRIP=$lt_STRIP
3434
3435@@ -17036,6 +17732,12 @@ global_symbol_to_c_name_address=$lt_lt_c
3436 # Transform the output of nm in a C name address pair when lib prefix is needed.
3437 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
3438
3439+# Specify filename containing input files for \$NM.
3440+nm_file_list_spec=$lt_nm_file_list_spec
3441+
3442+# The root where to search for dependent libraries,and in which our libraries should be installed.
3443+lt_sysroot=$lt_sysroot
3444+
3445 # The name of the directory that contains temporary libtool files.
3446 objdir=$objdir
3447
3448@@ -17045,6 +17747,9 @@ MAGIC_CMD=$MAGIC_CMD
3449 # Must we lock files when doing compilation?
3450 need_locks=$lt_need_locks
3451
3452+# Manifest tool.
3453+MANIFEST_TOOL=$lt_MANIFEST_TOOL
3454+
3455 # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
3456 DSYMUTIL=$lt_DSYMUTIL
3457
3458@@ -17159,12 +17864,12 @@ with_gcc=$GCC
3459 # Compiler flag to turn off builtin functions.
3460 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
3461
3462-# How to pass a linker flag through the compiler.
3463-wl=$lt_lt_prog_compiler_wl
3464-
3465 # Additional compiler flags for building library objects.
3466 pic_flag=$lt_lt_prog_compiler_pic
3467
3468+# How to pass a linker flag through the compiler.
3469+wl=$lt_lt_prog_compiler_wl
3470+
3471 # Compiler flag to prevent dynamic linking.
3472 link_static_flag=$lt_lt_prog_compiler_static
3473
3474@@ -17251,9 +17956,6 @@ inherit_rpath=$inherit_rpath
3475 # Whether libtool must link a program against all its dependency libraries.
3476 link_all_deplibs=$link_all_deplibs
3477
3478-# Fix the shell variable \$srcfile for the compiler.
3479-fix_srcfile_path=$lt_fix_srcfile_path
3480-
3481 # Set to "yes" if exported symbols are required.
3482 always_export_symbols=$always_export_symbols
3483
3484@@ -17269,6 +17971,9 @@ include_expsyms=$lt_include_expsyms
3485 # Commands necessary for linking programs (against libraries) with templates.
3486 prelink_cmds=$lt_prelink_cmds
3487
3488+# Commands necessary for finishing linking programs.
3489+postlink_cmds=$lt_postlink_cmds
3490+
3491 # Specify filename containing input files.
3492 file_list_spec=$lt_file_list_spec
3493
3494@@ -17301,210 +18006,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
3495 # if finds mixed CR/LF and LF-only lines. Since sed operates in
3496 # text mode, it properly converts lines to CR/LF. This bash problem
3497 # is reportedly fixed, but why not run on old versions too?
3498- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
3499- || (rm -f "$cfgfile"; exit 1)
3500-
3501- case $xsi_shell in
3502- yes)
3503- cat << \_LT_EOF >> "$cfgfile"
3504-
3505-# func_dirname file append nondir_replacement
3506-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
3507-# otherwise set result to NONDIR_REPLACEMENT.
3508-func_dirname ()
3509-{
3510- case ${1} in
3511- */*) func_dirname_result="${1%/*}${2}" ;;
3512- * ) func_dirname_result="${3}" ;;
3513- esac
3514-}
3515-
3516-# func_basename file
3517-func_basename ()
3518-{
3519- func_basename_result="${1##*/}"
3520-}
3521-
3522-# func_dirname_and_basename file append nondir_replacement
3523-# perform func_basename and func_dirname in a single function
3524-# call:
3525-# dirname: Compute the dirname of FILE. If nonempty,
3526-# add APPEND to the result, otherwise set result
3527-# to NONDIR_REPLACEMENT.
3528-# value returned in "$func_dirname_result"
3529-# basename: Compute filename of FILE.
3530-# value retuned in "$func_basename_result"
3531-# Implementation must be kept synchronized with func_dirname
3532-# and func_basename. For efficiency, we do not delegate to
3533-# those functions but instead duplicate the functionality here.
3534-func_dirname_and_basename ()
3535-{
3536- case ${1} in
3537- */*) func_dirname_result="${1%/*}${2}" ;;
3538- * ) func_dirname_result="${3}" ;;
3539- esac
3540- func_basename_result="${1##*/}"
3541-}
3542-
3543-# func_stripname prefix suffix name
3544-# strip PREFIX and SUFFIX off of NAME.
3545-# PREFIX and SUFFIX must not contain globbing or regex special
3546-# characters, hashes, percent signs, but SUFFIX may contain a leading
3547-# dot (in which case that matches only a dot).
3548-func_stripname ()
3549-{
3550- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
3551- # positional parameters, so assign one to ordinary parameter first.
3552- func_stripname_result=${3}
3553- func_stripname_result=${func_stripname_result#"${1}"}
3554- func_stripname_result=${func_stripname_result%"${2}"}
3555-}
3556-
3557-# func_opt_split
3558-func_opt_split ()
3559-{
3560- func_opt_split_opt=${1%%=*}
3561- func_opt_split_arg=${1#*=}
3562-}
3563-
3564-# func_lo2o object
3565-func_lo2o ()
3566-{
3567- case ${1} in
3568- *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
3569- *) func_lo2o_result=${1} ;;
3570- esac
3571-}
3572-
3573-# func_xform libobj-or-source
3574-func_xform ()
3575-{
3576- func_xform_result=${1%.*}.lo
3577-}
3578-
3579-# func_arith arithmetic-term...
3580-func_arith ()
3581-{
3582- func_arith_result=$(( $* ))
3583-}
3584-
3585-# func_len string
3586-# STRING may not start with a hyphen.
3587-func_len ()
3588-{
3589- func_len_result=${#1}
3590-}
3591-
3592-_LT_EOF
3593- ;;
3594- *) # Bourne compatible functions.
3595- cat << \_LT_EOF >> "$cfgfile"
3596-
3597-# func_dirname file append nondir_replacement
3598-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
3599-# otherwise set result to NONDIR_REPLACEMENT.
3600-func_dirname ()
3601-{
3602- # Extract subdirectory from the argument.
3603- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
3604- if test "X$func_dirname_result" = "X${1}"; then
3605- func_dirname_result="${3}"
3606- else
3607- func_dirname_result="$func_dirname_result${2}"
3608- fi
3609-}
3610-
3611-# func_basename file
3612-func_basename ()
3613-{
3614- func_basename_result=`$ECHO "${1}" | $SED "$basename"`
3615-}
3616-
3617-
3618-# func_stripname prefix suffix name
3619-# strip PREFIX and SUFFIX off of NAME.
3620-# PREFIX and SUFFIX must not contain globbing or regex special
3621-# characters, hashes, percent signs, but SUFFIX may contain a leading
3622-# dot (in which case that matches only a dot).
3623-# func_strip_suffix prefix name
3624-func_stripname ()
3625-{
3626- case ${2} in
3627- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
3628- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
3629- esac
3630-}
3631-
3632-# sed scripts:
3633-my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q'
3634-my_sed_long_arg='1s/^-[^=]*=//'
3635-
3636-# func_opt_split
3637-func_opt_split ()
3638-{
3639- func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"`
3640- func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"`
3641-}
3642-
3643-# func_lo2o object
3644-func_lo2o ()
3645-{
3646- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
3647-}
3648-
3649-# func_xform libobj-or-source
3650-func_xform ()
3651-{
3652- func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`
3653-}
3654-
3655-# func_arith arithmetic-term...
3656-func_arith ()
3657-{
3658- func_arith_result=`expr "$@"`
3659-}
3660-
3661-# func_len string
3662-# STRING may not start with a hyphen.
3663-func_len ()
3664-{
3665- func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len`
3666-}
3667-
3668-_LT_EOF
3669-esac
3670-
3671-case $lt_shell_append in
3672- yes)
3673- cat << \_LT_EOF >> "$cfgfile"
3674-
3675-# func_append var value
3676-# Append VALUE to the end of shell variable VAR.
3677-func_append ()
3678-{
3679- eval "$1+=\$2"
3680-}
3681-_LT_EOF
3682- ;;
3683- *)
3684- cat << \_LT_EOF >> "$cfgfile"
3685-
3686-# func_append var value
3687-# Append VALUE to the end of shell variable VAR.
3688-func_append ()
3689-{
3690- eval "$1=\$$1\$2"
3691-}
3692-
3693-_LT_EOF
3694- ;;
3695- esac
3696+ sed '$q' "$ltmain" >> "$cfgfile" \
3697+ || (rm -f "$cfgfile"; exit 1)
3698
3699+ if test x"$xsi_shell" = xyes; then
3700+ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\
3701+func_dirname ()\
3702+{\
3703+\ case ${1} in\
3704+\ */*) func_dirname_result="${1%/*}${2}" ;;\
3705+\ * ) func_dirname_result="${3}" ;;\
3706+\ esac\
3707+} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \
3708+ && mv -f "$cfgfile.tmp" "$cfgfile" \
3709+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
3710+test 0 -eq $? || _lt_function_replace_fail=:
3711+
3712+
3713+ sed -e '/^func_basename ()$/,/^} # func_basename /c\
3714+func_basename ()\
3715+{\
3716+\ func_basename_result="${1##*/}"\
3717+} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \
3718+ && mv -f "$cfgfile.tmp" "$cfgfile" \
3719+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
3720+test 0 -eq $? || _lt_function_replace_fail=:
3721+
3722+
3723+ sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\
3724+func_dirname_and_basename ()\
3725+{\
3726+\ case ${1} in\
3727+\ */*) func_dirname_result="${1%/*}${2}" ;;\
3728+\ * ) func_dirname_result="${3}" ;;\
3729+\ esac\
3730+\ func_basename_result="${1##*/}"\
3731+} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \
3732+ && mv -f "$cfgfile.tmp" "$cfgfile" \
3733+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
3734+test 0 -eq $? || _lt_function_replace_fail=:
3735+
3736+
3737+ sed -e '/^func_stripname ()$/,/^} # func_stripname /c\
3738+func_stripname ()\
3739+{\
3740+\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\
3741+\ # positional parameters, so assign one to ordinary parameter first.\
3742+\ func_stripname_result=${3}\
3743+\ func_stripname_result=${func_stripname_result#"${1}"}\
3744+\ func_stripname_result=${func_stripname_result%"${2}"}\
3745+} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \
3746+ && mv -f "$cfgfile.tmp" "$cfgfile" \
3747+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
3748+test 0 -eq $? || _lt_function_replace_fail=:
3749+
3750+
3751+ sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\
3752+func_split_long_opt ()\
3753+{\
3754+\ func_split_long_opt_name=${1%%=*}\
3755+\ func_split_long_opt_arg=${1#*=}\
3756+} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \
3757+ && mv -f "$cfgfile.tmp" "$cfgfile" \
3758+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
3759+test 0 -eq $? || _lt_function_replace_fail=:
3760+
3761+
3762+ sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\
3763+func_split_short_opt ()\
3764+{\
3765+\ func_split_short_opt_arg=${1#??}\
3766+\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\
3767+} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \
3768+ && mv -f "$cfgfile.tmp" "$cfgfile" \
3769+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
3770+test 0 -eq $? || _lt_function_replace_fail=:
3771+
3772+
3773+ sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\
3774+func_lo2o ()\
3775+{\
3776+\ case ${1} in\
3777+\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\
3778+\ *) func_lo2o_result=${1} ;;\
3779+\ esac\
3780+} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \
3781+ && mv -f "$cfgfile.tmp" "$cfgfile" \
3782+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
3783+test 0 -eq $? || _lt_function_replace_fail=:
3784+
3785+
3786+ sed -e '/^func_xform ()$/,/^} # func_xform /c\
3787+func_xform ()\
3788+{\
3789+ func_xform_result=${1%.*}.lo\
3790+} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \
3791+ && mv -f "$cfgfile.tmp" "$cfgfile" \
3792+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
3793+test 0 -eq $? || _lt_function_replace_fail=:
3794+
3795+
3796+ sed -e '/^func_arith ()$/,/^} # func_arith /c\
3797+func_arith ()\
3798+{\
3799+ func_arith_result=$(( $* ))\
3800+} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \
3801+ && mv -f "$cfgfile.tmp" "$cfgfile" \
3802+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
3803+test 0 -eq $? || _lt_function_replace_fail=:
3804+
3805+
3806+ sed -e '/^func_len ()$/,/^} # func_len /c\
3807+func_len ()\
3808+{\
3809+ func_len_result=${#1}\
3810+} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \
3811+ && mv -f "$cfgfile.tmp" "$cfgfile" \
3812+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
3813+test 0 -eq $? || _lt_function_replace_fail=:
3814+
3815+fi
3816+
3817+if test x"$lt_shell_append" = xyes; then
3818+ sed -e '/^func_append ()$/,/^} # func_append /c\
3819+func_append ()\
3820+{\
3821+ eval "${1}+=\\${2}"\
3822+} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \
3823+ && mv -f "$cfgfile.tmp" "$cfgfile" \
3824+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
3825+test 0 -eq $? || _lt_function_replace_fail=:
3826+
3827+
3828+ sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\
3829+func_append_quoted ()\
3830+{\
3831+\ func_quote_for_eval "${2}"\
3832+\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\
3833+} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \
3834+ && mv -f "$cfgfile.tmp" "$cfgfile" \
3835+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
3836+test 0 -eq $? || _lt_function_replace_fail=:
3837+
3838+
3839+ # Save a `func_append' function call where possible by direct use of '+='
3840+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
3841+ && mv -f "$cfgfile.tmp" "$cfgfile" \
3842+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
3843+ test 0 -eq $? || _lt_function_replace_fail=:
3844+else
3845+ # Save a `func_append' function call even when '+=' is not available
3846+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
3847+ && mv -f "$cfgfile.tmp" "$cfgfile" \
3848+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
3849+ test 0 -eq $? || _lt_function_replace_fail=:
3850+fi
3851+
3852+if test x"$_lt_function_replace_fail" = x":"; then
3853+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5
3854+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;}
3855+fi
3856
3857- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
3858- || (rm -f "$cfgfile"; exit 1)
3859
3860- mv -f "$cfgfile" "$ofile" ||
3861+ mv -f "$cfgfile" "$ofile" ||
3862 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
3863 chmod +x "$ofile"
3864
3865--- a/gas/configure
3866+++ b/gas/configure
3867@@ -681,8 +681,11 @@ OTOOL
3868 LIPO
3869 NMEDIT
3870 DSYMUTIL
3871+MANIFEST_TOOL
3872 RANLIB
3873+ac_ct_AR
3874 AR
3875+DLLTOOL
3876 OBJDUMP
3877 LN_S
3878 NM
3879@@ -799,6 +802,7 @@ enable_static
3880 with_pic
3881 enable_fast_install
3882 with_gnu_ld
3883+with_libtool_sysroot
3884 enable_libtool_lock
3885 enable_plugins
3886 enable_largefile
3887@@ -1490,6 +1494,8 @@ Optional Packages:
3888 --with-pic try to use only PIC/non-PIC objects [default=use
3889 both]
3890 --with-gnu-ld assume the C compiler uses GNU ld [default=no]
3891+ --with-libtool-sysroot=DIR Search for dependent libraries within DIR
3892+ (or the compiler's sysroot if not specified).
3893 --with-cpu=CPU default cpu variant is CPU (currently only supported
3894 on ARC)
3895 --with-system-zlib use installed libz
3896@@ -5277,8 +5283,8 @@ esac
3897
3898
3899
3900-macro_version='2.2.7a'
3901-macro_revision='1.3134'
3902+macro_version='2.4'
3903+macro_revision='1.3293'
3904
3905
3906
3907@@ -5318,7 +5324,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
3908 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
3909 $as_echo_n "checking how to print strings... " >&6; }
3910 # Test print first, because it will be a builtin if present.
3911-if test "X`print -r -- -n 2>/dev/null`" = X-n && \
3912+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
3913 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
3914 ECHO='print -r --'
3915 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
3916@@ -6004,8 +6010,8 @@ $as_echo_n "checking whether the shell u
3917 # Try some XSI features
3918 xsi_shell=no
3919 ( _lt_dummy="a/b/c"
3920- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
3921- = c,a/b,, \
3922+ test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
3923+ = c,a/b,b/c, \
3924 && eval 'test $(( 1 + 1 )) -eq 2 \
3925 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
3926 && xsi_shell=yes
3927@@ -6054,6 +6060,80 @@ esac
3928
3929
3930
3931+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5
3932+$as_echo_n "checking how to convert $build file names to $host format... " >&6; }
3933+if ${lt_cv_to_host_file_cmd+:} false; then :
3934+ $as_echo_n "(cached) " >&6
3935+else
3936+ case $host in
3937+ *-*-mingw* )
3938+ case $build in
3939+ *-*-mingw* ) # actually msys
3940+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
3941+ ;;
3942+ *-*-cygwin* )
3943+ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
3944+ ;;
3945+ * ) # otherwise, assume *nix
3946+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
3947+ ;;
3948+ esac
3949+ ;;
3950+ *-*-cygwin* )
3951+ case $build in
3952+ *-*-mingw* ) # actually msys
3953+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
3954+ ;;
3955+ *-*-cygwin* )
3956+ lt_cv_to_host_file_cmd=func_convert_file_noop
3957+ ;;
3958+ * ) # otherwise, assume *nix
3959+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
3960+ ;;
3961+ esac
3962+ ;;
3963+ * ) # unhandled hosts (and "normal" native builds)
3964+ lt_cv_to_host_file_cmd=func_convert_file_noop
3965+ ;;
3966+esac
3967+
3968+fi
3969+
3970+to_host_file_cmd=$lt_cv_to_host_file_cmd
3971+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5
3972+$as_echo "$lt_cv_to_host_file_cmd" >&6; }
3973+
3974+
3975+
3976+
3977+
3978+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5
3979+$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; }
3980+if ${lt_cv_to_tool_file_cmd+:} false; then :
3981+ $as_echo_n "(cached) " >&6
3982+else
3983+ #assume ordinary cross tools, or native build.
3984+lt_cv_to_tool_file_cmd=func_convert_file_noop
3985+case $host in
3986+ *-*-mingw* )
3987+ case $build in
3988+ *-*-mingw* ) # actually msys
3989+ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
3990+ ;;
3991+ esac
3992+ ;;
3993+esac
3994+
3995+fi
3996+
3997+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
3998+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5
3999+$as_echo "$lt_cv_to_tool_file_cmd" >&6; }
4000+
4001+
4002+
4003+
4004+
4005 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
4006 $as_echo_n "checking for $LD option to reload object files... " >&6; }
4007 if ${lt_cv_ld_reload_flag+:} false; then :
4008@@ -6070,6 +6150,11 @@ case $reload_flag in
4009 esac
4010 reload_cmds='$LD$reload_flag -o $output$reload_objs'
4011 case $host_os in
4012+ cygwin* | mingw* | pw32* | cegcc*)
4013+ if test "$GCC" != yes; then
4014+ reload_cmds=false
4015+ fi
4016+ ;;
4017 darwin*)
4018 if test "$GCC" = yes; then
4019 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
4020@@ -6238,7 +6323,8 @@ mingw* | pw32*)
4021 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
4022 lt_cv_file_magic_cmd='func_win32_libid'
4023 else
4024- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
4025+ # Keep this pattern in sync with the one in func_win32_libid.
4026+ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
4027 lt_cv_file_magic_cmd='$OBJDUMP -f'
4028 fi
4029 ;;
4030@@ -6392,6 +6478,21 @@ esac
4031 fi
4032 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
4033 $as_echo "$lt_cv_deplibs_check_method" >&6; }
4034+
4035+file_magic_glob=
4036+want_nocaseglob=no
4037+if test "$build" = "$host"; then
4038+ case $host_os in
4039+ mingw* | pw32*)
4040+ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
4041+ want_nocaseglob=yes
4042+ else
4043+ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"`
4044+ fi
4045+ ;;
4046+ esac
4047+fi
4048+
4049 file_magic_cmd=$lt_cv_file_magic_cmd
4050 deplibs_check_method=$lt_cv_deplibs_check_method
4051 test -z "$deplibs_check_method" && deplibs_check_method=unknown
4052@@ -6407,9 +6508,162 @@ test -z "$deplibs_check_method" && depli
4053
4054
4055
4056+
4057+
4058+
4059+
4060+
4061+
4062+
4063+
4064+
4065+
4066 if test -n "$ac_tool_prefix"; then
4067- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
4068-set dummy ${ac_tool_prefix}ar; ac_word=$2
4069+ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
4070+set dummy ${ac_tool_prefix}dlltool; ac_word=$2
4071+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
4072+$as_echo_n "checking for $ac_word... " >&6; }
4073+if ${ac_cv_prog_DLLTOOL+:} false; then :
4074+ $as_echo_n "(cached) " >&6
4075+else
4076+ if test -n "$DLLTOOL"; then
4077+ ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
4078+else
4079+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
4080+for as_dir in $PATH
4081+do
4082+ IFS=$as_save_IFS
4083+ test -z "$as_dir" && as_dir=.
4084+ for ac_exec_ext in '' $ac_executable_extensions; do
4085+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
4086+ ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
4087+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
4088+ break 2
4089+ fi
4090+done
4091+ done
4092+IFS=$as_save_IFS
4093+
4094+fi
4095+fi
4096+DLLTOOL=$ac_cv_prog_DLLTOOL
4097+if test -n "$DLLTOOL"; then
4098+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
4099+$as_echo "$DLLTOOL" >&6; }
4100+else
4101+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
4102+$as_echo "no" >&6; }
4103+fi
4104+
4105+
4106+fi
4107+if test -z "$ac_cv_prog_DLLTOOL"; then
4108+ ac_ct_DLLTOOL=$DLLTOOL
4109+ # Extract the first word of "dlltool", so it can be a program name with args.
4110+set dummy dlltool; ac_word=$2
4111+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
4112+$as_echo_n "checking for $ac_word... " >&6; }
4113+if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then :
4114+ $as_echo_n "(cached) " >&6
4115+else
4116+ if test -n "$ac_ct_DLLTOOL"; then
4117+ ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
4118+else
4119+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
4120+for as_dir in $PATH
4121+do
4122+ IFS=$as_save_IFS
4123+ test -z "$as_dir" && as_dir=.
4124+ for ac_exec_ext in '' $ac_executable_extensions; do
4125+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
4126+ ac_cv_prog_ac_ct_DLLTOOL="dlltool"
4127+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
4128+ break 2
4129+ fi
4130+done
4131+ done
4132+IFS=$as_save_IFS
4133+
4134+fi
4135+fi
4136+ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
4137+if test -n "$ac_ct_DLLTOOL"; then
4138+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
4139+$as_echo "$ac_ct_DLLTOOL" >&6; }
4140+else
4141+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
4142+$as_echo "no" >&6; }
4143+fi
4144+
4145+ if test "x$ac_ct_DLLTOOL" = x; then
4146+ DLLTOOL="false"
4147+ else
4148+ case $cross_compiling:$ac_tool_warned in
4149+yes:)
4150+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
4151+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
4152+ac_tool_warned=yes ;;
4153+esac
4154+ DLLTOOL=$ac_ct_DLLTOOL
4155+ fi
4156+else
4157+ DLLTOOL="$ac_cv_prog_DLLTOOL"
4158+fi
4159+
4160+test -z "$DLLTOOL" && DLLTOOL=dlltool
4161+
4162+
4163+
4164+
4165+
4166+
4167+
4168+
4169+
4170+
4171+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5
4172+$as_echo_n "checking how to associate runtime and link libraries... " >&6; }
4173+if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then :
4174+ $as_echo_n "(cached) " >&6
4175+else
4176+ lt_cv_sharedlib_from_linklib_cmd='unknown'
4177+
4178+case $host_os in
4179+cygwin* | mingw* | pw32* | cegcc*)
4180+ # two different shell functions defined in ltmain.sh
4181+ # decide which to use based on capabilities of $DLLTOOL
4182+ case `$DLLTOOL --help 2>&1` in
4183+ *--identify-strict*)
4184+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
4185+ ;;
4186+ *)
4187+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
4188+ ;;
4189+ esac
4190+ ;;
4191+*)
4192+ # fallback: assume linklib IS sharedlib
4193+ lt_cv_sharedlib_from_linklib_cmd="$ECHO"
4194+ ;;
4195+esac
4196+
4197+fi
4198+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5
4199+$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; }
4200+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
4201+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
4202+
4203+
4204+
4205+
4206+
4207+
4208+
4209+if test -n "$ac_tool_prefix"; then
4210+ for ac_prog in ar
4211+ do
4212+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
4213+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
4214 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
4215 $as_echo_n "checking for $ac_word... " >&6; }
4216 if ${ac_cv_prog_AR+:} false; then :
4217@@ -6425,7 +6679,7 @@ do
4218 test -z "$as_dir" && as_dir=.
4219 for ac_exec_ext in '' $ac_executable_extensions; do
4220 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
4221- ac_cv_prog_AR="${ac_tool_prefix}ar"
4222+ ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
4223 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
4224 break 2
4225 fi
4226@@ -6445,11 +6699,15 @@ $as_echo "no" >&6; }
4227 fi
4228
4229
4230+ test -n "$AR" && break
4231+ done
4232 fi
4233-if test -z "$ac_cv_prog_AR"; then
4234+if test -z "$AR"; then
4235 ac_ct_AR=$AR
4236- # Extract the first word of "ar", so it can be a program name with args.
4237-set dummy ar; ac_word=$2
4238+ for ac_prog in ar
4239+do
4240+ # Extract the first word of "$ac_prog", so it can be a program name with args.
4241+set dummy $ac_prog; ac_word=$2
4242 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
4243 $as_echo_n "checking for $ac_word... " >&6; }
4244 if ${ac_cv_prog_ac_ct_AR+:} false; then :
4245@@ -6465,7 +6723,7 @@ do
4246 test -z "$as_dir" && as_dir=.
4247 for ac_exec_ext in '' $ac_executable_extensions; do
4248 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
4249- ac_cv_prog_ac_ct_AR="ar"
4250+ ac_cv_prog_ac_ct_AR="$ac_prog"
4251 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
4252 break 2
4253 fi
4254@@ -6484,6 +6742,10 @@ else
4255 $as_echo "no" >&6; }
4256 fi
4257
4258+
4259+ test -n "$ac_ct_AR" && break
4260+done
4261+
4262 if test "x$ac_ct_AR" = x; then
4263 AR="false"
4264 else
4265@@ -6495,12 +6757,10 @@ ac_tool_warned=yes ;;
4266 esac
4267 AR=$ac_ct_AR
4268 fi
4269-else
4270- AR="$ac_cv_prog_AR"
4271 fi
4272
4273-test -z "$AR" && AR=ar
4274-test -z "$AR_FLAGS" && AR_FLAGS=cru
4275+: ${AR=ar}
4276+: ${AR_FLAGS=cru}
4277
4278
4279
4280@@ -6512,6 +6772,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru
4281
4282
4283
4284+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
4285+$as_echo_n "checking for archiver @FILE support... " >&6; }
4286+if ${lt_cv_ar_at_file+:} false; then :
4287+ $as_echo_n "(cached) " >&6
4288+else
4289+ lt_cv_ar_at_file=no
4290+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
4291+/* end confdefs.h. */
4292+
4293+int
4294+main ()
4295+{
4296+
4297+ ;
4298+ return 0;
4299+}
4300+_ACEOF
4301+if ac_fn_c_try_compile "$LINENO"; then :
4302+ echo conftest.$ac_objext > conftest.lst
4303+ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5'
4304+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
4305+ (eval $lt_ar_try) 2>&5
4306+ ac_status=$?
4307+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
4308+ test $ac_status = 0; }
4309+ if test "$ac_status" -eq 0; then
4310+ # Ensure the archiver fails upon bogus file names.
4311+ rm -f conftest.$ac_objext libconftest.a
4312+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
4313+ (eval $lt_ar_try) 2>&5
4314+ ac_status=$?
4315+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
4316+ test $ac_status = 0; }
4317+ if test "$ac_status" -ne 0; then
4318+ lt_cv_ar_at_file=@
4319+ fi
4320+ fi
4321+ rm -f conftest.* libconftest.a
4322+
4323+fi
4324+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
4325+
4326+fi
4327+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
4328+$as_echo "$lt_cv_ar_at_file" >&6; }
4329+
4330+if test "x$lt_cv_ar_at_file" = xno; then
4331+ archiver_list_spec=
4332+else
4333+ archiver_list_spec=$lt_cv_ar_at_file
4334+fi
4335+
4336+
4337+
4338+
4339+
4340+
4341+
4342 if test -n "$ac_tool_prefix"; then
4343 # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
4344 set dummy ${ac_tool_prefix}strip; ac_word=$2
4345@@ -6846,8 +7164,8 @@ esac
4346 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
4347
4348 # Transform an extracted symbol line into symbol name and symbol address
4349-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
4350-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'"
4351+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
4352+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'"
4353
4354 # Handle CRLF in mingw tool chain
4355 opt_cr=
4356@@ -6883,6 +7201,7 @@ for ac_symprfx in "" "_"; do
4357 else
4358 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
4359 fi
4360+ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
4361
4362 # Check to see that the pipe works correctly.
4363 pipe_works=no
4364@@ -6924,6 +7243,18 @@ _LT_EOF
4365 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
4366 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
4367 cat <<_LT_EOF > conftest.$ac_ext
4368+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */
4369+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
4370+/* DATA imports from DLLs on WIN32 con't be const, because runtime
4371+ relocations are performed -- see ld's documentation on pseudo-relocs. */
4372+# define LT_DLSYM_CONST
4373+#elif defined(__osf__)
4374+/* This system does not cope well with relocations in const data. */
4375+# define LT_DLSYM_CONST
4376+#else
4377+# define LT_DLSYM_CONST const
4378+#endif
4379+
4380 #ifdef __cplusplus
4381 extern "C" {
4382 #endif
4383@@ -6935,7 +7266,7 @@ _LT_EOF
4384 cat <<_LT_EOF >> conftest.$ac_ext
4385
4386 /* The mapping between symbol names and symbols. */
4387-const struct {
4388+LT_DLSYM_CONST struct {
4389 const char *name;
4390 void *address;
4391 }
4392@@ -6961,8 +7292,8 @@ static const void *lt_preloaded_setup()
4393 _LT_EOF
4394 # Now try linking the two files.
4395 mv conftest.$ac_objext conftstm.$ac_objext
4396- lt_save_LIBS="$LIBS"
4397- lt_save_CFLAGS="$CFLAGS"
4398+ lt_globsym_save_LIBS=$LIBS
4399+ lt_globsym_save_CFLAGS=$CFLAGS
4400 LIBS="conftstm.$ac_objext"
4401 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
4402 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
4403@@ -6972,8 +7303,8 @@ _LT_EOF
4404 test $ac_status = 0; } && test -s conftest${ac_exeext}; then
4405 pipe_works=yes
4406 fi
4407- LIBS="$lt_save_LIBS"
4408- CFLAGS="$lt_save_CFLAGS"
4409+ LIBS=$lt_globsym_save_LIBS
4410+ CFLAGS=$lt_globsym_save_CFLAGS
4411 else
4412 echo "cannot find nm_test_func in $nlist" >&5
4413 fi
4414@@ -7010,6 +7341,19 @@ else
4415 $as_echo "ok" >&6; }
4416 fi
4417
4418+# Response file support.
4419+if test "$lt_cv_nm_interface" = "MS dumpbin"; then
4420+ nm_file_list_spec='@'
4421+elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then
4422+ nm_file_list_spec='@'
4423+fi
4424+
4425+
4426+
4427+
4428+
4429+
4430+
4431
4432
4433
4434@@ -7030,6 +7374,42 @@ fi
4435
4436
4437
4438+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
4439+$as_echo_n "checking for sysroot... " >&6; }
4440+
4441+# Check whether --with-libtool-sysroot was given.
4442+if test "${with_libtool_sysroot+set}" = set; then :
4443+ withval=$with_libtool_sysroot;
4444+else
4445+ with_libtool_sysroot=no
4446+fi
4447+
4448+
4449+lt_sysroot=
4450+case ${with_libtool_sysroot} in #(
4451+ yes)
4452+ if test "$GCC" = yes; then
4453+ lt_sysroot=`$CC --print-sysroot 2>/dev/null`
4454+ fi
4455+ ;; #(
4456+ /*)
4457+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"`
4458+ ;; #(
4459+ no|'')
4460+ ;; #(
4461+ *)
4462+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5
4463+$as_echo "${with_libtool_sysroot}" >&6; }
4464+ as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5
4465+ ;;
4466+esac
4467+
4468+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
4469+$as_echo "${lt_sysroot:-no}" >&6; }
4470+
4471+
4472+
4473+
4474
4475 # Check whether --enable-libtool-lock was given.
4476 if test "${enable_libtool_lock+set}" = set; then :
4477@@ -7237,6 +7617,123 @@ esac
4478
4479 need_locks="$enable_libtool_lock"
4480
4481+if test -n "$ac_tool_prefix"; then
4482+ # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args.
4483+set dummy ${ac_tool_prefix}mt; ac_word=$2
4484+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
4485+$as_echo_n "checking for $ac_word... " >&6; }
4486+if ${ac_cv_prog_MANIFEST_TOOL+:} false; then :
4487+ $as_echo_n "(cached) " >&6
4488+else
4489+ if test -n "$MANIFEST_TOOL"; then
4490+ ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test.
4491+else
4492+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
4493+for as_dir in $PATH
4494+do
4495+ IFS=$as_save_IFS
4496+ test -z "$as_dir" && as_dir=.
4497+ for ac_exec_ext in '' $ac_executable_extensions; do
4498+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
4499+ ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
4500+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
4501+ break 2
4502+ fi
4503+done
4504+ done
4505+IFS=$as_save_IFS
4506+
4507+fi
4508+fi
4509+MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL
4510+if test -n "$MANIFEST_TOOL"; then
4511+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5
4512+$as_echo "$MANIFEST_TOOL" >&6; }
4513+else
4514+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
4515+$as_echo "no" >&6; }
4516+fi
4517+
4518+
4519+fi
4520+if test -z "$ac_cv_prog_MANIFEST_TOOL"; then
4521+ ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL
4522+ # Extract the first word of "mt", so it can be a program name with args.
4523+set dummy mt; ac_word=$2
4524+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
4525+$as_echo_n "checking for $ac_word... " >&6; }
4526+if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then :
4527+ $as_echo_n "(cached) " >&6
4528+else
4529+ if test -n "$ac_ct_MANIFEST_TOOL"; then
4530+ ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test.
4531+else
4532+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
4533+for as_dir in $PATH
4534+do
4535+ IFS=$as_save_IFS
4536+ test -z "$as_dir" && as_dir=.
4537+ for ac_exec_ext in '' $ac_executable_extensions; do
4538+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
4539+ ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
4540+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
4541+ break 2
4542+ fi
4543+done
4544+ done
4545+IFS=$as_save_IFS
4546+
4547+fi
4548+fi
4549+ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL
4550+if test -n "$ac_ct_MANIFEST_TOOL"; then
4551+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5
4552+$as_echo "$ac_ct_MANIFEST_TOOL" >&6; }
4553+else
4554+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
4555+$as_echo "no" >&6; }
4556+fi
4557+
4558+ if test "x$ac_ct_MANIFEST_TOOL" = x; then
4559+ MANIFEST_TOOL=":"
4560+ else
4561+ case $cross_compiling:$ac_tool_warned in
4562+yes:)
4563+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
4564+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
4565+ac_tool_warned=yes ;;
4566+esac
4567+ MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL
4568+ fi
4569+else
4570+ MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL"
4571+fi
4572+
4573+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
4574+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5
4575+$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; }
4576+if ${lt_cv_path_mainfest_tool+:} false; then :
4577+ $as_echo_n "(cached) " >&6
4578+else
4579+ lt_cv_path_mainfest_tool=no
4580+ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5
4581+ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
4582+ cat conftest.err >&5
4583+ if $GREP 'Manifest Tool' conftest.out > /dev/null; then
4584+ lt_cv_path_mainfest_tool=yes
4585+ fi
4586+ rm -f conftest*
4587+fi
4588+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5
4589+$as_echo "$lt_cv_path_mainfest_tool" >&6; }
4590+if test "x$lt_cv_path_mainfest_tool" != xyes; then
4591+ MANIFEST_TOOL=:
4592+fi
4593+
4594+
4595+
4596+
4597+
4598
4599 case $host_os in
4600 rhapsody* | darwin*)
4601@@ -7800,6 +8297,8 @@ _LT_EOF
4602 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
4603 echo "$AR cru libconftest.a conftest.o" >&5
4604 $AR cru libconftest.a conftest.o 2>&5
4605+ echo "$RANLIB libconftest.a" >&5
4606+ $RANLIB libconftest.a 2>&5
4607 cat > conftest.c << _LT_EOF
4608 int main() { return 0;}
4609 _LT_EOF
4610@@ -7995,7 +8494,8 @@ fi
4611 LIBTOOL_DEPS="$ltmain"
4612
4613 # Always use our own libtool.
4614-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
4615+LIBTOOL='$(SHELL) $(top_builddir)'
4616+LIBTOOL="$LIBTOOL/${host_alias}-libtool"
4617
4618
4619
4620@@ -8084,7 +8584,7 @@ aix3*)
4621 esac
4622
4623 # Global variables:
4624-ofile=libtool
4625+ofile=${host_alias}-libtool
4626 can_build_shared=yes
4627
4628 # All known linkers require a `.a' archive for static linking (except MSVC,
4629@@ -8382,8 +8882,6 @@ fi
4630 lt_prog_compiler_pic=
4631 lt_prog_compiler_static=
4632
4633-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
4634-$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
4635
4636 if test "$GCC" = yes; then
4637 lt_prog_compiler_wl='-Wl,'
4638@@ -8549,6 +9047,12 @@ $as_echo_n "checking for $compiler optio
4639 lt_prog_compiler_pic='--shared'
4640 lt_prog_compiler_static='--static'
4641 ;;
4642+ nagfor*)
4643+ # NAG Fortran compiler
4644+ lt_prog_compiler_wl='-Wl,-Wl,,'
4645+ lt_prog_compiler_pic='-PIC'
4646+ lt_prog_compiler_static='-Bstatic'
4647+ ;;
4648 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
4649 # Portland Group compilers (*not* the Pentium gcc compiler,
4650 # which looks to be a dead project)
4651@@ -8611,7 +9115,7 @@ $as_echo_n "checking for $compiler optio
4652 lt_prog_compiler_pic='-KPIC'
4653 lt_prog_compiler_static='-Bstatic'
4654 case $cc_basename in
4655- f77* | f90* | f95*)
4656+ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
4657 lt_prog_compiler_wl='-Qoption ld ';;
4658 *)
4659 lt_prog_compiler_wl='-Wl,';;
4660@@ -8668,13 +9172,17 @@ case $host_os in
4661 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
4662 ;;
4663 esac
4664-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5
4665-$as_echo "$lt_prog_compiler_pic" >&6; }
4666-
4667-
4668-
4669-
4670
4671+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
4672+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
4673+if ${lt_cv_prog_compiler_pic+:} false; then :
4674+ $as_echo_n "(cached) " >&6
4675+else
4676+ lt_cv_prog_compiler_pic=$lt_prog_compiler_pic
4677+fi
4678+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
4679+$as_echo "$lt_cv_prog_compiler_pic" >&6; }
4680+lt_prog_compiler_pic=$lt_cv_prog_compiler_pic
4681
4682 #
4683 # Check to make sure the PIC flag actually works.
4684@@ -8735,6 +9243,11 @@ fi
4685
4686
4687
4688+
4689+
4690+
4691+
4692+
4693 #
4694 # Check to make sure the static flag actually works.
4695 #
4696@@ -9085,7 +9598,8 @@ _LT_EOF
4697 allow_undefined_flag=unsupported
4698 always_export_symbols=no
4699 enable_shared_with_static_runtimes=yes
4700- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
4701+ 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'
4702+ exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
4703
4704 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
4705 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
4706@@ -9184,12 +9698,12 @@ _LT_EOF
4707 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
4708 hardcode_libdir_flag_spec=
4709 hardcode_libdir_flag_spec_ld='-rpath $libdir'
4710- archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
4711+ archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
4712 if test "x$supports_anon_versioning" = xyes; then
4713 archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
4714 cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
4715 echo "local: *; };" >> $output_objdir/$libname.ver~
4716- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
4717+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
4718 fi
4719 ;;
4720 esac
4721@@ -9203,8 +9717,8 @@ _LT_EOF
4722 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
4723 wlarc=
4724 else
4725- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
4726- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
4727+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
4728+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
4729 fi
4730 ;;
4731
4732@@ -9222,8 +9736,8 @@ _LT_EOF
4733
4734 _LT_EOF
4735 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
4736- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
4737- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
4738+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
4739+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
4740 else
4741 ld_shlibs=no
4742 fi
4743@@ -9269,8 +9783,8 @@ _LT_EOF
4744
4745 *)
4746 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
4747- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
4748- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
4749+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
4750+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
4751 else
4752 ld_shlibs=no
4753 fi
4754@@ -9400,7 +9914,13 @@ _LT_EOF
4755 allow_undefined_flag='-berok'
4756 # Determine the default libpath from the value encoded in an
4757 # empty executable.
4758- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
4759+ if test "${lt_cv_aix_libpath+set}" = set; then
4760+ aix_libpath=$lt_cv_aix_libpath
4761+else
4762+ if ${lt_cv_aix_libpath_+:} false; then :
4763+ $as_echo_n "(cached) " >&6
4764+else
4765+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
4766 /* end confdefs.h. */
4767
4768 int
4769@@ -9413,22 +9933,29 @@ main ()
4770 _ACEOF
4771 if ac_fn_c_try_link "$LINENO"; then :
4772
4773-lt_aix_libpath_sed='
4774- /Import File Strings/,/^$/ {
4775- /^0/ {
4776- s/^0 *\(.*\)$/\1/
4777- p
4778- }
4779- }'
4780-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
4781-# Check for a 64-bit object if we didn't find anything.
4782-if test -z "$aix_libpath"; then
4783- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
4784-fi
4785+ lt_aix_libpath_sed='
4786+ /Import File Strings/,/^$/ {
4787+ /^0/ {
4788+ s/^0 *\([^ ]*\) *$/\1/
4789+ p
4790+ }
4791+ }'
4792+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
4793+ # Check for a 64-bit object if we didn't find anything.
4794+ if test -z "$lt_cv_aix_libpath_"; then
4795+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
4796+ fi
4797 fi
4798 rm -f core conftest.err conftest.$ac_objext \
4799 conftest$ac_exeext conftest.$ac_ext
4800-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
4801+ if test -z "$lt_cv_aix_libpath_"; then
4802+ lt_cv_aix_libpath_="/usr/lib:/lib"
4803+ fi
4804+
4805+fi
4806+
4807+ aix_libpath=$lt_cv_aix_libpath_
4808+fi
4809
4810 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
4811 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"
4812@@ -9440,7 +9967,13 @@ if test -z "$aix_libpath"; then aix_libp
4813 else
4814 # Determine the default libpath from the value encoded in an
4815 # empty executable.
4816- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
4817+ if test "${lt_cv_aix_libpath+set}" = set; then
4818+ aix_libpath=$lt_cv_aix_libpath
4819+else
4820+ if ${lt_cv_aix_libpath_+:} false; then :
4821+ $as_echo_n "(cached) " >&6
4822+else
4823+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
4824 /* end confdefs.h. */
4825
4826 int
4827@@ -9453,22 +9986,29 @@ main ()
4828 _ACEOF
4829 if ac_fn_c_try_link "$LINENO"; then :
4830
4831-lt_aix_libpath_sed='
4832- /Import File Strings/,/^$/ {
4833- /^0/ {
4834- s/^0 *\(.*\)$/\1/
4835- p
4836- }
4837- }'
4838-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
4839-# Check for a 64-bit object if we didn't find anything.
4840-if test -z "$aix_libpath"; then
4841- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
4842-fi
4843+ lt_aix_libpath_sed='
4844+ /Import File Strings/,/^$/ {
4845+ /^0/ {
4846+ s/^0 *\([^ ]*\) *$/\1/
4847+ p
4848+ }
4849+ }'
4850+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
4851+ # Check for a 64-bit object if we didn't find anything.
4852+ if test -z "$lt_cv_aix_libpath_"; then
4853+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
4854+ fi
4855 fi
4856 rm -f core conftest.err conftest.$ac_objext \
4857 conftest$ac_exeext conftest.$ac_ext
4858-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
4859+ if test -z "$lt_cv_aix_libpath_"; then
4860+ lt_cv_aix_libpath_="/usr/lib:/lib"
4861+ fi
4862+
4863+fi
4864+
4865+ aix_libpath=$lt_cv_aix_libpath_
4866+fi
4867
4868 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
4869 # Warning - without using the other run time loading flags,
4870@@ -9513,20 +10053,63 @@ if test -z "$aix_libpath"; then aix_libp
4871 # Microsoft Visual C++.
4872 # hardcode_libdir_flag_spec is actually meaningless, as there is
4873 # no search path for DLLs.
4874- hardcode_libdir_flag_spec=' '
4875- allow_undefined_flag=unsupported
4876- # Tell ltmain to make .lib files, not .a files.
4877- libext=lib
4878- # Tell ltmain to make .dll files, not .so files.
4879- shrext_cmds=".dll"
4880- # FIXME: Setting linknames here is a bad hack.
4881- archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
4882- # The linker will automatically build a .lib file if we build a DLL.
4883- old_archive_from_new_cmds='true'
4884- # FIXME: Should let the user specify the lib program.
4885- old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
4886- fix_srcfile_path='`cygpath -w "$srcfile"`'
4887- enable_shared_with_static_runtimes=yes
4888+ case $cc_basename in
4889+ cl*)
4890+ # Native MSVC
4891+ hardcode_libdir_flag_spec=' '
4892+ allow_undefined_flag=unsupported
4893+ always_export_symbols=yes
4894+ file_list_spec='@'
4895+ # Tell ltmain to make .lib files, not .a files.
4896+ libext=lib
4897+ # Tell ltmain to make .dll files, not .so files.
4898+ shrext_cmds=".dll"
4899+ # FIXME: Setting linknames here is a bad hack.
4900+ archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
4901+ archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
4902+ sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
4903+ else
4904+ sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
4905+ fi~
4906+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
4907+ linknames='
4908+ # The linker will not automatically build a static lib if we build a DLL.
4909+ # _LT_TAGVAR(old_archive_from_new_cmds, )='true'
4910+ enable_shared_with_static_runtimes=yes
4911+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
4912+ # Don't use ranlib
4913+ old_postinstall_cmds='chmod 644 $oldlib'
4914+ postlink_cmds='lt_outputfile="@OUTPUT@"~
4915+ lt_tool_outputfile="@TOOL_OUTPUT@"~
4916+ case $lt_outputfile in
4917+ *.exe|*.EXE) ;;
4918+ *)
4919+ lt_outputfile="$lt_outputfile.exe"
4920+ lt_tool_outputfile="$lt_tool_outputfile.exe"
4921+ ;;
4922+ esac~
4923+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
4924+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
4925+ $RM "$lt_outputfile.manifest";
4926+ fi'
4927+ ;;
4928+ *)
4929+ # Assume MSVC wrapper
4930+ hardcode_libdir_flag_spec=' '
4931+ allow_undefined_flag=unsupported
4932+ # Tell ltmain to make .lib files, not .a files.
4933+ libext=lib
4934+ # Tell ltmain to make .dll files, not .so files.
4935+ shrext_cmds=".dll"
4936+ # FIXME: Setting linknames here is a bad hack.
4937+ archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
4938+ # The linker will automatically build a .lib file if we build a DLL.
4939+ old_archive_from_new_cmds='true'
4940+ # FIXME: Should let the user specify the lib program.
4941+ old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
4942+ enable_shared_with_static_runtimes=yes
4943+ ;;
4944+ esac
4945 ;;
4946
4947 darwin* | rhapsody*)
4948@@ -9587,7 +10170,7 @@ if test -z "$aix_libpath"; then aix_libp
4949
4950 # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
4951 freebsd* | dragonfly*)
4952- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
4953+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
4954 hardcode_libdir_flag_spec='-R$libdir'
4955 hardcode_direct=yes
4956 hardcode_shlibpath_var=no
4957@@ -9595,7 +10178,7 @@ if test -z "$aix_libpath"; then aix_libp
4958
4959 hpux9*)
4960 if test "$GCC" = yes; then
4961- 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'
4962+ 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'
4963 else
4964 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'
4965 fi
4966@@ -9611,7 +10194,7 @@ if test -z "$aix_libpath"; then aix_libp
4967
4968 hpux10*)
4969 if test "$GCC" = yes && test "$with_gnu_ld" = no; then
4970- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
4971+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
4972 else
4973 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
4974 fi
4975@@ -9635,10 +10218,10 @@ if test -z "$aix_libpath"; then aix_libp
4976 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
4977 ;;
4978 ia64*)
4979- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
4980+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
4981 ;;
4982 *)
4983- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
4984+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
4985 ;;
4986 esac
4987 else
4988@@ -9717,23 +10300,36 @@ fi
4989
4990 irix5* | irix6* | nonstopux*)
4991 if test "$GCC" = yes; then
4992- 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'
4993+ 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'
4994 # Try to use the -exported_symbol ld option, if it does not
4995 # work, assume that -exports_file does not work either and
4996 # implicitly export all symbols.
4997- save_LDFLAGS="$LDFLAGS"
4998- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
4999- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
5000+ # This should be the same for all languages, so no per-tag cache variable.
5001+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5
5002+$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; }
5003+if ${lt_cv_irix_exported_symbol+:} false; then :
5004+ $as_echo_n "(cached) " >&6
5005+else
5006+ save_LDFLAGS="$LDFLAGS"
5007+ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
5008+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
5009 /* end confdefs.h. */
5010-int foo(void) {}
5011+int foo (void) { return 0; }
5012 _ACEOF
5013 if ac_fn_c_try_link "$LINENO"; then :
5014- 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'
5015-
5016+ lt_cv_irix_exported_symbol=yes
5017+else
5018+ lt_cv_irix_exported_symbol=no
5019 fi
5020 rm -f core conftest.err conftest.$ac_objext \
5021 conftest$ac_exeext conftest.$ac_ext
5022- LDFLAGS="$save_LDFLAGS"
5023+ LDFLAGS="$save_LDFLAGS"
5024+fi
5025+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5
5026+$as_echo "$lt_cv_irix_exported_symbol" >&6; }
5027+ if test "$lt_cv_irix_exported_symbol" = yes; then
5028+ 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'
5029+ fi
5030 else
5031 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'
5032 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'
5033@@ -9818,7 +10414,7 @@ rm -f core conftest.err conftest.$ac_obj
5034 osf4* | osf5*) # as osf3* with the addition of -msym flag
5035 if test "$GCC" = yes; then
5036 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
5037- 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'
5038+ 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'
5039 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
5040 else
5041 allow_undefined_flag=' -expect_unresolved \*'
5042@@ -9837,9 +10433,9 @@ rm -f core conftest.err conftest.$ac_obj
5043 no_undefined_flag=' -z defs'
5044 if test "$GCC" = yes; then
5045 wlarc='${wl}'
5046- archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
5047+ archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
5048 archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
5049- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
5050+ $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'
5051 else
5052 case `$CC -V 2>&1` in
5053 *"Compilers 5.0"*)
5054@@ -10415,8 +11011,9 @@ cygwin* | mingw* | pw32* | cegcc*)
5055 need_version=no
5056 need_lib_prefix=no
5057
5058- case $GCC,$host_os in
5059- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
5060+ case $GCC,$cc_basename in
5061+ yes,*)
5062+ # gcc
5063 library_names_spec='$libname.dll.a'
5064 # DLL is installed to $(libdir)/../bin by postinstall_cmds
5065 postinstall_cmds='base_file=`basename \${file}`~
5066@@ -10449,13 +11046,71 @@ cygwin* | mingw* | pw32* | cegcc*)
5067 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
5068 ;;
5069 esac
5070+ dynamic_linker='Win32 ld.exe'
5071+ ;;
5072+
5073+ *,cl*)
5074+ # Native MSVC
5075+ libname_spec='$name'
5076+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
5077+ library_names_spec='${libname}.dll.lib'
5078+
5079+ case $build_os in
5080+ mingw*)
5081+ sys_lib_search_path_spec=
5082+ lt_save_ifs=$IFS
5083+ IFS=';'
5084+ for lt_path in $LIB
5085+ do
5086+ IFS=$lt_save_ifs
5087+ # Let DOS variable expansion print the short 8.3 style file name.
5088+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
5089+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
5090+ done
5091+ IFS=$lt_save_ifs
5092+ # Convert to MSYS style.
5093+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
5094+ ;;
5095+ cygwin*)
5096+ # Convert to unix form, then to dos form, then back to unix form
5097+ # but this time dos style (no spaces!) so that the unix form looks
5098+ # like /cygdrive/c/PROGRA~1:/cygdr...
5099+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
5100+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
5101+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
5102+ ;;
5103+ *)
5104+ sys_lib_search_path_spec="$LIB"
5105+ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
5106+ # It is most probably a Windows format PATH.
5107+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
5108+ else
5109+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
5110+ fi
5111+ # FIXME: find the short name or the path components, as spaces are
5112+ # common. (e.g. "Program Files" -> "PROGRA~1")
5113+ ;;
5114+ esac
5115+
5116+ # DLL is installed to $(libdir)/../bin by postinstall_cmds
5117+ postinstall_cmds='base_file=`basename \${file}`~
5118+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
5119+ dldir=$destdir/`dirname \$dlpath`~
5120+ test -d \$dldir || mkdir -p \$dldir~
5121+ $install_prog $dir/$dlname \$dldir/$dlname'
5122+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
5123+ dlpath=$dir/\$dldll~
5124+ $RM \$dlpath'
5125+ shlibpath_overrides_runpath=yes
5126+ dynamic_linker='Win32 link.exe'
5127 ;;
5128
5129 *)
5130+ # Assume MSVC wrapper
5131 library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
5132+ dynamic_linker='Win32 ld.exe'
5133 ;;
5134 esac
5135- dynamic_linker='Win32 ld.exe'
5136 # FIXME: first we should search . and the directory the executable is in
5137 shlibpath_var=PATH
5138 ;;
5139@@ -10547,7 +11202,7 @@ haiku*)
5140 soname_spec='${libname}${release}${shared_ext}$major'
5141 shlibpath_var=LIBRARY_PATH
5142 shlibpath_overrides_runpath=yes
5143- sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib'
5144+ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
5145 hardcode_into_libs=yes
5146 ;;
5147
5148@@ -11343,7 +11998,7 @@ else
5149 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
5150 lt_status=$lt_dlunknown
5151 cat > conftest.$ac_ext <<_LT_EOF
5152-#line 11346 "configure"
5153+#line $LINENO "configure"
5154 #include "confdefs.h"
5155
5156 #if HAVE_DLFCN_H
5157@@ -11387,10 +12042,10 @@ else
5158 /* When -fvisbility=hidden is used, assume the code has been annotated
5159 correspondingly for the symbols needed. */
5160 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
5161-void fnord () __attribute__((visibility("default")));
5162+int fnord () __attribute__((visibility("default")));
5163 #endif
5164
5165-void fnord () { int i=42; }
5166+int fnord () { return 42; }
5167 int main ()
5168 {
5169 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
5170@@ -11449,7 +12104,7 @@ else
5171 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
5172 lt_status=$lt_dlunknown
5173 cat > conftest.$ac_ext <<_LT_EOF
5174-#line 11452 "configure"
5175+#line $LINENO "configure"
5176 #include "confdefs.h"
5177
5178 #if HAVE_DLFCN_H
5179@@ -11493,10 +12148,10 @@ else
5180 /* When -fvisbility=hidden is used, assume the code has been annotated
5181 correspondingly for the symbols needed. */
5182 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
5183-void fnord () __attribute__((visibility("default")));
5184+int fnord () __attribute__((visibility("default")));
5185 #endif
5186
5187-void fnord () { int i=42; }
5188+int fnord () { return 42; }
5189 int main ()
5190 {
5191 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
5192@@ -15928,13 +16583,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_
5193 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
5194 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
5195 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
5196+lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`'
5197+lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`'
5198 reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
5199 reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
5200 OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
5201 deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`'
5202 file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`'
5203+file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`'
5204+want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`'
5205+DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`'
5206+sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`'
5207 AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`'
5208 AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`'
5209+archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`'
5210 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
5211 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
5212 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
5213@@ -15949,14 +16611,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$l
5214 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
5215 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
5216 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"`'
5217+nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`'
5218+lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`'
5219 objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`'
5220 MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`'
5221 lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`'
5222-lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
5223 lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`'
5224+lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
5225 lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`'
5226 lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`'
5227 need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`'
5228+MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`'
5229 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
5230 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
5231 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
5232@@ -15989,12 +16654,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcod
5233 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
5234 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
5235 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
5236-fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`'
5237 always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`'
5238 export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`'
5239 exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`'
5240 include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`'
5241 prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`'
5242+postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`'
5243 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
5244 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
5245 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
5246@@ -16049,8 +16714,13 @@ reload_flag \
5247 OBJDUMP \
5248 deplibs_check_method \
5249 file_magic_cmd \
5250+file_magic_glob \
5251+want_nocaseglob \
5252+DLLTOOL \
5253+sharedlib_from_linklib_cmd \
5254 AR \
5255 AR_FLAGS \
5256+archiver_list_spec \
5257 STRIP \
5258 RANLIB \
5259 CC \
5260@@ -16060,12 +16730,14 @@ lt_cv_sys_global_symbol_pipe \
5261 lt_cv_sys_global_symbol_to_cdecl \
5262 lt_cv_sys_global_symbol_to_c_name_address \
5263 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
5264+nm_file_list_spec \
5265 lt_prog_compiler_no_builtin_flag \
5266-lt_prog_compiler_wl \
5267 lt_prog_compiler_pic \
5268+lt_prog_compiler_wl \
5269 lt_prog_compiler_static \
5270 lt_cv_prog_compiler_c_o \
5271 need_locks \
5272+MANIFEST_TOOL \
5273 DSYMUTIL \
5274 NMEDIT \
5275 LIPO \
5276@@ -16081,7 +16753,6 @@ no_undefined_flag \
5277 hardcode_libdir_flag_spec \
5278 hardcode_libdir_flag_spec_ld \
5279 hardcode_libdir_separator \
5280-fix_srcfile_path \
5281 exclude_expsyms \
5282 include_expsyms \
5283 file_list_spec \
5284@@ -16117,6 +16788,7 @@ module_cmds \
5285 module_expsym_cmds \
5286 export_symbols_cmds \
5287 prelink_cmds \
5288+postlink_cmds \
5289 postinstall_cmds \
5290 postuninstall_cmds \
5291 finish_cmds \
5292@@ -16890,7 +17562,8 @@ $as_echo X"$file" |
5293 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
5294 #
5295 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
5296-# 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
5297+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
5298+# Inc.
5299 # Written by Gordon Matzigkeit, 1996
5300 #
5301 # This file is part of GNU Libtool.
5302@@ -16993,19 +17666,42 @@ SP2NL=$lt_lt_SP2NL
5303 # turn newlines into spaces.
5304 NL2SP=$lt_lt_NL2SP
5305
5306+# convert \$build file names to \$host format.
5307+to_host_file_cmd=$lt_cv_to_host_file_cmd
5308+
5309+# convert \$build files to toolchain format.
5310+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
5311+
5312 # An object symbol dumper.
5313 OBJDUMP=$lt_OBJDUMP
5314
5315 # Method to check whether dependent libraries are shared objects.
5316 deplibs_check_method=$lt_deplibs_check_method
5317
5318-# Command to use when deplibs_check_method == "file_magic".
5319+# Command to use when deplibs_check_method = "file_magic".
5320 file_magic_cmd=$lt_file_magic_cmd
5321
5322+# How to find potential files when deplibs_check_method = "file_magic".
5323+file_magic_glob=$lt_file_magic_glob
5324+
5325+# Find potential files using nocaseglob when deplibs_check_method = "file_magic".
5326+want_nocaseglob=$lt_want_nocaseglob
5327+
5328+# DLL creation program.
5329+DLLTOOL=$lt_DLLTOOL
5330+
5331+# Command to associate shared and link libraries.
5332+sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd
5333+
5334 # The archiver.
5335 AR=$lt_AR
5336+
5337+# Flags to create an archive.
5338 AR_FLAGS=$lt_AR_FLAGS
5339
5340+# How to feed a file listing to the archiver.
5341+archiver_list_spec=$lt_archiver_list_spec
5342+
5343 # A symbol stripping program.
5344 STRIP=$lt_STRIP
5345
5346@@ -17035,6 +17731,12 @@ global_symbol_to_c_name_address=$lt_lt_c
5347 # Transform the output of nm in a C name address pair when lib prefix is needed.
5348 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
5349
5350+# Specify filename containing input files for \$NM.
5351+nm_file_list_spec=$lt_nm_file_list_spec
5352+
5353+# The root where to search for dependent libraries,and in which our libraries should be installed.
5354+lt_sysroot=$lt_sysroot
5355+
5356 # The name of the directory that contains temporary libtool files.
5357 objdir=$objdir
5358
5359@@ -17044,6 +17746,9 @@ MAGIC_CMD=$MAGIC_CMD
5360 # Must we lock files when doing compilation?
5361 need_locks=$lt_need_locks
5362
5363+# Manifest tool.
5364+MANIFEST_TOOL=$lt_MANIFEST_TOOL
5365+
5366 # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
5367 DSYMUTIL=$lt_DSYMUTIL
5368
5369@@ -17158,12 +17863,12 @@ with_gcc=$GCC
5370 # Compiler flag to turn off builtin functions.
5371 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
5372
5373-# How to pass a linker flag through the compiler.
5374-wl=$lt_lt_prog_compiler_wl
5375-
5376 # Additional compiler flags for building library objects.
5377 pic_flag=$lt_lt_prog_compiler_pic
5378
5379+# How to pass a linker flag through the compiler.
5380+wl=$lt_lt_prog_compiler_wl
5381+
5382 # Compiler flag to prevent dynamic linking.
5383 link_static_flag=$lt_lt_prog_compiler_static
5384
5385@@ -17250,9 +17955,6 @@ inherit_rpath=$inherit_rpath
5386 # Whether libtool must link a program against all its dependency libraries.
5387 link_all_deplibs=$link_all_deplibs
5388
5389-# Fix the shell variable \$srcfile for the compiler.
5390-fix_srcfile_path=$lt_fix_srcfile_path
5391-
5392 # Set to "yes" if exported symbols are required.
5393 always_export_symbols=$always_export_symbols
5394
5395@@ -17268,6 +17970,9 @@ include_expsyms=$lt_include_expsyms
5396 # Commands necessary for linking programs (against libraries) with templates.
5397 prelink_cmds=$lt_prelink_cmds
5398
5399+# Commands necessary for finishing linking programs.
5400+postlink_cmds=$lt_postlink_cmds
5401+
5402 # Specify filename containing input files.
5403 file_list_spec=$lt_file_list_spec
5404
5405@@ -17300,210 +18005,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
5406 # if finds mixed CR/LF and LF-only lines. Since sed operates in
5407 # text mode, it properly converts lines to CR/LF. This bash problem
5408 # is reportedly fixed, but why not run on old versions too?
5409- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
5410- || (rm -f "$cfgfile"; exit 1)
5411-
5412- case $xsi_shell in
5413- yes)
5414- cat << \_LT_EOF >> "$cfgfile"
5415-
5416-# func_dirname file append nondir_replacement
5417-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
5418-# otherwise set result to NONDIR_REPLACEMENT.
5419-func_dirname ()
5420-{
5421- case ${1} in
5422- */*) func_dirname_result="${1%/*}${2}" ;;
5423- * ) func_dirname_result="${3}" ;;
5424- esac
5425-}
5426-
5427-# func_basename file
5428-func_basename ()
5429-{
5430- func_basename_result="${1##*/}"
5431-}
5432-
5433-# func_dirname_and_basename file append nondir_replacement
5434-# perform func_basename and func_dirname in a single function
5435-# call:
5436-# dirname: Compute the dirname of FILE. If nonempty,
5437-# add APPEND to the result, otherwise set result
5438-# to NONDIR_REPLACEMENT.
5439-# value returned in "$func_dirname_result"
5440-# basename: Compute filename of FILE.
5441-# value retuned in "$func_basename_result"
5442-# Implementation must be kept synchronized with func_dirname
5443-# and func_basename. For efficiency, we do not delegate to
5444-# those functions but instead duplicate the functionality here.
5445-func_dirname_and_basename ()
5446-{
5447- case ${1} in
5448- */*) func_dirname_result="${1%/*}${2}" ;;
5449- * ) func_dirname_result="${3}" ;;
5450- esac
5451- func_basename_result="${1##*/}"
5452-}
5453-
5454-# func_stripname prefix suffix name
5455-# strip PREFIX and SUFFIX off of NAME.
5456-# PREFIX and SUFFIX must not contain globbing or regex special
5457-# characters, hashes, percent signs, but SUFFIX may contain a leading
5458-# dot (in which case that matches only a dot).
5459-func_stripname ()
5460-{
5461- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
5462- # positional parameters, so assign one to ordinary parameter first.
5463- func_stripname_result=${3}
5464- func_stripname_result=${func_stripname_result#"${1}"}
5465- func_stripname_result=${func_stripname_result%"${2}"}
5466-}
5467-
5468-# func_opt_split
5469-func_opt_split ()
5470-{
5471- func_opt_split_opt=${1%%=*}
5472- func_opt_split_arg=${1#*=}
5473-}
5474-
5475-# func_lo2o object
5476-func_lo2o ()
5477-{
5478- case ${1} in
5479- *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
5480- *) func_lo2o_result=${1} ;;
5481- esac
5482-}
5483-
5484-# func_xform libobj-or-source
5485-func_xform ()
5486-{
5487- func_xform_result=${1%.*}.lo
5488-}
5489-
5490-# func_arith arithmetic-term...
5491-func_arith ()
5492-{
5493- func_arith_result=$(( $* ))
5494-}
5495-
5496-# func_len string
5497-# STRING may not start with a hyphen.
5498-func_len ()
5499-{
5500- func_len_result=${#1}
5501-}
5502-
5503-_LT_EOF
5504- ;;
5505- *) # Bourne compatible functions.
5506- cat << \_LT_EOF >> "$cfgfile"
5507-
5508-# func_dirname file append nondir_replacement
5509-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
5510-# otherwise set result to NONDIR_REPLACEMENT.
5511-func_dirname ()
5512-{
5513- # Extract subdirectory from the argument.
5514- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
5515- if test "X$func_dirname_result" = "X${1}"; then
5516- func_dirname_result="${3}"
5517- else
5518- func_dirname_result="$func_dirname_result${2}"
5519- fi
5520-}
5521-
5522-# func_basename file
5523-func_basename ()
5524-{
5525- func_basename_result=`$ECHO "${1}" | $SED "$basename"`
5526-}
5527-
5528-
5529-# func_stripname prefix suffix name
5530-# strip PREFIX and SUFFIX off of NAME.
5531-# PREFIX and SUFFIX must not contain globbing or regex special
5532-# characters, hashes, percent signs, but SUFFIX may contain a leading
5533-# dot (in which case that matches only a dot).
5534-# func_strip_suffix prefix name
5535-func_stripname ()
5536-{
5537- case ${2} in
5538- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
5539- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
5540- esac
5541-}
5542-
5543-# sed scripts:
5544-my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q'
5545-my_sed_long_arg='1s/^-[^=]*=//'
5546-
5547-# func_opt_split
5548-func_opt_split ()
5549-{
5550- func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"`
5551- func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"`
5552-}
5553-
5554-# func_lo2o object
5555-func_lo2o ()
5556-{
5557- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
5558-}
5559-
5560-# func_xform libobj-or-source
5561-func_xform ()
5562-{
5563- func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`
5564-}
5565-
5566-# func_arith arithmetic-term...
5567-func_arith ()
5568-{
5569- func_arith_result=`expr "$@"`
5570-}
5571-
5572-# func_len string
5573-# STRING may not start with a hyphen.
5574-func_len ()
5575-{
5576- func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len`
5577-}
5578-
5579-_LT_EOF
5580-esac
5581-
5582-case $lt_shell_append in
5583- yes)
5584- cat << \_LT_EOF >> "$cfgfile"
5585-
5586-# func_append var value
5587-# Append VALUE to the end of shell variable VAR.
5588-func_append ()
5589-{
5590- eval "$1+=\$2"
5591-}
5592-_LT_EOF
5593- ;;
5594- *)
5595- cat << \_LT_EOF >> "$cfgfile"
5596-
5597-# func_append var value
5598-# Append VALUE to the end of shell variable VAR.
5599-func_append ()
5600-{
5601- eval "$1=\$$1\$2"
5602-}
5603-
5604-_LT_EOF
5605- ;;
5606- esac
5607+ sed '$q' "$ltmain" >> "$cfgfile" \
5608+ || (rm -f "$cfgfile"; exit 1)
5609
5610+ if test x"$xsi_shell" = xyes; then
5611+ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\
5612+func_dirname ()\
5613+{\
5614+\ case ${1} in\
5615+\ */*) func_dirname_result="${1%/*}${2}" ;;\
5616+\ * ) func_dirname_result="${3}" ;;\
5617+\ esac\
5618+} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \
5619+ && mv -f "$cfgfile.tmp" "$cfgfile" \
5620+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
5621+test 0 -eq $? || _lt_function_replace_fail=:
5622+
5623+
5624+ sed -e '/^func_basename ()$/,/^} # func_basename /c\
5625+func_basename ()\
5626+{\
5627+\ func_basename_result="${1##*/}"\
5628+} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \
5629+ && mv -f "$cfgfile.tmp" "$cfgfile" \
5630+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
5631+test 0 -eq $? || _lt_function_replace_fail=:
5632+
5633+
5634+ sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\
5635+func_dirname_and_basename ()\
5636+{\
5637+\ case ${1} in\
5638+\ */*) func_dirname_result="${1%/*}${2}" ;;\
5639+\ * ) func_dirname_result="${3}" ;;\
5640+\ esac\
5641+\ func_basename_result="${1##*/}"\
5642+} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \
5643+ && mv -f "$cfgfile.tmp" "$cfgfile" \
5644+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
5645+test 0 -eq $? || _lt_function_replace_fail=:
5646+
5647+
5648+ sed -e '/^func_stripname ()$/,/^} # func_stripname /c\
5649+func_stripname ()\
5650+{\
5651+\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\
5652+\ # positional parameters, so assign one to ordinary parameter first.\
5653+\ func_stripname_result=${3}\
5654+\ func_stripname_result=${func_stripname_result#"${1}"}\
5655+\ func_stripname_result=${func_stripname_result%"${2}"}\
5656+} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \
5657+ && mv -f "$cfgfile.tmp" "$cfgfile" \
5658+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
5659+test 0 -eq $? || _lt_function_replace_fail=:
5660+
5661+
5662+ sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\
5663+func_split_long_opt ()\
5664+{\
5665+\ func_split_long_opt_name=${1%%=*}\
5666+\ func_split_long_opt_arg=${1#*=}\
5667+} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \
5668+ && mv -f "$cfgfile.tmp" "$cfgfile" \
5669+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
5670+test 0 -eq $? || _lt_function_replace_fail=:
5671+
5672+
5673+ sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\
5674+func_split_short_opt ()\
5675+{\
5676+\ func_split_short_opt_arg=${1#??}\
5677+\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\
5678+} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \
5679+ && mv -f "$cfgfile.tmp" "$cfgfile" \
5680+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
5681+test 0 -eq $? || _lt_function_replace_fail=:
5682+
5683+
5684+ sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\
5685+func_lo2o ()\
5686+{\
5687+\ case ${1} in\
5688+\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\
5689+\ *) func_lo2o_result=${1} ;;\
5690+\ esac\
5691+} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \
5692+ && mv -f "$cfgfile.tmp" "$cfgfile" \
5693+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
5694+test 0 -eq $? || _lt_function_replace_fail=:
5695+
5696+
5697+ sed -e '/^func_xform ()$/,/^} # func_xform /c\
5698+func_xform ()\
5699+{\
5700+ func_xform_result=${1%.*}.lo\
5701+} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \
5702+ && mv -f "$cfgfile.tmp" "$cfgfile" \
5703+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
5704+test 0 -eq $? || _lt_function_replace_fail=:
5705+
5706+
5707+ sed -e '/^func_arith ()$/,/^} # func_arith /c\
5708+func_arith ()\
5709+{\
5710+ func_arith_result=$(( $* ))\
5711+} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \
5712+ && mv -f "$cfgfile.tmp" "$cfgfile" \
5713+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
5714+test 0 -eq $? || _lt_function_replace_fail=:
5715+
5716+
5717+ sed -e '/^func_len ()$/,/^} # func_len /c\
5718+func_len ()\
5719+{\
5720+ func_len_result=${#1}\
5721+} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \
5722+ && mv -f "$cfgfile.tmp" "$cfgfile" \
5723+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
5724+test 0 -eq $? || _lt_function_replace_fail=:
5725+
5726+fi
5727+
5728+if test x"$lt_shell_append" = xyes; then
5729+ sed -e '/^func_append ()$/,/^} # func_append /c\
5730+func_append ()\
5731+{\
5732+ eval "${1}+=\\${2}"\
5733+} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \
5734+ && mv -f "$cfgfile.tmp" "$cfgfile" \
5735+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
5736+test 0 -eq $? || _lt_function_replace_fail=:
5737+
5738+
5739+ sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\
5740+func_append_quoted ()\
5741+{\
5742+\ func_quote_for_eval "${2}"\
5743+\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\
5744+} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \
5745+ && mv -f "$cfgfile.tmp" "$cfgfile" \
5746+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
5747+test 0 -eq $? || _lt_function_replace_fail=:
5748+
5749+
5750+ # Save a `func_append' function call where possible by direct use of '+='
5751+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
5752+ && mv -f "$cfgfile.tmp" "$cfgfile" \
5753+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
5754+ test 0 -eq $? || _lt_function_replace_fail=:
5755+else
5756+ # Save a `func_append' function call even when '+=' is not available
5757+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
5758+ && mv -f "$cfgfile.tmp" "$cfgfile" \
5759+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
5760+ test 0 -eq $? || _lt_function_replace_fail=:
5761+fi
5762+
5763+if test x"$_lt_function_replace_fail" = x":"; then
5764+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5
5765+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;}
5766+fi
5767
5768- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
5769- || (rm -f "$cfgfile"; exit 1)
5770
5771- mv -f "$cfgfile" "$ofile" ||
5772+ mv -f "$cfgfile" "$ofile" ||
5773 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
5774 chmod +x "$ofile"
5775
5776--- a/gprof/configure
5777+++ b/gprof/configure
5778@@ -662,8 +662,11 @@ OTOOL
5779 LIPO
5780 NMEDIT
5781 DSYMUTIL
5782+MANIFEST_TOOL
5783 RANLIB
5784+ac_ct_AR
5785 AR
5786+DLLTOOL
5787 OBJDUMP
5788 LN_S
5789 NM
5790@@ -780,6 +783,7 @@ enable_static
5791 with_pic
5792 enable_fast_install
5793 with_gnu_ld
5794+with_libtool_sysroot
5795 enable_libtool_lock
5796 enable_plugins
5797 enable_largefile
5798@@ -1442,6 +1446,8 @@ Optional Packages:
5799 --with-pic try to use only PIC/non-PIC objects [default=use
5800 both]
5801 --with-gnu-ld assume the C compiler uses GNU ld [default=no]
5802+ --with-libtool-sysroot=DIR Search for dependent libraries within DIR
5803+ (or the compiler's sysroot if not specified).
5804
5805 Some influential environment variables:
5806 CC C compiler command
5807@@ -5124,8 +5130,8 @@ esac
5808
5809
5810
5811-macro_version='2.2.7a'
5812-macro_revision='1.3134'
5813+macro_version='2.4'
5814+macro_revision='1.3293'
5815
5816
5817
5818@@ -5165,7 +5171,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
5819 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
5820 $as_echo_n "checking how to print strings... " >&6; }
5821 # Test print first, because it will be a builtin if present.
5822-if test "X`print -r -- -n 2>/dev/null`" = X-n && \
5823+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
5824 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
5825 ECHO='print -r --'
5826 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
5827@@ -5851,8 +5857,8 @@ $as_echo_n "checking whether the shell u
5828 # Try some XSI features
5829 xsi_shell=no
5830 ( _lt_dummy="a/b/c"
5831- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
5832- = c,a/b,, \
5833+ test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
5834+ = c,a/b,b/c, \
5835 && eval 'test $(( 1 + 1 )) -eq 2 \
5836 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
5837 && xsi_shell=yes
5838@@ -5901,6 +5907,80 @@ esac
5839
5840
5841
5842+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5
5843+$as_echo_n "checking how to convert $build file names to $host format... " >&6; }
5844+if test "${lt_cv_to_host_file_cmd+set}" = set; then :
5845+ $as_echo_n "(cached) " >&6
5846+else
5847+ case $host in
5848+ *-*-mingw* )
5849+ case $build in
5850+ *-*-mingw* ) # actually msys
5851+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
5852+ ;;
5853+ *-*-cygwin* )
5854+ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
5855+ ;;
5856+ * ) # otherwise, assume *nix
5857+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
5858+ ;;
5859+ esac
5860+ ;;
5861+ *-*-cygwin* )
5862+ case $build in
5863+ *-*-mingw* ) # actually msys
5864+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
5865+ ;;
5866+ *-*-cygwin* )
5867+ lt_cv_to_host_file_cmd=func_convert_file_noop
5868+ ;;
5869+ * ) # otherwise, assume *nix
5870+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
5871+ ;;
5872+ esac
5873+ ;;
5874+ * ) # unhandled hosts (and "normal" native builds)
5875+ lt_cv_to_host_file_cmd=func_convert_file_noop
5876+ ;;
5877+esac
5878+
5879+fi
5880+
5881+to_host_file_cmd=$lt_cv_to_host_file_cmd
5882+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5
5883+$as_echo "$lt_cv_to_host_file_cmd" >&6; }
5884+
5885+
5886+
5887+
5888+
5889+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5
5890+$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; }
5891+if test "${lt_cv_to_tool_file_cmd+set}" = set; then :
5892+ $as_echo_n "(cached) " >&6
5893+else
5894+ #assume ordinary cross tools, or native build.
5895+lt_cv_to_tool_file_cmd=func_convert_file_noop
5896+case $host in
5897+ *-*-mingw* )
5898+ case $build in
5899+ *-*-mingw* ) # actually msys
5900+ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
5901+ ;;
5902+ esac
5903+ ;;
5904+esac
5905+
5906+fi
5907+
5908+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
5909+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5
5910+$as_echo "$lt_cv_to_tool_file_cmd" >&6; }
5911+
5912+
5913+
5914+
5915+
5916 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
5917 $as_echo_n "checking for $LD option to reload object files... " >&6; }
5918 if ${lt_cv_ld_reload_flag+:} false; then :
5919@@ -5917,6 +5997,11 @@ case $reload_flag in
5920 esac
5921 reload_cmds='$LD$reload_flag -o $output$reload_objs'
5922 case $host_os in
5923+ cygwin* | mingw* | pw32* | cegcc*)
5924+ if test "$GCC" != yes; then
5925+ reload_cmds=false
5926+ fi
5927+ ;;
5928 darwin*)
5929 if test "$GCC" = yes; then
5930 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
5931@@ -6085,7 +6170,8 @@ mingw* | pw32*)
5932 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
5933 lt_cv_file_magic_cmd='func_win32_libid'
5934 else
5935- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
5936+ # Keep this pattern in sync with the one in func_win32_libid.
5937+ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
5938 lt_cv_file_magic_cmd='$OBJDUMP -f'
5939 fi
5940 ;;
5941@@ -6162,11 +6248,6 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu)
5942 lt_cv_deplibs_check_method=pass_all
5943 ;;
5944
5945-linux-uclibc*)
5946- lt_cv_deplibs_check_method=pass_all
5947- lt_cv_file_magic_test_file=`echo /lib/libuClibc-*.so`
5948- ;;
5949-
5950 netbsd*)
5951 if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
5952 lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
5953@@ -6244,6 +6325,21 @@ esac
5954 fi
5955 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
5956 $as_echo "$lt_cv_deplibs_check_method" >&6; }
5957+
5958+file_magic_glob=
5959+want_nocaseglob=no
5960+if test "$build" = "$host"; then
5961+ case $host_os in
5962+ mingw* | pw32*)
5963+ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
5964+ want_nocaseglob=yes
5965+ else
5966+ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"`
5967+ fi
5968+ ;;
5969+ esac
5970+fi
5971+
5972 file_magic_cmd=$lt_cv_file_magic_cmd
5973 deplibs_check_method=$lt_cv_deplibs_check_method
5974 test -z "$deplibs_check_method" && deplibs_check_method=unknown
5975@@ -6259,9 +6355,162 @@ test -z "$deplibs_check_method" && depli
5976
5977
5978
5979+
5980+
5981+
5982+
5983+
5984+
5985+
5986+
5987+
5988+
5989 if test -n "$ac_tool_prefix"; then
5990- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
5991-set dummy ${ac_tool_prefix}ar; ac_word=$2
5992+ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
5993+set dummy ${ac_tool_prefix}dlltool; ac_word=$2
5994+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
5995+$as_echo_n "checking for $ac_word... " >&6; }
5996+if test "${ac_cv_prog_DLLTOOL+set}" = set; then :
5997+ $as_echo_n "(cached) " >&6
5998+else
5999+ if test -n "$DLLTOOL"; then
6000+ ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
6001+else
6002+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
6003+for as_dir in $PATH
6004+do
6005+ IFS=$as_save_IFS
6006+ test -z "$as_dir" && as_dir=.
6007+ for ac_exec_ext in '' $ac_executable_extensions; do
6008+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
6009+ ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
6010+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
6011+ break 2
6012+ fi
6013+done
6014+ done
6015+IFS=$as_save_IFS
6016+
6017+fi
6018+fi
6019+DLLTOOL=$ac_cv_prog_DLLTOOL
6020+if test -n "$DLLTOOL"; then
6021+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
6022+$as_echo "$DLLTOOL" >&6; }
6023+else
6024+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
6025+$as_echo "no" >&6; }
6026+fi
6027+
6028+
6029+fi
6030+if test -z "$ac_cv_prog_DLLTOOL"; then
6031+ ac_ct_DLLTOOL=$DLLTOOL
6032+ # Extract the first word of "dlltool", so it can be a program name with args.
6033+set dummy dlltool; ac_word=$2
6034+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
6035+$as_echo_n "checking for $ac_word... " >&6; }
6036+if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then :
6037+ $as_echo_n "(cached) " >&6
6038+else
6039+ if test -n "$ac_ct_DLLTOOL"; then
6040+ ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
6041+else
6042+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
6043+for as_dir in $PATH
6044+do
6045+ IFS=$as_save_IFS
6046+ test -z "$as_dir" && as_dir=.
6047+ for ac_exec_ext in '' $ac_executable_extensions; do
6048+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
6049+ ac_cv_prog_ac_ct_DLLTOOL="dlltool"
6050+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
6051+ break 2
6052+ fi
6053+done
6054+ done
6055+IFS=$as_save_IFS
6056+
6057+fi
6058+fi
6059+ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
6060+if test -n "$ac_ct_DLLTOOL"; then
6061+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
6062+$as_echo "$ac_ct_DLLTOOL" >&6; }
6063+else
6064+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
6065+$as_echo "no" >&6; }
6066+fi
6067+
6068+ if test "x$ac_ct_DLLTOOL" = x; then
6069+ DLLTOOL="false"
6070+ else
6071+ case $cross_compiling:$ac_tool_warned in
6072+yes:)
6073+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
6074+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
6075+ac_tool_warned=yes ;;
6076+esac
6077+ DLLTOOL=$ac_ct_DLLTOOL
6078+ fi
6079+else
6080+ DLLTOOL="$ac_cv_prog_DLLTOOL"
6081+fi
6082+
6083+test -z "$DLLTOOL" && DLLTOOL=dlltool
6084+
6085+
6086+
6087+
6088+
6089+
6090+
6091+
6092+
6093+
6094+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5
6095+$as_echo_n "checking how to associate runtime and link libraries... " >&6; }
6096+if test "${lt_cv_sharedlib_from_linklib_cmd+set}" = set; then :
6097+ $as_echo_n "(cached) " >&6
6098+else
6099+ lt_cv_sharedlib_from_linklib_cmd='unknown'
6100+
6101+case $host_os in
6102+cygwin* | mingw* | pw32* | cegcc*)
6103+ # two different shell functions defined in ltmain.sh
6104+ # decide which to use based on capabilities of $DLLTOOL
6105+ case `$DLLTOOL --help 2>&1` in
6106+ *--identify-strict*)
6107+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
6108+ ;;
6109+ *)
6110+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
6111+ ;;
6112+ esac
6113+ ;;
6114+*)
6115+ # fallback: assume linklib IS sharedlib
6116+ lt_cv_sharedlib_from_linklib_cmd="$ECHO"
6117+ ;;
6118+esac
6119+
6120+fi
6121+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5
6122+$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; }
6123+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
6124+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
6125+
6126+
6127+
6128+
6129+
6130+
6131+
6132+if test -n "$ac_tool_prefix"; then
6133+ for ac_prog in ar
6134+ do
6135+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
6136+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
6137 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
6138 $as_echo_n "checking for $ac_word... " >&6; }
6139 if ${ac_cv_prog_AR+:} false; then :
6140@@ -6276,8 +6525,8 @@ do
6141 IFS=$as_save_IFS
6142 test -z "$as_dir" && as_dir=.
6143 for ac_exec_ext in '' $ac_executable_extensions; do
6144- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
6145- ac_cv_prog_AR="${ac_tool_prefix}ar"
6146+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
6147+ ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
6148 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
6149 break 2
6150 fi
6151@@ -6297,11 +6546,15 @@ $as_echo "no" >&6; }
6152 fi
6153
6154
6155+ test -n "$AR" && break
6156+ done
6157 fi
6158-if test -z "$ac_cv_prog_AR"; then
6159+if test -z "$AR"; then
6160 ac_ct_AR=$AR
6161- # Extract the first word of "ar", so it can be a program name with args.
6162-set dummy ar; ac_word=$2
6163+ for ac_prog in ar
6164+do
6165+ # Extract the first word of "$ac_prog", so it can be a program name with args.
6166+set dummy $ac_prog; ac_word=$2
6167 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
6168 $as_echo_n "checking for $ac_word... " >&6; }
6169 if ${ac_cv_prog_ac_ct_AR+:} false; then :
6170@@ -6336,6 +6589,10 @@ else
6171 $as_echo "no" >&6; }
6172 fi
6173
6174+
6175+ test -n "$ac_ct_AR" && break
6176+done
6177+
6178 if test "x$ac_ct_AR" = x; then
6179 AR="false"
6180 else
6181@@ -6347,12 +6604,10 @@ ac_tool_warned=yes ;;
6182 esac
6183 AR=$ac_ct_AR
6184 fi
6185-else
6186- AR="$ac_cv_prog_AR"
6187 fi
6188
6189-test -z "$AR" && AR=ar
6190-test -z "$AR_FLAGS" && AR_FLAGS=cru
6191+: ${AR=ar}
6192+: ${AR_FLAGS=cru}
6193
6194
6195
6196@@ -6364,6 +6619,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru
6197
6198
6199
6200+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
6201+$as_echo_n "checking for archiver @FILE support... " >&6; }
6202+if test "${lt_cv_ar_at_file+set}" = set; then :
6203+ $as_echo_n "(cached) " >&6
6204+else
6205+ lt_cv_ar_at_file=no
6206+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
6207+/* end confdefs.h. */
6208+
6209+int
6210+main ()
6211+{
6212+
6213+ ;
6214+ return 0;
6215+}
6216+_ACEOF
6217+if ac_fn_c_try_compile "$LINENO"; then :
6218+ echo conftest.$ac_objext > conftest.lst
6219+ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5'
6220+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
6221+ (eval $lt_ar_try) 2>&5
6222+ ac_status=$?
6223+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
6224+ test $ac_status = 0; }
6225+ if test "$ac_status" -eq 0; then
6226+ # Ensure the archiver fails upon bogus file names.
6227+ rm -f conftest.$ac_objext libconftest.a
6228+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
6229+ (eval $lt_ar_try) 2>&5
6230+ ac_status=$?
6231+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
6232+ test $ac_status = 0; }
6233+ if test "$ac_status" -ne 0; then
6234+ lt_cv_ar_at_file=@
6235+ fi
6236+ fi
6237+ rm -f conftest.* libconftest.a
6238+
6239+fi
6240+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
6241+
6242+fi
6243+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
6244+$as_echo "$lt_cv_ar_at_file" >&6; }
6245+
6246+if test "x$lt_cv_ar_at_file" = xno; then
6247+ archiver_list_spec=
6248+else
6249+ archiver_list_spec=$lt_cv_ar_at_file
6250+fi
6251+
6252+
6253+
6254+
6255+
6256+
6257+
6258 if test -n "$ac_tool_prefix"; then
6259 # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
6260 set dummy ${ac_tool_prefix}strip; ac_word=$2
6261@@ -6698,8 +7011,8 @@ esac
6262 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
6263
6264 # Transform an extracted symbol line into symbol name and symbol address
6265-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
6266-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'"
6267+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
6268+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'"
6269
6270 # Handle CRLF in mingw tool chain
6271 opt_cr=
6272@@ -6735,6 +7048,7 @@ for ac_symprfx in "" "_"; do
6273 else
6274 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
6275 fi
6276+ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
6277
6278 # Check to see that the pipe works correctly.
6279 pipe_works=no
6280@@ -6776,6 +7090,18 @@ _LT_EOF
6281 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
6282 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
6283 cat <<_LT_EOF > conftest.$ac_ext
6284+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */
6285+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
6286+/* DATA imports from DLLs on WIN32 con't be const, because runtime
6287+ relocations are performed -- see ld's documentation on pseudo-relocs. */
6288+# define LT_DLSYM_CONST
6289+#elif defined(__osf__)
6290+/* This system does not cope well with relocations in const data. */
6291+# define LT_DLSYM_CONST
6292+#else
6293+# define LT_DLSYM_CONST const
6294+#endif
6295+
6296 #ifdef __cplusplus
6297 extern "C" {
6298 #endif
6299@@ -6787,7 +7113,7 @@ _LT_EOF
6300 cat <<_LT_EOF >> conftest.$ac_ext
6301
6302 /* The mapping between symbol names and symbols. */
6303-const struct {
6304+LT_DLSYM_CONST struct {
6305 const char *name;
6306 void *address;
6307 }
6308@@ -6813,8 +7139,8 @@ static const void *lt_preloaded_setup()
6309 _LT_EOF
6310 # Now try linking the two files.
6311 mv conftest.$ac_objext conftstm.$ac_objext
6312- lt_save_LIBS="$LIBS"
6313- lt_save_CFLAGS="$CFLAGS"
6314+ lt_globsym_save_LIBS=$LIBS
6315+ lt_globsym_save_CFLAGS=$CFLAGS
6316 LIBS="conftstm.$ac_objext"
6317 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
6318 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
6319@@ -6824,8 +7150,8 @@ _LT_EOF
6320 test $ac_status = 0; } && test -s conftest${ac_exeext}; then
6321 pipe_works=yes
6322 fi
6323- LIBS="$lt_save_LIBS"
6324- CFLAGS="$lt_save_CFLAGS"
6325+ LIBS=$lt_globsym_save_LIBS
6326+ CFLAGS=$lt_globsym_save_CFLAGS
6327 else
6328 echo "cannot find nm_test_func in $nlist" >&5
6329 fi
6330@@ -6862,6 +7188,17 @@ else
6331 $as_echo "ok" >&6; }
6332 fi
6333
6334+# Response file support.
6335+if test "$lt_cv_nm_interface" = "MS dumpbin"; then
6336+ nm_file_list_spec='@'
6337+elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then
6338+ nm_file_list_spec='@'
6339+fi
6340+
6341+
6342+
6343+
6344+
6345
6346
6347
6348@@ -6883,6 +7220,44 @@ fi
6349
6350
6351
6352+
6353+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
6354+$as_echo_n "checking for sysroot... " >&6; }
6355+
6356+# Check whether --with-libtool-sysroot was given.
6357+if test "${with_libtool_sysroot+set}" = set; then :
6358+ withval=$with_libtool_sysroot;
6359+else
6360+ with_libtool_sysroot=no
6361+fi
6362+
6363+
6364+lt_sysroot=
6365+case ${with_libtool_sysroot} in #(
6366+ yes)
6367+ if test "$GCC" = yes; then
6368+ lt_sysroot=`$CC --print-sysroot 2>/dev/null`
6369+ fi
6370+ ;; #(
6371+ /*)
6372+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"`
6373+ ;; #(
6374+ no|'')
6375+ ;; #(
6376+ *)
6377+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5
6378+$as_echo "${with_libtool_sysroot}" >&6; }
6379+ as_fn_error "The sysroot must be an absolute path." "$LINENO" 5
6380+ ;;
6381+esac
6382+
6383+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
6384+$as_echo "${lt_sysroot:-no}" >&6; }
6385+
6386+
6387+
6388+
6389+
6390 # Check whether --enable-libtool-lock was given.
6391 if test "${enable_libtool_lock+set}" = set; then :
6392 enableval=$enable_libtool_lock;
6393@@ -7089,6 +7464,123 @@ esac
6394
6395 need_locks="$enable_libtool_lock"
6396
6397+if test -n "$ac_tool_prefix"; then
6398+ # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args.
6399+set dummy ${ac_tool_prefix}mt; ac_word=$2
6400+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
6401+$as_echo_n "checking for $ac_word... " >&6; }
6402+if test "${ac_cv_prog_MANIFEST_TOOL+set}" = set; then :
6403+ $as_echo_n "(cached) " >&6
6404+else
6405+ if test -n "$MANIFEST_TOOL"; then
6406+ ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test.
6407+else
6408+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
6409+for as_dir in $PATH
6410+do
6411+ IFS=$as_save_IFS
6412+ test -z "$as_dir" && as_dir=.
6413+ for ac_exec_ext in '' $ac_executable_extensions; do
6414+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
6415+ ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
6416+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
6417+ break 2
6418+ fi
6419+done
6420+ done
6421+IFS=$as_save_IFS
6422+
6423+fi
6424+fi
6425+MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL
6426+if test -n "$MANIFEST_TOOL"; then
6427+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5
6428+$as_echo "$MANIFEST_TOOL" >&6; }
6429+else
6430+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
6431+$as_echo "no" >&6; }
6432+fi
6433+
6434+
6435+fi
6436+if test -z "$ac_cv_prog_MANIFEST_TOOL"; then
6437+ ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL
6438+ # Extract the first word of "mt", so it can be a program name with args.
6439+set dummy mt; ac_word=$2
6440+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
6441+$as_echo_n "checking for $ac_word... " >&6; }
6442+if test "${ac_cv_prog_ac_ct_MANIFEST_TOOL+set}" = set; then :
6443+ $as_echo_n "(cached) " >&6
6444+else
6445+ if test -n "$ac_ct_MANIFEST_TOOL"; then
6446+ ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test.
6447+else
6448+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
6449+for as_dir in $PATH
6450+do
6451+ IFS=$as_save_IFS
6452+ test -z "$as_dir" && as_dir=.
6453+ for ac_exec_ext in '' $ac_executable_extensions; do
6454+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
6455+ ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
6456+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
6457+ break 2
6458+ fi
6459+done
6460+ done
6461+IFS=$as_save_IFS
6462+
6463+fi
6464+fi
6465+ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL
6466+if test -n "$ac_ct_MANIFEST_TOOL"; then
6467+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5
6468+$as_echo "$ac_ct_MANIFEST_TOOL" >&6; }
6469+else
6470+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
6471+$as_echo "no" >&6; }
6472+fi
6473+
6474+ if test "x$ac_ct_MANIFEST_TOOL" = x; then
6475+ MANIFEST_TOOL=":"
6476+ else
6477+ case $cross_compiling:$ac_tool_warned in
6478+yes:)
6479+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
6480+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
6481+ac_tool_warned=yes ;;
6482+esac
6483+ MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL
6484+ fi
6485+else
6486+ MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL"
6487+fi
6488+
6489+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
6490+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5
6491+$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; }
6492+if test "${lt_cv_path_mainfest_tool+set}" = set; then :
6493+ $as_echo_n "(cached) " >&6
6494+else
6495+ lt_cv_path_mainfest_tool=no
6496+ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5
6497+ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
6498+ cat conftest.err >&5
6499+ if $GREP 'Manifest Tool' conftest.out > /dev/null; then
6500+ lt_cv_path_mainfest_tool=yes
6501+ fi
6502+ rm -f conftest*
6503+fi
6504+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5
6505+$as_echo "$lt_cv_path_mainfest_tool" >&6; }
6506+if test "x$lt_cv_path_mainfest_tool" != xyes; then
6507+ MANIFEST_TOOL=:
6508+fi
6509+
6510+
6511+
6512+
6513+
6514
6515 case $host_os in
6516 rhapsody* | darwin*)
6517@@ -7652,6 +8144,8 @@ _LT_EOF
6518 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
6519 echo "$AR cru libconftest.a conftest.o" >&5
6520 $AR cru libconftest.a conftest.o 2>&5
6521+ echo "$RANLIB libconftest.a" >&5
6522+ $RANLIB libconftest.a 2>&5
6523 cat > conftest.c << _LT_EOF
6524 int main() { return 0;}
6525 _LT_EOF
6526@@ -7847,7 +8341,8 @@ fi
6527 LIBTOOL_DEPS="$ltmain"
6528
6529 # Always use our own libtool.
6530-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
6531+LIBTOOL='$(SHELL) $(top_builddir)'
6532+LIBTOOL="$LIBTOOL/${host_alias}-libtool"
6533
6534
6535
6536@@ -7936,7 +8431,7 @@ aix3*)
6537 esac
6538
6539 # Global variables:
6540-ofile=libtool
6541+ofile=${host_alias}-libtool
6542 can_build_shared=yes
6543
6544 # All known linkers require a `.a' archive for static linking (except MSVC,
6545@@ -8234,8 +8729,6 @@ fi
6546 lt_prog_compiler_pic=
6547 lt_prog_compiler_static=
6548
6549-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
6550-$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
6551
6552 if test "$GCC" = yes; then
6553 lt_prog_compiler_wl='-Wl,'
6554@@ -8401,6 +8894,12 @@ $as_echo_n "checking for $compiler optio
6555 lt_prog_compiler_pic='--shared'
6556 lt_prog_compiler_static='--static'
6557 ;;
6558+ nagfor*)
6559+ # NAG Fortran compiler
6560+ lt_prog_compiler_wl='-Wl,-Wl,,'
6561+ lt_prog_compiler_pic='-PIC'
6562+ lt_prog_compiler_static='-Bstatic'
6563+ ;;
6564 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
6565 # Portland Group compilers (*not* the Pentium gcc compiler,
6566 # which looks to be a dead project)
6567@@ -8463,7 +8962,7 @@ $as_echo_n "checking for $compiler optio
6568 lt_prog_compiler_pic='-KPIC'
6569 lt_prog_compiler_static='-Bstatic'
6570 case $cc_basename in
6571- f77* | f90* | f95*)
6572+ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
6573 lt_prog_compiler_wl='-Qoption ld ';;
6574 *)
6575 lt_prog_compiler_wl='-Wl,';;
6576@@ -8520,13 +9019,17 @@ case $host_os in
6577 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
6578 ;;
6579 esac
6580-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5
6581-$as_echo "$lt_prog_compiler_pic" >&6; }
6582-
6583-
6584-
6585-
6586
6587+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
6588+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
6589+if test "${lt_cv_prog_compiler_pic+set}" = set; then :
6590+ $as_echo_n "(cached) " >&6
6591+else
6592+ lt_cv_prog_compiler_pic=$lt_prog_compiler_pic
6593+fi
6594+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
6595+$as_echo "$lt_cv_prog_compiler_pic" >&6; }
6596+lt_prog_compiler_pic=$lt_cv_prog_compiler_pic
6597
6598 #
6599 # Check to make sure the PIC flag actually works.
6600@@ -8587,6 +9090,11 @@ fi
6601
6602
6603
6604+
6605+
6606+
6607+
6608+
6609 #
6610 # Check to make sure the static flag actually works.
6611 #
6612@@ -8937,7 +9445,8 @@ _LT_EOF
6613 allow_undefined_flag=unsupported
6614 always_export_symbols=no
6615 enable_shared_with_static_runtimes=yes
6616- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
6617+ 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'
6618+ exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
6619
6620 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
6621 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
6622@@ -9036,12 +9545,12 @@ _LT_EOF
6623 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
6624 hardcode_libdir_flag_spec=
6625 hardcode_libdir_flag_spec_ld='-rpath $libdir'
6626- archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
6627+ archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
6628 if test "x$supports_anon_versioning" = xyes; then
6629 archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
6630 cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
6631 echo "local: *; };" >> $output_objdir/$libname.ver~
6632- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
6633+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
6634 fi
6635 ;;
6636 esac
6637@@ -9055,8 +9564,8 @@ _LT_EOF
6638 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
6639 wlarc=
6640 else
6641- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
6642- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
6643+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
6644+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
6645 fi
6646 ;;
6647
6648@@ -9074,8 +9583,8 @@ _LT_EOF
6649
6650 _LT_EOF
6651 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
6652- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
6653- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
6654+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
6655+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
6656 else
6657 ld_shlibs=no
6658 fi
6659@@ -9121,8 +9630,8 @@ _LT_EOF
6660
6661 *)
6662 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
6663- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
6664- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
6665+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
6666+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
6667 else
6668 ld_shlibs=no
6669 fi
6670@@ -9252,7 +9761,13 @@ _LT_EOF
6671 allow_undefined_flag='-berok'
6672 # Determine the default libpath from the value encoded in an
6673 # empty executable.
6674- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
6675+ if test "${lt_cv_aix_libpath+set}" = set; then
6676+ aix_libpath=$lt_cv_aix_libpath
6677+else
6678+ if test "${lt_cv_aix_libpath_+set}" = set; then :
6679+ $as_echo_n "(cached) " >&6
6680+else
6681+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
6682 /* end confdefs.h. */
6683
6684 int
6685@@ -9265,22 +9780,29 @@ main ()
6686 _ACEOF
6687 if ac_fn_c_try_link "$LINENO"; then :
6688
6689-lt_aix_libpath_sed='
6690- /Import File Strings/,/^$/ {
6691- /^0/ {
6692- s/^0 *\(.*\)$/\1/
6693- p
6694- }
6695- }'
6696-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
6697-# Check for a 64-bit object if we didn't find anything.
6698-if test -z "$aix_libpath"; then
6699- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
6700-fi
6701+ lt_aix_libpath_sed='
6702+ /Import File Strings/,/^$/ {
6703+ /^0/ {
6704+ s/^0 *\([^ ]*\) *$/\1/
6705+ p
6706+ }
6707+ }'
6708+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
6709+ # Check for a 64-bit object if we didn't find anything.
6710+ if test -z "$lt_cv_aix_libpath_"; then
6711+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
6712+ fi
6713 fi
6714 rm -f core conftest.err conftest.$ac_objext \
6715 conftest$ac_exeext conftest.$ac_ext
6716-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
6717+ if test -z "$lt_cv_aix_libpath_"; then
6718+ lt_cv_aix_libpath_="/usr/lib:/lib"
6719+ fi
6720+
6721+fi
6722+
6723+ aix_libpath=$lt_cv_aix_libpath_
6724+fi
6725
6726 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
6727 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"
6728@@ -9292,7 +9814,13 @@ if test -z "$aix_libpath"; then aix_libp
6729 else
6730 # Determine the default libpath from the value encoded in an
6731 # empty executable.
6732- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
6733+ if test "${lt_cv_aix_libpath+set}" = set; then
6734+ aix_libpath=$lt_cv_aix_libpath
6735+else
6736+ if test "${lt_cv_aix_libpath_+set}" = set; then :
6737+ $as_echo_n "(cached) " >&6
6738+else
6739+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
6740 /* end confdefs.h. */
6741
6742 int
6743@@ -9305,22 +9833,29 @@ main ()
6744 _ACEOF
6745 if ac_fn_c_try_link "$LINENO"; then :
6746
6747-lt_aix_libpath_sed='
6748- /Import File Strings/,/^$/ {
6749- /^0/ {
6750- s/^0 *\(.*\)$/\1/
6751- p
6752- }
6753- }'
6754-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
6755-# Check for a 64-bit object if we didn't find anything.
6756-if test -z "$aix_libpath"; then
6757- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
6758-fi
6759+ lt_aix_libpath_sed='
6760+ /Import File Strings/,/^$/ {
6761+ /^0/ {
6762+ s/^0 *\([^ ]*\) *$/\1/
6763+ p
6764+ }
6765+ }'
6766+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
6767+ # Check for a 64-bit object if we didn't find anything.
6768+ if test -z "$lt_cv_aix_libpath_"; then
6769+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
6770+ fi
6771 fi
6772 rm -f core conftest.err conftest.$ac_objext \
6773 conftest$ac_exeext conftest.$ac_ext
6774-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
6775+ if test -z "$lt_cv_aix_libpath_"; then
6776+ lt_cv_aix_libpath_="/usr/lib:/lib"
6777+ fi
6778+
6779+fi
6780+
6781+ aix_libpath=$lt_cv_aix_libpath_
6782+fi
6783
6784 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
6785 # Warning - without using the other run time loading flags,
6786@@ -9365,20 +9900,63 @@ if test -z "$aix_libpath"; then aix_libp
6787 # Microsoft Visual C++.
6788 # hardcode_libdir_flag_spec is actually meaningless, as there is
6789 # no search path for DLLs.
6790- hardcode_libdir_flag_spec=' '
6791- allow_undefined_flag=unsupported
6792- # Tell ltmain to make .lib files, not .a files.
6793- libext=lib
6794- # Tell ltmain to make .dll files, not .so files.
6795- shrext_cmds=".dll"
6796- # FIXME: Setting linknames here is a bad hack.
6797- archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
6798- # The linker will automatically build a .lib file if we build a DLL.
6799- old_archive_from_new_cmds='true'
6800- # FIXME: Should let the user specify the lib program.
6801- old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
6802- fix_srcfile_path='`cygpath -w "$srcfile"`'
6803- enable_shared_with_static_runtimes=yes
6804+ case $cc_basename in
6805+ cl*)
6806+ # Native MSVC
6807+ hardcode_libdir_flag_spec=' '
6808+ allow_undefined_flag=unsupported
6809+ always_export_symbols=yes
6810+ file_list_spec='@'
6811+ # Tell ltmain to make .lib files, not .a files.
6812+ libext=lib
6813+ # Tell ltmain to make .dll files, not .so files.
6814+ shrext_cmds=".dll"
6815+ # FIXME: Setting linknames here is a bad hack.
6816+ archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
6817+ archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
6818+ sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
6819+ else
6820+ sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
6821+ fi~
6822+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
6823+ linknames='
6824+ # The linker will not automatically build a static lib if we build a DLL.
6825+ # _LT_TAGVAR(old_archive_from_new_cmds, )='true'
6826+ enable_shared_with_static_runtimes=yes
6827+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
6828+ # Don't use ranlib
6829+ old_postinstall_cmds='chmod 644 $oldlib'
6830+ postlink_cmds='lt_outputfile="@OUTPUT@"~
6831+ lt_tool_outputfile="@TOOL_OUTPUT@"~
6832+ case $lt_outputfile in
6833+ *.exe|*.EXE) ;;
6834+ *)
6835+ lt_outputfile="$lt_outputfile.exe"
6836+ lt_tool_outputfile="$lt_tool_outputfile.exe"
6837+ ;;
6838+ esac~
6839+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
6840+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
6841+ $RM "$lt_outputfile.manifest";
6842+ fi'
6843+ ;;
6844+ *)
6845+ # Assume MSVC wrapper
6846+ hardcode_libdir_flag_spec=' '
6847+ allow_undefined_flag=unsupported
6848+ # Tell ltmain to make .lib files, not .a files.
6849+ libext=lib
6850+ # Tell ltmain to make .dll files, not .so files.
6851+ shrext_cmds=".dll"
6852+ # FIXME: Setting linknames here is a bad hack.
6853+ archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
6854+ # The linker will automatically build a .lib file if we build a DLL.
6855+ old_archive_from_new_cmds='true'
6856+ # FIXME: Should let the user specify the lib program.
6857+ old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
6858+ enable_shared_with_static_runtimes=yes
6859+ ;;
6860+ esac
6861 ;;
6862
6863 darwin* | rhapsody*)
6864@@ -9439,7 +10017,7 @@ if test -z "$aix_libpath"; then aix_libp
6865
6866 # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
6867 freebsd* | dragonfly*)
6868- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
6869+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
6870 hardcode_libdir_flag_spec='-R$libdir'
6871 hardcode_direct=yes
6872 hardcode_shlibpath_var=no
6873@@ -9447,7 +10025,7 @@ if test -z "$aix_libpath"; then aix_libp
6874
6875 hpux9*)
6876 if test "$GCC" = yes; then
6877- 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'
6878+ 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'
6879 else
6880 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'
6881 fi
6882@@ -9463,7 +10041,7 @@ if test -z "$aix_libpath"; then aix_libp
6883
6884 hpux10*)
6885 if test "$GCC" = yes && test "$with_gnu_ld" = no; then
6886- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
6887+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
6888 else
6889 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
6890 fi
6891@@ -9487,10 +10065,10 @@ if test -z "$aix_libpath"; then aix_libp
6892 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
6893 ;;
6894 ia64*)
6895- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
6896+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
6897 ;;
6898 *)
6899- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
6900+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
6901 ;;
6902 esac
6903 else
6904@@ -9569,23 +10147,36 @@ fi
6905
6906 irix5* | irix6* | nonstopux*)
6907 if test "$GCC" = yes; then
6908- 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'
6909+ 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'
6910 # Try to use the -exported_symbol ld option, if it does not
6911 # work, assume that -exports_file does not work either and
6912 # implicitly export all symbols.
6913- save_LDFLAGS="$LDFLAGS"
6914- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
6915- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
6916+ # This should be the same for all languages, so no per-tag cache variable.
6917+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5
6918+$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; }
6919+if test "${lt_cv_irix_exported_symbol+set}" = set; then :
6920+ $as_echo_n "(cached) " >&6
6921+else
6922+ save_LDFLAGS="$LDFLAGS"
6923+ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
6924+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
6925 /* end confdefs.h. */
6926-int foo(void) {}
6927+int foo (void) { return 0; }
6928 _ACEOF
6929 if ac_fn_c_try_link "$LINENO"; then :
6930- 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'
6931-
6932+ lt_cv_irix_exported_symbol=yes
6933+else
6934+ lt_cv_irix_exported_symbol=no
6935 fi
6936 rm -f core conftest.err conftest.$ac_objext \
6937 conftest$ac_exeext conftest.$ac_ext
6938- LDFLAGS="$save_LDFLAGS"
6939+ LDFLAGS="$save_LDFLAGS"
6940+fi
6941+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5
6942+$as_echo "$lt_cv_irix_exported_symbol" >&6; }
6943+ if test "$lt_cv_irix_exported_symbol" = yes; then
6944+ 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'
6945+ fi
6946 else
6947 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'
6948 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'
6949@@ -9670,7 +10261,7 @@ rm -f core conftest.err conftest.$ac_obj
6950 osf4* | osf5*) # as osf3* with the addition of -msym flag
6951 if test "$GCC" = yes; then
6952 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
6953- 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'
6954+ 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'
6955 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
6956 else
6957 allow_undefined_flag=' -expect_unresolved \*'
6958@@ -9689,9 +10280,9 @@ rm -f core conftest.err conftest.$ac_obj
6959 no_undefined_flag=' -z defs'
6960 if test "$GCC" = yes; then
6961 wlarc='${wl}'
6962- archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
6963+ archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
6964 archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
6965- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
6966+ $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'
6967 else
6968 case `$CC -V 2>&1` in
6969 *"Compilers 5.0"*)
6970@@ -10267,8 +10858,9 @@ cygwin* | mingw* | pw32* | cegcc*)
6971 need_version=no
6972 need_lib_prefix=no
6973
6974- case $GCC,$host_os in
6975- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
6976+ case $GCC,$cc_basename in
6977+ yes,*)
6978+ # gcc
6979 library_names_spec='$libname.dll.a'
6980 # DLL is installed to $(libdir)/../bin by postinstall_cmds
6981 postinstall_cmds='base_file=`basename \${file}`~
6982@@ -10301,13 +10893,71 @@ cygwin* | mingw* | pw32* | cegcc*)
6983 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
6984 ;;
6985 esac
6986+ dynamic_linker='Win32 ld.exe'
6987+ ;;
6988+
6989+ *,cl*)
6990+ # Native MSVC
6991+ libname_spec='$name'
6992+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
6993+ library_names_spec='${libname}.dll.lib'
6994+
6995+ case $build_os in
6996+ mingw*)
6997+ sys_lib_search_path_spec=
6998+ lt_save_ifs=$IFS
6999+ IFS=';'
7000+ for lt_path in $LIB
7001+ do
7002+ IFS=$lt_save_ifs
7003+ # Let DOS variable expansion print the short 8.3 style file name.
7004+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
7005+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
7006+ done
7007+ IFS=$lt_save_ifs
7008+ # Convert to MSYS style.
7009+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
7010+ ;;
7011+ cygwin*)
7012+ # Convert to unix form, then to dos form, then back to unix form
7013+ # but this time dos style (no spaces!) so that the unix form looks
7014+ # like /cygdrive/c/PROGRA~1:/cygdr...
7015+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
7016+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
7017+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
7018+ ;;
7019+ *)
7020+ sys_lib_search_path_spec="$LIB"
7021+ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
7022+ # It is most probably a Windows format PATH.
7023+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
7024+ else
7025+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
7026+ fi
7027+ # FIXME: find the short name or the path components, as spaces are
7028+ # common. (e.g. "Program Files" -> "PROGRA~1")
7029+ ;;
7030+ esac
7031+
7032+ # DLL is installed to $(libdir)/../bin by postinstall_cmds
7033+ postinstall_cmds='base_file=`basename \${file}`~
7034+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
7035+ dldir=$destdir/`dirname \$dlpath`~
7036+ test -d \$dldir || mkdir -p \$dldir~
7037+ $install_prog $dir/$dlname \$dldir/$dlname'
7038+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
7039+ dlpath=$dir/\$dldll~
7040+ $RM \$dlpath'
7041+ shlibpath_overrides_runpath=yes
7042+ dynamic_linker='Win32 link.exe'
7043 ;;
7044
7045 *)
7046+ # Assume MSVC wrapper
7047 library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
7048+ dynamic_linker='Win32 ld.exe'
7049 ;;
7050 esac
7051- dynamic_linker='Win32 ld.exe'
7052 # FIXME: first we should search . and the directory the executable is in
7053 shlibpath_var=PATH
7054 ;;
7055@@ -10399,7 +11049,7 @@ haiku*)
7056 soname_spec='${libname}${release}${shared_ext}$major'
7057 shlibpath_var=LIBRARY_PATH
7058 shlibpath_overrides_runpath=yes
7059- sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib'
7060+ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
7061 hardcode_into_libs=yes
7062 ;;
7063
7064@@ -11239,10 +11889,10 @@ else
7065 /* When -fvisbility=hidden is used, assume the code has been annotated
7066 correspondingly for the symbols needed. */
7067 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
7068-void fnord () __attribute__((visibility("default")));
7069+int fnord () __attribute__((visibility("default")));
7070 #endif
7071
7072-void fnord () { int i=42; }
7073+int fnord () { return 42; }
7074 int main ()
7075 {
7076 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
7077@@ -11345,10 +11995,10 @@ else
7078 /* When -fvisbility=hidden is used, assume the code has been annotated
7079 correspondingly for the symbols needed. */
7080 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
7081-void fnord () __attribute__((visibility("default")));
7082+int fnord () __attribute__((visibility("default")));
7083 #endif
7084
7085-void fnord () { int i=42; }
7086+int fnord () { return 42; }
7087 int main ()
7088 {
7089 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
7090@@ -13314,13 +13964,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_
7091 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
7092 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
7093 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
7094+lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`'
7095+lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`'
7096 reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
7097 reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
7098 OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
7099 deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`'
7100 file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`'
7101+file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`'
7102+want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`'
7103+DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`'
7104+sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`'
7105 AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`'
7106 AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`'
7107+archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`'
7108 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
7109 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
7110 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
7111@@ -13335,14 +13992,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$l
7112 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
7113 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
7114 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"`'
7115+nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`'
7116+lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`'
7117 objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`'
7118 MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`'
7119 lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`'
7120-lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
7121 lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`'
7122+lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
7123 lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`'
7124 lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`'
7125 need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`'
7126+MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`'
7127 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
7128 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
7129 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
7130@@ -13375,12 +14035,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcod
7131 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
7132 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
7133 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
7134-fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`'
7135 always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`'
7136 export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`'
7137 exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`'
7138 include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`'
7139 prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`'
7140+postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`'
7141 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
7142 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
7143 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
7144@@ -13435,8 +14095,13 @@ reload_flag \
7145 OBJDUMP \
7146 deplibs_check_method \
7147 file_magic_cmd \
7148+file_magic_glob \
7149+want_nocaseglob \
7150+DLLTOOL \
7151+sharedlib_from_linklib_cmd \
7152 AR \
7153 AR_FLAGS \
7154+archiver_list_spec \
7155 STRIP \
7156 RANLIB \
7157 CC \
7158@@ -13446,12 +14111,14 @@ lt_cv_sys_global_symbol_pipe \
7159 lt_cv_sys_global_symbol_to_cdecl \
7160 lt_cv_sys_global_symbol_to_c_name_address \
7161 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
7162+nm_file_list_spec \
7163 lt_prog_compiler_no_builtin_flag \
7164-lt_prog_compiler_wl \
7165 lt_prog_compiler_pic \
7166+lt_prog_compiler_wl \
7167 lt_prog_compiler_static \
7168 lt_cv_prog_compiler_c_o \
7169 need_locks \
7170+MANIFEST_TOOL \
7171 DSYMUTIL \
7172 NMEDIT \
7173 LIPO \
7174@@ -13467,7 +14134,6 @@ no_undefined_flag \
7175 hardcode_libdir_flag_spec \
7176 hardcode_libdir_flag_spec_ld \
7177 hardcode_libdir_separator \
7178-fix_srcfile_path \
7179 exclude_expsyms \
7180 include_expsyms \
7181 file_list_spec \
7182@@ -13503,6 +14169,7 @@ module_cmds \
7183 module_expsym_cmds \
7184 export_symbols_cmds \
7185 prelink_cmds \
7186+postlink_cmds \
7187 postinstall_cmds \
7188 postuninstall_cmds \
7189 finish_cmds \
7190@@ -14268,7 +14935,8 @@ $as_echo X"$file" |
7191 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
7192 #
7193 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
7194-# 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
7195+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
7196+# Inc.
7197 # Written by Gordon Matzigkeit, 1996
7198 #
7199 # This file is part of GNU Libtool.
7200@@ -14371,19 +15039,42 @@ SP2NL=$lt_lt_SP2NL
7201 # turn newlines into spaces.
7202 NL2SP=$lt_lt_NL2SP
7203
7204+# convert \$build file names to \$host format.
7205+to_host_file_cmd=$lt_cv_to_host_file_cmd
7206+
7207+# convert \$build files to toolchain format.
7208+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
7209+
7210 # An object symbol dumper.
7211 OBJDUMP=$lt_OBJDUMP
7212
7213 # Method to check whether dependent libraries are shared objects.
7214 deplibs_check_method=$lt_deplibs_check_method
7215
7216-# Command to use when deplibs_check_method == "file_magic".
7217+# Command to use when deplibs_check_method = "file_magic".
7218 file_magic_cmd=$lt_file_magic_cmd
7219
7220+# How to find potential files when deplibs_check_method = "file_magic".
7221+file_magic_glob=$lt_file_magic_glob
7222+
7223+# Find potential files using nocaseglob when deplibs_check_method = "file_magic".
7224+want_nocaseglob=$lt_want_nocaseglob
7225+
7226+# DLL creation program.
7227+DLLTOOL=$lt_DLLTOOL
7228+
7229+# Command to associate shared and link libraries.
7230+sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd
7231+
7232 # The archiver.
7233 AR=$lt_AR
7234+
7235+# Flags to create an archive.
7236 AR_FLAGS=$lt_AR_FLAGS
7237
7238+# How to feed a file listing to the archiver.
7239+archiver_list_spec=$lt_archiver_list_spec
7240+
7241 # A symbol stripping program.
7242 STRIP=$lt_STRIP
7243
7244@@ -14413,6 +15104,12 @@ global_symbol_to_c_name_address=$lt_lt_c
7245 # Transform the output of nm in a C name address pair when lib prefix is needed.
7246 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
7247
7248+# Specify filename containing input files for \$NM.
7249+nm_file_list_spec=$lt_nm_file_list_spec
7250+
7251+# The root where to search for dependent libraries,and in which our libraries should be installed.
7252+lt_sysroot=$lt_sysroot
7253+
7254 # The name of the directory that contains temporary libtool files.
7255 objdir=$objdir
7256
7257@@ -14422,6 +15119,9 @@ MAGIC_CMD=$MAGIC_CMD
7258 # Must we lock files when doing compilation?
7259 need_locks=$lt_need_locks
7260
7261+# Manifest tool.
7262+MANIFEST_TOOL=$lt_MANIFEST_TOOL
7263+
7264 # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
7265 DSYMUTIL=$lt_DSYMUTIL
7266
7267@@ -14536,12 +15236,12 @@ with_gcc=$GCC
7268 # Compiler flag to turn off builtin functions.
7269 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
7270
7271-# How to pass a linker flag through the compiler.
7272-wl=$lt_lt_prog_compiler_wl
7273-
7274 # Additional compiler flags for building library objects.
7275 pic_flag=$lt_lt_prog_compiler_pic
7276
7277+# How to pass a linker flag through the compiler.
7278+wl=$lt_lt_prog_compiler_wl
7279+
7280 # Compiler flag to prevent dynamic linking.
7281 link_static_flag=$lt_lt_prog_compiler_static
7282
7283@@ -14628,9 +15328,6 @@ inherit_rpath=$inherit_rpath
7284 # Whether libtool must link a program against all its dependency libraries.
7285 link_all_deplibs=$link_all_deplibs
7286
7287-# Fix the shell variable \$srcfile for the compiler.
7288-fix_srcfile_path=$lt_fix_srcfile_path
7289-
7290 # Set to "yes" if exported symbols are required.
7291 always_export_symbols=$always_export_symbols
7292
7293@@ -14646,6 +15343,9 @@ include_expsyms=$lt_include_expsyms
7294 # Commands necessary for linking programs (against libraries) with templates.
7295 prelink_cmds=$lt_prelink_cmds
7296
7297+# Commands necessary for finishing linking programs.
7298+postlink_cmds=$lt_postlink_cmds
7299+
7300 # Specify filename containing input files.
7301 file_list_spec=$lt_file_list_spec
7302
7303@@ -14678,210 +15378,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
7304 # if finds mixed CR/LF and LF-only lines. Since sed operates in
7305 # text mode, it properly converts lines to CR/LF. This bash problem
7306 # is reportedly fixed, but why not run on old versions too?
7307- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
7308- || (rm -f "$cfgfile"; exit 1)
7309-
7310- case $xsi_shell in
7311- yes)
7312- cat << \_LT_EOF >> "$cfgfile"
7313-
7314-# func_dirname file append nondir_replacement
7315-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
7316-# otherwise set result to NONDIR_REPLACEMENT.
7317-func_dirname ()
7318-{
7319- case ${1} in
7320- */*) func_dirname_result="${1%/*}${2}" ;;
7321- * ) func_dirname_result="${3}" ;;
7322- esac
7323-}
7324-
7325-# func_basename file
7326-func_basename ()
7327-{
7328- func_basename_result="${1##*/}"
7329-}
7330-
7331-# func_dirname_and_basename file append nondir_replacement
7332-# perform func_basename and func_dirname in a single function
7333-# call:
7334-# dirname: Compute the dirname of FILE. If nonempty,
7335-# add APPEND to the result, otherwise set result
7336-# to NONDIR_REPLACEMENT.
7337-# value returned in "$func_dirname_result"
7338-# basename: Compute filename of FILE.
7339-# value retuned in "$func_basename_result"
7340-# Implementation must be kept synchronized with func_dirname
7341-# and func_basename. For efficiency, we do not delegate to
7342-# those functions but instead duplicate the functionality here.
7343-func_dirname_and_basename ()
7344-{
7345- case ${1} in
7346- */*) func_dirname_result="${1%/*}${2}" ;;
7347- * ) func_dirname_result="${3}" ;;
7348- esac
7349- func_basename_result="${1##*/}"
7350-}
7351-
7352-# func_stripname prefix suffix name
7353-# strip PREFIX and SUFFIX off of NAME.
7354-# PREFIX and SUFFIX must not contain globbing or regex special
7355-# characters, hashes, percent signs, but SUFFIX may contain a leading
7356-# dot (in which case that matches only a dot).
7357-func_stripname ()
7358-{
7359- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
7360- # positional parameters, so assign one to ordinary parameter first.
7361- func_stripname_result=${3}
7362- func_stripname_result=${func_stripname_result#"${1}"}
7363- func_stripname_result=${func_stripname_result%"${2}"}
7364-}
7365-
7366-# func_opt_split
7367-func_opt_split ()
7368-{
7369- func_opt_split_opt=${1%%=*}
7370- func_opt_split_arg=${1#*=}
7371-}
7372-
7373-# func_lo2o object
7374-func_lo2o ()
7375-{
7376- case ${1} in
7377- *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
7378- *) func_lo2o_result=${1} ;;
7379- esac
7380-}
7381-
7382-# func_xform libobj-or-source
7383-func_xform ()
7384-{
7385- func_xform_result=${1%.*}.lo
7386-}
7387-
7388-# func_arith arithmetic-term...
7389-func_arith ()
7390-{
7391- func_arith_result=$(( $* ))
7392-}
7393-
7394-# func_len string
7395-# STRING may not start with a hyphen.
7396-func_len ()
7397-{
7398- func_len_result=${#1}
7399-}
7400-
7401-_LT_EOF
7402- ;;
7403- *) # Bourne compatible functions.
7404- cat << \_LT_EOF >> "$cfgfile"
7405-
7406-# func_dirname file append nondir_replacement
7407-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
7408-# otherwise set result to NONDIR_REPLACEMENT.
7409-func_dirname ()
7410-{
7411- # Extract subdirectory from the argument.
7412- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
7413- if test "X$func_dirname_result" = "X${1}"; then
7414- func_dirname_result="${3}"
7415- else
7416- func_dirname_result="$func_dirname_result${2}"
7417- fi
7418-}
7419-
7420-# func_basename file
7421-func_basename ()
7422-{
7423- func_basename_result=`$ECHO "${1}" | $SED "$basename"`
7424-}
7425-
7426-
7427-# func_stripname prefix suffix name
7428-# strip PREFIX and SUFFIX off of NAME.
7429-# PREFIX and SUFFIX must not contain globbing or regex special
7430-# characters, hashes, percent signs, but SUFFIX may contain a leading
7431-# dot (in which case that matches only a dot).
7432-# func_strip_suffix prefix name
7433-func_stripname ()
7434-{
7435- case ${2} in
7436- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
7437- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
7438- esac
7439-}
7440-
7441-# sed scripts:
7442-my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q'
7443-my_sed_long_arg='1s/^-[^=]*=//'
7444-
7445-# func_opt_split
7446-func_opt_split ()
7447-{
7448- func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"`
7449- func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"`
7450-}
7451-
7452-# func_lo2o object
7453-func_lo2o ()
7454-{
7455- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
7456-}
7457-
7458-# func_xform libobj-or-source
7459-func_xform ()
7460-{
7461- func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`
7462-}
7463-
7464-# func_arith arithmetic-term...
7465-func_arith ()
7466-{
7467- func_arith_result=`expr "$@"`
7468-}
7469-
7470-# func_len string
7471-# STRING may not start with a hyphen.
7472-func_len ()
7473-{
7474- func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len`
7475-}
7476-
7477-_LT_EOF
7478-esac
7479-
7480-case $lt_shell_append in
7481- yes)
7482- cat << \_LT_EOF >> "$cfgfile"
7483-
7484-# func_append var value
7485-# Append VALUE to the end of shell variable VAR.
7486-func_append ()
7487-{
7488- eval "$1+=\$2"
7489-}
7490-_LT_EOF
7491- ;;
7492- *)
7493- cat << \_LT_EOF >> "$cfgfile"
7494-
7495-# func_append var value
7496-# Append VALUE to the end of shell variable VAR.
7497-func_append ()
7498-{
7499- eval "$1=\$$1\$2"
7500-}
7501-
7502-_LT_EOF
7503- ;;
7504- esac
7505+ sed '$q' "$ltmain" >> "$cfgfile" \
7506+ || (rm -f "$cfgfile"; exit 1)
7507
7508+ if test x"$xsi_shell" = xyes; then
7509+ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\
7510+func_dirname ()\
7511+{\
7512+\ case ${1} in\
7513+\ */*) func_dirname_result="${1%/*}${2}" ;;\
7514+\ * ) func_dirname_result="${3}" ;;\
7515+\ esac\
7516+} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \
7517+ && mv -f "$cfgfile.tmp" "$cfgfile" \
7518+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
7519+test 0 -eq $? || _lt_function_replace_fail=:
7520+
7521+
7522+ sed -e '/^func_basename ()$/,/^} # func_basename /c\
7523+func_basename ()\
7524+{\
7525+\ func_basename_result="${1##*/}"\
7526+} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \
7527+ && mv -f "$cfgfile.tmp" "$cfgfile" \
7528+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
7529+test 0 -eq $? || _lt_function_replace_fail=:
7530+
7531+
7532+ sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\
7533+func_dirname_and_basename ()\
7534+{\
7535+\ case ${1} in\
7536+\ */*) func_dirname_result="${1%/*}${2}" ;;\
7537+\ * ) func_dirname_result="${3}" ;;\
7538+\ esac\
7539+\ func_basename_result="${1##*/}"\
7540+} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \
7541+ && mv -f "$cfgfile.tmp" "$cfgfile" \
7542+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
7543+test 0 -eq $? || _lt_function_replace_fail=:
7544+
7545+
7546+ sed -e '/^func_stripname ()$/,/^} # func_stripname /c\
7547+func_stripname ()\
7548+{\
7549+\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\
7550+\ # positional parameters, so assign one to ordinary parameter first.\
7551+\ func_stripname_result=${3}\
7552+\ func_stripname_result=${func_stripname_result#"${1}"}\
7553+\ func_stripname_result=${func_stripname_result%"${2}"}\
7554+} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \
7555+ && mv -f "$cfgfile.tmp" "$cfgfile" \
7556+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
7557+test 0 -eq $? || _lt_function_replace_fail=:
7558+
7559+
7560+ sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\
7561+func_split_long_opt ()\
7562+{\
7563+\ func_split_long_opt_name=${1%%=*}\
7564+\ func_split_long_opt_arg=${1#*=}\
7565+} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \
7566+ && mv -f "$cfgfile.tmp" "$cfgfile" \
7567+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
7568+test 0 -eq $? || _lt_function_replace_fail=:
7569+
7570+
7571+ sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\
7572+func_split_short_opt ()\
7573+{\
7574+\ func_split_short_opt_arg=${1#??}\
7575+\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\
7576+} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \
7577+ && mv -f "$cfgfile.tmp" "$cfgfile" \
7578+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
7579+test 0 -eq $? || _lt_function_replace_fail=:
7580+
7581+
7582+ sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\
7583+func_lo2o ()\
7584+{\
7585+\ case ${1} in\
7586+\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\
7587+\ *) func_lo2o_result=${1} ;;\
7588+\ esac\
7589+} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \
7590+ && mv -f "$cfgfile.tmp" "$cfgfile" \
7591+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
7592+test 0 -eq $? || _lt_function_replace_fail=:
7593+
7594+
7595+ sed -e '/^func_xform ()$/,/^} # func_xform /c\
7596+func_xform ()\
7597+{\
7598+ func_xform_result=${1%.*}.lo\
7599+} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \
7600+ && mv -f "$cfgfile.tmp" "$cfgfile" \
7601+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
7602+test 0 -eq $? || _lt_function_replace_fail=:
7603+
7604+
7605+ sed -e '/^func_arith ()$/,/^} # func_arith /c\
7606+func_arith ()\
7607+{\
7608+ func_arith_result=$(( $* ))\
7609+} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \
7610+ && mv -f "$cfgfile.tmp" "$cfgfile" \
7611+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
7612+test 0 -eq $? || _lt_function_replace_fail=:
7613+
7614+
7615+ sed -e '/^func_len ()$/,/^} # func_len /c\
7616+func_len ()\
7617+{\
7618+ func_len_result=${#1}\
7619+} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \
7620+ && mv -f "$cfgfile.tmp" "$cfgfile" \
7621+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
7622+test 0 -eq $? || _lt_function_replace_fail=:
7623+
7624+fi
7625+
7626+if test x"$lt_shell_append" = xyes; then
7627+ sed -e '/^func_append ()$/,/^} # func_append /c\
7628+func_append ()\
7629+{\
7630+ eval "${1}+=\\${2}"\
7631+} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \
7632+ && mv -f "$cfgfile.tmp" "$cfgfile" \
7633+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
7634+test 0 -eq $? || _lt_function_replace_fail=:
7635+
7636+
7637+ sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\
7638+func_append_quoted ()\
7639+{\
7640+\ func_quote_for_eval "${2}"\
7641+\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\
7642+} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \
7643+ && mv -f "$cfgfile.tmp" "$cfgfile" \
7644+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
7645+test 0 -eq $? || _lt_function_replace_fail=:
7646+
7647+
7648+ # Save a `func_append' function call where possible by direct use of '+='
7649+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
7650+ && mv -f "$cfgfile.tmp" "$cfgfile" \
7651+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
7652+ test 0 -eq $? || _lt_function_replace_fail=:
7653+else
7654+ # Save a `func_append' function call even when '+=' is not available
7655+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
7656+ && mv -f "$cfgfile.tmp" "$cfgfile" \
7657+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
7658+ test 0 -eq $? || _lt_function_replace_fail=:
7659+fi
7660+
7661+if test x"$_lt_function_replace_fail" = x":"; then
7662+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5
7663+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;}
7664+fi
7665
7666- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
7667- || (rm -f "$cfgfile"; exit 1)
7668
7669- mv -f "$cfgfile" "$ofile" ||
7670+ mv -f "$cfgfile" "$ofile" ||
7671 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
7672 chmod +x "$ofile"
7673
7674--- a/ld/configure
7675+++ b/ld/configure
7676@@ -688,8 +688,11 @@ OTOOL
7677 LIPO
7678 NMEDIT
7679 DSYMUTIL
7680+MANIFEST_TOOL
7681 RANLIB
7682+ac_ct_AR
7683 AR
7684+DLLTOOL
7685 OBJDUMP
7686 LN_S
7687 NM
7688@@ -816,6 +819,7 @@ enable_static
7689 with_pic
7690 enable_fast_install
7691 with_gnu_ld
7692+with_libtool_sysroot
7693 enable_libtool_lock
7694 enable_plugins
7695 enable_largefile
7696@@ -1508,6 +1512,8 @@ Optional Packages:
7697 --with-pic try to use only PIC/non-PIC objects [default=use
7698 both]
7699 --with-gnu-ld assume the C compiler uses GNU ld [default=no]
7700+ --with-libtool-sysroot=DIR Search for dependent libraries within DIR
7701+ (or the compiler's sysroot if not specified).
7702 --with-lib-path=dir1:dir2... set default LIB_PATH
7703 --with-sysroot=DIR Search for usr/lib et al within DIR.
7704
7705@@ -5960,8 +5966,8 @@ esac
7706
7707
7708
7709-macro_version='2.2.7a'
7710-macro_revision='1.3134'
7711+macro_version='2.4'
7712+macro_revision='1.3293'
7713
7714
7715
7716@@ -6001,7 +6007,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
7717 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
7718 $as_echo_n "checking how to print strings... " >&6; }
7719 # Test print first, because it will be a builtin if present.
7720-if test "X`print -r -- -n 2>/dev/null`" = X-n && \
7721+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
7722 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
7723 ECHO='print -r --'
7724 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
7725@@ -6687,8 +6693,8 @@ $as_echo_n "checking whether the shell u
7726 # Try some XSI features
7727 xsi_shell=no
7728 ( _lt_dummy="a/b/c"
7729- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
7730- = c,a/b,, \
7731+ test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
7732+ = c,a/b,b/c, \
7733 && eval 'test $(( 1 + 1 )) -eq 2 \
7734 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
7735 && xsi_shell=yes
7736@@ -6737,6 +6743,80 @@ esac
7737
7738
7739
7740+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5
7741+$as_echo_n "checking how to convert $build file names to $host format... " >&6; }
7742+if ${lt_cv_to_host_file_cmd+:} false; then :
7743+ $as_echo_n "(cached) " >&6
7744+else
7745+ case $host in
7746+ *-*-mingw* )
7747+ case $build in
7748+ *-*-mingw* ) # actually msys
7749+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
7750+ ;;
7751+ *-*-cygwin* )
7752+ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
7753+ ;;
7754+ * ) # otherwise, assume *nix
7755+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
7756+ ;;
7757+ esac
7758+ ;;
7759+ *-*-cygwin* )
7760+ case $build in
7761+ *-*-mingw* ) # actually msys
7762+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
7763+ ;;
7764+ *-*-cygwin* )
7765+ lt_cv_to_host_file_cmd=func_convert_file_noop
7766+ ;;
7767+ * ) # otherwise, assume *nix
7768+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
7769+ ;;
7770+ esac
7771+ ;;
7772+ * ) # unhandled hosts (and "normal" native builds)
7773+ lt_cv_to_host_file_cmd=func_convert_file_noop
7774+ ;;
7775+esac
7776+
7777+fi
7778+
7779+to_host_file_cmd=$lt_cv_to_host_file_cmd
7780+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5
7781+$as_echo "$lt_cv_to_host_file_cmd" >&6; }
7782+
7783+
7784+
7785+
7786+
7787+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5
7788+$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; }
7789+if ${lt_cv_to_tool_file_cmd+:} false; then :
7790+ $as_echo_n "(cached) " >&6
7791+else
7792+ #assume ordinary cross tools, or native build.
7793+lt_cv_to_tool_file_cmd=func_convert_file_noop
7794+case $host in
7795+ *-*-mingw* )
7796+ case $build in
7797+ *-*-mingw* ) # actually msys
7798+ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
7799+ ;;
7800+ esac
7801+ ;;
7802+esac
7803+
7804+fi
7805+
7806+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
7807+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5
7808+$as_echo "$lt_cv_to_tool_file_cmd" >&6; }
7809+
7810+
7811+
7812+
7813+
7814 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
7815 $as_echo_n "checking for $LD option to reload object files... " >&6; }
7816 if ${lt_cv_ld_reload_flag+:} false; then :
7817@@ -6753,6 +6833,11 @@ case $reload_flag in
7818 esac
7819 reload_cmds='$LD$reload_flag -o $output$reload_objs'
7820 case $host_os in
7821+ cygwin* | mingw* | pw32* | cegcc*)
7822+ if test "$GCC" != yes; then
7823+ reload_cmds=false
7824+ fi
7825+ ;;
7826 darwin*)
7827 if test "$GCC" = yes; then
7828 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
7829@@ -6921,7 +7006,8 @@ mingw* | pw32*)
7830 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
7831 lt_cv_file_magic_cmd='func_win32_libid'
7832 else
7833- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
7834+ # Keep this pattern in sync with the one in func_win32_libid.
7835+ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
7836 lt_cv_file_magic_cmd='$OBJDUMP -f'
7837 fi
7838 ;;
7839@@ -7075,6 +7161,21 @@ esac
7840 fi
7841 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
7842 $as_echo "$lt_cv_deplibs_check_method" >&6; }
7843+
7844+file_magic_glob=
7845+want_nocaseglob=no
7846+if test "$build" = "$host"; then
7847+ case $host_os in
7848+ mingw* | pw32*)
7849+ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
7850+ want_nocaseglob=yes
7851+ else
7852+ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"`
7853+ fi
7854+ ;;
7855+ esac
7856+fi
7857+
7858 file_magic_cmd=$lt_cv_file_magic_cmd
7859 deplibs_check_method=$lt_cv_deplibs_check_method
7860 test -z "$deplibs_check_method" && deplibs_check_method=unknown
7861@@ -7090,9 +7191,162 @@ test -z "$deplibs_check_method" && depli
7862
7863
7864
7865+
7866+
7867+
7868+
7869+
7870+
7871+
7872+
7873+
7874+
7875+if test -n "$ac_tool_prefix"; then
7876+ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
7877+set dummy ${ac_tool_prefix}dlltool; ac_word=$2
7878+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
7879+$as_echo_n "checking for $ac_word... " >&6; }
7880+if ${ac_cv_prog_DLLTOOL+:} false; then :
7881+ $as_echo_n "(cached) " >&6
7882+else
7883+ if test -n "$DLLTOOL"; then
7884+ ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
7885+else
7886+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
7887+for as_dir in $PATH
7888+do
7889+ IFS=$as_save_IFS
7890+ test -z "$as_dir" && as_dir=.
7891+ for ac_exec_ext in '' $ac_executable_extensions; do
7892+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
7893+ ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
7894+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
7895+ break 2
7896+ fi
7897+done
7898+ done
7899+IFS=$as_save_IFS
7900+
7901+fi
7902+fi
7903+DLLTOOL=$ac_cv_prog_DLLTOOL
7904+if test -n "$DLLTOOL"; then
7905+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
7906+$as_echo "$DLLTOOL" >&6; }
7907+else
7908+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
7909+$as_echo "no" >&6; }
7910+fi
7911+
7912+
7913+fi
7914+if test -z "$ac_cv_prog_DLLTOOL"; then
7915+ ac_ct_DLLTOOL=$DLLTOOL
7916+ # Extract the first word of "dlltool", so it can be a program name with args.
7917+set dummy dlltool; ac_word=$2
7918+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
7919+$as_echo_n "checking for $ac_word... " >&6; }
7920+if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then :
7921+ $as_echo_n "(cached) " >&6
7922+else
7923+ if test -n "$ac_ct_DLLTOOL"; then
7924+ ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
7925+else
7926+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
7927+for as_dir in $PATH
7928+do
7929+ IFS=$as_save_IFS
7930+ test -z "$as_dir" && as_dir=.
7931+ for ac_exec_ext in '' $ac_executable_extensions; do
7932+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
7933+ ac_cv_prog_ac_ct_DLLTOOL="dlltool"
7934+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
7935+ break 2
7936+ fi
7937+done
7938+ done
7939+IFS=$as_save_IFS
7940+
7941+fi
7942+fi
7943+ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
7944+if test -n "$ac_ct_DLLTOOL"; then
7945+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
7946+$as_echo "$ac_ct_DLLTOOL" >&6; }
7947+else
7948+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
7949+$as_echo "no" >&6; }
7950+fi
7951+
7952+ if test "x$ac_ct_DLLTOOL" = x; then
7953+ DLLTOOL="false"
7954+ else
7955+ case $cross_compiling:$ac_tool_warned in
7956+yes:)
7957+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
7958+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
7959+ac_tool_warned=yes ;;
7960+esac
7961+ DLLTOOL=$ac_ct_DLLTOOL
7962+ fi
7963+else
7964+ DLLTOOL="$ac_cv_prog_DLLTOOL"
7965+fi
7966+
7967+test -z "$DLLTOOL" && DLLTOOL=dlltool
7968+
7969+
7970+
7971+
7972+
7973+
7974+
7975+
7976+
7977+
7978+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5
7979+$as_echo_n "checking how to associate runtime and link libraries... " >&6; }
7980+if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then :
7981+ $as_echo_n "(cached) " >&6
7982+else
7983+ lt_cv_sharedlib_from_linklib_cmd='unknown'
7984+
7985+case $host_os in
7986+cygwin* | mingw* | pw32* | cegcc*)
7987+ # two different shell functions defined in ltmain.sh
7988+ # decide which to use based on capabilities of $DLLTOOL
7989+ case `$DLLTOOL --help 2>&1` in
7990+ *--identify-strict*)
7991+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
7992+ ;;
7993+ *)
7994+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
7995+ ;;
7996+ esac
7997+ ;;
7998+*)
7999+ # fallback: assume linklib IS sharedlib
8000+ lt_cv_sharedlib_from_linklib_cmd="$ECHO"
8001+ ;;
8002+esac
8003+
8004+fi
8005+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5
8006+$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; }
8007+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
8008+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
8009+
8010+
8011+
8012+
8013+
8014+
8015+
8016 if test -n "$ac_tool_prefix"; then
8017- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
8018-set dummy ${ac_tool_prefix}ar; ac_word=$2
8019+ for ac_prog in ar
8020+ do
8021+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
8022+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
8023 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
8024 $as_echo_n "checking for $ac_word... " >&6; }
8025 if ${ac_cv_prog_AR+:} false; then :
8026@@ -7108,7 +7362,7 @@ do
8027 test -z "$as_dir" && as_dir=.
8028 for ac_exec_ext in '' $ac_executable_extensions; do
8029 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
8030- ac_cv_prog_AR="${ac_tool_prefix}ar"
8031+ ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
8032 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
8033 break 2
8034 fi
8035@@ -7128,11 +7382,15 @@ $as_echo "no" >&6; }
8036 fi
8037
8038
8039+ test -n "$AR" && break
8040+ done
8041 fi
8042-if test -z "$ac_cv_prog_AR"; then
8043+if test -z "$AR"; then
8044 ac_ct_AR=$AR
8045- # Extract the first word of "ar", so it can be a program name with args.
8046-set dummy ar; ac_word=$2
8047+ for ac_prog in ar
8048+do
8049+ # Extract the first word of "$ac_prog", so it can be a program name with args.
8050+set dummy $ac_prog; ac_word=$2
8051 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
8052 $as_echo_n "checking for $ac_word... " >&6; }
8053 if ${ac_cv_prog_ac_ct_AR+:} false; then :
8054@@ -7148,7 +7406,7 @@ do
8055 test -z "$as_dir" && as_dir=.
8056 for ac_exec_ext in '' $ac_executable_extensions; do
8057 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
8058- ac_cv_prog_ac_ct_AR="ar"
8059+ ac_cv_prog_ac_ct_AR="$ac_prog"
8060 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
8061 break 2
8062 fi
8063@@ -7167,6 +7425,10 @@ else
8064 $as_echo "no" >&6; }
8065 fi
8066
8067+
8068+ test -n "$ac_ct_AR" && break
8069+done
8070+
8071 if test "x$ac_ct_AR" = x; then
8072 AR="false"
8073 else
8074@@ -7178,12 +7440,11 @@ ac_tool_warned=yes ;;
8075 esac
8076 AR=$ac_ct_AR
8077 fi
8078-else
8079- AR="$ac_cv_prog_AR"
8080 fi
8081
8082-test -z "$AR" && AR=ar
8083-test -z "$AR_FLAGS" && AR_FLAGS=cru
8084+: ${AR=ar}
8085+: ${AR_FLAGS=cru}
8086+
8087
8088
8089
8090@@ -7194,6 +7455,63 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru
8091
8092
8093
8094+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
8095+$as_echo_n "checking for archiver @FILE support... " >&6; }
8096+if ${lt_cv_ar_at_file+:} false; then :
8097+ $as_echo_n "(cached) " >&6
8098+else
8099+ lt_cv_ar_at_file=no
8100+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
8101+/* end confdefs.h. */
8102+
8103+int
8104+main ()
8105+{
8106+
8107+ ;
8108+ return 0;
8109+}
8110+_ACEOF
8111+if ac_fn_c_try_compile "$LINENO"; then :
8112+ echo conftest.$ac_objext > conftest.lst
8113+ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5'
8114+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
8115+ (eval $lt_ar_try) 2>&5
8116+ ac_status=$?
8117+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
8118+ test $ac_status = 0; }
8119+ if test "$ac_status" -eq 0; then
8120+ # Ensure the archiver fails upon bogus file names.
8121+ rm -f conftest.$ac_objext libconftest.a
8122+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
8123+ (eval $lt_ar_try) 2>&5
8124+ ac_status=$?
8125+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
8126+ test $ac_status = 0; }
8127+ if test "$ac_status" -ne 0; then
8128+ lt_cv_ar_at_file=@
8129+ fi
8130+ fi
8131+ rm -f conftest.* libconftest.a
8132+
8133+fi
8134+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
8135+
8136+fi
8137+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
8138+$as_echo "$lt_cv_ar_at_file" >&6; }
8139+
8140+if test "x$lt_cv_ar_at_file" = xno; then
8141+ archiver_list_spec=
8142+else
8143+ archiver_list_spec=$lt_cv_ar_at_file
8144+fi
8145+
8146+
8147+
8148+
8149+
8150+
8151
8152 if test -n "$ac_tool_prefix"; then
8153 # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
8154@@ -7529,8 +7847,8 @@ esac
8155 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
8156
8157 # Transform an extracted symbol line into symbol name and symbol address
8158-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
8159-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'"
8160+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
8161+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'"
8162
8163 # Handle CRLF in mingw tool chain
8164 opt_cr=
8165@@ -7566,6 +7884,7 @@ for ac_symprfx in "" "_"; do
8166 else
8167 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
8168 fi
8169+ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
8170
8171 # Check to see that the pipe works correctly.
8172 pipe_works=no
8173@@ -7607,6 +7926,18 @@ _LT_EOF
8174 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
8175 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
8176 cat <<_LT_EOF > conftest.$ac_ext
8177+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */
8178+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
8179+/* DATA imports from DLLs on WIN32 con't be const, because runtime
8180+ relocations are performed -- see ld's documentation on pseudo-relocs. */
8181+# define LT_DLSYM_CONST
8182+#elif defined(__osf__)
8183+/* This system does not cope well with relocations in const data. */
8184+# define LT_DLSYM_CONST
8185+#else
8186+# define LT_DLSYM_CONST const
8187+#endif
8188+
8189 #ifdef __cplusplus
8190 extern "C" {
8191 #endif
8192@@ -7618,7 +7949,7 @@ _LT_EOF
8193 cat <<_LT_EOF >> conftest.$ac_ext
8194
8195 /* The mapping between symbol names and symbols. */
8196-const struct {
8197+LT_DLSYM_CONST struct {
8198 const char *name;
8199 void *address;
8200 }
8201@@ -7644,8 +7975,8 @@ static const void *lt_preloaded_setup()
8202 _LT_EOF
8203 # Now try linking the two files.
8204 mv conftest.$ac_objext conftstm.$ac_objext
8205- lt_save_LIBS="$LIBS"
8206- lt_save_CFLAGS="$CFLAGS"
8207+ lt_globsym_save_LIBS=$LIBS
8208+ lt_globsym_save_CFLAGS=$CFLAGS
8209 LIBS="conftstm.$ac_objext"
8210 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
8211 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
8212@@ -7655,8 +7986,8 @@ _LT_EOF
8213 test $ac_status = 0; } && test -s conftest${ac_exeext}; then
8214 pipe_works=yes
8215 fi
8216- LIBS="$lt_save_LIBS"
8217- CFLAGS="$lt_save_CFLAGS"
8218+ LIBS=$lt_globsym_save_LIBS
8219+ CFLAGS=$lt_globsym_save_CFLAGS
8220 else
8221 echo "cannot find nm_test_func in $nlist" >&5
8222 fi
8223@@ -7693,6 +8024,13 @@ else
8224 $as_echo "ok" >&6; }
8225 fi
8226
8227+# Response file support.
8228+if test "$lt_cv_nm_interface" = "MS dumpbin"; then
8229+ nm_file_list_spec='@'
8230+elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then
8231+ nm_file_list_spec='@'
8232+fi
8233+
8234
8235
8236
8237@@ -7714,6 +8052,48 @@ fi
8238
8239
8240
8241+
8242+
8243+
8244+
8245+
8246+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
8247+$as_echo_n "checking for sysroot... " >&6; }
8248+
8249+# Check whether --with-libtool-sysroot was given.
8250+if test "${with_libtool_sysroot+set}" = set; then :
8251+ withval=$with_libtool_sysroot;
8252+else
8253+ with_libtool_sysroot=no
8254+fi
8255+
8256+
8257+lt_sysroot=
8258+case ${with_libtool_sysroot} in #(
8259+ yes)
8260+ if test "$GCC" = yes; then
8261+ lt_sysroot=`$CC --print-sysroot 2>/dev/null`
8262+ fi
8263+ ;; #(
8264+ /*)
8265+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"`
8266+ ;; #(
8267+ no|'')
8268+ ;; #(
8269+ *)
8270+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5
8271+$as_echo "${with_libtool_sysroot}" >&6; }
8272+ as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5
8273+ ;;
8274+esac
8275+
8276+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
8277+$as_echo "${lt_sysroot:-no}" >&6; }
8278+
8279+
8280+
8281+
8282+
8283 # Check whether --enable-libtool-lock was given.
8284 if test "${enable_libtool_lock+set}" = set; then :
8285 enableval=$enable_libtool_lock;
8286@@ -7920,6 +8300,123 @@ esac
8287
8288 need_locks="$enable_libtool_lock"
8289
8290+if test -n "$ac_tool_prefix"; then
8291+ # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args.
8292+set dummy ${ac_tool_prefix}mt; ac_word=$2
8293+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
8294+$as_echo_n "checking for $ac_word... " >&6; }
8295+if ${ac_cv_prog_MANIFEST_TOOL+:} false; then :
8296+ $as_echo_n "(cached) " >&6
8297+else
8298+ if test -n "$MANIFEST_TOOL"; then
8299+ ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test.
8300+else
8301+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
8302+for as_dir in $PATH
8303+do
8304+ IFS=$as_save_IFS
8305+ test -z "$as_dir" && as_dir=.
8306+ for ac_exec_ext in '' $ac_executable_extensions; do
8307+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
8308+ ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
8309+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
8310+ break 2
8311+ fi
8312+done
8313+ done
8314+IFS=$as_save_IFS
8315+
8316+fi
8317+fi
8318+MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL
8319+if test -n "$MANIFEST_TOOL"; then
8320+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5
8321+$as_echo "$MANIFEST_TOOL" >&6; }
8322+else
8323+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
8324+$as_echo "no" >&6; }
8325+fi
8326+
8327+
8328+fi
8329+if test -z "$ac_cv_prog_MANIFEST_TOOL"; then
8330+ ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL
8331+ # Extract the first word of "mt", so it can be a program name with args.
8332+set dummy mt; ac_word=$2
8333+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
8334+$as_echo_n "checking for $ac_word... " >&6; }
8335+if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then :
8336+ $as_echo_n "(cached) " >&6
8337+else
8338+ if test -n "$ac_ct_MANIFEST_TOOL"; then
8339+ ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test.
8340+else
8341+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
8342+for as_dir in $PATH
8343+do
8344+ IFS=$as_save_IFS
8345+ test -z "$as_dir" && as_dir=.
8346+ for ac_exec_ext in '' $ac_executable_extensions; do
8347+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
8348+ ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
8349+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
8350+ break 2
8351+ fi
8352+done
8353+ done
8354+IFS=$as_save_IFS
8355+
8356+fi
8357+fi
8358+ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL
8359+if test -n "$ac_ct_MANIFEST_TOOL"; then
8360+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5
8361+$as_echo "$ac_ct_MANIFEST_TOOL" >&6; }
8362+else
8363+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
8364+$as_echo "no" >&6; }
8365+fi
8366+
8367+ if test "x$ac_ct_MANIFEST_TOOL" = x; then
8368+ MANIFEST_TOOL=":"
8369+ else
8370+ case $cross_compiling:$ac_tool_warned in
8371+yes:)
8372+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
8373+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
8374+ac_tool_warned=yes ;;
8375+esac
8376+ MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL
8377+ fi
8378+else
8379+ MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL"
8380+fi
8381+
8382+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
8383+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5
8384+$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; }
8385+if ${lt_cv_path_mainfest_tool+:} false; then :
8386+ $as_echo_n "(cached) " >&6
8387+else
8388+ lt_cv_path_mainfest_tool=no
8389+ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5
8390+ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
8391+ cat conftest.err >&5
8392+ if $GREP 'Manifest Tool' conftest.out > /dev/null; then
8393+ lt_cv_path_mainfest_tool=yes
8394+ fi
8395+ rm -f conftest*
8396+fi
8397+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5
8398+$as_echo "$lt_cv_path_mainfest_tool" >&6; }
8399+if test "x$lt_cv_path_mainfest_tool" != xyes; then
8400+ MANIFEST_TOOL=:
8401+fi
8402+
8403+
8404+
8405+
8406+
8407
8408 case $host_os in
8409 rhapsody* | darwin*)
8410@@ -8483,6 +8980,8 @@ _LT_EOF
8411 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
8412 echo "$AR cru libconftest.a conftest.o" >&5
8413 $AR cru libconftest.a conftest.o 2>&5
8414+ echo "$RANLIB libconftest.a" >&5
8415+ $RANLIB libconftest.a 2>&5
8416 cat > conftest.c << _LT_EOF
8417 int main() { return 0;}
8418 _LT_EOF
8419@@ -8551,6 +9050,16 @@ done
8420
8421
8422
8423+func_stripname_cnf ()
8424+{
8425+ case ${2} in
8426+ .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
8427+ *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
8428+ esac
8429+} # func_stripname_cnf
8430+
8431+
8432+
8433
8434
8435 # Set options
8436@@ -8679,7 +9188,8 @@ fi
8437 LIBTOOL_DEPS="$ltmain"
8438
8439 # Always use our own libtool.
8440-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
8441+LIBTOOL='$(SHELL) $(top_builddir)'
8442+LIBTOOL="$LIBTOOL/${host_alias}-libtool"
8443
8444
8445
8446@@ -8768,7 +9278,7 @@ aix3*)
8447 esac
8448
8449 # Global variables:
8450-ofile=libtool
8451+ofile=${host_alias}-libtool
8452 can_build_shared=yes
8453
8454 # All known linkers require a `.a' archive for static linking (except MSVC,
8455@@ -9066,8 +9576,6 @@ fi
8456 lt_prog_compiler_pic=
8457 lt_prog_compiler_static=
8458
8459-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
8460-$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
8461
8462 if test "$GCC" = yes; then
8463 lt_prog_compiler_wl='-Wl,'
8464@@ -9233,6 +9741,12 @@ $as_echo_n "checking for $compiler optio
8465 lt_prog_compiler_pic='--shared'
8466 lt_prog_compiler_static='--static'
8467 ;;
8468+ nagfor*)
8469+ # NAG Fortran compiler
8470+ lt_prog_compiler_wl='-Wl,-Wl,,'
8471+ lt_prog_compiler_pic='-PIC'
8472+ lt_prog_compiler_static='-Bstatic'
8473+ ;;
8474 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
8475 # Portland Group compilers (*not* the Pentium gcc compiler,
8476 # which looks to be a dead project)
8477@@ -9295,7 +9809,7 @@ $as_echo_n "checking for $compiler optio
8478 lt_prog_compiler_pic='-KPIC'
8479 lt_prog_compiler_static='-Bstatic'
8480 case $cc_basename in
8481- f77* | f90* | f95*)
8482+ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
8483 lt_prog_compiler_wl='-Qoption ld ';;
8484 *)
8485 lt_prog_compiler_wl='-Wl,';;
8486@@ -9352,13 +9866,17 @@ case $host_os in
8487 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
8488 ;;
8489 esac
8490-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5
8491-$as_echo "$lt_prog_compiler_pic" >&6; }
8492-
8493-
8494-
8495-
8496
8497+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
8498+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
8499+if ${lt_cv_prog_compiler_pic+:} false; then :
8500+ $as_echo_n "(cached) " >&6
8501+else
8502+ lt_cv_prog_compiler_pic=$lt_prog_compiler_pic
8503+fi
8504+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
8505+$as_echo "$lt_cv_prog_compiler_pic" >&6; }
8506+lt_prog_compiler_pic=$lt_cv_prog_compiler_pic
8507
8508 #
8509 # Check to make sure the PIC flag actually works.
8510@@ -9419,6 +9937,11 @@ fi
8511
8512
8513
8514+
8515+
8516+
8517+
8518+
8519 #
8520 # Check to make sure the static flag actually works.
8521 #
8522@@ -9769,7 +10292,8 @@ _LT_EOF
8523 allow_undefined_flag=unsupported
8524 always_export_symbols=no
8525 enable_shared_with_static_runtimes=yes
8526- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
8527+ 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'
8528+ exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
8529
8530 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
8531 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
8532@@ -9868,12 +10392,12 @@ _LT_EOF
8533 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
8534 hardcode_libdir_flag_spec=
8535 hardcode_libdir_flag_spec_ld='-rpath $libdir'
8536- archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
8537+ archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
8538 if test "x$supports_anon_versioning" = xyes; then
8539 archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
8540 cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
8541 echo "local: *; };" >> $output_objdir/$libname.ver~
8542- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
8543+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
8544 fi
8545 ;;
8546 esac
8547@@ -9887,8 +10411,8 @@ _LT_EOF
8548 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
8549 wlarc=
8550 else
8551- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
8552- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
8553+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
8554+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
8555 fi
8556 ;;
8557
8558@@ -9906,8 +10430,8 @@ _LT_EOF
8559
8560 _LT_EOF
8561 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
8562- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
8563- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
8564+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
8565+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
8566 else
8567 ld_shlibs=no
8568 fi
8569@@ -9953,8 +10477,8 @@ _LT_EOF
8570
8571 *)
8572 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
8573- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
8574- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
8575+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
8576+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
8577 else
8578 ld_shlibs=no
8579 fi
8580@@ -10084,7 +10608,13 @@ _LT_EOF
8581 allow_undefined_flag='-berok'
8582 # Determine the default libpath from the value encoded in an
8583 # empty executable.
8584- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
8585+ if test "${lt_cv_aix_libpath+set}" = set; then
8586+ aix_libpath=$lt_cv_aix_libpath
8587+else
8588+ if ${lt_cv_aix_libpath_+:} false; then :
8589+ $as_echo_n "(cached) " >&6
8590+else
8591+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
8592 /* end confdefs.h. */
8593
8594 int
8595@@ -10097,22 +10627,29 @@ main ()
8596 _ACEOF
8597 if ac_fn_c_try_link "$LINENO"; then :
8598
8599-lt_aix_libpath_sed='
8600- /Import File Strings/,/^$/ {
8601- /^0/ {
8602- s/^0 *\(.*\)$/\1/
8603- p
8604- }
8605- }'
8606-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
8607-# Check for a 64-bit object if we didn't find anything.
8608-if test -z "$aix_libpath"; then
8609- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
8610-fi
8611+ lt_aix_libpath_sed='
8612+ /Import File Strings/,/^$/ {
8613+ /^0/ {
8614+ s/^0 *\([^ ]*\) *$/\1/
8615+ p
8616+ }
8617+ }'
8618+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
8619+ # Check for a 64-bit object if we didn't find anything.
8620+ if test -z "$lt_cv_aix_libpath_"; then
8621+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
8622+ fi
8623 fi
8624 rm -f core conftest.err conftest.$ac_objext \
8625 conftest$ac_exeext conftest.$ac_ext
8626-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
8627+ if test -z "$lt_cv_aix_libpath_"; then
8628+ lt_cv_aix_libpath_="/usr/lib:/lib"
8629+ fi
8630+
8631+fi
8632+
8633+ aix_libpath=$lt_cv_aix_libpath_
8634+fi
8635
8636 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
8637 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"
8638@@ -10124,7 +10661,13 @@ if test -z "$aix_libpath"; then aix_libp
8639 else
8640 # Determine the default libpath from the value encoded in an
8641 # empty executable.
8642- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
8643+ if test "${lt_cv_aix_libpath+set}" = set; then
8644+ aix_libpath=$lt_cv_aix_libpath
8645+else
8646+ if ${lt_cv_aix_libpath_+:} false; then :
8647+ $as_echo_n "(cached) " >&6
8648+else
8649+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
8650 /* end confdefs.h. */
8651
8652 int
8653@@ -10137,22 +10680,29 @@ main ()
8654 _ACEOF
8655 if ac_fn_c_try_link "$LINENO"; then :
8656
8657-lt_aix_libpath_sed='
8658- /Import File Strings/,/^$/ {
8659- /^0/ {
8660- s/^0 *\(.*\)$/\1/
8661- p
8662- }
8663- }'
8664-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
8665-# Check for a 64-bit object if we didn't find anything.
8666-if test -z "$aix_libpath"; then
8667- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
8668-fi
8669+ lt_aix_libpath_sed='
8670+ /Import File Strings/,/^$/ {
8671+ /^0/ {
8672+ s/^0 *\([^ ]*\) *$/\1/
8673+ p
8674+ }
8675+ }'
8676+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
8677+ # Check for a 64-bit object if we didn't find anything.
8678+ if test -z "$lt_cv_aix_libpath_"; then
8679+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
8680+ fi
8681 fi
8682 rm -f core conftest.err conftest.$ac_objext \
8683 conftest$ac_exeext conftest.$ac_ext
8684-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
8685+ if test -z "$lt_cv_aix_libpath_"; then
8686+ lt_cv_aix_libpath_="/usr/lib:/lib"
8687+ fi
8688+
8689+fi
8690+
8691+ aix_libpath=$lt_cv_aix_libpath_
8692+fi
8693
8694 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
8695 # Warning - without using the other run time loading flags,
8696@@ -10197,20 +10747,63 @@ if test -z "$aix_libpath"; then aix_libp
8697 # Microsoft Visual C++.
8698 # hardcode_libdir_flag_spec is actually meaningless, as there is
8699 # no search path for DLLs.
8700- hardcode_libdir_flag_spec=' '
8701- allow_undefined_flag=unsupported
8702- # Tell ltmain to make .lib files, not .a files.
8703- libext=lib
8704- # Tell ltmain to make .dll files, not .so files.
8705- shrext_cmds=".dll"
8706- # FIXME: Setting linknames here is a bad hack.
8707- archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
8708- # The linker will automatically build a .lib file if we build a DLL.
8709- old_archive_from_new_cmds='true'
8710- # FIXME: Should let the user specify the lib program.
8711- old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
8712- fix_srcfile_path='`cygpath -w "$srcfile"`'
8713- enable_shared_with_static_runtimes=yes
8714+ case $cc_basename in
8715+ cl*)
8716+ # Native MSVC
8717+ hardcode_libdir_flag_spec=' '
8718+ allow_undefined_flag=unsupported
8719+ always_export_symbols=yes
8720+ file_list_spec='@'
8721+ # Tell ltmain to make .lib files, not .a files.
8722+ libext=lib
8723+ # Tell ltmain to make .dll files, not .so files.
8724+ shrext_cmds=".dll"
8725+ # FIXME: Setting linknames here is a bad hack.
8726+ archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
8727+ archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
8728+ sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
8729+ else
8730+ sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
8731+ fi~
8732+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
8733+ linknames='
8734+ # The linker will not automatically build a static lib if we build a DLL.
8735+ # _LT_TAGVAR(old_archive_from_new_cmds, )='true'
8736+ enable_shared_with_static_runtimes=yes
8737+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
8738+ # Don't use ranlib
8739+ old_postinstall_cmds='chmod 644 $oldlib'
8740+ postlink_cmds='lt_outputfile="@OUTPUT@"~
8741+ lt_tool_outputfile="@TOOL_OUTPUT@"~
8742+ case $lt_outputfile in
8743+ *.exe|*.EXE) ;;
8744+ *)
8745+ lt_outputfile="$lt_outputfile.exe"
8746+ lt_tool_outputfile="$lt_tool_outputfile.exe"
8747+ ;;
8748+ esac~
8749+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
8750+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
8751+ $RM "$lt_outputfile.manifest";
8752+ fi'
8753+ ;;
8754+ *)
8755+ # Assume MSVC wrapper
8756+ hardcode_libdir_flag_spec=' '
8757+ allow_undefined_flag=unsupported
8758+ # Tell ltmain to make .lib files, not .a files.
8759+ libext=lib
8760+ # Tell ltmain to make .dll files, not .so files.
8761+ shrext_cmds=".dll"
8762+ # FIXME: Setting linknames here is a bad hack.
8763+ archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
8764+ # The linker will automatically build a .lib file if we build a DLL.
8765+ old_archive_from_new_cmds='true'
8766+ # FIXME: Should let the user specify the lib program.
8767+ old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
8768+ enable_shared_with_static_runtimes=yes
8769+ ;;
8770+ esac
8771 ;;
8772
8773 darwin* | rhapsody*)
8774@@ -10271,7 +10864,7 @@ if test -z "$aix_libpath"; then aix_libp
8775
8776 # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
8777 freebsd* | dragonfly*)
8778- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
8779+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
8780 hardcode_libdir_flag_spec='-R$libdir'
8781 hardcode_direct=yes
8782 hardcode_shlibpath_var=no
8783@@ -10279,7 +10872,7 @@ if test -z "$aix_libpath"; then aix_libp
8784
8785 hpux9*)
8786 if test "$GCC" = yes; then
8787- 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'
8788+ 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'
8789 else
8790 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'
8791 fi
8792@@ -10295,7 +10888,7 @@ if test -z "$aix_libpath"; then aix_libp
8793
8794 hpux10*)
8795 if test "$GCC" = yes && test "$with_gnu_ld" = no; then
8796- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
8797+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
8798 else
8799 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
8800 fi
8801@@ -10319,10 +10912,10 @@ if test -z "$aix_libpath"; then aix_libp
8802 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
8803 ;;
8804 ia64*)
8805- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
8806+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
8807 ;;
8808 *)
8809- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
8810+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
8811 ;;
8812 esac
8813 else
8814@@ -10401,23 +10994,36 @@ fi
8815
8816 irix5* | irix6* | nonstopux*)
8817 if test "$GCC" = yes; then
8818- 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'
8819+ 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'
8820 # Try to use the -exported_symbol ld option, if it does not
8821 # work, assume that -exports_file does not work either and
8822 # implicitly export all symbols.
8823- save_LDFLAGS="$LDFLAGS"
8824- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
8825- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
8826+ # This should be the same for all languages, so no per-tag cache variable.
8827+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5
8828+$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; }
8829+if ${lt_cv_irix_exported_symbol+:} false; then :
8830+ $as_echo_n "(cached) " >&6
8831+else
8832+ save_LDFLAGS="$LDFLAGS"
8833+ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
8834+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
8835 /* end confdefs.h. */
8836-int foo(void) {}
8837+int foo (void) { return 0; }
8838 _ACEOF
8839 if ac_fn_c_try_link "$LINENO"; then :
8840- 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'
8841-
8842+ lt_cv_irix_exported_symbol=yes
8843+else
8844+ lt_cv_irix_exported_symbol=no
8845 fi
8846 rm -f core conftest.err conftest.$ac_objext \
8847 conftest$ac_exeext conftest.$ac_ext
8848- LDFLAGS="$save_LDFLAGS"
8849+ LDFLAGS="$save_LDFLAGS"
8850+fi
8851+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5
8852+$as_echo "$lt_cv_irix_exported_symbol" >&6; }
8853+ if test "$lt_cv_irix_exported_symbol" = yes; then
8854+ 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'
8855+ fi
8856 else
8857 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'
8858 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'
8859@@ -10502,7 +11108,7 @@ rm -f core conftest.err conftest.$ac_obj
8860 osf4* | osf5*) # as osf3* with the addition of -msym flag
8861 if test "$GCC" = yes; then
8862 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
8863- 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'
8864+ 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'
8865 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
8866 else
8867 allow_undefined_flag=' -expect_unresolved \*'
8868@@ -10521,9 +11127,9 @@ rm -f core conftest.err conftest.$ac_obj
8869 no_undefined_flag=' -z defs'
8870 if test "$GCC" = yes; then
8871 wlarc='${wl}'
8872- archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
8873+ archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
8874 archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
8875- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
8876+ $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'
8877 else
8878 case `$CC -V 2>&1` in
8879 *"Compilers 5.0"*)
8880@@ -11099,8 +11705,9 @@ cygwin* | mingw* | pw32* | cegcc*)
8881 need_version=no
8882 need_lib_prefix=no
8883
8884- case $GCC,$host_os in
8885- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
8886+ case $GCC,$cc_basename in
8887+ yes,*)
8888+ # gcc
8889 library_names_spec='$libname.dll.a'
8890 # DLL is installed to $(libdir)/../bin by postinstall_cmds
8891 postinstall_cmds='base_file=`basename \${file}`~
8892@@ -11133,13 +11740,71 @@ cygwin* | mingw* | pw32* | cegcc*)
8893 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
8894 ;;
8895 esac
8896+ dynamic_linker='Win32 ld.exe'
8897+ ;;
8898+
8899+ *,cl*)
8900+ # Native MSVC
8901+ libname_spec='$name'
8902+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
8903+ library_names_spec='${libname}.dll.lib'
8904+
8905+ case $build_os in
8906+ mingw*)
8907+ sys_lib_search_path_spec=
8908+ lt_save_ifs=$IFS
8909+ IFS=';'
8910+ for lt_path in $LIB
8911+ do
8912+ IFS=$lt_save_ifs
8913+ # Let DOS variable expansion print the short 8.3 style file name.
8914+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
8915+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
8916+ done
8917+ IFS=$lt_save_ifs
8918+ # Convert to MSYS style.
8919+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
8920+ ;;
8921+ cygwin*)
8922+ # Convert to unix form, then to dos form, then back to unix form
8923+ # but this time dos style (no spaces!) so that the unix form looks
8924+ # like /cygdrive/c/PROGRA~1:/cygdr...
8925+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
8926+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
8927+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
8928+ ;;
8929+ *)
8930+ sys_lib_search_path_spec="$LIB"
8931+ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
8932+ # It is most probably a Windows format PATH.
8933+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
8934+ else
8935+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
8936+ fi
8937+ # FIXME: find the short name or the path components, as spaces are
8938+ # common. (e.g. "Program Files" -> "PROGRA~1")
8939+ ;;
8940+ esac
8941+
8942+ # DLL is installed to $(libdir)/../bin by postinstall_cmds
8943+ postinstall_cmds='base_file=`basename \${file}`~
8944+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
8945+ dldir=$destdir/`dirname \$dlpath`~
8946+ test -d \$dldir || mkdir -p \$dldir~
8947+ $install_prog $dir/$dlname \$dldir/$dlname'
8948+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
8949+ dlpath=$dir/\$dldll~
8950+ $RM \$dlpath'
8951+ shlibpath_overrides_runpath=yes
8952+ dynamic_linker='Win32 link.exe'
8953 ;;
8954
8955 *)
8956+ # Assume MSVC wrapper
8957 library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
8958+ dynamic_linker='Win32 ld.exe'
8959 ;;
8960 esac
8961- dynamic_linker='Win32 ld.exe'
8962 # FIXME: first we should search . and the directory the executable is in
8963 shlibpath_var=PATH
8964 ;;
8965@@ -11231,7 +11896,7 @@ haiku*)
8966 soname_spec='${libname}${release}${shared_ext}$major'
8967 shlibpath_var=LIBRARY_PATH
8968 shlibpath_overrides_runpath=yes
8969- sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib'
8970+ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
8971 hardcode_into_libs=yes
8972 ;;
8973
8974@@ -12027,7 +12692,7 @@ else
8975 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
8976 lt_status=$lt_dlunknown
8977 cat > conftest.$ac_ext <<_LT_EOF
8978-#line 12030 "configure"
8979+#line $LINENO "configure"
8980 #include "confdefs.h"
8981
8982 #if HAVE_DLFCN_H
8983@@ -12071,10 +12736,10 @@ else
8984 /* When -fvisbility=hidden is used, assume the code has been annotated
8985 correspondingly for the symbols needed. */
8986 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
8987-void fnord () __attribute__((visibility("default")));
8988+int fnord () __attribute__((visibility("default")));
8989 #endif
8990
8991-void fnord () { int i=42; }
8992+int fnord () { return 42; }
8993 int main ()
8994 {
8995 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
8996@@ -12133,7 +12798,7 @@ else
8997 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
8998 lt_status=$lt_dlunknown
8999 cat > conftest.$ac_ext <<_LT_EOF
9000-#line 12136 "configure"
9001+#line $LINENO "configure"
9002 #include "confdefs.h"
9003
9004 #if HAVE_DLFCN_H
9005@@ -12177,10 +12842,10 @@ else
9006 /* When -fvisbility=hidden is used, assume the code has been annotated
9007 correspondingly for the symbols needed. */
9008 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
9009-void fnord () __attribute__((visibility("default")));
9010+int fnord () __attribute__((visibility("default")));
9011 #endif
9012
9013-void fnord () { int i=42; }
9014+int fnord () { return 42; }
9015 int main ()
9016 {
9017 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
9018@@ -12572,6 +13237,7 @@ $RM -r conftest*
9019
9020 # Allow CC to be a program name with arguments.
9021 lt_save_CC=$CC
9022+ lt_save_CFLAGS=$CFLAGS
9023 lt_save_LD=$LD
9024 lt_save_GCC=$GCC
9025 GCC=$GXX
9026@@ -12589,6 +13255,7 @@ $RM -r conftest*
9027 fi
9028 test -z "${LDCXX+set}" || LD=$LDCXX
9029 CC=${CXX-"c++"}
9030+ CFLAGS=$CXXFLAGS
9031 compiler=$CC
9032 compiler_CXX=$CC
9033 for cc_temp in $compiler""; do
9034@@ -12871,7 +13538,13 @@ $as_echo_n "checking whether the $compil
9035 allow_undefined_flag_CXX='-berok'
9036 # Determine the default libpath from the value encoded in an empty
9037 # executable.
9038- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
9039+ if test "${lt_cv_aix_libpath+set}" = set; then
9040+ aix_libpath=$lt_cv_aix_libpath
9041+else
9042+ if ${lt_cv_aix_libpath__CXX+:} false; then :
9043+ $as_echo_n "(cached) " >&6
9044+else
9045+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
9046 /* end confdefs.h. */
9047
9048 int
9049@@ -12884,22 +13557,29 @@ main ()
9050 _ACEOF
9051 if ac_fn_cxx_try_link "$LINENO"; then :
9052
9053-lt_aix_libpath_sed='
9054- /Import File Strings/,/^$/ {
9055- /^0/ {
9056- s/^0 *\(.*\)$/\1/
9057- p
9058- }
9059- }'
9060-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
9061-# Check for a 64-bit object if we didn't find anything.
9062-if test -z "$aix_libpath"; then
9063- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
9064-fi
9065+ lt_aix_libpath_sed='
9066+ /Import File Strings/,/^$/ {
9067+ /^0/ {
9068+ s/^0 *\([^ ]*\) *$/\1/
9069+ p
9070+ }
9071+ }'
9072+ lt_cv_aix_libpath__CXX=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
9073+ # Check for a 64-bit object if we didn't find anything.
9074+ if test -z "$lt_cv_aix_libpath__CXX"; then
9075+ lt_cv_aix_libpath__CXX=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
9076+ fi
9077 fi
9078 rm -f core conftest.err conftest.$ac_objext \
9079 conftest$ac_exeext conftest.$ac_ext
9080-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
9081+ if test -z "$lt_cv_aix_libpath__CXX"; then
9082+ lt_cv_aix_libpath__CXX="/usr/lib:/lib"
9083+ fi
9084+
9085+fi
9086+
9087+ aix_libpath=$lt_cv_aix_libpath__CXX
9088+fi
9089
9090 hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
9091
9092@@ -12912,7 +13592,13 @@ if test -z "$aix_libpath"; then aix_libp
9093 else
9094 # Determine the default libpath from the value encoded in an
9095 # empty executable.
9096- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
9097+ if test "${lt_cv_aix_libpath+set}" = set; then
9098+ aix_libpath=$lt_cv_aix_libpath
9099+else
9100+ if ${lt_cv_aix_libpath__CXX+:} false; then :
9101+ $as_echo_n "(cached) " >&6
9102+else
9103+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
9104 /* end confdefs.h. */
9105
9106 int
9107@@ -12925,22 +13611,29 @@ main ()
9108 _ACEOF
9109 if ac_fn_cxx_try_link "$LINENO"; then :
9110
9111-lt_aix_libpath_sed='
9112- /Import File Strings/,/^$/ {
9113- /^0/ {
9114- s/^0 *\(.*\)$/\1/
9115- p
9116- }
9117- }'
9118-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
9119-# Check for a 64-bit object if we didn't find anything.
9120-if test -z "$aix_libpath"; then
9121- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
9122-fi
9123+ lt_aix_libpath_sed='
9124+ /Import File Strings/,/^$/ {
9125+ /^0/ {
9126+ s/^0 *\([^ ]*\) *$/\1/
9127+ p
9128+ }
9129+ }'
9130+ lt_cv_aix_libpath__CXX=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
9131+ # Check for a 64-bit object if we didn't find anything.
9132+ if test -z "$lt_cv_aix_libpath__CXX"; then
9133+ lt_cv_aix_libpath__CXX=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
9134+ fi
9135 fi
9136 rm -f core conftest.err conftest.$ac_objext \
9137 conftest$ac_exeext conftest.$ac_ext
9138-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
9139+ if test -z "$lt_cv_aix_libpath__CXX"; then
9140+ lt_cv_aix_libpath__CXX="/usr/lib:/lib"
9141+ fi
9142+
9143+fi
9144+
9145+ aix_libpath=$lt_cv_aix_libpath__CXX
9146+fi
9147
9148 hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
9149 # Warning - without using the other run time loading flags,
9150@@ -12983,29 +13676,75 @@ if test -z "$aix_libpath"; then aix_libp
9151 ;;
9152
9153 cygwin* | mingw* | pw32* | cegcc*)
9154- # _LT_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless,
9155- # as there is no search path for DLLs.
9156- hardcode_libdir_flag_spec_CXX='-L$libdir'
9157- export_dynamic_flag_spec_CXX='${wl}--export-all-symbols'
9158- allow_undefined_flag_CXX=unsupported
9159- always_export_symbols_CXX=no
9160- enable_shared_with_static_runtimes_CXX=yes
9161-
9162- if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
9163- archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
9164- # If the export-symbols file already is a .def file (1st line
9165- # is EXPORTS), use it as is; otherwise, prepend...
9166- archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
9167- cp $export_symbols $output_objdir/$soname.def;
9168- else
9169- echo EXPORTS > $output_objdir/$soname.def;
9170- cat $export_symbols >> $output_objdir/$soname.def;
9171- fi~
9172- $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'
9173- else
9174- ld_shlibs_CXX=no
9175- fi
9176- ;;
9177+ case $GXX,$cc_basename in
9178+ ,cl* | no,cl*)
9179+ # Native MSVC
9180+ # hardcode_libdir_flag_spec is actually meaningless, as there is
9181+ # no search path for DLLs.
9182+ hardcode_libdir_flag_spec_CXX=' '
9183+ allow_undefined_flag_CXX=unsupported
9184+ always_export_symbols_CXX=yes
9185+ file_list_spec_CXX='@'
9186+ # Tell ltmain to make .lib files, not .a files.
9187+ libext=lib
9188+ # Tell ltmain to make .dll files, not .so files.
9189+ shrext_cmds=".dll"
9190+ # FIXME: Setting linknames here is a bad hack.
9191+ archive_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
9192+ archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
9193+ $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
9194+ else
9195+ $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
9196+ fi~
9197+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
9198+ linknames='
9199+ # The linker will not automatically build a static lib if we build a DLL.
9200+ # _LT_TAGVAR(old_archive_from_new_cmds, CXX)='true'
9201+ enable_shared_with_static_runtimes_CXX=yes
9202+ # Don't use ranlib
9203+ old_postinstall_cmds_CXX='chmod 644 $oldlib'
9204+ postlink_cmds_CXX='lt_outputfile="@OUTPUT@"~
9205+ lt_tool_outputfile="@TOOL_OUTPUT@"~
9206+ case $lt_outputfile in
9207+ *.exe|*.EXE) ;;
9208+ *)
9209+ lt_outputfile="$lt_outputfile.exe"
9210+ lt_tool_outputfile="$lt_tool_outputfile.exe"
9211+ ;;
9212+ esac~
9213+ func_to_tool_file "$lt_outputfile"~
9214+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
9215+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
9216+ $RM "$lt_outputfile.manifest";
9217+ fi'
9218+ ;;
9219+ *)
9220+ # g++
9221+ # _LT_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless,
9222+ # as there is no search path for DLLs.
9223+ hardcode_libdir_flag_spec_CXX='-L$libdir'
9224+ export_dynamic_flag_spec_CXX='${wl}--export-all-symbols'
9225+ allow_undefined_flag_CXX=unsupported
9226+ always_export_symbols_CXX=no
9227+ enable_shared_with_static_runtimes_CXX=yes
9228+
9229+ if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
9230+ archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
9231+ # If the export-symbols file already is a .def file (1st line
9232+ # is EXPORTS), use it as is; otherwise, prepend...
9233+ archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
9234+ cp $export_symbols $output_objdir/$soname.def;
9235+ else
9236+ echo EXPORTS > $output_objdir/$soname.def;
9237+ cat $export_symbols >> $output_objdir/$soname.def;
9238+ fi~
9239+ $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'
9240+ else
9241+ ld_shlibs_CXX=no
9242+ fi
9243+ ;;
9244+ esac
9245+ ;;
9246 darwin* | rhapsody*)
9247
9248
9249@@ -13111,7 +13850,7 @@ if test -z "$aix_libpath"; then aix_libp
9250 ;;
9251 *)
9252 if test "$GXX" = yes; then
9253- archive_cmds_CXX='$RM $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
9254+ archive_cmds_CXX='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
9255 else
9256 # FIXME: insert proper C++ library support
9257 ld_shlibs_CXX=no
9258@@ -13182,10 +13921,10 @@ if test -z "$aix_libpath"; then aix_libp
9259 archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
9260 ;;
9261 ia64*)
9262- archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
9263+ archive_cmds_CXX='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
9264 ;;
9265 *)
9266- archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
9267+ archive_cmds_CXX='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
9268 ;;
9269 esac
9270 fi
9271@@ -13226,9 +13965,9 @@ if test -z "$aix_libpath"; then aix_libp
9272 *)
9273 if test "$GXX" = yes; then
9274 if test "$with_gnu_ld" = no; then
9275- archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
9276+ archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
9277 else
9278- archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib'
9279+ archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib'
9280 fi
9281 fi
9282 link_all_deplibs_CXX=yes
9283@@ -13298,20 +14037,20 @@ if test -z "$aix_libpath"; then aix_libp
9284 prelink_cmds_CXX='tpldir=Template.dir~
9285 rm -rf $tpldir~
9286 $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
9287- compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"'
9288+ compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"'
9289 old_archive_cmds_CXX='tpldir=Template.dir~
9290 rm -rf $tpldir~
9291 $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
9292- $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~
9293+ $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~
9294 $RANLIB $oldlib'
9295 archive_cmds_CXX='tpldir=Template.dir~
9296 rm -rf $tpldir~
9297 $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
9298- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
9299+ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
9300 archive_expsym_cmds_CXX='tpldir=Template.dir~
9301 rm -rf $tpldir~
9302 $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
9303- $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'
9304+ $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'
9305 ;;
9306 *) # Version 6 and above use weak symbols
9307 archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
9308@@ -13506,7 +14245,7 @@ if test -z "$aix_libpath"; then aix_libp
9309 archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
9310 ;;
9311 *)
9312- archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
9313+ archive_cmds_CXX='$CC -shared $pic_flag -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
9314 ;;
9315 esac
9316
9317@@ -13552,7 +14291,7 @@ if test -z "$aix_libpath"; then aix_libp
9318
9319 solaris*)
9320 case $cc_basename in
9321- CC*)
9322+ CC* | sunCC*)
9323 # Sun C++ 4.2, 5.x and Centerline C++
9324 archive_cmds_need_lc_CXX=yes
9325 no_undefined_flag_CXX=' -zdefs'
9326@@ -13593,9 +14332,9 @@ if test -z "$aix_libpath"; then aix_libp
9327 if test "$GXX" = yes && test "$with_gnu_ld" = no; then
9328 no_undefined_flag_CXX=' ${wl}-z ${wl}defs'
9329 if $CC --version | $GREP -v '^2\.7' > /dev/null; then
9330- archive_cmds_CXX='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
9331+ archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
9332 archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
9333- $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
9334+ $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
9335
9336 # Commands to make compiler produce verbose output that lists
9337 # what "hidden" libraries, object files and flags are used when
9338@@ -13730,6 +14469,13 @@ private:
9339 };
9340 _LT_EOF
9341
9342+
9343+_lt_libdeps_save_CFLAGS=$CFLAGS
9344+case "$CC $CFLAGS " in #(
9345+*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;;
9346+*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;;
9347+esac
9348+
9349 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
9350 (eval $ac_compile) 2>&5
9351 ac_status=$?
9352@@ -13743,7 +14489,7 @@ if { { eval echo "\"\$as_me\":${as_linen
9353 pre_test_object_deps_done=no
9354
9355 for p in `eval "$output_verbose_link_cmd"`; do
9356- case $p in
9357+ case ${prev}${p} in
9358
9359 -L* | -R* | -l*)
9360 # Some compilers place space between "-{L,R}" and the path.
9361@@ -13752,13 +14498,22 @@ if { { eval echo "\"\$as_me\":${as_linen
9362 test $p = "-R"; then
9363 prev=$p
9364 continue
9365- else
9366- prev=
9367 fi
9368
9369+ # Expand the sysroot to ease extracting the directories later.
9370+ if test -z "$prev"; then
9371+ case $p in
9372+ -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;;
9373+ -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;;
9374+ -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;;
9375+ esac
9376+ fi
9377+ case $p in
9378+ =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;;
9379+ esac
9380 if test "$pre_test_object_deps_done" = no; then
9381- case $p in
9382- -L* | -R*)
9383+ case ${prev} in
9384+ -L | -R)
9385 # Internal compiler library paths should come after those
9386 # provided the user. The postdeps already come after the
9387 # user supplied libs so there is no need to process them.
9388@@ -13778,8 +14533,10 @@ if { { eval echo "\"\$as_me\":${as_linen
9389 postdeps_CXX="${postdeps_CXX} ${prev}${p}"
9390 fi
9391 fi
9392+ prev=
9393 ;;
9394
9395+ *.lto.$objext) ;; # Ignore GCC LTO objects
9396 *.$objext)
9397 # This assumes that the test object file only shows up
9398 # once in the compiler output.
9399@@ -13815,6 +14572,7 @@ else
9400 fi
9401
9402 $RM -f confest.$objext
9403+CFLAGS=$_lt_libdeps_save_CFLAGS
9404
9405 # PORTME: override above test on systems where it is broken
9406 case $host_os in
9407@@ -13850,7 +14608,7 @@ linux*)
9408
9409 solaris*)
9410 case $cc_basename in
9411- CC*)
9412+ CC* | sunCC*)
9413 # The more standards-conforming stlport4 library is
9414 # incompatible with the Cstd library. Avoid specifying
9415 # it if it's in CXXFLAGS. Ignore libCrun as
9416@@ -13915,8 +14673,6 @@ fi
9417 lt_prog_compiler_pic_CXX=
9418 lt_prog_compiler_static_CXX=
9419
9420-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
9421-$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
9422
9423 # C++ specific cases for pic, static, wl, etc.
9424 if test "$GXX" = yes; then
9425@@ -14021,6 +14777,11 @@ $as_echo_n "checking for $compiler optio
9426 ;;
9427 esac
9428 ;;
9429+ mingw* | cygwin* | os2* | pw32* | cegcc*)
9430+ # This hack is so that the source file can tell whether it is being
9431+ # built for inclusion in a dll (and should export symbols for example).
9432+ lt_prog_compiler_pic_CXX='-DDLL_EXPORT'
9433+ ;;
9434 dgux*)
9435 case $cc_basename in
9436 ec++*)
9437@@ -14173,7 +14934,7 @@ $as_echo_n "checking for $compiler optio
9438 ;;
9439 solaris*)
9440 case $cc_basename in
9441- CC*)
9442+ CC* | sunCC*)
9443 # Sun C++ 4.2, 5.x and Centerline C++
9444 lt_prog_compiler_pic_CXX='-KPIC'
9445 lt_prog_compiler_static_CXX='-Bstatic'
9446@@ -14238,10 +14999,17 @@ case $host_os in
9447 lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC"
9448 ;;
9449 esac
9450-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic_CXX" >&5
9451-$as_echo "$lt_prog_compiler_pic_CXX" >&6; }
9452-
9453
9454+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
9455+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
9456+if ${lt_cv_prog_compiler_pic_CXX+:} false; then :
9457+ $as_echo_n "(cached) " >&6
9458+else
9459+ lt_cv_prog_compiler_pic_CXX=$lt_prog_compiler_pic_CXX
9460+fi
9461+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_CXX" >&5
9462+$as_echo "$lt_cv_prog_compiler_pic_CXX" >&6; }
9463+lt_prog_compiler_pic_CXX=$lt_cv_prog_compiler_pic_CXX
9464
9465 #
9466 # Check to make sure the PIC flag actually works.
9467@@ -14299,6 +15067,8 @@ fi
9468
9469
9470
9471+
9472+
9473 #
9474 # Check to make sure the static flag actually works.
9475 #
9476@@ -14476,6 +15246,7 @@ fi
9477 $as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
9478
9479 export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
9480+ exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
9481 case $host_os in
9482 aix[4-9]*)
9483 # If we're using GNU nm, then we don't want the "-C" option.
9484@@ -14490,15 +15261,20 @@ $as_echo_n "checking whether the $compil
9485 ;;
9486 pw32*)
9487 export_symbols_cmds_CXX="$ltdll_cmds"
9488- ;;
9489+ ;;
9490 cygwin* | mingw* | cegcc*)
9491- export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;/^.*[ ]__nm__/s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols'
9492- ;;
9493+ case $cc_basename in
9494+ cl*) ;;
9495+ *)
9496+ export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols'
9497+ exclude_expsyms_CXX='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
9498+ ;;
9499+ esac
9500+ ;;
9501 *)
9502 export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
9503- ;;
9504+ ;;
9505 esac
9506- exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
9507
9508 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5
9509 $as_echo "$ld_shlibs_CXX" >&6; }
9510@@ -14761,8 +15537,9 @@ cygwin* | mingw* | pw32* | cegcc*)
9511 need_version=no
9512 need_lib_prefix=no
9513
9514- case $GCC,$host_os in
9515- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
9516+ case $GCC,$cc_basename in
9517+ yes,*)
9518+ # gcc
9519 library_names_spec='$libname.dll.a'
9520 # DLL is installed to $(libdir)/../bin by postinstall_cmds
9521 postinstall_cmds='base_file=`basename \${file}`~
9522@@ -14794,13 +15571,71 @@ cygwin* | mingw* | pw32* | cegcc*)
9523 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
9524 ;;
9525 esac
9526+ dynamic_linker='Win32 ld.exe'
9527+ ;;
9528+
9529+ *,cl*)
9530+ # Native MSVC
9531+ libname_spec='$name'
9532+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
9533+ library_names_spec='${libname}.dll.lib'
9534+
9535+ case $build_os in
9536+ mingw*)
9537+ sys_lib_search_path_spec=
9538+ lt_save_ifs=$IFS
9539+ IFS=';'
9540+ for lt_path in $LIB
9541+ do
9542+ IFS=$lt_save_ifs
9543+ # Let DOS variable expansion print the short 8.3 style file name.
9544+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
9545+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
9546+ done
9547+ IFS=$lt_save_ifs
9548+ # Convert to MSYS style.
9549+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
9550+ ;;
9551+ cygwin*)
9552+ # Convert to unix form, then to dos form, then back to unix form
9553+ # but this time dos style (no spaces!) so that the unix form looks
9554+ # like /cygdrive/c/PROGRA~1:/cygdr...
9555+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
9556+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
9557+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
9558+ ;;
9559+ *)
9560+ sys_lib_search_path_spec="$LIB"
9561+ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
9562+ # It is most probably a Windows format PATH.
9563+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
9564+ else
9565+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
9566+ fi
9567+ # FIXME: find the short name or the path components, as spaces are
9568+ # common. (e.g. "Program Files" -> "PROGRA~1")
9569+ ;;
9570+ esac
9571+
9572+ # DLL is installed to $(libdir)/../bin by postinstall_cmds
9573+ postinstall_cmds='base_file=`basename \${file}`~
9574+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
9575+ dldir=$destdir/`dirname \$dlpath`~
9576+ test -d \$dldir || mkdir -p \$dldir~
9577+ $install_prog $dir/$dlname \$dldir/$dlname'
9578+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
9579+ dlpath=$dir/\$dldll~
9580+ $RM \$dlpath'
9581+ shlibpath_overrides_runpath=yes
9582+ dynamic_linker='Win32 link.exe'
9583 ;;
9584
9585 *)
9586+ # Assume MSVC wrapper
9587 library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
9588+ dynamic_linker='Win32 ld.exe'
9589 ;;
9590 esac
9591- dynamic_linker='Win32 ld.exe'
9592 # FIXME: first we should search . and the directory the executable is in
9593 shlibpath_var=PATH
9594 ;;
9595@@ -14891,7 +15726,7 @@ haiku*)
9596 soname_spec='${libname}${release}${shared_ext}$major'
9597 shlibpath_var=LIBRARY_PATH
9598 shlibpath_overrides_runpath=yes
9599- sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib'
9600+ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
9601 hardcode_into_libs=yes
9602 ;;
9603
9604@@ -15350,6 +16185,7 @@ fi
9605 fi # test -n "$compiler"
9606
9607 CC=$lt_save_CC
9608+ CFLAGS=$lt_save_CFLAGS
9609 LDCXX=$LD
9610 LD=$lt_save_LD
9611 GCC=$lt_save_GCC
9612@@ -18449,13 +19285,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_
9613 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
9614 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
9615 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
9616+lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`'
9617+lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`'
9618 reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
9619 reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
9620 OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
9621 deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`'
9622 file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`'
9623+file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`'
9624+want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`'
9625+DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`'
9626+sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`'
9627 AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`'
9628 AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`'
9629+archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`'
9630 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
9631 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
9632 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
9633@@ -18470,14 +19313,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$l
9634 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
9635 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
9636 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"`'
9637+nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`'
9638+lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`'
9639 objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`'
9640 MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`'
9641 lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`'
9642-lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
9643 lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`'
9644+lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
9645 lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`'
9646 lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`'
9647 need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`'
9648+MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`'
9649 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
9650 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
9651 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
9652@@ -18510,12 +19356,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcod
9653 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
9654 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
9655 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
9656-fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`'
9657 always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`'
9658 export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`'
9659 exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`'
9660 include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`'
9661 prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`'
9662+postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`'
9663 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
9664 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
9665 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
9666@@ -18554,8 +19400,8 @@ old_archive_cmds_CXX='`$ECHO "$old_archi
9667 compiler_CXX='`$ECHO "$compiler_CXX" | $SED "$delay_single_quote_subst"`'
9668 GCC_CXX='`$ECHO "$GCC_CXX" | $SED "$delay_single_quote_subst"`'
9669 lt_prog_compiler_no_builtin_flag_CXX='`$ECHO "$lt_prog_compiler_no_builtin_flag_CXX" | $SED "$delay_single_quote_subst"`'
9670-lt_prog_compiler_wl_CXX='`$ECHO "$lt_prog_compiler_wl_CXX" | $SED "$delay_single_quote_subst"`'
9671 lt_prog_compiler_pic_CXX='`$ECHO "$lt_prog_compiler_pic_CXX" | $SED "$delay_single_quote_subst"`'
9672+lt_prog_compiler_wl_CXX='`$ECHO "$lt_prog_compiler_wl_CXX" | $SED "$delay_single_quote_subst"`'
9673 lt_prog_compiler_static_CXX='`$ECHO "$lt_prog_compiler_static_CXX" | $SED "$delay_single_quote_subst"`'
9674 lt_cv_prog_compiler_c_o_CXX='`$ECHO "$lt_cv_prog_compiler_c_o_CXX" | $SED "$delay_single_quote_subst"`'
9675 archive_cmds_need_lc_CXX='`$ECHO "$archive_cmds_need_lc_CXX" | $SED "$delay_single_quote_subst"`'
9676@@ -18582,12 +19428,12 @@ hardcode_shlibpath_var_CXX='`$ECHO "$har
9677 hardcode_automatic_CXX='`$ECHO "$hardcode_automatic_CXX" | $SED "$delay_single_quote_subst"`'
9678 inherit_rpath_CXX='`$ECHO "$inherit_rpath_CXX" | $SED "$delay_single_quote_subst"`'
9679 link_all_deplibs_CXX='`$ECHO "$link_all_deplibs_CXX" | $SED "$delay_single_quote_subst"`'
9680-fix_srcfile_path_CXX='`$ECHO "$fix_srcfile_path_CXX" | $SED "$delay_single_quote_subst"`'
9681 always_export_symbols_CXX='`$ECHO "$always_export_symbols_CXX" | $SED "$delay_single_quote_subst"`'
9682 export_symbols_cmds_CXX='`$ECHO "$export_symbols_cmds_CXX" | $SED "$delay_single_quote_subst"`'
9683 exclude_expsyms_CXX='`$ECHO "$exclude_expsyms_CXX" | $SED "$delay_single_quote_subst"`'
9684 include_expsyms_CXX='`$ECHO "$include_expsyms_CXX" | $SED "$delay_single_quote_subst"`'
9685 prelink_cmds_CXX='`$ECHO "$prelink_cmds_CXX" | $SED "$delay_single_quote_subst"`'
9686+postlink_cmds_CXX='`$ECHO "$postlink_cmds_CXX" | $SED "$delay_single_quote_subst"`'
9687 file_list_spec_CXX='`$ECHO "$file_list_spec_CXX" | $SED "$delay_single_quote_subst"`'
9688 hardcode_action_CXX='`$ECHO "$hardcode_action_CXX" | $SED "$delay_single_quote_subst"`'
9689 compiler_lib_search_dirs_CXX='`$ECHO "$compiler_lib_search_dirs_CXX" | $SED "$delay_single_quote_subst"`'
9690@@ -18625,8 +19471,13 @@ reload_flag \
9691 OBJDUMP \
9692 deplibs_check_method \
9693 file_magic_cmd \
9694+file_magic_glob \
9695+want_nocaseglob \
9696+DLLTOOL \
9697+sharedlib_from_linklib_cmd \
9698 AR \
9699 AR_FLAGS \
9700+archiver_list_spec \
9701 STRIP \
9702 RANLIB \
9703 CC \
9704@@ -18636,12 +19487,14 @@ lt_cv_sys_global_symbol_pipe \
9705 lt_cv_sys_global_symbol_to_cdecl \
9706 lt_cv_sys_global_symbol_to_c_name_address \
9707 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
9708+nm_file_list_spec \
9709 lt_prog_compiler_no_builtin_flag \
9710-lt_prog_compiler_wl \
9711 lt_prog_compiler_pic \
9712+lt_prog_compiler_wl \
9713 lt_prog_compiler_static \
9714 lt_cv_prog_compiler_c_o \
9715 need_locks \
9716+MANIFEST_TOOL \
9717 DSYMUTIL \
9718 NMEDIT \
9719 LIPO \
9720@@ -18657,7 +19510,6 @@ no_undefined_flag \
9721 hardcode_libdir_flag_spec \
9722 hardcode_libdir_flag_spec_ld \
9723 hardcode_libdir_separator \
9724-fix_srcfile_path \
9725 exclude_expsyms \
9726 include_expsyms \
9727 file_list_spec \
9728@@ -18679,8 +19531,8 @@ LD_CXX \
9729 reload_flag_CXX \
9730 compiler_CXX \
9731 lt_prog_compiler_no_builtin_flag_CXX \
9732-lt_prog_compiler_wl_CXX \
9733 lt_prog_compiler_pic_CXX \
9734+lt_prog_compiler_wl_CXX \
9735 lt_prog_compiler_static_CXX \
9736 lt_cv_prog_compiler_c_o_CXX \
9737 export_dynamic_flag_spec_CXX \
9738@@ -18692,7 +19544,6 @@ no_undefined_flag_CXX \
9739 hardcode_libdir_flag_spec_CXX \
9740 hardcode_libdir_flag_spec_ld_CXX \
9741 hardcode_libdir_separator_CXX \
9742-fix_srcfile_path_CXX \
9743 exclude_expsyms_CXX \
9744 include_expsyms_CXX \
9745 file_list_spec_CXX \
9746@@ -18726,6 +19577,7 @@ module_cmds \
9747 module_expsym_cmds \
9748 export_symbols_cmds \
9749 prelink_cmds \
9750+postlink_cmds \
9751 postinstall_cmds \
9752 postuninstall_cmds \
9753 finish_cmds \
9754@@ -18740,7 +19592,8 @@ archive_expsym_cmds_CXX \
9755 module_cmds_CXX \
9756 module_expsym_cmds_CXX \
9757 export_symbols_cmds_CXX \
9758-prelink_cmds_CXX; do
9759+prelink_cmds_CXX \
9760+postlink_cmds_CXX; do
9761 case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
9762 *[\\\\\\\`\\"\\\$]*)
9763 eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
9764@@ -19505,7 +20358,8 @@ $as_echo X"$file" |
9765 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
9766 #
9767 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
9768-# 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
9769+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
9770+# Inc.
9771 # Written by Gordon Matzigkeit, 1996
9772 #
9773 # This file is part of GNU Libtool.
9774@@ -19608,19 +20462,42 @@ SP2NL=$lt_lt_SP2NL
9775 # turn newlines into spaces.
9776 NL2SP=$lt_lt_NL2SP
9777
9778+# convert \$build file names to \$host format.
9779+to_host_file_cmd=$lt_cv_to_host_file_cmd
9780+
9781+# convert \$build files to toolchain format.
9782+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
9783+
9784 # An object symbol dumper.
9785 OBJDUMP=$lt_OBJDUMP
9786
9787 # Method to check whether dependent libraries are shared objects.
9788 deplibs_check_method=$lt_deplibs_check_method
9789
9790-# Command to use when deplibs_check_method == "file_magic".
9791+# Command to use when deplibs_check_method = "file_magic".
9792 file_magic_cmd=$lt_file_magic_cmd
9793
9794+# How to find potential files when deplibs_check_method = "file_magic".
9795+file_magic_glob=$lt_file_magic_glob
9796+
9797+# Find potential files using nocaseglob when deplibs_check_method = "file_magic".
9798+want_nocaseglob=$lt_want_nocaseglob
9799+
9800+# DLL creation program.
9801+DLLTOOL=$lt_DLLTOOL
9802+
9803+# Command to associate shared and link libraries.
9804+sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd
9805+
9806 # The archiver.
9807 AR=$lt_AR
9808+
9809+# Flags to create an archive.
9810 AR_FLAGS=$lt_AR_FLAGS
9811
9812+# How to feed a file listing to the archiver.
9813+archiver_list_spec=$lt_archiver_list_spec
9814+
9815 # A symbol stripping program.
9816 STRIP=$lt_STRIP
9817
9818@@ -19650,6 +20527,12 @@ global_symbol_to_c_name_address=$lt_lt_c
9819 # Transform the output of nm in a C name address pair when lib prefix is needed.
9820 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
9821
9822+# Specify filename containing input files for \$NM.
9823+nm_file_list_spec=$lt_nm_file_list_spec
9824+
9825+# The root where to search for dependent libraries,and in which our libraries should be installed.
9826+lt_sysroot=$lt_sysroot
9827+
9828 # The name of the directory that contains temporary libtool files.
9829 objdir=$objdir
9830
9831@@ -19659,6 +20542,9 @@ MAGIC_CMD=$MAGIC_CMD
9832 # Must we lock files when doing compilation?
9833 need_locks=$lt_need_locks
9834
9835+# Manifest tool.
9836+MANIFEST_TOOL=$lt_MANIFEST_TOOL
9837+
9838 # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
9839 DSYMUTIL=$lt_DSYMUTIL
9840
9841@@ -19773,12 +20659,12 @@ with_gcc=$GCC
9842 # Compiler flag to turn off builtin functions.
9843 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
9844
9845-# How to pass a linker flag through the compiler.
9846-wl=$lt_lt_prog_compiler_wl
9847-
9848 # Additional compiler flags for building library objects.
9849 pic_flag=$lt_lt_prog_compiler_pic
9850
9851+# How to pass a linker flag through the compiler.
9852+wl=$lt_lt_prog_compiler_wl
9853+
9854 # Compiler flag to prevent dynamic linking.
9855 link_static_flag=$lt_lt_prog_compiler_static
9856
9857@@ -19865,9 +20751,6 @@ inherit_rpath=$inherit_rpath
9858 # Whether libtool must link a program against all its dependency libraries.
9859 link_all_deplibs=$link_all_deplibs
9860
9861-# Fix the shell variable \$srcfile for the compiler.
9862-fix_srcfile_path=$lt_fix_srcfile_path
9863-
9864 # Set to "yes" if exported symbols are required.
9865 always_export_symbols=$always_export_symbols
9866
9867@@ -19883,6 +20766,9 @@ include_expsyms=$lt_include_expsyms
9868 # Commands necessary for linking programs (against libraries) with templates.
9869 prelink_cmds=$lt_prelink_cmds
9870
9871+# Commands necessary for finishing linking programs.
9872+postlink_cmds=$lt_postlink_cmds
9873+
9874 # Specify filename containing input files.
9875 file_list_spec=$lt_file_list_spec
9876
9877@@ -19929,210 +20815,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
9878 # if finds mixed CR/LF and LF-only lines. Since sed operates in
9879 # text mode, it properly converts lines to CR/LF. This bash problem
9880 # is reportedly fixed, but why not run on old versions too?
9881- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
9882- || (rm -f "$cfgfile"; exit 1)
9883-
9884- case $xsi_shell in
9885- yes)
9886- cat << \_LT_EOF >> "$cfgfile"
9887-
9888-# func_dirname file append nondir_replacement
9889-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
9890-# otherwise set result to NONDIR_REPLACEMENT.
9891-func_dirname ()
9892-{
9893- case ${1} in
9894- */*) func_dirname_result="${1%/*}${2}" ;;
9895- * ) func_dirname_result="${3}" ;;
9896- esac
9897-}
9898-
9899-# func_basename file
9900-func_basename ()
9901-{
9902- func_basename_result="${1##*/}"
9903-}
9904-
9905-# func_dirname_and_basename file append nondir_replacement
9906-# perform func_basename and func_dirname in a single function
9907-# call:
9908-# dirname: Compute the dirname of FILE. If nonempty,
9909-# add APPEND to the result, otherwise set result
9910-# to NONDIR_REPLACEMENT.
9911-# value returned in "$func_dirname_result"
9912-# basename: Compute filename of FILE.
9913-# value retuned in "$func_basename_result"
9914-# Implementation must be kept synchronized with func_dirname
9915-# and func_basename. For efficiency, we do not delegate to
9916-# those functions but instead duplicate the functionality here.
9917-func_dirname_and_basename ()
9918-{
9919- case ${1} in
9920- */*) func_dirname_result="${1%/*}${2}" ;;
9921- * ) func_dirname_result="${3}" ;;
9922- esac
9923- func_basename_result="${1##*/}"
9924-}
9925-
9926-# func_stripname prefix suffix name
9927-# strip PREFIX and SUFFIX off of NAME.
9928-# PREFIX and SUFFIX must not contain globbing or regex special
9929-# characters, hashes, percent signs, but SUFFIX may contain a leading
9930-# dot (in which case that matches only a dot).
9931-func_stripname ()
9932-{
9933- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
9934- # positional parameters, so assign one to ordinary parameter first.
9935- func_stripname_result=${3}
9936- func_stripname_result=${func_stripname_result#"${1}"}
9937- func_stripname_result=${func_stripname_result%"${2}"}
9938-}
9939-
9940-# func_opt_split
9941-func_opt_split ()
9942-{
9943- func_opt_split_opt=${1%%=*}
9944- func_opt_split_arg=${1#*=}
9945-}
9946-
9947-# func_lo2o object
9948-func_lo2o ()
9949-{
9950- case ${1} in
9951- *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
9952- *) func_lo2o_result=${1} ;;
9953- esac
9954-}
9955-
9956-# func_xform libobj-or-source
9957-func_xform ()
9958-{
9959- func_xform_result=${1%.*}.lo
9960-}
9961-
9962-# func_arith arithmetic-term...
9963-func_arith ()
9964-{
9965- func_arith_result=$(( $* ))
9966-}
9967-
9968-# func_len string
9969-# STRING may not start with a hyphen.
9970-func_len ()
9971-{
9972- func_len_result=${#1}
9973-}
9974-
9975-_LT_EOF
9976- ;;
9977- *) # Bourne compatible functions.
9978- cat << \_LT_EOF >> "$cfgfile"
9979-
9980-# func_dirname file append nondir_replacement
9981-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
9982-# otherwise set result to NONDIR_REPLACEMENT.
9983-func_dirname ()
9984-{
9985- # Extract subdirectory from the argument.
9986- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
9987- if test "X$func_dirname_result" = "X${1}"; then
9988- func_dirname_result="${3}"
9989- else
9990- func_dirname_result="$func_dirname_result${2}"
9991- fi
9992-}
9993-
9994-# func_basename file
9995-func_basename ()
9996-{
9997- func_basename_result=`$ECHO "${1}" | $SED "$basename"`
9998-}
9999-
10000-
10001-# func_stripname prefix suffix name
10002-# strip PREFIX and SUFFIX off of NAME.
10003-# PREFIX and SUFFIX must not contain globbing or regex special
10004-# characters, hashes, percent signs, but SUFFIX may contain a leading
10005-# dot (in which case that matches only a dot).
10006-# func_strip_suffix prefix name
10007-func_stripname ()
10008-{
10009- case ${2} in
10010- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
10011- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
10012- esac
10013-}
10014-
10015-# sed scripts:
10016-my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q'
10017-my_sed_long_arg='1s/^-[^=]*=//'
10018-
10019-# func_opt_split
10020-func_opt_split ()
10021-{
10022- func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"`
10023- func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"`
10024-}
10025-
10026-# func_lo2o object
10027-func_lo2o ()
10028-{
10029- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
10030-}
10031-
10032-# func_xform libobj-or-source
10033-func_xform ()
10034-{
10035- func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`
10036-}
10037-
10038-# func_arith arithmetic-term...
10039-func_arith ()
10040-{
10041- func_arith_result=`expr "$@"`
10042-}
10043-
10044-# func_len string
10045-# STRING may not start with a hyphen.
10046-func_len ()
10047-{
10048- func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len`
10049-}
10050-
10051-_LT_EOF
10052-esac
10053-
10054-case $lt_shell_append in
10055- yes)
10056- cat << \_LT_EOF >> "$cfgfile"
10057-
10058-# func_append var value
10059-# Append VALUE to the end of shell variable VAR.
10060-func_append ()
10061-{
10062- eval "$1+=\$2"
10063-}
10064-_LT_EOF
10065- ;;
10066- *)
10067- cat << \_LT_EOF >> "$cfgfile"
10068-
10069-# func_append var value
10070-# Append VALUE to the end of shell variable VAR.
10071-func_append ()
10072-{
10073- eval "$1=\$$1\$2"
10074-}
10075-
10076-_LT_EOF
10077- ;;
10078- esac
10079+ sed '$q' "$ltmain" >> "$cfgfile" \
10080+ || (rm -f "$cfgfile"; exit 1)
10081
10082+ if test x"$xsi_shell" = xyes; then
10083+ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\
10084+func_dirname ()\
10085+{\
10086+\ case ${1} in\
10087+\ */*) func_dirname_result="${1%/*}${2}" ;;\
10088+\ * ) func_dirname_result="${3}" ;;\
10089+\ esac\
10090+} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \
10091+ && mv -f "$cfgfile.tmp" "$cfgfile" \
10092+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
10093+test 0 -eq $? || _lt_function_replace_fail=:
10094+
10095+
10096+ sed -e '/^func_basename ()$/,/^} # func_basename /c\
10097+func_basename ()\
10098+{\
10099+\ func_basename_result="${1##*/}"\
10100+} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \
10101+ && mv -f "$cfgfile.tmp" "$cfgfile" \
10102+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
10103+test 0 -eq $? || _lt_function_replace_fail=:
10104+
10105+
10106+ sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\
10107+func_dirname_and_basename ()\
10108+{\
10109+\ case ${1} in\
10110+\ */*) func_dirname_result="${1%/*}${2}" ;;\
10111+\ * ) func_dirname_result="${3}" ;;\
10112+\ esac\
10113+\ func_basename_result="${1##*/}"\
10114+} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \
10115+ && mv -f "$cfgfile.tmp" "$cfgfile" \
10116+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
10117+test 0 -eq $? || _lt_function_replace_fail=:
10118+
10119+
10120+ sed -e '/^func_stripname ()$/,/^} # func_stripname /c\
10121+func_stripname ()\
10122+{\
10123+\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\
10124+\ # positional parameters, so assign one to ordinary parameter first.\
10125+\ func_stripname_result=${3}\
10126+\ func_stripname_result=${func_stripname_result#"${1}"}\
10127+\ func_stripname_result=${func_stripname_result%"${2}"}\
10128+} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \
10129+ && mv -f "$cfgfile.tmp" "$cfgfile" \
10130+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
10131+test 0 -eq $? || _lt_function_replace_fail=:
10132+
10133+
10134+ sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\
10135+func_split_long_opt ()\
10136+{\
10137+\ func_split_long_opt_name=${1%%=*}\
10138+\ func_split_long_opt_arg=${1#*=}\
10139+} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \
10140+ && mv -f "$cfgfile.tmp" "$cfgfile" \
10141+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
10142+test 0 -eq $? || _lt_function_replace_fail=:
10143+
10144+
10145+ sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\
10146+func_split_short_opt ()\
10147+{\
10148+\ func_split_short_opt_arg=${1#??}\
10149+\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\
10150+} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \
10151+ && mv -f "$cfgfile.tmp" "$cfgfile" \
10152+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
10153+test 0 -eq $? || _lt_function_replace_fail=:
10154+
10155+
10156+ sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\
10157+func_lo2o ()\
10158+{\
10159+\ case ${1} in\
10160+\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\
10161+\ *) func_lo2o_result=${1} ;;\
10162+\ esac\
10163+} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \
10164+ && mv -f "$cfgfile.tmp" "$cfgfile" \
10165+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
10166+test 0 -eq $? || _lt_function_replace_fail=:
10167+
10168+
10169+ sed -e '/^func_xform ()$/,/^} # func_xform /c\
10170+func_xform ()\
10171+{\
10172+ func_xform_result=${1%.*}.lo\
10173+} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \
10174+ && mv -f "$cfgfile.tmp" "$cfgfile" \
10175+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
10176+test 0 -eq $? || _lt_function_replace_fail=:
10177+
10178+
10179+ sed -e '/^func_arith ()$/,/^} # func_arith /c\
10180+func_arith ()\
10181+{\
10182+ func_arith_result=$(( $* ))\
10183+} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \
10184+ && mv -f "$cfgfile.tmp" "$cfgfile" \
10185+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
10186+test 0 -eq $? || _lt_function_replace_fail=:
10187+
10188+
10189+ sed -e '/^func_len ()$/,/^} # func_len /c\
10190+func_len ()\
10191+{\
10192+ func_len_result=${#1}\
10193+} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \
10194+ && mv -f "$cfgfile.tmp" "$cfgfile" \
10195+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
10196+test 0 -eq $? || _lt_function_replace_fail=:
10197+
10198+fi
10199+
10200+if test x"$lt_shell_append" = xyes; then
10201+ sed -e '/^func_append ()$/,/^} # func_append /c\
10202+func_append ()\
10203+{\
10204+ eval "${1}+=\\${2}"\
10205+} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \
10206+ && mv -f "$cfgfile.tmp" "$cfgfile" \
10207+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
10208+test 0 -eq $? || _lt_function_replace_fail=:
10209+
10210+
10211+ sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\
10212+func_append_quoted ()\
10213+{\
10214+\ func_quote_for_eval "${2}"\
10215+\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\
10216+} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \
10217+ && mv -f "$cfgfile.tmp" "$cfgfile" \
10218+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
10219+test 0 -eq $? || _lt_function_replace_fail=:
10220+
10221+
10222+ # Save a `func_append' function call where possible by direct use of '+='
10223+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
10224+ && mv -f "$cfgfile.tmp" "$cfgfile" \
10225+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
10226+ test 0 -eq $? || _lt_function_replace_fail=:
10227+else
10228+ # Save a `func_append' function call even when '+=' is not available
10229+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
10230+ && mv -f "$cfgfile.tmp" "$cfgfile" \
10231+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
10232+ test 0 -eq $? || _lt_function_replace_fail=:
10233+fi
10234+
10235+if test x"$_lt_function_replace_fail" = x":"; then
10236+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5
10237+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;}
10238+fi
10239
10240- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
10241- || (rm -f "$cfgfile"; exit 1)
10242
10243- mv -f "$cfgfile" "$ofile" ||
10244+ mv -f "$cfgfile" "$ofile" ||
10245 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
10246 chmod +x "$ofile"
10247
10248@@ -20160,12 +21005,12 @@ with_gcc=$GCC_CXX
10249 # Compiler flag to turn off builtin functions.
10250 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX
10251
10252-# How to pass a linker flag through the compiler.
10253-wl=$lt_lt_prog_compiler_wl_CXX
10254-
10255 # Additional compiler flags for building library objects.
10256 pic_flag=$lt_lt_prog_compiler_pic_CXX
10257
10258+# How to pass a linker flag through the compiler.
10259+wl=$lt_lt_prog_compiler_wl_CXX
10260+
10261 # Compiler flag to prevent dynamic linking.
10262 link_static_flag=$lt_lt_prog_compiler_static_CXX
10263
10264@@ -20252,9 +21097,6 @@ inherit_rpath=$inherit_rpath_CXX
10265 # Whether libtool must link a program against all its dependency libraries.
10266 link_all_deplibs=$link_all_deplibs_CXX
10267
10268-# Fix the shell variable \$srcfile for the compiler.
10269-fix_srcfile_path=$lt_fix_srcfile_path_CXX
10270-
10271 # Set to "yes" if exported symbols are required.
10272 always_export_symbols=$always_export_symbols_CXX
10273
10274@@ -20270,6 +21112,9 @@ include_expsyms=$lt_include_expsyms_CXX
10275 # Commands necessary for linking programs (against libraries) with templates.
10276 prelink_cmds=$lt_prelink_cmds_CXX
10277
10278+# Commands necessary for finishing linking programs.
10279+postlink_cmds=$lt_postlink_cmds_CXX
10280+
10281 # Specify filename containing input files.
10282 file_list_spec=$lt_file_list_spec_CXX
10283
10284--- a/libtool.m4
10285+++ b/libtool.m4
10286@@ -1,7 +1,8 @@
10287 # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
10288 #
10289 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
10290-# 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
10291+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
10292+# Inc.
10293 # Written by Gordon Matzigkeit, 1996
10294 #
10295 # This file is free software; the Free Software Foundation gives
10296@@ -10,7 +11,8 @@
10297
10298 m4_define([_LT_COPYING], [dnl
10299 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
10300-# 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
10301+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
10302+# Inc.
10303 # Written by Gordon Matzigkeit, 1996
10304 #
10305 # This file is part of GNU Libtool.
10306@@ -37,7 +39,7 @@ m4_define([_LT_COPYING], [dnl
10307 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
10308 ])
10309
10310-# serial 56 LT_INIT
10311+# serial 57 LT_INIT
10312
10313
10314 # LT_PREREQ(VERSION)
10315@@ -92,7 +94,8 @@ _LT_SET_OPTIONS([$0], [$1])
10316 LIBTOOL_DEPS="$ltmain"
10317
10318 # Always use our own libtool.
10319-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
10320+LIBTOOL='$(SHELL) $(top_builddir)'
10321+LIBTOOL="$LIBTOOL/${host_alias}-libtool"
10322 AC_SUBST(LIBTOOL)dnl
10323
10324 _LT_SETUP
10325@@ -166,10 +169,13 @@ _LT_DECL([], [exeext], [0], [Executable
10326 dnl
10327 m4_require([_LT_FILEUTILS_DEFAULTS])dnl
10328 m4_require([_LT_CHECK_SHELL_FEATURES])dnl
10329+m4_require([_LT_PATH_CONVERSION_FUNCTIONS])dnl
10330 m4_require([_LT_CMD_RELOAD])dnl
10331 m4_require([_LT_CHECK_MAGIC_METHOD])dnl
10332+m4_require([_LT_CHECK_SHAREDLIB_FROM_LINKLIB])dnl
10333 m4_require([_LT_CMD_OLD_ARCHIVE])dnl
10334 m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl
10335+m4_require([_LT_WITH_SYSROOT])dnl
10336
10337 _LT_CONFIG_LIBTOOL_INIT([
10338 # See if we are running on zsh, and set the options which allow our
10339@@ -199,7 +205,7 @@ aix3*)
10340 esac
10341
10342 # Global variables:
10343-ofile=libtool
10344+ofile=${host_alias}-libtool
10345 can_build_shared=yes
10346
10347 # All known linkers require a `.a' archive for static linking (except MSVC,
10348@@ -632,7 +638,7 @@ m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_
10349 m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION])
10350 configured by $[0], generated by m4_PACKAGE_STRING.
10351
10352-Copyright (C) 2009 Free Software Foundation, Inc.
10353+Copyright (C) 2010 Free Software Foundation, Inc.
10354 This config.lt script is free software; the Free Software Foundation
10355 gives unlimited permision to copy, distribute and modify it."
10356
10357@@ -746,15 +752,12 @@ _LT_EOF
10358 # if finds mixed CR/LF and LF-only lines. Since sed operates in
10359 # text mode, it properly converts lines to CR/LF. This bash problem
10360 # is reportedly fixed, but why not run on old versions too?
10361- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
10362- || (rm -f "$cfgfile"; exit 1)
10363+ sed '$q' "$ltmain" >> "$cfgfile" \
10364+ || (rm -f "$cfgfile"; exit 1)
10365
10366- _LT_PROG_XSI_SHELLFNS
10367+ _LT_PROG_REPLACE_SHELLFNS
10368
10369- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
10370- || (rm -f "$cfgfile"; exit 1)
10371-
10372- mv -f "$cfgfile" "$ofile" ||
10373+ mv -f "$cfgfile" "$ofile" ||
10374 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
10375 chmod +x "$ofile"
10376 ],
10377@@ -980,6 +983,8 @@ _LT_EOF
10378 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD
10379 echo "$AR cru libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD
10380 $AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD
10381+ echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD
10382+ $RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD
10383 cat > conftest.c << _LT_EOF
10384 int main() { return 0;}
10385 _LT_EOF
10386@@ -1069,30 +1074,41 @@ m4_defun([_LT_DARWIN_LINKER_FEATURES],
10387 fi
10388 ])
10389
10390-# _LT_SYS_MODULE_PATH_AIX
10391-# -----------------------
10392+# _LT_SYS_MODULE_PATH_AIX([TAGNAME])
10393+# ----------------------------------
10394 # Links a minimal program and checks the executable
10395 # for the system default hardcoded library path. In most cases,
10396 # this is /usr/lib:/lib, but when the MPI compilers are used
10397 # the location of the communication and MPI libs are included too.
10398 # If we don't find anything, use the default library path according
10399 # to the aix ld manual.
10400+# Store the results from the different compilers for each TAGNAME.
10401+# Allow to override them for all tags through lt_cv_aix_libpath.
10402 m4_defun([_LT_SYS_MODULE_PATH_AIX],
10403 [m4_require([_LT_DECL_SED])dnl
10404-AC_LINK_IFELSE([AC_LANG_SOURCE([AC_LANG_PROGRAM])],[
10405-lt_aix_libpath_sed='
10406- /Import File Strings/,/^$/ {
10407- /^0/ {
10408- s/^0 *\(.*\)$/\1/
10409- p
10410- }
10411- }'
10412-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
10413-# Check for a 64-bit object if we didn't find anything.
10414-if test -z "$aix_libpath"; then
10415- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
10416-fi],[])
10417-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
10418+if test "${lt_cv_aix_libpath+set}" = set; then
10419+ aix_libpath=$lt_cv_aix_libpath
10420+else
10421+ AC_CACHE_VAL([_LT_TAGVAR([lt_cv_aix_libpath_], [$1])],
10422+ [AC_LINK_IFELSE([AC_LANG_PROGRAM],[
10423+ lt_aix_libpath_sed='[
10424+ /Import File Strings/,/^$/ {
10425+ /^0/ {
10426+ s/^0 *\([^ ]*\) *$/\1/
10427+ p
10428+ }
10429+ }]'
10430+ _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
10431+ # Check for a 64-bit object if we didn't find anything.
10432+ if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then
10433+ _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
10434+ fi],[])
10435+ if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then
10436+ _LT_TAGVAR([lt_cv_aix_libpath_], [$1])="/usr/lib:/lib"
10437+ fi
10438+ ])
10439+ aix_libpath=$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])
10440+fi
10441 ])# _LT_SYS_MODULE_PATH_AIX
10442
10443
10444@@ -1117,7 +1133,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
10445
10446 AC_MSG_CHECKING([how to print strings])
10447 # Test print first, because it will be a builtin if present.
10448-if test "X`print -r -- -n 2>/dev/null`" = X-n && \
10449+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
10450 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
10451 ECHO='print -r --'
10452 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
10453@@ -1161,6 +1177,39 @@ _LT_DECL([], [ECHO], [1], [An echo progr
10454 ])# _LT_PROG_ECHO_BACKSLASH
10455
10456
10457+# _LT_WITH_SYSROOT
10458+# ----------------
10459+AC_DEFUN([_LT_WITH_SYSROOT],
10460+[AC_MSG_CHECKING([for sysroot])
10461+AC_ARG_WITH([libtool-sysroot],
10462+[ --with-libtool-sysroot[=DIR] Search for dependent libraries within DIR
10463+ (or the compiler's sysroot if not specified).],
10464+[], [with_libtool_sysroot=no])
10465+
10466+dnl lt_sysroot will always be passed unquoted. We quote it here
10467+dnl in case the user passed a directory name.
10468+lt_sysroot=
10469+case ${with_libtool_sysroot} in #(
10470+ yes)
10471+ if test "$GCC" = yes; then
10472+ lt_sysroot=`$CC --print-sysroot 2>/dev/null`
10473+ fi
10474+ ;; #(
10475+ /*)
10476+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"`
10477+ ;; #(
10478+ no|'')
10479+ ;; #(
10480+ *)
10481+ AC_MSG_RESULT([${with_libtool_sysroot}])
10482+ AC_MSG_ERROR([The sysroot must be an absolute path.])
10483+ ;;
10484+esac
10485+
10486+ AC_MSG_RESULT([${lt_sysroot:-no}])
10487+_LT_DECL([], [lt_sysroot], [0], [The root where to search for ]dnl
10488+[dependent libraries, and in which our libraries should be installed.])])
10489+
10490 # _LT_ENABLE_LOCK
10491 # ---------------
10492 m4_defun([_LT_ENABLE_LOCK],
10493@@ -1320,14 +1369,47 @@ need_locks="$enable_libtool_lock"
10494 ])# _LT_ENABLE_LOCK
10495
10496
10497+# _LT_PROG_AR
10498+# -----------
10499+m4_defun([_LT_PROG_AR],
10500+[AC_CHECK_TOOLS(AR, [ar], false)
10501+: ${AR=ar}
10502+: ${AR_FLAGS=cru}
10503+_LT_DECL([], [AR], [1], [The archiver])
10504+_LT_DECL([], [AR_FLAGS], [1], [Flags to create an archive])
10505+
10506+AC_CACHE_CHECK([for archiver @FILE support], [lt_cv_ar_at_file],
10507+ [lt_cv_ar_at_file=no
10508+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM],
10509+ [echo conftest.$ac_objext > conftest.lst
10510+ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&AS_MESSAGE_LOG_FD'
10511+ AC_TRY_EVAL([lt_ar_try])
10512+ if test "$ac_status" -eq 0; then
10513+ # Ensure the archiver fails upon bogus file names.
10514+ rm -f conftest.$ac_objext libconftest.a
10515+ AC_TRY_EVAL([lt_ar_try])
10516+ if test "$ac_status" -ne 0; then
10517+ lt_cv_ar_at_file=@
10518+ fi
10519+ fi
10520+ rm -f conftest.* libconftest.a
10521+ ])
10522+ ])
10523+
10524+if test "x$lt_cv_ar_at_file" = xno; then
10525+ archiver_list_spec=
10526+else
10527+ archiver_list_spec=$lt_cv_ar_at_file
10528+fi
10529+_LT_DECL([], [archiver_list_spec], [1],
10530+ [How to feed a file listing to the archiver])
10531+])# _LT_PROG_AR
10532+
10533+
10534 # _LT_CMD_OLD_ARCHIVE
10535 # -------------------
10536 m4_defun([_LT_CMD_OLD_ARCHIVE],
10537-[AC_CHECK_TOOL(AR, ar, false)
10538-test -z "$AR" && AR=ar
10539-test -z "$AR_FLAGS" && AR_FLAGS=cru
10540-_LT_DECL([], [AR], [1], [The archiver])
10541-_LT_DECL([], [AR_FLAGS], [1])
10542+[_LT_PROG_AR
10543
10544 AC_CHECK_TOOL(STRIP, strip, :)
10545 test -z "$STRIP" && STRIP=:
10546@@ -1623,7 +1705,7 @@ else
10547 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
10548 lt_status=$lt_dlunknown
10549 cat > conftest.$ac_ext <<_LT_EOF
10550-[#line __oline__ "configure"
10551+[#line $LINENO "configure"
10552 #include "confdefs.h"
10553
10554 #if HAVE_DLFCN_H
10555@@ -1667,10 +1749,10 @@ else
10556 /* When -fvisbility=hidden is used, assume the code has been annotated
10557 correspondingly for the symbols needed. */
10558 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
10559-void fnord () __attribute__((visibility("default")));
10560+int fnord () __attribute__((visibility("default")));
10561 #endif
10562
10563-void fnord () { int i=42; }
10564+int fnord () { return 42; }
10565 int main ()
10566 {
10567 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
10568@@ -2210,8 +2292,9 @@ cygwin* | mingw* | pw32* | cegcc*)
10569 need_version=no
10570 need_lib_prefix=no
10571
10572- case $GCC,$host_os in
10573- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
10574+ case $GCC,$cc_basename in
10575+ yes,*)
10576+ # gcc
10577 library_names_spec='$libname.dll.a'
10578 # DLL is installed to $(libdir)/../bin by postinstall_cmds
10579 postinstall_cmds='base_file=`basename \${file}`~
10580@@ -2244,13 +2327,71 @@ m4_if([$1], [],[
10581 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
10582 ;;
10583 esac
10584+ dynamic_linker='Win32 ld.exe'
10585+ ;;
10586+
10587+ *,cl*)
10588+ # Native MSVC
10589+ libname_spec='$name'
10590+ soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
10591+ library_names_spec='${libname}.dll.lib'
10592+
10593+ case $build_os in
10594+ mingw*)
10595+ sys_lib_search_path_spec=
10596+ lt_save_ifs=$IFS
10597+ IFS=';'
10598+ for lt_path in $LIB
10599+ do
10600+ IFS=$lt_save_ifs
10601+ # Let DOS variable expansion print the short 8.3 style file name.
10602+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
10603+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
10604+ done
10605+ IFS=$lt_save_ifs
10606+ # Convert to MSYS style.
10607+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([[a-zA-Z]]\\):| /\\1|g' -e 's|^ ||'`
10608+ ;;
10609+ cygwin*)
10610+ # Convert to unix form, then to dos form, then back to unix form
10611+ # but this time dos style (no spaces!) so that the unix form looks
10612+ # like /cygdrive/c/PROGRA~1:/cygdr...
10613+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
10614+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
10615+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
10616+ ;;
10617+ *)
10618+ sys_lib_search_path_spec="$LIB"
10619+ if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then
10620+ # It is most probably a Windows format PATH.
10621+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
10622+ else
10623+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
10624+ fi
10625+ # FIXME: find the short name or the path components, as spaces are
10626+ # common. (e.g. "Program Files" -> "PROGRA~1")
10627+ ;;
10628+ esac
10629+
10630+ # DLL is installed to $(libdir)/../bin by postinstall_cmds
10631+ postinstall_cmds='base_file=`basename \${file}`~
10632+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
10633+ dldir=$destdir/`dirname \$dlpath`~
10634+ test -d \$dldir || mkdir -p \$dldir~
10635+ $install_prog $dir/$dlname \$dldir/$dlname'
10636+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
10637+ dlpath=$dir/\$dldll~
10638+ $RM \$dlpath'
10639+ shlibpath_overrides_runpath=yes
10640+ dynamic_linker='Win32 link.exe'
10641 ;;
10642
10643 *)
10644+ # Assume MSVC wrapper
10645 library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib'
10646+ dynamic_linker='Win32 ld.exe'
10647 ;;
10648 esac
10649- dynamic_linker='Win32 ld.exe'
10650 # FIXME: first we should search . and the directory the executable is in
10651 shlibpath_var=PATH
10652 ;;
10653@@ -2342,7 +2483,7 @@ haiku*)
10654 soname_spec='${libname}${release}${shared_ext}$major'
10655 shlibpath_var=LIBRARY_PATH
10656 shlibpath_overrides_runpath=yes
10657- sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib'
10658+ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
10659 hardcode_into_libs=yes
10660 ;;
10661
10662@@ -2950,6 +3091,11 @@ case $reload_flag in
10663 esac
10664 reload_cmds='$LD$reload_flag -o $output$reload_objs'
10665 case $host_os in
10666+ cygwin* | mingw* | pw32* | cegcc*)
10667+ if test "$GCC" != yes; then
10668+ reload_cmds=false
10669+ fi
10670+ ;;
10671 darwin*)
10672 if test "$GCC" = yes; then
10673 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
10674@@ -3016,7 +3162,8 @@ mingw* | pw32*)
10675 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
10676 lt_cv_file_magic_cmd='func_win32_libid'
10677 else
10678- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
10679+ # Keep this pattern in sync with the one in func_win32_libid.
10680+ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
10681 lt_cv_file_magic_cmd='$OBJDUMP -f'
10682 fi
10683 ;;
10684@@ -3167,6 +3314,21 @@ tpf*)
10685 ;;
10686 esac
10687 ])
10688+
10689+file_magic_glob=
10690+want_nocaseglob=no
10691+if test "$build" = "$host"; then
10692+ case $host_os in
10693+ mingw* | pw32*)
10694+ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
10695+ want_nocaseglob=yes
10696+ else
10697+ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[[\1]]\/[[\1]]\/g;/g"`
10698+ fi
10699+ ;;
10700+ esac
10701+fi
10702+
10703 file_magic_cmd=$lt_cv_file_magic_cmd
10704 deplibs_check_method=$lt_cv_deplibs_check_method
10705 test -z "$deplibs_check_method" && deplibs_check_method=unknown
10706@@ -3174,7 +3336,11 @@ test -z "$deplibs_check_method" && depli
10707 _LT_DECL([], [deplibs_check_method], [1],
10708 [Method to check whether dependent libraries are shared objects])
10709 _LT_DECL([], [file_magic_cmd], [1],
10710- [Command to use when deplibs_check_method == "file_magic"])
10711+ [Command to use when deplibs_check_method = "file_magic"])
10712+_LT_DECL([], [file_magic_glob], [1],
10713+ [How to find potential files when deplibs_check_method = "file_magic"])
10714+_LT_DECL([], [want_nocaseglob], [1],
10715+ [Find potential files using nocaseglob when deplibs_check_method = "file_magic"])
10716 ])# _LT_CHECK_MAGIC_METHOD
10717
10718
10719@@ -3277,6 +3443,67 @@ dnl aclocal-1.4 backwards compatibility:
10720 dnl AC_DEFUN([AM_PROG_NM], [])
10721 dnl AC_DEFUN([AC_PROG_NM], [])
10722
10723+# _LT_CHECK_SHAREDLIB_FROM_LINKLIB
10724+# --------------------------------
10725+# how to determine the name of the shared library
10726+# associated with a specific link library.
10727+# -- PORTME fill in with the dynamic library characteristics
10728+m4_defun([_LT_CHECK_SHAREDLIB_FROM_LINKLIB],
10729+[m4_require([_LT_DECL_EGREP])
10730+m4_require([_LT_DECL_OBJDUMP])
10731+m4_require([_LT_DECL_DLLTOOL])
10732+AC_CACHE_CHECK([how to associate runtime and link libraries],
10733+lt_cv_sharedlib_from_linklib_cmd,
10734+[lt_cv_sharedlib_from_linklib_cmd='unknown'
10735+
10736+case $host_os in
10737+cygwin* | mingw* | pw32* | cegcc*)
10738+ # two different shell functions defined in ltmain.sh
10739+ # decide which to use based on capabilities of $DLLTOOL
10740+ case `$DLLTOOL --help 2>&1` in
10741+ *--identify-strict*)
10742+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
10743+ ;;
10744+ *)
10745+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
10746+ ;;
10747+ esac
10748+ ;;
10749+*)
10750+ # fallback: assume linklib IS sharedlib
10751+ lt_cv_sharedlib_from_linklib_cmd="$ECHO"
10752+ ;;
10753+esac
10754+])
10755+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
10756+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
10757+
10758+_LT_DECL([], [sharedlib_from_linklib_cmd], [1],
10759+ [Command to associate shared and link libraries])
10760+])# _LT_CHECK_SHAREDLIB_FROM_LINKLIB
10761+
10762+
10763+# _LT_PATH_MANIFEST_TOOL
10764+# ----------------------
10765+# locate the manifest tool
10766+m4_defun([_LT_PATH_MANIFEST_TOOL],
10767+[AC_CHECK_TOOL(MANIFEST_TOOL, mt, :)
10768+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
10769+AC_CACHE_CHECK([if $MANIFEST_TOOL is a manifest tool], [lt_cv_path_mainfest_tool],
10770+ [lt_cv_path_mainfest_tool=no
10771+ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&AS_MESSAGE_LOG_FD
10772+ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
10773+ cat conftest.err >&AS_MESSAGE_LOG_FD
10774+ if $GREP 'Manifest Tool' conftest.out > /dev/null; then
10775+ lt_cv_path_mainfest_tool=yes
10776+ fi
10777+ rm -f conftest*])
10778+if test "x$lt_cv_path_mainfest_tool" != xyes; then
10779+ MANIFEST_TOOL=:
10780+fi
10781+_LT_DECL([], [MANIFEST_TOOL], [1], [Manifest tool])dnl
10782+])# _LT_PATH_MANIFEST_TOOL
10783+
10784
10785 # LT_LIB_M
10786 # --------
10787@@ -3403,8 +3630,8 @@ esac
10788 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
10789
10790 # Transform an extracted symbol line into symbol name and symbol address
10791-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p'"
10792-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'"
10793+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p'"
10794+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'"
10795
10796 # Handle CRLF in mingw tool chain
10797 opt_cr=
10798@@ -3440,6 +3667,7 @@ for ac_symprfx in "" "_"; do
10799 else
10800 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
10801 fi
10802+ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
10803
10804 # Check to see that the pipe works correctly.
10805 pipe_works=no
10806@@ -3473,6 +3701,18 @@ _LT_EOF
10807 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
10808 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
10809 cat <<_LT_EOF > conftest.$ac_ext
10810+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */
10811+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
10812+/* DATA imports from DLLs on WIN32 con't be const, because runtime
10813+ relocations are performed -- see ld's documentation on pseudo-relocs. */
10814+# define LT@&t@_DLSYM_CONST
10815+#elif defined(__osf__)
10816+/* This system does not cope well with relocations in const data. */
10817+# define LT@&t@_DLSYM_CONST
10818+#else
10819+# define LT@&t@_DLSYM_CONST const
10820+#endif
10821+
10822 #ifdef __cplusplus
10823 extern "C" {
10824 #endif
10825@@ -3484,7 +3724,7 @@ _LT_EOF
10826 cat <<_LT_EOF >> conftest.$ac_ext
10827
10828 /* The mapping between symbol names and symbols. */
10829-const struct {
10830+LT@&t@_DLSYM_CONST struct {
10831 const char *name;
10832 void *address;
10833 }
10834@@ -3510,15 +3750,15 @@ static const void *lt_preloaded_setup()
10835 _LT_EOF
10836 # Now try linking the two files.
10837 mv conftest.$ac_objext conftstm.$ac_objext
10838- lt_save_LIBS="$LIBS"
10839- lt_save_CFLAGS="$CFLAGS"
10840+ lt_globsym_save_LIBS=$LIBS
10841+ lt_globsym_save_CFLAGS=$CFLAGS
10842 LIBS="conftstm.$ac_objext"
10843 CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)"
10844 if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then
10845 pipe_works=yes
10846 fi
10847- LIBS="$lt_save_LIBS"
10848- CFLAGS="$lt_save_CFLAGS"
10849+ LIBS=$lt_globsym_save_LIBS
10850+ CFLAGS=$lt_globsym_save_CFLAGS
10851 else
10852 echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD
10853 fi
10854@@ -3551,6 +3791,13 @@ else
10855 AC_MSG_RESULT(ok)
10856 fi
10857
10858+# Response file support.
10859+if test "$lt_cv_nm_interface" = "MS dumpbin"; then
10860+ nm_file_list_spec='@'
10861+elif $NM --help 2>/dev/null | grep '[[@]]FILE' >/dev/null; then
10862+ nm_file_list_spec='@'
10863+fi
10864+
10865 _LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1],
10866 [Take the output of nm and produce a listing of raw symbols and C names])
10867 _LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1],
10868@@ -3561,6 +3808,8 @@ _LT_DECL([global_symbol_to_c_name_addres
10869 _LT_DECL([global_symbol_to_c_name_address_lib_prefix],
10870 [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1],
10871 [Transform the output of nm in a C name address pair when lib prefix is needed])
10872+_LT_DECL([], [nm_file_list_spec], [1],
10873+ [Specify filename containing input files for $NM])
10874 ]) # _LT_CMD_GLOBAL_SYMBOLS
10875
10876
10877@@ -3572,7 +3821,6 @@ _LT_TAGVAR(lt_prog_compiler_wl, $1)=
10878 _LT_TAGVAR(lt_prog_compiler_pic, $1)=
10879 _LT_TAGVAR(lt_prog_compiler_static, $1)=
10880
10881-AC_MSG_CHECKING([for $compiler option to produce PIC])
10882 m4_if([$1], [CXX], [
10883 # C++ specific cases for pic, static, wl, etc.
10884 if test "$GXX" = yes; then
10885@@ -3678,6 +3926,12 @@ m4_if([$1], [CXX], [
10886 ;;
10887 esac
10888 ;;
10889+ mingw* | cygwin* | os2* | pw32* | cegcc*)
10890+ # This hack is so that the source file can tell whether it is being
10891+ # built for inclusion in a dll (and should export symbols for example).
10892+ m4_if([$1], [GCJ], [],
10893+ [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
10894+ ;;
10895 dgux*)
10896 case $cc_basename in
10897 ec++*)
10898@@ -3830,7 +4084,7 @@ m4_if([$1], [CXX], [
10899 ;;
10900 solaris*)
10901 case $cc_basename in
10902- CC*)
10903+ CC* | sunCC*)
10904 # Sun C++ 4.2, 5.x and Centerline C++
10905 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
10906 _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
10907@@ -4053,6 +4307,12 @@ m4_if([$1], [CXX], [
10908 _LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared'
10909 _LT_TAGVAR(lt_prog_compiler_static, $1)='--static'
10910 ;;
10911+ nagfor*)
10912+ # NAG Fortran compiler
10913+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,-Wl,,'
10914+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
10915+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
10916+ ;;
10917 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
10918 # Portland Group compilers (*not* the Pentium gcc compiler,
10919 # which looks to be a dead project)
10920@@ -4115,7 +4375,7 @@ m4_if([$1], [CXX], [
10921 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
10922 _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
10923 case $cc_basename in
10924- f77* | f90* | f95*)
10925+ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
10926 _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';;
10927 *)
10928 _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';;
10929@@ -4172,9 +4432,11 @@ case $host_os in
10930 _LT_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])"
10931 ;;
10932 esac
10933-AC_MSG_RESULT([$_LT_TAGVAR(lt_prog_compiler_pic, $1)])
10934-_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1],
10935- [How to pass a linker flag through the compiler])
10936+
10937+AC_CACHE_CHECK([for $compiler option to produce PIC],
10938+ [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)],
10939+ [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_prog_compiler_pic, $1)])
10940+_LT_TAGVAR(lt_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)
10941
10942 #
10943 # Check to make sure the PIC flag actually works.
10944@@ -4193,6 +4455,8 @@ fi
10945 _LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1],
10946 [Additional compiler flags for building library objects])
10947
10948+_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1],
10949+ [How to pass a linker flag through the compiler])
10950 #
10951 # Check to make sure the static flag actually works.
10952 #
10953@@ -4213,6 +4477,7 @@ _LT_TAGDECL([link_static_flag], [lt_prog
10954 m4_defun([_LT_LINKER_SHLIBS],
10955 [AC_REQUIRE([LT_PATH_LD])dnl
10956 AC_REQUIRE([LT_PATH_NM])dnl
10957+m4_require([_LT_PATH_MANIFEST_TOOL])dnl
10958 m4_require([_LT_FILEUTILS_DEFAULTS])dnl
10959 m4_require([_LT_DECL_EGREP])dnl
10960 m4_require([_LT_DECL_SED])dnl
10961@@ -4221,6 +4486,7 @@ m4_require([_LT_TAG_COMPILER])dnl
10962 AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
10963 m4_if([$1], [CXX], [
10964 _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
10965+ _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
10966 case $host_os in
10967 aix[[4-9]]*)
10968 # If we're using GNU nm, then we don't want the "-C" option.
10969@@ -4235,15 +4501,20 @@ m4_if([$1], [CXX], [
10970 ;;
10971 pw32*)
10972 _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
10973- ;;
10974+ ;;
10975 cygwin* | mingw* | cegcc*)
10976- _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'
10977- ;;
10978+ case $cc_basename in
10979+ cl*) ;;
10980+ *)
10981+ _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'
10982+ _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname']
10983+ ;;
10984+ esac
10985+ ;;
10986 *)
10987 _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
10988- ;;
10989+ ;;
10990 esac
10991- _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
10992 ], [
10993 runpath_var=
10994 _LT_TAGVAR(allow_undefined_flag, $1)=
10995@@ -4411,7 +4682,8 @@ _LT_EOF
10996 _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
10997 _LT_TAGVAR(always_export_symbols, $1)=no
10998 _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
10999- _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'
11000+ _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'
11001+ _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname']
11002
11003 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
11004 _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'
11005@@ -4510,12 +4782,12 @@ _LT_EOF
11006 _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive'
11007 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
11008 _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
11009- _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
11010+ _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
11011 if test "x$supports_anon_versioning" = xyes; then
11012 _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
11013 cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
11014 echo "local: *; };" >> $output_objdir/$libname.ver~
11015- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
11016+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
11017 fi
11018 ;;
11019 esac
11020@@ -4529,8 +4801,8 @@ _LT_EOF
11021 _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
11022 wlarc=
11023 else
11024- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
11025- _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'
11026+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
11027+ _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'
11028 fi
11029 ;;
11030
11031@@ -4548,8 +4820,8 @@ _LT_EOF
11032
11033 _LT_EOF
11034 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
11035- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
11036- _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'
11037+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
11038+ _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'
11039 else
11040 _LT_TAGVAR(ld_shlibs, $1)=no
11041 fi
11042@@ -4595,8 +4867,8 @@ _LT_EOF
11043
11044 *)
11045 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
11046- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
11047- _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'
11048+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
11049+ _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'
11050 else
11051 _LT_TAGVAR(ld_shlibs, $1)=no
11052 fi
11053@@ -4726,7 +4998,7 @@ _LT_EOF
11054 _LT_TAGVAR(allow_undefined_flag, $1)='-berok'
11055 # Determine the default libpath from the value encoded in an
11056 # empty executable.
11057- _LT_SYS_MODULE_PATH_AIX
11058+ _LT_SYS_MODULE_PATH_AIX([$1])
11059 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
11060 _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"
11061 else
11062@@ -4737,7 +5009,7 @@ _LT_EOF
11063 else
11064 # Determine the default libpath from the value encoded in an
11065 # empty executable.
11066- _LT_SYS_MODULE_PATH_AIX
11067+ _LT_SYS_MODULE_PATH_AIX([$1])
11068 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
11069 # Warning - without using the other run time loading flags,
11070 # -berok will link without error, but may produce a broken library.
11071@@ -4781,20 +5053,63 @@ _LT_EOF
11072 # Microsoft Visual C++.
11073 # hardcode_libdir_flag_spec is actually meaningless, as there is
11074 # no search path for DLLs.
11075- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
11076- _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
11077- # Tell ltmain to make .lib files, not .a files.
11078- libext=lib
11079- # Tell ltmain to make .dll files, not .so files.
11080- shrext_cmds=".dll"
11081- # FIXME: Setting linknames here is a bad hack.
11082- _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
11083- # The linker will automatically build a .lib file if we build a DLL.
11084- _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
11085- # FIXME: Should let the user specify the lib program.
11086- _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs'
11087- _LT_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`'
11088- _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
11089+ case $cc_basename in
11090+ cl*)
11091+ # Native MSVC
11092+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
11093+ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
11094+ _LT_TAGVAR(always_export_symbols, $1)=yes
11095+ _LT_TAGVAR(file_list_spec, $1)='@'
11096+ # Tell ltmain to make .lib files, not .a files.
11097+ libext=lib
11098+ # Tell ltmain to make .dll files, not .so files.
11099+ shrext_cmds=".dll"
11100+ # FIXME: Setting linknames here is a bad hack.
11101+ _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
11102+ _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
11103+ sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
11104+ else
11105+ sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
11106+ fi~
11107+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
11108+ linknames='
11109+ # The linker will not automatically build a static lib if we build a DLL.
11110+ # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
11111+ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
11112+ _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'
11113+ # Don't use ranlib
11114+ _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
11115+ _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~
11116+ lt_tool_outputfile="@TOOL_OUTPUT@"~
11117+ case $lt_outputfile in
11118+ *.exe|*.EXE) ;;
11119+ *)
11120+ lt_outputfile="$lt_outputfile.exe"
11121+ lt_tool_outputfile="$lt_tool_outputfile.exe"
11122+ ;;
11123+ esac~
11124+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
11125+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
11126+ $RM "$lt_outputfile.manifest";
11127+ fi'
11128+ ;;
11129+ *)
11130+ # Assume MSVC wrapper
11131+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
11132+ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
11133+ # Tell ltmain to make .lib files, not .a files.
11134+ libext=lib
11135+ # Tell ltmain to make .dll files, not .so files.
11136+ shrext_cmds=".dll"
11137+ # FIXME: Setting linknames here is a bad hack.
11138+ _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
11139+ # The linker will automatically build a .lib file if we build a DLL.
11140+ _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
11141+ # FIXME: Should let the user specify the lib program.
11142+ _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs'
11143+ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
11144+ ;;
11145+ esac
11146 ;;
11147
11148 darwin* | rhapsody*)
11149@@ -4828,7 +5143,7 @@ _LT_EOF
11150
11151 # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
11152 freebsd* | dragonfly*)
11153- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
11154+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
11155 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
11156 _LT_TAGVAR(hardcode_direct, $1)=yes
11157 _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
11158@@ -4836,7 +5151,7 @@ _LT_EOF
11159
11160 hpux9*)
11161 if test "$GCC" = yes; then
11162- _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'
11163+ _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'
11164 else
11165 _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'
11166 fi
11167@@ -4852,7 +5167,7 @@ _LT_EOF
11168
11169 hpux10*)
11170 if test "$GCC" = yes && test "$with_gnu_ld" = no; then
11171- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
11172+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
11173 else
11174 _LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
11175 fi
11176@@ -4876,10 +5191,10 @@ _LT_EOF
11177 _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
11178 ;;
11179 ia64*)
11180- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
11181+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
11182 ;;
11183 *)
11184- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
11185+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
11186 ;;
11187 esac
11188 else
11189@@ -4926,16 +5241,31 @@ _LT_EOF
11190
11191 irix5* | irix6* | nonstopux*)
11192 if test "$GCC" = yes; then
11193- _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'
11194+ _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'
11195 # Try to use the -exported_symbol ld option, if it does not
11196 # work, assume that -exports_file does not work either and
11197 # implicitly export all symbols.
11198- save_LDFLAGS="$LDFLAGS"
11199- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
11200- AC_LINK_IFELSE([AC_LANG_SOURCE([int foo(void) {}])],
11201- _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'
11202- )
11203- LDFLAGS="$save_LDFLAGS"
11204+ # This should be the same for all languages, so no per-tag cache variable.
11205+ AC_CACHE_CHECK([whether the $host_os linker accepts -exported_symbol],
11206+ [lt_cv_irix_exported_symbol],
11207+ [save_LDFLAGS="$LDFLAGS"
11208+ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
11209+ AC_LINK_IFELSE(
11210+ [AC_LANG_SOURCE(
11211+ [AC_LANG_CASE([C], [[int foo (void) { return 0; }]],
11212+ [C++], [[int foo (void) { return 0; }]],
11213+ [Fortran 77], [[
11214+ subroutine foo
11215+ end]],
11216+ [Fortran], [[
11217+ subroutine foo
11218+ end]])])],
11219+ [lt_cv_irix_exported_symbol=yes],
11220+ [lt_cv_irix_exported_symbol=no])
11221+ LDFLAGS="$save_LDFLAGS"])
11222+ if test "$lt_cv_irix_exported_symbol" = yes; then
11223+ _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'
11224+ fi
11225 else
11226 _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'
11227 _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'
11228@@ -5020,7 +5350,7 @@ _LT_EOF
11229 osf4* | osf5*) # as osf3* with the addition of -msym flag
11230 if test "$GCC" = yes; then
11231 _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
11232- _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'
11233+ _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'
11234 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
11235 else
11236 _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
11237@@ -5039,9 +5369,9 @@ _LT_EOF
11238 _LT_TAGVAR(no_undefined_flag, $1)=' -z defs'
11239 if test "$GCC" = yes; then
11240 wlarc='${wl}'
11241- _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
11242+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
11243 _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
11244- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
11245+ $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'
11246 else
11247 case `$CC -V 2>&1` in
11248 *"Compilers 5.0"*)
11249@@ -5313,8 +5643,6 @@ _LT_TAGDECL([], [inherit_rpath], [0],
11250 to runtime path list])
11251 _LT_TAGDECL([], [link_all_deplibs], [0],
11252 [Whether libtool must link a program against all its dependency libraries])
11253-_LT_TAGDECL([], [fix_srcfile_path], [1],
11254- [Fix the shell variable $srcfile for the compiler])
11255 _LT_TAGDECL([], [always_export_symbols], [0],
11256 [Set to "yes" if exported symbols are required])
11257 _LT_TAGDECL([], [export_symbols_cmds], [2],
11258@@ -5325,6 +5653,8 @@ _LT_TAGDECL([], [include_expsyms], [1],
11259 [Symbols that must always be exported])
11260 _LT_TAGDECL([], [prelink_cmds], [2],
11261 [Commands necessary for linking programs (against libraries) with templates])
11262+_LT_TAGDECL([], [postlink_cmds], [2],
11263+ [Commands necessary for finishing linking programs])
11264 _LT_TAGDECL([], [file_list_spec], [1],
11265 [Specify filename containing input files])
11266 dnl FIXME: Not yet implemented
11267@@ -5426,6 +5756,7 @@ CC="$lt_save_CC"
11268 m4_defun([_LT_LANG_CXX_CONFIG],
11269 [m4_require([_LT_FILEUTILS_DEFAULTS])dnl
11270 m4_require([_LT_DECL_EGREP])dnl
11271+m4_require([_LT_PATH_MANIFEST_TOOL])dnl
11272 if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
11273 ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
11274 (test "X$CXX" != "Xg++"))) ; then
11275@@ -5487,6 +5818,7 @@ if test "$_lt_caught_CXX_error" != yes;
11276
11277 # Allow CC to be a program name with arguments.
11278 lt_save_CC=$CC
11279+ lt_save_CFLAGS=$CFLAGS
11280 lt_save_LD=$LD
11281 lt_save_GCC=$GCC
11282 GCC=$GXX
11283@@ -5504,6 +5836,7 @@ if test "$_lt_caught_CXX_error" != yes;
11284 fi
11285 test -z "${LDCXX+set}" || LD=$LDCXX
11286 CC=${CXX-"c++"}
11287+ CFLAGS=$CXXFLAGS
11288 compiler=$CC
11289 _LT_TAGVAR(compiler, $1)=$CC
11290 _LT_CC_BASENAME([$compiler])
11291@@ -5667,7 +6000,7 @@ if test "$_lt_caught_CXX_error" != yes;
11292 _LT_TAGVAR(allow_undefined_flag, $1)='-berok'
11293 # Determine the default libpath from the value encoded in an empty
11294 # executable.
11295- _LT_SYS_MODULE_PATH_AIX
11296+ _LT_SYS_MODULE_PATH_AIX([$1])
11297 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
11298
11299 _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"
11300@@ -5679,7 +6012,7 @@ if test "$_lt_caught_CXX_error" != yes;
11301 else
11302 # Determine the default libpath from the value encoded in an
11303 # empty executable.
11304- _LT_SYS_MODULE_PATH_AIX
11305+ _LT_SYS_MODULE_PATH_AIX([$1])
11306 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
11307 # Warning - without using the other run time loading flags,
11308 # -berok will link without error, but may produce a broken library.
11309@@ -5721,29 +6054,75 @@ if test "$_lt_caught_CXX_error" != yes;
11310 ;;
11311
11312 cygwin* | mingw* | pw32* | cegcc*)
11313- # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
11314- # as there is no search path for DLLs.
11315- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
11316- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols'
11317- _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
11318- _LT_TAGVAR(always_export_symbols, $1)=no
11319- _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
11320-
11321- if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
11322- _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'
11323- # If the export-symbols file already is a .def file (1st line
11324- # is EXPORTS), use it as is; otherwise, prepend...
11325- _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
11326- cp $export_symbols $output_objdir/$soname.def;
11327- else
11328- echo EXPORTS > $output_objdir/$soname.def;
11329- cat $export_symbols >> $output_objdir/$soname.def;
11330- fi~
11331- $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'
11332- else
11333- _LT_TAGVAR(ld_shlibs, $1)=no
11334- fi
11335- ;;
11336+ case $GXX,$cc_basename in
11337+ ,cl* | no,cl*)
11338+ # Native MSVC
11339+ # hardcode_libdir_flag_spec is actually meaningless, as there is
11340+ # no search path for DLLs.
11341+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
11342+ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
11343+ _LT_TAGVAR(always_export_symbols, $1)=yes
11344+ _LT_TAGVAR(file_list_spec, $1)='@'
11345+ # Tell ltmain to make .lib files, not .a files.
11346+ libext=lib
11347+ # Tell ltmain to make .dll files, not .so files.
11348+ shrext_cmds=".dll"
11349+ # FIXME: Setting linknames here is a bad hack.
11350+ _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
11351+ _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
11352+ $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
11353+ else
11354+ $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
11355+ fi~
11356+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
11357+ linknames='
11358+ # The linker will not automatically build a static lib if we build a DLL.
11359+ # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
11360+ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
11361+ # Don't use ranlib
11362+ _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
11363+ _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~
11364+ lt_tool_outputfile="@TOOL_OUTPUT@"~
11365+ case $lt_outputfile in
11366+ *.exe|*.EXE) ;;
11367+ *)
11368+ lt_outputfile="$lt_outputfile.exe"
11369+ lt_tool_outputfile="$lt_tool_outputfile.exe"
11370+ ;;
11371+ esac~
11372+ func_to_tool_file "$lt_outputfile"~
11373+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
11374+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
11375+ $RM "$lt_outputfile.manifest";
11376+ fi'
11377+ ;;
11378+ *)
11379+ # g++
11380+ # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
11381+ # as there is no search path for DLLs.
11382+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
11383+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols'
11384+ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
11385+ _LT_TAGVAR(always_export_symbols, $1)=no
11386+ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
11387+
11388+ if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
11389+ _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'
11390+ # If the export-symbols file already is a .def file (1st line
11391+ # is EXPORTS), use it as is; otherwise, prepend...
11392+ _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
11393+ cp $export_symbols $output_objdir/$soname.def;
11394+ else
11395+ echo EXPORTS > $output_objdir/$soname.def;
11396+ cat $export_symbols >> $output_objdir/$soname.def;
11397+ fi~
11398+ $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'
11399+ else
11400+ _LT_TAGVAR(ld_shlibs, $1)=no
11401+ fi
11402+ ;;
11403+ esac
11404+ ;;
11405 darwin* | rhapsody*)
11406 _LT_DARWIN_LINKER_FEATURES($1)
11407 ;;
11408@@ -5818,7 +6197,7 @@ if test "$_lt_caught_CXX_error" != yes;
11409 ;;
11410 *)
11411 if test "$GXX" = yes; then
11412- _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'
11413+ _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'
11414 else
11415 # FIXME: insert proper C++ library support
11416 _LT_TAGVAR(ld_shlibs, $1)=no
11417@@ -5889,10 +6268,10 @@ if test "$_lt_caught_CXX_error" != yes;
11418 _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
11419 ;;
11420 ia64*)
11421- _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'
11422+ _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'
11423 ;;
11424 *)
11425- _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'
11426+ _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'
11427 ;;
11428 esac
11429 fi
11430@@ -5933,9 +6312,9 @@ if test "$_lt_caught_CXX_error" != yes;
11431 *)
11432 if test "$GXX" = yes; then
11433 if test "$with_gnu_ld" = no; then
11434- _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'
11435+ _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'
11436 else
11437- _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'
11438+ _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'
11439 fi
11440 fi
11441 _LT_TAGVAR(link_all_deplibs, $1)=yes
11442@@ -6005,20 +6384,20 @@ if test "$_lt_caught_CXX_error" != yes;
11443 _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~
11444 rm -rf $tpldir~
11445 $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
11446- compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"'
11447+ compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"'
11448 _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~
11449 rm -rf $tpldir~
11450 $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
11451- $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~
11452+ $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~
11453 $RANLIB $oldlib'
11454 _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~
11455 rm -rf $tpldir~
11456 $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
11457- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
11458+ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
11459 _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~
11460 rm -rf $tpldir~
11461 $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
11462- $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'
11463+ $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'
11464 ;;
11465 *) # Version 6 and above use weak symbols
11466 _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
11467@@ -6213,7 +6592,7 @@ if test "$_lt_caught_CXX_error" != yes;
11468 _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'
11469 ;;
11470 *)
11471- _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'
11472+ _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'
11473 ;;
11474 esac
11475
11476@@ -6259,7 +6638,7 @@ if test "$_lt_caught_CXX_error" != yes;
11477
11478 solaris*)
11479 case $cc_basename in
11480- CC*)
11481+ CC* | sunCC*)
11482 # Sun C++ 4.2, 5.x and Centerline C++
11483 _LT_TAGVAR(archive_cmds_need_lc,$1)=yes
11484 _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
11485@@ -6300,9 +6679,9 @@ if test "$_lt_caught_CXX_error" != yes;
11486 if test "$GXX" = yes && test "$with_gnu_ld" = no; then
11487 _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
11488 if $CC --version | $GREP -v '^2\.7' > /dev/null; then
11489- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
11490+ _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'
11491 _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
11492- $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
11493+ $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
11494
11495 # Commands to make compiler produce verbose output that lists
11496 # what "hidden" libraries, object files and flags are used when
11497@@ -6431,6 +6810,7 @@ if test "$_lt_caught_CXX_error" != yes;
11498 fi # test -n "$compiler"
11499
11500 CC=$lt_save_CC
11501+ CFLAGS=$lt_save_CFLAGS
11502 LDCXX=$LD
11503 LD=$lt_save_LD
11504 GCC=$lt_save_GCC
11505@@ -6445,6 +6825,29 @@ AC_LANG_POP
11506 ])# _LT_LANG_CXX_CONFIG
11507
11508
11509+# _LT_FUNC_STRIPNAME_CNF
11510+# ----------------------
11511+# func_stripname_cnf prefix suffix name
11512+# strip PREFIX and SUFFIX off of NAME.
11513+# PREFIX and SUFFIX must not contain globbing or regex special
11514+# characters, hashes, percent signs, but SUFFIX may contain a leading
11515+# dot (in which case that matches only a dot).
11516+#
11517+# This function is identical to the (non-XSI) version of func_stripname,
11518+# except this one can be used by m4 code that may be executed by configure,
11519+# rather than the libtool script.
11520+m4_defun([_LT_FUNC_STRIPNAME_CNF],[dnl
11521+AC_REQUIRE([_LT_DECL_SED])
11522+AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])
11523+func_stripname_cnf ()
11524+{
11525+ case ${2} in
11526+ .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
11527+ *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
11528+ esac
11529+} # func_stripname_cnf
11530+])# _LT_FUNC_STRIPNAME_CNF
11531+
11532 # _LT_SYS_HIDDEN_LIBDEPS([TAGNAME])
11533 # ---------------------------------
11534 # Figure out "hidden" library dependencies from verbose
11535@@ -6453,6 +6856,7 @@ AC_LANG_POP
11536 # objects, libraries and library flags.
11537 m4_defun([_LT_SYS_HIDDEN_LIBDEPS],
11538 [m4_require([_LT_FILEUTILS_DEFAULTS])dnl
11539+AC_REQUIRE([_LT_FUNC_STRIPNAME_CNF])dnl
11540 # Dependencies to place before and after the object being linked:
11541 _LT_TAGVAR(predep_objects, $1)=
11542 _LT_TAGVAR(postdep_objects, $1)=
11543@@ -6503,6 +6907,13 @@ public class foo {
11544 };
11545 _LT_EOF
11546 ])
11547+
11548+_lt_libdeps_save_CFLAGS=$CFLAGS
11549+case "$CC $CFLAGS " in #(
11550+*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;;
11551+*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;;
11552+esac
11553+
11554 dnl Parse the compiler output and extract the necessary
11555 dnl objects, libraries and library flags.
11556 if AC_TRY_EVAL(ac_compile); then
11557@@ -6514,7 +6925,7 @@ if AC_TRY_EVAL(ac_compile); then
11558 pre_test_object_deps_done=no
11559
11560 for p in `eval "$output_verbose_link_cmd"`; do
11561- case $p in
11562+ case ${prev}${p} in
11563
11564 -L* | -R* | -l*)
11565 # Some compilers place space between "-{L,R}" and the path.
11566@@ -6523,13 +6934,22 @@ if AC_TRY_EVAL(ac_compile); then
11567 test $p = "-R"; then
11568 prev=$p
11569 continue
11570- else
11571- prev=
11572 fi
11573
11574+ # Expand the sysroot to ease extracting the directories later.
11575+ if test -z "$prev"; then
11576+ case $p in
11577+ -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;;
11578+ -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;;
11579+ -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;;
11580+ esac
11581+ fi
11582+ case $p in
11583+ =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;;
11584+ esac
11585 if test "$pre_test_object_deps_done" = no; then
11586- case $p in
11587- -L* | -R*)
11588+ case ${prev} in
11589+ -L | -R)
11590 # Internal compiler library paths should come after those
11591 # provided the user. The postdeps already come after the
11592 # user supplied libs so there is no need to process them.
11593@@ -6549,8 +6969,10 @@ if AC_TRY_EVAL(ac_compile); then
11594 _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}"
11595 fi
11596 fi
11597+ prev=
11598 ;;
11599
11600+ *.lto.$objext) ;; # Ignore GCC LTO objects
11601 *.$objext)
11602 # This assumes that the test object file only shows up
11603 # once in the compiler output.
11604@@ -6586,6 +7008,7 @@ else
11605 fi
11606
11607 $RM -f confest.$objext
11608+CFLAGS=$_lt_libdeps_save_CFLAGS
11609
11610 # PORTME: override above test on systems where it is broken
11611 m4_if([$1], [CXX],
11612@@ -6622,7 +7045,7 @@ linux*)
11613
11614 solaris*)
11615 case $cc_basename in
11616- CC*)
11617+ CC* | sunCC*)
11618 # The more standards-conforming stlport4 library is
11619 # incompatible with the Cstd library. Avoid specifying
11620 # it if it's in CXXFLAGS. Ignore libCrun as
11621@@ -6735,7 +7158,9 @@ if test "$_lt_disable_F77" != yes; then
11622 # Allow CC to be a program name with arguments.
11623 lt_save_CC="$CC"
11624 lt_save_GCC=$GCC
11625+ lt_save_CFLAGS=$CFLAGS
11626 CC=${F77-"f77"}
11627+ CFLAGS=$FFLAGS
11628 compiler=$CC
11629 _LT_TAGVAR(compiler, $1)=$CC
11630 _LT_CC_BASENAME([$compiler])
11631@@ -6789,6 +7214,7 @@ if test "$_lt_disable_F77" != yes; then
11632
11633 GCC=$lt_save_GCC
11634 CC="$lt_save_CC"
11635+ CFLAGS="$lt_save_CFLAGS"
11636 fi # test "$_lt_disable_F77" != yes
11637
11638 AC_LANG_POP
11639@@ -6865,7 +7291,9 @@ if test "$_lt_disable_FC" != yes; then
11640 # Allow CC to be a program name with arguments.
11641 lt_save_CC="$CC"
11642 lt_save_GCC=$GCC
11643+ lt_save_CFLAGS=$CFLAGS
11644 CC=${FC-"f95"}
11645+ CFLAGS=$FCFLAGS
11646 compiler=$CC
11647 GCC=$ac_cv_fc_compiler_gnu
11648
11649@@ -6921,7 +7349,8 @@ if test "$_lt_disable_FC" != yes; then
11650 fi # test -n "$compiler"
11651
11652 GCC=$lt_save_GCC
11653- CC="$lt_save_CC"
11654+ CC=$lt_save_CC
11655+ CFLAGS=$lt_save_CFLAGS
11656 fi # test "$_lt_disable_FC" != yes
11657
11658 AC_LANG_POP
11659@@ -6958,10 +7387,12 @@ _LT_COMPILER_BOILERPLATE
11660 _LT_LINKER_BOILERPLATE
11661
11662 # Allow CC to be a program name with arguments.
11663-lt_save_CC="$CC"
11664+lt_save_CC=$CC
11665+lt_save_CFLAGS=$CFLAGS
11666 lt_save_GCC=$GCC
11667 GCC=yes
11668 CC=${GCJ-"gcj"}
11669+CFLAGS=$GCJFLAGS
11670 compiler=$CC
11671 _LT_TAGVAR(compiler, $1)=$CC
11672 _LT_TAGVAR(LD, $1)="$LD"
11673@@ -6992,7 +7423,8 @@ fi
11674 AC_LANG_RESTORE
11675
11676 GCC=$lt_save_GCC
11677-CC="$lt_save_CC"
11678+CC=$lt_save_CC
11679+CFLAGS=$lt_save_CFLAGS
11680 ])# _LT_LANG_GCJ_CONFIG
11681
11682
11683@@ -7027,9 +7459,11 @@ _LT_LINKER_BOILERPLATE
11684
11685 # Allow CC to be a program name with arguments.
11686 lt_save_CC="$CC"
11687+lt_save_CFLAGS=$CFLAGS
11688 lt_save_GCC=$GCC
11689 GCC=
11690 CC=${RC-"windres"}
11691+CFLAGS=
11692 compiler=$CC
11693 _LT_TAGVAR(compiler, $1)=$CC
11694 _LT_CC_BASENAME([$compiler])
11695@@ -7042,7 +7476,8 @@ fi
11696
11697 GCC=$lt_save_GCC
11698 AC_LANG_RESTORE
11699-CC="$lt_save_CC"
11700+CC=$lt_save_CC
11701+CFLAGS=$lt_save_CFLAGS
11702 ])# _LT_LANG_RC_CONFIG
11703
11704
11705@@ -7101,6 +7536,15 @@ _LT_DECL([], [OBJDUMP], [1], [An object
11706 AC_SUBST([OBJDUMP])
11707 ])
11708
11709+# _LT_DECL_DLLTOOL
11710+# ----------------
11711+# Ensure DLLTOOL variable is set.
11712+m4_defun([_LT_DECL_DLLTOOL],
11713+[AC_CHECK_TOOL(DLLTOOL, dlltool, false)
11714+test -z "$DLLTOOL" && DLLTOOL=dlltool
11715+_LT_DECL([], [DLLTOOL], [1], [DLL creation program])
11716+AC_SUBST([DLLTOOL])
11717+])
11718
11719 # _LT_DECL_SED
11720 # ------------
11721@@ -7194,8 +7638,8 @@ m4_defun([_LT_CHECK_SHELL_FEATURES],
11722 # Try some XSI features
11723 xsi_shell=no
11724 ( _lt_dummy="a/b/c"
11725- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
11726- = c,a/b,, \
11727+ test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
11728+ = c,a/b,b/c, \
11729 && eval 'test $(( 1 + 1 )) -eq 2 \
11730 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
11731 && xsi_shell=yes
11732@@ -7234,206 +7678,162 @@ _LT_DECL([NL2SP], [lt_NL2SP], [1], [turn
11733 ])# _LT_CHECK_SHELL_FEATURES
11734
11735
11736-# _LT_PROG_XSI_SHELLFNS
11737-# ---------------------
11738-# Bourne and XSI compatible variants of some useful shell functions.
11739-m4_defun([_LT_PROG_XSI_SHELLFNS],
11740-[case $xsi_shell in
11741- yes)
11742- cat << \_LT_EOF >> "$cfgfile"
11743-
11744-# func_dirname file append nondir_replacement
11745-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
11746-# otherwise set result to NONDIR_REPLACEMENT.
11747-func_dirname ()
11748-{
11749- case ${1} in
11750- */*) func_dirname_result="${1%/*}${2}" ;;
11751- * ) func_dirname_result="${3}" ;;
11752- esac
11753-}
11754-
11755-# func_basename file
11756-func_basename ()
11757-{
11758- func_basename_result="${1##*/}"
11759-}
11760-
11761-# func_dirname_and_basename file append nondir_replacement
11762-# perform func_basename and func_dirname in a single function
11763-# call:
11764-# dirname: Compute the dirname of FILE. If nonempty,
11765-# add APPEND to the result, otherwise set result
11766-# to NONDIR_REPLACEMENT.
11767-# value returned in "$func_dirname_result"
11768-# basename: Compute filename of FILE.
11769-# value retuned in "$func_basename_result"
11770-# Implementation must be kept synchronized with func_dirname
11771-# and func_basename. For efficiency, we do not delegate to
11772-# those functions but instead duplicate the functionality here.
11773-func_dirname_and_basename ()
11774-{
11775- case ${1} in
11776- */*) func_dirname_result="${1%/*}${2}" ;;
11777- * ) func_dirname_result="${3}" ;;
11778- esac
11779- func_basename_result="${1##*/}"
11780-}
11781-
11782-# func_stripname prefix suffix name
11783-# strip PREFIX and SUFFIX off of NAME.
11784-# PREFIX and SUFFIX must not contain globbing or regex special
11785-# characters, hashes, percent signs, but SUFFIX may contain a leading
11786-# dot (in which case that matches only a dot).
11787-func_stripname ()
11788-{
11789- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
11790- # positional parameters, so assign one to ordinary parameter first.
11791- func_stripname_result=${3}
11792- func_stripname_result=${func_stripname_result#"${1}"}
11793- func_stripname_result=${func_stripname_result%"${2}"}
11794-}
11795-
11796-# func_opt_split
11797-func_opt_split ()
11798-{
11799- func_opt_split_opt=${1%%=*}
11800- func_opt_split_arg=${1#*=}
11801-}
11802-
11803-# func_lo2o object
11804-func_lo2o ()
11805-{
11806- case ${1} in
11807- *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
11808- *) func_lo2o_result=${1} ;;
11809- esac
11810-}
11811-
11812-# func_xform libobj-or-source
11813-func_xform ()
11814-{
11815- func_xform_result=${1%.*}.lo
11816-}
11817-
11818-# func_arith arithmetic-term...
11819-func_arith ()
11820-{
11821- func_arith_result=$(( $[*] ))
11822-}
11823-
11824-# func_len string
11825-# STRING may not start with a hyphen.
11826-func_len ()
11827-{
11828- func_len_result=${#1}
11829-}
11830-
11831-_LT_EOF
11832- ;;
11833- *) # Bourne compatible functions.
11834- cat << \_LT_EOF >> "$cfgfile"
11835-
11836-# func_dirname file append nondir_replacement
11837-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
11838-# otherwise set result to NONDIR_REPLACEMENT.
11839-func_dirname ()
11840-{
11841- # Extract subdirectory from the argument.
11842- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
11843- if test "X$func_dirname_result" = "X${1}"; then
11844- func_dirname_result="${3}"
11845- else
11846- func_dirname_result="$func_dirname_result${2}"
11847- fi
11848-}
11849-
11850-# func_basename file
11851-func_basename ()
11852-{
11853- func_basename_result=`$ECHO "${1}" | $SED "$basename"`
11854-}
11855+# _LT_PROG_FUNCTION_REPLACE (FUNCNAME, REPLACEMENT-BODY)
11856+# ------------------------------------------------------
11857+# In `$cfgfile', look for function FUNCNAME delimited by `^FUNCNAME ()$' and
11858+# '^} FUNCNAME ', and replace its body with REPLACEMENT-BODY.
11859+m4_defun([_LT_PROG_FUNCTION_REPLACE],
11860+[dnl {
11861+sed -e '/^$1 ()$/,/^} # $1 /c\
11862+$1 ()\
11863+{\
11864+m4_bpatsubsts([$2], [$], [\\], [^\([ ]\)], [\\\1])
11865+} # Extended-shell $1 implementation' "$cfgfile" > $cfgfile.tmp \
11866+ && mv -f "$cfgfile.tmp" "$cfgfile" \
11867+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
11868+test 0 -eq $? || _lt_function_replace_fail=:
11869+])
11870
11871-dnl func_dirname_and_basename
11872-dnl A portable version of this function is already defined in general.m4sh
11873-dnl so there is no need for it here.
11874
11875-# func_stripname prefix suffix name
11876-# strip PREFIX and SUFFIX off of NAME.
11877-# PREFIX and SUFFIX must not contain globbing or regex special
11878-# characters, hashes, percent signs, but SUFFIX may contain a leading
11879-# dot (in which case that matches only a dot).
11880-# func_strip_suffix prefix name
11881-func_stripname ()
11882-{
11883- case ${2} in
11884- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
11885- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
11886- esac
11887-}
11888+# _LT_PROG_REPLACE_SHELLFNS
11889+# -------------------------
11890+# Replace existing portable implementations of several shell functions with
11891+# equivalent extended shell implementations where those features are available..
11892+m4_defun([_LT_PROG_REPLACE_SHELLFNS],
11893+[if test x"$xsi_shell" = xyes; then
11894+ _LT_PROG_FUNCTION_REPLACE([func_dirname], [dnl
11895+ case ${1} in
11896+ */*) func_dirname_result="${1%/*}${2}" ;;
11897+ * ) func_dirname_result="${3}" ;;
11898+ esac])
11899+
11900+ _LT_PROG_FUNCTION_REPLACE([func_basename], [dnl
11901+ func_basename_result="${1##*/}"])
11902+
11903+ _LT_PROG_FUNCTION_REPLACE([func_dirname_and_basename], [dnl
11904+ case ${1} in
11905+ */*) func_dirname_result="${1%/*}${2}" ;;
11906+ * ) func_dirname_result="${3}" ;;
11907+ esac
11908+ func_basename_result="${1##*/}"])
11909
11910-# sed scripts:
11911-my_sed_long_opt='1s/^\(-[[^=]]*\)=.*/\1/;q'
11912-my_sed_long_arg='1s/^-[[^=]]*=//'
11913+ _LT_PROG_FUNCTION_REPLACE([func_stripname], [dnl
11914+ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
11915+ # positional parameters, so assign one to ordinary parameter first.
11916+ func_stripname_result=${3}
11917+ func_stripname_result=${func_stripname_result#"${1}"}
11918+ func_stripname_result=${func_stripname_result%"${2}"}])
11919+
11920+ _LT_PROG_FUNCTION_REPLACE([func_split_long_opt], [dnl
11921+ func_split_long_opt_name=${1%%=*}
11922+ func_split_long_opt_arg=${1#*=}])
11923+
11924+ _LT_PROG_FUNCTION_REPLACE([func_split_short_opt], [dnl
11925+ func_split_short_opt_arg=${1#??}
11926+ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}])
11927+
11928+ _LT_PROG_FUNCTION_REPLACE([func_lo2o], [dnl
11929+ case ${1} in
11930+ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
11931+ *) func_lo2o_result=${1} ;;
11932+ esac])
11933
11934-# func_opt_split
11935-func_opt_split ()
11936-{
11937- func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"`
11938- func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"`
11939-}
11940+ _LT_PROG_FUNCTION_REPLACE([func_xform], [ func_xform_result=${1%.*}.lo])
11941
11942-# func_lo2o object
11943-func_lo2o ()
11944-{
11945- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
11946-}
11947+ _LT_PROG_FUNCTION_REPLACE([func_arith], [ func_arith_result=$(( $[*] ))])
11948
11949-# func_xform libobj-or-source
11950-func_xform ()
11951-{
11952- func_xform_result=`$ECHO "${1}" | $SED 's/\.[[^.]]*$/.lo/'`
11953-}
11954+ _LT_PROG_FUNCTION_REPLACE([func_len], [ func_len_result=${#1}])
11955+fi
11956
11957-# func_arith arithmetic-term...
11958-func_arith ()
11959-{
11960- func_arith_result=`expr "$[@]"`
11961-}
11962+if test x"$lt_shell_append" = xyes; then
11963+ _LT_PROG_FUNCTION_REPLACE([func_append], [ eval "${1}+=\\${2}"])
11964
11965-# func_len string
11966-# STRING may not start with a hyphen.
11967-func_len ()
11968-{
11969- func_len_result=`expr "$[1]" : ".*" 2>/dev/null || echo $max_cmd_len`
11970-}
11971+ _LT_PROG_FUNCTION_REPLACE([func_append_quoted], [dnl
11972+ func_quote_for_eval "${2}"
11973+dnl m4 expansion turns \\\\ into \\, and then the shell eval turns that into \
11974+ eval "${1}+=\\\\ \\$func_quote_for_eval_result"])
11975+
11976+ # Save a `func_append' function call where possible by direct use of '+='
11977+ sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
11978+ && mv -f "$cfgfile.tmp" "$cfgfile" \
11979+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
11980+ test 0 -eq $? || _lt_function_replace_fail=:
11981+else
11982+ # Save a `func_append' function call even when '+=' is not available
11983+ sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
11984+ && mv -f "$cfgfile.tmp" "$cfgfile" \
11985+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
11986+ test 0 -eq $? || _lt_function_replace_fail=:
11987+fi
11988
11989-_LT_EOF
11990-esac
11991+if test x"$_lt_function_replace_fail" = x":"; then
11992+ AC_MSG_WARN([Unable to substitute extended shell functions in $ofile])
11993+fi
11994+])
11995
11996-case $lt_shell_append in
11997- yes)
11998- cat << \_LT_EOF >> "$cfgfile"
11999-
12000-# func_append var value
12001-# Append VALUE to the end of shell variable VAR.
12002-func_append ()
12003-{
12004- eval "$[1]+=\$[2]"
12005-}
12006-_LT_EOF
12007+# _LT_PATH_CONVERSION_FUNCTIONS
12008+# -----------------------------
12009+# Determine which file name conversion functions should be used by
12010+# func_to_host_file (and, implicitly, by func_to_host_path). These are needed
12011+# for certain cross-compile configurations and native mingw.
12012+m4_defun([_LT_PATH_CONVERSION_FUNCTIONS],
12013+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
12014+AC_REQUIRE([AC_CANONICAL_BUILD])dnl
12015+AC_MSG_CHECKING([how to convert $build file names to $host format])
12016+AC_CACHE_VAL(lt_cv_to_host_file_cmd,
12017+[case $host in
12018+ *-*-mingw* )
12019+ case $build in
12020+ *-*-mingw* ) # actually msys
12021+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
12022+ ;;
12023+ *-*-cygwin* )
12024+ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
12025+ ;;
12026+ * ) # otherwise, assume *nix
12027+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
12028+ ;;
12029+ esac
12030 ;;
12031- *)
12032- cat << \_LT_EOF >> "$cfgfile"
12033-
12034-# func_append var value
12035-# Append VALUE to the end of shell variable VAR.
12036-func_append ()
12037-{
12038- eval "$[1]=\$$[1]\$[2]"
12039-}
12040-
12041-_LT_EOF
12042+ *-*-cygwin* )
12043+ case $build in
12044+ *-*-mingw* ) # actually msys
12045+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
12046+ ;;
12047+ *-*-cygwin* )
12048+ lt_cv_to_host_file_cmd=func_convert_file_noop
12049+ ;;
12050+ * ) # otherwise, assume *nix
12051+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
12052+ ;;
12053+ esac
12054 ;;
12055- esac
12056+ * ) # unhandled hosts (and "normal" native builds)
12057+ lt_cv_to_host_file_cmd=func_convert_file_noop
12058+ ;;
12059+esac
12060+])
12061+to_host_file_cmd=$lt_cv_to_host_file_cmd
12062+AC_MSG_RESULT([$lt_cv_to_host_file_cmd])
12063+_LT_DECL([to_host_file_cmd], [lt_cv_to_host_file_cmd],
12064+ [0], [convert $build file names to $host format])dnl
12065+
12066+AC_MSG_CHECKING([how to convert $build file names to toolchain format])
12067+AC_CACHE_VAL(lt_cv_to_tool_file_cmd,
12068+[#assume ordinary cross tools, or native build.
12069+lt_cv_to_tool_file_cmd=func_convert_file_noop
12070+case $host in
12071+ *-*-mingw* )
12072+ case $build in
12073+ *-*-mingw* ) # actually msys
12074+ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
12075+ ;;
12076+ esac
12077+ ;;
12078+esac
12079 ])
12080+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
12081+AC_MSG_RESULT([$lt_cv_to_tool_file_cmd])
12082+_LT_DECL([to_tool_file_cmd], [lt_cv_to_tool_file_cmd],
12083+ [0], [convert $build files to toolchain format])dnl
12084+])# _LT_PATH_CONVERSION_FUNCTIONS
12085--- a/ltmain.sh
12086+++ b/ltmain.sh
12087@@ -1,10 +1,9 @@
12088-# Generated from ltmain.m4sh.
12089
12090-# libtool (GNU libtool 1.3134 2009-11-29) 2.2.7a
12091+# libtool (GNU libtool) 2.4
12092 # Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
12093
12094 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
12095-# 2007, 2008, 2009 Free Software Foundation, Inc.
12096+# 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
12097 # This is free software; see the source for copying conditions. There is NO
12098 # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
12099
12100@@ -38,7 +37,6 @@
12101 # -n, --dry-run display commands without modifying any files
12102 # --features display basic configuration information and exit
12103 # --mode=MODE use operation mode MODE
12104-# --no-finish let install mode avoid finish commands
12105 # --preserve-dup-deps don't remove duplicate dependency libraries
12106 # --quiet, --silent don't print informational messages
12107 # --no-quiet, --no-silent
12108@@ -71,17 +69,19 @@
12109 # compiler: $LTCC
12110 # compiler flags: $LTCFLAGS
12111 # linker: $LD (gnu? $with_gnu_ld)
12112-# $progname: (GNU libtool 1.3134 2009-11-29) 2.2.7a
12113+# $progname: (GNU libtool) 2.4
12114 # automake: $automake_version
12115 # autoconf: $autoconf_version
12116 #
12117 # Report bugs to <bug-libtool@gnu.org>.
12118+# GNU libtool home page: <http://www.gnu.org/software/libtool/>.
12119+# General help using GNU software: <http://www.gnu.org/gethelp/>.
12120
12121 PROGRAM=libtool
12122 PACKAGE=libtool
12123-VERSION=2.2.7a
12124-TIMESTAMP=" 1.3134 2009-11-29"
12125-package_revision=1.3134
12126+VERSION=2.4
12127+TIMESTAMP=""
12128+package_revision=1.3293
12129
12130 # Be Bourne compatible
12131 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
12132@@ -106,9 +106,6 @@ _LTECHO_EOF'
12133 }
12134
12135 # NLS nuisances: We save the old values to restore during execute mode.
12136-# Only set LANG and LC_ALL to C if already set.
12137-# These must not be set unconditionally because not all systems understand
12138-# e.g. LANG=C (notably SCO).
12139 lt_user_locale=
12140 lt_safe_locale=
12141 for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
12142@@ -121,15 +118,13 @@ do
12143 lt_safe_locale=\"$lt_var=C; \$lt_safe_locale\"
12144 fi"
12145 done
12146+LC_ALL=C
12147+LANGUAGE=C
12148+export LANGUAGE LC_ALL
12149
12150 $lt_unset CDPATH
12151
12152
12153-
12154-
12155-
12156-
12157-
12158 # Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
12159 # is ksh but when the shell is invoked as "sh" and the current value of
12160 # the _XPG environment variable is not equal to 1 (one), the special
12161@@ -140,7 +135,7 @@ progpath="$0"
12162
12163
12164 : ${CP="cp -f"}
12165-: ${ECHO=$as_echo}
12166+test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'}
12167 : ${EGREP="/bin/grep -E"}
12168 : ${FGREP="/bin/grep -F"}
12169 : ${GREP="/bin/grep"}
12170@@ -149,7 +144,7 @@ progpath="$0"
12171 : ${MKDIR="mkdir"}
12172 : ${MV="mv -f"}
12173 : ${RM="rm -f"}
12174-: ${SED="/mount/endor/wildenhu/local-x86_64/bin/sed"}
12175+: ${SED="/bin/sed"}
12176 : ${SHELL="${CONFIG_SHELL-/bin/sh}"}
12177 : ${Xsed="$SED -e 1s/^X//"}
12178
12179@@ -169,6 +164,27 @@ IFS=" $lt_nl"
12180 dirname="s,/[^/]*$,,"
12181 basename="s,^.*/,,"
12182
12183+# func_dirname file append nondir_replacement
12184+# Compute the dirname of FILE. If nonempty, add APPEND to the result,
12185+# otherwise set result to NONDIR_REPLACEMENT.
12186+func_dirname ()
12187+{
12188+ func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
12189+ if test "X$func_dirname_result" = "X${1}"; then
12190+ func_dirname_result="${3}"
12191+ else
12192+ func_dirname_result="$func_dirname_result${2}"
12193+ fi
12194+} # func_dirname may be replaced by extended shell implementation
12195+
12196+
12197+# func_basename file
12198+func_basename ()
12199+{
12200+ func_basename_result=`$ECHO "${1}" | $SED "$basename"`
12201+} # func_basename may be replaced by extended shell implementation
12202+
12203+
12204 # func_dirname_and_basename file append nondir_replacement
12205 # perform func_basename and func_dirname in a single function
12206 # call:
12207@@ -183,17 +199,31 @@ basename="s,^.*/,,"
12208 # those functions but instead duplicate the functionality here.
12209 func_dirname_and_basename ()
12210 {
12211- # Extract subdirectory from the argument.
12212- func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"`
12213- if test "X$func_dirname_result" = "X${1}"; then
12214- func_dirname_result="${3}"
12215- else
12216- func_dirname_result="$func_dirname_result${2}"
12217- fi
12218- func_basename_result=`$ECHO "${1}" | $SED -e "$basename"`
12219-}
12220+ # Extract subdirectory from the argument.
12221+ func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"`
12222+ if test "X$func_dirname_result" = "X${1}"; then
12223+ func_dirname_result="${3}"
12224+ else
12225+ func_dirname_result="$func_dirname_result${2}"
12226+ fi
12227+ func_basename_result=`$ECHO "${1}" | $SED -e "$basename"`
12228+} # func_dirname_and_basename may be replaced by extended shell implementation
12229+
12230+
12231+# func_stripname prefix suffix name
12232+# strip PREFIX and SUFFIX off of NAME.
12233+# PREFIX and SUFFIX must not contain globbing or regex special
12234+# characters, hashes, percent signs, but SUFFIX may contain a leading
12235+# dot (in which case that matches only a dot).
12236+# func_strip_suffix prefix name
12237+func_stripname ()
12238+{
12239+ case ${2} in
12240+ .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
12241+ *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
12242+ esac
12243+} # func_stripname may be replaced by extended shell implementation
12244
12245-# Generated shell functions inserted here.
12246
12247 # These SED scripts presuppose an absolute path with a trailing slash.
12248 pathcar='s,^/\([^/]*\).*$,\1,'
12249@@ -376,6 +406,15 @@ sed_quote_subst='s/\([`"$\\]\)/\\\1/g'
12250 # Same as above, but do not quote variable references.
12251 double_quote_subst='s/\(["`\\]\)/\\\1/g'
12252
12253+# Sed substitution that turns a string into a regex matching for the
12254+# string literally.
12255+sed_make_literal_regex='s,[].[^$\\*\/],\\&,g'
12256+
12257+# Sed substitution that converts a w32 file name or path
12258+# which contains forward slashes, into one that contains
12259+# (escaped) backslashes. A very naive implementation.
12260+lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
12261+
12262 # Re-`\' parameter expansions in output of double_quote_subst that were
12263 # `\'-ed in input to the same. If an odd number of `\' preceded a '$'
12264 # in input to double_quote_subst, that '$' was protected from expansion.
12265@@ -404,7 +443,7 @@ opt_warning=:
12266 # name if it has been set yet.
12267 func_echo ()
12268 {
12269- $ECHO "$progname${mode+: }$mode: $*"
12270+ $ECHO "$progname: ${opt_mode+$opt_mode: }$*"
12271 }
12272
12273 # func_verbose arg...
12274@@ -430,14 +469,14 @@ func_echo_all ()
12275 # Echo program name prefixed message to standard error.
12276 func_error ()
12277 {
12278- $ECHO "$progname${mode+: }$mode: "${1+"$@"} 1>&2
12279+ $ECHO "$progname: ${opt_mode+$opt_mode: }"${1+"$@"} 1>&2
12280 }
12281
12282 # func_warning arg...
12283 # Echo program name prefixed warning message to standard error.
12284 func_warning ()
12285 {
12286- $opt_warning && $ECHO "$progname${mode+: }$mode: warning: "${1+"$@"} 1>&2
12287+ $opt_warning && $ECHO "$progname: ${opt_mode+$opt_mode: }warning: "${1+"$@"} 1>&2
12288
12289 # bash bug again:
12290 :
12291@@ -656,19 +695,35 @@ func_show_eval_locale ()
12292 fi
12293 }
12294
12295-
12296-
12297+# func_tr_sh
12298+# Turn $1 into a string suitable for a shell variable name.
12299+# Result is stored in $func_tr_sh_result. All characters
12300+# not in the set a-zA-Z0-9_ are replaced with '_'. Further,
12301+# if $1 begins with a digit, a '_' is prepended as well.
12302+func_tr_sh ()
12303+{
12304+ case $1 in
12305+ [0-9]* | *[!a-zA-Z0-9_]*)
12306+ func_tr_sh_result=`$ECHO "$1" | $SED 's/^\([0-9]\)/_\1/; s/[^a-zA-Z0-9_]/_/g'`
12307+ ;;
12308+ * )
12309+ func_tr_sh_result=$1
12310+ ;;
12311+ esac
12312+}
12313
12314
12315 # func_version
12316 # Echo version message to standard output and exit.
12317 func_version ()
12318 {
12319+ $opt_debug
12320+
12321 $SED -n '/(C)/!b go
12322 :more
12323 /\./!{
12324 N
12325- s/\n# //
12326+ s/\n# / /
12327 b more
12328 }
12329 :go
12330@@ -685,7 +740,9 @@ func_version ()
12331 # Echo short help message to standard output and exit.
12332 func_usage ()
12333 {
12334- $SED -n '/^# Usage:/,/^# *-h/ {
12335+ $opt_debug
12336+
12337+ $SED -n '/^# Usage:/,/^# *.*--help/ {
12338 s/^# //
12339 s/^# *$//
12340 s/\$progname/'$progname'/
12341@@ -701,7 +758,10 @@ func_usage ()
12342 # unless 'noexit' is passed as argument.
12343 func_help ()
12344 {
12345+ $opt_debug
12346+
12347 $SED -n '/^# Usage:/,/# Report bugs to/ {
12348+ :print
12349 s/^# //
12350 s/^# *$//
12351 s*\$progname*'$progname'*
12352@@ -714,7 +774,11 @@ func_help ()
12353 s/\$automake_version/'"`(automake --version) 2>/dev/null |$SED 1q`"'/
12354 s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/
12355 p
12356- }' < "$progpath"
12357+ d
12358+ }
12359+ /^# .* home page:/b print
12360+ /^# General help using/b print
12361+ ' < "$progpath"
12362 ret=$?
12363 if test -z "$1"; then
12364 exit $ret
12365@@ -726,12 +790,39 @@ func_help ()
12366 # exit_cmd.
12367 func_missing_arg ()
12368 {
12369- func_error "missing argument for $1"
12370+ $opt_debug
12371+
12372+ func_error "missing argument for $1."
12373 exit_cmd=exit
12374 }
12375
12376-exit_cmd=:
12377
12378+# func_split_short_opt shortopt
12379+# Set func_split_short_opt_name and func_split_short_opt_arg shell
12380+# variables after splitting SHORTOPT after the 2nd character.
12381+func_split_short_opt ()
12382+{
12383+ my_sed_short_opt='1s/^\(..\).*$/\1/;q'
12384+ my_sed_short_rest='1s/^..\(.*\)$/\1/;q'
12385+
12386+ func_split_short_opt_name=`$ECHO "$1" | $SED "$my_sed_short_opt"`
12387+ func_split_short_opt_arg=`$ECHO "$1" | $SED "$my_sed_short_rest"`
12388+} # func_split_short_opt may be replaced by extended shell implementation
12389+
12390+
12391+# func_split_long_opt longopt
12392+# Set func_split_long_opt_name and func_split_long_opt_arg shell
12393+# variables after splitting LONGOPT at the `=' sign.
12394+func_split_long_opt ()
12395+{
12396+ my_sed_long_opt='1s/^\(--[^=]*\)=.*/\1/;q'
12397+ my_sed_long_arg='1s/^--[^=]*=//'
12398+
12399+ func_split_long_opt_name=`$ECHO "$1" | $SED "$my_sed_long_opt"`
12400+ func_split_long_opt_arg=`$ECHO "$1" | $SED "$my_sed_long_arg"`
12401+} # func_split_long_opt may be replaced by extended shell implementation
12402+
12403+exit_cmd=:
12404
12405
12406
12407@@ -741,26 +832,64 @@ magic="%%%MAGIC variable%%%"
12408 magic_exe="%%%MAGIC EXE variable%%%"
12409
12410 # Global variables.
12411-# $mode is unset
12412 nonopt=
12413-execute_dlfiles=
12414 preserve_args=
12415 lo2o="s/\\.lo\$/.${objext}/"
12416 o2lo="s/\\.${objext}\$/.lo/"
12417 extracted_archives=
12418 extracted_serial=0
12419
12420-opt_dry_run=false
12421-opt_finish=:
12422-opt_duplicate_deps=false
12423-opt_silent=false
12424-opt_debug=:
12425-
12426 # If this variable is set in any of the actions, the command in it
12427 # will be execed at the end. This prevents here-documents from being
12428 # left over by shells.
12429 exec_cmd=
12430
12431+# func_append var value
12432+# Append VALUE to the end of shell variable VAR.
12433+func_append ()
12434+{
12435+ eval "${1}=\$${1}\${2}"
12436+} # func_append may be replaced by extended shell implementation
12437+
12438+# func_append_quoted var value
12439+# Quote VALUE and append to the end of shell variable VAR, separated
12440+# by a space.
12441+func_append_quoted ()
12442+{
12443+ func_quote_for_eval "${2}"
12444+ eval "${1}=\$${1}\\ \$func_quote_for_eval_result"
12445+} # func_append_quoted may be replaced by extended shell implementation
12446+
12447+
12448+# func_arith arithmetic-term...
12449+func_arith ()
12450+{
12451+ func_arith_result=`expr "${@}"`
12452+} # func_arith may be replaced by extended shell implementation
12453+
12454+
12455+# func_len string
12456+# STRING may not start with a hyphen.
12457+func_len ()
12458+{
12459+ func_len_result=`expr "${1}" : ".*" 2>/dev/null || echo $max_cmd_len`
12460+} # func_len may be replaced by extended shell implementation
12461+
12462+
12463+# func_lo2o object
12464+func_lo2o ()
12465+{
12466+ func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
12467+} # func_lo2o may be replaced by extended shell implementation
12468+
12469+
12470+# func_xform libobj-or-source
12471+func_xform ()
12472+{
12473+ func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`
12474+} # func_xform may be replaced by extended shell implementation
12475+
12476+
12477 # func_fatal_configuration arg...
12478 # Echo program name prefixed message to standard error, followed by
12479 # a configuration failure hint, and exit.
12480@@ -850,130 +979,204 @@ func_enable_tag ()
12481 esac
12482 }
12483
12484-# Parse options once, thoroughly. This comes as soon as possible in
12485-# the script to make things like `libtool --version' happen quickly.
12486+# func_check_version_match
12487+# Ensure that we are using m4 macros, and libtool script from the same
12488+# release of libtool.
12489+func_check_version_match ()
12490 {
12491+ if test "$package_revision" != "$macro_revision"; then
12492+ if test "$VERSION" != "$macro_version"; then
12493+ if test -z "$macro_version"; then
12494+ cat >&2 <<_LT_EOF
12495+$progname: Version mismatch error. This is $PACKAGE $VERSION, but the
12496+$progname: definition of this LT_INIT comes from an older release.
12497+$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
12498+$progname: and run autoconf again.
12499+_LT_EOF
12500+ else
12501+ cat >&2 <<_LT_EOF
12502+$progname: Version mismatch error. This is $PACKAGE $VERSION, but the
12503+$progname: definition of this LT_INIT comes from $PACKAGE $macro_version.
12504+$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
12505+$progname: and run autoconf again.
12506+_LT_EOF
12507+ fi
12508+ else
12509+ cat >&2 <<_LT_EOF
12510+$progname: Version mismatch error. This is $PACKAGE $VERSION, revision $package_revision,
12511+$progname: but the definition of this LT_INIT comes from revision $macro_revision.
12512+$progname: You should recreate aclocal.m4 with macros from revision $package_revision
12513+$progname: of $PACKAGE $VERSION and run autoconf again.
12514+_LT_EOF
12515+ fi
12516+
12517+ exit $EXIT_MISMATCH
12518+ fi
12519+}
12520+
12521+
12522+# Shorthand for --mode=foo, only valid as the first argument
12523+case $1 in
12524+clean|clea|cle|cl)
12525+ shift; set dummy --mode clean ${1+"$@"}; shift
12526+ ;;
12527+compile|compil|compi|comp|com|co|c)
12528+ shift; set dummy --mode compile ${1+"$@"}; shift
12529+ ;;
12530+execute|execut|execu|exec|exe|ex|e)
12531+ shift; set dummy --mode execute ${1+"$@"}; shift
12532+ ;;
12533+finish|finis|fini|fin|fi|f)
12534+ shift; set dummy --mode finish ${1+"$@"}; shift
12535+ ;;
12536+install|instal|insta|inst|ins|in|i)
12537+ shift; set dummy --mode install ${1+"$@"}; shift
12538+ ;;
12539+link|lin|li|l)
12540+ shift; set dummy --mode link ${1+"$@"}; shift
12541+ ;;
12542+uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u)
12543+ shift; set dummy --mode uninstall ${1+"$@"}; shift
12544+ ;;
12545+esac
12546+
12547+
12548+
12549+# Option defaults:
12550+opt_debug=:
12551+opt_dry_run=false
12552+opt_config=false
12553+opt_preserve_dup_deps=false
12554+opt_features=false
12555+opt_finish=false
12556+opt_help=false
12557+opt_help_all=false
12558+opt_silent=:
12559+opt_verbose=:
12560+opt_silent=false
12561+opt_verbose=false
12562
12563- # Shorthand for --mode=foo, only valid as the first argument
12564- case $1 in
12565- clean|clea|cle|cl)
12566- shift; set dummy --mode clean ${1+"$@"}; shift
12567- ;;
12568- compile|compil|compi|comp|com|co|c)
12569- shift; set dummy --mode compile ${1+"$@"}; shift
12570- ;;
12571- execute|execut|execu|exec|exe|ex|e)
12572- shift; set dummy --mode execute ${1+"$@"}; shift
12573- ;;
12574- finish|finis|fini|fin|fi|f)
12575- shift; set dummy --mode finish ${1+"$@"}; shift
12576- ;;
12577- install|instal|insta|inst|ins|in|i)
12578- shift; set dummy --mode install ${1+"$@"}; shift
12579- ;;
12580- link|lin|li|l)
12581- shift; set dummy --mode link ${1+"$@"}; shift
12582- ;;
12583- uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u)
12584- shift; set dummy --mode uninstall ${1+"$@"}; shift
12585- ;;
12586- esac
12587
12588- # Parse non-mode specific arguments:
12589- while test "$#" -gt 0; do
12590+# Parse options once, thoroughly. This comes as soon as possible in the
12591+# script to make things like `--version' happen as quickly as we can.
12592+{
12593+ # this just eases exit handling
12594+ while test $# -gt 0; do
12595 opt="$1"
12596 shift
12597-
12598 case $opt in
12599- --config) func_config ;;
12600-
12601- --debug) preserve_args="$preserve_args $opt"
12602+ --debug|-x) opt_debug='set -x'
12603 func_echo "enabling shell trace mode"
12604- opt_debug='set -x'
12605 $opt_debug
12606 ;;
12607-
12608- -dlopen) test "$#" -eq 0 && func_missing_arg "$opt" && break
12609- execute_dlfiles="$execute_dlfiles $1"
12610- shift
12611+ --dry-run|--dryrun|-n)
12612+ opt_dry_run=:
12613 ;;
12614-
12615- --dry-run | -n) opt_dry_run=: ;;
12616- --features) func_features ;;
12617- --finish) mode="finish" ;;
12618- --no-finish) opt_finish=false ;;
12619-
12620- --mode) test "$#" -eq 0 && func_missing_arg "$opt" && break
12621- case $1 in
12622- # Valid mode arguments:
12623- clean) ;;
12624- compile) ;;
12625- execute) ;;
12626- finish) ;;
12627- install) ;;
12628- link) ;;
12629- relink) ;;
12630- uninstall) ;;
12631-
12632- # Catch anything else as an error
12633- *) func_error "invalid argument for $opt"
12634- exit_cmd=exit
12635- break
12636- ;;
12637- esac
12638-
12639- mode="$1"
12640+ --config)
12641+ opt_config=:
12642+func_config
12643+ ;;
12644+ --dlopen|-dlopen)
12645+ optarg="$1"
12646+ opt_dlopen="${opt_dlopen+$opt_dlopen
12647+}$optarg"
12648 shift
12649 ;;
12650-
12651 --preserve-dup-deps)
12652- opt_duplicate_deps=: ;;
12653-
12654- --quiet|--silent) preserve_args="$preserve_args $opt"
12655- opt_silent=:
12656- opt_verbose=false
12657+ opt_preserve_dup_deps=:
12658 ;;
12659-
12660- --no-quiet|--no-silent)
12661- preserve_args="$preserve_args $opt"
12662- opt_silent=false
12663+ --features)
12664+ opt_features=:
12665+func_features
12666 ;;
12667-
12668- --verbose| -v) preserve_args="$preserve_args $opt"
12669+ --finish)
12670+ opt_finish=:
12671+set dummy --mode finish ${1+"$@"}; shift
12672+ ;;
12673+ --help)
12674+ opt_help=:
12675+ ;;
12676+ --help-all)
12677+ opt_help_all=:
12678+opt_help=': help-all'
12679+ ;;
12680+ --mode)
12681+ test $# = 0 && func_missing_arg $opt && break
12682+ optarg="$1"
12683+ opt_mode="$optarg"
12684+case $optarg in
12685+ # Valid mode arguments:
12686+ clean|compile|execute|finish|install|link|relink|uninstall) ;;
12687+
12688+ # Catch anything else as an error
12689+ *) func_error "invalid argument for $opt"
12690+ exit_cmd=exit
12691+ break
12692+ ;;
12693+esac
12694+ shift
12695+ ;;
12696+ --no-silent|--no-quiet)
12697 opt_silent=false
12698- opt_verbose=:
12699+func_append preserve_args " $opt"
12700 ;;
12701-
12702- --no-verbose) preserve_args="$preserve_args $opt"
12703+ --no-verbose)
12704 opt_verbose=false
12705+func_append preserve_args " $opt"
12706 ;;
12707-
12708- --tag) test "$#" -eq 0 && func_missing_arg "$opt" && break
12709- preserve_args="$preserve_args $opt $1"
12710- func_enable_tag "$1" # tagname is set here
12711+ --silent|--quiet)
12712+ opt_silent=:
12713+func_append preserve_args " $opt"
12714+ opt_verbose=false
12715+ ;;
12716+ --verbose|-v)
12717+ opt_verbose=:
12718+func_append preserve_args " $opt"
12719+opt_silent=false
12720+ ;;
12721+ --tag)
12722+ test $# = 0 && func_missing_arg $opt && break
12723+ optarg="$1"
12724+ opt_tag="$optarg"
12725+func_append preserve_args " $opt $optarg"
12726+func_enable_tag "$optarg"
12727 shift
12728 ;;
12729
12730+ -\?|-h) func_usage ;;
12731+ --help) func_help ;;
12732+ --version) func_version ;;
12733+
12734 # Separate optargs to long options:
12735- -dlopen=*|--mode=*|--tag=*)
12736- func_opt_split "$opt"
12737- set dummy "$func_opt_split_opt" "$func_opt_split_arg" ${1+"$@"}
12738+ --*=*)
12739+ func_split_long_opt "$opt"
12740+ set dummy "$func_split_long_opt_name" "$func_split_long_opt_arg" ${1+"$@"}
12741 shift
12742 ;;
12743
12744- -\?|-h) func_usage ;;
12745- --help) opt_help=: ;;
12746- --help-all) opt_help=': help-all' ;;
12747- --version) func_version ;;
12748-
12749- -*) func_fatal_help "unrecognized option \`$opt'" ;;
12750-
12751- *) nonopt="$opt"
12752- break
12753+ # Separate non-argument short options:
12754+ -\?*|-h*|-n*|-v*)
12755+ func_split_short_opt "$opt"
12756+ set dummy "$func_split_short_opt_name" "-$func_split_short_opt_arg" ${1+"$@"}
12757+ shift
12758 ;;
12759+
12760+ --) break ;;
12761+ -*) func_fatal_help "unrecognized option \`$opt'" ;;
12762+ *) set dummy "$opt" ${1+"$@"}; shift; break ;;
12763 esac
12764 done
12765
12766+ # Validate options:
12767+
12768+ # save first non-option argument
12769+ if test "$#" -gt 0; then
12770+ nonopt="$opt"
12771+ shift
12772+ fi
12773+
12774+ # preserve --debug
12775+ test "$opt_debug" = : || func_append preserve_args " --debug"
12776
12777 case $host in
12778 *cygwin* | *mingw* | *pw32* | *cegcc* | *solaris2* )
12779@@ -981,82 +1184,44 @@ func_enable_tag ()
12780 opt_duplicate_compiler_generated_deps=:
12781 ;;
12782 *)
12783- opt_duplicate_compiler_generated_deps=$opt_duplicate_deps
12784+ opt_duplicate_compiler_generated_deps=$opt_preserve_dup_deps
12785 ;;
12786 esac
12787
12788- # Having warned about all mis-specified options, bail out if
12789- # anything was wrong.
12790- $exit_cmd $EXIT_FAILURE
12791-}
12792+ $opt_help || {
12793+ # Sanity checks first:
12794+ func_check_version_match
12795
12796-# func_check_version_match
12797-# Ensure that we are using m4 macros, and libtool script from the same
12798-# release of libtool.
12799-func_check_version_match ()
12800-{
12801- if test "$package_revision" != "$macro_revision"; then
12802- if test "$VERSION" != "$macro_version"; then
12803- if test -z "$macro_version"; then
12804- cat >&2 <<_LT_EOF
12805-$progname: Version mismatch error. This is $PACKAGE $VERSION, but the
12806-$progname: definition of this LT_INIT comes from an older release.
12807-$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
12808-$progname: and run autoconf again.
12809-_LT_EOF
12810- else
12811- cat >&2 <<_LT_EOF
12812-$progname: Version mismatch error. This is $PACKAGE $VERSION, but the
12813-$progname: definition of this LT_INIT comes from $PACKAGE $macro_version.
12814-$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
12815-$progname: and run autoconf again.
12816-_LT_EOF
12817- fi
12818- else
12819- cat >&2 <<_LT_EOF
12820-$progname: Version mismatch error. This is $PACKAGE $VERSION, revision $package_revision,
12821-$progname: but the definition of this LT_INIT comes from revision $macro_revision.
12822-$progname: You should recreate aclocal.m4 with macros from revision $package_revision
12823-$progname: of $PACKAGE $VERSION and run autoconf again.
12824-_LT_EOF
12825+ if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
12826+ func_fatal_configuration "not configured to build any kind of library"
12827 fi
12828
12829- exit $EXIT_MISMATCH
12830- fi
12831-}
12832-
12833-
12834-## ----------- ##
12835-## Main. ##
12836-## ----------- ##
12837+ # Darwin sucks
12838+ eval std_shrext=\"$shrext_cmds\"
12839
12840-$opt_help || {
12841- # Sanity checks first:
12842- func_check_version_match
12843-
12844- if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
12845- func_fatal_configuration "not configured to build any kind of library"
12846- fi
12847+ # Only execute mode is allowed to have -dlopen flags.
12848+ if test -n "$opt_dlopen" && test "$opt_mode" != execute; then
12849+ func_error "unrecognized option \`-dlopen'"
12850+ $ECHO "$help" 1>&2
12851+ exit $EXIT_FAILURE
12852+ fi
12853
12854- test -z "$mode" && func_fatal_error "error: you must specify a MODE."
12855+ # Change the help message to a mode-specific one.
12856+ generic_help="$help"
12857+ help="Try \`$progname --help --mode=$opt_mode' for more information."
12858+ }
12859
12860
12861- # Darwin sucks
12862- eval "std_shrext=\"$shrext_cmds\""
12863+ # Bail if the options were screwed
12864+ $exit_cmd $EXIT_FAILURE
12865+}
12866
12867
12868- # Only execute mode is allowed to have -dlopen flags.
12869- if test -n "$execute_dlfiles" && test "$mode" != execute; then
12870- func_error "unrecognized option \`-dlopen'"
12871- $ECHO "$help" 1>&2
12872- exit $EXIT_FAILURE
12873- fi
12874
12875- # Change the help message to a mode-specific one.
12876- generic_help="$help"
12877- help="Try \`$progname --help --mode=$mode' for more information."
12878-}
12879
12880+## ----------- ##
12881+## Main. ##
12882+## ----------- ##
12883
12884 # func_lalib_p file
12885 # True iff FILE is a libtool `.la' library or `.lo' object file.
12886@@ -1121,12 +1286,9 @@ func_ltwrapper_executable_p ()
12887 # temporary ltwrapper_script.
12888 func_ltwrapper_scriptname ()
12889 {
12890- func_ltwrapper_scriptname_result=""
12891- if func_ltwrapper_executable_p "$1"; then
12892- func_dirname_and_basename "$1" "" "."
12893- func_stripname '' '.exe' "$func_basename_result"
12894- func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper"
12895- fi
12896+ func_dirname_and_basename "$1" "" "."
12897+ func_stripname '' '.exe' "$func_basename_result"
12898+ func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper"
12899 }
12900
12901 # func_ltwrapper_p file
12902@@ -1149,7 +1311,7 @@ func_execute_cmds ()
12903 save_ifs=$IFS; IFS='~'
12904 for cmd in $1; do
12905 IFS=$save_ifs
12906- eval "cmd=\"$cmd\""
12907+ eval cmd=\"$cmd\"
12908 func_show_eval "$cmd" "${2-:}"
12909 done
12910 IFS=$save_ifs
12911@@ -1172,6 +1334,37 @@ func_source ()
12912 }
12913
12914
12915+# func_resolve_sysroot PATH
12916+# Replace a leading = in PATH with a sysroot. Store the result into
12917+# func_resolve_sysroot_result
12918+func_resolve_sysroot ()
12919+{
12920+ func_resolve_sysroot_result=$1
12921+ case $func_resolve_sysroot_result in
12922+ =*)
12923+ func_stripname '=' '' "$func_resolve_sysroot_result"
12924+ func_resolve_sysroot_result=$lt_sysroot$func_stripname_result
12925+ ;;
12926+ esac
12927+}
12928+
12929+# func_replace_sysroot PATH
12930+# If PATH begins with the sysroot, replace it with = and
12931+# store the result into func_replace_sysroot_result.
12932+func_replace_sysroot ()
12933+{
12934+ case "$lt_sysroot:$1" in
12935+ ?*:"$lt_sysroot"*)
12936+ func_stripname "$lt_sysroot" '' "$1"
12937+ func_replace_sysroot_result="=$func_stripname_result"
12938+ ;;
12939+ *)
12940+ # Including no sysroot.
12941+ func_replace_sysroot_result=$1
12942+ ;;
12943+ esac
12944+}
12945+
12946 # func_infer_tag arg
12947 # Infer tagged configuration to use if any are available and
12948 # if one wasn't chosen via the "--tag" command line option.
12949@@ -1184,8 +1377,7 @@ func_infer_tag ()
12950 if test -n "$available_tags" && test -z "$tagname"; then
12951 CC_quoted=
12952 for arg in $CC; do
12953- func_quote_for_eval "$arg"
12954- CC_quoted="$CC_quoted $func_quote_for_eval_result"
12955+ func_append_quoted CC_quoted "$arg"
12956 done
12957 CC_expanded=`func_echo_all $CC`
12958 CC_quoted_expanded=`func_echo_all $CC_quoted`
12959@@ -1204,8 +1396,7 @@ func_infer_tag ()
12960 CC_quoted=
12961 for arg in $CC; do
12962 # Double-quote args containing other shell metacharacters.
12963- func_quote_for_eval "$arg"
12964- CC_quoted="$CC_quoted $func_quote_for_eval_result"
12965+ func_append_quoted CC_quoted "$arg"
12966 done
12967 CC_expanded=`func_echo_all $CC`
12968 CC_quoted_expanded=`func_echo_all $CC_quoted`
12969@@ -1274,6 +1465,486 @@ EOF
12970 }
12971 }
12972
12973+
12974+##################################################
12975+# FILE NAME AND PATH CONVERSION HELPER FUNCTIONS #
12976+##################################################
12977+
12978+# func_convert_core_file_wine_to_w32 ARG
12979+# Helper function used by file name conversion functions when $build is *nix,
12980+# and $host is mingw, cygwin, or some other w32 environment. Relies on a
12981+# correctly configured wine environment available, with the winepath program
12982+# in $build's $PATH.
12983+#
12984+# ARG is the $build file name to be converted to w32 format.
12985+# Result is available in $func_convert_core_file_wine_to_w32_result, and will
12986+# be empty on error (or when ARG is empty)
12987+func_convert_core_file_wine_to_w32 ()
12988+{
12989+ $opt_debug
12990+ func_convert_core_file_wine_to_w32_result="$1"
12991+ if test -n "$1"; then
12992+ # Unfortunately, winepath does not exit with a non-zero error code, so we
12993+ # are forced to check the contents of stdout. On the other hand, if the
12994+ # command is not found, the shell will set an exit code of 127 and print
12995+ # *an error message* to stdout. So we must check for both error code of
12996+ # zero AND non-empty stdout, which explains the odd construction:
12997+ func_convert_core_file_wine_to_w32_tmp=`winepath -w "$1" 2>/dev/null`
12998+ if test "$?" -eq 0 && test -n "${func_convert_core_file_wine_to_w32_tmp}"; then
12999+ func_convert_core_file_wine_to_w32_result=`$ECHO "$func_convert_core_file_wine_to_w32_tmp" |
13000+ $SED -e "$lt_sed_naive_backslashify"`
13001+ else
13002+ func_convert_core_file_wine_to_w32_result=
13003+ fi
13004+ fi
13005+}
13006+# end: func_convert_core_file_wine_to_w32
13007+
13008+
13009+# func_convert_core_path_wine_to_w32 ARG
13010+# Helper function used by path conversion functions when $build is *nix, and
13011+# $host is mingw, cygwin, or some other w32 environment. Relies on a correctly
13012+# configured wine environment available, with the winepath program in $build's
13013+# $PATH. Assumes ARG has no leading or trailing path separator characters.
13014+#
13015+# ARG is path to be converted from $build format to win32.
13016+# Result is available in $func_convert_core_path_wine_to_w32_result.
13017+# Unconvertible file (directory) names in ARG are skipped; if no directory names
13018+# are convertible, then the result may be empty.
13019+func_convert_core_path_wine_to_w32 ()
13020+{
13021+ $opt_debug
13022+ # unfortunately, winepath doesn't convert paths, only file names
13023+ func_convert_core_path_wine_to_w32_result=""
13024+ if test -n "$1"; then
13025+ oldIFS=$IFS
13026+ IFS=:
13027+ for func_convert_core_path_wine_to_w32_f in $1; do
13028+ IFS=$oldIFS
13029+ func_convert_core_file_wine_to_w32 "$func_convert_core_path_wine_to_w32_f"
13030+ if test -n "$func_convert_core_file_wine_to_w32_result" ; then
13031+ if test -z "$func_convert_core_path_wine_to_w32_result"; then
13032+ func_convert_core_path_wine_to_w32_result="$func_convert_core_file_wine_to_w32_result"
13033+ else
13034+ func_append func_convert_core_path_wine_to_w32_result ";$func_convert_core_file_wine_to_w32_result"
13035+ fi
13036+ fi
13037+ done
13038+ IFS=$oldIFS
13039+ fi
13040+}
13041+# end: func_convert_core_path_wine_to_w32
13042+
13043+
13044+# func_cygpath ARGS...
13045+# Wrapper around calling the cygpath program via LT_CYGPATH. This is used when
13046+# when (1) $build is *nix and Cygwin is hosted via a wine environment; or (2)
13047+# $build is MSYS and $host is Cygwin, or (3) $build is Cygwin. In case (1) or
13048+# (2), returns the Cygwin file name or path in func_cygpath_result (input
13049+# file name or path is assumed to be in w32 format, as previously converted
13050+# from $build's *nix or MSYS format). In case (3), returns the w32 file name
13051+# or path in func_cygpath_result (input file name or path is assumed to be in
13052+# Cygwin format). Returns an empty string on error.
13053+#
13054+# ARGS are passed to cygpath, with the last one being the file name or path to
13055+# be converted.
13056+#
13057+# Specify the absolute *nix (or w32) name to cygpath in the LT_CYGPATH
13058+# environment variable; do not put it in $PATH.
13059+func_cygpath ()
13060+{
13061+ $opt_debug
13062+ if test -n "$LT_CYGPATH" && test -f "$LT_CYGPATH"; then
13063+ func_cygpath_result=`$LT_CYGPATH "$@" 2>/dev/null`
13064+ if test "$?" -ne 0; then
13065+ # on failure, ensure result is empty
13066+ func_cygpath_result=
13067+ fi
13068+ else
13069+ func_cygpath_result=
13070+ func_error "LT_CYGPATH is empty or specifies non-existent file: \`$LT_CYGPATH'"
13071+ fi
13072+}
13073+#end: func_cygpath
13074+
13075+
13076+# func_convert_core_msys_to_w32 ARG
13077+# Convert file name or path ARG from MSYS format to w32 format. Return
13078+# result in func_convert_core_msys_to_w32_result.
13079+func_convert_core_msys_to_w32 ()
13080+{
13081+ $opt_debug
13082+ # awkward: cmd appends spaces to result
13083+ func_convert_core_msys_to_w32_result=`( cmd //c echo "$1" ) 2>/dev/null |
13084+ $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"`
13085+}
13086+#end: func_convert_core_msys_to_w32
13087+
13088+
13089+# func_convert_file_check ARG1 ARG2
13090+# Verify that ARG1 (a file name in $build format) was converted to $host
13091+# format in ARG2. Otherwise, emit an error message, but continue (resetting
13092+# func_to_host_file_result to ARG1).
13093+func_convert_file_check ()
13094+{
13095+ $opt_debug
13096+ if test -z "$2" && test -n "$1" ; then
13097+ func_error "Could not determine host file name corresponding to"
13098+ func_error " \`$1'"
13099+ func_error "Continuing, but uninstalled executables may not work."
13100+ # Fallback:
13101+ func_to_host_file_result="$1"
13102+ fi
13103+}
13104+# end func_convert_file_check
13105+
13106+
13107+# func_convert_path_check FROM_PATHSEP TO_PATHSEP FROM_PATH TO_PATH
13108+# Verify that FROM_PATH (a path in $build format) was converted to $host
13109+# format in TO_PATH. Otherwise, emit an error message, but continue, resetting
13110+# func_to_host_file_result to a simplistic fallback value (see below).
13111+func_convert_path_check ()
13112+{
13113+ $opt_debug
13114+ if test -z "$4" && test -n "$3"; then
13115+ func_error "Could not determine the host path corresponding to"
13116+ func_error " \`$3'"
13117+ func_error "Continuing, but uninstalled executables may not work."
13118+ # Fallback. This is a deliberately simplistic "conversion" and
13119+ # should not be "improved". See libtool.info.
13120+ if test "x$1" != "x$2"; then
13121+ lt_replace_pathsep_chars="s|$1|$2|g"
13122+ func_to_host_path_result=`echo "$3" |
13123+ $SED -e "$lt_replace_pathsep_chars"`
13124+ else
13125+ func_to_host_path_result="$3"
13126+ fi
13127+ fi
13128+}
13129+# end func_convert_path_check
13130+
13131+
13132+# func_convert_path_front_back_pathsep FRONTPAT BACKPAT REPL ORIG
13133+# Modifies func_to_host_path_result by prepending REPL if ORIG matches FRONTPAT
13134+# and appending REPL if ORIG matches BACKPAT.
13135+func_convert_path_front_back_pathsep ()
13136+{
13137+ $opt_debug
13138+ case $4 in
13139+ $1 ) func_to_host_path_result="$3$func_to_host_path_result"
13140+ ;;
13141+ esac
13142+ case $4 in
13143+ $2 ) func_append func_to_host_path_result "$3"
13144+ ;;
13145+ esac
13146+}
13147+# end func_convert_path_front_back_pathsep
13148+
13149+
13150+##################################################
13151+# $build to $host FILE NAME CONVERSION FUNCTIONS #
13152+##################################################
13153+# invoked via `$to_host_file_cmd ARG'
13154+#
13155+# In each case, ARG is the path to be converted from $build to $host format.
13156+# Result will be available in $func_to_host_file_result.
13157+
13158+
13159+# func_to_host_file ARG
13160+# Converts the file name ARG from $build format to $host format. Return result
13161+# in func_to_host_file_result.
13162+func_to_host_file ()
13163+{
13164+ $opt_debug
13165+ $to_host_file_cmd "$1"
13166+}
13167+# end func_to_host_file
13168+
13169+
13170+# func_to_tool_file ARG LAZY
13171+# converts the file name ARG from $build format to toolchain format. Return
13172+# result in func_to_tool_file_result. If the conversion in use is listed
13173+# in (the comma separated) LAZY, no conversion takes place.
13174+func_to_tool_file ()
13175+{
13176+ $opt_debug
13177+ case ,$2, in
13178+ *,"$to_tool_file_cmd",*)
13179+ func_to_tool_file_result=$1
13180+ ;;
13181+ *)
13182+ $to_tool_file_cmd "$1"
13183+ func_to_tool_file_result=$func_to_host_file_result
13184+ ;;
13185+ esac
13186+}
13187+# end func_to_tool_file
13188+
13189+
13190+# func_convert_file_noop ARG
13191+# Copy ARG to func_to_host_file_result.
13192+func_convert_file_noop ()
13193+{
13194+ func_to_host_file_result="$1"
13195+}
13196+# end func_convert_file_noop
13197+
13198+
13199+# func_convert_file_msys_to_w32 ARG
13200+# Convert file name ARG from (mingw) MSYS to (mingw) w32 format; automatic
13201+# conversion to w32 is not available inside the cwrapper. Returns result in
13202+# func_to_host_file_result.
13203+func_convert_file_msys_to_w32 ()
13204+{
13205+ $opt_debug
13206+ func_to_host_file_result="$1"
13207+ if test -n "$1"; then
13208+ func_convert_core_msys_to_w32 "$1"
13209+ func_to_host_file_result="$func_convert_core_msys_to_w32_result"
13210+ fi
13211+ func_convert_file_check "$1" "$func_to_host_file_result"
13212+}
13213+# end func_convert_file_msys_to_w32
13214+
13215+
13216+# func_convert_file_cygwin_to_w32 ARG
13217+# Convert file name ARG from Cygwin to w32 format. Returns result in
13218+# func_to_host_file_result.
13219+func_convert_file_cygwin_to_w32 ()
13220+{
13221+ $opt_debug
13222+ func_to_host_file_result="$1"
13223+ if test -n "$1"; then
13224+ # because $build is cygwin, we call "the" cygpath in $PATH; no need to use
13225+ # LT_CYGPATH in this case.
13226+ func_to_host_file_result=`cygpath -m "$1"`
13227+ fi
13228+ func_convert_file_check "$1" "$func_to_host_file_result"
13229+}
13230+# end func_convert_file_cygwin_to_w32
13231+
13232+
13233+# func_convert_file_nix_to_w32 ARG
13234+# Convert file name ARG from *nix to w32 format. Requires a wine environment
13235+# and a working winepath. Returns result in func_to_host_file_result.
13236+func_convert_file_nix_to_w32 ()
13237+{
13238+ $opt_debug
13239+ func_to_host_file_result="$1"
13240+ if test -n "$1"; then
13241+ func_convert_core_file_wine_to_w32 "$1"
13242+ func_to_host_file_result="$func_convert_core_file_wine_to_w32_result"
13243+ fi
13244+ func_convert_file_check "$1" "$func_to_host_file_result"
13245+}
13246+# end func_convert_file_nix_to_w32
13247+
13248+
13249+# func_convert_file_msys_to_cygwin ARG
13250+# Convert file name ARG from MSYS to Cygwin format. Requires LT_CYGPATH set.
13251+# Returns result in func_to_host_file_result.
13252+func_convert_file_msys_to_cygwin ()
13253+{
13254+ $opt_debug
13255+ func_to_host_file_result="$1"
13256+ if test -n "$1"; then
13257+ func_convert_core_msys_to_w32 "$1"
13258+ func_cygpath -u "$func_convert_core_msys_to_w32_result"
13259+ func_to_host_file_result="$func_cygpath_result"
13260+ fi
13261+ func_convert_file_check "$1" "$func_to_host_file_result"
13262+}
13263+# end func_convert_file_msys_to_cygwin
13264+
13265+
13266+# func_convert_file_nix_to_cygwin ARG
13267+# Convert file name ARG from *nix to Cygwin format. Requires Cygwin installed
13268+# in a wine environment, working winepath, and LT_CYGPATH set. Returns result
13269+# in func_to_host_file_result.
13270+func_convert_file_nix_to_cygwin ()
13271+{
13272+ $opt_debug
13273+ func_to_host_file_result="$1"
13274+ if test -n "$1"; then
13275+ # convert from *nix to w32, then use cygpath to convert from w32 to cygwin.
13276+ func_convert_core_file_wine_to_w32 "$1"
13277+ func_cygpath -u "$func_convert_core_file_wine_to_w32_result"
13278+ func_to_host_file_result="$func_cygpath_result"
13279+ fi
13280+ func_convert_file_check "$1" "$func_to_host_file_result"
13281+}
13282+# end func_convert_file_nix_to_cygwin
13283+
13284+
13285+#############################################
13286+# $build to $host PATH CONVERSION FUNCTIONS #
13287+#############################################
13288+# invoked via `$to_host_path_cmd ARG'
13289+#
13290+# In each case, ARG is the path to be converted from $build to $host format.
13291+# The result will be available in $func_to_host_path_result.
13292+#
13293+# Path separators are also converted from $build format to $host format. If
13294+# ARG begins or ends with a path separator character, it is preserved (but
13295+# converted to $host format) on output.
13296+#
13297+# All path conversion functions are named using the following convention:
13298+# file name conversion function : func_convert_file_X_to_Y ()
13299+# path conversion function : func_convert_path_X_to_Y ()
13300+# where, for any given $build/$host combination the 'X_to_Y' value is the
13301+# same. If conversion functions are added for new $build/$host combinations,
13302+# the two new functions must follow this pattern, or func_init_to_host_path_cmd
13303+# will break.
13304+
13305+
13306+# func_init_to_host_path_cmd
13307+# Ensures that function "pointer" variable $to_host_path_cmd is set to the
13308+# appropriate value, based on the value of $to_host_file_cmd.
13309+to_host_path_cmd=
13310+func_init_to_host_path_cmd ()
13311+{
13312+ $opt_debug
13313+ if test -z "$to_host_path_cmd"; then
13314+ func_stripname 'func_convert_file_' '' "$to_host_file_cmd"
13315+ to_host_path_cmd="func_convert_path_${func_stripname_result}"
13316+ fi
13317+}
13318+
13319+
13320+# func_to_host_path ARG
13321+# Converts the path ARG from $build format to $host format. Return result
13322+# in func_to_host_path_result.
13323+func_to_host_path ()
13324+{
13325+ $opt_debug
13326+ func_init_to_host_path_cmd
13327+ $to_host_path_cmd "$1"
13328+}
13329+# end func_to_host_path
13330+
13331+
13332+# func_convert_path_noop ARG
13333+# Copy ARG to func_to_host_path_result.
13334+func_convert_path_noop ()
13335+{
13336+ func_to_host_path_result="$1"
13337+}
13338+# end func_convert_path_noop
13339+
13340+
13341+# func_convert_path_msys_to_w32 ARG
13342+# Convert path ARG from (mingw) MSYS to (mingw) w32 format; automatic
13343+# conversion to w32 is not available inside the cwrapper. Returns result in
13344+# func_to_host_path_result.
13345+func_convert_path_msys_to_w32 ()
13346+{
13347+ $opt_debug
13348+ func_to_host_path_result="$1"
13349+ if test -n "$1"; then
13350+ # Remove leading and trailing path separator characters from ARG. MSYS
13351+ # behavior is inconsistent here; cygpath turns them into '.;' and ';.';
13352+ # and winepath ignores them completely.
13353+ func_stripname : : "$1"
13354+ func_to_host_path_tmp1=$func_stripname_result
13355+ func_convert_core_msys_to_w32 "$func_to_host_path_tmp1"
13356+ func_to_host_path_result="$func_convert_core_msys_to_w32_result"
13357+ func_convert_path_check : ";" \
13358+ "$func_to_host_path_tmp1" "$func_to_host_path_result"
13359+ func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
13360+ fi
13361+}
13362+# end func_convert_path_msys_to_w32
13363+
13364+
13365+# func_convert_path_cygwin_to_w32 ARG
13366+# Convert path ARG from Cygwin to w32 format. Returns result in
13367+# func_to_host_file_result.
13368+func_convert_path_cygwin_to_w32 ()
13369+{
13370+ $opt_debug
13371+ func_to_host_path_result="$1"
13372+ if test -n "$1"; then
13373+ # See func_convert_path_msys_to_w32:
13374+ func_stripname : : "$1"
13375+ func_to_host_path_tmp1=$func_stripname_result
13376+ func_to_host_path_result=`cygpath -m -p "$func_to_host_path_tmp1"`
13377+ func_convert_path_check : ";" \
13378+ "$func_to_host_path_tmp1" "$func_to_host_path_result"
13379+ func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
13380+ fi
13381+}
13382+# end func_convert_path_cygwin_to_w32
13383+
13384+
13385+# func_convert_path_nix_to_w32 ARG
13386+# Convert path ARG from *nix to w32 format. Requires a wine environment and
13387+# a working winepath. Returns result in func_to_host_file_result.
13388+func_convert_path_nix_to_w32 ()
13389+{
13390+ $opt_debug
13391+ func_to_host_path_result="$1"
13392+ if test -n "$1"; then
13393+ # See func_convert_path_msys_to_w32:
13394+ func_stripname : : "$1"
13395+ func_to_host_path_tmp1=$func_stripname_result
13396+ func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1"
13397+ func_to_host_path_result="$func_convert_core_path_wine_to_w32_result"
13398+ func_convert_path_check : ";" \
13399+ "$func_to_host_path_tmp1" "$func_to_host_path_result"
13400+ func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
13401+ fi
13402+}
13403+# end func_convert_path_nix_to_w32
13404+
13405+
13406+# func_convert_path_msys_to_cygwin ARG
13407+# Convert path ARG from MSYS to Cygwin format. Requires LT_CYGPATH set.
13408+# Returns result in func_to_host_file_result.
13409+func_convert_path_msys_to_cygwin ()
13410+{
13411+ $opt_debug
13412+ func_to_host_path_result="$1"
13413+ if test -n "$1"; then
13414+ # See func_convert_path_msys_to_w32:
13415+ func_stripname : : "$1"
13416+ func_to_host_path_tmp1=$func_stripname_result
13417+ func_convert_core_msys_to_w32 "$func_to_host_path_tmp1"
13418+ func_cygpath -u -p "$func_convert_core_msys_to_w32_result"
13419+ func_to_host_path_result="$func_cygpath_result"
13420+ func_convert_path_check : : \
13421+ "$func_to_host_path_tmp1" "$func_to_host_path_result"
13422+ func_convert_path_front_back_pathsep ":*" "*:" : "$1"
13423+ fi
13424+}
13425+# end func_convert_path_msys_to_cygwin
13426+
13427+
13428+# func_convert_path_nix_to_cygwin ARG
13429+# Convert path ARG from *nix to Cygwin format. Requires Cygwin installed in a
13430+# a wine environment, working winepath, and LT_CYGPATH set. Returns result in
13431+# func_to_host_file_result.
13432+func_convert_path_nix_to_cygwin ()
13433+{
13434+ $opt_debug
13435+ func_to_host_path_result="$1"
13436+ if test -n "$1"; then
13437+ # Remove leading and trailing path separator characters from
13438+ # ARG. msys behavior is inconsistent here, cygpath turns them
13439+ # into '.;' and ';.', and winepath ignores them completely.
13440+ func_stripname : : "$1"
13441+ func_to_host_path_tmp1=$func_stripname_result
13442+ func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1"
13443+ func_cygpath -u -p "$func_convert_core_path_wine_to_w32_result"
13444+ func_to_host_path_result="$func_cygpath_result"
13445+ func_convert_path_check : : \
13446+ "$func_to_host_path_tmp1" "$func_to_host_path_result"
13447+ func_convert_path_front_back_pathsep ":*" "*:" : "$1"
13448+ fi
13449+}
13450+# end func_convert_path_nix_to_cygwin
13451+
13452+
13453 # func_mode_compile arg...
13454 func_mode_compile ()
13455 {
13456@@ -1314,12 +1985,12 @@ func_mode_compile ()
13457 ;;
13458
13459 -pie | -fpie | -fPIE)
13460- pie_flag="$pie_flag $arg"
13461+ func_append pie_flag " $arg"
13462 continue
13463 ;;
13464
13465 -shared | -static | -prefer-pic | -prefer-non-pic)
13466- later="$later $arg"
13467+ func_append later " $arg"
13468 continue
13469 ;;
13470
13471@@ -1340,15 +2011,14 @@ func_mode_compile ()
13472 save_ifs="$IFS"; IFS=','
13473 for arg in $args; do
13474 IFS="$save_ifs"
13475- func_quote_for_eval "$arg"
13476- lastarg="$lastarg $func_quote_for_eval_result"
13477+ func_append_quoted lastarg "$arg"
13478 done
13479 IFS="$save_ifs"
13480 func_stripname ' ' '' "$lastarg"
13481 lastarg=$func_stripname_result
13482
13483 # Add the arguments to base_compile.
13484- base_compile="$base_compile $lastarg"
13485+ func_append base_compile " $lastarg"
13486 continue
13487 ;;
13488
13489@@ -1364,8 +2034,7 @@ func_mode_compile ()
13490 esac # case $arg_mode
13491
13492 # Aesthetically quote the previous argument.
13493- func_quote_for_eval "$lastarg"
13494- base_compile="$base_compile $func_quote_for_eval_result"
13495+ func_append_quoted base_compile "$lastarg"
13496 done # for arg
13497
13498 case $arg_mode in
13499@@ -1496,17 +2165,16 @@ compiler."
13500 $opt_dry_run || $RM $removelist
13501 exit $EXIT_FAILURE
13502 fi
13503- removelist="$removelist $output_obj"
13504+ func_append removelist " $output_obj"
13505 $ECHO "$srcfile" > "$lockfile"
13506 fi
13507
13508 $opt_dry_run || $RM $removelist
13509- removelist="$removelist $lockfile"
13510+ func_append removelist " $lockfile"
13511 trap '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' 1 2 15
13512
13513- if test -n "$fix_srcfile_path"; then
13514- eval "srcfile=\"$fix_srcfile_path\""
13515- fi
13516+ func_to_tool_file "$srcfile" func_convert_file_msys_to_w32
13517+ srcfile=$func_to_tool_file_result
13518 func_quote_for_eval "$srcfile"
13519 qsrcfile=$func_quote_for_eval_result
13520
13521@@ -1526,7 +2194,7 @@ compiler."
13522
13523 if test -z "$output_obj"; then
13524 # Place PIC objects in $objdir
13525- command="$command -o $lobj"
13526+ func_append command " -o $lobj"
13527 fi
13528
13529 func_show_eval_locale "$command" \
13530@@ -1573,11 +2241,11 @@ compiler."
13531 command="$base_compile $qsrcfile $pic_flag"
13532 fi
13533 if test "$compiler_c_o" = yes; then
13534- command="$command -o $obj"
13535+ func_append command " -o $obj"
13536 fi
13537
13538 # Suppress compiler output if we already did a PIC compilation.
13539- command="$command$suppress_output"
13540+ func_append command "$suppress_output"
13541 func_show_eval_locale "$command" \
13542 '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE'
13543
13544@@ -1622,13 +2290,13 @@ compiler."
13545 }
13546
13547 $opt_help || {
13548- test "$mode" = compile && func_mode_compile ${1+"$@"}
13549+ test "$opt_mode" = compile && func_mode_compile ${1+"$@"}
13550 }
13551
13552 func_mode_help ()
13553 {
13554 # We need to display help for each of the modes.
13555- case $mode in
13556+ case $opt_mode in
13557 "")
13558 # Generic help is extracted from the usage comments
13559 # at the start of this file.
13560@@ -1659,8 +2327,8 @@ This mode accepts the following addition
13561
13562 -o OUTPUT-FILE set the output file name to OUTPUT-FILE
13563 -no-suppress do not suppress compiler output for multiple passes
13564- -prefer-pic try to building PIC objects only
13565- -prefer-non-pic try to building non-PIC objects only
13566+ -prefer-pic try to build PIC objects only
13567+ -prefer-non-pic try to build non-PIC objects only
13568 -shared do not build a \`.o' file suitable for static linking
13569 -static only build a \`.o' file suitable for static linking
13570 -Wc,FLAG pass FLAG directly to the compiler
13571@@ -1804,7 +2472,7 @@ Otherwise, only FILE itself is deleted u
13572 ;;
13573
13574 *)
13575- func_fatal_help "invalid operation mode \`$mode'"
13576+ func_fatal_help "invalid operation mode \`$opt_mode'"
13577 ;;
13578 esac
13579
13580@@ -1819,13 +2487,13 @@ if $opt_help; then
13581 else
13582 {
13583 func_help noexit
13584- for mode in compile link execute install finish uninstall clean; do
13585+ for opt_mode in compile link execute install finish uninstall clean; do
13586 func_mode_help
13587 done
13588 } | sed -n '1p; 2,$s/^Usage:/ or: /p'
13589 {
13590 func_help noexit
13591- for mode in compile link execute install finish uninstall clean; do
13592+ for opt_mode in compile link execute install finish uninstall clean; do
13593 echo
13594 func_mode_help
13595 done
13596@@ -1854,13 +2522,16 @@ func_mode_execute ()
13597 func_fatal_help "you must specify a COMMAND"
13598
13599 # Handle -dlopen flags immediately.
13600- for file in $execute_dlfiles; do
13601+ for file in $opt_dlopen; do
13602 test -f "$file" \
13603 || func_fatal_help "\`$file' is not a file"
13604
13605 dir=
13606 case $file in
13607 *.la)
13608+ func_resolve_sysroot "$file"
13609+ file=$func_resolve_sysroot_result
13610+
13611 # Check to see that this really is a libtool archive.
13612 func_lalib_unsafe_p "$file" \
13613 || func_fatal_help "\`$lib' is not a valid libtool archive"
13614@@ -1882,7 +2553,7 @@ func_mode_execute ()
13615 dir="$func_dirname_result"
13616
13617 if test -f "$dir/$objdir/$dlname"; then
13618- dir="$dir/$objdir"
13619+ func_append dir "/$objdir"
13620 else
13621 if test ! -f "$dir/$dlname"; then
13622 func_fatal_error "cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'"
13623@@ -1907,10 +2578,10 @@ func_mode_execute ()
13624 test -n "$absdir" && dir="$absdir"
13625
13626 # Now add the directory to shlibpath_var.
13627- if eval test -z \"\$$shlibpath_var\"; then
13628- eval $shlibpath_var=\$dir
13629+ if eval "test -z \"\$$shlibpath_var\""; then
13630+ eval "$shlibpath_var=\"\$dir\""
13631 else
13632- eval $shlibpath_var=\$dir:\$$shlibpath_var
13633+ eval "$shlibpath_var=\"\$dir:\$$shlibpath_var\""
13634 fi
13635 done
13636
13637@@ -1939,8 +2610,7 @@ func_mode_execute ()
13638 ;;
13639 esac
13640 # Quote arguments (to preserve shell metacharacters).
13641- func_quote_for_eval "$file"
13642- args="$args $func_quote_for_eval_result"
13643+ func_append_quoted args "$file"
13644 done
13645
13646 if test "X$opt_dry_run" = Xfalse; then
13647@@ -1972,22 +2642,59 @@ func_mode_execute ()
13648 fi
13649 }
13650
13651-test "$mode" = execute && func_mode_execute ${1+"$@"}
13652+test "$opt_mode" = execute && func_mode_execute ${1+"$@"}
13653
13654
13655 # func_mode_finish arg...
13656 func_mode_finish ()
13657 {
13658 $opt_debug
13659- libdirs="$nonopt"
13660+ libs=
13661+ libdirs=
13662 admincmds=
13663
13664- if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
13665- for dir
13666- do
13667- libdirs="$libdirs $dir"
13668- done
13669+ for opt in "$nonopt" ${1+"$@"}
13670+ do
13671+ if test -d "$opt"; then
13672+ func_append libdirs " $opt"
13673+
13674+ elif test -f "$opt"; then
13675+ if func_lalib_unsafe_p "$opt"; then
13676+ func_append libs " $opt"
13677+ else
13678+ func_warning "\`$opt' is not a valid libtool archive"
13679+ fi
13680+
13681+ else
13682+ func_fatal_error "invalid argument \`$opt'"
13683+ fi
13684+ done
13685+
13686+ if test -n "$libs"; then
13687+ if test -n "$lt_sysroot"; then
13688+ sysroot_regex=`$ECHO "$lt_sysroot" | $SED "$sed_make_literal_regex"`
13689+ sysroot_cmd="s/\([ ']\)$sysroot_regex/\1/g;"
13690+ else
13691+ sysroot_cmd=
13692+ fi
13693
13694+ # Remove sysroot references
13695+ if $opt_dry_run; then
13696+ for lib in $libs; do
13697+ echo "removing references to $lt_sysroot and \`=' prefixes from $lib"
13698+ done
13699+ else
13700+ tmpdir=`func_mktempdir`
13701+ for lib in $libs; do
13702+ sed -e "${sysroot_cmd} s/\([ ']-[LR]\)=/\1/g; s/\([ ']\)=/\1/g" $lib \
13703+ > $tmpdir/tmp-la
13704+ mv -f $tmpdir/tmp-la $lib
13705+ done
13706+ ${RM}r "$tmpdir"
13707+ fi
13708+ fi
13709+
13710+ if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
13711 for libdir in $libdirs; do
13712 if test -n "$finish_cmds"; then
13713 # Do each command in the finish commands.
13714@@ -1997,7 +2704,7 @@ func_mode_finish ()
13715 if test -n "$finish_eval"; then
13716 # Do the single finish_eval.
13717 eval cmds=\"$finish_eval\"
13718- $opt_dry_run || eval "$cmds" || admincmds="$admincmds
13719+ $opt_dry_run || eval "$cmds" || func_append admincmds "
13720 $cmds"
13721 fi
13722 done
13723@@ -2006,53 +2713,55 @@ func_mode_finish ()
13724 # Exit here if they wanted silent mode.
13725 $opt_silent && exit $EXIT_SUCCESS
13726
13727- echo "----------------------------------------------------------------------"
13728- echo "Libraries have been installed in:"
13729- for libdir in $libdirs; do
13730- $ECHO " $libdir"
13731- done
13732- echo
13733- echo "If you ever happen to want to link against installed libraries"
13734- echo "in a given directory, LIBDIR, you must either use libtool, and"
13735- echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
13736- echo "flag during linking and do at least one of the following:"
13737- if test -n "$shlibpath_var"; then
13738- echo " - add LIBDIR to the \`$shlibpath_var' environment variable"
13739- echo " during execution"
13740- fi
13741- if test -n "$runpath_var"; then
13742- echo " - add LIBDIR to the \`$runpath_var' environment variable"
13743- echo " during linking"
13744- fi
13745- if test -n "$hardcode_libdir_flag_spec"; then
13746- libdir=LIBDIR
13747- eval "flag=\"$hardcode_libdir_flag_spec\""
13748+ if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
13749+ echo "----------------------------------------------------------------------"
13750+ echo "Libraries have been installed in:"
13751+ for libdir in $libdirs; do
13752+ $ECHO " $libdir"
13753+ done
13754+ echo
13755+ echo "If you ever happen to want to link against installed libraries"
13756+ echo "in a given directory, LIBDIR, you must either use libtool, and"
13757+ echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
13758+ echo "flag during linking and do at least one of the following:"
13759+ if test -n "$shlibpath_var"; then
13760+ echo " - add LIBDIR to the \`$shlibpath_var' environment variable"
13761+ echo " during execution"
13762+ fi
13763+ if test -n "$runpath_var"; then
13764+ echo " - add LIBDIR to the \`$runpath_var' environment variable"
13765+ echo " during linking"
13766+ fi
13767+ if test -n "$hardcode_libdir_flag_spec"; then
13768+ libdir=LIBDIR
13769+ eval flag=\"$hardcode_libdir_flag_spec\"
13770
13771- $ECHO " - use the \`$flag' linker flag"
13772- fi
13773- if test -n "$admincmds"; then
13774- $ECHO " - have your system administrator run these commands:$admincmds"
13775- fi
13776- if test -f /etc/ld.so.conf; then
13777- echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
13778- fi
13779- echo
13780+ $ECHO " - use the \`$flag' linker flag"
13781+ fi
13782+ if test -n "$admincmds"; then
13783+ $ECHO " - have your system administrator run these commands:$admincmds"
13784+ fi
13785+ if test -f /etc/ld.so.conf; then
13786+ echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
13787+ fi
13788+ echo
13789
13790- echo "See any operating system documentation about shared libraries for"
13791- case $host in
13792- solaris2.[6789]|solaris2.1[0-9])
13793- echo "more information, such as the ld(1), crle(1) and ld.so(8) manual"
13794- echo "pages."
13795- ;;
13796- *)
13797- echo "more information, such as the ld(1) and ld.so(8) manual pages."
13798- ;;
13799- esac
13800- echo "----------------------------------------------------------------------"
13801+ echo "See any operating system documentation about shared libraries for"
13802+ case $host in
13803+ solaris2.[6789]|solaris2.1[0-9])
13804+ echo "more information, such as the ld(1), crle(1) and ld.so(8) manual"
13805+ echo "pages."
13806+ ;;
13807+ *)
13808+ echo "more information, such as the ld(1) and ld.so(8) manual pages."
13809+ ;;
13810+ esac
13811+ echo "----------------------------------------------------------------------"
13812+ fi
13813 exit $EXIT_SUCCESS
13814 }
13815
13816-test "$mode" = finish && func_mode_finish ${1+"$@"}
13817+test "$opt_mode" = finish && func_mode_finish ${1+"$@"}
13818
13819
13820 # func_mode_install arg...
13821@@ -2077,7 +2786,7 @@ func_mode_install ()
13822 # The real first argument should be the name of the installation program.
13823 # Aesthetically quote it.
13824 func_quote_for_eval "$arg"
13825- install_prog="$install_prog$func_quote_for_eval_result"
13826+ func_append install_prog "$func_quote_for_eval_result"
13827 install_shared_prog=$install_prog
13828 case " $install_prog " in
13829 *[\\\ /]cp\ *) install_cp=: ;;
13830@@ -2097,7 +2806,7 @@ func_mode_install ()
13831 do
13832 arg2=
13833 if test -n "$dest"; then
13834- files="$files $dest"
13835+ func_append files " $dest"
13836 dest=$arg
13837 continue
13838 fi
13839@@ -2135,11 +2844,11 @@ func_mode_install ()
13840
13841 # Aesthetically quote the argument.
13842 func_quote_for_eval "$arg"
13843- install_prog="$install_prog $func_quote_for_eval_result"
13844+ func_append install_prog " $func_quote_for_eval_result"
13845 if test -n "$arg2"; then
13846 func_quote_for_eval "$arg2"
13847 fi
13848- install_shared_prog="$install_shared_prog $func_quote_for_eval_result"
13849+ func_append install_shared_prog " $func_quote_for_eval_result"
13850 done
13851
13852 test -z "$install_prog" && \
13853@@ -2151,7 +2860,7 @@ func_mode_install ()
13854 if test -n "$install_override_mode" && $no_mode; then
13855 if $install_cp; then :; else
13856 func_quote_for_eval "$install_override_mode"
13857- install_shared_prog="$install_shared_prog -m $func_quote_for_eval_result"
13858+ func_append install_shared_prog " -m $func_quote_for_eval_result"
13859 fi
13860 fi
13861
13862@@ -2209,10 +2918,13 @@ func_mode_install ()
13863 case $file in
13864 *.$libext)
13865 # Do the static libraries later.
13866- staticlibs="$staticlibs $file"
13867+ func_append staticlibs " $file"
13868 ;;
13869
13870 *.la)
13871+ func_resolve_sysroot "$file"
13872+ file=$func_resolve_sysroot_result
13873+
13874 # Check to see that this really is a libtool archive.
13875 func_lalib_unsafe_p "$file" \
13876 || func_fatal_help "\`$file' is not a valid libtool archive"
13877@@ -2226,23 +2938,30 @@ func_mode_install ()
13878 if test "X$destdir" = "X$libdir"; then
13879 case "$current_libdirs " in
13880 *" $libdir "*) ;;
13881- *) current_libdirs="$current_libdirs $libdir" ;;
13882+ *) func_append current_libdirs " $libdir" ;;
13883 esac
13884 else
13885 # Note the libdir as a future libdir.
13886 case "$future_libdirs " in
13887 *" $libdir "*) ;;
13888- *) future_libdirs="$future_libdirs $libdir" ;;
13889+ *) func_append future_libdirs " $libdir" ;;
13890 esac
13891 fi
13892
13893 func_dirname "$file" "/" ""
13894 dir="$func_dirname_result"
13895- dir="$dir$objdir"
13896+ func_append dir "$objdir"
13897
13898 if test -n "$relink_command"; then
13899+ # Strip any trailing slash from the destination.
13900+ func_stripname '' '/' "$libdir"
13901+ destlibdir=$func_stripname_result
13902+
13903+ func_stripname '' '/' "$destdir"
13904+ s_destdir=$func_stripname_result
13905+
13906 # Determine the prefix the user has applied to our future dir.
13907- inst_prefix_dir=`$ECHO "$destdir" | $SED -e "s%$libdir\$%%"`
13908+ inst_prefix_dir=`$ECHO "X$s_destdir" | $Xsed -e "s%$destlibdir\$%%"`
13909
13910 # Don't allow the user to place us outside of our expected
13911 # location b/c this prevents finding dependent libraries that
13912@@ -2315,7 +3034,7 @@ func_mode_install ()
13913 func_show_eval "$install_prog $instname $destdir/$name" 'exit $?'
13914
13915 # Maybe install the static library, too.
13916- test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
13917+ test -n "$old_library" && func_append staticlibs " $dir/$old_library"
13918 ;;
13919
13920 *.lo)
13921@@ -2503,7 +3222,7 @@ func_mode_install ()
13922 test -n "$future_libdirs" && \
13923 func_warning "remember to run \`$progname --finish$future_libdirs'"
13924
13925- if test -n "$current_libdirs" && $opt_finish; then
13926+ if test -n "$current_libdirs"; then
13927 # Maybe just do a dry run.
13928 $opt_dry_run && current_libdirs=" -n$current_libdirs"
13929 exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs'
13930@@ -2512,7 +3231,7 @@ func_mode_install ()
13931 fi
13932 }
13933
13934-test "$mode" = install && func_mode_install ${1+"$@"}
13935+test "$opt_mode" = install && func_mode_install ${1+"$@"}
13936
13937
13938 # func_generate_dlsyms outputname originator pic_p
13939@@ -2559,6 +3278,18 @@ extern \"C\" {
13940 #pragma GCC diagnostic ignored \"-Wstrict-prototypes\"
13941 #endif
13942
13943+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */
13944+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
13945+/* DATA imports from DLLs on WIN32 con't be const, because runtime
13946+ relocations are performed -- see ld's documentation on pseudo-relocs. */
13947+# define LT_DLSYM_CONST
13948+#elif defined(__osf__)
13949+/* This system does not cope well with relocations in const data. */
13950+# define LT_DLSYM_CONST
13951+#else
13952+# define LT_DLSYM_CONST const
13953+#endif
13954+
13955 /* External symbol declarations for the compiler. */\
13956 "
13957
13958@@ -2570,21 +3301,22 @@ extern \"C\" {
13959 # Add our own program objects to the symbol list.
13960 progfiles=`$ECHO "$objs$old_deplibs" | $SP2NL | $SED "$lo2o" | $NL2SP`
13961 for progfile in $progfiles; do
13962- func_verbose "extracting global C symbols from \`$progfile'"
13963- $opt_dry_run || eval "$NM $progfile | $global_symbol_pipe >> '$nlist'"
13964+ func_to_tool_file "$progfile" func_convert_file_msys_to_w32
13965+ func_verbose "extracting global C symbols from \`$func_to_tool_file_result'"
13966+ $opt_dry_run || eval "$NM $func_to_tool_file_result | $global_symbol_pipe >> '$nlist'"
13967 done
13968
13969 if test -n "$exclude_expsyms"; then
13970 $opt_dry_run || {
13971- $EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T
13972- $MV "$nlist"T "$nlist"
13973+ eval '$EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T'
13974+ eval '$MV "$nlist"T "$nlist"'
13975 }
13976 fi
13977
13978 if test -n "$export_symbols_regex"; then
13979 $opt_dry_run || {
13980- $EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T
13981- $MV "$nlist"T "$nlist"
13982+ eval '$EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T'
13983+ eval '$MV "$nlist"T "$nlist"'
13984 }
13985 fi
13986
13987@@ -2593,23 +3325,23 @@ extern \"C\" {
13988 export_symbols="$output_objdir/$outputname.exp"
13989 $opt_dry_run || {
13990 $RM $export_symbols
13991- ${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' < "$nlist" > "$export_symbols"
13992+ eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
13993 case $host in
13994 *cygwin* | *mingw* | *cegcc* )
13995- echo EXPORTS > "$output_objdir/$outputname.def"
13996- cat "$export_symbols" >> "$output_objdir/$outputname.def"
13997+ eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
13998+ eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"'
13999 ;;
14000 esac
14001 }
14002 else
14003 $opt_dry_run || {
14004- ${SED} -e 's/\([].[*^$]\)/\\\1/g' -e 's/^/ /' -e 's/$/$/' < "$export_symbols" > "$output_objdir/$outputname.exp"
14005- $GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T
14006- $MV "$nlist"T "$nlist"
14007+ eval "${SED} -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"'
14008+ eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T'
14009+ eval '$MV "$nlist"T "$nlist"'
14010 case $host in
14011 *cygwin* | *mingw* | *cegcc* )
14012- echo EXPORTS > "$output_objdir/$outputname.def"
14013- cat "$nlist" >> "$output_objdir/$outputname.def"
14014+ eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
14015+ eval 'cat "$nlist" >> "$output_objdir/$outputname.def"'
14016 ;;
14017 esac
14018 }
14019@@ -2620,10 +3352,52 @@ extern \"C\" {
14020 func_verbose "extracting global C symbols from \`$dlprefile'"
14021 func_basename "$dlprefile"
14022 name="$func_basename_result"
14023- $opt_dry_run || {
14024- $ECHO ": $name " >> "$nlist"
14025- eval "$NM $dlprefile 2>/dev/null | $global_symbol_pipe >> '$nlist'"
14026- }
14027+ case $host in
14028+ *cygwin* | *mingw* | *cegcc* )
14029+ # if an import library, we need to obtain dlname
14030+ if func_win32_import_lib_p "$dlprefile"; then
14031+ func_tr_sh "$dlprefile"
14032+ eval "curr_lafile=\$libfile_$func_tr_sh_result"
14033+ dlprefile_dlbasename=""
14034+ if test -n "$curr_lafile" && func_lalib_p "$curr_lafile"; then
14035+ # Use subshell, to avoid clobbering current variable values
14036+ dlprefile_dlname=`source "$curr_lafile" && echo "$dlname"`
14037+ if test -n "$dlprefile_dlname" ; then
14038+ func_basename "$dlprefile_dlname"
14039+ dlprefile_dlbasename="$func_basename_result"
14040+ else
14041+ # no lafile. user explicitly requested -dlpreopen <import library>.
14042+ $sharedlib_from_linklib_cmd "$dlprefile"
14043+ dlprefile_dlbasename=$sharedlib_from_linklib_result
14044+ fi
14045+ fi
14046+ $opt_dry_run || {
14047+ if test -n "$dlprefile_dlbasename" ; then
14048+ eval '$ECHO ": $dlprefile_dlbasename" >> "$nlist"'
14049+ else
14050+ func_warning "Could not compute DLL name from $name"
14051+ eval '$ECHO ": $name " >> "$nlist"'
14052+ fi
14053+ func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
14054+ eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe |
14055+ $SED -e '/I __imp/d' -e 's/I __nm_/D /;s/_nm__//' >> '$nlist'"
14056+ }
14057+ else # not an import lib
14058+ $opt_dry_run || {
14059+ eval '$ECHO ": $name " >> "$nlist"'
14060+ func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
14061+ eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'"
14062+ }
14063+ fi
14064+ ;;
14065+ *)
14066+ $opt_dry_run || {
14067+ eval '$ECHO ": $name " >> "$nlist"'
14068+ func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
14069+ eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'"
14070+ }
14071+ ;;
14072+ esac
14073 done
14074
14075 $opt_dry_run || {
14076@@ -2661,26 +3435,9 @@ typedef struct {
14077 const char *name;
14078 void *address;
14079 } lt_dlsymlist;
14080-"
14081- case $host in
14082- *cygwin* | *mingw* | *cegcc* )
14083- echo >> "$output_objdir/$my_dlsyms" "\
14084-/* DATA imports from DLLs on WIN32 con't be const, because
14085- runtime relocations are performed -- see ld's documentation
14086- on pseudo-relocs. */"
14087- lt_dlsym_const= ;;
14088- *osf5*)
14089- echo >> "$output_objdir/$my_dlsyms" "\
14090-/* This system does not cope well with relocations in const data */"
14091- lt_dlsym_const= ;;
14092- *)
14093- lt_dlsym_const=const ;;
14094- esac
14095-
14096- echo >> "$output_objdir/$my_dlsyms" "\
14097-extern $lt_dlsym_const lt_dlsymlist
14098+extern LT_DLSYM_CONST lt_dlsymlist
14099 lt_${my_prefix}_LTX_preloaded_symbols[];
14100-$lt_dlsym_const lt_dlsymlist
14101+LT_DLSYM_CONST lt_dlsymlist
14102 lt_${my_prefix}_LTX_preloaded_symbols[] =
14103 {\
14104 { \"$my_originator\", (void *) 0 },"
14105@@ -2736,7 +3493,7 @@ static const void *lt_preloaded_setup()
14106 for arg in $LTCFLAGS; do
14107 case $arg in
14108 -pie | -fpie | -fPIE) ;;
14109- *) symtab_cflags="$symtab_cflags $arg" ;;
14110+ *) func_append symtab_cflags " $arg" ;;
14111 esac
14112 done
14113
14114@@ -2796,9 +3553,11 @@ func_win32_libid ()
14115 win32_libid_type="x86 archive import"
14116 ;;
14117 *ar\ archive*) # could be an import, or static
14118- if $OBJDUMP -f "$1" | $SED -e '10q' 2>/dev/null |
14119- $EGREP 'file format (pe-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then
14120- win32_nmres=`$NM -f posix -A "$1" |
14121+ # Keep the egrep pattern in sync with the one in _LT_CHECK_MAGIC_METHOD.
14122+ if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null |
14123+ $EGREP 'file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then
14124+ func_to_tool_file "$1" func_convert_file_msys_to_w32
14125+ win32_nmres=`eval $NM -f posix -A \"$func_to_tool_file_result\" |
14126 $SED -n -e '
14127 1,100{
14128 / I /{
14129@@ -2827,6 +3586,131 @@ func_win32_libid ()
14130 $ECHO "$win32_libid_type"
14131 }
14132
14133+# func_cygming_dll_for_implib ARG
14134+#
14135+# Platform-specific function to extract the
14136+# name of the DLL associated with the specified
14137+# import library ARG.
14138+# Invoked by eval'ing the libtool variable
14139+# $sharedlib_from_linklib_cmd
14140+# Result is available in the variable
14141+# $sharedlib_from_linklib_result
14142+func_cygming_dll_for_implib ()
14143+{
14144+ $opt_debug
14145+ sharedlib_from_linklib_result=`$DLLTOOL --identify-strict --identify "$1"`
14146+}
14147+
14148+# func_cygming_dll_for_implib_fallback_core SECTION_NAME LIBNAMEs
14149+#
14150+# The is the core of a fallback implementation of a
14151+# platform-specific function to extract the name of the
14152+# DLL associated with the specified import library LIBNAME.
14153+#
14154+# SECTION_NAME is either .idata$6 or .idata$7, depending
14155+# on the platform and compiler that created the implib.
14156+#
14157+# Echos the name of the DLL associated with the
14158+# specified import library.
14159+func_cygming_dll_for_implib_fallback_core ()
14160+{
14161+ $opt_debug
14162+ match_literal=`$ECHO "$1" | $SED "$sed_make_literal_regex"`
14163+ $OBJDUMP -s --section "$1" "$2" 2>/dev/null |
14164+ $SED '/^Contents of section '"$match_literal"':/{
14165+ # Place marker at beginning of archive member dllname section
14166+ s/.*/====MARK====/
14167+ p
14168+ d
14169+ }
14170+ # These lines can sometimes be longer than 43 characters, but
14171+ # are always uninteresting
14172+ /:[ ]*file format pe[i]\{,1\}-/d
14173+ /^In archive [^:]*:/d
14174+ # Ensure marker is printed
14175+ /^====MARK====/p
14176+ # Remove all lines with less than 43 characters
14177+ /^.\{43\}/!d
14178+ # From remaining lines, remove first 43 characters
14179+ s/^.\{43\}//' |
14180+ $SED -n '
14181+ # Join marker and all lines until next marker into a single line
14182+ /^====MARK====/ b para
14183+ H
14184+ $ b para
14185+ b
14186+ :para
14187+ x
14188+ s/\n//g
14189+ # Remove the marker
14190+ s/^====MARK====//
14191+ # Remove trailing dots and whitespace
14192+ s/[\. \t]*$//
14193+ # Print
14194+ /./p' |
14195+ # we now have a list, one entry per line, of the stringified
14196+ # contents of the appropriate section of all members of the
14197+ # archive which possess that section. Heuristic: eliminate
14198+ # all those which have a first or second character that is
14199+ # a '.' (that is, objdump's representation of an unprintable
14200+ # character.) This should work for all archives with less than
14201+ # 0x302f exports -- but will fail for DLLs whose name actually
14202+ # begins with a literal '.' or a single character followed by
14203+ # a '.'.
14204+ #
14205+ # Of those that remain, print the first one.
14206+ $SED -e '/^\./d;/^.\./d;q'
14207+}
14208+
14209+# func_cygming_gnu_implib_p ARG
14210+# This predicate returns with zero status (TRUE) if
14211+# ARG is a GNU/binutils-style import library. Returns
14212+# with nonzero status (FALSE) otherwise.
14213+func_cygming_gnu_implib_p ()
14214+{
14215+ $opt_debug
14216+ func_to_tool_file "$1" func_convert_file_msys_to_w32
14217+ 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)$'`
14218+ test -n "$func_cygming_gnu_implib_tmp"
14219+}
14220+
14221+# func_cygming_ms_implib_p ARG
14222+# This predicate returns with zero status (TRUE) if
14223+# ARG is an MS-style import library. Returns
14224+# with nonzero status (FALSE) otherwise.
14225+func_cygming_ms_implib_p ()
14226+{
14227+ $opt_debug
14228+ func_to_tool_file "$1" func_convert_file_msys_to_w32
14229+ func_cygming_ms_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $GREP '_NULL_IMPORT_DESCRIPTOR'`
14230+ test -n "$func_cygming_ms_implib_tmp"
14231+}
14232+
14233+# func_cygming_dll_for_implib_fallback ARG
14234+# Platform-specific function to extract the
14235+# name of the DLL associated with the specified
14236+# import library ARG.
14237+#
14238+# This fallback implementation is for use when $DLLTOOL
14239+# does not support the --identify-strict option.
14240+# Invoked by eval'ing the libtool variable
14241+# $sharedlib_from_linklib_cmd
14242+# Result is available in the variable
14243+# $sharedlib_from_linklib_result
14244+func_cygming_dll_for_implib_fallback ()
14245+{
14246+ $opt_debug
14247+ if func_cygming_gnu_implib_p "$1" ; then
14248+ # binutils import library
14249+ sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$7' "$1"`
14250+ elif func_cygming_ms_implib_p "$1" ; then
14251+ # ms-generated import library
14252+ sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$6' "$1"`
14253+ else
14254+ # unknown
14255+ sharedlib_from_linklib_result=""
14256+ fi
14257+}
14258
14259
14260 # func_extract_an_archive dir oldlib
14261@@ -2917,7 +3801,7 @@ func_extract_archives ()
14262 darwin_file=
14263 darwin_files=
14264 for darwin_file in $darwin_filelist; do
14265- darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP`
14266+ darwin_files=`find unfat-$$ -name $darwin_file -print | sort | $NL2SP`
14267 $LIPO -create -output "$darwin_file" $darwin_files
14268 done # $darwin_filelist
14269 $RM -rf unfat-$$
14270@@ -2932,7 +3816,7 @@ func_extract_archives ()
14271 func_extract_an_archive "$my_xdir" "$my_xabs"
14272 ;;
14273 esac
14274- my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
14275+ my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | sort | $NL2SP`
14276 done
14277
14278 func_extract_archives_result="$my_oldobjs"
14279@@ -3014,7 +3898,110 @@ func_fallback_echo ()
14280 _LTECHO_EOF'
14281 }
14282 ECHO=\"$qECHO\"
14283- fi\
14284+ fi
14285+
14286+# Very basic option parsing. These options are (a) specific to
14287+# the libtool wrapper, (b) are identical between the wrapper
14288+# /script/ and the wrapper /executable/ which is used only on
14289+# windows platforms, and (c) all begin with the string "--lt-"
14290+# (application programs are unlikely to have options which match
14291+# this pattern).
14292+#
14293+# There are only two supported options: --lt-debug and
14294+# --lt-dump-script. There is, deliberately, no --lt-help.
14295+#
14296+# The first argument to this parsing function should be the
14297+# script's $0 value, followed by "$@".
14298+lt_option_debug=
14299+func_parse_lt_options ()
14300+{
14301+ lt_script_arg0=\$0
14302+ shift
14303+ for lt_opt
14304+ do
14305+ case \"\$lt_opt\" in
14306+ --lt-debug) lt_option_debug=1 ;;
14307+ --lt-dump-script)
14308+ lt_dump_D=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%/[^/]*$%%'\`
14309+ test \"X\$lt_dump_D\" = \"X\$lt_script_arg0\" && lt_dump_D=.
14310+ lt_dump_F=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%^.*/%%'\`
14311+ cat \"\$lt_dump_D/\$lt_dump_F\"
14312+ exit 0
14313+ ;;
14314+ --lt-*)
14315+ \$ECHO \"Unrecognized --lt- option: '\$lt_opt'\" 1>&2
14316+ exit 1
14317+ ;;
14318+ esac
14319+ done
14320+
14321+ # Print the debug banner immediately:
14322+ if test -n \"\$lt_option_debug\"; then
14323+ echo \"${outputname}:${output}:\${LINENO}: libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\" 1>&2
14324+ fi
14325+}
14326+
14327+# Used when --lt-debug. Prints its arguments to stdout
14328+# (redirection is the responsibility of the caller)
14329+func_lt_dump_args ()
14330+{
14331+ lt_dump_args_N=1;
14332+ for lt_arg
14333+ do
14334+ \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[\$lt_dump_args_N]: \$lt_arg\"
14335+ lt_dump_args_N=\`expr \$lt_dump_args_N + 1\`
14336+ done
14337+}
14338+
14339+# Core function for launching the target application
14340+func_exec_program_core ()
14341+{
14342+"
14343+ case $host in
14344+ # Backslashes separate directories on plain windows
14345+ *-*-mingw | *-*-os2* | *-cegcc*)
14346+ $ECHO "\
14347+ if test -n \"\$lt_option_debug\"; then
14348+ \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir\\\\\$program\" 1>&2
14349+ func_lt_dump_args \${1+\"\$@\"} 1>&2
14350+ fi
14351+ exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
14352+"
14353+ ;;
14354+
14355+ *)
14356+ $ECHO "\
14357+ if test -n \"\$lt_option_debug\"; then
14358+ \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir/\$program\" 1>&2
14359+ func_lt_dump_args \${1+\"\$@\"} 1>&2
14360+ fi
14361+ exec \"\$progdir/\$program\" \${1+\"\$@\"}
14362+"
14363+ ;;
14364+ esac
14365+ $ECHO "\
14366+ \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2
14367+ exit 1
14368+}
14369+
14370+# A function to encapsulate launching the target application
14371+# Strips options in the --lt-* namespace from \$@ and
14372+# launches target application with the remaining arguments.
14373+func_exec_program ()
14374+{
14375+ for lt_wr_arg
14376+ do
14377+ case \$lt_wr_arg in
14378+ --lt-*) ;;
14379+ *) set x \"\$@\" \"\$lt_wr_arg\"; shift;;
14380+ esac
14381+ shift
14382+ done
14383+ func_exec_program_core \${1+\"\$@\"}
14384+}
14385+
14386+ # Parse options
14387+ func_parse_lt_options \"\$0\" \${1+\"\$@\"}
14388
14389 # Find the directory that this script lives in.
14390 thisdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*$%%'\`
14391@@ -3078,7 +4065,7 @@ _LTECHO_EOF'
14392
14393 # relink executable if necessary
14394 if test -n \"\$relink_command\"; then
14395- if relink_command_output=\`eval \"\$relink_command\" 2>&1\`; then :
14396+ if relink_command_output=\`eval \$relink_command 2>&1\`; then :
14397 else
14398 $ECHO \"\$relink_command_output\" >&2
14399 $RM \"\$progdir/\$file\"
14400@@ -3102,6 +4089,18 @@ _LTECHO_EOF'
14401
14402 if test -f \"\$progdir/\$program\"; then"
14403
14404+ # fixup the dll searchpath if we need to.
14405+ #
14406+ # Fix the DLL searchpath if we need to. Do this before prepending
14407+ # to shlibpath, because on Windows, both are PATH and uninstalled
14408+ # libraries must come first.
14409+ if test -n "$dllsearchpath"; then
14410+ $ECHO "\
14411+ # Add the dll search path components to the executable PATH
14412+ PATH=$dllsearchpath:\$PATH
14413+"
14414+ fi
14415+
14416 # Export our shlibpath_var if we have one.
14417 if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
14418 $ECHO "\
14419@@ -3116,35 +4115,10 @@ _LTECHO_EOF'
14420 "
14421 fi
14422
14423- # fixup the dll searchpath if we need to.
14424- if test -n "$dllsearchpath"; then
14425- $ECHO "\
14426- # Add the dll search path components to the executable PATH
14427- PATH=$dllsearchpath:\$PATH
14428-"
14429- fi
14430-
14431 $ECHO "\
14432 if test \"\$libtool_execute_magic\" != \"$magic\"; then
14433 # Run the actual program with our arguments.
14434-"
14435- case $host in
14436- # Backslashes separate directories on plain windows
14437- *-*-mingw | *-*-os2* | *-cegcc*)
14438- $ECHO "\
14439- exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
14440-"
14441- ;;
14442-
14443- *)
14444- $ECHO "\
14445- exec \"\$progdir/\$program\" \${1+\"\$@\"}
14446-"
14447- ;;
14448- esac
14449- $ECHO "\
14450- \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2
14451- exit 1
14452+ func_exec_program \${1+\"\$@\"}
14453 fi
14454 else
14455 # The program doesn't exist.
14456@@ -3158,166 +4132,6 @@ fi\
14457 }
14458
14459
14460-# func_to_host_path arg
14461-#
14462-# Convert paths to host format when used with build tools.
14463-# Intended for use with "native" mingw (where libtool itself
14464-# is running under the msys shell), or in the following cross-
14465-# build environments:
14466-# $build $host
14467-# mingw (msys) mingw [e.g. native]
14468-# cygwin mingw
14469-# *nix + wine mingw
14470-# where wine is equipped with the `winepath' executable.
14471-# In the native mingw case, the (msys) shell automatically
14472-# converts paths for any non-msys applications it launches,
14473-# but that facility isn't available from inside the cwrapper.
14474-# Similar accommodations are necessary for $host mingw and
14475-# $build cygwin. Calling this function does no harm for other
14476-# $host/$build combinations not listed above.
14477-#
14478-# ARG is the path (on $build) that should be converted to
14479-# the proper representation for $host. The result is stored
14480-# in $func_to_host_path_result.
14481-func_to_host_path ()
14482-{
14483- func_to_host_path_result="$1"
14484- if test -n "$1"; then
14485- case $host in
14486- *mingw* )
14487- lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
14488- case $build in
14489- *mingw* ) # actually, msys
14490- # awkward: cmd appends spaces to result
14491- func_to_host_path_result=`( cmd //c echo "$1" ) 2>/dev/null |
14492- $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"`
14493- ;;
14494- *cygwin* )
14495- func_to_host_path_result=`cygpath -w "$1" |
14496- $SED -e "$lt_sed_naive_backslashify"`
14497- ;;
14498- * )
14499- # Unfortunately, winepath does not exit with a non-zero
14500- # error code, so we are forced to check the contents of
14501- # stdout. On the other hand, if the command is not
14502- # found, the shell will set an exit code of 127 and print
14503- # *an error message* to stdout. So we must check for both
14504- # error code of zero AND non-empty stdout, which explains
14505- # the odd construction:
14506- func_to_host_path_tmp1=`winepath -w "$1" 2>/dev/null`
14507- if test "$?" -eq 0 && test -n "${func_to_host_path_tmp1}"; then
14508- func_to_host_path_result=`$ECHO "$func_to_host_path_tmp1" |
14509- $SED -e "$lt_sed_naive_backslashify"`
14510- else
14511- # Allow warning below.
14512- func_to_host_path_result=
14513- fi
14514- ;;
14515- esac
14516- if test -z "$func_to_host_path_result" ; then
14517- func_error "Could not determine host path corresponding to"
14518- func_error " \`$1'"
14519- func_error "Continuing, but uninstalled executables may not work."
14520- # Fallback:
14521- func_to_host_path_result="$1"
14522- fi
14523- ;;
14524- esac
14525- fi
14526-}
14527-# end: func_to_host_path
14528-
14529-# func_to_host_pathlist arg
14530-#
14531-# Convert pathlists to host format when used with build tools.
14532-# See func_to_host_path(), above. This function supports the
14533-# following $build/$host combinations (but does no harm for
14534-# combinations not listed here):
14535-# $build $host
14536-# mingw (msys) mingw [e.g. native]
14537-# cygwin mingw
14538-# *nix + wine mingw
14539-#
14540-# Path separators are also converted from $build format to
14541-# $host format. If ARG begins or ends with a path separator
14542-# character, it is preserved (but converted to $host format)
14543-# on output.
14544-#
14545-# ARG is a pathlist (on $build) that should be converted to
14546-# the proper representation on $host. The result is stored
14547-# in $func_to_host_pathlist_result.
14548-func_to_host_pathlist ()
14549-{
14550- func_to_host_pathlist_result="$1"
14551- if test -n "$1"; then
14552- case $host in
14553- *mingw* )
14554- lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
14555- # Remove leading and trailing path separator characters from
14556- # ARG. msys behavior is inconsistent here, cygpath turns them
14557- # into '.;' and ';.', and winepath ignores them completely.
14558- func_stripname : : "$1"
14559- func_to_host_pathlist_tmp1=$func_stripname_result
14560- case $build in
14561- *mingw* ) # Actually, msys.
14562- # Awkward: cmd appends spaces to result.
14563- func_to_host_pathlist_result=`
14564- ( cmd //c echo "$func_to_host_pathlist_tmp1" ) 2>/dev/null |
14565- $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"`
14566- ;;
14567- *cygwin* )
14568- func_to_host_pathlist_result=`cygpath -w -p "$func_to_host_pathlist_tmp1" |
14569- $SED -e "$lt_sed_naive_backslashify"`
14570- ;;
14571- * )
14572- # unfortunately, winepath doesn't convert pathlists
14573- func_to_host_pathlist_result=""
14574- func_to_host_pathlist_oldIFS=$IFS
14575- IFS=:
14576- for func_to_host_pathlist_f in $func_to_host_pathlist_tmp1 ; do
14577- IFS=$func_to_host_pathlist_oldIFS
14578- if test -n "$func_to_host_pathlist_f" ; then
14579- func_to_host_path "$func_to_host_pathlist_f"
14580- if test -n "$func_to_host_path_result" ; then
14581- if test -z "$func_to_host_pathlist_result" ; then
14582- func_to_host_pathlist_result="$func_to_host_path_result"
14583- else
14584- func_append func_to_host_pathlist_result ";$func_to_host_path_result"
14585- fi
14586- fi
14587- fi
14588- done
14589- IFS=$func_to_host_pathlist_oldIFS
14590- ;;
14591- esac
14592- if test -z "$func_to_host_pathlist_result"; then
14593- func_error "Could not determine the host path(s) corresponding to"
14594- func_error " \`$1'"
14595- func_error "Continuing, but uninstalled executables may not work."
14596- # Fallback. This may break if $1 contains DOS-style drive
14597- # specifications. The fix is not to complicate the expression
14598- # below, but for the user to provide a working wine installation
14599- # with winepath so that path translation in the cross-to-mingw
14600- # case works properly.
14601- lt_replace_pathsep_nix_to_dos="s|:|;|g"
14602- func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp1" |\
14603- $SED -e "$lt_replace_pathsep_nix_to_dos"`
14604- fi
14605- # Now, add the leading and trailing path separators back
14606- case "$1" in
14607- :* ) func_to_host_pathlist_result=";$func_to_host_pathlist_result"
14608- ;;
14609- esac
14610- case "$1" in
14611- *: ) func_append func_to_host_pathlist_result ";"
14612- ;;
14613- esac
14614- ;;
14615- esac
14616- fi
14617-}
14618-# end: func_to_host_pathlist
14619-
14620 # func_emit_cwrapperexe_src
14621 # emit the source code for a wrapper executable on stdout
14622 # Must ONLY be called from within func_mode_link because
14623@@ -3334,10 +4148,6 @@ func_emit_cwrapperexe_src ()
14624
14625 This wrapper executable should never be moved out of the build directory.
14626 If it is, it will not operate correctly.
14627-
14628- Currently, it simply execs the wrapper *script* "$SHELL $output",
14629- but could eventually absorb all of the scripts functionality and
14630- exec $objdir/$outputname directly.
14631 */
14632 EOF
14633 cat <<"EOF"
14634@@ -3462,22 +4272,13 @@ int setenv (const char *, const char *,
14635 if (stale) { free ((void *) stale); stale = 0; } \
14636 } while (0)
14637
14638-#undef LTWRAPPER_DEBUGPRINTF
14639-#if defined LT_DEBUGWRAPPER
14640-# define LTWRAPPER_DEBUGPRINTF(args) ltwrapper_debugprintf args
14641-static void
14642-ltwrapper_debugprintf (const char *fmt, ...)
14643-{
14644- va_list args;
14645- va_start (args, fmt);
14646- (void) vfprintf (stderr, fmt, args);
14647- va_end (args);
14648-}
14649+#if defined(LT_DEBUGWRAPPER)
14650+static int lt_debug = 1;
14651 #else
14652-# define LTWRAPPER_DEBUGPRINTF(args)
14653+static int lt_debug = 0;
14654 #endif
14655
14656-const char *program_name = NULL;
14657+const char *program_name = "libtool-wrapper"; /* in case xstrdup fails */
14658
14659 void *xmalloc (size_t num);
14660 char *xstrdup (const char *string);
14661@@ -3487,7 +4288,10 @@ char *chase_symlinks (const char *pathsp
14662 int make_executable (const char *path);
14663 int check_executable (const char *path);
14664 char *strendzap (char *str, const char *pat);
14665-void lt_fatal (const char *message, ...);
14666+void lt_debugprintf (const char *file, int line, const char *fmt, ...);
14667+void lt_fatal (const char *file, int line, const char *message, ...);
14668+static const char *nonnull (const char *s);
14669+static const char *nonempty (const char *s);
14670 void lt_setenv (const char *name, const char *value);
14671 char *lt_extend_str (const char *orig_value, const char *add, int to_end);
14672 void lt_update_exe_path (const char *name, const char *value);
14673@@ -3497,14 +4301,14 @@ void lt_dump_script (FILE *f);
14674 EOF
14675
14676 cat <<EOF
14677-const char * MAGIC_EXE = "$magic_exe";
14678+volatile const char * MAGIC_EXE = "$magic_exe";
14679 const char * LIB_PATH_VARNAME = "$shlibpath_var";
14680 EOF
14681
14682 if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
14683- func_to_host_pathlist "$temp_rpath"
14684+ func_to_host_path "$temp_rpath"
14685 cat <<EOF
14686-const char * LIB_PATH_VALUE = "$func_to_host_pathlist_result";
14687+const char * LIB_PATH_VALUE = "$func_to_host_path_result";
14688 EOF
14689 else
14690 cat <<"EOF"
14691@@ -3513,10 +4317,10 @@ EOF
14692 fi
14693
14694 if test -n "$dllsearchpath"; then
14695- func_to_host_pathlist "$dllsearchpath:"
14696+ func_to_host_path "$dllsearchpath:"
14697 cat <<EOF
14698 const char * EXE_PATH_VARNAME = "PATH";
14699-const char * EXE_PATH_VALUE = "$func_to_host_pathlist_result";
14700+const char * EXE_PATH_VALUE = "$func_to_host_path_result";
14701 EOF
14702 else
14703 cat <<"EOF"
14704@@ -3539,12 +4343,10 @@ EOF
14705 cat <<"EOF"
14706
14707 #define LTWRAPPER_OPTION_PREFIX "--lt-"
14708-#define LTWRAPPER_OPTION_PREFIX_LENGTH 5
14709
14710-static const size_t opt_prefix_len = LTWRAPPER_OPTION_PREFIX_LENGTH;
14711 static const char *ltwrapper_option_prefix = LTWRAPPER_OPTION_PREFIX;
14712-
14713 static const char *dumpscript_opt = LTWRAPPER_OPTION_PREFIX "dump-script";
14714+static const char *debug_opt = LTWRAPPER_OPTION_PREFIX "debug";
14715
14716 int
14717 main (int argc, char *argv[])
14718@@ -3561,10 +4363,13 @@ main (int argc, char *argv[])
14719 int i;
14720
14721 program_name = (char *) xstrdup (base_name (argv[0]));
14722- LTWRAPPER_DEBUGPRINTF (("(main) argv[0] : %s\n", argv[0]));
14723- LTWRAPPER_DEBUGPRINTF (("(main) program_name : %s\n", program_name));
14724+ newargz = XMALLOC (char *, argc + 1);
14725
14726- /* very simple arg parsing; don't want to rely on getopt */
14727+ /* very simple arg parsing; don't want to rely on getopt
14728+ * also, copy all non cwrapper options to newargz, except
14729+ * argz[0], which is handled differently
14730+ */
14731+ newargc=0;
14732 for (i = 1; i < argc; i++)
14733 {
14734 if (strcmp (argv[i], dumpscript_opt) == 0)
14735@@ -3581,21 +4386,54 @@ EOF
14736 lt_dump_script (stdout);
14737 return 0;
14738 }
14739+ if (strcmp (argv[i], debug_opt) == 0)
14740+ {
14741+ lt_debug = 1;
14742+ continue;
14743+ }
14744+ if (strcmp (argv[i], ltwrapper_option_prefix) == 0)
14745+ {
14746+ /* however, if there is an option in the LTWRAPPER_OPTION_PREFIX
14747+ namespace, but it is not one of the ones we know about and
14748+ have already dealt with, above (inluding dump-script), then
14749+ report an error. Otherwise, targets might begin to believe
14750+ they are allowed to use options in the LTWRAPPER_OPTION_PREFIX
14751+ namespace. The first time any user complains about this, we'll
14752+ need to make LTWRAPPER_OPTION_PREFIX a configure-time option
14753+ or a configure.ac-settable value.
14754+ */
14755+ lt_fatal (__FILE__, __LINE__,
14756+ "unrecognized %s option: '%s'",
14757+ ltwrapper_option_prefix, argv[i]);
14758+ }
14759+ /* otherwise ... */
14760+ newargz[++newargc] = xstrdup (argv[i]);
14761 }
14762+ newargz[++newargc] = NULL;
14763+
14764+EOF
14765+ cat <<EOF
14766+ /* The GNU banner must be the first non-error debug message */
14767+ lt_debugprintf (__FILE__, __LINE__, "libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\n");
14768+EOF
14769+ cat <<"EOF"
14770+ lt_debugprintf (__FILE__, __LINE__, "(main) argv[0]: %s\n", argv[0]);
14771+ lt_debugprintf (__FILE__, __LINE__, "(main) program_name: %s\n", program_name);
14772
14773- newargz = XMALLOC (char *, argc + 1);
14774 tmp_pathspec = find_executable (argv[0]);
14775 if (tmp_pathspec == NULL)
14776- lt_fatal ("Couldn't find %s", argv[0]);
14777- LTWRAPPER_DEBUGPRINTF (("(main) found exe (before symlink chase) at : %s\n",
14778- tmp_pathspec));
14779+ lt_fatal (__FILE__, __LINE__, "couldn't find %s", argv[0]);
14780+ lt_debugprintf (__FILE__, __LINE__,
14781+ "(main) found exe (before symlink chase) at: %s\n",
14782+ tmp_pathspec);
14783
14784 actual_cwrapper_path = chase_symlinks (tmp_pathspec);
14785- LTWRAPPER_DEBUGPRINTF (("(main) found exe (after symlink chase) at : %s\n",
14786- actual_cwrapper_path));
14787+ lt_debugprintf (__FILE__, __LINE__,
14788+ "(main) found exe (after symlink chase) at: %s\n",
14789+ actual_cwrapper_path);
14790 XFREE (tmp_pathspec);
14791
14792- actual_cwrapper_name = xstrdup( base_name (actual_cwrapper_path));
14793+ actual_cwrapper_name = xstrdup (base_name (actual_cwrapper_path));
14794 strendzap (actual_cwrapper_path, actual_cwrapper_name);
14795
14796 /* wrapper name transforms */
14797@@ -3613,8 +4451,9 @@ EOF
14798 target_name = tmp_pathspec;
14799 tmp_pathspec = 0;
14800
14801- LTWRAPPER_DEBUGPRINTF (("(main) libtool target name: %s\n",
14802- target_name));
14803+ lt_debugprintf (__FILE__, __LINE__,
14804+ "(main) libtool target name: %s\n",
14805+ target_name);
14806 EOF
14807
14808 cat <<EOF
14809@@ -3664,35 +4503,19 @@ EOF
14810
14811 lt_setenv ("BIN_SH", "xpg4"); /* for Tru64 */
14812 lt_setenv ("DUALCASE", "1"); /* for MSK sh */
14813- lt_update_lib_path (LIB_PATH_VARNAME, LIB_PATH_VALUE);
14814+ /* Update the DLL searchpath. EXE_PATH_VALUE ($dllsearchpath) must
14815+ be prepended before (that is, appear after) LIB_PATH_VALUE ($temp_rpath)
14816+ because on Windows, both *_VARNAMEs are PATH but uninstalled
14817+ libraries must come first. */
14818 lt_update_exe_path (EXE_PATH_VARNAME, EXE_PATH_VALUE);
14819+ lt_update_lib_path (LIB_PATH_VARNAME, LIB_PATH_VALUE);
14820
14821- newargc=0;
14822- for (i = 1; i < argc; i++)
14823- {
14824- if (strncmp (argv[i], ltwrapper_option_prefix, opt_prefix_len) == 0)
14825- {
14826- /* however, if there is an option in the LTWRAPPER_OPTION_PREFIX
14827- namespace, but it is not one of the ones we know about and
14828- have already dealt with, above (inluding dump-script), then
14829- report an error. Otherwise, targets might begin to believe
14830- they are allowed to use options in the LTWRAPPER_OPTION_PREFIX
14831- namespace. The first time any user complains about this, we'll
14832- need to make LTWRAPPER_OPTION_PREFIX a configure-time option
14833- or a configure.ac-settable value.
14834- */
14835- lt_fatal ("Unrecognized option in %s namespace: '%s'",
14836- ltwrapper_option_prefix, argv[i]);
14837- }
14838- /* otherwise ... */
14839- newargz[++newargc] = xstrdup (argv[i]);
14840- }
14841- newargz[++newargc] = NULL;
14842-
14843- LTWRAPPER_DEBUGPRINTF (("(main) lt_argv_zero : %s\n", (lt_argv_zero ? lt_argv_zero : "<NULL>")));
14844+ lt_debugprintf (__FILE__, __LINE__, "(main) lt_argv_zero: %s\n",
14845+ nonnull (lt_argv_zero));
14846 for (i = 0; i < newargc; i++)
14847 {
14848- LTWRAPPER_DEBUGPRINTF (("(main) newargz[%d] : %s\n", i, (newargz[i] ? newargz[i] : "<NULL>")));
14849+ lt_debugprintf (__FILE__, __LINE__, "(main) newargz[%d]: %s\n",
14850+ i, nonnull (newargz[i]));
14851 }
14852
14853 EOF
14854@@ -3706,7 +4529,9 @@ EOF
14855 if (rval == -1)
14856 {
14857 /* failed to start process */
14858- LTWRAPPER_DEBUGPRINTF (("(main) failed to launch target \"%s\": errno = %d\n", lt_argv_zero, errno));
14859+ lt_debugprintf (__FILE__, __LINE__,
14860+ "(main) failed to launch target \"%s\": %s\n",
14861+ lt_argv_zero, nonnull (strerror (errno)));
14862 return 127;
14863 }
14864 return rval;
14865@@ -3728,7 +4553,7 @@ xmalloc (size_t num)
14866 {
14867 void *p = (void *) malloc (num);
14868 if (!p)
14869- lt_fatal ("Memory exhausted");
14870+ lt_fatal (__FILE__, __LINE__, "memory exhausted");
14871
14872 return p;
14873 }
14874@@ -3762,8 +4587,8 @@ check_executable (const char *path)
14875 {
14876 struct stat st;
14877
14878- LTWRAPPER_DEBUGPRINTF (("(check_executable) : %s\n",
14879- path ? (*path ? path : "EMPTY!") : "NULL!"));
14880+ lt_debugprintf (__FILE__, __LINE__, "(check_executable): %s\n",
14881+ nonempty (path));
14882 if ((!path) || (!*path))
14883 return 0;
14884
14885@@ -3780,8 +4605,8 @@ make_executable (const char *path)
14886 int rval = 0;
14887 struct stat st;
14888
14889- LTWRAPPER_DEBUGPRINTF (("(make_executable) : %s\n",
14890- path ? (*path ? path : "EMPTY!") : "NULL!"));
14891+ lt_debugprintf (__FILE__, __LINE__, "(make_executable): %s\n",
14892+ nonempty (path));
14893 if ((!path) || (!*path))
14894 return 0;
14895
14896@@ -3807,8 +4632,8 @@ find_executable (const char *wrapper)
14897 int tmp_len;
14898 char *concat_name;
14899
14900- LTWRAPPER_DEBUGPRINTF (("(find_executable) : %s\n",
14901- wrapper ? (*wrapper ? wrapper : "EMPTY!") : "NULL!"));
14902+ lt_debugprintf (__FILE__, __LINE__, "(find_executable): %s\n",
14903+ nonempty (wrapper));
14904
14905 if ((wrapper == NULL) || (*wrapper == '\0'))
14906 return NULL;
14907@@ -3861,7 +4686,8 @@ find_executable (const char *wrapper)
14908 {
14909 /* empty path: current directory */
14910 if (getcwd (tmp, LT_PATHMAX) == NULL)
14911- lt_fatal ("getcwd failed");
14912+ lt_fatal (__FILE__, __LINE__, "getcwd failed: %s",
14913+ nonnull (strerror (errno)));
14914 tmp_len = strlen (tmp);
14915 concat_name =
14916 XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1);
14917@@ -3886,7 +4712,8 @@ find_executable (const char *wrapper)
14918 }
14919 /* Relative path | not found in path: prepend cwd */
14920 if (getcwd (tmp, LT_PATHMAX) == NULL)
14921- lt_fatal ("getcwd failed");
14922+ lt_fatal (__FILE__, __LINE__, "getcwd failed: %s",
14923+ nonnull (strerror (errno)));
14924 tmp_len = strlen (tmp);
14925 concat_name = XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1);
14926 memcpy (concat_name, tmp, tmp_len);
14927@@ -3912,8 +4739,9 @@ chase_symlinks (const char *pathspec)
14928 int has_symlinks = 0;
14929 while (strlen (tmp_pathspec) && !has_symlinks)
14930 {
14931- LTWRAPPER_DEBUGPRINTF (("checking path component for symlinks: %s\n",
14932- tmp_pathspec));
14933+ lt_debugprintf (__FILE__, __LINE__,
14934+ "checking path component for symlinks: %s\n",
14935+ tmp_pathspec);
14936 if (lstat (tmp_pathspec, &s) == 0)
14937 {
14938 if (S_ISLNK (s.st_mode) != 0)
14939@@ -3935,8 +4763,9 @@ chase_symlinks (const char *pathspec)
14940 }
14941 else
14942 {
14943- char *errstr = strerror (errno);
14944- lt_fatal ("Error accessing file %s (%s)", tmp_pathspec, errstr);
14945+ lt_fatal (__FILE__, __LINE__,
14946+ "error accessing file \"%s\": %s",
14947+ tmp_pathspec, nonnull (strerror (errno)));
14948 }
14949 }
14950 XFREE (tmp_pathspec);
14951@@ -3949,7 +4778,8 @@ chase_symlinks (const char *pathspec)
14952 tmp_pathspec = realpath (pathspec, buf);
14953 if (tmp_pathspec == 0)
14954 {
14955- lt_fatal ("Could not follow symlinks for %s", pathspec);
14956+ lt_fatal (__FILE__, __LINE__,
14957+ "could not follow symlinks for %s", pathspec);
14958 }
14959 return xstrdup (tmp_pathspec);
14960 #endif
14961@@ -3975,11 +4805,25 @@ strendzap (char *str, const char *pat)
14962 return str;
14963 }
14964
14965+void
14966+lt_debugprintf (const char *file, int line, const char *fmt, ...)
14967+{
14968+ va_list args;
14969+ if (lt_debug)
14970+ {
14971+ (void) fprintf (stderr, "%s:%s:%d: ", program_name, file, line);
14972+ va_start (args, fmt);
14973+ (void) vfprintf (stderr, fmt, args);
14974+ va_end (args);
14975+ }
14976+}
14977+
14978 static void
14979-lt_error_core (int exit_status, const char *mode,
14980+lt_error_core (int exit_status, const char *file,
14981+ int line, const char *mode,
14982 const char *message, va_list ap)
14983 {
14984- fprintf (stderr, "%s: %s: ", program_name, mode);
14985+ fprintf (stderr, "%s:%s:%d: %s: ", program_name, file, line, mode);
14986 vfprintf (stderr, message, ap);
14987 fprintf (stderr, ".\n");
14988
14989@@ -3988,20 +4832,32 @@ lt_error_core (int exit_status, const ch
14990 }
14991
14992 void
14993-lt_fatal (const char *message, ...)
14994+lt_fatal (const char *file, int line, const char *message, ...)
14995 {
14996 va_list ap;
14997 va_start (ap, message);
14998- lt_error_core (EXIT_FAILURE, "FATAL", message, ap);
14999+ lt_error_core (EXIT_FAILURE, file, line, "FATAL", message, ap);
15000 va_end (ap);
15001 }
15002
15003+static const char *
15004+nonnull (const char *s)
15005+{
15006+ return s ? s : "(null)";
15007+}
15008+
15009+static const char *
15010+nonempty (const char *s)
15011+{
15012+ return (s && !*s) ? "(empty)" : nonnull (s);
15013+}
15014+
15015 void
15016 lt_setenv (const char *name, const char *value)
15017 {
15018- LTWRAPPER_DEBUGPRINTF (("(lt_setenv) setting '%s' to '%s'\n",
15019- (name ? name : "<NULL>"),
15020- (value ? value : "<NULL>")));
15021+ lt_debugprintf (__FILE__, __LINE__,
15022+ "(lt_setenv) setting '%s' to '%s'\n",
15023+ nonnull (name), nonnull (value));
15024 {
15025 #ifdef HAVE_SETENV
15026 /* always make a copy, for consistency with !HAVE_SETENV */
15027@@ -4049,9 +4905,9 @@ lt_extend_str (const char *orig_value, c
15028 void
15029 lt_update_exe_path (const char *name, const char *value)
15030 {
15031- LTWRAPPER_DEBUGPRINTF (("(lt_update_exe_path) modifying '%s' by prepending '%s'\n",
15032- (name ? name : "<NULL>"),
15033- (value ? value : "<NULL>")));
15034+ lt_debugprintf (__FILE__, __LINE__,
15035+ "(lt_update_exe_path) modifying '%s' by prepending '%s'\n",
15036+ nonnull (name), nonnull (value));
15037
15038 if (name && *name && value && *value)
15039 {
15040@@ -4070,9 +4926,9 @@ lt_update_exe_path (const char *name, co
15041 void
15042 lt_update_lib_path (const char *name, const char *value)
15043 {
15044- LTWRAPPER_DEBUGPRINTF (("(lt_update_lib_path) modifying '%s' by prepending '%s'\n",
15045- (name ? name : "<NULL>"),
15046- (value ? value : "<NULL>")));
15047+ lt_debugprintf (__FILE__, __LINE__,
15048+ "(lt_update_lib_path) modifying '%s' by prepending '%s'\n",
15049+ nonnull (name), nonnull (value));
15050
15051 if (name && *name && value && *value)
15052 {
15053@@ -4222,7 +5078,7 @@ EOF
15054 func_win32_import_lib_p ()
15055 {
15056 $opt_debug
15057- case `eval "$file_magic_cmd \"\$1\" 2>/dev/null" | $SED -e 10q` in
15058+ case `eval $file_magic_cmd \"\$1\" 2>/dev/null | $SED -e 10q` in
15059 *import*) : ;;
15060 *) false ;;
15061 esac
15062@@ -4401,9 +5257,9 @@ func_mode_link ()
15063 ;;
15064 *)
15065 if test "$prev" = dlfiles; then
15066- dlfiles="$dlfiles $arg"
15067+ func_append dlfiles " $arg"
15068 else
15069- dlprefiles="$dlprefiles $arg"
15070+ func_append dlprefiles " $arg"
15071 fi
15072 prev=
15073 continue
15074@@ -4427,7 +5283,7 @@ func_mode_link ()
15075 *-*-darwin*)
15076 case "$deplibs " in
15077 *" $qarg.ltframework "*) ;;
15078- *) deplibs="$deplibs $qarg.ltframework" # this is fixed later
15079+ *) func_append deplibs " $qarg.ltframework" # this is fixed later
15080 ;;
15081 esac
15082 ;;
15083@@ -4446,7 +5302,7 @@ func_mode_link ()
15084 moreargs=
15085 for fil in `cat "$save_arg"`
15086 do
15087-# moreargs="$moreargs $fil"
15088+# func_append moreargs " $fil"
15089 arg=$fil
15090 # A libtool-controlled object.
15091
15092@@ -4475,7 +5331,7 @@ func_mode_link ()
15093
15094 if test "$prev" = dlfiles; then
15095 if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
15096- dlfiles="$dlfiles $pic_object"
15097+ func_append dlfiles " $pic_object"
15098 prev=
15099 continue
15100 else
15101@@ -4487,7 +5343,7 @@ func_mode_link ()
15102 # CHECK ME: I think I busted this. -Ossama
15103 if test "$prev" = dlprefiles; then
15104 # Preload the old-style object.
15105- dlprefiles="$dlprefiles $pic_object"
15106+ func_append dlprefiles " $pic_object"
15107 prev=
15108 fi
15109
15110@@ -4557,12 +5413,12 @@ func_mode_link ()
15111 if test "$prev" = rpath; then
15112 case "$rpath " in
15113 *" $arg "*) ;;
15114- *) rpath="$rpath $arg" ;;
15115+ *) func_append rpath " $arg" ;;
15116 esac
15117 else
15118 case "$xrpath " in
15119 *" $arg "*) ;;
15120- *) xrpath="$xrpath $arg" ;;
15121+ *) func_append xrpath " $arg" ;;
15122 esac
15123 fi
15124 prev=
15125@@ -4574,28 +5430,28 @@ func_mode_link ()
15126 continue
15127 ;;
15128 weak)
15129- weak_libs="$weak_libs $arg"
15130+ func_append weak_libs " $arg"
15131 prev=
15132 continue
15133 ;;
15134 xcclinker)
15135- linker_flags="$linker_flags $qarg"
15136- compiler_flags="$compiler_flags $qarg"
15137+ func_append linker_flags " $qarg"
15138+ func_append compiler_flags " $qarg"
15139 prev=
15140 func_append compile_command " $qarg"
15141 func_append finalize_command " $qarg"
15142 continue
15143 ;;
15144 xcompiler)
15145- compiler_flags="$compiler_flags $qarg"
15146+ func_append compiler_flags " $qarg"
15147 prev=
15148 func_append compile_command " $qarg"
15149 func_append finalize_command " $qarg"
15150 continue
15151 ;;
15152 xlinker)
15153- linker_flags="$linker_flags $qarg"
15154- compiler_flags="$compiler_flags $wl$qarg"
15155+ func_append linker_flags " $qarg"
15156+ func_append compiler_flags " $wl$qarg"
15157 prev=
15158 func_append compile_command " $wl$qarg"
15159 func_append finalize_command " $wl$qarg"
15160@@ -4686,15 +5542,16 @@ func_mode_link ()
15161 ;;
15162
15163 -L*)
15164- func_stripname '-L' '' "$arg"
15165- dir=$func_stripname_result
15166- if test -z "$dir"; then
15167+ func_stripname "-L" '' "$arg"
15168+ if test -z "$func_stripname_result"; then
15169 if test "$#" -gt 0; then
15170 func_fatal_error "require no space between \`-L' and \`$1'"
15171 else
15172 func_fatal_error "need path for \`-L' option"
15173 fi
15174 fi
15175+ func_resolve_sysroot "$func_stripname_result"
15176+ dir=$func_resolve_sysroot_result
15177 # We need an absolute path.
15178 case $dir in
15179 [\\/]* | [A-Za-z]:[\\/]*) ;;
15180@@ -4706,10 +5563,16 @@ func_mode_link ()
15181 ;;
15182 esac
15183 case "$deplibs " in
15184- *" -L$dir "*) ;;
15185+ *" -L$dir "* | *" $arg "*)
15186+ # Will only happen for absolute or sysroot arguments
15187+ ;;
15188 *)
15189- deplibs="$deplibs -L$dir"
15190- lib_search_path="$lib_search_path $dir"
15191+ # Preserve sysroot, but never include relative directories
15192+ case $dir in
15193+ [\\/]* | [A-Za-z]:[\\/]* | =*) func_append deplibs " $arg" ;;
15194+ *) func_append deplibs " -L$dir" ;;
15195+ esac
15196+ func_append lib_search_path " $dir"
15197 ;;
15198 esac
15199 case $host in
15200@@ -4718,12 +5581,12 @@ func_mode_link ()
15201 case :$dllsearchpath: in
15202 *":$dir:"*) ;;
15203 ::) dllsearchpath=$dir;;
15204- *) dllsearchpath="$dllsearchpath:$dir";;
15205+ *) func_append dllsearchpath ":$dir";;
15206 esac
15207 case :$dllsearchpath: in
15208 *":$testbindir:"*) ;;
15209 ::) dllsearchpath=$testbindir;;
15210- *) dllsearchpath="$dllsearchpath:$testbindir";;
15211+ *) func_append dllsearchpath ":$testbindir";;
15212 esac
15213 ;;
15214 esac
15215@@ -4747,7 +5610,7 @@ func_mode_link ()
15216 ;;
15217 *-*-rhapsody* | *-*-darwin1.[012])
15218 # Rhapsody C and math libraries are in the System framework
15219- deplibs="$deplibs System.ltframework"
15220+ func_append deplibs " System.ltframework"
15221 continue
15222 ;;
15223 *-*-sco3.2v5* | *-*-sco5v6*)
15224@@ -4758,9 +5621,6 @@ func_mode_link ()
15225 # Compiler inserts libc in the correct place for threads to work
15226 test "X$arg" = "X-lc" && continue
15227 ;;
15228- *-*-linux*)
15229- test "X$arg" = "X-lc" && continue
15230- ;;
15231 esac
15232 elif test "X$arg" = "X-lc_r"; then
15233 case $host in
15234@@ -4770,7 +5630,7 @@ func_mode_link ()
15235 ;;
15236 esac
15237 fi
15238- deplibs="$deplibs $arg"
15239+ func_append deplibs " $arg"
15240 continue
15241 ;;
15242
15243@@ -4782,8 +5642,8 @@ func_mode_link ()
15244 # Tru64 UNIX uses -model [arg] to determine the layout of C++
15245 # classes, name mangling, and exception handling.
15246 # Darwin uses the -arch flag to determine output architecture.
15247- -model|-arch|-isysroot)
15248- compiler_flags="$compiler_flags $arg"
15249+ -model|-arch|-isysroot|--sysroot)
15250+ func_append compiler_flags " $arg"
15251 func_append compile_command " $arg"
15252 func_append finalize_command " $arg"
15253 prev=xcompiler
15254@@ -4791,12 +5651,12 @@ func_mode_link ()
15255 ;;
15256
15257 -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
15258- compiler_flags="$compiler_flags $arg"
15259+ func_append compiler_flags " $arg"
15260 func_append compile_command " $arg"
15261 func_append finalize_command " $arg"
15262 case "$new_inherited_linker_flags " in
15263 *" $arg "*) ;;
15264- * ) new_inherited_linker_flags="$new_inherited_linker_flags $arg" ;;
15265+ * ) func_append new_inherited_linker_flags " $arg" ;;
15266 esac
15267 continue
15268 ;;
15269@@ -4863,13 +5723,17 @@ func_mode_link ()
15270 # We need an absolute path.
15271 case $dir in
15272 [\\/]* | [A-Za-z]:[\\/]*) ;;
15273+ =*)
15274+ func_stripname '=' '' "$dir"
15275+ dir=$lt_sysroot$func_stripname_result
15276+ ;;
15277 *)
15278 func_fatal_error "only absolute run-paths are allowed"
15279 ;;
15280 esac
15281 case "$xrpath " in
15282 *" $dir "*) ;;
15283- *) xrpath="$xrpath $dir" ;;
15284+ *) func_append xrpath " $dir" ;;
15285 esac
15286 continue
15287 ;;
15288@@ -4922,8 +5786,8 @@ func_mode_link ()
15289 for flag in $args; do
15290 IFS="$save_ifs"
15291 func_quote_for_eval "$flag"
15292- arg="$arg $func_quote_for_eval_result"
15293- compiler_flags="$compiler_flags $func_quote_for_eval_result"
15294+ func_append arg " $func_quote_for_eval_result"
15295+ func_append compiler_flags " $func_quote_for_eval_result"
15296 done
15297 IFS="$save_ifs"
15298 func_stripname ' ' '' "$arg"
15299@@ -4938,9 +5802,9 @@ func_mode_link ()
15300 for flag in $args; do
15301 IFS="$save_ifs"
15302 func_quote_for_eval "$flag"
15303- arg="$arg $wl$func_quote_for_eval_result"
15304- compiler_flags="$compiler_flags $wl$func_quote_for_eval_result"
15305- linker_flags="$linker_flags $func_quote_for_eval_result"
15306+ func_append arg " $wl$func_quote_for_eval_result"
15307+ func_append compiler_flags " $wl$func_quote_for_eval_result"
15308+ func_append linker_flags " $func_quote_for_eval_result"
15309 done
15310 IFS="$save_ifs"
15311 func_stripname ' ' '' "$arg"
15312@@ -4968,24 +5832,27 @@ func_mode_link ()
15313 arg="$func_quote_for_eval_result"
15314 ;;
15315
15316- # -64, -mips[0-9] enable 64-bit mode on the SGI compiler
15317- # -r[0-9][0-9]* specifies the processor on the SGI compiler
15318- # -xarch=*, -xtarget=* enable 64-bit mode on the Sun compiler
15319- # +DA*, +DD* enable 64-bit mode on the HP compiler
15320- # -q* pass through compiler args for the IBM compiler
15321- # -m*, -t[45]*, -txscale* pass through architecture-specific
15322- # compiler args for GCC
15323- # -F/path gives path to uninstalled frameworks, gcc on darwin
15324- # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC
15325- # @file GCC response files
15326- # -tp=* Portland pgcc target processor selection
15327+ # Flags to be passed through unchanged, with rationale:
15328+ # -64, -mips[0-9] enable 64-bit mode for the SGI compiler
15329+ # -r[0-9][0-9]* specify processor for the SGI compiler
15330+ # -xarch=*, -xtarget=* enable 64-bit mode for the Sun compiler
15331+ # +DA*, +DD* enable 64-bit mode for the HP compiler
15332+ # -q* compiler args for the IBM compiler
15333+ # -m*, -t[45]*, -txscale* architecture-specific flags for GCC
15334+ # -F/path path to uninstalled frameworks, gcc on darwin
15335+ # -p, -pg, --coverage, -fprofile-* profiling flags for GCC
15336+ # @file GCC response files
15337+ # -tp=* Portland pgcc target processor selection
15338+ # --sysroot=* for sysroot support
15339+ # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
15340 -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
15341- -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*)
15342+ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \
15343+ -O*|-flto*|-fwhopr*|-fuse-linker-plugin)
15344 func_quote_for_eval "$arg"
15345 arg="$func_quote_for_eval_result"
15346 func_append compile_command " $arg"
15347 func_append finalize_command " $arg"
15348- compiler_flags="$compiler_flags $arg"
15349+ func_append compiler_flags " $arg"
15350 continue
15351 ;;
15352
15353@@ -4997,7 +5864,7 @@ func_mode_link ()
15354
15355 *.$objext)
15356 # A standard object.
15357- objs="$objs $arg"
15358+ func_append objs " $arg"
15359 ;;
15360
15361 *.lo)
15362@@ -5028,7 +5895,7 @@ func_mode_link ()
15363
15364 if test "$prev" = dlfiles; then
15365 if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
15366- dlfiles="$dlfiles $pic_object"
15367+ func_append dlfiles " $pic_object"
15368 prev=
15369 continue
15370 else
15371@@ -5040,7 +5907,7 @@ func_mode_link ()
15372 # CHECK ME: I think I busted this. -Ossama
15373 if test "$prev" = dlprefiles; then
15374 # Preload the old-style object.
15375- dlprefiles="$dlprefiles $pic_object"
15376+ func_append dlprefiles " $pic_object"
15377 prev=
15378 fi
15379
15380@@ -5085,24 +5952,25 @@ func_mode_link ()
15381
15382 *.$libext)
15383 # An archive.
15384- deplibs="$deplibs $arg"
15385- old_deplibs="$old_deplibs $arg"
15386+ func_append deplibs " $arg"
15387+ func_append old_deplibs " $arg"
15388 continue
15389 ;;
15390
15391 *.la)
15392 # A libtool-controlled library.
15393
15394+ func_resolve_sysroot "$arg"
15395 if test "$prev" = dlfiles; then
15396 # This library was specified with -dlopen.
15397- dlfiles="$dlfiles $arg"
15398+ func_append dlfiles " $func_resolve_sysroot_result"
15399 prev=
15400 elif test "$prev" = dlprefiles; then
15401 # The library was specified with -dlpreopen.
15402- dlprefiles="$dlprefiles $arg"
15403+ func_append dlprefiles " $func_resolve_sysroot_result"
15404 prev=
15405 else
15406- deplibs="$deplibs $arg"
15407+ func_append deplibs " $func_resolve_sysroot_result"
15408 fi
15409 continue
15410 ;;
15411@@ -5127,7 +5995,7 @@ func_mode_link ()
15412 func_fatal_help "the \`$prevarg' option requires an argument"
15413
15414 if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then
15415- eval "arg=\"$export_dynamic_flag_spec\""
15416+ eval arg=\"$export_dynamic_flag_spec\"
15417 func_append compile_command " $arg"
15418 func_append finalize_command " $arg"
15419 fi
15420@@ -5144,11 +6012,13 @@ func_mode_link ()
15421 else
15422 shlib_search_path=
15423 fi
15424- eval "sys_lib_search_path=\"$sys_lib_search_path_spec\""
15425- eval "sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\""
15426+ eval sys_lib_search_path=\"$sys_lib_search_path_spec\"
15427+ eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\"
15428
15429 func_dirname "$output" "/" ""
15430 output_objdir="$func_dirname_result$objdir"
15431+ func_to_tool_file "$output_objdir/"
15432+ tool_output_objdir=$func_to_tool_file_result
15433 # Create the object directory.
15434 func_mkdir_p "$output_objdir"
15435
15436@@ -5169,12 +6039,12 @@ func_mode_link ()
15437 # Find all interdependent deplibs by searching for libraries
15438 # that are linked more than once (e.g. -la -lb -la)
15439 for deplib in $deplibs; do
15440- if $opt_duplicate_deps ; then
15441+ if $opt_preserve_dup_deps ; then
15442 case "$libs " in
15443- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
15444+ *" $deplib "*) func_append specialdeplibs " $deplib" ;;
15445 esac
15446 fi
15447- libs="$libs $deplib"
15448+ func_append libs " $deplib"
15449 done
15450
15451 if test "$linkmode" = lib; then
15452@@ -5187,9 +6057,9 @@ func_mode_link ()
15453 if $opt_duplicate_compiler_generated_deps; then
15454 for pre_post_dep in $predeps $postdeps; do
15455 case "$pre_post_deps " in
15456- *" $pre_post_dep "*) specialdeplibs="$specialdeplibs $pre_post_deps" ;;
15457+ *" $pre_post_dep "*) func_append specialdeplibs " $pre_post_deps" ;;
15458 esac
15459- pre_post_deps="$pre_post_deps $pre_post_dep"
15460+ func_append pre_post_deps " $pre_post_dep"
15461 done
15462 fi
15463 pre_post_deps=
15464@@ -5256,8 +6126,9 @@ func_mode_link ()
15465 for lib in $dlprefiles; do
15466 # Ignore non-libtool-libs
15467 dependency_libs=
15468+ func_resolve_sysroot "$lib"
15469 case $lib in
15470- *.la) func_source "$lib" ;;
15471+ *.la) func_source "$func_resolve_sysroot_result" ;;
15472 esac
15473
15474 # Collect preopened libtool deplibs, except any this library
15475@@ -5267,7 +6138,7 @@ func_mode_link ()
15476 deplib_base=$func_basename_result
15477 case " $weak_libs " in
15478 *" $deplib_base "*) ;;
15479- *) deplibs="$deplibs $deplib" ;;
15480+ *) func_append deplibs " $deplib" ;;
15481 esac
15482 done
15483 done
15484@@ -5288,11 +6159,11 @@ func_mode_link ()
15485 compile_deplibs="$deplib $compile_deplibs"
15486 finalize_deplibs="$deplib $finalize_deplibs"
15487 else
15488- compiler_flags="$compiler_flags $deplib"
15489+ func_append compiler_flags " $deplib"
15490 if test "$linkmode" = lib ; then
15491 case "$new_inherited_linker_flags " in
15492 *" $deplib "*) ;;
15493- * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;;
15494+ * ) func_append new_inherited_linker_flags " $deplib" ;;
15495 esac
15496 fi
15497 fi
15498@@ -5377,7 +6248,7 @@ func_mode_link ()
15499 if test "$linkmode" = lib ; then
15500 case "$new_inherited_linker_flags " in
15501 *" $deplib "*) ;;
15502- * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;;
15503+ * ) func_append new_inherited_linker_flags " $deplib" ;;
15504 esac
15505 fi
15506 fi
15507@@ -5390,7 +6261,8 @@ func_mode_link ()
15508 test "$pass" = conv && continue
15509 newdependency_libs="$deplib $newdependency_libs"
15510 func_stripname '-L' '' "$deplib"
15511- newlib_search_path="$newlib_search_path $func_stripname_result"
15512+ func_resolve_sysroot "$func_stripname_result"
15513+ func_append newlib_search_path " $func_resolve_sysroot_result"
15514 ;;
15515 prog)
15516 if test "$pass" = conv; then
15517@@ -5404,7 +6276,8 @@ func_mode_link ()
15518 finalize_deplibs="$deplib $finalize_deplibs"
15519 fi
15520 func_stripname '-L' '' "$deplib"
15521- newlib_search_path="$newlib_search_path $func_stripname_result"
15522+ func_resolve_sysroot "$func_stripname_result"
15523+ func_append newlib_search_path " $func_resolve_sysroot_result"
15524 ;;
15525 *)
15526 func_warning "\`-L' is ignored for archives/objects"
15527@@ -5415,17 +6288,21 @@ func_mode_link ()
15528 -R*)
15529 if test "$pass" = link; then
15530 func_stripname '-R' '' "$deplib"
15531- dir=$func_stripname_result
15532+ func_resolve_sysroot "$func_stripname_result"
15533+ dir=$func_resolve_sysroot_result
15534 # Make sure the xrpath contains only unique directories.
15535 case "$xrpath " in
15536 *" $dir "*) ;;
15537- *) xrpath="$xrpath $dir" ;;
15538+ *) func_append xrpath " $dir" ;;
15539 esac
15540 fi
15541 deplibs="$deplib $deplibs"
15542 continue
15543 ;;
15544- *.la) lib="$deplib" ;;
15545+ *.la)
15546+ func_resolve_sysroot "$deplib"
15547+ lib=$func_resolve_sysroot_result
15548+ ;;
15549 *.$libext)
15550 if test "$pass" = conv; then
15551 deplibs="$deplib $deplibs"
15552@@ -5488,11 +6365,11 @@ func_mode_link ()
15553 if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
15554 # If there is no dlopen support or we're linking statically,
15555 # we need to preload.
15556- newdlprefiles="$newdlprefiles $deplib"
15557+ func_append newdlprefiles " $deplib"
15558 compile_deplibs="$deplib $compile_deplibs"
15559 finalize_deplibs="$deplib $finalize_deplibs"
15560 else
15561- newdlfiles="$newdlfiles $deplib"
15562+ func_append newdlfiles " $deplib"
15563 fi
15564 fi
15565 continue
15566@@ -5538,7 +6415,7 @@ func_mode_link ()
15567 for tmp_inherited_linker_flag in $tmp_inherited_linker_flags; do
15568 case " $new_inherited_linker_flags " in
15569 *" $tmp_inherited_linker_flag "*) ;;
15570- *) new_inherited_linker_flags="$new_inherited_linker_flags $tmp_inherited_linker_flag";;
15571+ *) func_append new_inherited_linker_flags " $tmp_inherited_linker_flag";;
15572 esac
15573 done
15574 fi
15575@@ -5546,8 +6423,8 @@ func_mode_link ()
15576 if test "$linkmode,$pass" = "lib,link" ||
15577 test "$linkmode,$pass" = "prog,scan" ||
15578 { test "$linkmode" != prog && test "$linkmode" != lib; }; then
15579- test -n "$dlopen" && dlfiles="$dlfiles $dlopen"
15580- test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen"
15581+ test -n "$dlopen" && func_append dlfiles " $dlopen"
15582+ test -n "$dlpreopen" && func_append dlprefiles " $dlpreopen"
15583 fi
15584
15585 if test "$pass" = conv; then
15586@@ -5558,20 +6435,20 @@ func_mode_link ()
15587 func_fatal_error "cannot find name of link library for \`$lib'"
15588 fi
15589 # It is a libtool convenience library, so add in its objects.
15590- convenience="$convenience $ladir/$objdir/$old_library"
15591- old_convenience="$old_convenience $ladir/$objdir/$old_library"
15592+ func_append convenience " $ladir/$objdir/$old_library"
15593+ func_append old_convenience " $ladir/$objdir/$old_library"
15594 elif test "$linkmode" != prog && test "$linkmode" != lib; then
15595 func_fatal_error "\`$lib' is not a convenience library"
15596 fi
15597 tmp_libs=
15598 for deplib in $dependency_libs; do
15599 deplibs="$deplib $deplibs"
15600- if $opt_duplicate_deps ; then
15601+ if $opt_preserve_dup_deps ; then
15602 case "$tmp_libs " in
15603- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
15604+ *" $deplib "*) func_append specialdeplibs " $deplib" ;;
15605 esac
15606 fi
15607- tmp_libs="$tmp_libs $deplib"
15608+ func_append tmp_libs " $deplib"
15609 done
15610 continue
15611 fi # $pass = conv
15612@@ -5579,9 +6456,15 @@ func_mode_link ()
15613
15614 # Get the name of the library we link against.
15615 linklib=
15616- for l in $old_library $library_names; do
15617- linklib="$l"
15618- done
15619+ if test -n "$old_library" &&
15620+ { test "$prefer_static_libs" = yes ||
15621+ test "$prefer_static_libs,$installed" = "built,no"; }; then
15622+ linklib=$old_library
15623+ else
15624+ for l in $old_library $library_names; do
15625+ linklib="$l"
15626+ done
15627+ fi
15628 if test -z "$linklib"; then
15629 func_fatal_error "cannot find name of link library for \`$lib'"
15630 fi
15631@@ -5598,9 +6481,9 @@ func_mode_link ()
15632 # statically, we need to preload. We also need to preload any
15633 # dependent libraries so libltdl's deplib preloader doesn't
15634 # bomb out in the load deplibs phase.
15635- dlprefiles="$dlprefiles $lib $dependency_libs"
15636+ func_append dlprefiles " $lib $dependency_libs"
15637 else
15638- newdlfiles="$newdlfiles $lib"
15639+ func_append newdlfiles " $lib"
15640 fi
15641 continue
15642 fi # $pass = dlopen
15643@@ -5622,14 +6505,14 @@ func_mode_link ()
15644
15645 # Find the relevant object directory and library name.
15646 if test "X$installed" = Xyes; then
15647- if test ! -f "$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then
15648+ if test ! -f "$lt_sysroot$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then
15649 func_warning "library \`$lib' was moved."
15650 dir="$ladir"
15651 absdir="$abs_ladir"
15652 libdir="$abs_ladir"
15653 else
15654- dir="$libdir"
15655- absdir="$libdir"
15656+ dir="$lt_sysroot$libdir"
15657+ absdir="$lt_sysroot$libdir"
15658 fi
15659 test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
15660 else
15661@@ -5637,12 +6520,12 @@ func_mode_link ()
15662 dir="$ladir"
15663 absdir="$abs_ladir"
15664 # Remove this search path later
15665- notinst_path="$notinst_path $abs_ladir"
15666+ func_append notinst_path " $abs_ladir"
15667 else
15668 dir="$ladir/$objdir"
15669 absdir="$abs_ladir/$objdir"
15670 # Remove this search path later
15671- notinst_path="$notinst_path $abs_ladir"
15672+ func_append notinst_path " $abs_ladir"
15673 fi
15674 fi # $installed = yes
15675 func_stripname 'lib' '.la' "$laname"
15676@@ -5653,20 +6536,46 @@ func_mode_link ()
15677 if test -z "$libdir" && test "$linkmode" = prog; then
15678 func_fatal_error "only libraries may -dlpreopen a convenience library: \`$lib'"
15679 fi
15680- # Prefer using a static library (so that no silly _DYNAMIC symbols
15681- # are required to link).
15682- if test -n "$old_library"; then
15683- newdlprefiles="$newdlprefiles $dir/$old_library"
15684- # Keep a list of preopened convenience libraries to check
15685- # that they are being used correctly in the link pass.
15686- test -z "$libdir" && \
15687- dlpreconveniencelibs="$dlpreconveniencelibs $dir/$old_library"
15688- # Otherwise, use the dlname, so that lt_dlopen finds it.
15689- elif test -n "$dlname"; then
15690- newdlprefiles="$newdlprefiles $dir/$dlname"
15691- else
15692- newdlprefiles="$newdlprefiles $dir/$linklib"
15693- fi
15694+ case "$host" in
15695+ # special handling for platforms with PE-DLLs.
15696+ *cygwin* | *mingw* | *cegcc* )
15697+ # Linker will automatically link against shared library if both
15698+ # static and shared are present. Therefore, ensure we extract
15699+ # symbols from the import library if a shared library is present
15700+ # (otherwise, the dlopen module name will be incorrect). We do
15701+ # this by putting the import library name into $newdlprefiles.
15702+ # We recover the dlopen module name by 'saving' the la file
15703+ # name in a special purpose variable, and (later) extracting the
15704+ # dlname from the la file.
15705+ if test -n "$dlname"; then
15706+ func_tr_sh "$dir/$linklib"
15707+ eval "libfile_$func_tr_sh_result=\$abs_ladir/\$laname"
15708+ func_append newdlprefiles " $dir/$linklib"
15709+ else
15710+ func_append newdlprefiles " $dir/$old_library"
15711+ # Keep a list of preopened convenience libraries to check
15712+ # that they are being used correctly in the link pass.
15713+ test -z "$libdir" && \
15714+ func_append dlpreconveniencelibs " $dir/$old_library"
15715+ fi
15716+ ;;
15717+ * )
15718+ # Prefer using a static library (so that no silly _DYNAMIC symbols
15719+ # are required to link).
15720+ if test -n "$old_library"; then
15721+ func_append newdlprefiles " $dir/$old_library"
15722+ # Keep a list of preopened convenience libraries to check
15723+ # that they are being used correctly in the link pass.
15724+ test -z "$libdir" && \
15725+ func_append dlpreconveniencelibs " $dir/$old_library"
15726+ # Otherwise, use the dlname, so that lt_dlopen finds it.
15727+ elif test -n "$dlname"; then
15728+ func_append newdlprefiles " $dir/$dlname"
15729+ else
15730+ func_append newdlprefiles " $dir/$linklib"
15731+ fi
15732+ ;;
15733+ esac
15734 fi # $pass = dlpreopen
15735
15736 if test -z "$libdir"; then
15737@@ -5684,7 +6593,7 @@ func_mode_link ()
15738
15739
15740 if test "$linkmode" = prog && test "$pass" != link; then
15741- newlib_search_path="$newlib_search_path $ladir"
15742+ func_append newlib_search_path " $ladir"
15743 deplibs="$lib $deplibs"
15744
15745 linkalldeplibs=no
15746@@ -5697,7 +6606,8 @@ func_mode_link ()
15747 for deplib in $dependency_libs; do
15748 case $deplib in
15749 -L*) func_stripname '-L' '' "$deplib"
15750- newlib_search_path="$newlib_search_path $func_stripname_result"
15751+ func_resolve_sysroot "$func_stripname_result"
15752+ func_append newlib_search_path " $func_resolve_sysroot_result"
15753 ;;
15754 esac
15755 # Need to link against all dependency_libs?
15756@@ -5708,12 +6618,12 @@ func_mode_link ()
15757 # or/and link against static libraries
15758 newdependency_libs="$deplib $newdependency_libs"
15759 fi
15760- if $opt_duplicate_deps ; then
15761+ if $opt_preserve_dup_deps ; then
15762 case "$tmp_libs " in
15763- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
15764+ *" $deplib "*) func_append specialdeplibs " $deplib" ;;
15765 esac
15766 fi
15767- tmp_libs="$tmp_libs $deplib"
15768+ func_append tmp_libs " $deplib"
15769 done # for deplib
15770 continue
15771 fi # $linkmode = prog...
15772@@ -5728,7 +6638,7 @@ func_mode_link ()
15773 # Make sure the rpath contains only unique directories.
15774 case "$temp_rpath:" in
15775 *"$absdir:"*) ;;
15776- *) temp_rpath="$temp_rpath$absdir:" ;;
15777+ *) func_append temp_rpath "$absdir:" ;;
15778 esac
15779 fi
15780
15781@@ -5740,7 +6650,7 @@ func_mode_link ()
15782 *)
15783 case "$compile_rpath " in
15784 *" $absdir "*) ;;
15785- *) compile_rpath="$compile_rpath $absdir"
15786+ *) func_append compile_rpath " $absdir" ;;
15787 esac
15788 ;;
15789 esac
15790@@ -5749,7 +6659,7 @@ func_mode_link ()
15791 *)
15792 case "$finalize_rpath " in
15793 *" $libdir "*) ;;
15794- *) finalize_rpath="$finalize_rpath $libdir"
15795+ *) func_append finalize_rpath " $libdir" ;;
15796 esac
15797 ;;
15798 esac
15799@@ -5774,12 +6684,12 @@ func_mode_link ()
15800 case $host in
15801 *cygwin* | *mingw* | *cegcc*)
15802 # No point in relinking DLLs because paths are not encoded
15803- notinst_deplibs="$notinst_deplibs $lib"
15804+ func_append notinst_deplibs " $lib"
15805 need_relink=no
15806 ;;
15807 *)
15808 if test "$installed" = no; then
15809- notinst_deplibs="$notinst_deplibs $lib"
15810+ func_append notinst_deplibs " $lib"
15811 need_relink=yes
15812 fi
15813 ;;
15814@@ -5814,7 +6724,7 @@ func_mode_link ()
15815 *)
15816 case "$compile_rpath " in
15817 *" $absdir "*) ;;
15818- *) compile_rpath="$compile_rpath $absdir"
15819+ *) func_append compile_rpath " $absdir" ;;
15820 esac
15821 ;;
15822 esac
15823@@ -5823,7 +6733,7 @@ func_mode_link ()
15824 *)
15825 case "$finalize_rpath " in
15826 *" $libdir "*) ;;
15827- *) finalize_rpath="$finalize_rpath $libdir"
15828+ *) func_append finalize_rpath " $libdir" ;;
15829 esac
15830 ;;
15831 esac
15832@@ -5835,7 +6745,7 @@ func_mode_link ()
15833 shift
15834 realname="$1"
15835 shift
15836- eval "libname=\"$libname_spec\""
15837+ libname=`eval "\\$ECHO \"$libname_spec\""`
15838 # use dlname if we got it. it's perfectly good, no?
15839 if test -n "$dlname"; then
15840 soname="$dlname"
15841@@ -5848,7 +6758,7 @@ func_mode_link ()
15842 versuffix="-$major"
15843 ;;
15844 esac
15845- eval "soname=\"$soname_spec\""
15846+ eval soname=\"$soname_spec\"
15847 else
15848 soname="$realname"
15849 fi
15850@@ -5877,7 +6787,7 @@ func_mode_link ()
15851 linklib=$newlib
15852 fi # test -n "$old_archive_from_expsyms_cmds"
15853
15854- if test "$linkmode" = prog || test "$mode" != relink; then
15855+ if test "$linkmode" = prog || test "$opt_mode" != relink; then
15856 add_shlibpath=
15857 add_dir=
15858 add=
15859@@ -5933,7 +6843,7 @@ func_mode_link ()
15860 if test -n "$inst_prefix_dir"; then
15861 case $libdir in
15862 [\\/]*)
15863- add_dir="$add_dir -L$inst_prefix_dir$libdir"
15864+ func_append add_dir " -L$inst_prefix_dir$libdir"
15865 ;;
15866 esac
15867 fi
15868@@ -5955,7 +6865,7 @@ func_mode_link ()
15869 if test -n "$add_shlibpath"; then
15870 case :$compile_shlibpath: in
15871 *":$add_shlibpath:"*) ;;
15872- *) compile_shlibpath="$compile_shlibpath$add_shlibpath:" ;;
15873+ *) func_append compile_shlibpath "$add_shlibpath:" ;;
15874 esac
15875 fi
15876 if test "$linkmode" = prog; then
15877@@ -5969,13 +6879,13 @@ func_mode_link ()
15878 test "$hardcode_shlibpath_var" = yes; then
15879 case :$finalize_shlibpath: in
15880 *":$libdir:"*) ;;
15881- *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
15882+ *) func_append finalize_shlibpath "$libdir:" ;;
15883 esac
15884 fi
15885 fi
15886 fi
15887
15888- if test "$linkmode" = prog || test "$mode" = relink; then
15889+ if test "$linkmode" = prog || test "$opt_mode" = relink; then
15890 add_shlibpath=
15891 add_dir=
15892 add=
15893@@ -5989,7 +6899,7 @@ func_mode_link ()
15894 elif test "$hardcode_shlibpath_var" = yes; then
15895 case :$finalize_shlibpath: in
15896 *":$libdir:"*) ;;
15897- *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
15898+ *) func_append finalize_shlibpath "$libdir:" ;;
15899 esac
15900 add="-l$name"
15901 elif test "$hardcode_automatic" = yes; then
15902@@ -6001,12 +6911,12 @@ func_mode_link ()
15903 fi
15904 else
15905 # We cannot seem to hardcode it, guess we'll fake it.
15906- add_dir="-L$libdir"
15907+ add_dir="-L$lt_sysroot$libdir"
15908 # Try looking first in the location we're being installed to.
15909 if test -n "$inst_prefix_dir"; then
15910 case $libdir in
15911 [\\/]*)
15912- add_dir="$add_dir -L$inst_prefix_dir$libdir"
15913+ func_append add_dir " -L$inst_prefix_dir$libdir"
15914 ;;
15915 esac
15916 fi
15917@@ -6083,27 +6993,33 @@ func_mode_link ()
15918 temp_xrpath=$func_stripname_result
15919 case " $xrpath " in
15920 *" $temp_xrpath "*) ;;
15921- *) xrpath="$xrpath $temp_xrpath";;
15922+ *) func_append xrpath " $temp_xrpath";;
15923 esac;;
15924- *) temp_deplibs="$temp_deplibs $libdir";;
15925+ *) func_append temp_deplibs " $libdir";;
15926 esac
15927 done
15928 dependency_libs="$temp_deplibs"
15929 fi
15930
15931- newlib_search_path="$newlib_search_path $absdir"
15932+ func_append newlib_search_path " $absdir"
15933 # Link against this library
15934 test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs"
15935 # ... and its dependency_libs
15936 tmp_libs=
15937 for deplib in $dependency_libs; do
15938 newdependency_libs="$deplib $newdependency_libs"
15939- if $opt_duplicate_deps ; then
15940+ case $deplib in
15941+ -L*) func_stripname '-L' '' "$deplib"
15942+ func_resolve_sysroot "$func_stripname_result";;
15943+ *) func_resolve_sysroot "$deplib" ;;
15944+ esac
15945+ if $opt_preserve_dup_deps ; then
15946 case "$tmp_libs " in
15947- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
15948+ *" $func_resolve_sysroot_result "*)
15949+ func_append specialdeplibs " $func_resolve_sysroot_result" ;;
15950 esac
15951 fi
15952- tmp_libs="$tmp_libs $deplib"
15953+ func_append tmp_libs " $func_resolve_sysroot_result"
15954 done
15955
15956 if test "$link_all_deplibs" != no; then
15957@@ -6113,8 +7029,10 @@ func_mode_link ()
15958 case $deplib in
15959 -L*) path="$deplib" ;;
15960 *.la)
15961+ func_resolve_sysroot "$deplib"
15962+ deplib=$func_resolve_sysroot_result
15963 func_dirname "$deplib" "" "."
15964- dir="$func_dirname_result"
15965+ dir=$func_dirname_result
15966 # We need an absolute path.
15967 case $dir in
15968 [\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;;
15969@@ -6130,7 +7048,7 @@ func_mode_link ()
15970 case $host in
15971 *-*-darwin*)
15972 depdepl=
15973- deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
15974+ eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
15975 if test -n "$deplibrary_names" ; then
15976 for tmp in $deplibrary_names ; do
15977 depdepl=$tmp
15978@@ -6141,8 +7059,8 @@ func_mode_link ()
15979 if test -z "$darwin_install_name"; then
15980 darwin_install_name=`${OTOOL64} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'`
15981 fi
15982- compiler_flags="$compiler_flags ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}"
15983- linker_flags="$linker_flags -dylib_file ${darwin_install_name}:${depdepl}"
15984+ func_append compiler_flags " ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}"
15985+ func_append linker_flags " -dylib_file ${darwin_install_name}:${depdepl}"
15986 path=
15987 fi
15988 fi
15989@@ -6152,7 +7070,7 @@ func_mode_link ()
15990 ;;
15991 esac
15992 else
15993- libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
15994+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
15995 test -z "$libdir" && \
15996 func_fatal_error "\`$deplib' is not a valid libtool archive"
15997 test "$absdir" != "$libdir" && \
15998@@ -6192,7 +7110,7 @@ func_mode_link ()
15999 for dir in $newlib_search_path; do
16000 case "$lib_search_path " in
16001 *" $dir "*) ;;
16002- *) lib_search_path="$lib_search_path $dir" ;;
16003+ *) func_append lib_search_path " $dir" ;;
16004 esac
16005 done
16006 newlib_search_path=
16007@@ -6205,7 +7123,7 @@ func_mode_link ()
16008 fi
16009 for var in $vars dependency_libs; do
16010 # Add libraries to $var in reverse order
16011- eval tmp_libs=\$$var
16012+ eval tmp_libs=\"\$$var\"
16013 new_libs=
16014 for deplib in $tmp_libs; do
16015 # FIXME: Pedantically, this is the right thing to do, so
16016@@ -6250,13 +7168,13 @@ func_mode_link ()
16017 -L*)
16018 case " $tmp_libs " in
16019 *" $deplib "*) ;;
16020- *) tmp_libs="$tmp_libs $deplib" ;;
16021+ *) func_append tmp_libs " $deplib" ;;
16022 esac
16023 ;;
16024- *) tmp_libs="$tmp_libs $deplib" ;;
16025+ *) func_append tmp_libs " $deplib" ;;
16026 esac
16027 done
16028- eval $var=\$tmp_libs
16029+ eval $var=\"$tmp_libs\"
16030 done # for var
16031 fi
16032 # Last step: remove runtime libs from dependency_libs
16033@@ -6269,7 +7187,7 @@ func_mode_link ()
16034 ;;
16035 esac
16036 if test -n "$i" ; then
16037- tmp_libs="$tmp_libs $i"
16038+ func_append tmp_libs " $i"
16039 fi
16040 done
16041 dependency_libs=$tmp_libs
16042@@ -6310,7 +7228,7 @@ func_mode_link ()
16043 # Now set the variables for building old libraries.
16044 build_libtool_libs=no
16045 oldlibs="$output"
16046- objs="$objs$old_deplibs"
16047+ func_append objs "$old_deplibs"
16048 ;;
16049
16050 lib)
16051@@ -6319,8 +7237,8 @@ func_mode_link ()
16052 lib*)
16053 func_stripname 'lib' '.la' "$outputname"
16054 name=$func_stripname_result
16055- eval "shared_ext=\"$shrext_cmds\""
16056- eval "libname=\"$libname_spec\""
16057+ eval shared_ext=\"$shrext_cmds\"
16058+ eval libname=\"$libname_spec\"
16059 ;;
16060 *)
16061 test "$module" = no && \
16062@@ -6330,8 +7248,8 @@ func_mode_link ()
16063 # Add the "lib" prefix for modules if required
16064 func_stripname '' '.la' "$outputname"
16065 name=$func_stripname_result
16066- eval "shared_ext=\"$shrext_cmds\""
16067- eval "libname=\"$libname_spec\""
16068+ eval shared_ext=\"$shrext_cmds\"
16069+ eval libname=\"$libname_spec\"
16070 else
16071 func_stripname '' '.la' "$outputname"
16072 libname=$func_stripname_result
16073@@ -6346,7 +7264,7 @@ func_mode_link ()
16074 echo
16075 $ECHO "*** Warning: Linking the shared library $output against the non-libtool"
16076 $ECHO "*** objects $objs is not portable!"
16077- libobjs="$libobjs $objs"
16078+ func_append libobjs " $objs"
16079 fi
16080 fi
16081
16082@@ -6544,7 +7462,7 @@ func_mode_link ()
16083 done
16084
16085 # Make executables depend on our current version.
16086- verstring="$verstring:${current}.0"
16087+ func_append verstring ":${current}.0"
16088 ;;
16089
16090 qnx)
16091@@ -6612,10 +7530,10 @@ func_mode_link ()
16092 fi
16093
16094 func_generate_dlsyms "$libname" "$libname" "yes"
16095- libobjs="$libobjs $symfileobj"
16096+ func_append libobjs " $symfileobj"
16097 test "X$libobjs" = "X " && libobjs=
16098
16099- if test "$mode" != relink; then
16100+ if test "$opt_mode" != relink; then
16101 # Remove our outputs, but don't remove object files since they
16102 # may have been created when compiling PIC objects.
16103 removelist=
16104@@ -6631,7 +7549,7 @@ func_mode_link ()
16105 continue
16106 fi
16107 fi
16108- removelist="$removelist $p"
16109+ func_append removelist " $p"
16110 ;;
16111 *) ;;
16112 esac
16113@@ -6642,7 +7560,7 @@ func_mode_link ()
16114
16115 # Now set the variables for building old libraries.
16116 if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then
16117- oldlibs="$oldlibs $output_objdir/$libname.$libext"
16118+ func_append oldlibs " $output_objdir/$libname.$libext"
16119
16120 # Transform .lo files to .o files.
16121 oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; $lo2o" | $NL2SP`
16122@@ -6659,10 +7577,11 @@ func_mode_link ()
16123 # If the user specified any rpath flags, then add them.
16124 temp_xrpath=
16125 for libdir in $xrpath; do
16126- temp_xrpath="$temp_xrpath -R$libdir"
16127+ func_replace_sysroot "$libdir"
16128+ func_append temp_xrpath " -R$func_replace_sysroot_result"
16129 case "$finalize_rpath " in
16130 *" $libdir "*) ;;
16131- *) finalize_rpath="$finalize_rpath $libdir" ;;
16132+ *) func_append finalize_rpath " $libdir" ;;
16133 esac
16134 done
16135 if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then
16136@@ -6676,7 +7595,7 @@ func_mode_link ()
16137 for lib in $old_dlfiles; do
16138 case " $dlprefiles $dlfiles " in
16139 *" $lib "*) ;;
16140- *) dlfiles="$dlfiles $lib" ;;
16141+ *) func_append dlfiles " $lib" ;;
16142 esac
16143 done
16144
16145@@ -6686,7 +7605,7 @@ func_mode_link ()
16146 for lib in $old_dlprefiles; do
16147 case "$dlprefiles " in
16148 *" $lib "*) ;;
16149- *) dlprefiles="$dlprefiles $lib" ;;
16150+ *) func_append dlprefiles " $lib" ;;
16151 esac
16152 done
16153
16154@@ -6698,7 +7617,7 @@ func_mode_link ()
16155 ;;
16156 *-*-rhapsody* | *-*-darwin1.[012])
16157 # Rhapsody C library is in the System framework
16158- deplibs="$deplibs System.ltframework"
16159+ func_append deplibs " System.ltframework"
16160 ;;
16161 *-*-netbsd*)
16162 # Don't link with libc until the a.out ld.so is fixed.
16163@@ -6715,7 +7634,7 @@ func_mode_link ()
16164 *)
16165 # Add libc to deplibs on all other systems if necessary.
16166 if test "$build_libtool_need_lc" = "yes"; then
16167- deplibs="$deplibs -lc"
16168+ func_append deplibs " -lc"
16169 fi
16170 ;;
16171 esac
16172@@ -6764,18 +7683,18 @@ EOF
16173 if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
16174 case " $predeps $postdeps " in
16175 *" $i "*)
16176- newdeplibs="$newdeplibs $i"
16177+ func_append newdeplibs " $i"
16178 i=""
16179 ;;
16180 esac
16181 fi
16182 if test -n "$i" ; then
16183- eval "libname=\"$libname_spec\""
16184- eval "deplib_matches=\"$library_names_spec\""
16185+ libname=`eval "\\$ECHO \"$libname_spec\""`
16186+ deplib_matches=`eval "\\$ECHO \"$library_names_spec\""`
16187 set dummy $deplib_matches; shift
16188 deplib_match=$1
16189 if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
16190- newdeplibs="$newdeplibs $i"
16191+ func_append newdeplibs " $i"
16192 else
16193 droppeddeps=yes
16194 echo
16195@@ -6789,7 +7708,7 @@ EOF
16196 fi
16197 ;;
16198 *)
16199- newdeplibs="$newdeplibs $i"
16200+ func_append newdeplibs " $i"
16201 ;;
16202 esac
16203 done
16204@@ -6807,18 +7726,18 @@ EOF
16205 if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
16206 case " $predeps $postdeps " in
16207 *" $i "*)
16208- newdeplibs="$newdeplibs $i"
16209+ func_append newdeplibs " $i"
16210 i=""
16211 ;;
16212 esac
16213 fi
16214 if test -n "$i" ; then
16215- eval "libname=\"$libname_spec\""
16216- eval "deplib_matches=\"$library_names_spec\""
16217+ libname=`eval "\\$ECHO \"$libname_spec\""`
16218+ deplib_matches=`eval "\\$ECHO \"$library_names_spec\""`
16219 set dummy $deplib_matches; shift
16220 deplib_match=$1
16221 if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
16222- newdeplibs="$newdeplibs $i"
16223+ func_append newdeplibs " $i"
16224 else
16225 droppeddeps=yes
16226 echo
16227@@ -6840,7 +7759,7 @@ EOF
16228 fi
16229 ;;
16230 *)
16231- newdeplibs="$newdeplibs $i"
16232+ func_append newdeplibs " $i"
16233 ;;
16234 esac
16235 done
16236@@ -6857,15 +7776,27 @@ EOF
16237 if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
16238 case " $predeps $postdeps " in
16239 *" $a_deplib "*)
16240- newdeplibs="$newdeplibs $a_deplib"
16241+ func_append newdeplibs " $a_deplib"
16242 a_deplib=""
16243 ;;
16244 esac
16245 fi
16246 if test -n "$a_deplib" ; then
16247- eval "libname=\"$libname_spec\""
16248+ libname=`eval "\\$ECHO \"$libname_spec\""`
16249+ if test -n "$file_magic_glob"; then
16250+ libnameglob=`func_echo_all "$libname" | $SED -e $file_magic_glob`
16251+ else
16252+ libnameglob=$libname
16253+ fi
16254+ test "$want_nocaseglob" = yes && nocaseglob=`shopt -p nocaseglob`
16255 for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
16256- potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
16257+ if test "$want_nocaseglob" = yes; then
16258+ shopt -s nocaseglob
16259+ potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null`
16260+ $nocaseglob
16261+ else
16262+ potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null`
16263+ fi
16264 for potent_lib in $potential_libs; do
16265 # Follow soft links.
16266 if ls -lLd "$potent_lib" 2>/dev/null |
16267@@ -6885,10 +7816,10 @@ EOF
16268 *) potlib=`$ECHO "$potlib" | $SED 's,[^/]*$,,'`"$potliblink";;
16269 esac
16270 done
16271- if eval "$file_magic_cmd \"\$potlib\"" 2>/dev/null |
16272+ if eval $file_magic_cmd \"\$potlib\" 2>/dev/null |
16273 $SED -e 10q |
16274 $EGREP "$file_magic_regex" > /dev/null; then
16275- newdeplibs="$newdeplibs $a_deplib"
16276+ func_append newdeplibs " $a_deplib"
16277 a_deplib=""
16278 break 2
16279 fi
16280@@ -6913,7 +7844,7 @@ EOF
16281 ;;
16282 *)
16283 # Add a -L argument.
16284- newdeplibs="$newdeplibs $a_deplib"
16285+ func_append newdeplibs " $a_deplib"
16286 ;;
16287 esac
16288 done # Gone through all deplibs.
16289@@ -6929,20 +7860,20 @@ EOF
16290 if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
16291 case " $predeps $postdeps " in
16292 *" $a_deplib "*)
16293- newdeplibs="$newdeplibs $a_deplib"
16294+ func_append newdeplibs " $a_deplib"
16295 a_deplib=""
16296 ;;
16297 esac
16298 fi
16299 if test -n "$a_deplib" ; then
16300- eval "libname=\"$libname_spec\""
16301+ libname=`eval "\\$ECHO \"$libname_spec\""`
16302 for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
16303 potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
16304 for potent_lib in $potential_libs; do
16305 potlib="$potent_lib" # see symlink-check above in file_magic test
16306 if eval "\$ECHO \"$potent_lib\"" 2>/dev/null | $SED 10q | \
16307 $EGREP "$match_pattern_regex" > /dev/null; then
16308- newdeplibs="$newdeplibs $a_deplib"
16309+ func_append newdeplibs " $a_deplib"
16310 a_deplib=""
16311 break 2
16312 fi
16313@@ -6967,7 +7898,7 @@ EOF
16314 ;;
16315 *)
16316 # Add a -L argument.
16317- newdeplibs="$newdeplibs $a_deplib"
16318+ func_append newdeplibs " $a_deplib"
16319 ;;
16320 esac
16321 done # Gone through all deplibs.
16322@@ -7071,7 +8002,7 @@ EOF
16323 *)
16324 case " $deplibs " in
16325 *" -L$path/$objdir "*)
16326- new_libs="$new_libs -L$path/$objdir" ;;
16327+ func_append new_libs " -L$path/$objdir" ;;
16328 esac
16329 ;;
16330 esac
16331@@ -7081,10 +8012,10 @@ EOF
16332 -L*)
16333 case " $new_libs " in
16334 *" $deplib "*) ;;
16335- *) new_libs="$new_libs $deplib" ;;
16336+ *) func_append new_libs " $deplib" ;;
16337 esac
16338 ;;
16339- *) new_libs="$new_libs $deplib" ;;
16340+ *) func_append new_libs " $deplib" ;;
16341 esac
16342 done
16343 deplibs="$new_libs"
16344@@ -7101,10 +8032,12 @@ EOF
16345 hardcode_libdirs=
16346 dep_rpath=
16347 rpath="$finalize_rpath"
16348- test "$mode" != relink && rpath="$compile_rpath$rpath"
16349+ test "$opt_mode" != relink && rpath="$compile_rpath$rpath"
16350 for libdir in $rpath; do
16351 if test -n "$hardcode_libdir_flag_spec"; then
16352 if test -n "$hardcode_libdir_separator"; then
16353+ func_replace_sysroot "$libdir"
16354+ libdir=$func_replace_sysroot_result
16355 if test -z "$hardcode_libdirs"; then
16356 hardcode_libdirs="$libdir"
16357 else
16358@@ -7113,18 +8046,18 @@ EOF
16359 *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
16360 ;;
16361 *)
16362- hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
16363+ func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
16364 ;;
16365 esac
16366 fi
16367 else
16368- eval "flag=\"$hardcode_libdir_flag_spec\""
16369- dep_rpath="$dep_rpath $flag"
16370+ eval flag=\"$hardcode_libdir_flag_spec\"
16371+ func_append dep_rpath " $flag"
16372 fi
16373 elif test -n "$runpath_var"; then
16374 case "$perm_rpath " in
16375 *" $libdir "*) ;;
16376- *) perm_rpath="$perm_rpath $libdir" ;;
16377+ *) func_apped perm_rpath " $libdir" ;;
16378 esac
16379 fi
16380 done
16381@@ -7133,40 +8066,38 @@ EOF
16382 test -n "$hardcode_libdirs"; then
16383 libdir="$hardcode_libdirs"
16384 if test -n "$hardcode_libdir_flag_spec_ld"; then
16385- eval "dep_rpath=\"$hardcode_libdir_flag_spec_ld\""
16386+ eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\"
16387 else
16388- eval "dep_rpath=\"$hardcode_libdir_flag_spec\""
16389+ eval dep_rpath=\"$hardcode_libdir_flag_spec\"
16390 fi
16391 fi
16392 if test -n "$runpath_var" && test -n "$perm_rpath"; then
16393 # We should set the runpath_var.
16394 rpath=
16395 for dir in $perm_rpath; do
16396- rpath="$rpath$dir:"
16397+ func_append rpath "$dir:"
16398 done
16399- eval $runpath_var=\$rpath\$$runpath_var
16400- export $runpath_var
16401+ eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var"
16402 fi
16403 test -n "$dep_rpath" && deplibs="$dep_rpath $deplibs"
16404 fi
16405
16406 shlibpath="$finalize_shlibpath"
16407- test "$mode" != relink && shlibpath="$compile_shlibpath$shlibpath"
16408+ test "$opt_mode" != relink && shlibpath="$compile_shlibpath$shlibpath"
16409 if test -n "$shlibpath"; then
16410- eval $shlibpath_var=\$shlibpath\$$shlibpath_var
16411- export $shlibpath_var
16412+ eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var"
16413 fi
16414
16415 # Get the real and link names of the library.
16416- eval "shared_ext=\"$shrext_cmds\""
16417- eval "library_names=\"$library_names_spec\""
16418+ eval shared_ext=\"$shrext_cmds\"
16419+ eval library_names=\"$library_names_spec\"
16420 set dummy $library_names
16421 shift
16422 realname="$1"
16423 shift
16424
16425 if test -n "$soname_spec"; then
16426- eval "soname=\"$soname_spec\""
16427+ eval soname=\"$soname_spec\"
16428 else
16429 soname="$realname"
16430 fi
16431@@ -7178,7 +8109,7 @@ EOF
16432 linknames=
16433 for link
16434 do
16435- linknames="$linknames $link"
16436+ func_append linknames " $link"
16437 done
16438
16439 # Use standard objects if they are pic
16440@@ -7189,7 +8120,7 @@ EOF
16441 if test -n "$export_symbols" && test -n "$include_expsyms"; then
16442 $opt_dry_run || cp "$export_symbols" "$output_objdir/$libname.uexp"
16443 export_symbols="$output_objdir/$libname.uexp"
16444- delfiles="$delfiles $export_symbols"
16445+ func_append delfiles " $export_symbols"
16446 fi
16447
16448 orig_export_symbols=
16449@@ -7220,13 +8151,45 @@ EOF
16450 $opt_dry_run || $RM $export_symbols
16451 cmds=$export_symbols_cmds
16452 save_ifs="$IFS"; IFS='~'
16453- for cmd in $cmds; do
16454+ for cmd1 in $cmds; do
16455 IFS="$save_ifs"
16456- eval "cmd=\"$cmd\""
16457- func_len " $cmd"
16458- len=$func_len_result
16459- if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
16460+ # Take the normal branch if the nm_file_list_spec branch
16461+ # doesn't work or if tool conversion is not needed.
16462+ case $nm_file_list_spec~$to_tool_file_cmd in
16463+ *~func_convert_file_noop | *~func_convert_file_msys_to_w32 | ~*)
16464+ try_normal_branch=yes
16465+ eval cmd=\"$cmd1\"
16466+ func_len " $cmd"
16467+ len=$func_len_result
16468+ ;;
16469+ *)
16470+ try_normal_branch=no
16471+ ;;
16472+ esac
16473+ if test "$try_normal_branch" = yes \
16474+ && { test "$len" -lt "$max_cmd_len" \
16475+ || test "$max_cmd_len" -le -1; }
16476+ then
16477+ func_show_eval "$cmd" 'exit $?'
16478+ skipped_export=false
16479+ elif test -n "$nm_file_list_spec"; then
16480+ func_basename "$output"
16481+ output_la=$func_basename_result
16482+ save_libobjs=$libobjs
16483+ save_output=$output
16484+ output=${output_objdir}/${output_la}.nm
16485+ func_to_tool_file "$output"
16486+ libobjs=$nm_file_list_spec$func_to_tool_file_result
16487+ func_append delfiles " $output"
16488+ func_verbose "creating $NM input file list: $output"
16489+ for obj in $save_libobjs; do
16490+ func_to_tool_file "$obj"
16491+ $ECHO "$func_to_tool_file_result"
16492+ done > "$output"
16493+ eval cmd=\"$cmd1\"
16494 func_show_eval "$cmd" 'exit $?'
16495+ output=$save_output
16496+ libobjs=$save_libobjs
16497 skipped_export=false
16498 else
16499 # The command line is too long to execute in one step.
16500@@ -7248,7 +8211,7 @@ EOF
16501 if test -n "$export_symbols" && test -n "$include_expsyms"; then
16502 tmp_export_symbols="$export_symbols"
16503 test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols"
16504- $opt_dry_run || $ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"
16505+ $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"'
16506 fi
16507
16508 if test "X$skipped_export" != "X:" && test -n "$orig_export_symbols"; then
16509@@ -7260,7 +8223,7 @@ EOF
16510 # global variables. join(1) would be nice here, but unfortunately
16511 # isn't a blessed tool.
16512 $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter
16513- delfiles="$delfiles $export_symbols $output_objdir/$libname.filter"
16514+ func_append delfiles " $export_symbols $output_objdir/$libname.filter"
16515 export_symbols=$output_objdir/$libname.def
16516 $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
16517 fi
16518@@ -7270,7 +8233,7 @@ EOF
16519 case " $convenience " in
16520 *" $test_deplib "*) ;;
16521 *)
16522- tmp_deplibs="$tmp_deplibs $test_deplib"
16523+ func_append tmp_deplibs " $test_deplib"
16524 ;;
16525 esac
16526 done
16527@@ -7286,43 +8249,43 @@ EOF
16528 fi
16529 if test -n "$whole_archive_flag_spec"; then
16530 save_libobjs=$libobjs
16531- eval "libobjs=\"\$libobjs $whole_archive_flag_spec\""
16532+ eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
16533 test "X$libobjs" = "X " && libobjs=
16534 else
16535 gentop="$output_objdir/${outputname}x"
16536- generated="$generated $gentop"
16537+ func_append generated " $gentop"
16538
16539 func_extract_archives $gentop $convenience
16540- libobjs="$libobjs $func_extract_archives_result"
16541+ func_append libobjs " $func_extract_archives_result"
16542 test "X$libobjs" = "X " && libobjs=
16543 fi
16544 fi
16545
16546 if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then
16547- eval "flag=\"$thread_safe_flag_spec\""
16548- linker_flags="$linker_flags $flag"
16549+ eval flag=\"$thread_safe_flag_spec\"
16550+ func_append linker_flags " $flag"
16551 fi
16552
16553 # Make a backup of the uninstalled library when relinking
16554- if test "$mode" = relink; then
16555- $opt_dry_run || (cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U) || exit $?
16556+ if test "$opt_mode" = relink; then
16557+ $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U)' || exit $?
16558 fi
16559
16560 # Do each of the archive commands.
16561 if test "$module" = yes && test -n "$module_cmds" ; then
16562 if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
16563- eval "test_cmds=\"$module_expsym_cmds\""
16564+ eval test_cmds=\"$module_expsym_cmds\"
16565 cmds=$module_expsym_cmds
16566 else
16567- eval "test_cmds=\"$module_cmds\""
16568+ eval test_cmds=\"$module_cmds\"
16569 cmds=$module_cmds
16570 fi
16571 else
16572 if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
16573- eval "test_cmds=\"$archive_expsym_cmds\""
16574+ eval test_cmds=\"$archive_expsym_cmds\"
16575 cmds=$archive_expsym_cmds
16576 else
16577- eval "test_cmds=\"$archive_cmds\""
16578+ eval test_cmds=\"$archive_cmds\"
16579 cmds=$archive_cmds
16580 fi
16581 fi
16582@@ -7366,10 +8329,13 @@ EOF
16583 echo 'INPUT (' > $output
16584 for obj in $save_libobjs
16585 do
16586- $ECHO "$obj" >> $output
16587+ func_to_tool_file "$obj"
16588+ $ECHO "$func_to_tool_file_result" >> $output
16589 done
16590 echo ')' >> $output
16591- delfiles="$delfiles $output"
16592+ func_append delfiles " $output"
16593+ func_to_tool_file "$output"
16594+ output=$func_to_tool_file_result
16595 elif test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "X$file_list_spec" != X; then
16596 output=${output_objdir}/${output_la}.lnk
16597 func_verbose "creating linker input file list: $output"
16598@@ -7383,15 +8349,17 @@ EOF
16599 fi
16600 for obj
16601 do
16602- $ECHO "$obj" >> $output
16603+ func_to_tool_file "$obj"
16604+ $ECHO "$func_to_tool_file_result" >> $output
16605 done
16606- delfiles="$delfiles $output"
16607- output=$firstobj\"$file_list_spec$output\"
16608+ func_append delfiles " $output"
16609+ func_to_tool_file "$output"
16610+ output=$firstobj\"$file_list_spec$func_to_tool_file_result\"
16611 else
16612 if test -n "$save_libobjs"; then
16613 func_verbose "creating reloadable object files..."
16614 output=$output_objdir/$output_la-${k}.$objext
16615- eval "test_cmds=\"$reload_cmds\""
16616+ eval test_cmds=\"$reload_cmds\"
16617 func_len " $test_cmds"
16618 len0=$func_len_result
16619 len=$len0
16620@@ -7411,12 +8379,12 @@ EOF
16621 if test "$k" -eq 1 ; then
16622 # The first file doesn't have a previous command to add.
16623 reload_objs=$objlist
16624- eval "concat_cmds=\"$reload_cmds\""
16625+ eval concat_cmds=\"$reload_cmds\"
16626 else
16627 # All subsequent reloadable object files will link in
16628 # the last one created.
16629 reload_objs="$objlist $last_robj"
16630- eval "concat_cmds=\"\$concat_cmds~$reload_cmds~\$RM $last_robj\""
16631+ eval concat_cmds=\"\$concat_cmds~$reload_cmds~\$RM $last_robj\"
16632 fi
16633 last_robj=$output_objdir/$output_la-${k}.$objext
16634 func_arith $k + 1
16635@@ -7433,11 +8401,11 @@ EOF
16636 # files will link in the last one created.
16637 test -z "$concat_cmds" || concat_cmds=$concat_cmds~
16638 reload_objs="$objlist $last_robj"
16639- eval "concat_cmds=\"\${concat_cmds}$reload_cmds\""
16640+ eval concat_cmds=\"\${concat_cmds}$reload_cmds\"
16641 if test -n "$last_robj"; then
16642- eval "concat_cmds=\"\${concat_cmds}~\$RM $last_robj\""
16643+ eval concat_cmds=\"\${concat_cmds}~\$RM $last_robj\"
16644 fi
16645- delfiles="$delfiles $output"
16646+ func_append delfiles " $output"
16647
16648 else
16649 output=
16650@@ -7450,9 +8418,9 @@ EOF
16651 libobjs=$output
16652 # Append the command to create the export file.
16653 test -z "$concat_cmds" || concat_cmds=$concat_cmds~
16654- eval "concat_cmds=\"\$concat_cmds$export_symbols_cmds\""
16655+ eval concat_cmds=\"\$concat_cmds$export_symbols_cmds\"
16656 if test -n "$last_robj"; then
16657- eval "concat_cmds=\"\$concat_cmds~\$RM $last_robj\""
16658+ eval concat_cmds=\"\$concat_cmds~\$RM $last_robj\"
16659 fi
16660 fi
16661
16662@@ -7471,7 +8439,7 @@ EOF
16663 lt_exit=$?
16664
16665 # Restore the uninstalled library and exit
16666- if test "$mode" = relink; then
16667+ if test "$opt_mode" = relink; then
16668 ( cd "$output_objdir" && \
16669 $RM "${realname}T" && \
16670 $MV "${realname}U" "$realname" )
16671@@ -7492,7 +8460,7 @@ EOF
16672 if test -n "$export_symbols" && test -n "$include_expsyms"; then
16673 tmp_export_symbols="$export_symbols"
16674 test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols"
16675- $opt_dry_run || $ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"
16676+ $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"'
16677 fi
16678
16679 if test -n "$orig_export_symbols"; then
16680@@ -7504,7 +8472,7 @@ EOF
16681 # global variables. join(1) would be nice here, but unfortunately
16682 # isn't a blessed tool.
16683 $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter
16684- delfiles="$delfiles $export_symbols $output_objdir/$libname.filter"
16685+ func_append delfiles " $export_symbols $output_objdir/$libname.filter"
16686 export_symbols=$output_objdir/$libname.def
16687 $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
16688 fi
16689@@ -7515,7 +8483,7 @@ EOF
16690 output=$save_output
16691
16692 if test -n "$convenience" && test -n "$whole_archive_flag_spec"; then
16693- eval "libobjs=\"\$libobjs $whole_archive_flag_spec\""
16694+ eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
16695 test "X$libobjs" = "X " && libobjs=
16696 fi
16697 # Expand the library linking commands again to reset the
16698@@ -7539,23 +8507,23 @@ EOF
16699
16700 if test -n "$delfiles"; then
16701 # Append the command to remove temporary files to $cmds.
16702- eval "cmds=\"\$cmds~\$RM $delfiles\""
16703+ eval cmds=\"\$cmds~\$RM $delfiles\"
16704 fi
16705
16706 # Add any objects from preloaded convenience libraries
16707 if test -n "$dlprefiles"; then
16708 gentop="$output_objdir/${outputname}x"
16709- generated="$generated $gentop"
16710+ func_append generated " $gentop"
16711
16712 func_extract_archives $gentop $dlprefiles
16713- libobjs="$libobjs $func_extract_archives_result"
16714+ func_append libobjs " $func_extract_archives_result"
16715 test "X$libobjs" = "X " && libobjs=
16716 fi
16717
16718 save_ifs="$IFS"; IFS='~'
16719 for cmd in $cmds; do
16720 IFS="$save_ifs"
16721- eval "cmd=\"$cmd\""
16722+ eval cmd=\"$cmd\"
16723 $opt_silent || {
16724 func_quote_for_expand "$cmd"
16725 eval "func_echo $func_quote_for_expand_result"
16726@@ -7564,7 +8532,7 @@ EOF
16727 lt_exit=$?
16728
16729 # Restore the uninstalled library and exit
16730- if test "$mode" = relink; then
16731+ if test "$opt_mode" = relink; then
16732 ( cd "$output_objdir" && \
16733 $RM "${realname}T" && \
16734 $MV "${realname}U" "$realname" )
16735@@ -7576,8 +8544,8 @@ EOF
16736 IFS="$save_ifs"
16737
16738 # Restore the uninstalled library and exit
16739- if test "$mode" = relink; then
16740- $opt_dry_run || (cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname) || exit $?
16741+ if test "$opt_mode" = relink; then
16742+ $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname)' || exit $?
16743
16744 if test -n "$convenience"; then
16745 if test -z "$whole_archive_flag_spec"; then
16746@@ -7656,17 +8624,20 @@ EOF
16747
16748 if test -n "$convenience"; then
16749 if test -n "$whole_archive_flag_spec"; then
16750- eval "tmp_whole_archive_flags=\"$whole_archive_flag_spec\""
16751+ eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\"
16752 reload_conv_objs=$reload_objs\ `$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'`
16753 else
16754 gentop="$output_objdir/${obj}x"
16755- generated="$generated $gentop"
16756+ func_append generated " $gentop"
16757
16758 func_extract_archives $gentop $convenience
16759 reload_conv_objs="$reload_objs $func_extract_archives_result"
16760 fi
16761 fi
16762
16763+ # If we're not building shared, we need to use non_pic_objs
16764+ test "$build_libtool_libs" != yes && libobjs="$non_pic_objects"
16765+
16766 # Create the old-style object.
16767 reload_objs="$objs$old_deplibs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; /\.lib$/d; $lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test
16768
16769@@ -7690,7 +8661,7 @@ EOF
16770 # Create an invalid libtool object if no PIC, so that we don't
16771 # accidentally link it into a program.
16772 # $show "echo timestamp > $libobj"
16773- # $opt_dry_run || echo timestamp > $libobj || exit $?
16774+ # $opt_dry_run || eval "echo timestamp > $libobj" || exit $?
16775 exit $EXIT_SUCCESS
16776 fi
16777
16778@@ -7740,8 +8711,8 @@ EOF
16779 if test "$tagname" = CXX ; then
16780 case ${MACOSX_DEPLOYMENT_TARGET-10.0} in
16781 10.[0123])
16782- compile_command="$compile_command ${wl}-bind_at_load"
16783- finalize_command="$finalize_command ${wl}-bind_at_load"
16784+ func_append compile_command " ${wl}-bind_at_load"
16785+ func_append finalize_command " ${wl}-bind_at_load"
16786 ;;
16787 esac
16788 fi
16789@@ -7761,7 +8732,7 @@ EOF
16790 *)
16791 case " $compile_deplibs " in
16792 *" -L$path/$objdir "*)
16793- new_libs="$new_libs -L$path/$objdir" ;;
16794+ func_append new_libs " -L$path/$objdir" ;;
16795 esac
16796 ;;
16797 esac
16798@@ -7771,17 +8742,17 @@ EOF
16799 -L*)
16800 case " $new_libs " in
16801 *" $deplib "*) ;;
16802- *) new_libs="$new_libs $deplib" ;;
16803+ *) func_append new_libs " $deplib" ;;
16804 esac
16805 ;;
16806- *) new_libs="$new_libs $deplib" ;;
16807+ *) func_append new_libs " $deplib" ;;
16808 esac
16809 done
16810 compile_deplibs="$new_libs"
16811
16812
16813- compile_command="$compile_command $compile_deplibs"
16814- finalize_command="$finalize_command $finalize_deplibs"
16815+ func_append compile_command " $compile_deplibs"
16816+ func_append finalize_command " $finalize_deplibs"
16817
16818 if test -n "$rpath$xrpath"; then
16819 # If the user specified any rpath flags, then add them.
16820@@ -7789,7 +8760,7 @@ EOF
16821 # This is the magic to use -rpath.
16822 case "$finalize_rpath " in
16823 *" $libdir "*) ;;
16824- *) finalize_rpath="$finalize_rpath $libdir" ;;
16825+ *) func_append finalize_rpath " $libdir" ;;
16826 esac
16827 done
16828 fi
16829@@ -7808,18 +8779,18 @@ EOF
16830 *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
16831 ;;
16832 *)
16833- hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
16834+ func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
16835 ;;
16836 esac
16837 fi
16838 else
16839- eval "flag=\"$hardcode_libdir_flag_spec\""
16840- rpath="$rpath $flag"
16841+ eval flag=\"$hardcode_libdir_flag_spec\"
16842+ func_append rpath " $flag"
16843 fi
16844 elif test -n "$runpath_var"; then
16845 case "$perm_rpath " in
16846 *" $libdir "*) ;;
16847- *) perm_rpath="$perm_rpath $libdir" ;;
16848+ *) func_append perm_rpath " $libdir" ;;
16849 esac
16850 fi
16851 case $host in
16852@@ -7828,12 +8799,12 @@ EOF
16853 case :$dllsearchpath: in
16854 *":$libdir:"*) ;;
16855 ::) dllsearchpath=$libdir;;
16856- *) dllsearchpath="$dllsearchpath:$libdir";;
16857+ *) func_append dllsearchpath ":$libdir";;
16858 esac
16859 case :$dllsearchpath: in
16860 *":$testbindir:"*) ;;
16861 ::) dllsearchpath=$testbindir;;
16862- *) dllsearchpath="$dllsearchpath:$testbindir";;
16863+ *) func_append dllsearchpath ":$testbindir";;
16864 esac
16865 ;;
16866 esac
16867@@ -7842,7 +8813,7 @@ EOF
16868 if test -n "$hardcode_libdir_separator" &&
16869 test -n "$hardcode_libdirs"; then
16870 libdir="$hardcode_libdirs"
16871- eval "rpath=\" $hardcode_libdir_flag_spec\""
16872+ eval rpath=\" $hardcode_libdir_flag_spec\"
16873 fi
16874 compile_rpath="$rpath"
16875
16876@@ -7859,18 +8830,18 @@ EOF
16877 *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
16878 ;;
16879 *)
16880- hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
16881+ func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
16882 ;;
16883 esac
16884 fi
16885 else
16886- eval "flag=\"$hardcode_libdir_flag_spec\""
16887- rpath="$rpath $flag"
16888+ eval flag=\"$hardcode_libdir_flag_spec\"
16889+ func_append rpath " $flag"
16890 fi
16891 elif test -n "$runpath_var"; then
16892 case "$finalize_perm_rpath " in
16893 *" $libdir "*) ;;
16894- *) finalize_perm_rpath="$finalize_perm_rpath $libdir" ;;
16895+ *) func_append finalize_perm_rpath " $libdir" ;;
16896 esac
16897 fi
16898 done
16899@@ -7878,7 +8849,7 @@ EOF
16900 if test -n "$hardcode_libdir_separator" &&
16901 test -n "$hardcode_libdirs"; then
16902 libdir="$hardcode_libdirs"
16903- eval "rpath=\" $hardcode_libdir_flag_spec\""
16904+ eval rpath=\" $hardcode_libdir_flag_spec\"
16905 fi
16906 finalize_rpath="$rpath"
16907
16908@@ -7921,6 +8892,12 @@ EOF
16909 exit_status=0
16910 func_show_eval "$link_command" 'exit_status=$?'
16911
16912+ if test -n "$postlink_cmds"; then
16913+ func_to_tool_file "$output"
16914+ postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'`
16915+ func_execute_cmds "$postlink_cmds" 'exit $?'
16916+ fi
16917+
16918 # Delete the generated files.
16919 if test -f "$output_objdir/${outputname}S.${objext}"; then
16920 func_show_eval '$RM "$output_objdir/${outputname}S.${objext}"'
16921@@ -7943,7 +8920,7 @@ EOF
16922 # We should set the runpath_var.
16923 rpath=
16924 for dir in $perm_rpath; do
16925- rpath="$rpath$dir:"
16926+ func_append rpath "$dir:"
16927 done
16928 compile_var="$runpath_var=\"$rpath\$$runpath_var\" "
16929 fi
16930@@ -7951,7 +8928,7 @@ EOF
16931 # We should set the runpath_var.
16932 rpath=
16933 for dir in $finalize_perm_rpath; do
16934- rpath="$rpath$dir:"
16935+ func_append rpath "$dir:"
16936 done
16937 finalize_var="$runpath_var=\"$rpath\$$runpath_var\" "
16938 fi
16939@@ -7966,6 +8943,13 @@ EOF
16940 $opt_dry_run || $RM $output
16941 # Link the executable and exit
16942 func_show_eval "$link_command" 'exit $?'
16943+
16944+ if test -n "$postlink_cmds"; then
16945+ func_to_tool_file "$output"
16946+ postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'`
16947+ func_execute_cmds "$postlink_cmds" 'exit $?'
16948+ fi
16949+
16950 exit $EXIT_SUCCESS
16951 fi
16952
16953@@ -7999,6 +8983,12 @@ EOF
16954
16955 func_show_eval "$link_command" 'exit $?'
16956
16957+ if test -n "$postlink_cmds"; then
16958+ func_to_tool_file "$output_objdir/$outputname"
16959+ 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'`
16960+ func_execute_cmds "$postlink_cmds" 'exit $?'
16961+ fi
16962+
16963 # Now create the wrapper script.
16964 func_verbose "creating $output"
16965
16966@@ -8096,7 +9086,7 @@ EOF
16967 else
16968 oldobjs="$old_deplibs $non_pic_objects"
16969 if test "$preload" = yes && test -f "$symfileobj"; then
16970- oldobjs="$oldobjs $symfileobj"
16971+ func_append oldobjs " $symfileobj"
16972 fi
16973 fi
16974 addlibs="$old_convenience"
16975@@ -8104,10 +9094,10 @@ EOF
16976
16977 if test -n "$addlibs"; then
16978 gentop="$output_objdir/${outputname}x"
16979- generated="$generated $gentop"
16980+ func_append generated " $gentop"
16981
16982 func_extract_archives $gentop $addlibs
16983- oldobjs="$oldobjs $func_extract_archives_result"
16984+ func_append oldobjs " $func_extract_archives_result"
16985 fi
16986
16987 # Do each command in the archive commands.
16988@@ -8118,10 +9108,10 @@ EOF
16989 # Add any objects from preloaded convenience libraries
16990 if test -n "$dlprefiles"; then
16991 gentop="$output_objdir/${outputname}x"
16992- generated="$generated $gentop"
16993+ func_append generated " $gentop"
16994
16995 func_extract_archives $gentop $dlprefiles
16996- oldobjs="$oldobjs $func_extract_archives_result"
16997+ func_append oldobjs " $func_extract_archives_result"
16998 fi
16999
17000 # POSIX demands no paths to be encoded in archives. We have
17001@@ -8139,7 +9129,7 @@ EOF
17002 else
17003 echo "copying selected object files to avoid basename conflicts..."
17004 gentop="$output_objdir/${outputname}x"
17005- generated="$generated $gentop"
17006+ func_append generated " $gentop"
17007 func_mkdir_p "$gentop"
17008 save_oldobjs=$oldobjs
17009 oldobjs=
17010@@ -8163,18 +9153,28 @@ EOF
17011 esac
17012 done
17013 func_show_eval "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj"
17014- oldobjs="$oldobjs $gentop/$newobj"
17015+ func_append oldobjs " $gentop/$newobj"
17016 ;;
17017- *) oldobjs="$oldobjs $obj" ;;
17018+ *) func_append oldobjs " $obj" ;;
17019 esac
17020 done
17021 fi
17022- eval "cmds=\"$old_archive_cmds\""
17023+ eval cmds=\"$old_archive_cmds\"
17024
17025 func_len " $cmds"
17026 len=$func_len_result
17027 if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
17028 cmds=$old_archive_cmds
17029+ elif test -n "$archiver_list_spec"; then
17030+ func_verbose "using command file archive linking..."
17031+ for obj in $oldobjs
17032+ do
17033+ func_to_tool_file "$obj"
17034+ $ECHO "$func_to_tool_file_result"
17035+ done > $output_objdir/$libname.libcmd
17036+ func_to_tool_file "$output_objdir/$libname.libcmd"
17037+ oldobjs=" $archiver_list_spec$func_to_tool_file_result"
17038+ cmds=$old_archive_cmds
17039 else
17040 # the command line is too long to link in one step, link in parts
17041 func_verbose "using piecewise archive linking..."
17042@@ -8189,7 +9189,7 @@ EOF
17043 do
17044 last_oldobj=$obj
17045 done
17046- eval "test_cmds=\"$old_archive_cmds\""
17047+ eval test_cmds=\"$old_archive_cmds\"
17048 func_len " $test_cmds"
17049 len0=$func_len_result
17050 len=$len0
17051@@ -8208,7 +9208,7 @@ EOF
17052 RANLIB=$save_RANLIB
17053 fi
17054 test -z "$concat_cmds" || concat_cmds=$concat_cmds~
17055- eval "concat_cmds=\"\${concat_cmds}$old_archive_cmds\""
17056+ eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\"
17057 objlist=
17058 len=$len0
17059 fi
17060@@ -8216,9 +9216,9 @@ EOF
17061 RANLIB=$save_RANLIB
17062 oldobjs=$objlist
17063 if test "X$oldobjs" = "X" ; then
17064- eval "cmds=\"\$concat_cmds\""
17065+ eval cmds=\"\$concat_cmds\"
17066 else
17067- eval "cmds=\"\$concat_cmds~\$old_archive_cmds\""
17068+ eval cmds=\"\$concat_cmds~\$old_archive_cmds\"
17069 fi
17070 fi
17071 fi
17072@@ -8268,12 +9268,23 @@ EOF
17073 *.la)
17074 func_basename "$deplib"
17075 name="$func_basename_result"
17076- libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
17077+ func_resolve_sysroot "$deplib"
17078+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result`
17079 test -z "$libdir" && \
17080 func_fatal_error "\`$deplib' is not a valid libtool archive"
17081- newdependency_libs="$newdependency_libs $libdir/$name"
17082+ func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name"
17083+ ;;
17084+ -L*)
17085+ func_stripname -L '' "$deplib"
17086+ func_replace_sysroot "$func_stripname_result"
17087+ func_append newdependency_libs " -L$func_replace_sysroot_result"
17088 ;;
17089- *) newdependency_libs="$newdependency_libs $deplib" ;;
17090+ -R*)
17091+ func_stripname -R '' "$deplib"
17092+ func_replace_sysroot "$func_stripname_result"
17093+ func_append newdependency_libs " -R$func_replace_sysroot_result"
17094+ ;;
17095+ *) func_append newdependency_libs " $deplib" ;;
17096 esac
17097 done
17098 dependency_libs="$newdependency_libs"
17099@@ -8284,12 +9295,14 @@ EOF
17100 *.la)
17101 func_basename "$lib"
17102 name="$func_basename_result"
17103- libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
17104+ func_resolve_sysroot "$lib"
17105+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result`
17106+
17107 test -z "$libdir" && \
17108 func_fatal_error "\`$lib' is not a valid libtool archive"
17109- newdlfiles="$newdlfiles $libdir/$name"
17110+ func_append newdlfiles " ${lt_sysroot:+=}$libdir/$name"
17111 ;;
17112- *) newdlfiles="$newdlfiles $lib" ;;
17113+ *) func_append newdlfiles " $lib" ;;
17114 esac
17115 done
17116 dlfiles="$newdlfiles"
17117@@ -8303,10 +9316,11 @@ EOF
17118 # the library:
17119 func_basename "$lib"
17120 name="$func_basename_result"
17121- libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
17122+ func_resolve_sysroot "$lib"
17123+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result`
17124 test -z "$libdir" && \
17125 func_fatal_error "\`$lib' is not a valid libtool archive"
17126- newdlprefiles="$newdlprefiles $libdir/$name"
17127+ func_append newdlprefiles " ${lt_sysroot:+=}$libdir/$name"
17128 ;;
17129 esac
17130 done
17131@@ -8318,7 +9332,7 @@ EOF
17132 [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
17133 *) abs=`pwd`"/$lib" ;;
17134 esac
17135- newdlfiles="$newdlfiles $abs"
17136+ func_append newdlfiles " $abs"
17137 done
17138 dlfiles="$newdlfiles"
17139 newdlprefiles=
17140@@ -8327,7 +9341,7 @@ EOF
17141 [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
17142 *) abs=`pwd`"/$lib" ;;
17143 esac
17144- newdlprefiles="$newdlprefiles $abs"
17145+ func_append newdlprefiles " $abs"
17146 done
17147 dlprefiles="$newdlprefiles"
17148 fi
17149@@ -8412,7 +9426,7 @@ relink_command=\"$relink_command\""
17150 exit $EXIT_SUCCESS
17151 }
17152
17153-{ test "$mode" = link || test "$mode" = relink; } &&
17154+{ test "$opt_mode" = link || test "$opt_mode" = relink; } &&
17155 func_mode_link ${1+"$@"}
17156
17157
17158@@ -8432,9 +9446,9 @@ func_mode_uninstall ()
17159 for arg
17160 do
17161 case $arg in
17162- -f) RM="$RM $arg"; rmforce=yes ;;
17163- -*) RM="$RM $arg" ;;
17164- *) files="$files $arg" ;;
17165+ -f) func_append RM " $arg"; rmforce=yes ;;
17166+ -*) func_append RM " $arg" ;;
17167+ *) func_append files " $arg" ;;
17168 esac
17169 done
17170
17171@@ -8443,24 +9457,23 @@ func_mode_uninstall ()
17172
17173 rmdirs=
17174
17175- origobjdir="$objdir"
17176 for file in $files; do
17177 func_dirname "$file" "" "."
17178 dir="$func_dirname_result"
17179 if test "X$dir" = X.; then
17180- objdir="$origobjdir"
17181+ odir="$objdir"
17182 else
17183- objdir="$dir/$origobjdir"
17184+ odir="$dir/$objdir"
17185 fi
17186 func_basename "$file"
17187 name="$func_basename_result"
17188- test "$mode" = uninstall && objdir="$dir"
17189+ test "$opt_mode" = uninstall && odir="$dir"
17190
17191- # Remember objdir for removal later, being careful to avoid duplicates
17192- if test "$mode" = clean; then
17193+ # Remember odir for removal later, being careful to avoid duplicates
17194+ if test "$opt_mode" = clean; then
17195 case " $rmdirs " in
17196- *" $objdir "*) ;;
17197- *) rmdirs="$rmdirs $objdir" ;;
17198+ *" $odir "*) ;;
17199+ *) func_append rmdirs " $odir" ;;
17200 esac
17201 fi
17202
17203@@ -8486,18 +9499,17 @@ func_mode_uninstall ()
17204
17205 # Delete the libtool libraries and symlinks.
17206 for n in $library_names; do
17207- rmfiles="$rmfiles $objdir/$n"
17208+ func_append rmfiles " $odir/$n"
17209 done
17210- test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library"
17211+ test -n "$old_library" && func_append rmfiles " $odir/$old_library"
17212
17213- case "$mode" in
17214+ case "$opt_mode" in
17215 clean)
17216- case " $library_names " in
17217- # " " in the beginning catches empty $dlname
17218+ case " $library_names " in
17219 *" $dlname "*) ;;
17220- *) rmfiles="$rmfiles $objdir/$dlname" ;;
17221+ *) test -n "$dlname" && func_append rmfiles " $odir/$dlname" ;;
17222 esac
17223- test -n "$libdir" && rmfiles="$rmfiles $objdir/$name $objdir/${name}i"
17224+ test -n "$libdir" && func_append rmfiles " $odir/$name $odir/${name}i"
17225 ;;
17226 uninstall)
17227 if test -n "$library_names"; then
17228@@ -8525,19 +9537,19 @@ func_mode_uninstall ()
17229 # Add PIC object to the list of files to remove.
17230 if test -n "$pic_object" &&
17231 test "$pic_object" != none; then
17232- rmfiles="$rmfiles $dir/$pic_object"
17233+ func_append rmfiles " $dir/$pic_object"
17234 fi
17235
17236 # Add non-PIC object to the list of files to remove.
17237 if test -n "$non_pic_object" &&
17238 test "$non_pic_object" != none; then
17239- rmfiles="$rmfiles $dir/$non_pic_object"
17240+ func_append rmfiles " $dir/$non_pic_object"
17241 fi
17242 fi
17243 ;;
17244
17245 *)
17246- if test "$mode" = clean ; then
17247+ if test "$opt_mode" = clean ; then
17248 noexename=$name
17249 case $file in
17250 *.exe)
17251@@ -8547,7 +9559,7 @@ func_mode_uninstall ()
17252 noexename=$func_stripname_result
17253 # $file with .exe has already been added to rmfiles,
17254 # add $file without .exe
17255- rmfiles="$rmfiles $file"
17256+ func_append rmfiles " $file"
17257 ;;
17258 esac
17259 # Do a test to see if this is a libtool program.
17260@@ -8556,7 +9568,7 @@ func_mode_uninstall ()
17261 func_ltwrapper_scriptname "$file"
17262 relink_command=
17263 func_source $func_ltwrapper_scriptname_result
17264- rmfiles="$rmfiles $func_ltwrapper_scriptname_result"
17265+ func_append rmfiles " $func_ltwrapper_scriptname_result"
17266 else
17267 relink_command=
17268 func_source $dir/$noexename
17269@@ -8564,12 +9576,12 @@ func_mode_uninstall ()
17270
17271 # note $name still contains .exe if it was in $file originally
17272 # as does the version of $file that was added into $rmfiles
17273- rmfiles="$rmfiles $objdir/$name $objdir/${name}S.${objext}"
17274+ func_append rmfiles " $odir/$name $odir/${name}S.${objext}"
17275 if test "$fast_install" = yes && test -n "$relink_command"; then
17276- rmfiles="$rmfiles $objdir/lt-$name"
17277+ func_append rmfiles " $odir/lt-$name"
17278 fi
17279 if test "X$noexename" != "X$name" ; then
17280- rmfiles="$rmfiles $objdir/lt-${noexename}.c"
17281+ func_append rmfiles " $odir/lt-${noexename}.c"
17282 fi
17283 fi
17284 fi
17285@@ -8577,7 +9589,6 @@ func_mode_uninstall ()
17286 esac
17287 func_show_eval "$RM $rmfiles" 'exit_status=1'
17288 done
17289- objdir="$origobjdir"
17290
17291 # Try to remove the ${objdir}s in the directories where we deleted files
17292 for dir in $rmdirs; do
17293@@ -8589,16 +9600,16 @@ func_mode_uninstall ()
17294 exit $exit_status
17295 }
17296
17297-{ test "$mode" = uninstall || test "$mode" = clean; } &&
17298+{ test "$opt_mode" = uninstall || test "$opt_mode" = clean; } &&
17299 func_mode_uninstall ${1+"$@"}
17300
17301-test -z "$mode" && {
17302+test -z "$opt_mode" && {
17303 help="$generic_help"
17304 func_fatal_help "you must specify a MODE"
17305 }
17306
17307 test -z "$exec_cmd" && \
17308- func_fatal_help "invalid operation mode \`$mode'"
17309+ func_fatal_help "invalid operation mode \`$opt_mode'"
17310
17311 if test -n "$exec_cmd"; then
17312 eval exec "$exec_cmd"
17313--- a/ltoptions.m4
17314+++ b/ltoptions.m4
17315@@ -8,7 +8,7 @@
17316 # unlimited permission to copy and/or distribute it, with or without
17317 # modifications, as long as this notice is preserved.
17318
17319-# serial 6 ltoptions.m4
17320+# serial 7 ltoptions.m4
17321
17322 # This is to help aclocal find these macros, as it can't see m4_define.
17323 AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])])
17324--- a/ltversion.m4
17325+++ b/ltversion.m4
17326@@ -7,17 +7,17 @@
17327 # unlimited permission to copy and/or distribute it, with or without
17328 # modifications, as long as this notice is preserved.
17329
17330-# Generated from ltversion.in.
17331+# @configure_input@
17332
17333-# serial 3134 ltversion.m4
17334+# serial 3293 ltversion.m4
17335 # This file is part of GNU Libtool
17336
17337-m4_define([LT_PACKAGE_VERSION], [2.2.7a])
17338-m4_define([LT_PACKAGE_REVISION], [1.3134])
17339+m4_define([LT_PACKAGE_VERSION], [2.4])
17340+m4_define([LT_PACKAGE_REVISION], [1.3293])
17341
17342 AC_DEFUN([LTVERSION_VERSION],
17343-[macro_version='2.2.7a'
17344-macro_revision='1.3134'
17345+[macro_version='2.4'
17346+macro_revision='1.3293'
17347 _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
17348 _LT_DECL(, macro_revision, 0)
17349 ])
17350--- a/lt~obsolete.m4
17351+++ b/lt~obsolete.m4
17352@@ -7,7 +7,7 @@
17353 # unlimited permission to copy and/or distribute it, with or without
17354 # modifications, as long as this notice is preserved.
17355
17356-# serial 4 lt~obsolete.m4
17357+# serial 5 lt~obsolete.m4
17358
17359 # These exist entirely to fool aclocal when bootstrapping libtool.
17360 #
17361--- a/opcodes/configure
17362+++ b/opcodes/configure
17363@@ -680,6 +680,9 @@ OTOOL
17364 LIPO
17365 NMEDIT
17366 DSYMUTIL
17367+MANIFEST_TOOL
17368+ac_ct_AR
17369+DLLTOOL
17370 OBJDUMP
17371 LN_S
17372 NM
17373@@ -798,6 +801,7 @@ enable_static
17374 with_pic
17375 enable_fast_install
17376 with_gnu_ld
17377+with_libtool_sysroot
17378 enable_libtool_lock
17379 enable_targets
17380 enable_werror
17381@@ -1462,6 +1466,8 @@ Optional Packages:
17382 --with-pic try to use only PIC/non-PIC objects [default=use
17383 both]
17384 --with-gnu-ld assume the C compiler uses GNU ld [default=no]
17385+ --with-libtool-sysroot=DIR Search for dependent libraries within DIR
17386+ (or the compiler's sysroot if not specified).
17387
17388 Some influential environment variables:
17389 CC C compiler command
17390@@ -5403,8 +5409,8 @@ esac
17391
17392
17393
17394-macro_version='2.2.7a'
17395-macro_revision='1.3134'
17396+macro_version='2.4'
17397+macro_revision='1.3293'
17398
17399
17400
17401@@ -5444,7 +5450,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
17402 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
17403 $as_echo_n "checking how to print strings... " >&6; }
17404 # Test print first, because it will be a builtin if present.
17405-if test "X`print -r -- -n 2>/dev/null`" = X-n && \
17406+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
17407 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
17408 ECHO='print -r --'
17409 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
17410@@ -6130,8 +6136,8 @@ $as_echo_n "checking whether the shell u
17411 # Try some XSI features
17412 xsi_shell=no
17413 ( _lt_dummy="a/b/c"
17414- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
17415- = c,a/b,, \
17416+ test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
17417+ = c,a/b,b/c, \
17418 && eval 'test $(( 1 + 1 )) -eq 2 \
17419 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
17420 && xsi_shell=yes
17421@@ -6180,6 +6186,80 @@ esac
17422
17423
17424
17425+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5
17426+$as_echo_n "checking how to convert $build file names to $host format... " >&6; }
17427+if ${lt_cv_to_host_file_cmd+:} false; then :
17428+ $as_echo_n "(cached) " >&6
17429+else
17430+ case $host in
17431+ *-*-mingw* )
17432+ case $build in
17433+ *-*-mingw* ) # actually msys
17434+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
17435+ ;;
17436+ *-*-cygwin* )
17437+ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
17438+ ;;
17439+ * ) # otherwise, assume *nix
17440+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
17441+ ;;
17442+ esac
17443+ ;;
17444+ *-*-cygwin* )
17445+ case $build in
17446+ *-*-mingw* ) # actually msys
17447+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
17448+ ;;
17449+ *-*-cygwin* )
17450+ lt_cv_to_host_file_cmd=func_convert_file_noop
17451+ ;;
17452+ * ) # otherwise, assume *nix
17453+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
17454+ ;;
17455+ esac
17456+ ;;
17457+ * ) # unhandled hosts (and "normal" native builds)
17458+ lt_cv_to_host_file_cmd=func_convert_file_noop
17459+ ;;
17460+esac
17461+
17462+fi
17463+
17464+to_host_file_cmd=$lt_cv_to_host_file_cmd
17465+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5
17466+$as_echo "$lt_cv_to_host_file_cmd" >&6; }
17467+
17468+
17469+
17470+
17471+
17472+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5
17473+$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; }
17474+if ${lt_cv_to_tool_file_cmd+:} false; then :
17475+ $as_echo_n "(cached) " >&6
17476+else
17477+ #assume ordinary cross tools, or native build.
17478+lt_cv_to_tool_file_cmd=func_convert_file_noop
17479+case $host in
17480+ *-*-mingw* )
17481+ case $build in
17482+ *-*-mingw* ) # actually msys
17483+ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
17484+ ;;
17485+ esac
17486+ ;;
17487+esac
17488+
17489+fi
17490+
17491+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
17492+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5
17493+$as_echo "$lt_cv_to_tool_file_cmd" >&6; }
17494+
17495+
17496+
17497+
17498+
17499 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
17500 $as_echo_n "checking for $LD option to reload object files... " >&6; }
17501 if ${lt_cv_ld_reload_flag+:} false; then :
17502@@ -6196,6 +6276,11 @@ case $reload_flag in
17503 esac
17504 reload_cmds='$LD$reload_flag -o $output$reload_objs'
17505 case $host_os in
17506+ cygwin* | mingw* | pw32* | cegcc*)
17507+ if test "$GCC" != yes; then
17508+ reload_cmds=false
17509+ fi
17510+ ;;
17511 darwin*)
17512 if test "$GCC" = yes; then
17513 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
17514@@ -6364,7 +6449,8 @@ mingw* | pw32*)
17515 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
17516 lt_cv_file_magic_cmd='func_win32_libid'
17517 else
17518- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
17519+ # Keep this pattern in sync with the one in func_win32_libid.
17520+ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
17521 lt_cv_file_magic_cmd='$OBJDUMP -f'
17522 fi
17523 ;;
17524@@ -6518,6 +6604,21 @@ esac
17525 fi
17526 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
17527 $as_echo "$lt_cv_deplibs_check_method" >&6; }
17528+
17529+file_magic_glob=
17530+want_nocaseglob=no
17531+if test "$build" = "$host"; then
17532+ case $host_os in
17533+ mingw* | pw32*)
17534+ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
17535+ want_nocaseglob=yes
17536+ else
17537+ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"`
17538+ fi
17539+ ;;
17540+ esac
17541+fi
17542+
17543 file_magic_cmd=$lt_cv_file_magic_cmd
17544 deplibs_check_method=$lt_cv_deplibs_check_method
17545 test -z "$deplibs_check_method" && deplibs_check_method=unknown
17546@@ -6533,9 +6634,162 @@ test -z "$deplibs_check_method" && depli
17547
17548
17549
17550+
17551+
17552+
17553+
17554+
17555+
17556+
17557+
17558+
17559+
17560 if test -n "$ac_tool_prefix"; then
17561- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
17562-set dummy ${ac_tool_prefix}ar; ac_word=$2
17563+ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
17564+set dummy ${ac_tool_prefix}dlltool; ac_word=$2
17565+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
17566+$as_echo_n "checking for $ac_word... " >&6; }
17567+if ${ac_cv_prog_DLLTOOL+:} false; then :
17568+ $as_echo_n "(cached) " >&6
17569+else
17570+ if test -n "$DLLTOOL"; then
17571+ ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
17572+else
17573+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
17574+for as_dir in $PATH
17575+do
17576+ IFS=$as_save_IFS
17577+ test -z "$as_dir" && as_dir=.
17578+ for ac_exec_ext in '' $ac_executable_extensions; do
17579+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
17580+ ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
17581+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
17582+ break 2
17583+ fi
17584+done
17585+ done
17586+IFS=$as_save_IFS
17587+
17588+fi
17589+fi
17590+DLLTOOL=$ac_cv_prog_DLLTOOL
17591+if test -n "$DLLTOOL"; then
17592+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
17593+$as_echo "$DLLTOOL" >&6; }
17594+else
17595+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
17596+$as_echo "no" >&6; }
17597+fi
17598+
17599+
17600+fi
17601+if test -z "$ac_cv_prog_DLLTOOL"; then
17602+ ac_ct_DLLTOOL=$DLLTOOL
17603+ # Extract the first word of "dlltool", so it can be a program name with args.
17604+set dummy dlltool; ac_word=$2
17605+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
17606+$as_echo_n "checking for $ac_word... " >&6; }
17607+if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then :
17608+ $as_echo_n "(cached) " >&6
17609+else
17610+ if test -n "$ac_ct_DLLTOOL"; then
17611+ ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
17612+else
17613+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
17614+for as_dir in $PATH
17615+do
17616+ IFS=$as_save_IFS
17617+ test -z "$as_dir" && as_dir=.
17618+ for ac_exec_ext in '' $ac_executable_extensions; do
17619+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
17620+ ac_cv_prog_ac_ct_DLLTOOL="dlltool"
17621+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
17622+ break 2
17623+ fi
17624+done
17625+ done
17626+IFS=$as_save_IFS
17627+
17628+fi
17629+fi
17630+ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
17631+if test -n "$ac_ct_DLLTOOL"; then
17632+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
17633+$as_echo "$ac_ct_DLLTOOL" >&6; }
17634+else
17635+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
17636+$as_echo "no" >&6; }
17637+fi
17638+
17639+ if test "x$ac_ct_DLLTOOL" = x; then
17640+ DLLTOOL="false"
17641+ else
17642+ case $cross_compiling:$ac_tool_warned in
17643+yes:)
17644+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
17645+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
17646+ac_tool_warned=yes ;;
17647+esac
17648+ DLLTOOL=$ac_ct_DLLTOOL
17649+ fi
17650+else
17651+ DLLTOOL="$ac_cv_prog_DLLTOOL"
17652+fi
17653+
17654+test -z "$DLLTOOL" && DLLTOOL=dlltool
17655+
17656+
17657+
17658+
17659+
17660+
17661+
17662+
17663+
17664+
17665+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5
17666+$as_echo_n "checking how to associate runtime and link libraries... " >&6; }
17667+if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then :
17668+ $as_echo_n "(cached) " >&6
17669+else
17670+ lt_cv_sharedlib_from_linklib_cmd='unknown'
17671+
17672+case $host_os in
17673+cygwin* | mingw* | pw32* | cegcc*)
17674+ # two different shell functions defined in ltmain.sh
17675+ # decide which to use based on capabilities of $DLLTOOL
17676+ case `$DLLTOOL --help 2>&1` in
17677+ *--identify-strict*)
17678+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
17679+ ;;
17680+ *)
17681+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
17682+ ;;
17683+ esac
17684+ ;;
17685+*)
17686+ # fallback: assume linklib IS sharedlib
17687+ lt_cv_sharedlib_from_linklib_cmd="$ECHO"
17688+ ;;
17689+esac
17690+
17691+fi
17692+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5
17693+$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; }
17694+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
17695+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
17696+
17697+
17698+
17699+
17700+
17701+
17702+
17703+if test -n "$ac_tool_prefix"; then
17704+ for ac_prog in ar
17705+ do
17706+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
17707+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
17708 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
17709 $as_echo_n "checking for $ac_word... " >&6; }
17710 if ${ac_cv_prog_AR+:} false; then :
17711@@ -6551,7 +6805,7 @@ do
17712 test -z "$as_dir" && as_dir=.
17713 for ac_exec_ext in '' $ac_executable_extensions; do
17714 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
17715- ac_cv_prog_AR="${ac_tool_prefix}ar"
17716+ ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
17717 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
17718 break 2
17719 fi
17720@@ -6571,11 +6825,15 @@ $as_echo "no" >&6; }
17721 fi
17722
17723
17724+ test -n "$AR" && break
17725+ done
17726 fi
17727-if test -z "$ac_cv_prog_AR"; then
17728+if test -z "$AR"; then
17729 ac_ct_AR=$AR
17730- # Extract the first word of "ar", so it can be a program name with args.
17731-set dummy ar; ac_word=$2
17732+ for ac_prog in ar
17733+do
17734+ # Extract the first word of "$ac_prog", so it can be a program name with args.
17735+set dummy $ac_prog; ac_word=$2
17736 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
17737 $as_echo_n "checking for $ac_word... " >&6; }
17738 if ${ac_cv_prog_ac_ct_AR+:} false; then :
17739@@ -6591,7 +6849,7 @@ do
17740 test -z "$as_dir" && as_dir=.
17741 for ac_exec_ext in '' $ac_executable_extensions; do
17742 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
17743- ac_cv_prog_ac_ct_AR="ar"
17744+ ac_cv_prog_ac_ct_AR="$ac_prog"
17745 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
17746 break 2
17747 fi
17748@@ -6610,6 +6868,10 @@ else
17749 $as_echo "no" >&6; }
17750 fi
17751
17752+
17753+ test -n "$ac_ct_AR" && break
17754+done
17755+
17756 if test "x$ac_ct_AR" = x; then
17757 AR="false"
17758 else
17759@@ -6621,12 +6883,11 @@ ac_tool_warned=yes ;;
17760 esac
17761 AR=$ac_ct_AR
17762 fi
17763-else
17764- AR="$ac_cv_prog_AR"
17765 fi
17766
17767-test -z "$AR" && AR=ar
17768-test -z "$AR_FLAGS" && AR_FLAGS=cru
17769+: ${AR=ar}
17770+: ${AR_FLAGS=cru}
17771+
17772
17773
17774
17775@@ -6637,6 +6898,63 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru
17776
17777
17778
17779+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
17780+$as_echo_n "checking for archiver @FILE support... " >&6; }
17781+if ${lt_cv_ar_at_file+:} false; then :
17782+ $as_echo_n "(cached) " >&6
17783+else
17784+ lt_cv_ar_at_file=no
17785+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
17786+/* end confdefs.h. */
17787+
17788+int
17789+main ()
17790+{
17791+
17792+ ;
17793+ return 0;
17794+}
17795+_ACEOF
17796+if ac_fn_c_try_compile "$LINENO"; then :
17797+ echo conftest.$ac_objext > conftest.lst
17798+ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5'
17799+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
17800+ (eval $lt_ar_try) 2>&5
17801+ ac_status=$?
17802+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
17803+ test $ac_status = 0; }
17804+ if test "$ac_status" -eq 0; then
17805+ # Ensure the archiver fails upon bogus file names.
17806+ rm -f conftest.$ac_objext libconftest.a
17807+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
17808+ (eval $lt_ar_try) 2>&5
17809+ ac_status=$?
17810+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
17811+ test $ac_status = 0; }
17812+ if test "$ac_status" -ne 0; then
17813+ lt_cv_ar_at_file=@
17814+ fi
17815+ fi
17816+ rm -f conftest.* libconftest.a
17817+
17818+fi
17819+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
17820+
17821+fi
17822+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
17823+$as_echo "$lt_cv_ar_at_file" >&6; }
17824+
17825+if test "x$lt_cv_ar_at_file" = xno; then
17826+ archiver_list_spec=
17827+else
17828+ archiver_list_spec=$lt_cv_ar_at_file
17829+fi
17830+
17831+
17832+
17833+
17834+
17835+
17836
17837 if test -n "$ac_tool_prefix"; then
17838 # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
17839@@ -6972,8 +7290,8 @@ esac
17840 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
17841
17842 # Transform an extracted symbol line into symbol name and symbol address
17843-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
17844-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'"
17845+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
17846+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'"
17847
17848 # Handle CRLF in mingw tool chain
17849 opt_cr=
17850@@ -7009,6 +7327,7 @@ for ac_symprfx in "" "_"; do
17851 else
17852 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
17853 fi
17854+ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
17855
17856 # Check to see that the pipe works correctly.
17857 pipe_works=no
17858@@ -7050,6 +7369,18 @@ _LT_EOF
17859 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
17860 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
17861 cat <<_LT_EOF > conftest.$ac_ext
17862+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */
17863+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
17864+/* DATA imports from DLLs on WIN32 con't be const, because runtime
17865+ relocations are performed -- see ld's documentation on pseudo-relocs. */
17866+# define LT_DLSYM_CONST
17867+#elif defined(__osf__)
17868+/* This system does not cope well with relocations in const data. */
17869+# define LT_DLSYM_CONST
17870+#else
17871+# define LT_DLSYM_CONST const
17872+#endif
17873+
17874 #ifdef __cplusplus
17875 extern "C" {
17876 #endif
17877@@ -7061,7 +7392,7 @@ _LT_EOF
17878 cat <<_LT_EOF >> conftest.$ac_ext
17879
17880 /* The mapping between symbol names and symbols. */
17881-const struct {
17882+LT_DLSYM_CONST struct {
17883 const char *name;
17884 void *address;
17885 }
17886@@ -7087,8 +7418,8 @@ static const void *lt_preloaded_setup()
17887 _LT_EOF
17888 # Now try linking the two files.
17889 mv conftest.$ac_objext conftstm.$ac_objext
17890- lt_save_LIBS="$LIBS"
17891- lt_save_CFLAGS="$CFLAGS"
17892+ lt_globsym_save_LIBS=$LIBS
17893+ lt_globsym_save_CFLAGS=$CFLAGS
17894 LIBS="conftstm.$ac_objext"
17895 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
17896 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
17897@@ -7098,8 +7429,8 @@ _LT_EOF
17898 test $ac_status = 0; } && test -s conftest${ac_exeext}; then
17899 pipe_works=yes
17900 fi
17901- LIBS="$lt_save_LIBS"
17902- CFLAGS="$lt_save_CFLAGS"
17903+ LIBS=$lt_globsym_save_LIBS
17904+ CFLAGS=$lt_globsym_save_CFLAGS
17905 else
17906 echo "cannot find nm_test_func in $nlist" >&5
17907 fi
17908@@ -7136,6 +7467,14 @@ else
17909 $as_echo "ok" >&6; }
17910 fi
17911
17912+# Response file support.
17913+if test "$lt_cv_nm_interface" = "MS dumpbin"; then
17914+ nm_file_list_spec='@'
17915+elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then
17916+ nm_file_list_spec='@'
17917+fi
17918+
17919+
17920
17921
17922
17923@@ -7157,6 +7496,47 @@ fi
17924
17925
17926
17927+
17928+
17929+
17930+
17931+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
17932+$as_echo_n "checking for sysroot... " >&6; }
17933+
17934+# Check whether --with-libtool-sysroot was given.
17935+if test "${with_libtool_sysroot+set}" = set; then :
17936+ withval=$with_libtool_sysroot;
17937+else
17938+ with_libtool_sysroot=no
17939+fi
17940+
17941+
17942+lt_sysroot=
17943+case ${with_libtool_sysroot} in #(
17944+ yes)
17945+ if test "$GCC" = yes; then
17946+ lt_sysroot=`$CC --print-sysroot 2>/dev/null`
17947+ fi
17948+ ;; #(
17949+ /*)
17950+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"`
17951+ ;; #(
17952+ no|'')
17953+ ;; #(
17954+ *)
17955+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5
17956+$as_echo "${with_libtool_sysroot}" >&6; }
17957+ as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5
17958+ ;;
17959+esac
17960+
17961+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
17962+$as_echo "${lt_sysroot:-no}" >&6; }
17963+
17964+
17965+
17966+
17967+
17968 # Check whether --enable-libtool-lock was given.
17969 if test "${enable_libtool_lock+set}" = set; then :
17970 enableval=$enable_libtool_lock;
17971@@ -7363,6 +7743,123 @@ esac
17972
17973 need_locks="$enable_libtool_lock"
17974
17975+if test -n "$ac_tool_prefix"; then
17976+ # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args.
17977+set dummy ${ac_tool_prefix}mt; ac_word=$2
17978+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
17979+$as_echo_n "checking for $ac_word... " >&6; }
17980+if ${ac_cv_prog_MANIFEST_TOOL+:} false; then :
17981+ $as_echo_n "(cached) " >&6
17982+else
17983+ if test -n "$MANIFEST_TOOL"; then
17984+ ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test.
17985+else
17986+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
17987+for as_dir in $PATH
17988+do
17989+ IFS=$as_save_IFS
17990+ test -z "$as_dir" && as_dir=.
17991+ for ac_exec_ext in '' $ac_executable_extensions; do
17992+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
17993+ ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
17994+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
17995+ break 2
17996+ fi
17997+done
17998+ done
17999+IFS=$as_save_IFS
18000+
18001+fi
18002+fi
18003+MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL
18004+if test -n "$MANIFEST_TOOL"; then
18005+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5
18006+$as_echo "$MANIFEST_TOOL" >&6; }
18007+else
18008+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
18009+$as_echo "no" >&6; }
18010+fi
18011+
18012+
18013+fi
18014+if test -z "$ac_cv_prog_MANIFEST_TOOL"; then
18015+ ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL
18016+ # Extract the first word of "mt", so it can be a program name with args.
18017+set dummy mt; ac_word=$2
18018+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
18019+$as_echo_n "checking for $ac_word... " >&6; }
18020+if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then :
18021+ $as_echo_n "(cached) " >&6
18022+else
18023+ if test -n "$ac_ct_MANIFEST_TOOL"; then
18024+ ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test.
18025+else
18026+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
18027+for as_dir in $PATH
18028+do
18029+ IFS=$as_save_IFS
18030+ test -z "$as_dir" && as_dir=.
18031+ for ac_exec_ext in '' $ac_executable_extensions; do
18032+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
18033+ ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
18034+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
18035+ break 2
18036+ fi
18037+done
18038+ done
18039+IFS=$as_save_IFS
18040+
18041+fi
18042+fi
18043+ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL
18044+if test -n "$ac_ct_MANIFEST_TOOL"; then
18045+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5
18046+$as_echo "$ac_ct_MANIFEST_TOOL" >&6; }
18047+else
18048+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
18049+$as_echo "no" >&6; }
18050+fi
18051+
18052+ if test "x$ac_ct_MANIFEST_TOOL" = x; then
18053+ MANIFEST_TOOL=":"
18054+ else
18055+ case $cross_compiling:$ac_tool_warned in
18056+yes:)
18057+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
18058+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
18059+ac_tool_warned=yes ;;
18060+esac
18061+ MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL
18062+ fi
18063+else
18064+ MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL"
18065+fi
18066+
18067+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
18068+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5
18069+$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; }
18070+if ${lt_cv_path_mainfest_tool+:} false; then :
18071+ $as_echo_n "(cached) " >&6
18072+else
18073+ lt_cv_path_mainfest_tool=no
18074+ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5
18075+ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
18076+ cat conftest.err >&5
18077+ if $GREP 'Manifest Tool' conftest.out > /dev/null; then
18078+ lt_cv_path_mainfest_tool=yes
18079+ fi
18080+ rm -f conftest*
18081+fi
18082+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5
18083+$as_echo "$lt_cv_path_mainfest_tool" >&6; }
18084+if test "x$lt_cv_path_mainfest_tool" != xyes; then
18085+ MANIFEST_TOOL=:
18086+fi
18087+
18088+
18089+
18090+
18091+
18092
18093 case $host_os in
18094 rhapsody* | darwin*)
18095@@ -7926,6 +8423,8 @@ _LT_EOF
18096 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
18097 echo "$AR cru libconftest.a conftest.o" >&5
18098 $AR cru libconftest.a conftest.o 2>&5
18099+ echo "$RANLIB libconftest.a" >&5
18100+ $RANLIB libconftest.a 2>&5
18101 cat > conftest.c << _LT_EOF
18102 int main() { return 0;}
18103 _LT_EOF
18104@@ -8091,7 +8590,8 @@ fi
18105 LIBTOOL_DEPS="$ltmain"
18106
18107 # Always use our own libtool.
18108-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
18109+LIBTOOL='$(SHELL) $(top_builddir)'
18110+LIBTOOL="$LIBTOOL/${host_alias}-libtool"
18111
18112
18113
18114@@ -8180,7 +8680,7 @@ aix3*)
18115 esac
18116
18117 # Global variables:
18118-ofile=libtool
18119+ofile=${host_alias}-libtool
18120 can_build_shared=yes
18121
18122 # All known linkers require a `.a' archive for static linking (except MSVC,
18123@@ -8478,8 +8978,6 @@ fi
18124 lt_prog_compiler_pic=
18125 lt_prog_compiler_static=
18126
18127-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
18128-$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
18129
18130 if test "$GCC" = yes; then
18131 lt_prog_compiler_wl='-Wl,'
18132@@ -8645,6 +9143,12 @@ $as_echo_n "checking for $compiler optio
18133 lt_prog_compiler_pic='--shared'
18134 lt_prog_compiler_static='--static'
18135 ;;
18136+ nagfor*)
18137+ # NAG Fortran compiler
18138+ lt_prog_compiler_wl='-Wl,-Wl,,'
18139+ lt_prog_compiler_pic='-PIC'
18140+ lt_prog_compiler_static='-Bstatic'
18141+ ;;
18142 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
18143 # Portland Group compilers (*not* the Pentium gcc compiler,
18144 # which looks to be a dead project)
18145@@ -8707,7 +9211,7 @@ $as_echo_n "checking for $compiler optio
18146 lt_prog_compiler_pic='-KPIC'
18147 lt_prog_compiler_static='-Bstatic'
18148 case $cc_basename in
18149- f77* | f90* | f95*)
18150+ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
18151 lt_prog_compiler_wl='-Qoption ld ';;
18152 *)
18153 lt_prog_compiler_wl='-Wl,';;
18154@@ -8764,13 +9268,17 @@ case $host_os in
18155 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
18156 ;;
18157 esac
18158-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5
18159-$as_echo "$lt_prog_compiler_pic" >&6; }
18160-
18161-
18162-
18163-
18164
18165+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
18166+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
18167+if ${lt_cv_prog_compiler_pic+:} false; then :
18168+ $as_echo_n "(cached) " >&6
18169+else
18170+ lt_cv_prog_compiler_pic=$lt_prog_compiler_pic
18171+fi
18172+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
18173+$as_echo "$lt_cv_prog_compiler_pic" >&6; }
18174+lt_prog_compiler_pic=$lt_cv_prog_compiler_pic
18175
18176 #
18177 # Check to make sure the PIC flag actually works.
18178@@ -8831,6 +9339,11 @@ fi
18179
18180
18181
18182+
18183+
18184+
18185+
18186+
18187 #
18188 # Check to make sure the static flag actually works.
18189 #
18190@@ -9181,7 +9694,8 @@ _LT_EOF
18191 allow_undefined_flag=unsupported
18192 always_export_symbols=no
18193 enable_shared_with_static_runtimes=yes
18194- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
18195+ 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'
18196+ exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
18197
18198 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
18199 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
18200@@ -9280,12 +9794,12 @@ _LT_EOF
18201 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
18202 hardcode_libdir_flag_spec=
18203 hardcode_libdir_flag_spec_ld='-rpath $libdir'
18204- archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
18205+ archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
18206 if test "x$supports_anon_versioning" = xyes; then
18207 archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
18208 cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
18209 echo "local: *; };" >> $output_objdir/$libname.ver~
18210- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
18211+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
18212 fi
18213 ;;
18214 esac
18215@@ -9299,8 +9813,8 @@ _LT_EOF
18216 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
18217 wlarc=
18218 else
18219- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
18220- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
18221+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
18222+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
18223 fi
18224 ;;
18225
18226@@ -9318,8 +9832,8 @@ _LT_EOF
18227
18228 _LT_EOF
18229 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
18230- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
18231- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
18232+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
18233+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
18234 else
18235 ld_shlibs=no
18236 fi
18237@@ -9365,8 +9879,8 @@ _LT_EOF
18238
18239 *)
18240 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
18241- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
18242- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
18243+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
18244+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
18245 else
18246 ld_shlibs=no
18247 fi
18248@@ -9496,7 +10010,13 @@ _LT_EOF
18249 allow_undefined_flag='-berok'
18250 # Determine the default libpath from the value encoded in an
18251 # empty executable.
18252- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
18253+ if test "${lt_cv_aix_libpath+set}" = set; then
18254+ aix_libpath=$lt_cv_aix_libpath
18255+else
18256+ if ${lt_cv_aix_libpath_+:} false; then :
18257+ $as_echo_n "(cached) " >&6
18258+else
18259+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
18260 /* end confdefs.h. */
18261
18262 int
18263@@ -9509,22 +10029,29 @@ main ()
18264 _ACEOF
18265 if ac_fn_c_try_link "$LINENO"; then :
18266
18267-lt_aix_libpath_sed='
18268- /Import File Strings/,/^$/ {
18269- /^0/ {
18270- s/^0 *\(.*\)$/\1/
18271- p
18272- }
18273- }'
18274-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
18275-# Check for a 64-bit object if we didn't find anything.
18276-if test -z "$aix_libpath"; then
18277- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
18278-fi
18279+ lt_aix_libpath_sed='
18280+ /Import File Strings/,/^$/ {
18281+ /^0/ {
18282+ s/^0 *\([^ ]*\) *$/\1/
18283+ p
18284+ }
18285+ }'
18286+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
18287+ # Check for a 64-bit object if we didn't find anything.
18288+ if test -z "$lt_cv_aix_libpath_"; then
18289+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
18290+ fi
18291 fi
18292 rm -f core conftest.err conftest.$ac_objext \
18293 conftest$ac_exeext conftest.$ac_ext
18294-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
18295+ if test -z "$lt_cv_aix_libpath_"; then
18296+ lt_cv_aix_libpath_="/usr/lib:/lib"
18297+ fi
18298+
18299+fi
18300+
18301+ aix_libpath=$lt_cv_aix_libpath_
18302+fi
18303
18304 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
18305 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"
18306@@ -9536,7 +10063,13 @@ if test -z "$aix_libpath"; then aix_libp
18307 else
18308 # Determine the default libpath from the value encoded in an
18309 # empty executable.
18310- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
18311+ if test "${lt_cv_aix_libpath+set}" = set; then
18312+ aix_libpath=$lt_cv_aix_libpath
18313+else
18314+ if ${lt_cv_aix_libpath_+:} false; then :
18315+ $as_echo_n "(cached) " >&6
18316+else
18317+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
18318 /* end confdefs.h. */
18319
18320 int
18321@@ -9549,22 +10082,29 @@ main ()
18322 _ACEOF
18323 if ac_fn_c_try_link "$LINENO"; then :
18324
18325-lt_aix_libpath_sed='
18326- /Import File Strings/,/^$/ {
18327- /^0/ {
18328- s/^0 *\(.*\)$/\1/
18329- p
18330- }
18331- }'
18332-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
18333-# Check for a 64-bit object if we didn't find anything.
18334-if test -z "$aix_libpath"; then
18335- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
18336-fi
18337+ lt_aix_libpath_sed='
18338+ /Import File Strings/,/^$/ {
18339+ /^0/ {
18340+ s/^0 *\([^ ]*\) *$/\1/
18341+ p
18342+ }
18343+ }'
18344+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
18345+ # Check for a 64-bit object if we didn't find anything.
18346+ if test -z "$lt_cv_aix_libpath_"; then
18347+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
18348+ fi
18349 fi
18350 rm -f core conftest.err conftest.$ac_objext \
18351 conftest$ac_exeext conftest.$ac_ext
18352-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
18353+ if test -z "$lt_cv_aix_libpath_"; then
18354+ lt_cv_aix_libpath_="/usr/lib:/lib"
18355+ fi
18356+
18357+fi
18358+
18359+ aix_libpath=$lt_cv_aix_libpath_
18360+fi
18361
18362 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
18363 # Warning - without using the other run time loading flags,
18364@@ -9609,20 +10149,63 @@ if test -z "$aix_libpath"; then aix_libp
18365 # Microsoft Visual C++.
18366 # hardcode_libdir_flag_spec is actually meaningless, as there is
18367 # no search path for DLLs.
18368- hardcode_libdir_flag_spec=' '
18369- allow_undefined_flag=unsupported
18370- # Tell ltmain to make .lib files, not .a files.
18371- libext=lib
18372- # Tell ltmain to make .dll files, not .so files.
18373- shrext_cmds=".dll"
18374- # FIXME: Setting linknames here is a bad hack.
18375- archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
18376- # The linker will automatically build a .lib file if we build a DLL.
18377- old_archive_from_new_cmds='true'
18378- # FIXME: Should let the user specify the lib program.
18379- old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
18380- fix_srcfile_path='`cygpath -w "$srcfile"`'
18381- enable_shared_with_static_runtimes=yes
18382+ case $cc_basename in
18383+ cl*)
18384+ # Native MSVC
18385+ hardcode_libdir_flag_spec=' '
18386+ allow_undefined_flag=unsupported
18387+ always_export_symbols=yes
18388+ file_list_spec='@'
18389+ # Tell ltmain to make .lib files, not .a files.
18390+ libext=lib
18391+ # Tell ltmain to make .dll files, not .so files.
18392+ shrext_cmds=".dll"
18393+ # FIXME: Setting linknames here is a bad hack.
18394+ archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
18395+ archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
18396+ sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
18397+ else
18398+ sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
18399+ fi~
18400+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
18401+ linknames='
18402+ # The linker will not automatically build a static lib if we build a DLL.
18403+ # _LT_TAGVAR(old_archive_from_new_cmds, )='true'
18404+ enable_shared_with_static_runtimes=yes
18405+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
18406+ # Don't use ranlib
18407+ old_postinstall_cmds='chmod 644 $oldlib'
18408+ postlink_cmds='lt_outputfile="@OUTPUT@"~
18409+ lt_tool_outputfile="@TOOL_OUTPUT@"~
18410+ case $lt_outputfile in
18411+ *.exe|*.EXE) ;;
18412+ *)
18413+ lt_outputfile="$lt_outputfile.exe"
18414+ lt_tool_outputfile="$lt_tool_outputfile.exe"
18415+ ;;
18416+ esac~
18417+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
18418+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
18419+ $RM "$lt_outputfile.manifest";
18420+ fi'
18421+ ;;
18422+ *)
18423+ # Assume MSVC wrapper
18424+ hardcode_libdir_flag_spec=' '
18425+ allow_undefined_flag=unsupported
18426+ # Tell ltmain to make .lib files, not .a files.
18427+ libext=lib
18428+ # Tell ltmain to make .dll files, not .so files.
18429+ shrext_cmds=".dll"
18430+ # FIXME: Setting linknames here is a bad hack.
18431+ archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
18432+ # The linker will automatically build a .lib file if we build a DLL.
18433+ old_archive_from_new_cmds='true'
18434+ # FIXME: Should let the user specify the lib program.
18435+ old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
18436+ enable_shared_with_static_runtimes=yes
18437+ ;;
18438+ esac
18439 ;;
18440
18441 darwin* | rhapsody*)
18442@@ -9683,7 +10266,7 @@ if test -z "$aix_libpath"; then aix_libp
18443
18444 # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
18445 freebsd* | dragonfly*)
18446- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
18447+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
18448 hardcode_libdir_flag_spec='-R$libdir'
18449 hardcode_direct=yes
18450 hardcode_shlibpath_var=no
18451@@ -9691,7 +10274,7 @@ if test -z "$aix_libpath"; then aix_libp
18452
18453 hpux9*)
18454 if test "$GCC" = yes; then
18455- 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'
18456+ 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'
18457 else
18458 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'
18459 fi
18460@@ -9707,7 +10290,7 @@ if test -z "$aix_libpath"; then aix_libp
18461
18462 hpux10*)
18463 if test "$GCC" = yes && test "$with_gnu_ld" = no; then
18464- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
18465+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
18466 else
18467 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
18468 fi
18469@@ -9731,10 +10314,10 @@ if test -z "$aix_libpath"; then aix_libp
18470 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
18471 ;;
18472 ia64*)
18473- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
18474+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
18475 ;;
18476 *)
18477- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
18478+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
18479 ;;
18480 esac
18481 else
18482@@ -9813,23 +10396,36 @@ fi
18483
18484 irix5* | irix6* | nonstopux*)
18485 if test "$GCC" = yes; then
18486- 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'
18487+ 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'
18488 # Try to use the -exported_symbol ld option, if it does not
18489 # work, assume that -exports_file does not work either and
18490 # implicitly export all symbols.
18491- save_LDFLAGS="$LDFLAGS"
18492- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
18493- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
18494+ # This should be the same for all languages, so no per-tag cache variable.
18495+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5
18496+$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; }
18497+if ${lt_cv_irix_exported_symbol+:} false; then :
18498+ $as_echo_n "(cached) " >&6
18499+else
18500+ save_LDFLAGS="$LDFLAGS"
18501+ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
18502+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
18503 /* end confdefs.h. */
18504-int foo(void) {}
18505+int foo (void) { return 0; }
18506 _ACEOF
18507 if ac_fn_c_try_link "$LINENO"; then :
18508- 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'
18509-
18510+ lt_cv_irix_exported_symbol=yes
18511+else
18512+ lt_cv_irix_exported_symbol=no
18513 fi
18514 rm -f core conftest.err conftest.$ac_objext \
18515 conftest$ac_exeext conftest.$ac_ext
18516- LDFLAGS="$save_LDFLAGS"
18517+ LDFLAGS="$save_LDFLAGS"
18518+fi
18519+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5
18520+$as_echo "$lt_cv_irix_exported_symbol" >&6; }
18521+ if test "$lt_cv_irix_exported_symbol" = yes; then
18522+ 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'
18523+ fi
18524 else
18525 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'
18526 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'
18527@@ -9914,7 +10510,7 @@ rm -f core conftest.err conftest.$ac_obj
18528 osf4* | osf5*) # as osf3* with the addition of -msym flag
18529 if test "$GCC" = yes; then
18530 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
18531- 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'
18532+ 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'
18533 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
18534 else
18535 allow_undefined_flag=' -expect_unresolved \*'
18536@@ -9933,9 +10529,9 @@ rm -f core conftest.err conftest.$ac_obj
18537 no_undefined_flag=' -z defs'
18538 if test "$GCC" = yes; then
18539 wlarc='${wl}'
18540- archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
18541+ archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
18542 archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
18543- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
18544+ $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'
18545 else
18546 case `$CC -V 2>&1` in
18547 *"Compilers 5.0"*)
18548@@ -10511,8 +11107,9 @@ cygwin* | mingw* | pw32* | cegcc*)
18549 need_version=no
18550 need_lib_prefix=no
18551
18552- case $GCC,$host_os in
18553- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
18554+ case $GCC,$cc_basename in
18555+ yes,*)
18556+ # gcc
18557 library_names_spec='$libname.dll.a'
18558 # DLL is installed to $(libdir)/../bin by postinstall_cmds
18559 postinstall_cmds='base_file=`basename \${file}`~
18560@@ -10545,13 +11142,71 @@ cygwin* | mingw* | pw32* | cegcc*)
18561 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
18562 ;;
18563 esac
18564+ dynamic_linker='Win32 ld.exe'
18565+ ;;
18566+
18567+ *,cl*)
18568+ # Native MSVC
18569+ libname_spec='$name'
18570+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
18571+ library_names_spec='${libname}.dll.lib'
18572+
18573+ case $build_os in
18574+ mingw*)
18575+ sys_lib_search_path_spec=
18576+ lt_save_ifs=$IFS
18577+ IFS=';'
18578+ for lt_path in $LIB
18579+ do
18580+ IFS=$lt_save_ifs
18581+ # Let DOS variable expansion print the short 8.3 style file name.
18582+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
18583+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
18584+ done
18585+ IFS=$lt_save_ifs
18586+ # Convert to MSYS style.
18587+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
18588+ ;;
18589+ cygwin*)
18590+ # Convert to unix form, then to dos form, then back to unix form
18591+ # but this time dos style (no spaces!) so that the unix form looks
18592+ # like /cygdrive/c/PROGRA~1:/cygdr...
18593+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
18594+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
18595+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
18596+ ;;
18597+ *)
18598+ sys_lib_search_path_spec="$LIB"
18599+ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
18600+ # It is most probably a Windows format PATH.
18601+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
18602+ else
18603+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
18604+ fi
18605+ # FIXME: find the short name or the path components, as spaces are
18606+ # common. (e.g. "Program Files" -> "PROGRA~1")
18607+ ;;
18608+ esac
18609+
18610+ # DLL is installed to $(libdir)/../bin by postinstall_cmds
18611+ postinstall_cmds='base_file=`basename \${file}`~
18612+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
18613+ dldir=$destdir/`dirname \$dlpath`~
18614+ test -d \$dldir || mkdir -p \$dldir~
18615+ $install_prog $dir/$dlname \$dldir/$dlname'
18616+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
18617+ dlpath=$dir/\$dldll~
18618+ $RM \$dlpath'
18619+ shlibpath_overrides_runpath=yes
18620+ dynamic_linker='Win32 link.exe'
18621 ;;
18622
18623 *)
18624+ # Assume MSVC wrapper
18625 library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
18626+ dynamic_linker='Win32 ld.exe'
18627 ;;
18628 esac
18629- dynamic_linker='Win32 ld.exe'
18630 # FIXME: first we should search . and the directory the executable is in
18631 shlibpath_var=PATH
18632 ;;
18633@@ -10643,7 +11298,7 @@ haiku*)
18634 soname_spec='${libname}${release}${shared_ext}$major'
18635 shlibpath_var=LIBRARY_PATH
18636 shlibpath_overrides_runpath=yes
18637- sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib'
18638+ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
18639 hardcode_into_libs=yes
18640 ;;
18641
18642@@ -11439,7 +12094,7 @@ else
18643 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
18644 lt_status=$lt_dlunknown
18645 cat > conftest.$ac_ext <<_LT_EOF
18646-#line 11442 "configure"
18647+#line $LINENO "configure"
18648 #include "confdefs.h"
18649
18650 #if HAVE_DLFCN_H
18651@@ -11483,10 +12138,10 @@ else
18652 /* When -fvisbility=hidden is used, assume the code has been annotated
18653 correspondingly for the symbols needed. */
18654 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
18655-void fnord () __attribute__((visibility("default")));
18656+int fnord () __attribute__((visibility("default")));
18657 #endif
18658
18659-void fnord () { int i=42; }
18660+int fnord () { return 42; }
18661 int main ()
18662 {
18663 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
18664@@ -11545,7 +12200,7 @@ else
18665 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
18666 lt_status=$lt_dlunknown
18667 cat > conftest.$ac_ext <<_LT_EOF
18668-#line 11548 "configure"
18669+#line $LINENO "configure"
18670 #include "confdefs.h"
18671
18672 #if HAVE_DLFCN_H
18673@@ -11589,10 +12244,10 @@ else
18674 /* When -fvisbility=hidden is used, assume the code has been annotated
18675 correspondingly for the symbols needed. */
18676 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
18677-void fnord () __attribute__((visibility("default")));
18678+int fnord () __attribute__((visibility("default")));
18679 #endif
18680
18681-void fnord () { int i=42; }
18682+int fnord () { return 42; }
18683 int main ()
18684 {
18685 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
18686@@ -12779,7 +13434,7 @@ if test "$enable_shared" = "yes"; then
18687 # since libbfd may not pull in the entirety of libiberty.
18688 x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'`
18689 if test -n "$x"; then
18690- SHARED_LIBADD="-L`pwd`/../libiberty/pic -liberty"
18691+ SHARED_LIBADD="`pwd`/../libiberty/pic/libiberty.a"
18692 fi
18693
18694 case "${host}" in
18695@@ -13757,13 +14412,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_
18696 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
18697 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
18698 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
18699+lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`'
18700+lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`'
18701 reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
18702 reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
18703 OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
18704 deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`'
18705 file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`'
18706+file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`'
18707+want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`'
18708+DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`'
18709+sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`'
18710 AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`'
18711 AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`'
18712+archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`'
18713 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
18714 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
18715 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
18716@@ -13778,14 +14440,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$l
18717 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
18718 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
18719 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"`'
18720+nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`'
18721+lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`'
18722 objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`'
18723 MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`'
18724 lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`'
18725-lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
18726 lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`'
18727+lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
18728 lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`'
18729 lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`'
18730 need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`'
18731+MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`'
18732 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
18733 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
18734 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
18735@@ -13818,12 +14483,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcod
18736 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
18737 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
18738 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
18739-fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`'
18740 always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`'
18741 export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`'
18742 exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`'
18743 include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`'
18744 prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`'
18745+postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`'
18746 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
18747 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
18748 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
18749@@ -13878,8 +14543,13 @@ reload_flag \
18750 OBJDUMP \
18751 deplibs_check_method \
18752 file_magic_cmd \
18753+file_magic_glob \
18754+want_nocaseglob \
18755+DLLTOOL \
18756+sharedlib_from_linklib_cmd \
18757 AR \
18758 AR_FLAGS \
18759+archiver_list_spec \
18760 STRIP \
18761 RANLIB \
18762 CC \
18763@@ -13889,12 +14559,14 @@ lt_cv_sys_global_symbol_pipe \
18764 lt_cv_sys_global_symbol_to_cdecl \
18765 lt_cv_sys_global_symbol_to_c_name_address \
18766 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
18767+nm_file_list_spec \
18768 lt_prog_compiler_no_builtin_flag \
18769-lt_prog_compiler_wl \
18770 lt_prog_compiler_pic \
18771+lt_prog_compiler_wl \
18772 lt_prog_compiler_static \
18773 lt_cv_prog_compiler_c_o \
18774 need_locks \
18775+MANIFEST_TOOL \
18776 DSYMUTIL \
18777 NMEDIT \
18778 LIPO \
18779@@ -13910,7 +14582,6 @@ no_undefined_flag \
18780 hardcode_libdir_flag_spec \
18781 hardcode_libdir_flag_spec_ld \
18782 hardcode_libdir_separator \
18783-fix_srcfile_path \
18784 exclude_expsyms \
18785 include_expsyms \
18786 file_list_spec \
18787@@ -13946,6 +14617,7 @@ module_cmds \
18788 module_expsym_cmds \
18789 export_symbols_cmds \
18790 prelink_cmds \
18791+postlink_cmds \
18792 postinstall_cmds \
18793 postuninstall_cmds \
18794 finish_cmds \
18795@@ -14711,7 +15383,8 @@ $as_echo X"$file" |
18796 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
18797 #
18798 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
18799-# 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
18800+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
18801+# Inc.
18802 # Written by Gordon Matzigkeit, 1996
18803 #
18804 # This file is part of GNU Libtool.
18805@@ -14814,19 +15487,42 @@ SP2NL=$lt_lt_SP2NL
18806 # turn newlines into spaces.
18807 NL2SP=$lt_lt_NL2SP
18808
18809+# convert \$build file names to \$host format.
18810+to_host_file_cmd=$lt_cv_to_host_file_cmd
18811+
18812+# convert \$build files to toolchain format.
18813+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
18814+
18815 # An object symbol dumper.
18816 OBJDUMP=$lt_OBJDUMP
18817
18818 # Method to check whether dependent libraries are shared objects.
18819 deplibs_check_method=$lt_deplibs_check_method
18820
18821-# Command to use when deplibs_check_method == "file_magic".
18822+# Command to use when deplibs_check_method = "file_magic".
18823 file_magic_cmd=$lt_file_magic_cmd
18824
18825+# How to find potential files when deplibs_check_method = "file_magic".
18826+file_magic_glob=$lt_file_magic_glob
18827+
18828+# Find potential files using nocaseglob when deplibs_check_method = "file_magic".
18829+want_nocaseglob=$lt_want_nocaseglob
18830+
18831+# DLL creation program.
18832+DLLTOOL=$lt_DLLTOOL
18833+
18834+# Command to associate shared and link libraries.
18835+sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd
18836+
18837 # The archiver.
18838 AR=$lt_AR
18839+
18840+# Flags to create an archive.
18841 AR_FLAGS=$lt_AR_FLAGS
18842
18843+# How to feed a file listing to the archiver.
18844+archiver_list_spec=$lt_archiver_list_spec
18845+
18846 # A symbol stripping program.
18847 STRIP=$lt_STRIP
18848
18849@@ -14856,6 +15552,12 @@ global_symbol_to_c_name_address=$lt_lt_c
18850 # Transform the output of nm in a C name address pair when lib prefix is needed.
18851 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
18852
18853+# Specify filename containing input files for \$NM.
18854+nm_file_list_spec=$lt_nm_file_list_spec
18855+
18856+# The root where to search for dependent libraries,and in which our libraries should be installed.
18857+lt_sysroot=$lt_sysroot
18858+
18859 # The name of the directory that contains temporary libtool files.
18860 objdir=$objdir
18861
18862@@ -14865,6 +15567,9 @@ MAGIC_CMD=$MAGIC_CMD
18863 # Must we lock files when doing compilation?
18864 need_locks=$lt_need_locks
18865
18866+# Manifest tool.
18867+MANIFEST_TOOL=$lt_MANIFEST_TOOL
18868+
18869 # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
18870 DSYMUTIL=$lt_DSYMUTIL
18871
18872@@ -14979,12 +15684,12 @@ with_gcc=$GCC
18873 # Compiler flag to turn off builtin functions.
18874 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
18875
18876-# How to pass a linker flag through the compiler.
18877-wl=$lt_lt_prog_compiler_wl
18878-
18879 # Additional compiler flags for building library objects.
18880 pic_flag=$lt_lt_prog_compiler_pic
18881
18882+# How to pass a linker flag through the compiler.
18883+wl=$lt_lt_prog_compiler_wl
18884+
18885 # Compiler flag to prevent dynamic linking.
18886 link_static_flag=$lt_lt_prog_compiler_static
18887
18888@@ -15071,9 +15776,6 @@ inherit_rpath=$inherit_rpath
18889 # Whether libtool must link a program against all its dependency libraries.
18890 link_all_deplibs=$link_all_deplibs
18891
18892-# Fix the shell variable \$srcfile for the compiler.
18893-fix_srcfile_path=$lt_fix_srcfile_path
18894-
18895 # Set to "yes" if exported symbols are required.
18896 always_export_symbols=$always_export_symbols
18897
18898@@ -15089,6 +15791,9 @@ include_expsyms=$lt_include_expsyms
18899 # Commands necessary for linking programs (against libraries) with templates.
18900 prelink_cmds=$lt_prelink_cmds
18901
18902+# Commands necessary for finishing linking programs.
18903+postlink_cmds=$lt_postlink_cmds
18904+
18905 # Specify filename containing input files.
18906 file_list_spec=$lt_file_list_spec
18907
18908@@ -15121,210 +15826,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
18909 # if finds mixed CR/LF and LF-only lines. Since sed operates in
18910 # text mode, it properly converts lines to CR/LF. This bash problem
18911 # is reportedly fixed, but why not run on old versions too?
18912- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
18913- || (rm -f "$cfgfile"; exit 1)
18914-
18915- case $xsi_shell in
18916- yes)
18917- cat << \_LT_EOF >> "$cfgfile"
18918-
18919-# func_dirname file append nondir_replacement
18920-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
18921-# otherwise set result to NONDIR_REPLACEMENT.
18922-func_dirname ()
18923-{
18924- case ${1} in
18925- */*) func_dirname_result="${1%/*}${2}" ;;
18926- * ) func_dirname_result="${3}" ;;
18927- esac
18928-}
18929-
18930-# func_basename file
18931-func_basename ()
18932-{
18933- func_basename_result="${1##*/}"
18934-}
18935-
18936-# func_dirname_and_basename file append nondir_replacement
18937-# perform func_basename and func_dirname in a single function
18938-# call:
18939-# dirname: Compute the dirname of FILE. If nonempty,
18940-# add APPEND to the result, otherwise set result
18941-# to NONDIR_REPLACEMENT.
18942-# value returned in "$func_dirname_result"
18943-# basename: Compute filename of FILE.
18944-# value retuned in "$func_basename_result"
18945-# Implementation must be kept synchronized with func_dirname
18946-# and func_basename. For efficiency, we do not delegate to
18947-# those functions but instead duplicate the functionality here.
18948-func_dirname_and_basename ()
18949-{
18950- case ${1} in
18951- */*) func_dirname_result="${1%/*}${2}" ;;
18952- * ) func_dirname_result="${3}" ;;
18953- esac
18954- func_basename_result="${1##*/}"
18955-}
18956-
18957-# func_stripname prefix suffix name
18958-# strip PREFIX and SUFFIX off of NAME.
18959-# PREFIX and SUFFIX must not contain globbing or regex special
18960-# characters, hashes, percent signs, but SUFFIX may contain a leading
18961-# dot (in which case that matches only a dot).
18962-func_stripname ()
18963-{
18964- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
18965- # positional parameters, so assign one to ordinary parameter first.
18966- func_stripname_result=${3}
18967- func_stripname_result=${func_stripname_result#"${1}"}
18968- func_stripname_result=${func_stripname_result%"${2}"}
18969-}
18970-
18971-# func_opt_split
18972-func_opt_split ()
18973-{
18974- func_opt_split_opt=${1%%=*}
18975- func_opt_split_arg=${1#*=}
18976-}
18977-
18978-# func_lo2o object
18979-func_lo2o ()
18980-{
18981- case ${1} in
18982- *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
18983- *) func_lo2o_result=${1} ;;
18984- esac
18985-}
18986-
18987-# func_xform libobj-or-source
18988-func_xform ()
18989-{
18990- func_xform_result=${1%.*}.lo
18991-}
18992-
18993-# func_arith arithmetic-term...
18994-func_arith ()
18995-{
18996- func_arith_result=$(( $* ))
18997-}
18998-
18999-# func_len string
19000-# STRING may not start with a hyphen.
19001-func_len ()
19002-{
19003- func_len_result=${#1}
19004-}
19005-
19006-_LT_EOF
19007- ;;
19008- *) # Bourne compatible functions.
19009- cat << \_LT_EOF >> "$cfgfile"
19010-
19011-# func_dirname file append nondir_replacement
19012-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
19013-# otherwise set result to NONDIR_REPLACEMENT.
19014-func_dirname ()
19015-{
19016- # Extract subdirectory from the argument.
19017- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
19018- if test "X$func_dirname_result" = "X${1}"; then
19019- func_dirname_result="${3}"
19020- else
19021- func_dirname_result="$func_dirname_result${2}"
19022- fi
19023-}
19024-
19025-# func_basename file
19026-func_basename ()
19027-{
19028- func_basename_result=`$ECHO "${1}" | $SED "$basename"`
19029-}
19030-
19031-
19032-# func_stripname prefix suffix name
19033-# strip PREFIX and SUFFIX off of NAME.
19034-# PREFIX and SUFFIX must not contain globbing or regex special
19035-# characters, hashes, percent signs, but SUFFIX may contain a leading
19036-# dot (in which case that matches only a dot).
19037-# func_strip_suffix prefix name
19038-func_stripname ()
19039-{
19040- case ${2} in
19041- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
19042- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
19043- esac
19044-}
19045-
19046-# sed scripts:
19047-my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q'
19048-my_sed_long_arg='1s/^-[^=]*=//'
19049-
19050-# func_opt_split
19051-func_opt_split ()
19052-{
19053- func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"`
19054- func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"`
19055-}
19056-
19057-# func_lo2o object
19058-func_lo2o ()
19059-{
19060- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
19061-}
19062-
19063-# func_xform libobj-or-source
19064-func_xform ()
19065-{
19066- func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`
19067-}
19068-
19069-# func_arith arithmetic-term...
19070-func_arith ()
19071-{
19072- func_arith_result=`expr "$@"`
19073-}
19074-
19075-# func_len string
19076-# STRING may not start with a hyphen.
19077-func_len ()
19078-{
19079- func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len`
19080-}
19081-
19082-_LT_EOF
19083-esac
19084-
19085-case $lt_shell_append in
19086- yes)
19087- cat << \_LT_EOF >> "$cfgfile"
19088-
19089-# func_append var value
19090-# Append VALUE to the end of shell variable VAR.
19091-func_append ()
19092-{
19093- eval "$1+=\$2"
19094-}
19095-_LT_EOF
19096- ;;
19097- *)
19098- cat << \_LT_EOF >> "$cfgfile"
19099-
19100-# func_append var value
19101-# Append VALUE to the end of shell variable VAR.
19102-func_append ()
19103-{
19104- eval "$1=\$$1\$2"
19105-}
19106-
19107-_LT_EOF
19108- ;;
19109- esac
19110+ sed '$q' "$ltmain" >> "$cfgfile" \
19111+ || (rm -f "$cfgfile"; exit 1)
19112
19113+ if test x"$xsi_shell" = xyes; then
19114+ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\
19115+func_dirname ()\
19116+{\
19117+\ case ${1} in\
19118+\ */*) func_dirname_result="${1%/*}${2}" ;;\
19119+\ * ) func_dirname_result="${3}" ;;\
19120+\ esac\
19121+} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \
19122+ && mv -f "$cfgfile.tmp" "$cfgfile" \
19123+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
19124+test 0 -eq $? || _lt_function_replace_fail=:
19125+
19126+
19127+ sed -e '/^func_basename ()$/,/^} # func_basename /c\
19128+func_basename ()\
19129+{\
19130+\ func_basename_result="${1##*/}"\
19131+} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \
19132+ && mv -f "$cfgfile.tmp" "$cfgfile" \
19133+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
19134+test 0 -eq $? || _lt_function_replace_fail=:
19135+
19136+
19137+ sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\
19138+func_dirname_and_basename ()\
19139+{\
19140+\ case ${1} in\
19141+\ */*) func_dirname_result="${1%/*}${2}" ;;\
19142+\ * ) func_dirname_result="${3}" ;;\
19143+\ esac\
19144+\ func_basename_result="${1##*/}"\
19145+} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \
19146+ && mv -f "$cfgfile.tmp" "$cfgfile" \
19147+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
19148+test 0 -eq $? || _lt_function_replace_fail=:
19149+
19150+
19151+ sed -e '/^func_stripname ()$/,/^} # func_stripname /c\
19152+func_stripname ()\
19153+{\
19154+\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\
19155+\ # positional parameters, so assign one to ordinary parameter first.\
19156+\ func_stripname_result=${3}\
19157+\ func_stripname_result=${func_stripname_result#"${1}"}\
19158+\ func_stripname_result=${func_stripname_result%"${2}"}\
19159+} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \
19160+ && mv -f "$cfgfile.tmp" "$cfgfile" \
19161+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
19162+test 0 -eq $? || _lt_function_replace_fail=:
19163+
19164+
19165+ sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\
19166+func_split_long_opt ()\
19167+{\
19168+\ func_split_long_opt_name=${1%%=*}\
19169+\ func_split_long_opt_arg=${1#*=}\
19170+} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \
19171+ && mv -f "$cfgfile.tmp" "$cfgfile" \
19172+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
19173+test 0 -eq $? || _lt_function_replace_fail=:
19174+
19175+
19176+ sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\
19177+func_split_short_opt ()\
19178+{\
19179+\ func_split_short_opt_arg=${1#??}\
19180+\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\
19181+} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \
19182+ && mv -f "$cfgfile.tmp" "$cfgfile" \
19183+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
19184+test 0 -eq $? || _lt_function_replace_fail=:
19185+
19186+
19187+ sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\
19188+func_lo2o ()\
19189+{\
19190+\ case ${1} in\
19191+\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\
19192+\ *) func_lo2o_result=${1} ;;\
19193+\ esac\
19194+} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \
19195+ && mv -f "$cfgfile.tmp" "$cfgfile" \
19196+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
19197+test 0 -eq $? || _lt_function_replace_fail=:
19198+
19199+
19200+ sed -e '/^func_xform ()$/,/^} # func_xform /c\
19201+func_xform ()\
19202+{\
19203+ func_xform_result=${1%.*}.lo\
19204+} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \
19205+ && mv -f "$cfgfile.tmp" "$cfgfile" \
19206+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
19207+test 0 -eq $? || _lt_function_replace_fail=:
19208+
19209+
19210+ sed -e '/^func_arith ()$/,/^} # func_arith /c\
19211+func_arith ()\
19212+{\
19213+ func_arith_result=$(( $* ))\
19214+} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \
19215+ && mv -f "$cfgfile.tmp" "$cfgfile" \
19216+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
19217+test 0 -eq $? || _lt_function_replace_fail=:
19218+
19219+
19220+ sed -e '/^func_len ()$/,/^} # func_len /c\
19221+func_len ()\
19222+{\
19223+ func_len_result=${#1}\
19224+} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \
19225+ && mv -f "$cfgfile.tmp" "$cfgfile" \
19226+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
19227+test 0 -eq $? || _lt_function_replace_fail=:
19228+
19229+fi
19230+
19231+if test x"$lt_shell_append" = xyes; then
19232+ sed -e '/^func_append ()$/,/^} # func_append /c\
19233+func_append ()\
19234+{\
19235+ eval "${1}+=\\${2}"\
19236+} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \
19237+ && mv -f "$cfgfile.tmp" "$cfgfile" \
19238+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
19239+test 0 -eq $? || _lt_function_replace_fail=:
19240+
19241+
19242+ sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\
19243+func_append_quoted ()\
19244+{\
19245+\ func_quote_for_eval "${2}"\
19246+\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\
19247+} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \
19248+ && mv -f "$cfgfile.tmp" "$cfgfile" \
19249+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
19250+test 0 -eq $? || _lt_function_replace_fail=:
19251+
19252+
19253+ # Save a `func_append' function call where possible by direct use of '+='
19254+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
19255+ && mv -f "$cfgfile.tmp" "$cfgfile" \
19256+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
19257+ test 0 -eq $? || _lt_function_replace_fail=:
19258+else
19259+ # Save a `func_append' function call even when '+=' is not available
19260+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
19261+ && mv -f "$cfgfile.tmp" "$cfgfile" \
19262+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
19263+ test 0 -eq $? || _lt_function_replace_fail=:
19264+fi
19265+
19266+if test x"$_lt_function_replace_fail" = x":"; then
19267+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5
19268+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;}
19269+fi
19270
19271- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
19272- || (rm -f "$cfgfile"; exit 1)
19273
19274- mv -f "$cfgfile" "$ofile" ||
19275+ mv -f "$cfgfile" "$ofile" ||
19276 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
19277 chmod +x "$ofile"
19278
19279--- a/opcodes/configure.ac
19280+++ b/opcodes/configure.ac
19281@@ -170,7 +170,7 @@ changequote(,)dnl
19282 x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'`
19283 changequote([,])dnl
19284 if test -n "$x"; then
19285- SHARED_LIBADD="-L`pwd`/../libiberty/pic -liberty"
19286+ SHARED_LIBADD="`pwd`/../libiberty/pic/libiberty.a"
19287 fi
19288
19289 case "${host}" in
19290--- a/zlib/configure
19291+++ b/zlib/configure
19292@@ -646,8 +646,11 @@ OTOOL
19293 LIPO
19294 NMEDIT
19295 DSYMUTIL
19296+MANIFEST_TOOL
19297 RANLIB
19298+ac_ct_AR
19299 AR
19300+DLLTOOL
19301 OBJDUMP
19302 LN_S
19303 NM
19304@@ -774,6 +777,7 @@ enable_static
19305 with_pic
19306 enable_fast_install
19307 with_gnu_ld
19308+with_libtool_sysroot
19309 enable_libtool_lock
19310 enable_host_shared
19311 '
19312@@ -1428,6 +1432,8 @@ Optional Packages:
19313 --with-pic try to use only PIC/non-PIC objects [default=use
19314 both]
19315 --with-gnu-ld assume the C compiler uses GNU ld [default=no]
19316+ --with-libtool-sysroot=DIR Search for dependent libraries within DIR
19317+ (or the compiler's sysroot if not specified).
19318
19319 Some influential environment variables:
19320 CC C compiler command
19321@@ -4147,8 +4153,8 @@ esac
19322
19323
19324
19325-macro_version='2.2.7a'
19326-macro_revision='1.3134'
19327+macro_version='2.4'
19328+macro_revision='1.3293'
19329
19330
19331
19332@@ -4188,7 +4194,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
19333 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
19334 $as_echo_n "checking how to print strings... " >&6; }
19335 # Test print first, because it will be a builtin if present.
19336-if test "X`print -r -- -n 2>/dev/null`" = X-n && \
19337+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
19338 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
19339 ECHO='print -r --'
19340 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
19341@@ -5004,8 +5010,8 @@ $as_echo_n "checking whether the shell u
19342 # Try some XSI features
19343 xsi_shell=no
19344 ( _lt_dummy="a/b/c"
19345- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
19346- = c,a/b,, \
19347+ test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
19348+ = c,a/b,b/c, \
19349 && eval 'test $(( 1 + 1 )) -eq 2 \
19350 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
19351 && xsi_shell=yes
19352@@ -5054,6 +5060,80 @@ esac
19353
19354
19355
19356+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5
19357+$as_echo_n "checking how to convert $build file names to $host format... " >&6; }
19358+if ${lt_cv_to_host_file_cmd+:} false; then :
19359+ $as_echo_n "(cached) " >&6
19360+else
19361+ case $host in
19362+ *-*-mingw* )
19363+ case $build in
19364+ *-*-mingw* ) # actually msys
19365+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
19366+ ;;
19367+ *-*-cygwin* )
19368+ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
19369+ ;;
19370+ * ) # otherwise, assume *nix
19371+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
19372+ ;;
19373+ esac
19374+ ;;
19375+ *-*-cygwin* )
19376+ case $build in
19377+ *-*-mingw* ) # actually msys
19378+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
19379+ ;;
19380+ *-*-cygwin* )
19381+ lt_cv_to_host_file_cmd=func_convert_file_noop
19382+ ;;
19383+ * ) # otherwise, assume *nix
19384+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
19385+ ;;
19386+ esac
19387+ ;;
19388+ * ) # unhandled hosts (and "normal" native builds)
19389+ lt_cv_to_host_file_cmd=func_convert_file_noop
19390+ ;;
19391+esac
19392+
19393+fi
19394+
19395+to_host_file_cmd=$lt_cv_to_host_file_cmd
19396+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5
19397+$as_echo "$lt_cv_to_host_file_cmd" >&6; }
19398+
19399+
19400+
19401+
19402+
19403+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5
19404+$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; }
19405+if ${lt_cv_to_tool_file_cmd+:} false; then :
19406+ $as_echo_n "(cached) " >&6
19407+else
19408+ #assume ordinary cross tools, or native build.
19409+lt_cv_to_tool_file_cmd=func_convert_file_noop
19410+case $host in
19411+ *-*-mingw* )
19412+ case $build in
19413+ *-*-mingw* ) # actually msys
19414+ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
19415+ ;;
19416+ esac
19417+ ;;
19418+esac
19419+
19420+fi
19421+
19422+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
19423+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5
19424+$as_echo "$lt_cv_to_tool_file_cmd" >&6; }
19425+
19426+
19427+
19428+
19429+
19430 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
19431 $as_echo_n "checking for $LD option to reload object files... " >&6; }
19432 if ${lt_cv_ld_reload_flag+:} false; then :
19433@@ -5070,6 +5150,11 @@ case $reload_flag in
19434 esac
19435 reload_cmds='$LD$reload_flag -o $output$reload_objs'
19436 case $host_os in
19437+ cygwin* | mingw* | pw32* | cegcc*)
19438+ if test "$GCC" != yes; then
19439+ reload_cmds=false
19440+ fi
19441+ ;;
19442 darwin*)
19443 if test "$GCC" = yes; then
19444 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
19445@@ -5238,7 +5323,8 @@ mingw* | pw32*)
19446 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
19447 lt_cv_file_magic_cmd='func_win32_libid'
19448 else
19449- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
19450+ # Keep this pattern in sync with the one in func_win32_libid.
19451+ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
19452 lt_cv_file_magic_cmd='$OBJDUMP -f'
19453 fi
19454 ;;
19455@@ -5392,6 +5478,21 @@ esac
19456 fi
19457 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
19458 $as_echo "$lt_cv_deplibs_check_method" >&6; }
19459+
19460+file_magic_glob=
19461+want_nocaseglob=no
19462+if test "$build" = "$host"; then
19463+ case $host_os in
19464+ mingw* | pw32*)
19465+ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
19466+ want_nocaseglob=yes
19467+ else
19468+ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"`
19469+ fi
19470+ ;;
19471+ esac
19472+fi
19473+
19474 file_magic_cmd=$lt_cv_file_magic_cmd
19475 deplibs_check_method=$lt_cv_deplibs_check_method
19476 test -z "$deplibs_check_method" && deplibs_check_method=unknown
19477@@ -5407,9 +5508,163 @@ test -z "$deplibs_check_method" && depli
19478
19479
19480
19481+
19482+
19483+
19484+
19485+
19486+
19487+
19488+
19489+
19490+
19491 if test -n "$ac_tool_prefix"; then
19492- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
19493-set dummy ${ac_tool_prefix}ar; ac_word=$2
19494+ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
19495+set dummy ${ac_tool_prefix}dlltool; ac_word=$2
19496+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
19497+$as_echo_n "checking for $ac_word... " >&6; }
19498+if ${ac_cv_prog_DLLTOOL+:} false; then :
19499+ $as_echo_n "(cached) " >&6
19500+else
19501+ if test -n "$DLLTOOL"; then
19502+ ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
19503+else
19504+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
19505+for as_dir in $PATH
19506+do
19507+ IFS=$as_save_IFS
19508+ test -z "$as_dir" && as_dir=.
19509+ for ac_exec_ext in '' $ac_executable_extensions; do
19510+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
19511+ ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
19512+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
19513+ break 2
19514+ fi
19515+done
19516+ done
19517+IFS=$as_save_IFS
19518+
19519+fi
19520+fi
19521+DLLTOOL=$ac_cv_prog_DLLTOOL
19522+if test -n "$DLLTOOL"; then
19523+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
19524+$as_echo "$DLLTOOL" >&6; }
19525+else
19526+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
19527+$as_echo "no" >&6; }
19528+fi
19529+
19530+
19531+fi
19532+if test -z "$ac_cv_prog_DLLTOOL"; then
19533+ ac_ct_DLLTOOL=$DLLTOOL
19534+ # Extract the first word of "dlltool", so it can be a program name with args.
19535+set dummy dlltool; ac_word=$2
19536+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
19537+$as_echo_n "checking for $ac_word... " >&6; }
19538+if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then :
19539+ $as_echo_n "(cached) " >&6
19540+else
19541+ if test -n "$ac_ct_DLLTOOL"; then
19542+ ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
19543+else
19544+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
19545+for as_dir in $PATH
19546+do
19547+ IFS=$as_save_IFS
19548+ test -z "$as_dir" && as_dir=.
19549+ for ac_exec_ext in '' $ac_executable_extensions; do
19550+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
19551+ ac_cv_prog_ac_ct_DLLTOOL="dlltool"
19552+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
19553+ break 2
19554+ fi
19555+done
19556+ done
19557+IFS=$as_save_IFS
19558+
19559+fi
19560+fi
19561+ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
19562+if test -n "$ac_ct_DLLTOOL"; then
19563+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
19564+$as_echo "$ac_ct_DLLTOOL" >&6; }
19565+else
19566+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
19567+$as_echo "no" >&6; }
19568+fi
19569+
19570+ if test "x$ac_ct_DLLTOOL" = x; then
19571+ DLLTOOL="false"
19572+ else
19573+ case $cross_compiling:$ac_tool_warned in
19574+yes:)
19575+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
19576+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
19577+ac_tool_warned=yes ;;
19578+esac
19579+ DLLTOOL=$ac_ct_DLLTOOL
19580+ fi
19581+else
19582+ DLLTOOL="$ac_cv_prog_DLLTOOL"
19583+fi
19584+
19585+test -z "$DLLTOOL" && DLLTOOL=dlltool
19586+
19587+
19588+
19589+
19590+
19591+
19592+
19593+
19594+
19595+
19596+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5
19597+$as_echo_n "checking how to associate runtime and link libraries... " >&6; }
19598+if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then :
19599+ $as_echo_n "(cached) " >&6
19600+else
19601+ lt_cv_sharedlib_from_linklib_cmd='unknown'
19602+
19603+case $host_os in
19604+cygwin* | mingw* | pw32* | cegcc*)
19605+ # two different shell functions defined in ltmain.sh
19606+ # decide which to use based on capabilities of $DLLTOOL
19607+ case `$DLLTOOL --help 2>&1` in
19608+ *--identify-strict*)
19609+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
19610+ ;;
19611+ *)
19612+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
19613+ ;;
19614+ esac
19615+ ;;
19616+*)
19617+ # fallback: assume linklib IS sharedlib
19618+ lt_cv_sharedlib_from_linklib_cmd="$ECHO"
19619+ ;;
19620+esac
19621+
19622+fi
19623+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5
19624+$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; }
19625+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
19626+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
19627+
19628+
19629+
19630+
19631+
19632+
19633+
19634+
19635+if test -n "$ac_tool_prefix"; then
19636+ for ac_prog in ar
19637+ do
19638+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
19639+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
19640 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
19641 $as_echo_n "checking for $ac_word... " >&6; }
19642 if ${ac_cv_prog_AR+:} false; then :
19643@@ -5425,7 +5680,7 @@ do
19644 test -z "$as_dir" && as_dir=.
19645 for ac_exec_ext in '' $ac_executable_extensions; do
19646 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
19647- ac_cv_prog_AR="${ac_tool_prefix}ar"
19648+ ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
19649 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
19650 break 2
19651 fi
19652@@ -5445,11 +5700,15 @@ $as_echo "no" >&6; }
19653 fi
19654
19655
19656+ test -n "$AR" && break
19657+ done
19658 fi
19659-if test -z "$ac_cv_prog_AR"; then
19660+if test -z "$AR"; then
19661 ac_ct_AR=$AR
19662- # Extract the first word of "ar", so it can be a program name with args.
19663-set dummy ar; ac_word=$2
19664+ for ac_prog in ar
19665+do
19666+ # Extract the first word of "$ac_prog", so it can be a program name with args.
19667+set dummy $ac_prog; ac_word=$2
19668 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
19669 $as_echo_n "checking for $ac_word... " >&6; }
19670 if ${ac_cv_prog_ac_ct_AR+:} false; then :
19671@@ -5465,7 +5724,7 @@ do
19672 test -z "$as_dir" && as_dir=.
19673 for ac_exec_ext in '' $ac_executable_extensions; do
19674 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
19675- ac_cv_prog_ac_ct_AR="ar"
19676+ ac_cv_prog_ac_ct_AR="$ac_prog"
19677 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
19678 break 2
19679 fi
19680@@ -5484,6 +5743,10 @@ else
19681 $as_echo "no" >&6; }
19682 fi
19683
19684+
19685+ test -n "$ac_ct_AR" && break
19686+done
19687+
19688 if test "x$ac_ct_AR" = x; then
19689 AR="false"
19690 else
19691@@ -5495,12 +5758,10 @@ ac_tool_warned=yes ;;
19692 esac
19693 AR=$ac_ct_AR
19694 fi
19695-else
19696- AR="$ac_cv_prog_AR"
19697 fi
19698
19699-test -z "$AR" && AR=ar
19700-test -z "$AR_FLAGS" && AR_FLAGS=cru
19701+: ${AR=ar}
19702+: ${AR_FLAGS=cru}
19703
19704
19705
19706@@ -5512,6 +5773,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru
19707
19708
19709
19710+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
19711+$as_echo_n "checking for archiver @FILE support... " >&6; }
19712+if ${lt_cv_ar_at_file+:} false; then :
19713+ $as_echo_n "(cached) " >&6
19714+else
19715+ lt_cv_ar_at_file=no
19716+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
19717+/* end confdefs.h. */
19718+
19719+int
19720+main ()
19721+{
19722+
19723+ ;
19724+ return 0;
19725+}
19726+_ACEOF
19727+if ac_fn_c_try_compile "$LINENO"; then :
19728+ echo conftest.$ac_objext > conftest.lst
19729+ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5'
19730+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
19731+ (eval $lt_ar_try) 2>&5
19732+ ac_status=$?
19733+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
19734+ test $ac_status = 0; }
19735+ if test "$ac_status" -eq 0; then
19736+ # Ensure the archiver fails upon bogus file names.
19737+ rm -f conftest.$ac_objext libconftest.a
19738+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
19739+ (eval $lt_ar_try) 2>&5
19740+ ac_status=$?
19741+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
19742+ test $ac_status = 0; }
19743+ if test "$ac_status" -ne 0; then
19744+ lt_cv_ar_at_file=@
19745+ fi
19746+ fi
19747+ rm -f conftest.* libconftest.a
19748+
19749+fi
19750+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
19751+
19752+fi
19753+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
19754+$as_echo "$lt_cv_ar_at_file" >&6; }
19755+
19756+if test "x$lt_cv_ar_at_file" = xno; then
19757+ archiver_list_spec=
19758+else
19759+ archiver_list_spec=$lt_cv_ar_at_file
19760+fi
19761+
19762+
19763+
19764+
19765+
19766+
19767+
19768 if test -n "$ac_tool_prefix"; then
19769 # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
19770 set dummy ${ac_tool_prefix}strip; ac_word=$2
19771@@ -5846,8 +6165,8 @@ esac
19772 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
19773
19774 # Transform an extracted symbol line into symbol name and symbol address
19775-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
19776-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'"
19777+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
19778+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'"
19779
19780 # Handle CRLF in mingw tool chain
19781 opt_cr=
19782@@ -5883,6 +6202,7 @@ for ac_symprfx in "" "_"; do
19783 else
19784 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
19785 fi
19786+ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
19787
19788 # Check to see that the pipe works correctly.
19789 pipe_works=no
19790@@ -5924,6 +6244,18 @@ _LT_EOF
19791 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
19792 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
19793 cat <<_LT_EOF > conftest.$ac_ext
19794+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */
19795+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
19796+/* DATA imports from DLLs on WIN32 con't be const, because runtime
19797+ relocations are performed -- see ld's documentation on pseudo-relocs. */
19798+# define LT_DLSYM_CONST
19799+#elif defined(__osf__)
19800+/* This system does not cope well with relocations in const data. */
19801+# define LT_DLSYM_CONST
19802+#else
19803+# define LT_DLSYM_CONST const
19804+#endif
19805+
19806 #ifdef __cplusplus
19807 extern "C" {
19808 #endif
19809@@ -5935,7 +6267,7 @@ _LT_EOF
19810 cat <<_LT_EOF >> conftest.$ac_ext
19811
19812 /* The mapping between symbol names and symbols. */
19813-const struct {
19814+LT_DLSYM_CONST struct {
19815 const char *name;
19816 void *address;
19817 }
19818@@ -5961,8 +6293,8 @@ static const void *lt_preloaded_setup()
19819 _LT_EOF
19820 # Now try linking the two files.
19821 mv conftest.$ac_objext conftstm.$ac_objext
19822- lt_save_LIBS="$LIBS"
19823- lt_save_CFLAGS="$CFLAGS"
19824+ lt_globsym_save_LIBS=$LIBS
19825+ lt_globsym_save_CFLAGS=$CFLAGS
19826 LIBS="conftstm.$ac_objext"
19827 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
19828 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
19829@@ -5972,8 +6304,8 @@ _LT_EOF
19830 test $ac_status = 0; } && test -s conftest${ac_exeext}; then
19831 pipe_works=yes
19832 fi
19833- LIBS="$lt_save_LIBS"
19834- CFLAGS="$lt_save_CFLAGS"
19835+ LIBS=$lt_globsym_save_LIBS
19836+ CFLAGS=$lt_globsym_save_CFLAGS
19837 else
19838 echo "cannot find nm_test_func in $nlist" >&5
19839 fi
19840@@ -6010,6 +6342,18 @@ else
19841 $as_echo "ok" >&6; }
19842 fi
19843
19844+# Response file support.
19845+if test "$lt_cv_nm_interface" = "MS dumpbin"; then
19846+ nm_file_list_spec='@'
19847+elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then
19848+ nm_file_list_spec='@'
19849+fi
19850+
19851+
19852+
19853+
19854+
19855+
19856
19857
19858
19859@@ -6031,6 +6375,42 @@ fi
19860
19861
19862
19863+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
19864+$as_echo_n "checking for sysroot... " >&6; }
19865+
19866+# Check whether --with-libtool-sysroot was given.
19867+if test "${with_libtool_sysroot+set}" = set; then :
19868+ withval=$with_libtool_sysroot;
19869+else
19870+ with_libtool_sysroot=no
19871+fi
19872+
19873+
19874+lt_sysroot=
19875+case ${with_libtool_sysroot} in #(
19876+ yes)
19877+ if test "$GCC" = yes; then
19878+ lt_sysroot=`$CC --print-sysroot 2>/dev/null`
19879+ fi
19880+ ;; #(
19881+ /*)
19882+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"`
19883+ ;; #(
19884+ no|'')
19885+ ;; #(
19886+ *)
19887+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5
19888+$as_echo "${with_libtool_sysroot}" >&6; }
19889+ as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5
19890+ ;;
19891+esac
19892+
19893+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
19894+$as_echo "${lt_sysroot:-no}" >&6; }
19895+
19896+
19897+
19898+
19899
19900 # Check whether --enable-libtool-lock was given.
19901 if test "${enable_libtool_lock+set}" = set; then :
19902@@ -6241,6 +6621,123 @@ esac
19903
19904 need_locks="$enable_libtool_lock"
19905
19906+if test -n "$ac_tool_prefix"; then
19907+ # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args.
19908+set dummy ${ac_tool_prefix}mt; ac_word=$2
19909+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
19910+$as_echo_n "checking for $ac_word... " >&6; }
19911+if ${ac_cv_prog_MANIFEST_TOOL+:} false; then :
19912+ $as_echo_n "(cached) " >&6
19913+else
19914+ if test -n "$MANIFEST_TOOL"; then
19915+ ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test.
19916+else
19917+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
19918+for as_dir in $PATH
19919+do
19920+ IFS=$as_save_IFS
19921+ test -z "$as_dir" && as_dir=.
19922+ for ac_exec_ext in '' $ac_executable_extensions; do
19923+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
19924+ ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
19925+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
19926+ break 2
19927+ fi
19928+done
19929+ done
19930+IFS=$as_save_IFS
19931+
19932+fi
19933+fi
19934+MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL
19935+if test -n "$MANIFEST_TOOL"; then
19936+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5
19937+$as_echo "$MANIFEST_TOOL" >&6; }
19938+else
19939+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
19940+$as_echo "no" >&6; }
19941+fi
19942+
19943+
19944+fi
19945+if test -z "$ac_cv_prog_MANIFEST_TOOL"; then
19946+ ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL
19947+ # Extract the first word of "mt", so it can be a program name with args.
19948+set dummy mt; ac_word=$2
19949+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
19950+$as_echo_n "checking for $ac_word... " >&6; }
19951+if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then :
19952+ $as_echo_n "(cached) " >&6
19953+else
19954+ if test -n "$ac_ct_MANIFEST_TOOL"; then
19955+ ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test.
19956+else
19957+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
19958+for as_dir in $PATH
19959+do
19960+ IFS=$as_save_IFS
19961+ test -z "$as_dir" && as_dir=.
19962+ for ac_exec_ext in '' $ac_executable_extensions; do
19963+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
19964+ ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
19965+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
19966+ break 2
19967+ fi
19968+done
19969+ done
19970+IFS=$as_save_IFS
19971+
19972+fi
19973+fi
19974+ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL
19975+if test -n "$ac_ct_MANIFEST_TOOL"; then
19976+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5
19977+$as_echo "$ac_ct_MANIFEST_TOOL" >&6; }
19978+else
19979+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
19980+$as_echo "no" >&6; }
19981+fi
19982+
19983+ if test "x$ac_ct_MANIFEST_TOOL" = x; then
19984+ MANIFEST_TOOL=":"
19985+ else
19986+ case $cross_compiling:$ac_tool_warned in
19987+yes:)
19988+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
19989+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
19990+ac_tool_warned=yes ;;
19991+esac
19992+ MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL
19993+ fi
19994+else
19995+ MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL"
19996+fi
19997+
19998+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
19999+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5
20000+$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; }
20001+if ${lt_cv_path_mainfest_tool+:} false; then :
20002+ $as_echo_n "(cached) " >&6
20003+else
20004+ lt_cv_path_mainfest_tool=no
20005+ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5
20006+ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
20007+ cat conftest.err >&5
20008+ if $GREP 'Manifest Tool' conftest.out > /dev/null; then
20009+ lt_cv_path_mainfest_tool=yes
20010+ fi
20011+ rm -f conftest*
20012+fi
20013+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5
20014+$as_echo "$lt_cv_path_mainfest_tool" >&6; }
20015+if test "x$lt_cv_path_mainfest_tool" != xyes; then
20016+ MANIFEST_TOOL=:
20017+fi
20018+
20019+
20020+
20021+
20022+
20023
20024 case $host_os in
20025 rhapsody* | darwin*)
20026@@ -6807,6 +7304,8 @@ _LT_EOF
20027 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
20028 echo "$AR cru libconftest.a conftest.o" >&5
20029 $AR cru libconftest.a conftest.o 2>&5
20030+ echo "$RANLIB libconftest.a" >&5
20031+ $RANLIB libconftest.a 2>&5
20032 cat > conftest.c << _LT_EOF
20033 int main() { return 0;}
20034 _LT_EOF
20035@@ -7269,7 +7768,8 @@ fi
20036 LIBTOOL_DEPS="$ltmain"
20037
20038 # Always use our own libtool.
20039-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
20040+LIBTOOL='$(SHELL) $(top_builddir)'
20041+LIBTOOL="$LIBTOOL/${host_alias}-libtool"
20042
20043
20044
20045@@ -7358,7 +7858,7 @@ aix3*)
20046 esac
20047
20048 # Global variables:
20049-ofile=libtool
20050+ofile=${host_alias}-libtool
20051 can_build_shared=yes
20052
20053 # All known linkers require a `.a' archive for static linking (except MSVC,
20054@@ -7656,8 +8156,6 @@ fi
20055 lt_prog_compiler_pic=
20056 lt_prog_compiler_static=
20057
20058-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
20059-$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
20060
20061 if test "$GCC" = yes; then
20062 lt_prog_compiler_wl='-Wl,'
20063@@ -7823,6 +8321,12 @@ $as_echo_n "checking for $compiler optio
20064 lt_prog_compiler_pic='--shared'
20065 lt_prog_compiler_static='--static'
20066 ;;
20067+ nagfor*)
20068+ # NAG Fortran compiler
20069+ lt_prog_compiler_wl='-Wl,-Wl,,'
20070+ lt_prog_compiler_pic='-PIC'
20071+ lt_prog_compiler_static='-Bstatic'
20072+ ;;
20073 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
20074 # Portland Group compilers (*not* the Pentium gcc compiler,
20075 # which looks to be a dead project)
20076@@ -7885,7 +8389,7 @@ $as_echo_n "checking for $compiler optio
20077 lt_prog_compiler_pic='-KPIC'
20078 lt_prog_compiler_static='-Bstatic'
20079 case $cc_basename in
20080- f77* | f90* | f95*)
20081+ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
20082 lt_prog_compiler_wl='-Qoption ld ';;
20083 *)
20084 lt_prog_compiler_wl='-Wl,';;
20085@@ -7942,13 +8446,17 @@ case $host_os in
20086 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
20087 ;;
20088 esac
20089-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5
20090-$as_echo "$lt_prog_compiler_pic" >&6; }
20091-
20092-
20093-
20094-
20095
20096+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
20097+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
20098+if ${lt_cv_prog_compiler_pic+:} false; then :
20099+ $as_echo_n "(cached) " >&6
20100+else
20101+ lt_cv_prog_compiler_pic=$lt_prog_compiler_pic
20102+fi
20103+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
20104+$as_echo "$lt_cv_prog_compiler_pic" >&6; }
20105+lt_prog_compiler_pic=$lt_cv_prog_compiler_pic
20106
20107 #
20108 # Check to make sure the PIC flag actually works.
20109@@ -8009,6 +8517,11 @@ fi
20110
20111
20112
20113+
20114+
20115+
20116+
20117+
20118 #
20119 # Check to make sure the static flag actually works.
20120 #
20121@@ -8359,7 +8872,8 @@ _LT_EOF
20122 allow_undefined_flag=unsupported
20123 always_export_symbols=no
20124 enable_shared_with_static_runtimes=yes
20125- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
20126+ 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'
20127+ exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
20128
20129 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
20130 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
20131@@ -8458,12 +8972,12 @@ _LT_EOF
20132 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
20133 hardcode_libdir_flag_spec=
20134 hardcode_libdir_flag_spec_ld='-rpath $libdir'
20135- archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
20136+ archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
20137 if test "x$supports_anon_versioning" = xyes; then
20138 archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
20139 cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
20140 echo "local: *; };" >> $output_objdir/$libname.ver~
20141- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
20142+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
20143 fi
20144 ;;
20145 esac
20146@@ -8477,8 +8991,8 @@ _LT_EOF
20147 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
20148 wlarc=
20149 else
20150- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
20151- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
20152+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
20153+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
20154 fi
20155 ;;
20156
20157@@ -8496,8 +9010,8 @@ _LT_EOF
20158
20159 _LT_EOF
20160 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
20161- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
20162- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
20163+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
20164+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
20165 else
20166 ld_shlibs=no
20167 fi
20168@@ -8543,8 +9057,8 @@ _LT_EOF
20169
20170 *)
20171 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
20172- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
20173- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
20174+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
20175+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
20176 else
20177 ld_shlibs=no
20178 fi
20179@@ -8674,7 +9188,13 @@ _LT_EOF
20180 allow_undefined_flag='-berok'
20181 # Determine the default libpath from the value encoded in an
20182 # empty executable.
20183- if test x$gcc_no_link = xyes; then
20184+ if test "${lt_cv_aix_libpath+set}" = set; then
20185+ aix_libpath=$lt_cv_aix_libpath
20186+else
20187+ if ${lt_cv_aix_libpath_+:} false; then :
20188+ $as_echo_n "(cached) " >&6
20189+else
20190+ if test x$gcc_no_link = xyes; then
20191 as_fn_error $? "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5
20192 fi
20193 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
20194@@ -8690,22 +9210,29 @@ main ()
20195 _ACEOF
20196 if ac_fn_c_try_link "$LINENO"; then :
20197
20198-lt_aix_libpath_sed='
20199- /Import File Strings/,/^$/ {
20200- /^0/ {
20201- s/^0 *\(.*\)$/\1/
20202- p
20203- }
20204- }'
20205-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
20206-# Check for a 64-bit object if we didn't find anything.
20207-if test -z "$aix_libpath"; then
20208- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
20209-fi
20210+ lt_aix_libpath_sed='
20211+ /Import File Strings/,/^$/ {
20212+ /^0/ {
20213+ s/^0 *\([^ ]*\) *$/\1/
20214+ p
20215+ }
20216+ }'
20217+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
20218+ # Check for a 64-bit object if we didn't find anything.
20219+ if test -z "$lt_cv_aix_libpath_"; then
20220+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
20221+ fi
20222 fi
20223 rm -f core conftest.err conftest.$ac_objext \
20224 conftest$ac_exeext conftest.$ac_ext
20225-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
20226+ if test -z "$lt_cv_aix_libpath_"; then
20227+ lt_cv_aix_libpath_="/usr/lib:/lib"
20228+ fi
20229+
20230+fi
20231+
20232+ aix_libpath=$lt_cv_aix_libpath_
20233+fi
20234
20235 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
20236 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"
20237@@ -8717,7 +9244,13 @@ if test -z "$aix_libpath"; then aix_libp
20238 else
20239 # Determine the default libpath from the value encoded in an
20240 # empty executable.
20241- if test x$gcc_no_link = xyes; then
20242+ if test "${lt_cv_aix_libpath+set}" = set; then
20243+ aix_libpath=$lt_cv_aix_libpath
20244+else
20245+ if ${lt_cv_aix_libpath_+:} false; then :
20246+ $as_echo_n "(cached) " >&6
20247+else
20248+ if test x$gcc_no_link = xyes; then
20249 as_fn_error $? "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5
20250 fi
20251 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
20252@@ -8733,22 +9266,29 @@ main ()
20253 _ACEOF
20254 if ac_fn_c_try_link "$LINENO"; then :
20255
20256-lt_aix_libpath_sed='
20257- /Import File Strings/,/^$/ {
20258- /^0/ {
20259- s/^0 *\(.*\)$/\1/
20260- p
20261- }
20262- }'
20263-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
20264-# Check for a 64-bit object if we didn't find anything.
20265-if test -z "$aix_libpath"; then
20266- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
20267-fi
20268+ lt_aix_libpath_sed='
20269+ /Import File Strings/,/^$/ {
20270+ /^0/ {
20271+ s/^0 *\([^ ]*\) *$/\1/
20272+ p
20273+ }
20274+ }'
20275+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
20276+ # Check for a 64-bit object if we didn't find anything.
20277+ if test -z "$lt_cv_aix_libpath_"; then
20278+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
20279+ fi
20280 fi
20281 rm -f core conftest.err conftest.$ac_objext \
20282 conftest$ac_exeext conftest.$ac_ext
20283-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
20284+ if test -z "$lt_cv_aix_libpath_"; then
20285+ lt_cv_aix_libpath_="/usr/lib:/lib"
20286+ fi
20287+
20288+fi
20289+
20290+ aix_libpath=$lt_cv_aix_libpath_
20291+fi
20292
20293 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
20294 # Warning - without using the other run time loading flags,
20295@@ -8793,20 +9333,63 @@ if test -z "$aix_libpath"; then aix_libp
20296 # Microsoft Visual C++.
20297 # hardcode_libdir_flag_spec is actually meaningless, as there is
20298 # no search path for DLLs.
20299- hardcode_libdir_flag_spec=' '
20300- allow_undefined_flag=unsupported
20301- # Tell ltmain to make .lib files, not .a files.
20302- libext=lib
20303- # Tell ltmain to make .dll files, not .so files.
20304- shrext_cmds=".dll"
20305- # FIXME: Setting linknames here is a bad hack.
20306- archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
20307- # The linker will automatically build a .lib file if we build a DLL.
20308- old_archive_from_new_cmds='true'
20309- # FIXME: Should let the user specify the lib program.
20310- old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
20311- fix_srcfile_path='`cygpath -w "$srcfile"`'
20312- enable_shared_with_static_runtimes=yes
20313+ case $cc_basename in
20314+ cl*)
20315+ # Native MSVC
20316+ hardcode_libdir_flag_spec=' '
20317+ allow_undefined_flag=unsupported
20318+ always_export_symbols=yes
20319+ file_list_spec='@'
20320+ # Tell ltmain to make .lib files, not .a files.
20321+ libext=lib
20322+ # Tell ltmain to make .dll files, not .so files.
20323+ shrext_cmds=".dll"
20324+ # FIXME: Setting linknames here is a bad hack.
20325+ archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
20326+ archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
20327+ sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
20328+ else
20329+ sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
20330+ fi~
20331+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
20332+ linknames='
20333+ # The linker will not automatically build a static lib if we build a DLL.
20334+ # _LT_TAGVAR(old_archive_from_new_cmds, )='true'
20335+ enable_shared_with_static_runtimes=yes
20336+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
20337+ # Don't use ranlib
20338+ old_postinstall_cmds='chmod 644 $oldlib'
20339+ postlink_cmds='lt_outputfile="@OUTPUT@"~
20340+ lt_tool_outputfile="@TOOL_OUTPUT@"~
20341+ case $lt_outputfile in
20342+ *.exe|*.EXE) ;;
20343+ *)
20344+ lt_outputfile="$lt_outputfile.exe"
20345+ lt_tool_outputfile="$lt_tool_outputfile.exe"
20346+ ;;
20347+ esac~
20348+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
20349+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
20350+ $RM "$lt_outputfile.manifest";
20351+ fi'
20352+ ;;
20353+ *)
20354+ # Assume MSVC wrapper
20355+ hardcode_libdir_flag_spec=' '
20356+ allow_undefined_flag=unsupported
20357+ # Tell ltmain to make .lib files, not .a files.
20358+ libext=lib
20359+ # Tell ltmain to make .dll files, not .so files.
20360+ shrext_cmds=".dll"
20361+ # FIXME: Setting linknames here is a bad hack.
20362+ archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
20363+ # The linker will automatically build a .lib file if we build a DLL.
20364+ old_archive_from_new_cmds='true'
20365+ # FIXME: Should let the user specify the lib program.
20366+ old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
20367+ enable_shared_with_static_runtimes=yes
20368+ ;;
20369+ esac
20370 ;;
20371
20372 darwin* | rhapsody*)
20373@@ -8867,7 +9450,7 @@ if test -z "$aix_libpath"; then aix_libp
20374
20375 # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
20376 freebsd* | dragonfly*)
20377- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
20378+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
20379 hardcode_libdir_flag_spec='-R$libdir'
20380 hardcode_direct=yes
20381 hardcode_shlibpath_var=no
20382@@ -8875,7 +9458,7 @@ if test -z "$aix_libpath"; then aix_libp
20383
20384 hpux9*)
20385 if test "$GCC" = yes; then
20386- 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'
20387+ 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'
20388 else
20389 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'
20390 fi
20391@@ -8891,7 +9474,7 @@ if test -z "$aix_libpath"; then aix_libp
20392
20393 hpux10*)
20394 if test "$GCC" = yes && test "$with_gnu_ld" = no; then
20395- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
20396+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
20397 else
20398 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
20399 fi
20400@@ -8915,10 +9498,10 @@ if test -z "$aix_libpath"; then aix_libp
20401 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
20402 ;;
20403 ia64*)
20404- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
20405+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
20406 ;;
20407 *)
20408- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
20409+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
20410 ;;
20411 esac
20412 else
20413@@ -8997,26 +9580,39 @@ fi
20414
20415 irix5* | irix6* | nonstopux*)
20416 if test "$GCC" = yes; then
20417- 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'
20418+ 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'
20419 # Try to use the -exported_symbol ld option, if it does not
20420 # work, assume that -exports_file does not work either and
20421 # implicitly export all symbols.
20422- save_LDFLAGS="$LDFLAGS"
20423- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
20424- if test x$gcc_no_link = xyes; then
20425+ # This should be the same for all languages, so no per-tag cache variable.
20426+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5
20427+$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; }
20428+if ${lt_cv_irix_exported_symbol+:} false; then :
20429+ $as_echo_n "(cached) " >&6
20430+else
20431+ save_LDFLAGS="$LDFLAGS"
20432+ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
20433+ if test x$gcc_no_link = xyes; then
20434 as_fn_error $? "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5
20435 fi
20436 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
20437 /* end confdefs.h. */
20438-int foo(void) {}
20439+int foo (void) { return 0; }
20440 _ACEOF
20441 if ac_fn_c_try_link "$LINENO"; then :
20442- 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'
20443-
20444+ lt_cv_irix_exported_symbol=yes
20445+else
20446+ lt_cv_irix_exported_symbol=no
20447 fi
20448 rm -f core conftest.err conftest.$ac_objext \
20449 conftest$ac_exeext conftest.$ac_ext
20450- LDFLAGS="$save_LDFLAGS"
20451+ LDFLAGS="$save_LDFLAGS"
20452+fi
20453+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5
20454+$as_echo "$lt_cv_irix_exported_symbol" >&6; }
20455+ if test "$lt_cv_irix_exported_symbol" = yes; then
20456+ 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'
20457+ fi
20458 else
20459 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'
20460 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'
20461@@ -9101,7 +9697,7 @@ rm -f core conftest.err conftest.$ac_obj
20462 osf4* | osf5*) # as osf3* with the addition of -msym flag
20463 if test "$GCC" = yes; then
20464 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
20465- 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'
20466+ 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'
20467 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
20468 else
20469 allow_undefined_flag=' -expect_unresolved \*'
20470@@ -9120,9 +9716,9 @@ rm -f core conftest.err conftest.$ac_obj
20471 no_undefined_flag=' -z defs'
20472 if test "$GCC" = yes; then
20473 wlarc='${wl}'
20474- archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
20475+ archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
20476 archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
20477- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
20478+ $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'
20479 else
20480 case `$CC -V 2>&1` in
20481 *"Compilers 5.0"*)
20482@@ -9698,8 +10294,9 @@ cygwin* | mingw* | pw32* | cegcc*)
20483 need_version=no
20484 need_lib_prefix=no
20485
20486- case $GCC,$host_os in
20487- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
20488+ case $GCC,$cc_basename in
20489+ yes,*)
20490+ # gcc
20491 library_names_spec='$libname.dll.a'
20492 # DLL is installed to $(libdir)/../bin by postinstall_cmds
20493 postinstall_cmds='base_file=`basename \${file}`~
20494@@ -9732,13 +10329,71 @@ cygwin* | mingw* | pw32* | cegcc*)
20495 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
20496 ;;
20497 esac
20498+ dynamic_linker='Win32 ld.exe'
20499+ ;;
20500+
20501+ *,cl*)
20502+ # Native MSVC
20503+ libname_spec='$name'
20504+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
20505+ library_names_spec='${libname}.dll.lib'
20506+
20507+ case $build_os in
20508+ mingw*)
20509+ sys_lib_search_path_spec=
20510+ lt_save_ifs=$IFS
20511+ IFS=';'
20512+ for lt_path in $LIB
20513+ do
20514+ IFS=$lt_save_ifs
20515+ # Let DOS variable expansion print the short 8.3 style file name.
20516+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
20517+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
20518+ done
20519+ IFS=$lt_save_ifs
20520+ # Convert to MSYS style.
20521+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
20522+ ;;
20523+ cygwin*)
20524+ # Convert to unix form, then to dos form, then back to unix form
20525+ # but this time dos style (no spaces!) so that the unix form looks
20526+ # like /cygdrive/c/PROGRA~1:/cygdr...
20527+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
20528+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
20529+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
20530+ ;;
20531+ *)
20532+ sys_lib_search_path_spec="$LIB"
20533+ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
20534+ # It is most probably a Windows format PATH.
20535+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
20536+ else
20537+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
20538+ fi
20539+ # FIXME: find the short name or the path components, as spaces are
20540+ # common. (e.g. "Program Files" -> "PROGRA~1")
20541+ ;;
20542+ esac
20543+
20544+ # DLL is installed to $(libdir)/../bin by postinstall_cmds
20545+ postinstall_cmds='base_file=`basename \${file}`~
20546+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
20547+ dldir=$destdir/`dirname \$dlpath`~
20548+ test -d \$dldir || mkdir -p \$dldir~
20549+ $install_prog $dir/$dlname \$dldir/$dlname'
20550+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
20551+ dlpath=$dir/\$dldll~
20552+ $RM \$dlpath'
20553+ shlibpath_overrides_runpath=yes
20554+ dynamic_linker='Win32 link.exe'
20555 ;;
20556
20557 *)
20558+ # Assume MSVC wrapper
20559 library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
20560+ dynamic_linker='Win32 ld.exe'
20561 ;;
20562 esac
20563- dynamic_linker='Win32 ld.exe'
20564 # FIXME: first we should search . and the directory the executable is in
20565 shlibpath_var=PATH
20566 ;;
20567@@ -9830,7 +10485,7 @@ haiku*)
20568 soname_spec='${libname}${release}${shared_ext}$major'
20569 shlibpath_var=LIBRARY_PATH
20570 shlibpath_overrides_runpath=yes
20571- sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib'
20572+ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
20573 hardcode_into_libs=yes
20574 ;;
20575
20576@@ -10644,7 +11299,7 @@ else
20577 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
20578 lt_status=$lt_dlunknown
20579 cat > conftest.$ac_ext <<_LT_EOF
20580-#line 10647 "configure"
20581+#line $LINENO "configure"
20582 #include "confdefs.h"
20583
20584 #if HAVE_DLFCN_H
20585@@ -10688,10 +11343,10 @@ else
20586 /* When -fvisbility=hidden is used, assume the code has been annotated
20587 correspondingly for the symbols needed. */
20588 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
20589-void fnord () __attribute__((visibility("default")));
20590+int fnord () __attribute__((visibility("default")));
20591 #endif
20592
20593-void fnord () { int i=42; }
20594+int fnord () { return 42; }
20595 int main ()
20596 {
20597 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
20598@@ -10750,7 +11405,7 @@ else
20599 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
20600 lt_status=$lt_dlunknown
20601 cat > conftest.$ac_ext <<_LT_EOF
20602-#line 10753 "configure"
20603+#line $LINENO "configure"
20604 #include "confdefs.h"
20605
20606 #if HAVE_DLFCN_H
20607@@ -10794,10 +11449,10 @@ else
20608 /* When -fvisbility=hidden is used, assume the code has been annotated
20609 correspondingly for the symbols needed. */
20610 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
20611-void fnord () __attribute__((visibility("default")));
20612+int fnord () __attribute__((visibility("default")));
20613 #endif
20614
20615-void fnord () { int i=42; }
20616+int fnord () { return 42; }
20617 int main ()
20618 {
20619 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
20620@@ -12267,13 +12922,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_
20621 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
20622 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
20623 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
20624+lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`'
20625+lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`'
20626 reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
20627 reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
20628 OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
20629 deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`'
20630 file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`'
20631+file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`'
20632+want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`'
20633+DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`'
20634+sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`'
20635 AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`'
20636 AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`'
20637+archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`'
20638 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
20639 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
20640 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
20641@@ -12288,14 +12950,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$l
20642 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
20643 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
20644 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"`'
20645+nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`'
20646+lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`'
20647 objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`'
20648 MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`'
20649 lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`'
20650-lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
20651 lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`'
20652+lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
20653 lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`'
20654 lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`'
20655 need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`'
20656+MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`'
20657 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
20658 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
20659 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
20660@@ -12328,12 +12993,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcod
20661 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
20662 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
20663 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
20664-fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`'
20665 always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`'
20666 export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`'
20667 exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`'
20668 include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`'
20669 prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`'
20670+postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`'
20671 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
20672 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
20673 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
20674@@ -12388,8 +13053,13 @@ reload_flag \
20675 OBJDUMP \
20676 deplibs_check_method \
20677 file_magic_cmd \
20678+file_magic_glob \
20679+want_nocaseglob \
20680+DLLTOOL \
20681+sharedlib_from_linklib_cmd \
20682 AR \
20683 AR_FLAGS \
20684+archiver_list_spec \
20685 STRIP \
20686 RANLIB \
20687 CC \
20688@@ -12399,12 +13069,14 @@ lt_cv_sys_global_symbol_pipe \
20689 lt_cv_sys_global_symbol_to_cdecl \
20690 lt_cv_sys_global_symbol_to_c_name_address \
20691 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
20692+nm_file_list_spec \
20693 lt_prog_compiler_no_builtin_flag \
20694-lt_prog_compiler_wl \
20695 lt_prog_compiler_pic \
20696+lt_prog_compiler_wl \
20697 lt_prog_compiler_static \
20698 lt_cv_prog_compiler_c_o \
20699 need_locks \
20700+MANIFEST_TOOL \
20701 DSYMUTIL \
20702 NMEDIT \
20703 LIPO \
20704@@ -12420,7 +13092,6 @@ no_undefined_flag \
20705 hardcode_libdir_flag_spec \
20706 hardcode_libdir_flag_spec_ld \
20707 hardcode_libdir_separator \
20708-fix_srcfile_path \
20709 exclude_expsyms \
20710 include_expsyms \
20711 file_list_spec \
20712@@ -12456,6 +13127,7 @@ module_cmds \
20713 module_expsym_cmds \
20714 export_symbols_cmds \
20715 prelink_cmds \
20716+postlink_cmds \
20717 postinstall_cmds \
20718 postuninstall_cmds \
20719 finish_cmds \
20720@@ -13054,7 +13726,8 @@ $as_echo X"$file" |
20721 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
20722 #
20723 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
20724-# 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
20725+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
20726+# Inc.
20727 # Written by Gordon Matzigkeit, 1996
20728 #
20729 # This file is part of GNU Libtool.
20730@@ -13157,19 +13830,42 @@ SP2NL=$lt_lt_SP2NL
20731 # turn newlines into spaces.
20732 NL2SP=$lt_lt_NL2SP
20733
20734+# convert \$build file names to \$host format.
20735+to_host_file_cmd=$lt_cv_to_host_file_cmd
20736+
20737+# convert \$build files to toolchain format.
20738+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
20739+
20740 # An object symbol dumper.
20741 OBJDUMP=$lt_OBJDUMP
20742
20743 # Method to check whether dependent libraries are shared objects.
20744 deplibs_check_method=$lt_deplibs_check_method
20745
20746-# Command to use when deplibs_check_method == "file_magic".
20747+# Command to use when deplibs_check_method = "file_magic".
20748 file_magic_cmd=$lt_file_magic_cmd
20749
20750+# How to find potential files when deplibs_check_method = "file_magic".
20751+file_magic_glob=$lt_file_magic_glob
20752+
20753+# Find potential files using nocaseglob when deplibs_check_method = "file_magic".
20754+want_nocaseglob=$lt_want_nocaseglob
20755+
20756+# DLL creation program.
20757+DLLTOOL=$lt_DLLTOOL
20758+
20759+# Command to associate shared and link libraries.
20760+sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd
20761+
20762 # The archiver.
20763 AR=$lt_AR
20764+
20765+# Flags to create an archive.
20766 AR_FLAGS=$lt_AR_FLAGS
20767
20768+# How to feed a file listing to the archiver.
20769+archiver_list_spec=$lt_archiver_list_spec
20770+
20771 # A symbol stripping program.
20772 STRIP=$lt_STRIP
20773
20774@@ -13199,6 +13895,12 @@ global_symbol_to_c_name_address=$lt_lt_c
20775 # Transform the output of nm in a C name address pair when lib prefix is needed.
20776 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
20777
20778+# Specify filename containing input files for \$NM.
20779+nm_file_list_spec=$lt_nm_file_list_spec
20780+
20781+# The root where to search for dependent libraries,and in which our libraries should be installed.
20782+lt_sysroot=$lt_sysroot
20783+
20784 # The name of the directory that contains temporary libtool files.
20785 objdir=$objdir
20786
20787@@ -13208,6 +13910,9 @@ MAGIC_CMD=$MAGIC_CMD
20788 # Must we lock files when doing compilation?
20789 need_locks=$lt_need_locks
20790
20791+# Manifest tool.
20792+MANIFEST_TOOL=$lt_MANIFEST_TOOL
20793+
20794 # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
20795 DSYMUTIL=$lt_DSYMUTIL
20796
20797@@ -13322,12 +14027,12 @@ with_gcc=$GCC
20798 # Compiler flag to turn off builtin functions.
20799 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
20800
20801-# How to pass a linker flag through the compiler.
20802-wl=$lt_lt_prog_compiler_wl
20803-
20804 # Additional compiler flags for building library objects.
20805 pic_flag=$lt_lt_prog_compiler_pic
20806
20807+# How to pass a linker flag through the compiler.
20808+wl=$lt_lt_prog_compiler_wl
20809+
20810 # Compiler flag to prevent dynamic linking.
20811 link_static_flag=$lt_lt_prog_compiler_static
20812
20813@@ -13414,9 +14119,6 @@ inherit_rpath=$inherit_rpath
20814 # Whether libtool must link a program against all its dependency libraries.
20815 link_all_deplibs=$link_all_deplibs
20816
20817-# Fix the shell variable \$srcfile for the compiler.
20818-fix_srcfile_path=$lt_fix_srcfile_path
20819-
20820 # Set to "yes" if exported symbols are required.
20821 always_export_symbols=$always_export_symbols
20822
20823@@ -13432,6 +14134,9 @@ include_expsyms=$lt_include_expsyms
20824 # Commands necessary for linking programs (against libraries) with templates.
20825 prelink_cmds=$lt_prelink_cmds
20826
20827+# Commands necessary for finishing linking programs.
20828+postlink_cmds=$lt_postlink_cmds
20829+
20830 # Specify filename containing input files.
20831 file_list_spec=$lt_file_list_spec
20832
20833@@ -13464,210 +14169,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
20834 # if finds mixed CR/LF and LF-only lines. Since sed operates in
20835 # text mode, it properly converts lines to CR/LF. This bash problem
20836 # is reportedly fixed, but why not run on old versions too?
20837- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
20838- || (rm -f "$cfgfile"; exit 1)
20839-
20840- case $xsi_shell in
20841- yes)
20842- cat << \_LT_EOF >> "$cfgfile"
20843-
20844-# func_dirname file append nondir_replacement
20845-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
20846-# otherwise set result to NONDIR_REPLACEMENT.
20847-func_dirname ()
20848-{
20849- case ${1} in
20850- */*) func_dirname_result="${1%/*}${2}" ;;
20851- * ) func_dirname_result="${3}" ;;
20852- esac
20853-}
20854-
20855-# func_basename file
20856-func_basename ()
20857-{
20858- func_basename_result="${1##*/}"
20859-}
20860-
20861-# func_dirname_and_basename file append nondir_replacement
20862-# perform func_basename and func_dirname in a single function
20863-# call:
20864-# dirname: Compute the dirname of FILE. If nonempty,
20865-# add APPEND to the result, otherwise set result
20866-# to NONDIR_REPLACEMENT.
20867-# value returned in "$func_dirname_result"
20868-# basename: Compute filename of FILE.
20869-# value retuned in "$func_basename_result"
20870-# Implementation must be kept synchronized with func_dirname
20871-# and func_basename. For efficiency, we do not delegate to
20872-# those functions but instead duplicate the functionality here.
20873-func_dirname_and_basename ()
20874-{
20875- case ${1} in
20876- */*) func_dirname_result="${1%/*}${2}" ;;
20877- * ) func_dirname_result="${3}" ;;
20878- esac
20879- func_basename_result="${1##*/}"
20880-}
20881-
20882-# func_stripname prefix suffix name
20883-# strip PREFIX and SUFFIX off of NAME.
20884-# PREFIX and SUFFIX must not contain globbing or regex special
20885-# characters, hashes, percent signs, but SUFFIX may contain a leading
20886-# dot (in which case that matches only a dot).
20887-func_stripname ()
20888-{
20889- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
20890- # positional parameters, so assign one to ordinary parameter first.
20891- func_stripname_result=${3}
20892- func_stripname_result=${func_stripname_result#"${1}"}
20893- func_stripname_result=${func_stripname_result%"${2}"}
20894-}
20895-
20896-# func_opt_split
20897-func_opt_split ()
20898-{
20899- func_opt_split_opt=${1%%=*}
20900- func_opt_split_arg=${1#*=}
20901-}
20902-
20903-# func_lo2o object
20904-func_lo2o ()
20905-{
20906- case ${1} in
20907- *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
20908- *) func_lo2o_result=${1} ;;
20909- esac
20910-}
20911-
20912-# func_xform libobj-or-source
20913-func_xform ()
20914-{
20915- func_xform_result=${1%.*}.lo
20916-}
20917-
20918-# func_arith arithmetic-term...
20919-func_arith ()
20920-{
20921- func_arith_result=$(( $* ))
20922-}
20923-
20924-# func_len string
20925-# STRING may not start with a hyphen.
20926-func_len ()
20927-{
20928- func_len_result=${#1}
20929-}
20930-
20931-_LT_EOF
20932- ;;
20933- *) # Bourne compatible functions.
20934- cat << \_LT_EOF >> "$cfgfile"
20935-
20936-# func_dirname file append nondir_replacement
20937-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
20938-# otherwise set result to NONDIR_REPLACEMENT.
20939-func_dirname ()
20940-{
20941- # Extract subdirectory from the argument.
20942- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
20943- if test "X$func_dirname_result" = "X${1}"; then
20944- func_dirname_result="${3}"
20945- else
20946- func_dirname_result="$func_dirname_result${2}"
20947- fi
20948-}
20949-
20950-# func_basename file
20951-func_basename ()
20952-{
20953- func_basename_result=`$ECHO "${1}" | $SED "$basename"`
20954-}
20955-
20956-
20957-# func_stripname prefix suffix name
20958-# strip PREFIX and SUFFIX off of NAME.
20959-# PREFIX and SUFFIX must not contain globbing or regex special
20960-# characters, hashes, percent signs, but SUFFIX may contain a leading
20961-# dot (in which case that matches only a dot).
20962-# func_strip_suffix prefix name
20963-func_stripname ()
20964-{
20965- case ${2} in
20966- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
20967- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
20968- esac
20969-}
20970-
20971-# sed scripts:
20972-my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q'
20973-my_sed_long_arg='1s/^-[^=]*=//'
20974-
20975-# func_opt_split
20976-func_opt_split ()
20977-{
20978- func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"`
20979- func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"`
20980-}
20981-
20982-# func_lo2o object
20983-func_lo2o ()
20984-{
20985- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
20986-}
20987-
20988-# func_xform libobj-or-source
20989-func_xform ()
20990-{
20991- func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`
20992-}
20993-
20994-# func_arith arithmetic-term...
20995-func_arith ()
20996-{
20997- func_arith_result=`expr "$@"`
20998-}
20999-
21000-# func_len string
21001-# STRING may not start with a hyphen.
21002-func_len ()
21003-{
21004- func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len`
21005-}
21006-
21007-_LT_EOF
21008-esac
21009-
21010-case $lt_shell_append in
21011- yes)
21012- cat << \_LT_EOF >> "$cfgfile"
21013-
21014-# func_append var value
21015-# Append VALUE to the end of shell variable VAR.
21016-func_append ()
21017-{
21018- eval "$1+=\$2"
21019-}
21020-_LT_EOF
21021- ;;
21022- *)
21023- cat << \_LT_EOF >> "$cfgfile"
21024-
21025-# func_append var value
21026-# Append VALUE to the end of shell variable VAR.
21027-func_append ()
21028-{
21029- eval "$1=\$$1\$2"
21030-}
21031-
21032-_LT_EOF
21033- ;;
21034- esac
21035+ sed '$q' "$ltmain" >> "$cfgfile" \
21036+ || (rm -f "$cfgfile"; exit 1)
21037
21038+ if test x"$xsi_shell" = xyes; then
21039+ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\
21040+func_dirname ()\
21041+{\
21042+\ case ${1} in\
21043+\ */*) func_dirname_result="${1%/*}${2}" ;;\
21044+\ * ) func_dirname_result="${3}" ;;\
21045+\ esac\
21046+} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \
21047+ && mv -f "$cfgfile.tmp" "$cfgfile" \
21048+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
21049+test 0 -eq $? || _lt_function_replace_fail=:
21050+
21051+
21052+ sed -e '/^func_basename ()$/,/^} # func_basename /c\
21053+func_basename ()\
21054+{\
21055+\ func_basename_result="${1##*/}"\
21056+} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \
21057+ && mv -f "$cfgfile.tmp" "$cfgfile" \
21058+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
21059+test 0 -eq $? || _lt_function_replace_fail=:
21060+
21061+
21062+ sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\
21063+func_dirname_and_basename ()\
21064+{\
21065+\ case ${1} in\
21066+\ */*) func_dirname_result="${1%/*}${2}" ;;\
21067+\ * ) func_dirname_result="${3}" ;;\
21068+\ esac\
21069+\ func_basename_result="${1##*/}"\
21070+} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \
21071+ && mv -f "$cfgfile.tmp" "$cfgfile" \
21072+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
21073+test 0 -eq $? || _lt_function_replace_fail=:
21074+
21075+
21076+ sed -e '/^func_stripname ()$/,/^} # func_stripname /c\
21077+func_stripname ()\
21078+{\
21079+\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\
21080+\ # positional parameters, so assign one to ordinary parameter first.\
21081+\ func_stripname_result=${3}\
21082+\ func_stripname_result=${func_stripname_result#"${1}"}\
21083+\ func_stripname_result=${func_stripname_result%"${2}"}\
21084+} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \
21085+ && mv -f "$cfgfile.tmp" "$cfgfile" \
21086+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
21087+test 0 -eq $? || _lt_function_replace_fail=:
21088+
21089+
21090+ sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\
21091+func_split_long_opt ()\
21092+{\
21093+\ func_split_long_opt_name=${1%%=*}\
21094+\ func_split_long_opt_arg=${1#*=}\
21095+} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \
21096+ && mv -f "$cfgfile.tmp" "$cfgfile" \
21097+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
21098+test 0 -eq $? || _lt_function_replace_fail=:
21099+
21100+
21101+ sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\
21102+func_split_short_opt ()\
21103+{\
21104+\ func_split_short_opt_arg=${1#??}\
21105+\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\
21106+} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \
21107+ && mv -f "$cfgfile.tmp" "$cfgfile" \
21108+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
21109+test 0 -eq $? || _lt_function_replace_fail=:
21110+
21111+
21112+ sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\
21113+func_lo2o ()\
21114+{\
21115+\ case ${1} in\
21116+\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\
21117+\ *) func_lo2o_result=${1} ;;\
21118+\ esac\
21119+} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \
21120+ && mv -f "$cfgfile.tmp" "$cfgfile" \
21121+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
21122+test 0 -eq $? || _lt_function_replace_fail=:
21123+
21124+
21125+ sed -e '/^func_xform ()$/,/^} # func_xform /c\
21126+func_xform ()\
21127+{\
21128+ func_xform_result=${1%.*}.lo\
21129+} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \
21130+ && mv -f "$cfgfile.tmp" "$cfgfile" \
21131+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
21132+test 0 -eq $? || _lt_function_replace_fail=:
21133+
21134+
21135+ sed -e '/^func_arith ()$/,/^} # func_arith /c\
21136+func_arith ()\
21137+{\
21138+ func_arith_result=$(( $* ))\
21139+} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \
21140+ && mv -f "$cfgfile.tmp" "$cfgfile" \
21141+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
21142+test 0 -eq $? || _lt_function_replace_fail=:
21143+
21144+
21145+ sed -e '/^func_len ()$/,/^} # func_len /c\
21146+func_len ()\
21147+{\
21148+ func_len_result=${#1}\
21149+} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \
21150+ && mv -f "$cfgfile.tmp" "$cfgfile" \
21151+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
21152+test 0 -eq $? || _lt_function_replace_fail=:
21153+
21154+fi
21155+
21156+if test x"$lt_shell_append" = xyes; then
21157+ sed -e '/^func_append ()$/,/^} # func_append /c\
21158+func_append ()\
21159+{\
21160+ eval "${1}+=\\${2}"\
21161+} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \
21162+ && mv -f "$cfgfile.tmp" "$cfgfile" \
21163+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
21164+test 0 -eq $? || _lt_function_replace_fail=:
21165+
21166+
21167+ sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\
21168+func_append_quoted ()\
21169+{\
21170+\ func_quote_for_eval "${2}"\
21171+\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\
21172+} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \
21173+ && mv -f "$cfgfile.tmp" "$cfgfile" \
21174+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
21175+test 0 -eq $? || _lt_function_replace_fail=:
21176+
21177+
21178+ # Save a `func_append' function call where possible by direct use of '+='
21179+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
21180+ && mv -f "$cfgfile.tmp" "$cfgfile" \
21181+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
21182+ test 0 -eq $? || _lt_function_replace_fail=:
21183+else
21184+ # Save a `func_append' function call even when '+=' is not available
21185+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
21186+ && mv -f "$cfgfile.tmp" "$cfgfile" \
21187+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
21188+ test 0 -eq $? || _lt_function_replace_fail=:
21189+fi
21190+
21191+if test x"$_lt_function_replace_fail" = x":"; then
21192+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5
21193+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;}
21194+fi
21195
21196- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
21197- || (rm -f "$cfgfile"; exit 1)
21198
21199- mv -f "$cfgfile" "$ofile" ||
21200+ mv -f "$cfgfile" "$ofile" ||
21201 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
21202 chmod +x "$ofile"
21203
diff --git a/meta/recipes-devtools/binutils/binutils/0007-Use-libtool-2.4.patch b/meta/recipes-devtools/binutils/binutils/0007-Use-libtool-2.4.patch
new file mode 100644
index 0000000000..c71e19ecb4
--- /dev/null
+++ b/meta/recipes-devtools/binutils/binutils/0007-Use-libtool-2.4.patch
@@ -0,0 +1,7115 @@
1From 3a2e7ec956568c503a678385ebee17098337feab Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Sun, 14 Feb 2016 17:04:07 +0000
4Subject: [PATCH] Use libtool 2.4
5
6get libtool sysroot support
7
8Upstream-Status: Pending
9
10Signed-off-by: Khem Raj <raj.khem@gmail.com>
11---
12 bfd/configure.ac | 2 +-
13 libtool.m4 | 1080 +++++++++++------
14 ltmain.sh | 2925 +++++++++++++++++++++++++++++++---------------
15 ltoptions.m4 | 2 +-
16 ltversion.m4 | 12 +-
17 lt~obsolete.m4 | 2 +-
18 6 files changed, 2717 insertions(+), 1306 deletions(-)
19
20diff --git a/bfd/configure.ac b/bfd/configure.ac
21index af4d4b8c13..a521738244 100644
22--- a/bfd/configure.ac
23+++ b/bfd/configure.ac
24@@ -296,7 +296,7 @@ changequote(,)dnl
25 x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'`
26 changequote([,])dnl
27 if test -n "$x"; then
28- SHARED_LIBADD="-L`pwd`/../libiberty/pic -liberty"
29+ SHARED_LIBADD="`pwd`/../libiberty/pic/libiberty.a"
30 fi
31
32 case "${host}" in
33diff --git a/libtool.m4 b/libtool.m4
34index 434530059f..e45fdc6998 100644
35--- a/libtool.m4
36+++ b/libtool.m4
37@@ -1,7 +1,8 @@
38 # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
39 #
40 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
41-# 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
42+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
43+# Inc.
44 # Written by Gordon Matzigkeit, 1996
45 #
46 # This file is free software; the Free Software Foundation gives
47@@ -10,7 +11,8 @@
48
49 m4_define([_LT_COPYING], [dnl
50 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
51-# 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
52+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
53+# Inc.
54 # Written by Gordon Matzigkeit, 1996
55 #
56 # This file is part of GNU Libtool.
57@@ -37,7 +39,7 @@ m4_define([_LT_COPYING], [dnl
58 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
59 ])
60
61-# serial 56 LT_INIT
62+# serial 57 LT_INIT
63
64
65 # LT_PREREQ(VERSION)
66@@ -92,7 +94,8 @@ _LT_SET_OPTIONS([$0], [$1])
67 LIBTOOL_DEPS="$ltmain"
68
69 # Always use our own libtool.
70-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
71+LIBTOOL='$(SHELL) $(top_builddir)'
72+LIBTOOL="$LIBTOOL/${host_alias}-libtool"
73 AC_SUBST(LIBTOOL)dnl
74
75 _LT_SETUP
76@@ -166,10 +169,13 @@ _LT_DECL([], [exeext], [0], [Executable file suffix (normally "")])dnl
77 dnl
78 m4_require([_LT_FILEUTILS_DEFAULTS])dnl
79 m4_require([_LT_CHECK_SHELL_FEATURES])dnl
80+m4_require([_LT_PATH_CONVERSION_FUNCTIONS])dnl
81 m4_require([_LT_CMD_RELOAD])dnl
82 m4_require([_LT_CHECK_MAGIC_METHOD])dnl
83+m4_require([_LT_CHECK_SHAREDLIB_FROM_LINKLIB])dnl
84 m4_require([_LT_CMD_OLD_ARCHIVE])dnl
85 m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl
86+m4_require([_LT_WITH_SYSROOT])dnl
87
88 _LT_CONFIG_LIBTOOL_INIT([
89 # See if we are running on zsh, and set the options which allow our
90@@ -199,7 +205,7 @@ aix3*)
91 esac
92
93 # Global variables:
94-ofile=libtool
95+ofile=${host_alias}-libtool
96 can_build_shared=yes
97
98 # All known linkers require a `.a' archive for static linking (except MSVC,
99@@ -632,7 +638,7 @@ m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])config.lt[]dnl
100 m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION])
101 configured by $[0], generated by m4_PACKAGE_STRING.
102
103-Copyright (C) 2009 Free Software Foundation, Inc.
104+Copyright (C) 2010 Free Software Foundation, Inc.
105 This config.lt script is free software; the Free Software Foundation
106 gives unlimited permision to copy, distribute and modify it."
107
108@@ -746,15 +752,12 @@ _LT_EOF
109 # if finds mixed CR/LF and LF-only lines. Since sed operates in
110 # text mode, it properly converts lines to CR/LF. This bash problem
111 # is reportedly fixed, but why not run on old versions too?
112- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
113- || (rm -f "$cfgfile"; exit 1)
114+ sed '$q' "$ltmain" >> "$cfgfile" \
115+ || (rm -f "$cfgfile"; exit 1)
116
117- _LT_PROG_XSI_SHELLFNS
118+ _LT_PROG_REPLACE_SHELLFNS
119
120- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
121- || (rm -f "$cfgfile"; exit 1)
122-
123- mv -f "$cfgfile" "$ofile" ||
124+ mv -f "$cfgfile" "$ofile" ||
125 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
126 chmod +x "$ofile"
127 ],
128@@ -980,6 +983,8 @@ _LT_EOF
129 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD
130 echo "$AR cru libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD
131 $AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD
132+ echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD
133+ $RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD
134 cat > conftest.c << _LT_EOF
135 int main() { return 0;}
136 _LT_EOF
137@@ -1069,30 +1074,41 @@ m4_defun([_LT_DARWIN_LINKER_FEATURES],
138 fi
139 ])
140
141-# _LT_SYS_MODULE_PATH_AIX
142-# -----------------------
143+# _LT_SYS_MODULE_PATH_AIX([TAGNAME])
144+# ----------------------------------
145 # Links a minimal program and checks the executable
146 # for the system default hardcoded library path. In most cases,
147 # this is /usr/lib:/lib, but when the MPI compilers are used
148 # the location of the communication and MPI libs are included too.
149 # If we don't find anything, use the default library path according
150 # to the aix ld manual.
151+# Store the results from the different compilers for each TAGNAME.
152+# Allow to override them for all tags through lt_cv_aix_libpath.
153 m4_defun([_LT_SYS_MODULE_PATH_AIX],
154 [m4_require([_LT_DECL_SED])dnl
155-AC_LINK_IFELSE([AC_LANG_SOURCE([AC_LANG_PROGRAM])],[
156-lt_aix_libpath_sed='
157- /Import File Strings/,/^$/ {
158- /^0/ {
159- s/^0 *\(.*\)$/\1/
160- p
161- }
162- }'
163-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
164-# Check for a 64-bit object if we didn't find anything.
165-if test -z "$aix_libpath"; then
166- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
167-fi],[])
168-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
169+if test "${lt_cv_aix_libpath+set}" = set; then
170+ aix_libpath=$lt_cv_aix_libpath
171+else
172+ AC_CACHE_VAL([_LT_TAGVAR([lt_cv_aix_libpath_], [$1])],
173+ [AC_LINK_IFELSE([AC_LANG_PROGRAM],[
174+ lt_aix_libpath_sed='[
175+ /Import File Strings/,/^$/ {
176+ /^0/ {
177+ s/^0 *\([^ ]*\) *$/\1/
178+ p
179+ }
180+ }]'
181+ _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
182+ # Check for a 64-bit object if we didn't find anything.
183+ if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then
184+ _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
185+ fi],[])
186+ if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then
187+ _LT_TAGVAR([lt_cv_aix_libpath_], [$1])="/usr/lib:/lib"
188+ fi
189+ ])
190+ aix_libpath=$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])
191+fi
192 ])# _LT_SYS_MODULE_PATH_AIX
193
194
195@@ -1117,7 +1133,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
196
197 AC_MSG_CHECKING([how to print strings])
198 # Test print first, because it will be a builtin if present.
199-if test "X`print -r -- -n 2>/dev/null`" = X-n && \
200+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
201 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
202 ECHO='print -r --'
203 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
204@@ -1161,6 +1177,39 @@ _LT_DECL([], [ECHO], [1], [An echo program that protects backslashes])
205 ])# _LT_PROG_ECHO_BACKSLASH
206
207
208+# _LT_WITH_SYSROOT
209+# ----------------
210+AC_DEFUN([_LT_WITH_SYSROOT],
211+[AC_MSG_CHECKING([for sysroot])
212+AC_ARG_WITH([libtool-sysroot],
213+[ --with-libtool-sysroot[=DIR] Search for dependent libraries within DIR
214+ (or the compiler's sysroot if not specified).],
215+[], [with_libtool_sysroot=no])
216+
217+dnl lt_sysroot will always be passed unquoted. We quote it here
218+dnl in case the user passed a directory name.
219+lt_sysroot=
220+case ${with_libtool_sysroot} in #(
221+ yes)
222+ if test "$GCC" = yes; then
223+ lt_sysroot=`$CC --print-sysroot 2>/dev/null`
224+ fi
225+ ;; #(
226+ /*)
227+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"`
228+ ;; #(
229+ no|'')
230+ ;; #(
231+ *)
232+ AC_MSG_RESULT([${with_libtool_sysroot}])
233+ AC_MSG_ERROR([The sysroot must be an absolute path.])
234+ ;;
235+esac
236+
237+ AC_MSG_RESULT([${lt_sysroot:-no}])
238+_LT_DECL([], [lt_sysroot], [0], [The root where to search for ]dnl
239+[dependent libraries, and in which our libraries should be installed.])])
240+
241 # _LT_ENABLE_LOCK
242 # ---------------
243 m4_defun([_LT_ENABLE_LOCK],
244@@ -1320,14 +1369,47 @@ need_locks="$enable_libtool_lock"
245 ])# _LT_ENABLE_LOCK
246
247
248+# _LT_PROG_AR
249+# -----------
250+m4_defun([_LT_PROG_AR],
251+[AC_CHECK_TOOLS(AR, [ar], false)
252+: ${AR=ar}
253+: ${AR_FLAGS=cru}
254+_LT_DECL([], [AR], [1], [The archiver])
255+_LT_DECL([], [AR_FLAGS], [1], [Flags to create an archive])
256+
257+AC_CACHE_CHECK([for archiver @FILE support], [lt_cv_ar_at_file],
258+ [lt_cv_ar_at_file=no
259+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM],
260+ [echo conftest.$ac_objext > conftest.lst
261+ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&AS_MESSAGE_LOG_FD'
262+ AC_TRY_EVAL([lt_ar_try])
263+ if test "$ac_status" -eq 0; then
264+ # Ensure the archiver fails upon bogus file names.
265+ rm -f conftest.$ac_objext libconftest.a
266+ AC_TRY_EVAL([lt_ar_try])
267+ if test "$ac_status" -ne 0; then
268+ lt_cv_ar_at_file=@
269+ fi
270+ fi
271+ rm -f conftest.* libconftest.a
272+ ])
273+ ])
274+
275+if test "x$lt_cv_ar_at_file" = xno; then
276+ archiver_list_spec=
277+else
278+ archiver_list_spec=$lt_cv_ar_at_file
279+fi
280+_LT_DECL([], [archiver_list_spec], [1],
281+ [How to feed a file listing to the archiver])
282+])# _LT_PROG_AR
283+
284+
285 # _LT_CMD_OLD_ARCHIVE
286 # -------------------
287 m4_defun([_LT_CMD_OLD_ARCHIVE],
288-[AC_CHECK_TOOL(AR, ar, false)
289-test -z "$AR" && AR=ar
290-test -z "$AR_FLAGS" && AR_FLAGS=cru
291-_LT_DECL([], [AR], [1], [The archiver])
292-_LT_DECL([], [AR_FLAGS], [1])
293+[_LT_PROG_AR
294
295 AC_CHECK_TOOL(STRIP, strip, :)
296 test -z "$STRIP" && STRIP=:
297@@ -1623,7 +1705,7 @@ else
298 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
299 lt_status=$lt_dlunknown
300 cat > conftest.$ac_ext <<_LT_EOF
301-[#line __oline__ "configure"
302+[#line $LINENO "configure"
303 #include "confdefs.h"
304
305 #if HAVE_DLFCN_H
306@@ -1667,10 +1749,10 @@ else
307 /* When -fvisbility=hidden is used, assume the code has been annotated
308 correspondingly for the symbols needed. */
309 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
310-void fnord () __attribute__((visibility("default")));
311+int fnord () __attribute__((visibility("default")));
312 #endif
313
314-void fnord () { int i=42; }
315+int fnord () { return 42; }
316 int main ()
317 {
318 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
319@@ -2210,8 +2292,9 @@ cygwin* | mingw* | pw32* | cegcc*)
320 need_version=no
321 need_lib_prefix=no
322
323- case $GCC,$host_os in
324- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
325+ case $GCC,$cc_basename in
326+ yes,*)
327+ # gcc
328 library_names_spec='$libname.dll.a'
329 # DLL is installed to $(libdir)/../bin by postinstall_cmds
330 postinstall_cmds='base_file=`basename \${file}`~
331@@ -2244,13 +2327,71 @@ m4_if([$1], [],[
332 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
333 ;;
334 esac
335+ dynamic_linker='Win32 ld.exe'
336+ ;;
337+
338+ *,cl*)
339+ # Native MSVC
340+ libname_spec='$name'
341+ soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
342+ library_names_spec='${libname}.dll.lib'
343+
344+ case $build_os in
345+ mingw*)
346+ sys_lib_search_path_spec=
347+ lt_save_ifs=$IFS
348+ IFS=';'
349+ for lt_path in $LIB
350+ do
351+ IFS=$lt_save_ifs
352+ # Let DOS variable expansion print the short 8.3 style file name.
353+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
354+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
355+ done
356+ IFS=$lt_save_ifs
357+ # Convert to MSYS style.
358+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([[a-zA-Z]]\\):| /\\1|g' -e 's|^ ||'`
359+ ;;
360+ cygwin*)
361+ # Convert to unix form, then to dos form, then back to unix form
362+ # but this time dos style (no spaces!) so that the unix form looks
363+ # like /cygdrive/c/PROGRA~1:/cygdr...
364+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
365+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
366+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
367+ ;;
368+ *)
369+ sys_lib_search_path_spec="$LIB"
370+ if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then
371+ # It is most probably a Windows format PATH.
372+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
373+ else
374+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
375+ fi
376+ # FIXME: find the short name or the path components, as spaces are
377+ # common. (e.g. "Program Files" -> "PROGRA~1")
378+ ;;
379+ esac
380+
381+ # DLL is installed to $(libdir)/../bin by postinstall_cmds
382+ postinstall_cmds='base_file=`basename \${file}`~
383+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
384+ dldir=$destdir/`dirname \$dlpath`~
385+ test -d \$dldir || mkdir -p \$dldir~
386+ $install_prog $dir/$dlname \$dldir/$dlname'
387+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
388+ dlpath=$dir/\$dldll~
389+ $RM \$dlpath'
390+ shlibpath_overrides_runpath=yes
391+ dynamic_linker='Win32 link.exe'
392 ;;
393
394 *)
395+ # Assume MSVC wrapper
396 library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib'
397+ dynamic_linker='Win32 ld.exe'
398 ;;
399 esac
400- dynamic_linker='Win32 ld.exe'
401 # FIXME: first we should search . and the directory the executable is in
402 shlibpath_var=PATH
403 ;;
404@@ -2342,7 +2483,7 @@ haiku*)
405 soname_spec='${libname}${release}${shared_ext}$major'
406 shlibpath_var=LIBRARY_PATH
407 shlibpath_overrides_runpath=yes
408- sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib'
409+ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
410 hardcode_into_libs=yes
411 ;;
412
413@@ -2950,6 +3091,11 @@ case $reload_flag in
414 esac
415 reload_cmds='$LD$reload_flag -o $output$reload_objs'
416 case $host_os in
417+ cygwin* | mingw* | pw32* | cegcc*)
418+ if test "$GCC" != yes; then
419+ reload_cmds=false
420+ fi
421+ ;;
422 darwin*)
423 if test "$GCC" = yes; then
424 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
425@@ -3016,7 +3162,8 @@ mingw* | pw32*)
426 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
427 lt_cv_file_magic_cmd='func_win32_libid'
428 else
429- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
430+ # Keep this pattern in sync with the one in func_win32_libid.
431+ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
432 lt_cv_file_magic_cmd='$OBJDUMP -f'
433 fi
434 ;;
435@@ -3167,6 +3314,21 @@ tpf*)
436 ;;
437 esac
438 ])
439+
440+file_magic_glob=
441+want_nocaseglob=no
442+if test "$build" = "$host"; then
443+ case $host_os in
444+ mingw* | pw32*)
445+ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
446+ want_nocaseglob=yes
447+ else
448+ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[[\1]]\/[[\1]]\/g;/g"`
449+ fi
450+ ;;
451+ esac
452+fi
453+
454 file_magic_cmd=$lt_cv_file_magic_cmd
455 deplibs_check_method=$lt_cv_deplibs_check_method
456 test -z "$deplibs_check_method" && deplibs_check_method=unknown
457@@ -3174,7 +3336,11 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
458 _LT_DECL([], [deplibs_check_method], [1],
459 [Method to check whether dependent libraries are shared objects])
460 _LT_DECL([], [file_magic_cmd], [1],
461- [Command to use when deplibs_check_method == "file_magic"])
462+ [Command to use when deplibs_check_method = "file_magic"])
463+_LT_DECL([], [file_magic_glob], [1],
464+ [How to find potential files when deplibs_check_method = "file_magic"])
465+_LT_DECL([], [want_nocaseglob], [1],
466+ [Find potential files using nocaseglob when deplibs_check_method = "file_magic"])
467 ])# _LT_CHECK_MAGIC_METHOD
468
469
470@@ -3277,6 +3443,67 @@ dnl aclocal-1.4 backwards compatibility:
471 dnl AC_DEFUN([AM_PROG_NM], [])
472 dnl AC_DEFUN([AC_PROG_NM], [])
473
474+# _LT_CHECK_SHAREDLIB_FROM_LINKLIB
475+# --------------------------------
476+# how to determine the name of the shared library
477+# associated with a specific link library.
478+# -- PORTME fill in with the dynamic library characteristics
479+m4_defun([_LT_CHECK_SHAREDLIB_FROM_LINKLIB],
480+[m4_require([_LT_DECL_EGREP])
481+m4_require([_LT_DECL_OBJDUMP])
482+m4_require([_LT_DECL_DLLTOOL])
483+AC_CACHE_CHECK([how to associate runtime and link libraries],
484+lt_cv_sharedlib_from_linklib_cmd,
485+[lt_cv_sharedlib_from_linklib_cmd='unknown'
486+
487+case $host_os in
488+cygwin* | mingw* | pw32* | cegcc*)
489+ # two different shell functions defined in ltmain.sh
490+ # decide which to use based on capabilities of $DLLTOOL
491+ case `$DLLTOOL --help 2>&1` in
492+ *--identify-strict*)
493+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
494+ ;;
495+ *)
496+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
497+ ;;
498+ esac
499+ ;;
500+*)
501+ # fallback: assume linklib IS sharedlib
502+ lt_cv_sharedlib_from_linklib_cmd="$ECHO"
503+ ;;
504+esac
505+])
506+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
507+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
508+
509+_LT_DECL([], [sharedlib_from_linklib_cmd], [1],
510+ [Command to associate shared and link libraries])
511+])# _LT_CHECK_SHAREDLIB_FROM_LINKLIB
512+
513+
514+# _LT_PATH_MANIFEST_TOOL
515+# ----------------------
516+# locate the manifest tool
517+m4_defun([_LT_PATH_MANIFEST_TOOL],
518+[AC_CHECK_TOOL(MANIFEST_TOOL, mt, :)
519+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
520+AC_CACHE_CHECK([if $MANIFEST_TOOL is a manifest tool], [lt_cv_path_mainfest_tool],
521+ [lt_cv_path_mainfest_tool=no
522+ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&AS_MESSAGE_LOG_FD
523+ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
524+ cat conftest.err >&AS_MESSAGE_LOG_FD
525+ if $GREP 'Manifest Tool' conftest.out > /dev/null; then
526+ lt_cv_path_mainfest_tool=yes
527+ fi
528+ rm -f conftest*])
529+if test "x$lt_cv_path_mainfest_tool" != xyes; then
530+ MANIFEST_TOOL=:
531+fi
532+_LT_DECL([], [MANIFEST_TOOL], [1], [Manifest tool])dnl
533+])# _LT_PATH_MANIFEST_TOOL
534+
535
536 # LT_LIB_M
537 # --------
538@@ -3403,8 +3630,8 @@ esac
539 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
540
541 # Transform an extracted symbol line into symbol name and symbol address
542-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p'"
543-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'"
544+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p'"
545+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'"
546
547 # Handle CRLF in mingw tool chain
548 opt_cr=
549@@ -3440,6 +3667,7 @@ for ac_symprfx in "" "_"; do
550 else
551 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
552 fi
553+ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
554
555 # Check to see that the pipe works correctly.
556 pipe_works=no
557@@ -3473,6 +3701,18 @@ _LT_EOF
558 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
559 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
560 cat <<_LT_EOF > conftest.$ac_ext
561+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */
562+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
563+/* DATA imports from DLLs on WIN32 con't be const, because runtime
564+ relocations are performed -- see ld's documentation on pseudo-relocs. */
565+# define LT@&t@_DLSYM_CONST
566+#elif defined(__osf__)
567+/* This system does not cope well with relocations in const data. */
568+# define LT@&t@_DLSYM_CONST
569+#else
570+# define LT@&t@_DLSYM_CONST const
571+#endif
572+
573 #ifdef __cplusplus
574 extern "C" {
575 #endif
576@@ -3484,7 +3724,7 @@ _LT_EOF
577 cat <<_LT_EOF >> conftest.$ac_ext
578
579 /* The mapping between symbol names and symbols. */
580-const struct {
581+LT@&t@_DLSYM_CONST struct {
582 const char *name;
583 void *address;
584 }
585@@ -3510,15 +3750,15 @@ static const void *lt_preloaded_setup() {
586 _LT_EOF
587 # Now try linking the two files.
588 mv conftest.$ac_objext conftstm.$ac_objext
589- lt_save_LIBS="$LIBS"
590- lt_save_CFLAGS="$CFLAGS"
591+ lt_globsym_save_LIBS=$LIBS
592+ lt_globsym_save_CFLAGS=$CFLAGS
593 LIBS="conftstm.$ac_objext"
594 CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)"
595 if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then
596 pipe_works=yes
597 fi
598- LIBS="$lt_save_LIBS"
599- CFLAGS="$lt_save_CFLAGS"
600+ LIBS=$lt_globsym_save_LIBS
601+ CFLAGS=$lt_globsym_save_CFLAGS
602 else
603 echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD
604 fi
605@@ -3551,6 +3791,13 @@ else
606 AC_MSG_RESULT(ok)
607 fi
608
609+# Response file support.
610+if test "$lt_cv_nm_interface" = "MS dumpbin"; then
611+ nm_file_list_spec='@'
612+elif $NM --help 2>/dev/null | grep '[[@]]FILE' >/dev/null; then
613+ nm_file_list_spec='@'
614+fi
615+
616 _LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1],
617 [Take the output of nm and produce a listing of raw symbols and C names])
618 _LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1],
619@@ -3561,6 +3808,8 @@ _LT_DECL([global_symbol_to_c_name_address],
620 _LT_DECL([global_symbol_to_c_name_address_lib_prefix],
621 [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1],
622 [Transform the output of nm in a C name address pair when lib prefix is needed])
623+_LT_DECL([], [nm_file_list_spec], [1],
624+ [Specify filename containing input files for $NM])
625 ]) # _LT_CMD_GLOBAL_SYMBOLS
626
627
628@@ -3572,7 +3821,6 @@ _LT_TAGVAR(lt_prog_compiler_wl, $1)=
629 _LT_TAGVAR(lt_prog_compiler_pic, $1)=
630 _LT_TAGVAR(lt_prog_compiler_static, $1)=
631
632-AC_MSG_CHECKING([for $compiler option to produce PIC])
633 m4_if([$1], [CXX], [
634 # C++ specific cases for pic, static, wl, etc.
635 if test "$GXX" = yes; then
636@@ -3678,6 +3926,12 @@ m4_if([$1], [CXX], [
637 ;;
638 esac
639 ;;
640+ mingw* | cygwin* | os2* | pw32* | cegcc*)
641+ # This hack is so that the source file can tell whether it is being
642+ # built for inclusion in a dll (and should export symbols for example).
643+ m4_if([$1], [GCJ], [],
644+ [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
645+ ;;
646 dgux*)
647 case $cc_basename in
648 ec++*)
649@@ -3830,7 +4084,7 @@ m4_if([$1], [CXX], [
650 ;;
651 solaris*)
652 case $cc_basename in
653- CC*)
654+ CC* | sunCC*)
655 # Sun C++ 4.2, 5.x and Centerline C++
656 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
657 _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
658@@ -4053,6 +4307,12 @@ m4_if([$1], [CXX], [
659 _LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared'
660 _LT_TAGVAR(lt_prog_compiler_static, $1)='--static'
661 ;;
662+ nagfor*)
663+ # NAG Fortran compiler
664+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,-Wl,,'
665+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
666+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
667+ ;;
668 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
669 # Portland Group compilers (*not* the Pentium gcc compiler,
670 # which looks to be a dead project)
671@@ -4115,7 +4375,7 @@ m4_if([$1], [CXX], [
672 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
673 _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
674 case $cc_basename in
675- f77* | f90* | f95*)
676+ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
677 _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';;
678 *)
679 _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';;
680@@ -4172,9 +4432,11 @@ case $host_os in
681 _LT_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])"
682 ;;
683 esac
684-AC_MSG_RESULT([$_LT_TAGVAR(lt_prog_compiler_pic, $1)])
685-_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1],
686- [How to pass a linker flag through the compiler])
687+
688+AC_CACHE_CHECK([for $compiler option to produce PIC],
689+ [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)],
690+ [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_prog_compiler_pic, $1)])
691+_LT_TAGVAR(lt_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)
692
693 #
694 # Check to make sure the PIC flag actually works.
695@@ -4193,6 +4455,8 @@ fi
696 _LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1],
697 [Additional compiler flags for building library objects])
698
699+_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1],
700+ [How to pass a linker flag through the compiler])
701 #
702 # Check to make sure the static flag actually works.
703 #
704@@ -4213,6 +4477,7 @@ _LT_TAGDECL([link_static_flag], [lt_prog_compiler_static], [1],
705 m4_defun([_LT_LINKER_SHLIBS],
706 [AC_REQUIRE([LT_PATH_LD])dnl
707 AC_REQUIRE([LT_PATH_NM])dnl
708+m4_require([_LT_PATH_MANIFEST_TOOL])dnl
709 m4_require([_LT_FILEUTILS_DEFAULTS])dnl
710 m4_require([_LT_DECL_EGREP])dnl
711 m4_require([_LT_DECL_SED])dnl
712@@ -4221,6 +4486,7 @@ m4_require([_LT_TAG_COMPILER])dnl
713 AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
714 m4_if([$1], [CXX], [
715 _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
716+ _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
717 case $host_os in
718 aix[[4-9]]*)
719 # If we're using GNU nm, then we don't want the "-C" option.
720@@ -4235,15 +4501,20 @@ m4_if([$1], [CXX], [
721 ;;
722 pw32*)
723 _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
724- ;;
725+ ;;
726 cygwin* | mingw* | cegcc*)
727- _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'
728- ;;
729+ case $cc_basename in
730+ cl*) ;;
731+ *)
732+ _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'
733+ _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname']
734+ ;;
735+ esac
736+ ;;
737 *)
738 _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
739- ;;
740+ ;;
741 esac
742- _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
743 ], [
744 runpath_var=
745 _LT_TAGVAR(allow_undefined_flag, $1)=
746@@ -4411,7 +4682,8 @@ _LT_EOF
747 _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
748 _LT_TAGVAR(always_export_symbols, $1)=no
749 _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
750- _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'
751+ _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'
752+ _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname']
753
754 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
755 _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'
756@@ -4510,12 +4782,12 @@ _LT_EOF
757 _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive'
758 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
759 _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
760- _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
761+ _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
762 if test "x$supports_anon_versioning" = xyes; then
763 _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
764 cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
765 echo "local: *; };" >> $output_objdir/$libname.ver~
766- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
767+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
768 fi
769 ;;
770 esac
771@@ -4529,8 +4801,8 @@ _LT_EOF
772 _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
773 wlarc=
774 else
775- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
776- _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'
777+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
778+ _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'
779 fi
780 ;;
781
782@@ -4548,8 +4820,8 @@ _LT_EOF
783
784 _LT_EOF
785 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
786- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
787- _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'
788+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
789+ _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'
790 else
791 _LT_TAGVAR(ld_shlibs, $1)=no
792 fi
793@@ -4595,8 +4867,8 @@ _LT_EOF
794
795 *)
796 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
797- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
798- _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'
799+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
800+ _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'
801 else
802 _LT_TAGVAR(ld_shlibs, $1)=no
803 fi
804@@ -4726,7 +4998,7 @@ _LT_EOF
805 _LT_TAGVAR(allow_undefined_flag, $1)='-berok'
806 # Determine the default libpath from the value encoded in an
807 # empty executable.
808- _LT_SYS_MODULE_PATH_AIX
809+ _LT_SYS_MODULE_PATH_AIX([$1])
810 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
811 _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"
812 else
813@@ -4737,7 +5009,7 @@ _LT_EOF
814 else
815 # Determine the default libpath from the value encoded in an
816 # empty executable.
817- _LT_SYS_MODULE_PATH_AIX
818+ _LT_SYS_MODULE_PATH_AIX([$1])
819 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
820 # Warning - without using the other run time loading flags,
821 # -berok will link without error, but may produce a broken library.
822@@ -4781,20 +5053,63 @@ _LT_EOF
823 # Microsoft Visual C++.
824 # hardcode_libdir_flag_spec is actually meaningless, as there is
825 # no search path for DLLs.
826- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
827- _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
828- # Tell ltmain to make .lib files, not .a files.
829- libext=lib
830- # Tell ltmain to make .dll files, not .so files.
831- shrext_cmds=".dll"
832- # FIXME: Setting linknames here is a bad hack.
833- _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
834- # The linker will automatically build a .lib file if we build a DLL.
835- _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
836- # FIXME: Should let the user specify the lib program.
837- _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs'
838- _LT_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`'
839- _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
840+ case $cc_basename in
841+ cl*)
842+ # Native MSVC
843+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
844+ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
845+ _LT_TAGVAR(always_export_symbols, $1)=yes
846+ _LT_TAGVAR(file_list_spec, $1)='@'
847+ # Tell ltmain to make .lib files, not .a files.
848+ libext=lib
849+ # Tell ltmain to make .dll files, not .so files.
850+ shrext_cmds=".dll"
851+ # FIXME: Setting linknames here is a bad hack.
852+ _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
853+ _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
854+ sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
855+ else
856+ sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
857+ fi~
858+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
859+ linknames='
860+ # The linker will not automatically build a static lib if we build a DLL.
861+ # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
862+ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
863+ _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'
864+ # Don't use ranlib
865+ _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
866+ _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~
867+ lt_tool_outputfile="@TOOL_OUTPUT@"~
868+ case $lt_outputfile in
869+ *.exe|*.EXE) ;;
870+ *)
871+ lt_outputfile="$lt_outputfile.exe"
872+ lt_tool_outputfile="$lt_tool_outputfile.exe"
873+ ;;
874+ esac~
875+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
876+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
877+ $RM "$lt_outputfile.manifest";
878+ fi'
879+ ;;
880+ *)
881+ # Assume MSVC wrapper
882+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
883+ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
884+ # Tell ltmain to make .lib files, not .a files.
885+ libext=lib
886+ # Tell ltmain to make .dll files, not .so files.
887+ shrext_cmds=".dll"
888+ # FIXME: Setting linknames here is a bad hack.
889+ _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
890+ # The linker will automatically build a .lib file if we build a DLL.
891+ _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
892+ # FIXME: Should let the user specify the lib program.
893+ _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs'
894+ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
895+ ;;
896+ esac
897 ;;
898
899 darwin* | rhapsody*)
900@@ -4828,7 +5143,7 @@ _LT_EOF
901
902 # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
903 freebsd* | dragonfly*)
904- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
905+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
906 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
907 _LT_TAGVAR(hardcode_direct, $1)=yes
908 _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
909@@ -4836,7 +5151,7 @@ _LT_EOF
910
911 hpux9*)
912 if test "$GCC" = yes; then
913- _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'
914+ _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'
915 else
916 _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'
917 fi
918@@ -4852,7 +5167,7 @@ _LT_EOF
919
920 hpux10*)
921 if test "$GCC" = yes && test "$with_gnu_ld" = no; then
922- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
923+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
924 else
925 _LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
926 fi
927@@ -4876,10 +5191,10 @@ _LT_EOF
928 _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
929 ;;
930 ia64*)
931- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
932+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
933 ;;
934 *)
935- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
936+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
937 ;;
938 esac
939 else
940@@ -4926,16 +5241,31 @@ _LT_EOF
941
942 irix5* | irix6* | nonstopux*)
943 if test "$GCC" = yes; then
944- _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'
945+ _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'
946 # Try to use the -exported_symbol ld option, if it does not
947 # work, assume that -exports_file does not work either and
948 # implicitly export all symbols.
949- save_LDFLAGS="$LDFLAGS"
950- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
951- AC_LINK_IFELSE([AC_LANG_SOURCE([int foo(void) {}])],
952- _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'
953- )
954- LDFLAGS="$save_LDFLAGS"
955+ # This should be the same for all languages, so no per-tag cache variable.
956+ AC_CACHE_CHECK([whether the $host_os linker accepts -exported_symbol],
957+ [lt_cv_irix_exported_symbol],
958+ [save_LDFLAGS="$LDFLAGS"
959+ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
960+ AC_LINK_IFELSE(
961+ [AC_LANG_SOURCE(
962+ [AC_LANG_CASE([C], [[int foo (void) { return 0; }]],
963+ [C++], [[int foo (void) { return 0; }]],
964+ [Fortran 77], [[
965+ subroutine foo
966+ end]],
967+ [Fortran], [[
968+ subroutine foo
969+ end]])])],
970+ [lt_cv_irix_exported_symbol=yes],
971+ [lt_cv_irix_exported_symbol=no])
972+ LDFLAGS="$save_LDFLAGS"])
973+ if test "$lt_cv_irix_exported_symbol" = yes; then
974+ _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'
975+ fi
976 else
977 _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'
978 _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'
979@@ -5020,7 +5350,7 @@ _LT_EOF
980 osf4* | osf5*) # as osf3* with the addition of -msym flag
981 if test "$GCC" = yes; then
982 _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
983- _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'
984+ _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'
985 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
986 else
987 _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
988@@ -5039,9 +5369,9 @@ _LT_EOF
989 _LT_TAGVAR(no_undefined_flag, $1)=' -z defs'
990 if test "$GCC" = yes; then
991 wlarc='${wl}'
992- _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
993+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
994 _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
995- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
996+ $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'
997 else
998 case `$CC -V 2>&1` in
999 *"Compilers 5.0"*)
1000@@ -5313,8 +5643,6 @@ _LT_TAGDECL([], [inherit_rpath], [0],
1001 to runtime path list])
1002 _LT_TAGDECL([], [link_all_deplibs], [0],
1003 [Whether libtool must link a program against all its dependency libraries])
1004-_LT_TAGDECL([], [fix_srcfile_path], [1],
1005- [Fix the shell variable $srcfile for the compiler])
1006 _LT_TAGDECL([], [always_export_symbols], [0],
1007 [Set to "yes" if exported symbols are required])
1008 _LT_TAGDECL([], [export_symbols_cmds], [2],
1009@@ -5325,6 +5653,8 @@ _LT_TAGDECL([], [include_expsyms], [1],
1010 [Symbols that must always be exported])
1011 _LT_TAGDECL([], [prelink_cmds], [2],
1012 [Commands necessary for linking programs (against libraries) with templates])
1013+_LT_TAGDECL([], [postlink_cmds], [2],
1014+ [Commands necessary for finishing linking programs])
1015 _LT_TAGDECL([], [file_list_spec], [1],
1016 [Specify filename containing input files])
1017 dnl FIXME: Not yet implemented
1018@@ -5426,6 +5756,7 @@ CC="$lt_save_CC"
1019 m4_defun([_LT_LANG_CXX_CONFIG],
1020 [m4_require([_LT_FILEUTILS_DEFAULTS])dnl
1021 m4_require([_LT_DECL_EGREP])dnl
1022+m4_require([_LT_PATH_MANIFEST_TOOL])dnl
1023 if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
1024 ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
1025 (test "X$CXX" != "Xg++"))) ; then
1026@@ -5487,6 +5818,7 @@ if test "$_lt_caught_CXX_error" != yes; then
1027
1028 # Allow CC to be a program name with arguments.
1029 lt_save_CC=$CC
1030+ lt_save_CFLAGS=$CFLAGS
1031 lt_save_LD=$LD
1032 lt_save_GCC=$GCC
1033 GCC=$GXX
1034@@ -5504,6 +5836,7 @@ if test "$_lt_caught_CXX_error" != yes; then
1035 fi
1036 test -z "${LDCXX+set}" || LD=$LDCXX
1037 CC=${CXX-"c++"}
1038+ CFLAGS=$CXXFLAGS
1039 compiler=$CC
1040 _LT_TAGVAR(compiler, $1)=$CC
1041 _LT_CC_BASENAME([$compiler])
1042@@ -5667,7 +6000,7 @@ if test "$_lt_caught_CXX_error" != yes; then
1043 _LT_TAGVAR(allow_undefined_flag, $1)='-berok'
1044 # Determine the default libpath from the value encoded in an empty
1045 # executable.
1046- _LT_SYS_MODULE_PATH_AIX
1047+ _LT_SYS_MODULE_PATH_AIX([$1])
1048 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
1049
1050 _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"
1051@@ -5679,7 +6012,7 @@ if test "$_lt_caught_CXX_error" != yes; then
1052 else
1053 # Determine the default libpath from the value encoded in an
1054 # empty executable.
1055- _LT_SYS_MODULE_PATH_AIX
1056+ _LT_SYS_MODULE_PATH_AIX([$1])
1057 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
1058 # Warning - without using the other run time loading flags,
1059 # -berok will link without error, but may produce a broken library.
1060@@ -5721,29 +6054,75 @@ if test "$_lt_caught_CXX_error" != yes; then
1061 ;;
1062
1063 cygwin* | mingw* | pw32* | cegcc*)
1064- # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
1065- # as there is no search path for DLLs.
1066- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
1067- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols'
1068- _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
1069- _LT_TAGVAR(always_export_symbols, $1)=no
1070- _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
1071-
1072- if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
1073- _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'
1074- # If the export-symbols file already is a .def file (1st line
1075- # is EXPORTS), use it as is; otherwise, prepend...
1076- _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
1077- cp $export_symbols $output_objdir/$soname.def;
1078- else
1079- echo EXPORTS > $output_objdir/$soname.def;
1080- cat $export_symbols >> $output_objdir/$soname.def;
1081- fi~
1082- $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'
1083- else
1084- _LT_TAGVAR(ld_shlibs, $1)=no
1085- fi
1086- ;;
1087+ case $GXX,$cc_basename in
1088+ ,cl* | no,cl*)
1089+ # Native MSVC
1090+ # hardcode_libdir_flag_spec is actually meaningless, as there is
1091+ # no search path for DLLs.
1092+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
1093+ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
1094+ _LT_TAGVAR(always_export_symbols, $1)=yes
1095+ _LT_TAGVAR(file_list_spec, $1)='@'
1096+ # Tell ltmain to make .lib files, not .a files.
1097+ libext=lib
1098+ # Tell ltmain to make .dll files, not .so files.
1099+ shrext_cmds=".dll"
1100+ # FIXME: Setting linknames here is a bad hack.
1101+ _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
1102+ _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
1103+ $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
1104+ else
1105+ $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
1106+ fi~
1107+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
1108+ linknames='
1109+ # The linker will not automatically build a static lib if we build a DLL.
1110+ # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
1111+ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
1112+ # Don't use ranlib
1113+ _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
1114+ _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~
1115+ lt_tool_outputfile="@TOOL_OUTPUT@"~
1116+ case $lt_outputfile in
1117+ *.exe|*.EXE) ;;
1118+ *)
1119+ lt_outputfile="$lt_outputfile.exe"
1120+ lt_tool_outputfile="$lt_tool_outputfile.exe"
1121+ ;;
1122+ esac~
1123+ func_to_tool_file "$lt_outputfile"~
1124+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
1125+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
1126+ $RM "$lt_outputfile.manifest";
1127+ fi'
1128+ ;;
1129+ *)
1130+ # g++
1131+ # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
1132+ # as there is no search path for DLLs.
1133+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
1134+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols'
1135+ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
1136+ _LT_TAGVAR(always_export_symbols, $1)=no
1137+ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
1138+
1139+ if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
1140+ _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'
1141+ # If the export-symbols file already is a .def file (1st line
1142+ # is EXPORTS), use it as is; otherwise, prepend...
1143+ _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
1144+ cp $export_symbols $output_objdir/$soname.def;
1145+ else
1146+ echo EXPORTS > $output_objdir/$soname.def;
1147+ cat $export_symbols >> $output_objdir/$soname.def;
1148+ fi~
1149+ $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'
1150+ else
1151+ _LT_TAGVAR(ld_shlibs, $1)=no
1152+ fi
1153+ ;;
1154+ esac
1155+ ;;
1156 darwin* | rhapsody*)
1157 _LT_DARWIN_LINKER_FEATURES($1)
1158 ;;
1159@@ -5818,7 +6197,7 @@ if test "$_lt_caught_CXX_error" != yes; then
1160 ;;
1161 *)
1162 if test "$GXX" = yes; then
1163- _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'
1164+ _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'
1165 else
1166 # FIXME: insert proper C++ library support
1167 _LT_TAGVAR(ld_shlibs, $1)=no
1168@@ -5889,10 +6268,10 @@ if test "$_lt_caught_CXX_error" != yes; then
1169 _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
1170 ;;
1171 ia64*)
1172- _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'
1173+ _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'
1174 ;;
1175 *)
1176- _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'
1177+ _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'
1178 ;;
1179 esac
1180 fi
1181@@ -5933,9 +6312,9 @@ if test "$_lt_caught_CXX_error" != yes; then
1182 *)
1183 if test "$GXX" = yes; then
1184 if test "$with_gnu_ld" = no; then
1185- _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'
1186+ _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'
1187 else
1188- _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'
1189+ _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'
1190 fi
1191 fi
1192 _LT_TAGVAR(link_all_deplibs, $1)=yes
1193@@ -6005,20 +6384,20 @@ if test "$_lt_caught_CXX_error" != yes; then
1194 _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~
1195 rm -rf $tpldir~
1196 $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
1197- compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"'
1198+ compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"'
1199 _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~
1200 rm -rf $tpldir~
1201 $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
1202- $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~
1203+ $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~
1204 $RANLIB $oldlib'
1205 _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~
1206 rm -rf $tpldir~
1207 $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
1208- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
1209+ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
1210 _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~
1211 rm -rf $tpldir~
1212 $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
1213- $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'
1214+ $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'
1215 ;;
1216 *) # Version 6 and above use weak symbols
1217 _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
1218@@ -6213,7 +6592,7 @@ if test "$_lt_caught_CXX_error" != yes; then
1219 _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'
1220 ;;
1221 *)
1222- _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'
1223+ _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'
1224 ;;
1225 esac
1226
1227@@ -6259,7 +6638,7 @@ if test "$_lt_caught_CXX_error" != yes; then
1228
1229 solaris*)
1230 case $cc_basename in
1231- CC*)
1232+ CC* | sunCC*)
1233 # Sun C++ 4.2, 5.x and Centerline C++
1234 _LT_TAGVAR(archive_cmds_need_lc,$1)=yes
1235 _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
1236@@ -6300,9 +6679,9 @@ if test "$_lt_caught_CXX_error" != yes; then
1237 if test "$GXX" = yes && test "$with_gnu_ld" = no; then
1238 _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
1239 if $CC --version | $GREP -v '^2\.7' > /dev/null; then
1240- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
1241+ _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'
1242 _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
1243- $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
1244+ $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
1245
1246 # Commands to make compiler produce verbose output that lists
1247 # what "hidden" libraries, object files and flags are used when
1248@@ -6431,6 +6810,7 @@ if test "$_lt_caught_CXX_error" != yes; then
1249 fi # test -n "$compiler"
1250
1251 CC=$lt_save_CC
1252+ CFLAGS=$lt_save_CFLAGS
1253 LDCXX=$LD
1254 LD=$lt_save_LD
1255 GCC=$lt_save_GCC
1256@@ -6445,6 +6825,29 @@ AC_LANG_POP
1257 ])# _LT_LANG_CXX_CONFIG
1258
1259
1260+# _LT_FUNC_STRIPNAME_CNF
1261+# ----------------------
1262+# func_stripname_cnf prefix suffix name
1263+# strip PREFIX and SUFFIX off of NAME.
1264+# PREFIX and SUFFIX must not contain globbing or regex special
1265+# characters, hashes, percent signs, but SUFFIX may contain a leading
1266+# dot (in which case that matches only a dot).
1267+#
1268+# This function is identical to the (non-XSI) version of func_stripname,
1269+# except this one can be used by m4 code that may be executed by configure,
1270+# rather than the libtool script.
1271+m4_defun([_LT_FUNC_STRIPNAME_CNF],[dnl
1272+AC_REQUIRE([_LT_DECL_SED])
1273+AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])
1274+func_stripname_cnf ()
1275+{
1276+ case ${2} in
1277+ .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
1278+ *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
1279+ esac
1280+} # func_stripname_cnf
1281+])# _LT_FUNC_STRIPNAME_CNF
1282+
1283 # _LT_SYS_HIDDEN_LIBDEPS([TAGNAME])
1284 # ---------------------------------
1285 # Figure out "hidden" library dependencies from verbose
1286@@ -6453,6 +6856,7 @@ AC_LANG_POP
1287 # objects, libraries and library flags.
1288 m4_defun([_LT_SYS_HIDDEN_LIBDEPS],
1289 [m4_require([_LT_FILEUTILS_DEFAULTS])dnl
1290+AC_REQUIRE([_LT_FUNC_STRIPNAME_CNF])dnl
1291 # Dependencies to place before and after the object being linked:
1292 _LT_TAGVAR(predep_objects, $1)=
1293 _LT_TAGVAR(postdep_objects, $1)=
1294@@ -6503,6 +6907,13 @@ public class foo {
1295 };
1296 _LT_EOF
1297 ])
1298+
1299+_lt_libdeps_save_CFLAGS=$CFLAGS
1300+case "$CC $CFLAGS " in #(
1301+*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;;
1302+*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;;
1303+esac
1304+
1305 dnl Parse the compiler output and extract the necessary
1306 dnl objects, libraries and library flags.
1307 if AC_TRY_EVAL(ac_compile); then
1308@@ -6514,7 +6925,7 @@ if AC_TRY_EVAL(ac_compile); then
1309 pre_test_object_deps_done=no
1310
1311 for p in `eval "$output_verbose_link_cmd"`; do
1312- case $p in
1313+ case ${prev}${p} in
1314
1315 -L* | -R* | -l*)
1316 # Some compilers place space between "-{L,R}" and the path.
1317@@ -6523,13 +6934,22 @@ if AC_TRY_EVAL(ac_compile); then
1318 test $p = "-R"; then
1319 prev=$p
1320 continue
1321- else
1322- prev=
1323 fi
1324
1325+ # Expand the sysroot to ease extracting the directories later.
1326+ if test -z "$prev"; then
1327+ case $p in
1328+ -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;;
1329+ -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;;
1330+ -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;;
1331+ esac
1332+ fi
1333+ case $p in
1334+ =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;;
1335+ esac
1336 if test "$pre_test_object_deps_done" = no; then
1337- case $p in
1338- -L* | -R*)
1339+ case ${prev} in
1340+ -L | -R)
1341 # Internal compiler library paths should come after those
1342 # provided the user. The postdeps already come after the
1343 # user supplied libs so there is no need to process them.
1344@@ -6549,8 +6969,10 @@ if AC_TRY_EVAL(ac_compile); then
1345 _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}"
1346 fi
1347 fi
1348+ prev=
1349 ;;
1350
1351+ *.lto.$objext) ;; # Ignore GCC LTO objects
1352 *.$objext)
1353 # This assumes that the test object file only shows up
1354 # once in the compiler output.
1355@@ -6586,6 +7008,7 @@ else
1356 fi
1357
1358 $RM -f confest.$objext
1359+CFLAGS=$_lt_libdeps_save_CFLAGS
1360
1361 # PORTME: override above test on systems where it is broken
1362 m4_if([$1], [CXX],
1363@@ -6622,7 +7045,7 @@ linux*)
1364
1365 solaris*)
1366 case $cc_basename in
1367- CC*)
1368+ CC* | sunCC*)
1369 # The more standards-conforming stlport4 library is
1370 # incompatible with the Cstd library. Avoid specifying
1371 # it if it's in CXXFLAGS. Ignore libCrun as
1372@@ -6735,7 +7158,9 @@ if test "$_lt_disable_F77" != yes; then
1373 # Allow CC to be a program name with arguments.
1374 lt_save_CC="$CC"
1375 lt_save_GCC=$GCC
1376+ lt_save_CFLAGS=$CFLAGS
1377 CC=${F77-"f77"}
1378+ CFLAGS=$FFLAGS
1379 compiler=$CC
1380 _LT_TAGVAR(compiler, $1)=$CC
1381 _LT_CC_BASENAME([$compiler])
1382@@ -6789,6 +7214,7 @@ if test "$_lt_disable_F77" != yes; then
1383
1384 GCC=$lt_save_GCC
1385 CC="$lt_save_CC"
1386+ CFLAGS="$lt_save_CFLAGS"
1387 fi # test "$_lt_disable_F77" != yes
1388
1389 AC_LANG_POP
1390@@ -6865,7 +7291,9 @@ if test "$_lt_disable_FC" != yes; then
1391 # Allow CC to be a program name with arguments.
1392 lt_save_CC="$CC"
1393 lt_save_GCC=$GCC
1394+ lt_save_CFLAGS=$CFLAGS
1395 CC=${FC-"f95"}
1396+ CFLAGS=$FCFLAGS
1397 compiler=$CC
1398 GCC=$ac_cv_fc_compiler_gnu
1399
1400@@ -6921,7 +7349,8 @@ if test "$_lt_disable_FC" != yes; then
1401 fi # test -n "$compiler"
1402
1403 GCC=$lt_save_GCC
1404- CC="$lt_save_CC"
1405+ CC=$lt_save_CC
1406+ CFLAGS=$lt_save_CFLAGS
1407 fi # test "$_lt_disable_FC" != yes
1408
1409 AC_LANG_POP
1410@@ -6958,10 +7387,12 @@ _LT_COMPILER_BOILERPLATE
1411 _LT_LINKER_BOILERPLATE
1412
1413 # Allow CC to be a program name with arguments.
1414-lt_save_CC="$CC"
1415+lt_save_CC=$CC
1416+lt_save_CFLAGS=$CFLAGS
1417 lt_save_GCC=$GCC
1418 GCC=yes
1419 CC=${GCJ-"gcj"}
1420+CFLAGS=$GCJFLAGS
1421 compiler=$CC
1422 _LT_TAGVAR(compiler, $1)=$CC
1423 _LT_TAGVAR(LD, $1)="$LD"
1424@@ -6992,7 +7423,8 @@ fi
1425 AC_LANG_RESTORE
1426
1427 GCC=$lt_save_GCC
1428-CC="$lt_save_CC"
1429+CC=$lt_save_CC
1430+CFLAGS=$lt_save_CFLAGS
1431 ])# _LT_LANG_GCJ_CONFIG
1432
1433
1434@@ -7027,9 +7459,11 @@ _LT_LINKER_BOILERPLATE
1435
1436 # Allow CC to be a program name with arguments.
1437 lt_save_CC="$CC"
1438+lt_save_CFLAGS=$CFLAGS
1439 lt_save_GCC=$GCC
1440 GCC=
1441 CC=${RC-"windres"}
1442+CFLAGS=
1443 compiler=$CC
1444 _LT_TAGVAR(compiler, $1)=$CC
1445 _LT_CC_BASENAME([$compiler])
1446@@ -7042,7 +7476,8 @@ fi
1447
1448 GCC=$lt_save_GCC
1449 AC_LANG_RESTORE
1450-CC="$lt_save_CC"
1451+CC=$lt_save_CC
1452+CFLAGS=$lt_save_CFLAGS
1453 ])# _LT_LANG_RC_CONFIG
1454
1455
1456@@ -7101,6 +7536,15 @@ _LT_DECL([], [OBJDUMP], [1], [An object symbol dumper])
1457 AC_SUBST([OBJDUMP])
1458 ])
1459
1460+# _LT_DECL_DLLTOOL
1461+# ----------------
1462+# Ensure DLLTOOL variable is set.
1463+m4_defun([_LT_DECL_DLLTOOL],
1464+[AC_CHECK_TOOL(DLLTOOL, dlltool, false)
1465+test -z "$DLLTOOL" && DLLTOOL=dlltool
1466+_LT_DECL([], [DLLTOOL], [1], [DLL creation program])
1467+AC_SUBST([DLLTOOL])
1468+])
1469
1470 # _LT_DECL_SED
1471 # ------------
1472@@ -7194,8 +7638,8 @@ m4_defun([_LT_CHECK_SHELL_FEATURES],
1473 # Try some XSI features
1474 xsi_shell=no
1475 ( _lt_dummy="a/b/c"
1476- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
1477- = c,a/b,, \
1478+ test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
1479+ = c,a/b,b/c, \
1480 && eval 'test $(( 1 + 1 )) -eq 2 \
1481 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
1482 && xsi_shell=yes
1483@@ -7234,206 +7678,162 @@ _LT_DECL([NL2SP], [lt_NL2SP], [1], [turn newlines into spaces])dnl
1484 ])# _LT_CHECK_SHELL_FEATURES
1485
1486
1487-# _LT_PROG_XSI_SHELLFNS
1488-# ---------------------
1489-# Bourne and XSI compatible variants of some useful shell functions.
1490-m4_defun([_LT_PROG_XSI_SHELLFNS],
1491-[case $xsi_shell in
1492- yes)
1493- cat << \_LT_EOF >> "$cfgfile"
1494-
1495-# func_dirname file append nondir_replacement
1496-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
1497-# otherwise set result to NONDIR_REPLACEMENT.
1498-func_dirname ()
1499-{
1500- case ${1} in
1501- */*) func_dirname_result="${1%/*}${2}" ;;
1502- * ) func_dirname_result="${3}" ;;
1503- esac
1504-}
1505-
1506-# func_basename file
1507-func_basename ()
1508-{
1509- func_basename_result="${1##*/}"
1510-}
1511-
1512-# func_dirname_and_basename file append nondir_replacement
1513-# perform func_basename and func_dirname in a single function
1514-# call:
1515-# dirname: Compute the dirname of FILE. If nonempty,
1516-# add APPEND to the result, otherwise set result
1517-# to NONDIR_REPLACEMENT.
1518-# value returned in "$func_dirname_result"
1519-# basename: Compute filename of FILE.
1520-# value retuned in "$func_basename_result"
1521-# Implementation must be kept synchronized with func_dirname
1522-# and func_basename. For efficiency, we do not delegate to
1523-# those functions but instead duplicate the functionality here.
1524-func_dirname_and_basename ()
1525-{
1526- case ${1} in
1527- */*) func_dirname_result="${1%/*}${2}" ;;
1528- * ) func_dirname_result="${3}" ;;
1529- esac
1530- func_basename_result="${1##*/}"
1531-}
1532-
1533-# func_stripname prefix suffix name
1534-# strip PREFIX and SUFFIX off of NAME.
1535-# PREFIX and SUFFIX must not contain globbing or regex special
1536-# characters, hashes, percent signs, but SUFFIX may contain a leading
1537-# dot (in which case that matches only a dot).
1538-func_stripname ()
1539-{
1540- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
1541- # positional parameters, so assign one to ordinary parameter first.
1542- func_stripname_result=${3}
1543- func_stripname_result=${func_stripname_result#"${1}"}
1544- func_stripname_result=${func_stripname_result%"${2}"}
1545-}
1546-
1547-# func_opt_split
1548-func_opt_split ()
1549-{
1550- func_opt_split_opt=${1%%=*}
1551- func_opt_split_arg=${1#*=}
1552-}
1553-
1554-# func_lo2o object
1555-func_lo2o ()
1556-{
1557- case ${1} in
1558- *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
1559- *) func_lo2o_result=${1} ;;
1560- esac
1561-}
1562-
1563-# func_xform libobj-or-source
1564-func_xform ()
1565-{
1566- func_xform_result=${1%.*}.lo
1567-}
1568-
1569-# func_arith arithmetic-term...
1570-func_arith ()
1571-{
1572- func_arith_result=$(( $[*] ))
1573-}
1574-
1575-# func_len string
1576-# STRING may not start with a hyphen.
1577-func_len ()
1578-{
1579- func_len_result=${#1}
1580-}
1581+# _LT_PROG_FUNCTION_REPLACE (FUNCNAME, REPLACEMENT-BODY)
1582+# ------------------------------------------------------
1583+# In `$cfgfile', look for function FUNCNAME delimited by `^FUNCNAME ()$' and
1584+# '^} FUNCNAME ', and replace its body with REPLACEMENT-BODY.
1585+m4_defun([_LT_PROG_FUNCTION_REPLACE],
1586+[dnl {
1587+sed -e '/^$1 ()$/,/^} # $1 /c\
1588+$1 ()\
1589+{\
1590+m4_bpatsubsts([$2], [$], [\\], [^\([ ]\)], [\\\1])
1591+} # Extended-shell $1 implementation' "$cfgfile" > $cfgfile.tmp \
1592+ && mv -f "$cfgfile.tmp" "$cfgfile" \
1593+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
1594+test 0 -eq $? || _lt_function_replace_fail=:
1595+])
1596
1597-_LT_EOF
1598- ;;
1599- *) # Bourne compatible functions.
1600- cat << \_LT_EOF >> "$cfgfile"
1601
1602-# func_dirname file append nondir_replacement
1603-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
1604-# otherwise set result to NONDIR_REPLACEMENT.
1605-func_dirname ()
1606-{
1607- # Extract subdirectory from the argument.
1608- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
1609- if test "X$func_dirname_result" = "X${1}"; then
1610- func_dirname_result="${3}"
1611- else
1612- func_dirname_result="$func_dirname_result${2}"
1613- fi
1614-}
1615+# _LT_PROG_REPLACE_SHELLFNS
1616+# -------------------------
1617+# Replace existing portable implementations of several shell functions with
1618+# equivalent extended shell implementations where those features are available..
1619+m4_defun([_LT_PROG_REPLACE_SHELLFNS],
1620+[if test x"$xsi_shell" = xyes; then
1621+ _LT_PROG_FUNCTION_REPLACE([func_dirname], [dnl
1622+ case ${1} in
1623+ */*) func_dirname_result="${1%/*}${2}" ;;
1624+ * ) func_dirname_result="${3}" ;;
1625+ esac])
1626+
1627+ _LT_PROG_FUNCTION_REPLACE([func_basename], [dnl
1628+ func_basename_result="${1##*/}"])
1629+
1630+ _LT_PROG_FUNCTION_REPLACE([func_dirname_and_basename], [dnl
1631+ case ${1} in
1632+ */*) func_dirname_result="${1%/*}${2}" ;;
1633+ * ) func_dirname_result="${3}" ;;
1634+ esac
1635+ func_basename_result="${1##*/}"])
1636
1637-# func_basename file
1638-func_basename ()
1639-{
1640- func_basename_result=`$ECHO "${1}" | $SED "$basename"`
1641-}
1642+ _LT_PROG_FUNCTION_REPLACE([func_stripname], [dnl
1643+ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
1644+ # positional parameters, so assign one to ordinary parameter first.
1645+ func_stripname_result=${3}
1646+ func_stripname_result=${func_stripname_result#"${1}"}
1647+ func_stripname_result=${func_stripname_result%"${2}"}])
1648
1649-dnl func_dirname_and_basename
1650-dnl A portable version of this function is already defined in general.m4sh
1651-dnl so there is no need for it here.
1652+ _LT_PROG_FUNCTION_REPLACE([func_split_long_opt], [dnl
1653+ func_split_long_opt_name=${1%%=*}
1654+ func_split_long_opt_arg=${1#*=}])
1655
1656-# func_stripname prefix suffix name
1657-# strip PREFIX and SUFFIX off of NAME.
1658-# PREFIX and SUFFIX must not contain globbing or regex special
1659-# characters, hashes, percent signs, but SUFFIX may contain a leading
1660-# dot (in which case that matches only a dot).
1661-# func_strip_suffix prefix name
1662-func_stripname ()
1663-{
1664- case ${2} in
1665- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
1666- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
1667- esac
1668-}
1669+ _LT_PROG_FUNCTION_REPLACE([func_split_short_opt], [dnl
1670+ func_split_short_opt_arg=${1#??}
1671+ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}])
1672
1673-# sed scripts:
1674-my_sed_long_opt='1s/^\(-[[^=]]*\)=.*/\1/;q'
1675-my_sed_long_arg='1s/^-[[^=]]*=//'
1676+ _LT_PROG_FUNCTION_REPLACE([func_lo2o], [dnl
1677+ case ${1} in
1678+ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
1679+ *) func_lo2o_result=${1} ;;
1680+ esac])
1681
1682-# func_opt_split
1683-func_opt_split ()
1684-{
1685- func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"`
1686- func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"`
1687-}
1688+ _LT_PROG_FUNCTION_REPLACE([func_xform], [ func_xform_result=${1%.*}.lo])
1689
1690-# func_lo2o object
1691-func_lo2o ()
1692-{
1693- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
1694-}
1695+ _LT_PROG_FUNCTION_REPLACE([func_arith], [ func_arith_result=$(( $[*] ))])
1696
1697-# func_xform libobj-or-source
1698-func_xform ()
1699-{
1700- func_xform_result=`$ECHO "${1}" | $SED 's/\.[[^.]]*$/.lo/'`
1701-}
1702+ _LT_PROG_FUNCTION_REPLACE([func_len], [ func_len_result=${#1}])
1703+fi
1704
1705-# func_arith arithmetic-term...
1706-func_arith ()
1707-{
1708- func_arith_result=`expr "$[@]"`
1709-}
1710+if test x"$lt_shell_append" = xyes; then
1711+ _LT_PROG_FUNCTION_REPLACE([func_append], [ eval "${1}+=\\${2}"])
1712
1713-# func_len string
1714-# STRING may not start with a hyphen.
1715-func_len ()
1716-{
1717- func_len_result=`expr "$[1]" : ".*" 2>/dev/null || echo $max_cmd_len`
1718-}
1719+ _LT_PROG_FUNCTION_REPLACE([func_append_quoted], [dnl
1720+ func_quote_for_eval "${2}"
1721+dnl m4 expansion turns \\\\ into \\, and then the shell eval turns that into \
1722+ eval "${1}+=\\\\ \\$func_quote_for_eval_result"])
1723
1724-_LT_EOF
1725-esac
1726+ # Save a `func_append' function call where possible by direct use of '+='
1727+ sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
1728+ && mv -f "$cfgfile.tmp" "$cfgfile" \
1729+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
1730+ test 0 -eq $? || _lt_function_replace_fail=:
1731+else
1732+ # Save a `func_append' function call even when '+=' is not available
1733+ sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
1734+ && mv -f "$cfgfile.tmp" "$cfgfile" \
1735+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
1736+ test 0 -eq $? || _lt_function_replace_fail=:
1737+fi
1738
1739-case $lt_shell_append in
1740- yes)
1741- cat << \_LT_EOF >> "$cfgfile"
1742+if test x"$_lt_function_replace_fail" = x":"; then
1743+ AC_MSG_WARN([Unable to substitute extended shell functions in $ofile])
1744+fi
1745+])
1746
1747-# func_append var value
1748-# Append VALUE to the end of shell variable VAR.
1749-func_append ()
1750-{
1751- eval "$[1]+=\$[2]"
1752-}
1753-_LT_EOF
1754+# _LT_PATH_CONVERSION_FUNCTIONS
1755+# -----------------------------
1756+# Determine which file name conversion functions should be used by
1757+# func_to_host_file (and, implicitly, by func_to_host_path). These are needed
1758+# for certain cross-compile configurations and native mingw.
1759+m4_defun([_LT_PATH_CONVERSION_FUNCTIONS],
1760+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
1761+AC_REQUIRE([AC_CANONICAL_BUILD])dnl
1762+AC_MSG_CHECKING([how to convert $build file names to $host format])
1763+AC_CACHE_VAL(lt_cv_to_host_file_cmd,
1764+[case $host in
1765+ *-*-mingw* )
1766+ case $build in
1767+ *-*-mingw* ) # actually msys
1768+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
1769+ ;;
1770+ *-*-cygwin* )
1771+ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
1772+ ;;
1773+ * ) # otherwise, assume *nix
1774+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
1775+ ;;
1776+ esac
1777 ;;
1778- *)
1779- cat << \_LT_EOF >> "$cfgfile"
1780-
1781-# func_append var value
1782-# Append VALUE to the end of shell variable VAR.
1783-func_append ()
1784-{
1785- eval "$[1]=\$$[1]\$[2]"
1786-}
1787-
1788-_LT_EOF
1789+ *-*-cygwin* )
1790+ case $build in
1791+ *-*-mingw* ) # actually msys
1792+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
1793+ ;;
1794+ *-*-cygwin* )
1795+ lt_cv_to_host_file_cmd=func_convert_file_noop
1796+ ;;
1797+ * ) # otherwise, assume *nix
1798+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
1799+ ;;
1800+ esac
1801 ;;
1802- esac
1803+ * ) # unhandled hosts (and "normal" native builds)
1804+ lt_cv_to_host_file_cmd=func_convert_file_noop
1805+ ;;
1806+esac
1807+])
1808+to_host_file_cmd=$lt_cv_to_host_file_cmd
1809+AC_MSG_RESULT([$lt_cv_to_host_file_cmd])
1810+_LT_DECL([to_host_file_cmd], [lt_cv_to_host_file_cmd],
1811+ [0], [convert $build file names to $host format])dnl
1812+
1813+AC_MSG_CHECKING([how to convert $build file names to toolchain format])
1814+AC_CACHE_VAL(lt_cv_to_tool_file_cmd,
1815+[#assume ordinary cross tools, or native build.
1816+lt_cv_to_tool_file_cmd=func_convert_file_noop
1817+case $host in
1818+ *-*-mingw* )
1819+ case $build in
1820+ *-*-mingw* ) # actually msys
1821+ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
1822+ ;;
1823+ esac
1824+ ;;
1825+esac
1826 ])
1827+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
1828+AC_MSG_RESULT([$lt_cv_to_tool_file_cmd])
1829+_LT_DECL([to_tool_file_cmd], [lt_cv_to_tool_file_cmd],
1830+ [0], [convert $build files to toolchain format])dnl
1831+])# _LT_PATH_CONVERSION_FUNCTIONS
1832diff --git a/ltmain.sh b/ltmain.sh
1833index 9503ec85d7..70e856e065 100644
1834--- a/ltmain.sh
1835+++ b/ltmain.sh
1836@@ -1,10 +1,9 @@
1837-# Generated from ltmain.m4sh.
1838
1839-# libtool (GNU libtool 1.3134 2009-11-29) 2.2.7a
1840+# libtool (GNU libtool) 2.4
1841 # Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
1842
1843 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
1844-# 2007, 2008, 2009 Free Software Foundation, Inc.
1845+# 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
1846 # This is free software; see the source for copying conditions. There is NO
1847 # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
1848
1849@@ -38,7 +37,6 @@
1850 # -n, --dry-run display commands without modifying any files
1851 # --features display basic configuration information and exit
1852 # --mode=MODE use operation mode MODE
1853-# --no-finish let install mode avoid finish commands
1854 # --preserve-dup-deps don't remove duplicate dependency libraries
1855 # --quiet, --silent don't print informational messages
1856 # --no-quiet, --no-silent
1857@@ -71,17 +69,19 @@
1858 # compiler: $LTCC
1859 # compiler flags: $LTCFLAGS
1860 # linker: $LD (gnu? $with_gnu_ld)
1861-# $progname: (GNU libtool 1.3134 2009-11-29) 2.2.7a
1862+# $progname: (GNU libtool) 2.4
1863 # automake: $automake_version
1864 # autoconf: $autoconf_version
1865 #
1866 # Report bugs to <bug-libtool@gnu.org>.
1867+# GNU libtool home page: <http://www.gnu.org/software/libtool/>.
1868+# General help using GNU software: <http://www.gnu.org/gethelp/>.
1869
1870 PROGRAM=libtool
1871 PACKAGE=libtool
1872-VERSION=2.2.7a
1873-TIMESTAMP=" 1.3134 2009-11-29"
1874-package_revision=1.3134
1875+VERSION=2.4
1876+TIMESTAMP=""
1877+package_revision=1.3293
1878
1879 # Be Bourne compatible
1880 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
1881@@ -106,9 +106,6 @@ _LTECHO_EOF'
1882 }
1883
1884 # NLS nuisances: We save the old values to restore during execute mode.
1885-# Only set LANG and LC_ALL to C if already set.
1886-# These must not be set unconditionally because not all systems understand
1887-# e.g. LANG=C (notably SCO).
1888 lt_user_locale=
1889 lt_safe_locale=
1890 for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
1891@@ -121,15 +118,13 @@ do
1892 lt_safe_locale=\"$lt_var=C; \$lt_safe_locale\"
1893 fi"
1894 done
1895+LC_ALL=C
1896+LANGUAGE=C
1897+export LANGUAGE LC_ALL
1898
1899 $lt_unset CDPATH
1900
1901
1902-
1903-
1904-
1905-
1906-
1907 # Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
1908 # is ksh but when the shell is invoked as "sh" and the current value of
1909 # the _XPG environment variable is not equal to 1 (one), the special
1910@@ -140,7 +135,7 @@ progpath="$0"
1911
1912
1913 : ${CP="cp -f"}
1914-: ${ECHO=$as_echo}
1915+test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'}
1916 : ${EGREP="/bin/grep -E"}
1917 : ${FGREP="/bin/grep -F"}
1918 : ${GREP="/bin/grep"}
1919@@ -149,7 +144,7 @@ progpath="$0"
1920 : ${MKDIR="mkdir"}
1921 : ${MV="mv -f"}
1922 : ${RM="rm -f"}
1923-: ${SED="/mount/endor/wildenhu/local-x86_64/bin/sed"}
1924+: ${SED="/bin/sed"}
1925 : ${SHELL="${CONFIG_SHELL-/bin/sh}"}
1926 : ${Xsed="$SED -e 1s/^X//"}
1927
1928@@ -169,6 +164,27 @@ IFS=" $lt_nl"
1929 dirname="s,/[^/]*$,,"
1930 basename="s,^.*/,,"
1931
1932+# func_dirname file append nondir_replacement
1933+# Compute the dirname of FILE. If nonempty, add APPEND to the result,
1934+# otherwise set result to NONDIR_REPLACEMENT.
1935+func_dirname ()
1936+{
1937+ func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
1938+ if test "X$func_dirname_result" = "X${1}"; then
1939+ func_dirname_result="${3}"
1940+ else
1941+ func_dirname_result="$func_dirname_result${2}"
1942+ fi
1943+} # func_dirname may be replaced by extended shell implementation
1944+
1945+
1946+# func_basename file
1947+func_basename ()
1948+{
1949+ func_basename_result=`$ECHO "${1}" | $SED "$basename"`
1950+} # func_basename may be replaced by extended shell implementation
1951+
1952+
1953 # func_dirname_and_basename file append nondir_replacement
1954 # perform func_basename and func_dirname in a single function
1955 # call:
1956@@ -183,17 +199,31 @@ basename="s,^.*/,,"
1957 # those functions but instead duplicate the functionality here.
1958 func_dirname_and_basename ()
1959 {
1960- # Extract subdirectory from the argument.
1961- func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"`
1962- if test "X$func_dirname_result" = "X${1}"; then
1963- func_dirname_result="${3}"
1964- else
1965- func_dirname_result="$func_dirname_result${2}"
1966- fi
1967- func_basename_result=`$ECHO "${1}" | $SED -e "$basename"`
1968-}
1969+ # Extract subdirectory from the argument.
1970+ func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"`
1971+ if test "X$func_dirname_result" = "X${1}"; then
1972+ func_dirname_result="${3}"
1973+ else
1974+ func_dirname_result="$func_dirname_result${2}"
1975+ fi
1976+ func_basename_result=`$ECHO "${1}" | $SED -e "$basename"`
1977+} # func_dirname_and_basename may be replaced by extended shell implementation
1978+
1979+
1980+# func_stripname prefix suffix name
1981+# strip PREFIX and SUFFIX off of NAME.
1982+# PREFIX and SUFFIX must not contain globbing or regex special
1983+# characters, hashes, percent signs, but SUFFIX may contain a leading
1984+# dot (in which case that matches only a dot).
1985+# func_strip_suffix prefix name
1986+func_stripname ()
1987+{
1988+ case ${2} in
1989+ .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
1990+ *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
1991+ esac
1992+} # func_stripname may be replaced by extended shell implementation
1993
1994-# Generated shell functions inserted here.
1995
1996 # These SED scripts presuppose an absolute path with a trailing slash.
1997 pathcar='s,^/\([^/]*\).*$,\1,'
1998@@ -376,6 +406,15 @@ sed_quote_subst='s/\([`"$\\]\)/\\\1/g'
1999 # Same as above, but do not quote variable references.
2000 double_quote_subst='s/\(["`\\]\)/\\\1/g'
2001
2002+# Sed substitution that turns a string into a regex matching for the
2003+# string literally.
2004+sed_make_literal_regex='s,[].[^$\\*\/],\\&,g'
2005+
2006+# Sed substitution that converts a w32 file name or path
2007+# which contains forward slashes, into one that contains
2008+# (escaped) backslashes. A very naive implementation.
2009+lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
2010+
2011 # Re-`\' parameter expansions in output of double_quote_subst that were
2012 # `\'-ed in input to the same. If an odd number of `\' preceded a '$'
2013 # in input to double_quote_subst, that '$' was protected from expansion.
2014@@ -404,7 +443,7 @@ opt_warning=:
2015 # name if it has been set yet.
2016 func_echo ()
2017 {
2018- $ECHO "$progname${mode+: }$mode: $*"
2019+ $ECHO "$progname: ${opt_mode+$opt_mode: }$*"
2020 }
2021
2022 # func_verbose arg...
2023@@ -430,14 +469,14 @@ func_echo_all ()
2024 # Echo program name prefixed message to standard error.
2025 func_error ()
2026 {
2027- $ECHO "$progname${mode+: }$mode: "${1+"$@"} 1>&2
2028+ $ECHO "$progname: ${opt_mode+$opt_mode: }"${1+"$@"} 1>&2
2029 }
2030
2031 # func_warning arg...
2032 # Echo program name prefixed warning message to standard error.
2033 func_warning ()
2034 {
2035- $opt_warning && $ECHO "$progname${mode+: }$mode: warning: "${1+"$@"} 1>&2
2036+ $opt_warning && $ECHO "$progname: ${opt_mode+$opt_mode: }warning: "${1+"$@"} 1>&2
2037
2038 # bash bug again:
2039 :
2040@@ -656,19 +695,35 @@ func_show_eval_locale ()
2041 fi
2042 }
2043
2044-
2045-
2046+# func_tr_sh
2047+# Turn $1 into a string suitable for a shell variable name.
2048+# Result is stored in $func_tr_sh_result. All characters
2049+# not in the set a-zA-Z0-9_ are replaced with '_'. Further,
2050+# if $1 begins with a digit, a '_' is prepended as well.
2051+func_tr_sh ()
2052+{
2053+ case $1 in
2054+ [0-9]* | *[!a-zA-Z0-9_]*)
2055+ func_tr_sh_result=`$ECHO "$1" | $SED 's/^\([0-9]\)/_\1/; s/[^a-zA-Z0-9_]/_/g'`
2056+ ;;
2057+ * )
2058+ func_tr_sh_result=$1
2059+ ;;
2060+ esac
2061+}
2062
2063
2064 # func_version
2065 # Echo version message to standard output and exit.
2066 func_version ()
2067 {
2068+ $opt_debug
2069+
2070 $SED -n '/(C)/!b go
2071 :more
2072 /\./!{
2073 N
2074- s/\n# //
2075+ s/\n# / /
2076 b more
2077 }
2078 :go
2079@@ -685,7 +740,9 @@ func_version ()
2080 # Echo short help message to standard output and exit.
2081 func_usage ()
2082 {
2083- $SED -n '/^# Usage:/,/^# *-h/ {
2084+ $opt_debug
2085+
2086+ $SED -n '/^# Usage:/,/^# *.*--help/ {
2087 s/^# //
2088 s/^# *$//
2089 s/\$progname/'$progname'/
2090@@ -701,7 +758,10 @@ func_usage ()
2091 # unless 'noexit' is passed as argument.
2092 func_help ()
2093 {
2094+ $opt_debug
2095+
2096 $SED -n '/^# Usage:/,/# Report bugs to/ {
2097+ :print
2098 s/^# //
2099 s/^# *$//
2100 s*\$progname*'$progname'*
2101@@ -714,7 +774,11 @@ func_help ()
2102 s/\$automake_version/'"`(automake --version) 2>/dev/null |$SED 1q`"'/
2103 s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/
2104 p
2105- }' < "$progpath"
2106+ d
2107+ }
2108+ /^# .* home page:/b print
2109+ /^# General help using/b print
2110+ ' < "$progpath"
2111 ret=$?
2112 if test -z "$1"; then
2113 exit $ret
2114@@ -726,12 +790,39 @@ func_help ()
2115 # exit_cmd.
2116 func_missing_arg ()
2117 {
2118- func_error "missing argument for $1"
2119+ $opt_debug
2120+
2121+ func_error "missing argument for $1."
2122 exit_cmd=exit
2123 }
2124
2125-exit_cmd=:
2126
2127+# func_split_short_opt shortopt
2128+# Set func_split_short_opt_name and func_split_short_opt_arg shell
2129+# variables after splitting SHORTOPT after the 2nd character.
2130+func_split_short_opt ()
2131+{
2132+ my_sed_short_opt='1s/^\(..\).*$/\1/;q'
2133+ my_sed_short_rest='1s/^..\(.*\)$/\1/;q'
2134+
2135+ func_split_short_opt_name=`$ECHO "$1" | $SED "$my_sed_short_opt"`
2136+ func_split_short_opt_arg=`$ECHO "$1" | $SED "$my_sed_short_rest"`
2137+} # func_split_short_opt may be replaced by extended shell implementation
2138+
2139+
2140+# func_split_long_opt longopt
2141+# Set func_split_long_opt_name and func_split_long_opt_arg shell
2142+# variables after splitting LONGOPT at the `=' sign.
2143+func_split_long_opt ()
2144+{
2145+ my_sed_long_opt='1s/^\(--[^=]*\)=.*/\1/;q'
2146+ my_sed_long_arg='1s/^--[^=]*=//'
2147+
2148+ func_split_long_opt_name=`$ECHO "$1" | $SED "$my_sed_long_opt"`
2149+ func_split_long_opt_arg=`$ECHO "$1" | $SED "$my_sed_long_arg"`
2150+} # func_split_long_opt may be replaced by extended shell implementation
2151+
2152+exit_cmd=:
2153
2154
2155
2156@@ -741,26 +832,64 @@ magic="%%%MAGIC variable%%%"
2157 magic_exe="%%%MAGIC EXE variable%%%"
2158
2159 # Global variables.
2160-# $mode is unset
2161 nonopt=
2162-execute_dlfiles=
2163 preserve_args=
2164 lo2o="s/\\.lo\$/.${objext}/"
2165 o2lo="s/\\.${objext}\$/.lo/"
2166 extracted_archives=
2167 extracted_serial=0
2168
2169-opt_dry_run=false
2170-opt_finish=:
2171-opt_duplicate_deps=false
2172-opt_silent=false
2173-opt_debug=:
2174-
2175 # If this variable is set in any of the actions, the command in it
2176 # will be execed at the end. This prevents here-documents from being
2177 # left over by shells.
2178 exec_cmd=
2179
2180+# func_append var value
2181+# Append VALUE to the end of shell variable VAR.
2182+func_append ()
2183+{
2184+ eval "${1}=\$${1}\${2}"
2185+} # func_append may be replaced by extended shell implementation
2186+
2187+# func_append_quoted var value
2188+# Quote VALUE and append to the end of shell variable VAR, separated
2189+# by a space.
2190+func_append_quoted ()
2191+{
2192+ func_quote_for_eval "${2}"
2193+ eval "${1}=\$${1}\\ \$func_quote_for_eval_result"
2194+} # func_append_quoted may be replaced by extended shell implementation
2195+
2196+
2197+# func_arith arithmetic-term...
2198+func_arith ()
2199+{
2200+ func_arith_result=`expr "${@}"`
2201+} # func_arith may be replaced by extended shell implementation
2202+
2203+
2204+# func_len string
2205+# STRING may not start with a hyphen.
2206+func_len ()
2207+{
2208+ func_len_result=`expr "${1}" : ".*" 2>/dev/null || echo $max_cmd_len`
2209+} # func_len may be replaced by extended shell implementation
2210+
2211+
2212+# func_lo2o object
2213+func_lo2o ()
2214+{
2215+ func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
2216+} # func_lo2o may be replaced by extended shell implementation
2217+
2218+
2219+# func_xform libobj-or-source
2220+func_xform ()
2221+{
2222+ func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`
2223+} # func_xform may be replaced by extended shell implementation
2224+
2225+
2226 # func_fatal_configuration arg...
2227 # Echo program name prefixed message to standard error, followed by
2228 # a configuration failure hint, and exit.
2229@@ -850,130 +979,204 @@ func_enable_tag ()
2230 esac
2231 }
2232
2233-# Parse options once, thoroughly. This comes as soon as possible in
2234-# the script to make things like `libtool --version' happen quickly.
2235+# func_check_version_match
2236+# Ensure that we are using m4 macros, and libtool script from the same
2237+# release of libtool.
2238+func_check_version_match ()
2239 {
2240+ if test "$package_revision" != "$macro_revision"; then
2241+ if test "$VERSION" != "$macro_version"; then
2242+ if test -z "$macro_version"; then
2243+ cat >&2 <<_LT_EOF
2244+$progname: Version mismatch error. This is $PACKAGE $VERSION, but the
2245+$progname: definition of this LT_INIT comes from an older release.
2246+$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
2247+$progname: and run autoconf again.
2248+_LT_EOF
2249+ else
2250+ cat >&2 <<_LT_EOF
2251+$progname: Version mismatch error. This is $PACKAGE $VERSION, but the
2252+$progname: definition of this LT_INIT comes from $PACKAGE $macro_version.
2253+$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
2254+$progname: and run autoconf again.
2255+_LT_EOF
2256+ fi
2257+ else
2258+ cat >&2 <<_LT_EOF
2259+$progname: Version mismatch error. This is $PACKAGE $VERSION, revision $package_revision,
2260+$progname: but the definition of this LT_INIT comes from revision $macro_revision.
2261+$progname: You should recreate aclocal.m4 with macros from revision $package_revision
2262+$progname: of $PACKAGE $VERSION and run autoconf again.
2263+_LT_EOF
2264+ fi
2265
2266- # Shorthand for --mode=foo, only valid as the first argument
2267- case $1 in
2268- clean|clea|cle|cl)
2269- shift; set dummy --mode clean ${1+"$@"}; shift
2270- ;;
2271- compile|compil|compi|comp|com|co|c)
2272- shift; set dummy --mode compile ${1+"$@"}; shift
2273- ;;
2274- execute|execut|execu|exec|exe|ex|e)
2275- shift; set dummy --mode execute ${1+"$@"}; shift
2276- ;;
2277- finish|finis|fini|fin|fi|f)
2278- shift; set dummy --mode finish ${1+"$@"}; shift
2279- ;;
2280- install|instal|insta|inst|ins|in|i)
2281- shift; set dummy --mode install ${1+"$@"}; shift
2282- ;;
2283- link|lin|li|l)
2284- shift; set dummy --mode link ${1+"$@"}; shift
2285- ;;
2286- uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u)
2287- shift; set dummy --mode uninstall ${1+"$@"}; shift
2288- ;;
2289- esac
2290+ exit $EXIT_MISMATCH
2291+ fi
2292+}
2293+
2294+
2295+# Shorthand for --mode=foo, only valid as the first argument
2296+case $1 in
2297+clean|clea|cle|cl)
2298+ shift; set dummy --mode clean ${1+"$@"}; shift
2299+ ;;
2300+compile|compil|compi|comp|com|co|c)
2301+ shift; set dummy --mode compile ${1+"$@"}; shift
2302+ ;;
2303+execute|execut|execu|exec|exe|ex|e)
2304+ shift; set dummy --mode execute ${1+"$@"}; shift
2305+ ;;
2306+finish|finis|fini|fin|fi|f)
2307+ shift; set dummy --mode finish ${1+"$@"}; shift
2308+ ;;
2309+install|instal|insta|inst|ins|in|i)
2310+ shift; set dummy --mode install ${1+"$@"}; shift
2311+ ;;
2312+link|lin|li|l)
2313+ shift; set dummy --mode link ${1+"$@"}; shift
2314+ ;;
2315+uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u)
2316+ shift; set dummy --mode uninstall ${1+"$@"}; shift
2317+ ;;
2318+esac
2319
2320- # Parse non-mode specific arguments:
2321- while test "$#" -gt 0; do
2322+
2323+
2324+# Option defaults:
2325+opt_debug=:
2326+opt_dry_run=false
2327+opt_config=false
2328+opt_preserve_dup_deps=false
2329+opt_features=false
2330+opt_finish=false
2331+opt_help=false
2332+opt_help_all=false
2333+opt_silent=:
2334+opt_verbose=:
2335+opt_silent=false
2336+opt_verbose=false
2337+
2338+
2339+# Parse options once, thoroughly. This comes as soon as possible in the
2340+# script to make things like `--version' happen as quickly as we can.
2341+{
2342+ # this just eases exit handling
2343+ while test $# -gt 0; do
2344 opt="$1"
2345 shift
2346-
2347 case $opt in
2348- --config) func_config ;;
2349-
2350- --debug) preserve_args="$preserve_args $opt"
2351+ --debug|-x) opt_debug='set -x'
2352 func_echo "enabling shell trace mode"
2353- opt_debug='set -x'
2354 $opt_debug
2355 ;;
2356-
2357- -dlopen) test "$#" -eq 0 && func_missing_arg "$opt" && break
2358- execute_dlfiles="$execute_dlfiles $1"
2359- shift
2360+ --dry-run|--dryrun|-n)
2361+ opt_dry_run=:
2362 ;;
2363-
2364- --dry-run | -n) opt_dry_run=: ;;
2365- --features) func_features ;;
2366- --finish) mode="finish" ;;
2367- --no-finish) opt_finish=false ;;
2368-
2369- --mode) test "$#" -eq 0 && func_missing_arg "$opt" && break
2370- case $1 in
2371- # Valid mode arguments:
2372- clean) ;;
2373- compile) ;;
2374- execute) ;;
2375- finish) ;;
2376- install) ;;
2377- link) ;;
2378- relink) ;;
2379- uninstall) ;;
2380-
2381- # Catch anything else as an error
2382- *) func_error "invalid argument for $opt"
2383- exit_cmd=exit
2384- break
2385- ;;
2386- esac
2387-
2388- mode="$1"
2389+ --config)
2390+ opt_config=:
2391+func_config
2392+ ;;
2393+ --dlopen|-dlopen)
2394+ optarg="$1"
2395+ opt_dlopen="${opt_dlopen+$opt_dlopen
2396+}$optarg"
2397 shift
2398 ;;
2399-
2400 --preserve-dup-deps)
2401- opt_duplicate_deps=: ;;
2402-
2403- --quiet|--silent) preserve_args="$preserve_args $opt"
2404- opt_silent=:
2405- opt_verbose=false
2406+ opt_preserve_dup_deps=:
2407 ;;
2408-
2409- --no-quiet|--no-silent)
2410- preserve_args="$preserve_args $opt"
2411- opt_silent=false
2412+ --features)
2413+ opt_features=:
2414+func_features
2415 ;;
2416-
2417- --verbose| -v) preserve_args="$preserve_args $opt"
2418+ --finish)
2419+ opt_finish=:
2420+set dummy --mode finish ${1+"$@"}; shift
2421+ ;;
2422+ --help)
2423+ opt_help=:
2424+ ;;
2425+ --help-all)
2426+ opt_help_all=:
2427+opt_help=': help-all'
2428+ ;;
2429+ --mode)
2430+ test $# = 0 && func_missing_arg $opt && break
2431+ optarg="$1"
2432+ opt_mode="$optarg"
2433+case $optarg in
2434+ # Valid mode arguments:
2435+ clean|compile|execute|finish|install|link|relink|uninstall) ;;
2436+
2437+ # Catch anything else as an error
2438+ *) func_error "invalid argument for $opt"
2439+ exit_cmd=exit
2440+ break
2441+ ;;
2442+esac
2443+ shift
2444+ ;;
2445+ --no-silent|--no-quiet)
2446 opt_silent=false
2447- opt_verbose=:
2448+func_append preserve_args " $opt"
2449 ;;
2450-
2451- --no-verbose) preserve_args="$preserve_args $opt"
2452+ --no-verbose)
2453 opt_verbose=false
2454+func_append preserve_args " $opt"
2455 ;;
2456-
2457- --tag) test "$#" -eq 0 && func_missing_arg "$opt" && break
2458- preserve_args="$preserve_args $opt $1"
2459- func_enable_tag "$1" # tagname is set here
2460+ --silent|--quiet)
2461+ opt_silent=:
2462+func_append preserve_args " $opt"
2463+ opt_verbose=false
2464+ ;;
2465+ --verbose|-v)
2466+ opt_verbose=:
2467+func_append preserve_args " $opt"
2468+opt_silent=false
2469+ ;;
2470+ --tag)
2471+ test $# = 0 && func_missing_arg $opt && break
2472+ optarg="$1"
2473+ opt_tag="$optarg"
2474+func_append preserve_args " $opt $optarg"
2475+func_enable_tag "$optarg"
2476 shift
2477 ;;
2478
2479+ -\?|-h) func_usage ;;
2480+ --help) func_help ;;
2481+ --version) func_version ;;
2482+
2483 # Separate optargs to long options:
2484- -dlopen=*|--mode=*|--tag=*)
2485- func_opt_split "$opt"
2486- set dummy "$func_opt_split_opt" "$func_opt_split_arg" ${1+"$@"}
2487+ --*=*)
2488+ func_split_long_opt "$opt"
2489+ set dummy "$func_split_long_opt_name" "$func_split_long_opt_arg" ${1+"$@"}
2490 shift
2491 ;;
2492
2493- -\?|-h) func_usage ;;
2494- --help) opt_help=: ;;
2495- --help-all) opt_help=': help-all' ;;
2496- --version) func_version ;;
2497-
2498- -*) func_fatal_help "unrecognized option \`$opt'" ;;
2499-
2500- *) nonopt="$opt"
2501- break
2502+ # Separate non-argument short options:
2503+ -\?*|-h*|-n*|-v*)
2504+ func_split_short_opt "$opt"
2505+ set dummy "$func_split_short_opt_name" "-$func_split_short_opt_arg" ${1+"$@"}
2506+ shift
2507 ;;
2508+
2509+ --) break ;;
2510+ -*) func_fatal_help "unrecognized option \`$opt'" ;;
2511+ *) set dummy "$opt" ${1+"$@"}; shift; break ;;
2512 esac
2513 done
2514
2515+ # Validate options:
2516+
2517+ # save first non-option argument
2518+ if test "$#" -gt 0; then
2519+ nonopt="$opt"
2520+ shift
2521+ fi
2522+
2523+ # preserve --debug
2524+ test "$opt_debug" = : || func_append preserve_args " --debug"
2525
2526 case $host in
2527 *cygwin* | *mingw* | *pw32* | *cegcc* | *solaris2* )
2528@@ -981,82 +1184,44 @@ func_enable_tag ()
2529 opt_duplicate_compiler_generated_deps=:
2530 ;;
2531 *)
2532- opt_duplicate_compiler_generated_deps=$opt_duplicate_deps
2533+ opt_duplicate_compiler_generated_deps=$opt_preserve_dup_deps
2534 ;;
2535 esac
2536
2537- # Having warned about all mis-specified options, bail out if
2538- # anything was wrong.
2539- $exit_cmd $EXIT_FAILURE
2540-}
2541+ $opt_help || {
2542+ # Sanity checks first:
2543+ func_check_version_match
2544
2545-# func_check_version_match
2546-# Ensure that we are using m4 macros, and libtool script from the same
2547-# release of libtool.
2548-func_check_version_match ()
2549-{
2550- if test "$package_revision" != "$macro_revision"; then
2551- if test "$VERSION" != "$macro_version"; then
2552- if test -z "$macro_version"; then
2553- cat >&2 <<_LT_EOF
2554-$progname: Version mismatch error. This is $PACKAGE $VERSION, but the
2555-$progname: definition of this LT_INIT comes from an older release.
2556-$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
2557-$progname: and run autoconf again.
2558-_LT_EOF
2559- else
2560- cat >&2 <<_LT_EOF
2561-$progname: Version mismatch error. This is $PACKAGE $VERSION, but the
2562-$progname: definition of this LT_INIT comes from $PACKAGE $macro_version.
2563-$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
2564-$progname: and run autoconf again.
2565-_LT_EOF
2566- fi
2567- else
2568- cat >&2 <<_LT_EOF
2569-$progname: Version mismatch error. This is $PACKAGE $VERSION, revision $package_revision,
2570-$progname: but the definition of this LT_INIT comes from revision $macro_revision.
2571-$progname: You should recreate aclocal.m4 with macros from revision $package_revision
2572-$progname: of $PACKAGE $VERSION and run autoconf again.
2573-_LT_EOF
2574+ if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
2575+ func_fatal_configuration "not configured to build any kind of library"
2576 fi
2577
2578- exit $EXIT_MISMATCH
2579- fi
2580-}
2581-
2582+ # Darwin sucks
2583+ eval std_shrext=\"$shrext_cmds\"
2584
2585-## ----------- ##
2586-## Main. ##
2587-## ----------- ##
2588-
2589-$opt_help || {
2590- # Sanity checks first:
2591- func_check_version_match
2592-
2593- if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
2594- func_fatal_configuration "not configured to build any kind of library"
2595- fi
2596+ # Only execute mode is allowed to have -dlopen flags.
2597+ if test -n "$opt_dlopen" && test "$opt_mode" != execute; then
2598+ func_error "unrecognized option \`-dlopen'"
2599+ $ECHO "$help" 1>&2
2600+ exit $EXIT_FAILURE
2601+ fi
2602
2603- test -z "$mode" && func_fatal_error "error: you must specify a MODE."
2604+ # Change the help message to a mode-specific one.
2605+ generic_help="$help"
2606+ help="Try \`$progname --help --mode=$opt_mode' for more information."
2607+ }
2608
2609
2610- # Darwin sucks
2611- eval "std_shrext=\"$shrext_cmds\""
2612+ # Bail if the options were screwed
2613+ $exit_cmd $EXIT_FAILURE
2614+}
2615
2616
2617- # Only execute mode is allowed to have -dlopen flags.
2618- if test -n "$execute_dlfiles" && test "$mode" != execute; then
2619- func_error "unrecognized option \`-dlopen'"
2620- $ECHO "$help" 1>&2
2621- exit $EXIT_FAILURE
2622- fi
2623
2624- # Change the help message to a mode-specific one.
2625- generic_help="$help"
2626- help="Try \`$progname --help --mode=$mode' for more information."
2627-}
2628
2629+## ----------- ##
2630+## Main. ##
2631+## ----------- ##
2632
2633 # func_lalib_p file
2634 # True iff FILE is a libtool `.la' library or `.lo' object file.
2635@@ -1121,12 +1286,9 @@ func_ltwrapper_executable_p ()
2636 # temporary ltwrapper_script.
2637 func_ltwrapper_scriptname ()
2638 {
2639- func_ltwrapper_scriptname_result=""
2640- if func_ltwrapper_executable_p "$1"; then
2641- func_dirname_and_basename "$1" "" "."
2642- func_stripname '' '.exe' "$func_basename_result"
2643- func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper"
2644- fi
2645+ func_dirname_and_basename "$1" "" "."
2646+ func_stripname '' '.exe' "$func_basename_result"
2647+ func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper"
2648 }
2649
2650 # func_ltwrapper_p file
2651@@ -1149,7 +1311,7 @@ func_execute_cmds ()
2652 save_ifs=$IFS; IFS='~'
2653 for cmd in $1; do
2654 IFS=$save_ifs
2655- eval "cmd=\"$cmd\""
2656+ eval cmd=\"$cmd\"
2657 func_show_eval "$cmd" "${2-:}"
2658 done
2659 IFS=$save_ifs
2660@@ -1172,6 +1334,37 @@ func_source ()
2661 }
2662
2663
2664+# func_resolve_sysroot PATH
2665+# Replace a leading = in PATH with a sysroot. Store the result into
2666+# func_resolve_sysroot_result
2667+func_resolve_sysroot ()
2668+{
2669+ func_resolve_sysroot_result=$1
2670+ case $func_resolve_sysroot_result in
2671+ =*)
2672+ func_stripname '=' '' "$func_resolve_sysroot_result"
2673+ func_resolve_sysroot_result=$lt_sysroot$func_stripname_result
2674+ ;;
2675+ esac
2676+}
2677+
2678+# func_replace_sysroot PATH
2679+# If PATH begins with the sysroot, replace it with = and
2680+# store the result into func_replace_sysroot_result.
2681+func_replace_sysroot ()
2682+{
2683+ case "$lt_sysroot:$1" in
2684+ ?*:"$lt_sysroot"*)
2685+ func_stripname "$lt_sysroot" '' "$1"
2686+ func_replace_sysroot_result="=$func_stripname_result"
2687+ ;;
2688+ *)
2689+ # Including no sysroot.
2690+ func_replace_sysroot_result=$1
2691+ ;;
2692+ esac
2693+}
2694+
2695 # func_infer_tag arg
2696 # Infer tagged configuration to use if any are available and
2697 # if one wasn't chosen via the "--tag" command line option.
2698@@ -1184,8 +1377,7 @@ func_infer_tag ()
2699 if test -n "$available_tags" && test -z "$tagname"; then
2700 CC_quoted=
2701 for arg in $CC; do
2702- func_quote_for_eval "$arg"
2703- CC_quoted="$CC_quoted $func_quote_for_eval_result"
2704+ func_append_quoted CC_quoted "$arg"
2705 done
2706 CC_expanded=`func_echo_all $CC`
2707 CC_quoted_expanded=`func_echo_all $CC_quoted`
2708@@ -1204,8 +1396,7 @@ func_infer_tag ()
2709 CC_quoted=
2710 for arg in $CC; do
2711 # Double-quote args containing other shell metacharacters.
2712- func_quote_for_eval "$arg"
2713- CC_quoted="$CC_quoted $func_quote_for_eval_result"
2714+ func_append_quoted CC_quoted "$arg"
2715 done
2716 CC_expanded=`func_echo_all $CC`
2717 CC_quoted_expanded=`func_echo_all $CC_quoted`
2718@@ -1274,6 +1465,486 @@ EOF
2719 }
2720 }
2721
2722+
2723+##################################################
2724+# FILE NAME AND PATH CONVERSION HELPER FUNCTIONS #
2725+##################################################
2726+
2727+# func_convert_core_file_wine_to_w32 ARG
2728+# Helper function used by file name conversion functions when $build is *nix,
2729+# and $host is mingw, cygwin, or some other w32 environment. Relies on a
2730+# correctly configured wine environment available, with the winepath program
2731+# in $build's $PATH.
2732+#
2733+# ARG is the $build file name to be converted to w32 format.
2734+# Result is available in $func_convert_core_file_wine_to_w32_result, and will
2735+# be empty on error (or when ARG is empty)
2736+func_convert_core_file_wine_to_w32 ()
2737+{
2738+ $opt_debug
2739+ func_convert_core_file_wine_to_w32_result="$1"
2740+ if test -n "$1"; then
2741+ # Unfortunately, winepath does not exit with a non-zero error code, so we
2742+ # are forced to check the contents of stdout. On the other hand, if the
2743+ # command is not found, the shell will set an exit code of 127 and print
2744+ # *an error message* to stdout. So we must check for both error code of
2745+ # zero AND non-empty stdout, which explains the odd construction:
2746+ func_convert_core_file_wine_to_w32_tmp=`winepath -w "$1" 2>/dev/null`
2747+ if test "$?" -eq 0 && test -n "${func_convert_core_file_wine_to_w32_tmp}"; then
2748+ func_convert_core_file_wine_to_w32_result=`$ECHO "$func_convert_core_file_wine_to_w32_tmp" |
2749+ $SED -e "$lt_sed_naive_backslashify"`
2750+ else
2751+ func_convert_core_file_wine_to_w32_result=
2752+ fi
2753+ fi
2754+}
2755+# end: func_convert_core_file_wine_to_w32
2756+
2757+
2758+# func_convert_core_path_wine_to_w32 ARG
2759+# Helper function used by path conversion functions when $build is *nix, and
2760+# $host is mingw, cygwin, or some other w32 environment. Relies on a correctly
2761+# configured wine environment available, with the winepath program in $build's
2762+# $PATH. Assumes ARG has no leading or trailing path separator characters.
2763+#
2764+# ARG is path to be converted from $build format to win32.
2765+# Result is available in $func_convert_core_path_wine_to_w32_result.
2766+# Unconvertible file (directory) names in ARG are skipped; if no directory names
2767+# are convertible, then the result may be empty.
2768+func_convert_core_path_wine_to_w32 ()
2769+{
2770+ $opt_debug
2771+ # unfortunately, winepath doesn't convert paths, only file names
2772+ func_convert_core_path_wine_to_w32_result=""
2773+ if test -n "$1"; then
2774+ oldIFS=$IFS
2775+ IFS=:
2776+ for func_convert_core_path_wine_to_w32_f in $1; do
2777+ IFS=$oldIFS
2778+ func_convert_core_file_wine_to_w32 "$func_convert_core_path_wine_to_w32_f"
2779+ if test -n "$func_convert_core_file_wine_to_w32_result" ; then
2780+ if test -z "$func_convert_core_path_wine_to_w32_result"; then
2781+ func_convert_core_path_wine_to_w32_result="$func_convert_core_file_wine_to_w32_result"
2782+ else
2783+ func_append func_convert_core_path_wine_to_w32_result ";$func_convert_core_file_wine_to_w32_result"
2784+ fi
2785+ fi
2786+ done
2787+ IFS=$oldIFS
2788+ fi
2789+}
2790+# end: func_convert_core_path_wine_to_w32
2791+
2792+
2793+# func_cygpath ARGS...
2794+# Wrapper around calling the cygpath program via LT_CYGPATH. This is used when
2795+# when (1) $build is *nix and Cygwin is hosted via a wine environment; or (2)
2796+# $build is MSYS and $host is Cygwin, or (3) $build is Cygwin. In case (1) or
2797+# (2), returns the Cygwin file name or path in func_cygpath_result (input
2798+# file name or path is assumed to be in w32 format, as previously converted
2799+# from $build's *nix or MSYS format). In case (3), returns the w32 file name
2800+# or path in func_cygpath_result (input file name or path is assumed to be in
2801+# Cygwin format). Returns an empty string on error.
2802+#
2803+# ARGS are passed to cygpath, with the last one being the file name or path to
2804+# be converted.
2805+#
2806+# Specify the absolute *nix (or w32) name to cygpath in the LT_CYGPATH
2807+# environment variable; do not put it in $PATH.
2808+func_cygpath ()
2809+{
2810+ $opt_debug
2811+ if test -n "$LT_CYGPATH" && test -f "$LT_CYGPATH"; then
2812+ func_cygpath_result=`$LT_CYGPATH "$@" 2>/dev/null`
2813+ if test "$?" -ne 0; then
2814+ # on failure, ensure result is empty
2815+ func_cygpath_result=
2816+ fi
2817+ else
2818+ func_cygpath_result=
2819+ func_error "LT_CYGPATH is empty or specifies non-existent file: \`$LT_CYGPATH'"
2820+ fi
2821+}
2822+#end: func_cygpath
2823+
2824+
2825+# func_convert_core_msys_to_w32 ARG
2826+# Convert file name or path ARG from MSYS format to w32 format. Return
2827+# result in func_convert_core_msys_to_w32_result.
2828+func_convert_core_msys_to_w32 ()
2829+{
2830+ $opt_debug
2831+ # awkward: cmd appends spaces to result
2832+ func_convert_core_msys_to_w32_result=`( cmd //c echo "$1" ) 2>/dev/null |
2833+ $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"`
2834+}
2835+#end: func_convert_core_msys_to_w32
2836+
2837+
2838+# func_convert_file_check ARG1 ARG2
2839+# Verify that ARG1 (a file name in $build format) was converted to $host
2840+# format in ARG2. Otherwise, emit an error message, but continue (resetting
2841+# func_to_host_file_result to ARG1).
2842+func_convert_file_check ()
2843+{
2844+ $opt_debug
2845+ if test -z "$2" && test -n "$1" ; then
2846+ func_error "Could not determine host file name corresponding to"
2847+ func_error " \`$1'"
2848+ func_error "Continuing, but uninstalled executables may not work."
2849+ # Fallback:
2850+ func_to_host_file_result="$1"
2851+ fi
2852+}
2853+# end func_convert_file_check
2854+
2855+
2856+# func_convert_path_check FROM_PATHSEP TO_PATHSEP FROM_PATH TO_PATH
2857+# Verify that FROM_PATH (a path in $build format) was converted to $host
2858+# format in TO_PATH. Otherwise, emit an error message, but continue, resetting
2859+# func_to_host_file_result to a simplistic fallback value (see below).
2860+func_convert_path_check ()
2861+{
2862+ $opt_debug
2863+ if test -z "$4" && test -n "$3"; then
2864+ func_error "Could not determine the host path corresponding to"
2865+ func_error " \`$3'"
2866+ func_error "Continuing, but uninstalled executables may not work."
2867+ # Fallback. This is a deliberately simplistic "conversion" and
2868+ # should not be "improved". See libtool.info.
2869+ if test "x$1" != "x$2"; then
2870+ lt_replace_pathsep_chars="s|$1|$2|g"
2871+ func_to_host_path_result=`echo "$3" |
2872+ $SED -e "$lt_replace_pathsep_chars"`
2873+ else
2874+ func_to_host_path_result="$3"
2875+ fi
2876+ fi
2877+}
2878+# end func_convert_path_check
2879+
2880+
2881+# func_convert_path_front_back_pathsep FRONTPAT BACKPAT REPL ORIG
2882+# Modifies func_to_host_path_result by prepending REPL if ORIG matches FRONTPAT
2883+# and appending REPL if ORIG matches BACKPAT.
2884+func_convert_path_front_back_pathsep ()
2885+{
2886+ $opt_debug
2887+ case $4 in
2888+ $1 ) func_to_host_path_result="$3$func_to_host_path_result"
2889+ ;;
2890+ esac
2891+ case $4 in
2892+ $2 ) func_append func_to_host_path_result "$3"
2893+ ;;
2894+ esac
2895+}
2896+# end func_convert_path_front_back_pathsep
2897+
2898+
2899+##################################################
2900+# $build to $host FILE NAME CONVERSION FUNCTIONS #
2901+##################################################
2902+# invoked via `$to_host_file_cmd ARG'
2903+#
2904+# In each case, ARG is the path to be converted from $build to $host format.
2905+# Result will be available in $func_to_host_file_result.
2906+
2907+
2908+# func_to_host_file ARG
2909+# Converts the file name ARG from $build format to $host format. Return result
2910+# in func_to_host_file_result.
2911+func_to_host_file ()
2912+{
2913+ $opt_debug
2914+ $to_host_file_cmd "$1"
2915+}
2916+# end func_to_host_file
2917+
2918+
2919+# func_to_tool_file ARG LAZY
2920+# converts the file name ARG from $build format to toolchain format. Return
2921+# result in func_to_tool_file_result. If the conversion in use is listed
2922+# in (the comma separated) LAZY, no conversion takes place.
2923+func_to_tool_file ()
2924+{
2925+ $opt_debug
2926+ case ,$2, in
2927+ *,"$to_tool_file_cmd",*)
2928+ func_to_tool_file_result=$1
2929+ ;;
2930+ *)
2931+ $to_tool_file_cmd "$1"
2932+ func_to_tool_file_result=$func_to_host_file_result
2933+ ;;
2934+ esac
2935+}
2936+# end func_to_tool_file
2937+
2938+
2939+# func_convert_file_noop ARG
2940+# Copy ARG to func_to_host_file_result.
2941+func_convert_file_noop ()
2942+{
2943+ func_to_host_file_result="$1"
2944+}
2945+# end func_convert_file_noop
2946+
2947+
2948+# func_convert_file_msys_to_w32 ARG
2949+# Convert file name ARG from (mingw) MSYS to (mingw) w32 format; automatic
2950+# conversion to w32 is not available inside the cwrapper. Returns result in
2951+# func_to_host_file_result.
2952+func_convert_file_msys_to_w32 ()
2953+{
2954+ $opt_debug
2955+ func_to_host_file_result="$1"
2956+ if test -n "$1"; then
2957+ func_convert_core_msys_to_w32 "$1"
2958+ func_to_host_file_result="$func_convert_core_msys_to_w32_result"
2959+ fi
2960+ func_convert_file_check "$1" "$func_to_host_file_result"
2961+}
2962+# end func_convert_file_msys_to_w32
2963+
2964+
2965+# func_convert_file_cygwin_to_w32 ARG
2966+# Convert file name ARG from Cygwin to w32 format. Returns result in
2967+# func_to_host_file_result.
2968+func_convert_file_cygwin_to_w32 ()
2969+{
2970+ $opt_debug
2971+ func_to_host_file_result="$1"
2972+ if test -n "$1"; then
2973+ # because $build is cygwin, we call "the" cygpath in $PATH; no need to use
2974+ # LT_CYGPATH in this case.
2975+ func_to_host_file_result=`cygpath -m "$1"`
2976+ fi
2977+ func_convert_file_check "$1" "$func_to_host_file_result"
2978+}
2979+# end func_convert_file_cygwin_to_w32
2980+
2981+
2982+# func_convert_file_nix_to_w32 ARG
2983+# Convert file name ARG from *nix to w32 format. Requires a wine environment
2984+# and a working winepath. Returns result in func_to_host_file_result.
2985+func_convert_file_nix_to_w32 ()
2986+{
2987+ $opt_debug
2988+ func_to_host_file_result="$1"
2989+ if test -n "$1"; then
2990+ func_convert_core_file_wine_to_w32 "$1"
2991+ func_to_host_file_result="$func_convert_core_file_wine_to_w32_result"
2992+ fi
2993+ func_convert_file_check "$1" "$func_to_host_file_result"
2994+}
2995+# end func_convert_file_nix_to_w32
2996+
2997+
2998+# func_convert_file_msys_to_cygwin ARG
2999+# Convert file name ARG from MSYS to Cygwin format. Requires LT_CYGPATH set.
3000+# Returns result in func_to_host_file_result.
3001+func_convert_file_msys_to_cygwin ()
3002+{
3003+ $opt_debug
3004+ func_to_host_file_result="$1"
3005+ if test -n "$1"; then
3006+ func_convert_core_msys_to_w32 "$1"
3007+ func_cygpath -u "$func_convert_core_msys_to_w32_result"
3008+ func_to_host_file_result="$func_cygpath_result"
3009+ fi
3010+ func_convert_file_check "$1" "$func_to_host_file_result"
3011+}
3012+# end func_convert_file_msys_to_cygwin
3013+
3014+
3015+# func_convert_file_nix_to_cygwin ARG
3016+# Convert file name ARG from *nix to Cygwin format. Requires Cygwin installed
3017+# in a wine environment, working winepath, and LT_CYGPATH set. Returns result
3018+# in func_to_host_file_result.
3019+func_convert_file_nix_to_cygwin ()
3020+{
3021+ $opt_debug
3022+ func_to_host_file_result="$1"
3023+ if test -n "$1"; then
3024+ # convert from *nix to w32, then use cygpath to convert from w32 to cygwin.
3025+ func_convert_core_file_wine_to_w32 "$1"
3026+ func_cygpath -u "$func_convert_core_file_wine_to_w32_result"
3027+ func_to_host_file_result="$func_cygpath_result"
3028+ fi
3029+ func_convert_file_check "$1" "$func_to_host_file_result"
3030+}
3031+# end func_convert_file_nix_to_cygwin
3032+
3033+
3034+#############################################
3035+# $build to $host PATH CONVERSION FUNCTIONS #
3036+#############################################
3037+# invoked via `$to_host_path_cmd ARG'
3038+#
3039+# In each case, ARG is the path to be converted from $build to $host format.
3040+# The result will be available in $func_to_host_path_result.
3041+#
3042+# Path separators are also converted from $build format to $host format. If
3043+# ARG begins or ends with a path separator character, it is preserved (but
3044+# converted to $host format) on output.
3045+#
3046+# All path conversion functions are named using the following convention:
3047+# file name conversion function : func_convert_file_X_to_Y ()
3048+# path conversion function : func_convert_path_X_to_Y ()
3049+# where, for any given $build/$host combination the 'X_to_Y' value is the
3050+# same. If conversion functions are added for new $build/$host combinations,
3051+# the two new functions must follow this pattern, or func_init_to_host_path_cmd
3052+# will break.
3053+
3054+
3055+# func_init_to_host_path_cmd
3056+# Ensures that function "pointer" variable $to_host_path_cmd is set to the
3057+# appropriate value, based on the value of $to_host_file_cmd.
3058+to_host_path_cmd=
3059+func_init_to_host_path_cmd ()
3060+{
3061+ $opt_debug
3062+ if test -z "$to_host_path_cmd"; then
3063+ func_stripname 'func_convert_file_' '' "$to_host_file_cmd"
3064+ to_host_path_cmd="func_convert_path_${func_stripname_result}"
3065+ fi
3066+}
3067+
3068+
3069+# func_to_host_path ARG
3070+# Converts the path ARG from $build format to $host format. Return result
3071+# in func_to_host_path_result.
3072+func_to_host_path ()
3073+{
3074+ $opt_debug
3075+ func_init_to_host_path_cmd
3076+ $to_host_path_cmd "$1"
3077+}
3078+# end func_to_host_path
3079+
3080+
3081+# func_convert_path_noop ARG
3082+# Copy ARG to func_to_host_path_result.
3083+func_convert_path_noop ()
3084+{
3085+ func_to_host_path_result="$1"
3086+}
3087+# end func_convert_path_noop
3088+
3089+
3090+# func_convert_path_msys_to_w32 ARG
3091+# Convert path ARG from (mingw) MSYS to (mingw) w32 format; automatic
3092+# conversion to w32 is not available inside the cwrapper. Returns result in
3093+# func_to_host_path_result.
3094+func_convert_path_msys_to_w32 ()
3095+{
3096+ $opt_debug
3097+ func_to_host_path_result="$1"
3098+ if test -n "$1"; then
3099+ # Remove leading and trailing path separator characters from ARG. MSYS
3100+ # behavior is inconsistent here; cygpath turns them into '.;' and ';.';
3101+ # and winepath ignores them completely.
3102+ func_stripname : : "$1"
3103+ func_to_host_path_tmp1=$func_stripname_result
3104+ func_convert_core_msys_to_w32 "$func_to_host_path_tmp1"
3105+ func_to_host_path_result="$func_convert_core_msys_to_w32_result"
3106+ func_convert_path_check : ";" \
3107+ "$func_to_host_path_tmp1" "$func_to_host_path_result"
3108+ func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
3109+ fi
3110+}
3111+# end func_convert_path_msys_to_w32
3112+
3113+
3114+# func_convert_path_cygwin_to_w32 ARG
3115+# Convert path ARG from Cygwin to w32 format. Returns result in
3116+# func_to_host_file_result.
3117+func_convert_path_cygwin_to_w32 ()
3118+{
3119+ $opt_debug
3120+ func_to_host_path_result="$1"
3121+ if test -n "$1"; then
3122+ # See func_convert_path_msys_to_w32:
3123+ func_stripname : : "$1"
3124+ func_to_host_path_tmp1=$func_stripname_result
3125+ func_to_host_path_result=`cygpath -m -p "$func_to_host_path_tmp1"`
3126+ func_convert_path_check : ";" \
3127+ "$func_to_host_path_tmp1" "$func_to_host_path_result"
3128+ func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
3129+ fi
3130+}
3131+# end func_convert_path_cygwin_to_w32
3132+
3133+
3134+# func_convert_path_nix_to_w32 ARG
3135+# Convert path ARG from *nix to w32 format. Requires a wine environment and
3136+# a working winepath. Returns result in func_to_host_file_result.
3137+func_convert_path_nix_to_w32 ()
3138+{
3139+ $opt_debug
3140+ func_to_host_path_result="$1"
3141+ if test -n "$1"; then
3142+ # See func_convert_path_msys_to_w32:
3143+ func_stripname : : "$1"
3144+ func_to_host_path_tmp1=$func_stripname_result
3145+ func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1"
3146+ func_to_host_path_result="$func_convert_core_path_wine_to_w32_result"
3147+ func_convert_path_check : ";" \
3148+ "$func_to_host_path_tmp1" "$func_to_host_path_result"
3149+ func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
3150+ fi
3151+}
3152+# end func_convert_path_nix_to_w32
3153+
3154+
3155+# func_convert_path_msys_to_cygwin ARG
3156+# Convert path ARG from MSYS to Cygwin format. Requires LT_CYGPATH set.
3157+# Returns result in func_to_host_file_result.
3158+func_convert_path_msys_to_cygwin ()
3159+{
3160+ $opt_debug
3161+ func_to_host_path_result="$1"
3162+ if test -n "$1"; then
3163+ # See func_convert_path_msys_to_w32:
3164+ func_stripname : : "$1"
3165+ func_to_host_path_tmp1=$func_stripname_result
3166+ func_convert_core_msys_to_w32 "$func_to_host_path_tmp1"
3167+ func_cygpath -u -p "$func_convert_core_msys_to_w32_result"
3168+ func_to_host_path_result="$func_cygpath_result"
3169+ func_convert_path_check : : \
3170+ "$func_to_host_path_tmp1" "$func_to_host_path_result"
3171+ func_convert_path_front_back_pathsep ":*" "*:" : "$1"
3172+ fi
3173+}
3174+# end func_convert_path_msys_to_cygwin
3175+
3176+
3177+# func_convert_path_nix_to_cygwin ARG
3178+# Convert path ARG from *nix to Cygwin format. Requires Cygwin installed in a
3179+# a wine environment, working winepath, and LT_CYGPATH set. Returns result in
3180+# func_to_host_file_result.
3181+func_convert_path_nix_to_cygwin ()
3182+{
3183+ $opt_debug
3184+ func_to_host_path_result="$1"
3185+ if test -n "$1"; then
3186+ # Remove leading and trailing path separator characters from
3187+ # ARG. msys behavior is inconsistent here, cygpath turns them
3188+ # into '.;' and ';.', and winepath ignores them completely.
3189+ func_stripname : : "$1"
3190+ func_to_host_path_tmp1=$func_stripname_result
3191+ func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1"
3192+ func_cygpath -u -p "$func_convert_core_path_wine_to_w32_result"
3193+ func_to_host_path_result="$func_cygpath_result"
3194+ func_convert_path_check : : \
3195+ "$func_to_host_path_tmp1" "$func_to_host_path_result"
3196+ func_convert_path_front_back_pathsep ":*" "*:" : "$1"
3197+ fi
3198+}
3199+# end func_convert_path_nix_to_cygwin
3200+
3201+
3202 # func_mode_compile arg...
3203 func_mode_compile ()
3204 {
3205@@ -1314,12 +1985,12 @@ func_mode_compile ()
3206 ;;
3207
3208 -pie | -fpie | -fPIE)
3209- pie_flag="$pie_flag $arg"
3210+ func_append pie_flag " $arg"
3211 continue
3212 ;;
3213
3214 -shared | -static | -prefer-pic | -prefer-non-pic)
3215- later="$later $arg"
3216+ func_append later " $arg"
3217 continue
3218 ;;
3219
3220@@ -1340,15 +2011,14 @@ func_mode_compile ()
3221 save_ifs="$IFS"; IFS=','
3222 for arg in $args; do
3223 IFS="$save_ifs"
3224- func_quote_for_eval "$arg"
3225- lastarg="$lastarg $func_quote_for_eval_result"
3226+ func_append_quoted lastarg "$arg"
3227 done
3228 IFS="$save_ifs"
3229 func_stripname ' ' '' "$lastarg"
3230 lastarg=$func_stripname_result
3231
3232 # Add the arguments to base_compile.
3233- base_compile="$base_compile $lastarg"
3234+ func_append base_compile " $lastarg"
3235 continue
3236 ;;
3237
3238@@ -1364,8 +2034,7 @@ func_mode_compile ()
3239 esac # case $arg_mode
3240
3241 # Aesthetically quote the previous argument.
3242- func_quote_for_eval "$lastarg"
3243- base_compile="$base_compile $func_quote_for_eval_result"
3244+ func_append_quoted base_compile "$lastarg"
3245 done # for arg
3246
3247 case $arg_mode in
3248@@ -1496,17 +2165,16 @@ compiler."
3249 $opt_dry_run || $RM $removelist
3250 exit $EXIT_FAILURE
3251 fi
3252- removelist="$removelist $output_obj"
3253+ func_append removelist " $output_obj"
3254 $ECHO "$srcfile" > "$lockfile"
3255 fi
3256
3257 $opt_dry_run || $RM $removelist
3258- removelist="$removelist $lockfile"
3259+ func_append removelist " $lockfile"
3260 trap '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' 1 2 15
3261
3262- if test -n "$fix_srcfile_path"; then
3263- eval "srcfile=\"$fix_srcfile_path\""
3264- fi
3265+ func_to_tool_file "$srcfile" func_convert_file_msys_to_w32
3266+ srcfile=$func_to_tool_file_result
3267 func_quote_for_eval "$srcfile"
3268 qsrcfile=$func_quote_for_eval_result
3269
3270@@ -1526,7 +2194,7 @@ compiler."
3271
3272 if test -z "$output_obj"; then
3273 # Place PIC objects in $objdir
3274- command="$command -o $lobj"
3275+ func_append command " -o $lobj"
3276 fi
3277
3278 func_show_eval_locale "$command" \
3279@@ -1573,11 +2241,11 @@ compiler."
3280 command="$base_compile $qsrcfile $pic_flag"
3281 fi
3282 if test "$compiler_c_o" = yes; then
3283- command="$command -o $obj"
3284+ func_append command " -o $obj"
3285 fi
3286
3287 # Suppress compiler output if we already did a PIC compilation.
3288- command="$command$suppress_output"
3289+ func_append command "$suppress_output"
3290 func_show_eval_locale "$command" \
3291 '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE'
3292
3293@@ -1622,13 +2290,13 @@ compiler."
3294 }
3295
3296 $opt_help || {
3297- test "$mode" = compile && func_mode_compile ${1+"$@"}
3298+ test "$opt_mode" = compile && func_mode_compile ${1+"$@"}
3299 }
3300
3301 func_mode_help ()
3302 {
3303 # We need to display help for each of the modes.
3304- case $mode in
3305+ case $opt_mode in
3306 "")
3307 # Generic help is extracted from the usage comments
3308 # at the start of this file.
3309@@ -1659,8 +2327,8 @@ This mode accepts the following additional options:
3310
3311 -o OUTPUT-FILE set the output file name to OUTPUT-FILE
3312 -no-suppress do not suppress compiler output for multiple passes
3313- -prefer-pic try to building PIC objects only
3314- -prefer-non-pic try to building non-PIC objects only
3315+ -prefer-pic try to build PIC objects only
3316+ -prefer-non-pic try to build non-PIC objects only
3317 -shared do not build a \`.o' file suitable for static linking
3318 -static only build a \`.o' file suitable for static linking
3319 -Wc,FLAG pass FLAG directly to the compiler
3320@@ -1804,7 +2472,7 @@ Otherwise, only FILE itself is deleted using RM."
3321 ;;
3322
3323 *)
3324- func_fatal_help "invalid operation mode \`$mode'"
3325+ func_fatal_help "invalid operation mode \`$opt_mode'"
3326 ;;
3327 esac
3328
3329@@ -1819,13 +2487,13 @@ if $opt_help; then
3330 else
3331 {
3332 func_help noexit
3333- for mode in compile link execute install finish uninstall clean; do
3334+ for opt_mode in compile link execute install finish uninstall clean; do
3335 func_mode_help
3336 done
3337 } | sed -n '1p; 2,$s/^Usage:/ or: /p'
3338 {
3339 func_help noexit
3340- for mode in compile link execute install finish uninstall clean; do
3341+ for opt_mode in compile link execute install finish uninstall clean; do
3342 echo
3343 func_mode_help
3344 done
3345@@ -1854,13 +2522,16 @@ func_mode_execute ()
3346 func_fatal_help "you must specify a COMMAND"
3347
3348 # Handle -dlopen flags immediately.
3349- for file in $execute_dlfiles; do
3350+ for file in $opt_dlopen; do
3351 test -f "$file" \
3352 || func_fatal_help "\`$file' is not a file"
3353
3354 dir=
3355 case $file in
3356 *.la)
3357+ func_resolve_sysroot "$file"
3358+ file=$func_resolve_sysroot_result
3359+
3360 # Check to see that this really is a libtool archive.
3361 func_lalib_unsafe_p "$file" \
3362 || func_fatal_help "\`$lib' is not a valid libtool archive"
3363@@ -1882,7 +2553,7 @@ func_mode_execute ()
3364 dir="$func_dirname_result"
3365
3366 if test -f "$dir/$objdir/$dlname"; then
3367- dir="$dir/$objdir"
3368+ func_append dir "/$objdir"
3369 else
3370 if test ! -f "$dir/$dlname"; then
3371 func_fatal_error "cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'"
3372@@ -1907,10 +2578,10 @@ func_mode_execute ()
3373 test -n "$absdir" && dir="$absdir"
3374
3375 # Now add the directory to shlibpath_var.
3376- if eval test -z \"\$$shlibpath_var\"; then
3377- eval $shlibpath_var=\$dir
3378+ if eval "test -z \"\$$shlibpath_var\""; then
3379+ eval "$shlibpath_var=\"\$dir\""
3380 else
3381- eval $shlibpath_var=\$dir:\$$shlibpath_var
3382+ eval "$shlibpath_var=\"\$dir:\$$shlibpath_var\""
3383 fi
3384 done
3385
3386@@ -1939,8 +2610,7 @@ func_mode_execute ()
3387 ;;
3388 esac
3389 # Quote arguments (to preserve shell metacharacters).
3390- func_quote_for_eval "$file"
3391- args="$args $func_quote_for_eval_result"
3392+ func_append_quoted args "$file"
3393 done
3394
3395 if test "X$opt_dry_run" = Xfalse; then
3396@@ -1972,22 +2642,59 @@ func_mode_execute ()
3397 fi
3398 }
3399
3400-test "$mode" = execute && func_mode_execute ${1+"$@"}
3401+test "$opt_mode" = execute && func_mode_execute ${1+"$@"}
3402
3403
3404 # func_mode_finish arg...
3405 func_mode_finish ()
3406 {
3407 $opt_debug
3408- libdirs="$nonopt"
3409+ libs=
3410+ libdirs=
3411 admincmds=
3412
3413- if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
3414- for dir
3415- do
3416- libdirs="$libdirs $dir"
3417- done
3418+ for opt in "$nonopt" ${1+"$@"}
3419+ do
3420+ if test -d "$opt"; then
3421+ func_append libdirs " $opt"
3422
3423+ elif test -f "$opt"; then
3424+ if func_lalib_unsafe_p "$opt"; then
3425+ func_append libs " $opt"
3426+ else
3427+ func_warning "\`$opt' is not a valid libtool archive"
3428+ fi
3429+
3430+ else
3431+ func_fatal_error "invalid argument \`$opt'"
3432+ fi
3433+ done
3434+
3435+ if test -n "$libs"; then
3436+ if test -n "$lt_sysroot"; then
3437+ sysroot_regex=`$ECHO "$lt_sysroot" | $SED "$sed_make_literal_regex"`
3438+ sysroot_cmd="s/\([ ']\)$sysroot_regex/\1/g;"
3439+ else
3440+ sysroot_cmd=
3441+ fi
3442+
3443+ # Remove sysroot references
3444+ if $opt_dry_run; then
3445+ for lib in $libs; do
3446+ echo "removing references to $lt_sysroot and \`=' prefixes from $lib"
3447+ done
3448+ else
3449+ tmpdir=`func_mktempdir`
3450+ for lib in $libs; do
3451+ sed -e "${sysroot_cmd} s/\([ ']-[LR]\)=/\1/g; s/\([ ']\)=/\1/g" $lib \
3452+ > $tmpdir/tmp-la
3453+ mv -f $tmpdir/tmp-la $lib
3454+ done
3455+ ${RM}r "$tmpdir"
3456+ fi
3457+ fi
3458+
3459+ if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
3460 for libdir in $libdirs; do
3461 if test -n "$finish_cmds"; then
3462 # Do each command in the finish commands.
3463@@ -1997,7 +2704,7 @@ func_mode_finish ()
3464 if test -n "$finish_eval"; then
3465 # Do the single finish_eval.
3466 eval cmds=\"$finish_eval\"
3467- $opt_dry_run || eval "$cmds" || admincmds="$admincmds
3468+ $opt_dry_run || eval "$cmds" || func_append admincmds "
3469 $cmds"
3470 fi
3471 done
3472@@ -2006,53 +2713,55 @@ func_mode_finish ()
3473 # Exit here if they wanted silent mode.
3474 $opt_silent && exit $EXIT_SUCCESS
3475
3476- echo "----------------------------------------------------------------------"
3477- echo "Libraries have been installed in:"
3478- for libdir in $libdirs; do
3479- $ECHO " $libdir"
3480- done
3481- echo
3482- echo "If you ever happen to want to link against installed libraries"
3483- echo "in a given directory, LIBDIR, you must either use libtool, and"
3484- echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
3485- echo "flag during linking and do at least one of the following:"
3486- if test -n "$shlibpath_var"; then
3487- echo " - add LIBDIR to the \`$shlibpath_var' environment variable"
3488- echo " during execution"
3489- fi
3490- if test -n "$runpath_var"; then
3491- echo " - add LIBDIR to the \`$runpath_var' environment variable"
3492- echo " during linking"
3493- fi
3494- if test -n "$hardcode_libdir_flag_spec"; then
3495- libdir=LIBDIR
3496- eval "flag=\"$hardcode_libdir_flag_spec\""
3497+ if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
3498+ echo "----------------------------------------------------------------------"
3499+ echo "Libraries have been installed in:"
3500+ for libdir in $libdirs; do
3501+ $ECHO " $libdir"
3502+ done
3503+ echo
3504+ echo "If you ever happen to want to link against installed libraries"
3505+ echo "in a given directory, LIBDIR, you must either use libtool, and"
3506+ echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
3507+ echo "flag during linking and do at least one of the following:"
3508+ if test -n "$shlibpath_var"; then
3509+ echo " - add LIBDIR to the \`$shlibpath_var' environment variable"
3510+ echo " during execution"
3511+ fi
3512+ if test -n "$runpath_var"; then
3513+ echo " - add LIBDIR to the \`$runpath_var' environment variable"
3514+ echo " during linking"
3515+ fi
3516+ if test -n "$hardcode_libdir_flag_spec"; then
3517+ libdir=LIBDIR
3518+ eval flag=\"$hardcode_libdir_flag_spec\"
3519
3520- $ECHO " - use the \`$flag' linker flag"
3521- fi
3522- if test -n "$admincmds"; then
3523- $ECHO " - have your system administrator run these commands:$admincmds"
3524- fi
3525- if test -f /etc/ld.so.conf; then
3526- echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
3527- fi
3528- echo
3529+ $ECHO " - use the \`$flag' linker flag"
3530+ fi
3531+ if test -n "$admincmds"; then
3532+ $ECHO " - have your system administrator run these commands:$admincmds"
3533+ fi
3534+ if test -f /etc/ld.so.conf; then
3535+ echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
3536+ fi
3537+ echo
3538
3539- echo "See any operating system documentation about shared libraries for"
3540- case $host in
3541- solaris2.[6789]|solaris2.1[0-9])
3542- echo "more information, such as the ld(1), crle(1) and ld.so(8) manual"
3543- echo "pages."
3544- ;;
3545- *)
3546- echo "more information, such as the ld(1) and ld.so(8) manual pages."
3547- ;;
3548- esac
3549- echo "----------------------------------------------------------------------"
3550+ echo "See any operating system documentation about shared libraries for"
3551+ case $host in
3552+ solaris2.[6789]|solaris2.1[0-9])
3553+ echo "more information, such as the ld(1), crle(1) and ld.so(8) manual"
3554+ echo "pages."
3555+ ;;
3556+ *)
3557+ echo "more information, such as the ld(1) and ld.so(8) manual pages."
3558+ ;;
3559+ esac
3560+ echo "----------------------------------------------------------------------"
3561+ fi
3562 exit $EXIT_SUCCESS
3563 }
3564
3565-test "$mode" = finish && func_mode_finish ${1+"$@"}
3566+test "$opt_mode" = finish && func_mode_finish ${1+"$@"}
3567
3568
3569 # func_mode_install arg...
3570@@ -2077,7 +2786,7 @@ func_mode_install ()
3571 # The real first argument should be the name of the installation program.
3572 # Aesthetically quote it.
3573 func_quote_for_eval "$arg"
3574- install_prog="$install_prog$func_quote_for_eval_result"
3575+ func_append install_prog "$func_quote_for_eval_result"
3576 install_shared_prog=$install_prog
3577 case " $install_prog " in
3578 *[\\\ /]cp\ *) install_cp=: ;;
3579@@ -2097,7 +2806,7 @@ func_mode_install ()
3580 do
3581 arg2=
3582 if test -n "$dest"; then
3583- files="$files $dest"
3584+ func_append files " $dest"
3585 dest=$arg
3586 continue
3587 fi
3588@@ -2135,11 +2844,11 @@ func_mode_install ()
3589
3590 # Aesthetically quote the argument.
3591 func_quote_for_eval "$arg"
3592- install_prog="$install_prog $func_quote_for_eval_result"
3593+ func_append install_prog " $func_quote_for_eval_result"
3594 if test -n "$arg2"; then
3595 func_quote_for_eval "$arg2"
3596 fi
3597- install_shared_prog="$install_shared_prog $func_quote_for_eval_result"
3598+ func_append install_shared_prog " $func_quote_for_eval_result"
3599 done
3600
3601 test -z "$install_prog" && \
3602@@ -2151,7 +2860,7 @@ func_mode_install ()
3603 if test -n "$install_override_mode" && $no_mode; then
3604 if $install_cp; then :; else
3605 func_quote_for_eval "$install_override_mode"
3606- install_shared_prog="$install_shared_prog -m $func_quote_for_eval_result"
3607+ func_append install_shared_prog " -m $func_quote_for_eval_result"
3608 fi
3609 fi
3610
3611@@ -2209,10 +2918,13 @@ func_mode_install ()
3612 case $file in
3613 *.$libext)
3614 # Do the static libraries later.
3615- staticlibs="$staticlibs $file"
3616+ func_append staticlibs " $file"
3617 ;;
3618
3619 *.la)
3620+ func_resolve_sysroot "$file"
3621+ file=$func_resolve_sysroot_result
3622+
3623 # Check to see that this really is a libtool archive.
3624 func_lalib_unsafe_p "$file" \
3625 || func_fatal_help "\`$file' is not a valid libtool archive"
3626@@ -2226,23 +2938,30 @@ func_mode_install ()
3627 if test "X$destdir" = "X$libdir"; then
3628 case "$current_libdirs " in
3629 *" $libdir "*) ;;
3630- *) current_libdirs="$current_libdirs $libdir" ;;
3631+ *) func_append current_libdirs " $libdir" ;;
3632 esac
3633 else
3634 # Note the libdir as a future libdir.
3635 case "$future_libdirs " in
3636 *" $libdir "*) ;;
3637- *) future_libdirs="$future_libdirs $libdir" ;;
3638+ *) func_append future_libdirs " $libdir" ;;
3639 esac
3640 fi
3641
3642 func_dirname "$file" "/" ""
3643 dir="$func_dirname_result"
3644- dir="$dir$objdir"
3645+ func_append dir "$objdir"
3646
3647 if test -n "$relink_command"; then
3648+ # Strip any trailing slash from the destination.
3649+ func_stripname '' '/' "$libdir"
3650+ destlibdir=$func_stripname_result
3651+
3652+ func_stripname '' '/' "$destdir"
3653+ s_destdir=$func_stripname_result
3654+
3655 # Determine the prefix the user has applied to our future dir.
3656- inst_prefix_dir=`$ECHO "$destdir" | $SED -e "s%$libdir\$%%"`
3657+ inst_prefix_dir=`$ECHO "X$s_destdir" | $Xsed -e "s%$destlibdir\$%%"`
3658
3659 # Don't allow the user to place us outside of our expected
3660 # location b/c this prevents finding dependent libraries that
3661@@ -2315,7 +3034,7 @@ func_mode_install ()
3662 func_show_eval "$install_prog $instname $destdir/$name" 'exit $?'
3663
3664 # Maybe install the static library, too.
3665- test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
3666+ test -n "$old_library" && func_append staticlibs " $dir/$old_library"
3667 ;;
3668
3669 *.lo)
3670@@ -2503,7 +3222,7 @@ func_mode_install ()
3671 test -n "$future_libdirs" && \
3672 func_warning "remember to run \`$progname --finish$future_libdirs'"
3673
3674- if test -n "$current_libdirs" && $opt_finish; then
3675+ if test -n "$current_libdirs"; then
3676 # Maybe just do a dry run.
3677 $opt_dry_run && current_libdirs=" -n$current_libdirs"
3678 exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs'
3679@@ -2512,7 +3231,7 @@ func_mode_install ()
3680 fi
3681 }
3682
3683-test "$mode" = install && func_mode_install ${1+"$@"}
3684+test "$opt_mode" = install && func_mode_install ${1+"$@"}
3685
3686
3687 # func_generate_dlsyms outputname originator pic_p
3688@@ -2559,6 +3278,18 @@ extern \"C\" {
3689 #pragma GCC diagnostic ignored \"-Wstrict-prototypes\"
3690 #endif
3691
3692+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */
3693+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
3694+/* DATA imports from DLLs on WIN32 con't be const, because runtime
3695+ relocations are performed -- see ld's documentation on pseudo-relocs. */
3696+# define LT_DLSYM_CONST
3697+#elif defined(__osf__)
3698+/* This system does not cope well with relocations in const data. */
3699+# define LT_DLSYM_CONST
3700+#else
3701+# define LT_DLSYM_CONST const
3702+#endif
3703+
3704 /* External symbol declarations for the compiler. */\
3705 "
3706
3707@@ -2570,21 +3301,22 @@ extern \"C\" {
3708 # Add our own program objects to the symbol list.
3709 progfiles=`$ECHO "$objs$old_deplibs" | $SP2NL | $SED "$lo2o" | $NL2SP`
3710 for progfile in $progfiles; do
3711- func_verbose "extracting global C symbols from \`$progfile'"
3712- $opt_dry_run || eval "$NM $progfile | $global_symbol_pipe >> '$nlist'"
3713+ func_to_tool_file "$progfile" func_convert_file_msys_to_w32
3714+ func_verbose "extracting global C symbols from \`$func_to_tool_file_result'"
3715+ $opt_dry_run || eval "$NM $func_to_tool_file_result | $global_symbol_pipe >> '$nlist'"
3716 done
3717
3718 if test -n "$exclude_expsyms"; then
3719 $opt_dry_run || {
3720- $EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T
3721- $MV "$nlist"T "$nlist"
3722+ eval '$EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T'
3723+ eval '$MV "$nlist"T "$nlist"'
3724 }
3725 fi
3726
3727 if test -n "$export_symbols_regex"; then
3728 $opt_dry_run || {
3729- $EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T
3730- $MV "$nlist"T "$nlist"
3731+ eval '$EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T'
3732+ eval '$MV "$nlist"T "$nlist"'
3733 }
3734 fi
3735
3736@@ -2593,23 +3325,23 @@ extern \"C\" {
3737 export_symbols="$output_objdir/$outputname.exp"
3738 $opt_dry_run || {
3739 $RM $export_symbols
3740- ${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' < "$nlist" > "$export_symbols"
3741+ eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
3742 case $host in
3743 *cygwin* | *mingw* | *cegcc* )
3744- echo EXPORTS > "$output_objdir/$outputname.def"
3745- cat "$export_symbols" >> "$output_objdir/$outputname.def"
3746+ eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
3747+ eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"'
3748 ;;
3749 esac
3750 }
3751 else
3752 $opt_dry_run || {
3753- ${SED} -e 's/\([].[*^$]\)/\\\1/g' -e 's/^/ /' -e 's/$/$/' < "$export_symbols" > "$output_objdir/$outputname.exp"
3754- $GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T
3755- $MV "$nlist"T "$nlist"
3756+ eval "${SED} -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"'
3757+ eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T'
3758+ eval '$MV "$nlist"T "$nlist"'
3759 case $host in
3760 *cygwin* | *mingw* | *cegcc* )
3761- echo EXPORTS > "$output_objdir/$outputname.def"
3762- cat "$nlist" >> "$output_objdir/$outputname.def"
3763+ eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
3764+ eval 'cat "$nlist" >> "$output_objdir/$outputname.def"'
3765 ;;
3766 esac
3767 }
3768@@ -2620,10 +3352,52 @@ extern \"C\" {
3769 func_verbose "extracting global C symbols from \`$dlprefile'"
3770 func_basename "$dlprefile"
3771 name="$func_basename_result"
3772- $opt_dry_run || {
3773- $ECHO ": $name " >> "$nlist"
3774- eval "$NM $dlprefile 2>/dev/null | $global_symbol_pipe >> '$nlist'"
3775- }
3776+ case $host in
3777+ *cygwin* | *mingw* | *cegcc* )
3778+ # if an import library, we need to obtain dlname
3779+ if func_win32_import_lib_p "$dlprefile"; then
3780+ func_tr_sh "$dlprefile"
3781+ eval "curr_lafile=\$libfile_$func_tr_sh_result"
3782+ dlprefile_dlbasename=""
3783+ if test -n "$curr_lafile" && func_lalib_p "$curr_lafile"; then
3784+ # Use subshell, to avoid clobbering current variable values
3785+ dlprefile_dlname=`source "$curr_lafile" && echo "$dlname"`
3786+ if test -n "$dlprefile_dlname" ; then
3787+ func_basename "$dlprefile_dlname"
3788+ dlprefile_dlbasename="$func_basename_result"
3789+ else
3790+ # no lafile. user explicitly requested -dlpreopen <import library>.
3791+ $sharedlib_from_linklib_cmd "$dlprefile"
3792+ dlprefile_dlbasename=$sharedlib_from_linklib_result
3793+ fi
3794+ fi
3795+ $opt_dry_run || {
3796+ if test -n "$dlprefile_dlbasename" ; then
3797+ eval '$ECHO ": $dlprefile_dlbasename" >> "$nlist"'
3798+ else
3799+ func_warning "Could not compute DLL name from $name"
3800+ eval '$ECHO ": $name " >> "$nlist"'
3801+ fi
3802+ func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
3803+ eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe |
3804+ $SED -e '/I __imp/d' -e 's/I __nm_/D /;s/_nm__//' >> '$nlist'"
3805+ }
3806+ else # not an import lib
3807+ $opt_dry_run || {
3808+ eval '$ECHO ": $name " >> "$nlist"'
3809+ func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
3810+ eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'"
3811+ }
3812+ fi
3813+ ;;
3814+ *)
3815+ $opt_dry_run || {
3816+ eval '$ECHO ": $name " >> "$nlist"'
3817+ func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
3818+ eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'"
3819+ }
3820+ ;;
3821+ esac
3822 done
3823
3824 $opt_dry_run || {
3825@@ -2661,26 +3435,9 @@ typedef struct {
3826 const char *name;
3827 void *address;
3828 } lt_dlsymlist;
3829-"
3830- case $host in
3831- *cygwin* | *mingw* | *cegcc* )
3832- echo >> "$output_objdir/$my_dlsyms" "\
3833-/* DATA imports from DLLs on WIN32 con't be const, because
3834- runtime relocations are performed -- see ld's documentation
3835- on pseudo-relocs. */"
3836- lt_dlsym_const= ;;
3837- *osf5*)
3838- echo >> "$output_objdir/$my_dlsyms" "\
3839-/* This system does not cope well with relocations in const data */"
3840- lt_dlsym_const= ;;
3841- *)
3842- lt_dlsym_const=const ;;
3843- esac
3844-
3845- echo >> "$output_objdir/$my_dlsyms" "\
3846-extern $lt_dlsym_const lt_dlsymlist
3847+extern LT_DLSYM_CONST lt_dlsymlist
3848 lt_${my_prefix}_LTX_preloaded_symbols[];
3849-$lt_dlsym_const lt_dlsymlist
3850+LT_DLSYM_CONST lt_dlsymlist
3851 lt_${my_prefix}_LTX_preloaded_symbols[] =
3852 {\
3853 { \"$my_originator\", (void *) 0 },"
3854@@ -2736,7 +3493,7 @@ static const void *lt_preloaded_setup() {
3855 for arg in $LTCFLAGS; do
3856 case $arg in
3857 -pie | -fpie | -fPIE) ;;
3858- *) symtab_cflags="$symtab_cflags $arg" ;;
3859+ *) func_append symtab_cflags " $arg" ;;
3860 esac
3861 done
3862
3863@@ -2796,9 +3553,11 @@ func_win32_libid ()
3864 win32_libid_type="x86 archive import"
3865 ;;
3866 *ar\ archive*) # could be an import, or static
3867- if $OBJDUMP -f "$1" | $SED -e '10q' 2>/dev/null |
3868- $EGREP 'file format (pe-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then
3869- win32_nmres=`$NM -f posix -A "$1" |
3870+ # Keep the egrep pattern in sync with the one in _LT_CHECK_MAGIC_METHOD.
3871+ if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null |
3872+ $EGREP 'file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then
3873+ func_to_tool_file "$1" func_convert_file_msys_to_w32
3874+ win32_nmres=`eval $NM -f posix -A \"$func_to_tool_file_result\" |
3875 $SED -n -e '
3876 1,100{
3877 / I /{
3878@@ -2827,6 +3586,131 @@ func_win32_libid ()
3879 $ECHO "$win32_libid_type"
3880 }
3881
3882+# func_cygming_dll_for_implib ARG
3883+#
3884+# Platform-specific function to extract the
3885+# name of the DLL associated with the specified
3886+# import library ARG.
3887+# Invoked by eval'ing the libtool variable
3888+# $sharedlib_from_linklib_cmd
3889+# Result is available in the variable
3890+# $sharedlib_from_linklib_result
3891+func_cygming_dll_for_implib ()
3892+{
3893+ $opt_debug
3894+ sharedlib_from_linklib_result=`$DLLTOOL --identify-strict --identify "$1"`
3895+}
3896+
3897+# func_cygming_dll_for_implib_fallback_core SECTION_NAME LIBNAMEs
3898+#
3899+# The is the core of a fallback implementation of a
3900+# platform-specific function to extract the name of the
3901+# DLL associated with the specified import library LIBNAME.
3902+#
3903+# SECTION_NAME is either .idata$6 or .idata$7, depending
3904+# on the platform and compiler that created the implib.
3905+#
3906+# Echos the name of the DLL associated with the
3907+# specified import library.
3908+func_cygming_dll_for_implib_fallback_core ()
3909+{
3910+ $opt_debug
3911+ match_literal=`$ECHO "$1" | $SED "$sed_make_literal_regex"`
3912+ $OBJDUMP -s --section "$1" "$2" 2>/dev/null |
3913+ $SED '/^Contents of section '"$match_literal"':/{
3914+ # Place marker at beginning of archive member dllname section
3915+ s/.*/====MARK====/
3916+ p
3917+ d
3918+ }
3919+ # These lines can sometimes be longer than 43 characters, but
3920+ # are always uninteresting
3921+ /:[ ]*file format pe[i]\{,1\}-/d
3922+ /^In archive [^:]*:/d
3923+ # Ensure marker is printed
3924+ /^====MARK====/p
3925+ # Remove all lines with less than 43 characters
3926+ /^.\{43\}/!d
3927+ # From remaining lines, remove first 43 characters
3928+ s/^.\{43\}//' |
3929+ $SED -n '
3930+ # Join marker and all lines until next marker into a single line
3931+ /^====MARK====/ b para
3932+ H
3933+ $ b para
3934+ b
3935+ :para
3936+ x
3937+ s/\n//g
3938+ # Remove the marker
3939+ s/^====MARK====//
3940+ # Remove trailing dots and whitespace
3941+ s/[\. \t]*$//
3942+ # Print
3943+ /./p' |
3944+ # we now have a list, one entry per line, of the stringified
3945+ # contents of the appropriate section of all members of the
3946+ # archive which possess that section. Heuristic: eliminate
3947+ # all those which have a first or second character that is
3948+ # a '.' (that is, objdump's representation of an unprintable
3949+ # character.) This should work for all archives with less than
3950+ # 0x302f exports -- but will fail for DLLs whose name actually
3951+ # begins with a literal '.' or a single character followed by
3952+ # a '.'.
3953+ #
3954+ # Of those that remain, print the first one.
3955+ $SED -e '/^\./d;/^.\./d;q'
3956+}
3957+
3958+# func_cygming_gnu_implib_p ARG
3959+# This predicate returns with zero status (TRUE) if
3960+# ARG is a GNU/binutils-style import library. Returns
3961+# with nonzero status (FALSE) otherwise.
3962+func_cygming_gnu_implib_p ()
3963+{
3964+ $opt_debug
3965+ func_to_tool_file "$1" func_convert_file_msys_to_w32
3966+ 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)$'`
3967+ test -n "$func_cygming_gnu_implib_tmp"
3968+}
3969+
3970+# func_cygming_ms_implib_p ARG
3971+# This predicate returns with zero status (TRUE) if
3972+# ARG is an MS-style import library. Returns
3973+# with nonzero status (FALSE) otherwise.
3974+func_cygming_ms_implib_p ()
3975+{
3976+ $opt_debug
3977+ func_to_tool_file "$1" func_convert_file_msys_to_w32
3978+ func_cygming_ms_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $GREP '_NULL_IMPORT_DESCRIPTOR'`
3979+ test -n "$func_cygming_ms_implib_tmp"
3980+}
3981+
3982+# func_cygming_dll_for_implib_fallback ARG
3983+# Platform-specific function to extract the
3984+# name of the DLL associated with the specified
3985+# import library ARG.
3986+#
3987+# This fallback implementation is for use when $DLLTOOL
3988+# does not support the --identify-strict option.
3989+# Invoked by eval'ing the libtool variable
3990+# $sharedlib_from_linklib_cmd
3991+# Result is available in the variable
3992+# $sharedlib_from_linklib_result
3993+func_cygming_dll_for_implib_fallback ()
3994+{
3995+ $opt_debug
3996+ if func_cygming_gnu_implib_p "$1" ; then
3997+ # binutils import library
3998+ sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$7' "$1"`
3999+ elif func_cygming_ms_implib_p "$1" ; then
4000+ # ms-generated import library
4001+ sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$6' "$1"`
4002+ else
4003+ # unknown
4004+ sharedlib_from_linklib_result=""
4005+ fi
4006+}
4007
4008
4009 # func_extract_an_archive dir oldlib
4010@@ -2917,7 +3801,7 @@ func_extract_archives ()
4011 darwin_file=
4012 darwin_files=
4013 for darwin_file in $darwin_filelist; do
4014- darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP`
4015+ darwin_files=`find unfat-$$ -name $darwin_file -print | sort | $NL2SP`
4016 $LIPO -create -output "$darwin_file" $darwin_files
4017 done # $darwin_filelist
4018 $RM -rf unfat-$$
4019@@ -2932,7 +3816,7 @@ func_extract_archives ()
4020 func_extract_an_archive "$my_xdir" "$my_xabs"
4021 ;;
4022 esac
4023- my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
4024+ my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | sort | $NL2SP`
4025 done
4026
4027 func_extract_archives_result="$my_oldobjs"
4028@@ -3014,7 +3898,110 @@ func_fallback_echo ()
4029 _LTECHO_EOF'
4030 }
4031 ECHO=\"$qECHO\"
4032- fi\
4033+ fi
4034+
4035+# Very basic option parsing. These options are (a) specific to
4036+# the libtool wrapper, (b) are identical between the wrapper
4037+# /script/ and the wrapper /executable/ which is used only on
4038+# windows platforms, and (c) all begin with the string "--lt-"
4039+# (application programs are unlikely to have options which match
4040+# this pattern).
4041+#
4042+# There are only two supported options: --lt-debug and
4043+# --lt-dump-script. There is, deliberately, no --lt-help.
4044+#
4045+# The first argument to this parsing function should be the
4046+# script's $0 value, followed by "$@".
4047+lt_option_debug=
4048+func_parse_lt_options ()
4049+{
4050+ lt_script_arg0=\$0
4051+ shift
4052+ for lt_opt
4053+ do
4054+ case \"\$lt_opt\" in
4055+ --lt-debug) lt_option_debug=1 ;;
4056+ --lt-dump-script)
4057+ lt_dump_D=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%/[^/]*$%%'\`
4058+ test \"X\$lt_dump_D\" = \"X\$lt_script_arg0\" && lt_dump_D=.
4059+ lt_dump_F=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%^.*/%%'\`
4060+ cat \"\$lt_dump_D/\$lt_dump_F\"
4061+ exit 0
4062+ ;;
4063+ --lt-*)
4064+ \$ECHO \"Unrecognized --lt- option: '\$lt_opt'\" 1>&2
4065+ exit 1
4066+ ;;
4067+ esac
4068+ done
4069+
4070+ # Print the debug banner immediately:
4071+ if test -n \"\$lt_option_debug\"; then
4072+ echo \"${outputname}:${output}:\${LINENO}: libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\" 1>&2
4073+ fi
4074+}
4075+
4076+# Used when --lt-debug. Prints its arguments to stdout
4077+# (redirection is the responsibility of the caller)
4078+func_lt_dump_args ()
4079+{
4080+ lt_dump_args_N=1;
4081+ for lt_arg
4082+ do
4083+ \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[\$lt_dump_args_N]: \$lt_arg\"
4084+ lt_dump_args_N=\`expr \$lt_dump_args_N + 1\`
4085+ done
4086+}
4087+
4088+# Core function for launching the target application
4089+func_exec_program_core ()
4090+{
4091+"
4092+ case $host in
4093+ # Backslashes separate directories on plain windows
4094+ *-*-mingw | *-*-os2* | *-cegcc*)
4095+ $ECHO "\
4096+ if test -n \"\$lt_option_debug\"; then
4097+ \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir\\\\\$program\" 1>&2
4098+ func_lt_dump_args \${1+\"\$@\"} 1>&2
4099+ fi
4100+ exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
4101+"
4102+ ;;
4103+
4104+ *)
4105+ $ECHO "\
4106+ if test -n \"\$lt_option_debug\"; then
4107+ \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir/\$program\" 1>&2
4108+ func_lt_dump_args \${1+\"\$@\"} 1>&2
4109+ fi
4110+ exec \"\$progdir/\$program\" \${1+\"\$@\"}
4111+"
4112+ ;;
4113+ esac
4114+ $ECHO "\
4115+ \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2
4116+ exit 1
4117+}
4118+
4119+# A function to encapsulate launching the target application
4120+# Strips options in the --lt-* namespace from \$@ and
4121+# launches target application with the remaining arguments.
4122+func_exec_program ()
4123+{
4124+ for lt_wr_arg
4125+ do
4126+ case \$lt_wr_arg in
4127+ --lt-*) ;;
4128+ *) set x \"\$@\" \"\$lt_wr_arg\"; shift;;
4129+ esac
4130+ shift
4131+ done
4132+ func_exec_program_core \${1+\"\$@\"}
4133+}
4134+
4135+ # Parse options
4136+ func_parse_lt_options \"\$0\" \${1+\"\$@\"}
4137
4138 # Find the directory that this script lives in.
4139 thisdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*$%%'\`
4140@@ -3078,7 +4065,7 @@ _LTECHO_EOF'
4141
4142 # relink executable if necessary
4143 if test -n \"\$relink_command\"; then
4144- if relink_command_output=\`eval \"\$relink_command\" 2>&1\`; then :
4145+ if relink_command_output=\`eval \$relink_command 2>&1\`; then :
4146 else
4147 $ECHO \"\$relink_command_output\" >&2
4148 $RM \"\$progdir/\$file\"
4149@@ -3102,6 +4089,18 @@ _LTECHO_EOF'
4150
4151 if test -f \"\$progdir/\$program\"; then"
4152
4153+ # fixup the dll searchpath if we need to.
4154+ #
4155+ # Fix the DLL searchpath if we need to. Do this before prepending
4156+ # to shlibpath, because on Windows, both are PATH and uninstalled
4157+ # libraries must come first.
4158+ if test -n "$dllsearchpath"; then
4159+ $ECHO "\
4160+ # Add the dll search path components to the executable PATH
4161+ PATH=$dllsearchpath:\$PATH
4162+"
4163+ fi
4164+
4165 # Export our shlibpath_var if we have one.
4166 if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
4167 $ECHO "\
4168@@ -3116,35 +4115,10 @@ _LTECHO_EOF'
4169 "
4170 fi
4171
4172- # fixup the dll searchpath if we need to.
4173- if test -n "$dllsearchpath"; then
4174- $ECHO "\
4175- # Add the dll search path components to the executable PATH
4176- PATH=$dllsearchpath:\$PATH
4177-"
4178- fi
4179-
4180 $ECHO "\
4181 if test \"\$libtool_execute_magic\" != \"$magic\"; then
4182 # Run the actual program with our arguments.
4183-"
4184- case $host in
4185- # Backslashes separate directories on plain windows
4186- *-*-mingw | *-*-os2* | *-cegcc*)
4187- $ECHO "\
4188- exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
4189-"
4190- ;;
4191-
4192- *)
4193- $ECHO "\
4194- exec \"\$progdir/\$program\" \${1+\"\$@\"}
4195-"
4196- ;;
4197- esac
4198- $ECHO "\
4199- \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2
4200- exit 1
4201+ func_exec_program \${1+\"\$@\"}
4202 fi
4203 else
4204 # The program doesn't exist.
4205@@ -3158,166 +4132,6 @@ fi\
4206 }
4207
4208
4209-# func_to_host_path arg
4210-#
4211-# Convert paths to host format when used with build tools.
4212-# Intended for use with "native" mingw (where libtool itself
4213-# is running under the msys shell), or in the following cross-
4214-# build environments:
4215-# $build $host
4216-# mingw (msys) mingw [e.g. native]
4217-# cygwin mingw
4218-# *nix + wine mingw
4219-# where wine is equipped with the `winepath' executable.
4220-# In the native mingw case, the (msys) shell automatically
4221-# converts paths for any non-msys applications it launches,
4222-# but that facility isn't available from inside the cwrapper.
4223-# Similar accommodations are necessary for $host mingw and
4224-# $build cygwin. Calling this function does no harm for other
4225-# $host/$build combinations not listed above.
4226-#
4227-# ARG is the path (on $build) that should be converted to
4228-# the proper representation for $host. The result is stored
4229-# in $func_to_host_path_result.
4230-func_to_host_path ()
4231-{
4232- func_to_host_path_result="$1"
4233- if test -n "$1"; then
4234- case $host in
4235- *mingw* )
4236- lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
4237- case $build in
4238- *mingw* ) # actually, msys
4239- # awkward: cmd appends spaces to result
4240- func_to_host_path_result=`( cmd //c echo "$1" ) 2>/dev/null |
4241- $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"`
4242- ;;
4243- *cygwin* )
4244- func_to_host_path_result=`cygpath -w "$1" |
4245- $SED -e "$lt_sed_naive_backslashify"`
4246- ;;
4247- * )
4248- # Unfortunately, winepath does not exit with a non-zero
4249- # error code, so we are forced to check the contents of
4250- # stdout. On the other hand, if the command is not
4251- # found, the shell will set an exit code of 127 and print
4252- # *an error message* to stdout. So we must check for both
4253- # error code of zero AND non-empty stdout, which explains
4254- # the odd construction:
4255- func_to_host_path_tmp1=`winepath -w "$1" 2>/dev/null`
4256- if test "$?" -eq 0 && test -n "${func_to_host_path_tmp1}"; then
4257- func_to_host_path_result=`$ECHO "$func_to_host_path_tmp1" |
4258- $SED -e "$lt_sed_naive_backslashify"`
4259- else
4260- # Allow warning below.
4261- func_to_host_path_result=
4262- fi
4263- ;;
4264- esac
4265- if test -z "$func_to_host_path_result" ; then
4266- func_error "Could not determine host path corresponding to"
4267- func_error " \`$1'"
4268- func_error "Continuing, but uninstalled executables may not work."
4269- # Fallback:
4270- func_to_host_path_result="$1"
4271- fi
4272- ;;
4273- esac
4274- fi
4275-}
4276-# end: func_to_host_path
4277-
4278-# func_to_host_pathlist arg
4279-#
4280-# Convert pathlists to host format when used with build tools.
4281-# See func_to_host_path(), above. This function supports the
4282-# following $build/$host combinations (but does no harm for
4283-# combinations not listed here):
4284-# $build $host
4285-# mingw (msys) mingw [e.g. native]
4286-# cygwin mingw
4287-# *nix + wine mingw
4288-#
4289-# Path separators are also converted from $build format to
4290-# $host format. If ARG begins or ends with a path separator
4291-# character, it is preserved (but converted to $host format)
4292-# on output.
4293-#
4294-# ARG is a pathlist (on $build) that should be converted to
4295-# the proper representation on $host. The result is stored
4296-# in $func_to_host_pathlist_result.
4297-func_to_host_pathlist ()
4298-{
4299- func_to_host_pathlist_result="$1"
4300- if test -n "$1"; then
4301- case $host in
4302- *mingw* )
4303- lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
4304- # Remove leading and trailing path separator characters from
4305- # ARG. msys behavior is inconsistent here, cygpath turns them
4306- # into '.;' and ';.', and winepath ignores them completely.
4307- func_stripname : : "$1"
4308- func_to_host_pathlist_tmp1=$func_stripname_result
4309- case $build in
4310- *mingw* ) # Actually, msys.
4311- # Awkward: cmd appends spaces to result.
4312- func_to_host_pathlist_result=`
4313- ( cmd //c echo "$func_to_host_pathlist_tmp1" ) 2>/dev/null |
4314- $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"`
4315- ;;
4316- *cygwin* )
4317- func_to_host_pathlist_result=`cygpath -w -p "$func_to_host_pathlist_tmp1" |
4318- $SED -e "$lt_sed_naive_backslashify"`
4319- ;;
4320- * )
4321- # unfortunately, winepath doesn't convert pathlists
4322- func_to_host_pathlist_result=""
4323- func_to_host_pathlist_oldIFS=$IFS
4324- IFS=:
4325- for func_to_host_pathlist_f in $func_to_host_pathlist_tmp1 ; do
4326- IFS=$func_to_host_pathlist_oldIFS
4327- if test -n "$func_to_host_pathlist_f" ; then
4328- func_to_host_path "$func_to_host_pathlist_f"
4329- if test -n "$func_to_host_path_result" ; then
4330- if test -z "$func_to_host_pathlist_result" ; then
4331- func_to_host_pathlist_result="$func_to_host_path_result"
4332- else
4333- func_append func_to_host_pathlist_result ";$func_to_host_path_result"
4334- fi
4335- fi
4336- fi
4337- done
4338- IFS=$func_to_host_pathlist_oldIFS
4339- ;;
4340- esac
4341- if test -z "$func_to_host_pathlist_result"; then
4342- func_error "Could not determine the host path(s) corresponding to"
4343- func_error " \`$1'"
4344- func_error "Continuing, but uninstalled executables may not work."
4345- # Fallback. This may break if $1 contains DOS-style drive
4346- # specifications. The fix is not to complicate the expression
4347- # below, but for the user to provide a working wine installation
4348- # with winepath so that path translation in the cross-to-mingw
4349- # case works properly.
4350- lt_replace_pathsep_nix_to_dos="s|:|;|g"
4351- func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp1" |\
4352- $SED -e "$lt_replace_pathsep_nix_to_dos"`
4353- fi
4354- # Now, add the leading and trailing path separators back
4355- case "$1" in
4356- :* ) func_to_host_pathlist_result=";$func_to_host_pathlist_result"
4357- ;;
4358- esac
4359- case "$1" in
4360- *: ) func_append func_to_host_pathlist_result ";"
4361- ;;
4362- esac
4363- ;;
4364- esac
4365- fi
4366-}
4367-# end: func_to_host_pathlist
4368-
4369 # func_emit_cwrapperexe_src
4370 # emit the source code for a wrapper executable on stdout
4371 # Must ONLY be called from within func_mode_link because
4372@@ -3334,10 +4148,6 @@ func_emit_cwrapperexe_src ()
4373
4374 This wrapper executable should never be moved out of the build directory.
4375 If it is, it will not operate correctly.
4376-
4377- Currently, it simply execs the wrapper *script* "$SHELL $output",
4378- but could eventually absorb all of the scripts functionality and
4379- exec $objdir/$outputname directly.
4380 */
4381 EOF
4382 cat <<"EOF"
4383@@ -3462,22 +4272,13 @@ int setenv (const char *, const char *, int);
4384 if (stale) { free ((void *) stale); stale = 0; } \
4385 } while (0)
4386
4387-#undef LTWRAPPER_DEBUGPRINTF
4388-#if defined LT_DEBUGWRAPPER
4389-# define LTWRAPPER_DEBUGPRINTF(args) ltwrapper_debugprintf args
4390-static void
4391-ltwrapper_debugprintf (const char *fmt, ...)
4392-{
4393- va_list args;
4394- va_start (args, fmt);
4395- (void) vfprintf (stderr, fmt, args);
4396- va_end (args);
4397-}
4398+#if defined(LT_DEBUGWRAPPER)
4399+static int lt_debug = 1;
4400 #else
4401-# define LTWRAPPER_DEBUGPRINTF(args)
4402+static int lt_debug = 0;
4403 #endif
4404
4405-const char *program_name = NULL;
4406+const char *program_name = "libtool-wrapper"; /* in case xstrdup fails */
4407
4408 void *xmalloc (size_t num);
4409 char *xstrdup (const char *string);
4410@@ -3487,7 +4288,10 @@ char *chase_symlinks (const char *pathspec);
4411 int make_executable (const char *path);
4412 int check_executable (const char *path);
4413 char *strendzap (char *str, const char *pat);
4414-void lt_fatal (const char *message, ...);
4415+void lt_debugprintf (const char *file, int line, const char *fmt, ...);
4416+void lt_fatal (const char *file, int line, const char *message, ...);
4417+static const char *nonnull (const char *s);
4418+static const char *nonempty (const char *s);
4419 void lt_setenv (const char *name, const char *value);
4420 char *lt_extend_str (const char *orig_value, const char *add, int to_end);
4421 void lt_update_exe_path (const char *name, const char *value);
4422@@ -3497,14 +4301,14 @@ void lt_dump_script (FILE *f);
4423 EOF
4424
4425 cat <<EOF
4426-const char * MAGIC_EXE = "$magic_exe";
4427+volatile const char * MAGIC_EXE = "$magic_exe";
4428 const char * LIB_PATH_VARNAME = "$shlibpath_var";
4429 EOF
4430
4431 if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
4432- func_to_host_pathlist "$temp_rpath"
4433+ func_to_host_path "$temp_rpath"
4434 cat <<EOF
4435-const char * LIB_PATH_VALUE = "$func_to_host_pathlist_result";
4436+const char * LIB_PATH_VALUE = "$func_to_host_path_result";
4437 EOF
4438 else
4439 cat <<"EOF"
4440@@ -3513,10 +4317,10 @@ EOF
4441 fi
4442
4443 if test -n "$dllsearchpath"; then
4444- func_to_host_pathlist "$dllsearchpath:"
4445+ func_to_host_path "$dllsearchpath:"
4446 cat <<EOF
4447 const char * EXE_PATH_VARNAME = "PATH";
4448-const char * EXE_PATH_VALUE = "$func_to_host_pathlist_result";
4449+const char * EXE_PATH_VALUE = "$func_to_host_path_result";
4450 EOF
4451 else
4452 cat <<"EOF"
4453@@ -3539,12 +4343,10 @@ EOF
4454 cat <<"EOF"
4455
4456 #define LTWRAPPER_OPTION_PREFIX "--lt-"
4457-#define LTWRAPPER_OPTION_PREFIX_LENGTH 5
4458
4459-static const size_t opt_prefix_len = LTWRAPPER_OPTION_PREFIX_LENGTH;
4460 static const char *ltwrapper_option_prefix = LTWRAPPER_OPTION_PREFIX;
4461-
4462 static const char *dumpscript_opt = LTWRAPPER_OPTION_PREFIX "dump-script";
4463+static const char *debug_opt = LTWRAPPER_OPTION_PREFIX "debug";
4464
4465 int
4466 main (int argc, char *argv[])
4467@@ -3561,10 +4363,13 @@ main (int argc, char *argv[])
4468 int i;
4469
4470 program_name = (char *) xstrdup (base_name (argv[0]));
4471- LTWRAPPER_DEBUGPRINTF (("(main) argv[0] : %s\n", argv[0]));
4472- LTWRAPPER_DEBUGPRINTF (("(main) program_name : %s\n", program_name));
4473+ newargz = XMALLOC (char *, argc + 1);
4474
4475- /* very simple arg parsing; don't want to rely on getopt */
4476+ /* very simple arg parsing; don't want to rely on getopt
4477+ * also, copy all non cwrapper options to newargz, except
4478+ * argz[0], which is handled differently
4479+ */
4480+ newargc=0;
4481 for (i = 1; i < argc; i++)
4482 {
4483 if (strcmp (argv[i], dumpscript_opt) == 0)
4484@@ -3581,21 +4386,54 @@ EOF
4485 lt_dump_script (stdout);
4486 return 0;
4487 }
4488+ if (strcmp (argv[i], debug_opt) == 0)
4489+ {
4490+ lt_debug = 1;
4491+ continue;
4492+ }
4493+ if (strcmp (argv[i], ltwrapper_option_prefix) == 0)
4494+ {
4495+ /* however, if there is an option in the LTWRAPPER_OPTION_PREFIX
4496+ namespace, but it is not one of the ones we know about and
4497+ have already dealt with, above (inluding dump-script), then
4498+ report an error. Otherwise, targets might begin to believe
4499+ they are allowed to use options in the LTWRAPPER_OPTION_PREFIX
4500+ namespace. The first time any user complains about this, we'll
4501+ need to make LTWRAPPER_OPTION_PREFIX a configure-time option
4502+ or a configure.ac-settable value.
4503+ */
4504+ lt_fatal (__FILE__, __LINE__,
4505+ "unrecognized %s option: '%s'",
4506+ ltwrapper_option_prefix, argv[i]);
4507+ }
4508+ /* otherwise ... */
4509+ newargz[++newargc] = xstrdup (argv[i]);
4510 }
4511+ newargz[++newargc] = NULL;
4512+
4513+EOF
4514+ cat <<EOF
4515+ /* The GNU banner must be the first non-error debug message */
4516+ lt_debugprintf (__FILE__, __LINE__, "libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\n");
4517+EOF
4518+ cat <<"EOF"
4519+ lt_debugprintf (__FILE__, __LINE__, "(main) argv[0]: %s\n", argv[0]);
4520+ lt_debugprintf (__FILE__, __LINE__, "(main) program_name: %s\n", program_name);
4521
4522- newargz = XMALLOC (char *, argc + 1);
4523 tmp_pathspec = find_executable (argv[0]);
4524 if (tmp_pathspec == NULL)
4525- lt_fatal ("Couldn't find %s", argv[0]);
4526- LTWRAPPER_DEBUGPRINTF (("(main) found exe (before symlink chase) at : %s\n",
4527- tmp_pathspec));
4528+ lt_fatal (__FILE__, __LINE__, "couldn't find %s", argv[0]);
4529+ lt_debugprintf (__FILE__, __LINE__,
4530+ "(main) found exe (before symlink chase) at: %s\n",
4531+ tmp_pathspec);
4532
4533 actual_cwrapper_path = chase_symlinks (tmp_pathspec);
4534- LTWRAPPER_DEBUGPRINTF (("(main) found exe (after symlink chase) at : %s\n",
4535- actual_cwrapper_path));
4536+ lt_debugprintf (__FILE__, __LINE__,
4537+ "(main) found exe (after symlink chase) at: %s\n",
4538+ actual_cwrapper_path);
4539 XFREE (tmp_pathspec);
4540
4541- actual_cwrapper_name = xstrdup( base_name (actual_cwrapper_path));
4542+ actual_cwrapper_name = xstrdup (base_name (actual_cwrapper_path));
4543 strendzap (actual_cwrapper_path, actual_cwrapper_name);
4544
4545 /* wrapper name transforms */
4546@@ -3613,8 +4451,9 @@ EOF
4547 target_name = tmp_pathspec;
4548 tmp_pathspec = 0;
4549
4550- LTWRAPPER_DEBUGPRINTF (("(main) libtool target name: %s\n",
4551- target_name));
4552+ lt_debugprintf (__FILE__, __LINE__,
4553+ "(main) libtool target name: %s\n",
4554+ target_name);
4555 EOF
4556
4557 cat <<EOF
4558@@ -3664,35 +4503,19 @@ EOF
4559
4560 lt_setenv ("BIN_SH", "xpg4"); /* for Tru64 */
4561 lt_setenv ("DUALCASE", "1"); /* for MSK sh */
4562- lt_update_lib_path (LIB_PATH_VARNAME, LIB_PATH_VALUE);
4563+ /* Update the DLL searchpath. EXE_PATH_VALUE ($dllsearchpath) must
4564+ be prepended before (that is, appear after) LIB_PATH_VALUE ($temp_rpath)
4565+ because on Windows, both *_VARNAMEs are PATH but uninstalled
4566+ libraries must come first. */
4567 lt_update_exe_path (EXE_PATH_VARNAME, EXE_PATH_VALUE);
4568+ lt_update_lib_path (LIB_PATH_VARNAME, LIB_PATH_VALUE);
4569
4570- newargc=0;
4571- for (i = 1; i < argc; i++)
4572- {
4573- if (strncmp (argv[i], ltwrapper_option_prefix, opt_prefix_len) == 0)
4574- {
4575- /* however, if there is an option in the LTWRAPPER_OPTION_PREFIX
4576- namespace, but it is not one of the ones we know about and
4577- have already dealt with, above (inluding dump-script), then
4578- report an error. Otherwise, targets might begin to believe
4579- they are allowed to use options in the LTWRAPPER_OPTION_PREFIX
4580- namespace. The first time any user complains about this, we'll
4581- need to make LTWRAPPER_OPTION_PREFIX a configure-time option
4582- or a configure.ac-settable value.
4583- */
4584- lt_fatal ("Unrecognized option in %s namespace: '%s'",
4585- ltwrapper_option_prefix, argv[i]);
4586- }
4587- /* otherwise ... */
4588- newargz[++newargc] = xstrdup (argv[i]);
4589- }
4590- newargz[++newargc] = NULL;
4591-
4592- LTWRAPPER_DEBUGPRINTF (("(main) lt_argv_zero : %s\n", (lt_argv_zero ? lt_argv_zero : "<NULL>")));
4593+ lt_debugprintf (__FILE__, __LINE__, "(main) lt_argv_zero: %s\n",
4594+ nonnull (lt_argv_zero));
4595 for (i = 0; i < newargc; i++)
4596 {
4597- LTWRAPPER_DEBUGPRINTF (("(main) newargz[%d] : %s\n", i, (newargz[i] ? newargz[i] : "<NULL>")));
4598+ lt_debugprintf (__FILE__, __LINE__, "(main) newargz[%d]: %s\n",
4599+ i, nonnull (newargz[i]));
4600 }
4601
4602 EOF
4603@@ -3706,7 +4529,9 @@ EOF
4604 if (rval == -1)
4605 {
4606 /* failed to start process */
4607- LTWRAPPER_DEBUGPRINTF (("(main) failed to launch target \"%s\": errno = %d\n", lt_argv_zero, errno));
4608+ lt_debugprintf (__FILE__, __LINE__,
4609+ "(main) failed to launch target \"%s\": %s\n",
4610+ lt_argv_zero, nonnull (strerror (errno)));
4611 return 127;
4612 }
4613 return rval;
4614@@ -3728,7 +4553,7 @@ xmalloc (size_t num)
4615 {
4616 void *p = (void *) malloc (num);
4617 if (!p)
4618- lt_fatal ("Memory exhausted");
4619+ lt_fatal (__FILE__, __LINE__, "memory exhausted");
4620
4621 return p;
4622 }
4623@@ -3762,8 +4587,8 @@ check_executable (const char *path)
4624 {
4625 struct stat st;
4626
4627- LTWRAPPER_DEBUGPRINTF (("(check_executable) : %s\n",
4628- path ? (*path ? path : "EMPTY!") : "NULL!"));
4629+ lt_debugprintf (__FILE__, __LINE__, "(check_executable): %s\n",
4630+ nonempty (path));
4631 if ((!path) || (!*path))
4632 return 0;
4633
4634@@ -3780,8 +4605,8 @@ make_executable (const char *path)
4635 int rval = 0;
4636 struct stat st;
4637
4638- LTWRAPPER_DEBUGPRINTF (("(make_executable) : %s\n",
4639- path ? (*path ? path : "EMPTY!") : "NULL!"));
4640+ lt_debugprintf (__FILE__, __LINE__, "(make_executable): %s\n",
4641+ nonempty (path));
4642 if ((!path) || (!*path))
4643 return 0;
4644
4645@@ -3807,8 +4632,8 @@ find_executable (const char *wrapper)
4646 int tmp_len;
4647 char *concat_name;
4648
4649- LTWRAPPER_DEBUGPRINTF (("(find_executable) : %s\n",
4650- wrapper ? (*wrapper ? wrapper : "EMPTY!") : "NULL!"));
4651+ lt_debugprintf (__FILE__, __LINE__, "(find_executable): %s\n",
4652+ nonempty (wrapper));
4653
4654 if ((wrapper == NULL) || (*wrapper == '\0'))
4655 return NULL;
4656@@ -3861,7 +4686,8 @@ find_executable (const char *wrapper)
4657 {
4658 /* empty path: current directory */
4659 if (getcwd (tmp, LT_PATHMAX) == NULL)
4660- lt_fatal ("getcwd failed");
4661+ lt_fatal (__FILE__, __LINE__, "getcwd failed: %s",
4662+ nonnull (strerror (errno)));
4663 tmp_len = strlen (tmp);
4664 concat_name =
4665 XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1);
4666@@ -3886,7 +4712,8 @@ find_executable (const char *wrapper)
4667 }
4668 /* Relative path | not found in path: prepend cwd */
4669 if (getcwd (tmp, LT_PATHMAX) == NULL)
4670- lt_fatal ("getcwd failed");
4671+ lt_fatal (__FILE__, __LINE__, "getcwd failed: %s",
4672+ nonnull (strerror (errno)));
4673 tmp_len = strlen (tmp);
4674 concat_name = XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1);
4675 memcpy (concat_name, tmp, tmp_len);
4676@@ -3912,8 +4739,9 @@ chase_symlinks (const char *pathspec)
4677 int has_symlinks = 0;
4678 while (strlen (tmp_pathspec) && !has_symlinks)
4679 {
4680- LTWRAPPER_DEBUGPRINTF (("checking path component for symlinks: %s\n",
4681- tmp_pathspec));
4682+ lt_debugprintf (__FILE__, __LINE__,
4683+ "checking path component for symlinks: %s\n",
4684+ tmp_pathspec);
4685 if (lstat (tmp_pathspec, &s) == 0)
4686 {
4687 if (S_ISLNK (s.st_mode) != 0)
4688@@ -3935,8 +4763,9 @@ chase_symlinks (const char *pathspec)
4689 }
4690 else
4691 {
4692- char *errstr = strerror (errno);
4693- lt_fatal ("Error accessing file %s (%s)", tmp_pathspec, errstr);
4694+ lt_fatal (__FILE__, __LINE__,
4695+ "error accessing file \"%s\": %s",
4696+ tmp_pathspec, nonnull (strerror (errno)));
4697 }
4698 }
4699 XFREE (tmp_pathspec);
4700@@ -3949,7 +4778,8 @@ chase_symlinks (const char *pathspec)
4701 tmp_pathspec = realpath (pathspec, buf);
4702 if (tmp_pathspec == 0)
4703 {
4704- lt_fatal ("Could not follow symlinks for %s", pathspec);
4705+ lt_fatal (__FILE__, __LINE__,
4706+ "could not follow symlinks for %s", pathspec);
4707 }
4708 return xstrdup (tmp_pathspec);
4709 #endif
4710@@ -3975,11 +4805,25 @@ strendzap (char *str, const char *pat)
4711 return str;
4712 }
4713
4714+void
4715+lt_debugprintf (const char *file, int line, const char *fmt, ...)
4716+{
4717+ va_list args;
4718+ if (lt_debug)
4719+ {
4720+ (void) fprintf (stderr, "%s:%s:%d: ", program_name, file, line);
4721+ va_start (args, fmt);
4722+ (void) vfprintf (stderr, fmt, args);
4723+ va_end (args);
4724+ }
4725+}
4726+
4727 static void
4728-lt_error_core (int exit_status, const char *mode,
4729+lt_error_core (int exit_status, const char *file,
4730+ int line, const char *mode,
4731 const char *message, va_list ap)
4732 {
4733- fprintf (stderr, "%s: %s: ", program_name, mode);
4734+ fprintf (stderr, "%s:%s:%d: %s: ", program_name, file, line, mode);
4735 vfprintf (stderr, message, ap);
4736 fprintf (stderr, ".\n");
4737
4738@@ -3988,20 +4832,32 @@ lt_error_core (int exit_status, const char *mode,
4739 }
4740
4741 void
4742-lt_fatal (const char *message, ...)
4743+lt_fatal (const char *file, int line, const char *message, ...)
4744 {
4745 va_list ap;
4746 va_start (ap, message);
4747- lt_error_core (EXIT_FAILURE, "FATAL", message, ap);
4748+ lt_error_core (EXIT_FAILURE, file, line, "FATAL", message, ap);
4749 va_end (ap);
4750 }
4751
4752+static const char *
4753+nonnull (const char *s)
4754+{
4755+ return s ? s : "(null)";
4756+}
4757+
4758+static const char *
4759+nonempty (const char *s)
4760+{
4761+ return (s && !*s) ? "(empty)" : nonnull (s);
4762+}
4763+
4764 void
4765 lt_setenv (const char *name, const char *value)
4766 {
4767- LTWRAPPER_DEBUGPRINTF (("(lt_setenv) setting '%s' to '%s'\n",
4768- (name ? name : "<NULL>"),
4769- (value ? value : "<NULL>")));
4770+ lt_debugprintf (__FILE__, __LINE__,
4771+ "(lt_setenv) setting '%s' to '%s'\n",
4772+ nonnull (name), nonnull (value));
4773 {
4774 #ifdef HAVE_SETENV
4775 /* always make a copy, for consistency with !HAVE_SETENV */
4776@@ -4049,9 +4905,9 @@ lt_extend_str (const char *orig_value, const char *add, int to_end)
4777 void
4778 lt_update_exe_path (const char *name, const char *value)
4779 {
4780- LTWRAPPER_DEBUGPRINTF (("(lt_update_exe_path) modifying '%s' by prepending '%s'\n",
4781- (name ? name : "<NULL>"),
4782- (value ? value : "<NULL>")));
4783+ lt_debugprintf (__FILE__, __LINE__,
4784+ "(lt_update_exe_path) modifying '%s' by prepending '%s'\n",
4785+ nonnull (name), nonnull (value));
4786
4787 if (name && *name && value && *value)
4788 {
4789@@ -4070,9 +4926,9 @@ lt_update_exe_path (const char *name, const char *value)
4790 void
4791 lt_update_lib_path (const char *name, const char *value)
4792 {
4793- LTWRAPPER_DEBUGPRINTF (("(lt_update_lib_path) modifying '%s' by prepending '%s'\n",
4794- (name ? name : "<NULL>"),
4795- (value ? value : "<NULL>")));
4796+ lt_debugprintf (__FILE__, __LINE__,
4797+ "(lt_update_lib_path) modifying '%s' by prepending '%s'\n",
4798+ nonnull (name), nonnull (value));
4799
4800 if (name && *name && value && *value)
4801 {
4802@@ -4222,7 +5078,7 @@ EOF
4803 func_win32_import_lib_p ()
4804 {
4805 $opt_debug
4806- case `eval "$file_magic_cmd \"\$1\" 2>/dev/null" | $SED -e 10q` in
4807+ case `eval $file_magic_cmd \"\$1\" 2>/dev/null | $SED -e 10q` in
4808 *import*) : ;;
4809 *) false ;;
4810 esac
4811@@ -4401,9 +5257,9 @@ func_mode_link ()
4812 ;;
4813 *)
4814 if test "$prev" = dlfiles; then
4815- dlfiles="$dlfiles $arg"
4816+ func_append dlfiles " $arg"
4817 else
4818- dlprefiles="$dlprefiles $arg"
4819+ func_append dlprefiles " $arg"
4820 fi
4821 prev=
4822 continue
4823@@ -4427,7 +5283,7 @@ func_mode_link ()
4824 *-*-darwin*)
4825 case "$deplibs " in
4826 *" $qarg.ltframework "*) ;;
4827- *) deplibs="$deplibs $qarg.ltframework" # this is fixed later
4828+ *) func_append deplibs " $qarg.ltframework" # this is fixed later
4829 ;;
4830 esac
4831 ;;
4832@@ -4446,7 +5302,7 @@ func_mode_link ()
4833 moreargs=
4834 for fil in `cat "$save_arg"`
4835 do
4836-# moreargs="$moreargs $fil"
4837+# func_append moreargs " $fil"
4838 arg=$fil
4839 # A libtool-controlled object.
4840
4841@@ -4475,7 +5331,7 @@ func_mode_link ()
4842
4843 if test "$prev" = dlfiles; then
4844 if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
4845- dlfiles="$dlfiles $pic_object"
4846+ func_append dlfiles " $pic_object"
4847 prev=
4848 continue
4849 else
4850@@ -4487,7 +5343,7 @@ func_mode_link ()
4851 # CHECK ME: I think I busted this. -Ossama
4852 if test "$prev" = dlprefiles; then
4853 # Preload the old-style object.
4854- dlprefiles="$dlprefiles $pic_object"
4855+ func_append dlprefiles " $pic_object"
4856 prev=
4857 fi
4858
4859@@ -4557,12 +5413,12 @@ func_mode_link ()
4860 if test "$prev" = rpath; then
4861 case "$rpath " in
4862 *" $arg "*) ;;
4863- *) rpath="$rpath $arg" ;;
4864+ *) func_append rpath " $arg" ;;
4865 esac
4866 else
4867 case "$xrpath " in
4868 *" $arg "*) ;;
4869- *) xrpath="$xrpath $arg" ;;
4870+ *) func_append xrpath " $arg" ;;
4871 esac
4872 fi
4873 prev=
4874@@ -4574,28 +5430,28 @@ func_mode_link ()
4875 continue
4876 ;;
4877 weak)
4878- weak_libs="$weak_libs $arg"
4879+ func_append weak_libs " $arg"
4880 prev=
4881 continue
4882 ;;
4883 xcclinker)
4884- linker_flags="$linker_flags $qarg"
4885- compiler_flags="$compiler_flags $qarg"
4886+ func_append linker_flags " $qarg"
4887+ func_append compiler_flags " $qarg"
4888 prev=
4889 func_append compile_command " $qarg"
4890 func_append finalize_command " $qarg"
4891 continue
4892 ;;
4893 xcompiler)
4894- compiler_flags="$compiler_flags $qarg"
4895+ func_append compiler_flags " $qarg"
4896 prev=
4897 func_append compile_command " $qarg"
4898 func_append finalize_command " $qarg"
4899 continue
4900 ;;
4901 xlinker)
4902- linker_flags="$linker_flags $qarg"
4903- compiler_flags="$compiler_flags $wl$qarg"
4904+ func_append linker_flags " $qarg"
4905+ func_append compiler_flags " $wl$qarg"
4906 prev=
4907 func_append compile_command " $wl$qarg"
4908 func_append finalize_command " $wl$qarg"
4909@@ -4686,15 +5542,16 @@ func_mode_link ()
4910 ;;
4911
4912 -L*)
4913- func_stripname '-L' '' "$arg"
4914- dir=$func_stripname_result
4915- if test -z "$dir"; then
4916+ func_stripname "-L" '' "$arg"
4917+ if test -z "$func_stripname_result"; then
4918 if test "$#" -gt 0; then
4919 func_fatal_error "require no space between \`-L' and \`$1'"
4920 else
4921 func_fatal_error "need path for \`-L' option"
4922 fi
4923 fi
4924+ func_resolve_sysroot "$func_stripname_result"
4925+ dir=$func_resolve_sysroot_result
4926 # We need an absolute path.
4927 case $dir in
4928 [\\/]* | [A-Za-z]:[\\/]*) ;;
4929@@ -4706,10 +5563,16 @@ func_mode_link ()
4930 ;;
4931 esac
4932 case "$deplibs " in
4933- *" -L$dir "*) ;;
4934+ *" -L$dir "* | *" $arg "*)
4935+ # Will only happen for absolute or sysroot arguments
4936+ ;;
4937 *)
4938- deplibs="$deplibs -L$dir"
4939- lib_search_path="$lib_search_path $dir"
4940+ # Preserve sysroot, but never include relative directories
4941+ case $dir in
4942+ [\\/]* | [A-Za-z]:[\\/]* | =*) func_append deplibs " $arg" ;;
4943+ *) func_append deplibs " -L$dir" ;;
4944+ esac
4945+ func_append lib_search_path " $dir"
4946 ;;
4947 esac
4948 case $host in
4949@@ -4718,12 +5581,12 @@ func_mode_link ()
4950 case :$dllsearchpath: in
4951 *":$dir:"*) ;;
4952 ::) dllsearchpath=$dir;;
4953- *) dllsearchpath="$dllsearchpath:$dir";;
4954+ *) func_append dllsearchpath ":$dir";;
4955 esac
4956 case :$dllsearchpath: in
4957 *":$testbindir:"*) ;;
4958 ::) dllsearchpath=$testbindir;;
4959- *) dllsearchpath="$dllsearchpath:$testbindir";;
4960+ *) func_append dllsearchpath ":$testbindir";;
4961 esac
4962 ;;
4963 esac
4964@@ -4747,7 +5610,7 @@ func_mode_link ()
4965 ;;
4966 *-*-rhapsody* | *-*-darwin1.[012])
4967 # Rhapsody C and math libraries are in the System framework
4968- deplibs="$deplibs System.ltframework"
4969+ func_append deplibs " System.ltframework"
4970 continue
4971 ;;
4972 *-*-sco3.2v5* | *-*-sco5v6*)
4973@@ -4758,9 +5621,6 @@ func_mode_link ()
4974 # Compiler inserts libc in the correct place for threads to work
4975 test "X$arg" = "X-lc" && continue
4976 ;;
4977- *-*-linux*)
4978- test "X$arg" = "X-lc" && continue
4979- ;;
4980 esac
4981 elif test "X$arg" = "X-lc_r"; then
4982 case $host in
4983@@ -4770,7 +5630,7 @@ func_mode_link ()
4984 ;;
4985 esac
4986 fi
4987- deplibs="$deplibs $arg"
4988+ func_append deplibs " $arg"
4989 continue
4990 ;;
4991
4992@@ -4782,8 +5642,8 @@ func_mode_link ()
4993 # Tru64 UNIX uses -model [arg] to determine the layout of C++
4994 # classes, name mangling, and exception handling.
4995 # Darwin uses the -arch flag to determine output architecture.
4996- -model|-arch|-isysroot)
4997- compiler_flags="$compiler_flags $arg"
4998+ -model|-arch|-isysroot|--sysroot)
4999+ func_append compiler_flags " $arg"
5000 func_append compile_command " $arg"
5001 func_append finalize_command " $arg"
5002 prev=xcompiler
5003@@ -4791,12 +5651,12 @@ func_mode_link ()
5004 ;;
5005
5006 -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
5007- compiler_flags="$compiler_flags $arg"
5008+ func_append compiler_flags " $arg"
5009 func_append compile_command " $arg"
5010 func_append finalize_command " $arg"
5011 case "$new_inherited_linker_flags " in
5012 *" $arg "*) ;;
5013- * ) new_inherited_linker_flags="$new_inherited_linker_flags $arg" ;;
5014+ * ) func_append new_inherited_linker_flags " $arg" ;;
5015 esac
5016 continue
5017 ;;
5018@@ -4863,13 +5723,17 @@ func_mode_link ()
5019 # We need an absolute path.
5020 case $dir in
5021 [\\/]* | [A-Za-z]:[\\/]*) ;;
5022+ =*)
5023+ func_stripname '=' '' "$dir"
5024+ dir=$lt_sysroot$func_stripname_result
5025+ ;;
5026 *)
5027 func_fatal_error "only absolute run-paths are allowed"
5028 ;;
5029 esac
5030 case "$xrpath " in
5031 *" $dir "*) ;;
5032- *) xrpath="$xrpath $dir" ;;
5033+ *) func_append xrpath " $dir" ;;
5034 esac
5035 continue
5036 ;;
5037@@ -4922,8 +5786,8 @@ func_mode_link ()
5038 for flag in $args; do
5039 IFS="$save_ifs"
5040 func_quote_for_eval "$flag"
5041- arg="$arg $func_quote_for_eval_result"
5042- compiler_flags="$compiler_flags $func_quote_for_eval_result"
5043+ func_append arg " $func_quote_for_eval_result"
5044+ func_append compiler_flags " $func_quote_for_eval_result"
5045 done
5046 IFS="$save_ifs"
5047 func_stripname ' ' '' "$arg"
5048@@ -4938,9 +5802,9 @@ func_mode_link ()
5049 for flag in $args; do
5050 IFS="$save_ifs"
5051 func_quote_for_eval "$flag"
5052- arg="$arg $wl$func_quote_for_eval_result"
5053- compiler_flags="$compiler_flags $wl$func_quote_for_eval_result"
5054- linker_flags="$linker_flags $func_quote_for_eval_result"
5055+ func_append arg " $wl$func_quote_for_eval_result"
5056+ func_append compiler_flags " $wl$func_quote_for_eval_result"
5057+ func_append linker_flags " $func_quote_for_eval_result"
5058 done
5059 IFS="$save_ifs"
5060 func_stripname ' ' '' "$arg"
5061@@ -4968,24 +5832,27 @@ func_mode_link ()
5062 arg="$func_quote_for_eval_result"
5063 ;;
5064
5065- # -64, -mips[0-9] enable 64-bit mode on the SGI compiler
5066- # -r[0-9][0-9]* specifies the processor on the SGI compiler
5067- # -xarch=*, -xtarget=* enable 64-bit mode on the Sun compiler
5068- # +DA*, +DD* enable 64-bit mode on the HP compiler
5069- # -q* pass through compiler args for the IBM compiler
5070- # -m*, -t[45]*, -txscale* pass through architecture-specific
5071- # compiler args for GCC
5072- # -F/path gives path to uninstalled frameworks, gcc on darwin
5073- # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC
5074- # @file GCC response files
5075- # -tp=* Portland pgcc target processor selection
5076+ # Flags to be passed through unchanged, with rationale:
5077+ # -64, -mips[0-9] enable 64-bit mode for the SGI compiler
5078+ # -r[0-9][0-9]* specify processor for the SGI compiler
5079+ # -xarch=*, -xtarget=* enable 64-bit mode for the Sun compiler
5080+ # +DA*, +DD* enable 64-bit mode for the HP compiler
5081+ # -q* compiler args for the IBM compiler
5082+ # -m*, -t[45]*, -txscale* architecture-specific flags for GCC
5083+ # -F/path path to uninstalled frameworks, gcc on darwin
5084+ # -p, -pg, --coverage, -fprofile-* profiling flags for GCC
5085+ # @file GCC response files
5086+ # -tp=* Portland pgcc target processor selection
5087+ # --sysroot=* for sysroot support
5088+ # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
5089 -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
5090- -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*)
5091+ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \
5092+ -O*|-flto*|-fwhopr*|-fuse-linker-plugin)
5093 func_quote_for_eval "$arg"
5094 arg="$func_quote_for_eval_result"
5095 func_append compile_command " $arg"
5096 func_append finalize_command " $arg"
5097- compiler_flags="$compiler_flags $arg"
5098+ func_append compiler_flags " $arg"
5099 continue
5100 ;;
5101
5102@@ -4997,7 +5864,7 @@ func_mode_link ()
5103
5104 *.$objext)
5105 # A standard object.
5106- objs="$objs $arg"
5107+ func_append objs " $arg"
5108 ;;
5109
5110 *.lo)
5111@@ -5028,7 +5895,7 @@ func_mode_link ()
5112
5113 if test "$prev" = dlfiles; then
5114 if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
5115- dlfiles="$dlfiles $pic_object"
5116+ func_append dlfiles " $pic_object"
5117 prev=
5118 continue
5119 else
5120@@ -5040,7 +5907,7 @@ func_mode_link ()
5121 # CHECK ME: I think I busted this. -Ossama
5122 if test "$prev" = dlprefiles; then
5123 # Preload the old-style object.
5124- dlprefiles="$dlprefiles $pic_object"
5125+ func_append dlprefiles " $pic_object"
5126 prev=
5127 fi
5128
5129@@ -5085,24 +5952,25 @@ func_mode_link ()
5130
5131 *.$libext)
5132 # An archive.
5133- deplibs="$deplibs $arg"
5134- old_deplibs="$old_deplibs $arg"
5135+ func_append deplibs " $arg"
5136+ func_append old_deplibs " $arg"
5137 continue
5138 ;;
5139
5140 *.la)
5141 # A libtool-controlled library.
5142
5143+ func_resolve_sysroot "$arg"
5144 if test "$prev" = dlfiles; then
5145 # This library was specified with -dlopen.
5146- dlfiles="$dlfiles $arg"
5147+ func_append dlfiles " $func_resolve_sysroot_result"
5148 prev=
5149 elif test "$prev" = dlprefiles; then
5150 # The library was specified with -dlpreopen.
5151- dlprefiles="$dlprefiles $arg"
5152+ func_append dlprefiles " $func_resolve_sysroot_result"
5153 prev=
5154 else
5155- deplibs="$deplibs $arg"
5156+ func_append deplibs " $func_resolve_sysroot_result"
5157 fi
5158 continue
5159 ;;
5160@@ -5127,7 +5995,7 @@ func_mode_link ()
5161 func_fatal_help "the \`$prevarg' option requires an argument"
5162
5163 if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then
5164- eval "arg=\"$export_dynamic_flag_spec\""
5165+ eval arg=\"$export_dynamic_flag_spec\"
5166 func_append compile_command " $arg"
5167 func_append finalize_command " $arg"
5168 fi
5169@@ -5144,11 +6012,13 @@ func_mode_link ()
5170 else
5171 shlib_search_path=
5172 fi
5173- eval "sys_lib_search_path=\"$sys_lib_search_path_spec\""
5174- eval "sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\""
5175+ eval sys_lib_search_path=\"$sys_lib_search_path_spec\"
5176+ eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\"
5177
5178 func_dirname "$output" "/" ""
5179 output_objdir="$func_dirname_result$objdir"
5180+ func_to_tool_file "$output_objdir/"
5181+ tool_output_objdir=$func_to_tool_file_result
5182 # Create the object directory.
5183 func_mkdir_p "$output_objdir"
5184
5185@@ -5169,12 +6039,12 @@ func_mode_link ()
5186 # Find all interdependent deplibs by searching for libraries
5187 # that are linked more than once (e.g. -la -lb -la)
5188 for deplib in $deplibs; do
5189- if $opt_duplicate_deps ; then
5190+ if $opt_preserve_dup_deps ; then
5191 case "$libs " in
5192- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
5193+ *" $deplib "*) func_append specialdeplibs " $deplib" ;;
5194 esac
5195 fi
5196- libs="$libs $deplib"
5197+ func_append libs " $deplib"
5198 done
5199
5200 if test "$linkmode" = lib; then
5201@@ -5187,9 +6057,9 @@ func_mode_link ()
5202 if $opt_duplicate_compiler_generated_deps; then
5203 for pre_post_dep in $predeps $postdeps; do
5204 case "$pre_post_deps " in
5205- *" $pre_post_dep "*) specialdeplibs="$specialdeplibs $pre_post_deps" ;;
5206+ *" $pre_post_dep "*) func_append specialdeplibs " $pre_post_deps" ;;
5207 esac
5208- pre_post_deps="$pre_post_deps $pre_post_dep"
5209+ func_append pre_post_deps " $pre_post_dep"
5210 done
5211 fi
5212 pre_post_deps=
5213@@ -5256,8 +6126,9 @@ func_mode_link ()
5214 for lib in $dlprefiles; do
5215 # Ignore non-libtool-libs
5216 dependency_libs=
5217+ func_resolve_sysroot "$lib"
5218 case $lib in
5219- *.la) func_source "$lib" ;;
5220+ *.la) func_source "$func_resolve_sysroot_result" ;;
5221 esac
5222
5223 # Collect preopened libtool deplibs, except any this library
5224@@ -5267,7 +6138,7 @@ func_mode_link ()
5225 deplib_base=$func_basename_result
5226 case " $weak_libs " in
5227 *" $deplib_base "*) ;;
5228- *) deplibs="$deplibs $deplib" ;;
5229+ *) func_append deplibs " $deplib" ;;
5230 esac
5231 done
5232 done
5233@@ -5288,11 +6159,11 @@ func_mode_link ()
5234 compile_deplibs="$deplib $compile_deplibs"
5235 finalize_deplibs="$deplib $finalize_deplibs"
5236 else
5237- compiler_flags="$compiler_flags $deplib"
5238+ func_append compiler_flags " $deplib"
5239 if test "$linkmode" = lib ; then
5240 case "$new_inherited_linker_flags " in
5241 *" $deplib "*) ;;
5242- * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;;
5243+ * ) func_append new_inherited_linker_flags " $deplib" ;;
5244 esac
5245 fi
5246 fi
5247@@ -5377,7 +6248,7 @@ func_mode_link ()
5248 if test "$linkmode" = lib ; then
5249 case "$new_inherited_linker_flags " in
5250 *" $deplib "*) ;;
5251- * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;;
5252+ * ) func_append new_inherited_linker_flags " $deplib" ;;
5253 esac
5254 fi
5255 fi
5256@@ -5390,7 +6261,8 @@ func_mode_link ()
5257 test "$pass" = conv && continue
5258 newdependency_libs="$deplib $newdependency_libs"
5259 func_stripname '-L' '' "$deplib"
5260- newlib_search_path="$newlib_search_path $func_stripname_result"
5261+ func_resolve_sysroot "$func_stripname_result"
5262+ func_append newlib_search_path " $func_resolve_sysroot_result"
5263 ;;
5264 prog)
5265 if test "$pass" = conv; then
5266@@ -5404,7 +6276,8 @@ func_mode_link ()
5267 finalize_deplibs="$deplib $finalize_deplibs"
5268 fi
5269 func_stripname '-L' '' "$deplib"
5270- newlib_search_path="$newlib_search_path $func_stripname_result"
5271+ func_resolve_sysroot "$func_stripname_result"
5272+ func_append newlib_search_path " $func_resolve_sysroot_result"
5273 ;;
5274 *)
5275 func_warning "\`-L' is ignored for archives/objects"
5276@@ -5415,17 +6288,21 @@ func_mode_link ()
5277 -R*)
5278 if test "$pass" = link; then
5279 func_stripname '-R' '' "$deplib"
5280- dir=$func_stripname_result
5281+ func_resolve_sysroot "$func_stripname_result"
5282+ dir=$func_resolve_sysroot_result
5283 # Make sure the xrpath contains only unique directories.
5284 case "$xrpath " in
5285 *" $dir "*) ;;
5286- *) xrpath="$xrpath $dir" ;;
5287+ *) func_append xrpath " $dir" ;;
5288 esac
5289 fi
5290 deplibs="$deplib $deplibs"
5291 continue
5292 ;;
5293- *.la) lib="$deplib" ;;
5294+ *.la)
5295+ func_resolve_sysroot "$deplib"
5296+ lib=$func_resolve_sysroot_result
5297+ ;;
5298 *.$libext)
5299 if test "$pass" = conv; then
5300 deplibs="$deplib $deplibs"
5301@@ -5488,11 +6365,11 @@ func_mode_link ()
5302 if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
5303 # If there is no dlopen support or we're linking statically,
5304 # we need to preload.
5305- newdlprefiles="$newdlprefiles $deplib"
5306+ func_append newdlprefiles " $deplib"
5307 compile_deplibs="$deplib $compile_deplibs"
5308 finalize_deplibs="$deplib $finalize_deplibs"
5309 else
5310- newdlfiles="$newdlfiles $deplib"
5311+ func_append newdlfiles " $deplib"
5312 fi
5313 fi
5314 continue
5315@@ -5538,7 +6415,7 @@ func_mode_link ()
5316 for tmp_inherited_linker_flag in $tmp_inherited_linker_flags; do
5317 case " $new_inherited_linker_flags " in
5318 *" $tmp_inherited_linker_flag "*) ;;
5319- *) new_inherited_linker_flags="$new_inherited_linker_flags $tmp_inherited_linker_flag";;
5320+ *) func_append new_inherited_linker_flags " $tmp_inherited_linker_flag";;
5321 esac
5322 done
5323 fi
5324@@ -5546,8 +6423,8 @@ func_mode_link ()
5325 if test "$linkmode,$pass" = "lib,link" ||
5326 test "$linkmode,$pass" = "prog,scan" ||
5327 { test "$linkmode" != prog && test "$linkmode" != lib; }; then
5328- test -n "$dlopen" && dlfiles="$dlfiles $dlopen"
5329- test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen"
5330+ test -n "$dlopen" && func_append dlfiles " $dlopen"
5331+ test -n "$dlpreopen" && func_append dlprefiles " $dlpreopen"
5332 fi
5333
5334 if test "$pass" = conv; then
5335@@ -5558,20 +6435,20 @@ func_mode_link ()
5336 func_fatal_error "cannot find name of link library for \`$lib'"
5337 fi
5338 # It is a libtool convenience library, so add in its objects.
5339- convenience="$convenience $ladir/$objdir/$old_library"
5340- old_convenience="$old_convenience $ladir/$objdir/$old_library"
5341+ func_append convenience " $ladir/$objdir/$old_library"
5342+ func_append old_convenience " $ladir/$objdir/$old_library"
5343 elif test "$linkmode" != prog && test "$linkmode" != lib; then
5344 func_fatal_error "\`$lib' is not a convenience library"
5345 fi
5346 tmp_libs=
5347 for deplib in $dependency_libs; do
5348 deplibs="$deplib $deplibs"
5349- if $opt_duplicate_deps ; then
5350+ if $opt_preserve_dup_deps ; then
5351 case "$tmp_libs " in
5352- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
5353+ *" $deplib "*) func_append specialdeplibs " $deplib" ;;
5354 esac
5355 fi
5356- tmp_libs="$tmp_libs $deplib"
5357+ func_append tmp_libs " $deplib"
5358 done
5359 continue
5360 fi # $pass = conv
5361@@ -5579,9 +6456,15 @@ func_mode_link ()
5362
5363 # Get the name of the library we link against.
5364 linklib=
5365- for l in $old_library $library_names; do
5366- linklib="$l"
5367- done
5368+ if test -n "$old_library" &&
5369+ { test "$prefer_static_libs" = yes ||
5370+ test "$prefer_static_libs,$installed" = "built,no"; }; then
5371+ linklib=$old_library
5372+ else
5373+ for l in $old_library $library_names; do
5374+ linklib="$l"
5375+ done
5376+ fi
5377 if test -z "$linklib"; then
5378 func_fatal_error "cannot find name of link library for \`$lib'"
5379 fi
5380@@ -5598,9 +6481,9 @@ func_mode_link ()
5381 # statically, we need to preload. We also need to preload any
5382 # dependent libraries so libltdl's deplib preloader doesn't
5383 # bomb out in the load deplibs phase.
5384- dlprefiles="$dlprefiles $lib $dependency_libs"
5385+ func_append dlprefiles " $lib $dependency_libs"
5386 else
5387- newdlfiles="$newdlfiles $lib"
5388+ func_append newdlfiles " $lib"
5389 fi
5390 continue
5391 fi # $pass = dlopen
5392@@ -5622,14 +6505,14 @@ func_mode_link ()
5393
5394 # Find the relevant object directory and library name.
5395 if test "X$installed" = Xyes; then
5396- if test ! -f "$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then
5397+ if test ! -f "$lt_sysroot$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then
5398 func_warning "library \`$lib' was moved."
5399 dir="$ladir"
5400 absdir="$abs_ladir"
5401 libdir="$abs_ladir"
5402 else
5403- dir="$libdir"
5404- absdir="$libdir"
5405+ dir="$lt_sysroot$libdir"
5406+ absdir="$lt_sysroot$libdir"
5407 fi
5408 test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
5409 else
5410@@ -5637,12 +6520,12 @@ func_mode_link ()
5411 dir="$ladir"
5412 absdir="$abs_ladir"
5413 # Remove this search path later
5414- notinst_path="$notinst_path $abs_ladir"
5415+ func_append notinst_path " $abs_ladir"
5416 else
5417 dir="$ladir/$objdir"
5418 absdir="$abs_ladir/$objdir"
5419 # Remove this search path later
5420- notinst_path="$notinst_path $abs_ladir"
5421+ func_append notinst_path " $abs_ladir"
5422 fi
5423 fi # $installed = yes
5424 func_stripname 'lib' '.la' "$laname"
5425@@ -5653,20 +6536,46 @@ func_mode_link ()
5426 if test -z "$libdir" && test "$linkmode" = prog; then
5427 func_fatal_error "only libraries may -dlpreopen a convenience library: \`$lib'"
5428 fi
5429- # Prefer using a static library (so that no silly _DYNAMIC symbols
5430- # are required to link).
5431- if test -n "$old_library"; then
5432- newdlprefiles="$newdlprefiles $dir/$old_library"
5433- # Keep a list of preopened convenience libraries to check
5434- # that they are being used correctly in the link pass.
5435- test -z "$libdir" && \
5436- dlpreconveniencelibs="$dlpreconveniencelibs $dir/$old_library"
5437- # Otherwise, use the dlname, so that lt_dlopen finds it.
5438- elif test -n "$dlname"; then
5439- newdlprefiles="$newdlprefiles $dir/$dlname"
5440- else
5441- newdlprefiles="$newdlprefiles $dir/$linklib"
5442- fi
5443+ case "$host" in
5444+ # special handling for platforms with PE-DLLs.
5445+ *cygwin* | *mingw* | *cegcc* )
5446+ # Linker will automatically link against shared library if both
5447+ # static and shared are present. Therefore, ensure we extract
5448+ # symbols from the import library if a shared library is present
5449+ # (otherwise, the dlopen module name will be incorrect). We do
5450+ # this by putting the import library name into $newdlprefiles.
5451+ # We recover the dlopen module name by 'saving' the la file
5452+ # name in a special purpose variable, and (later) extracting the
5453+ # dlname from the la file.
5454+ if test -n "$dlname"; then
5455+ func_tr_sh "$dir/$linklib"
5456+ eval "libfile_$func_tr_sh_result=\$abs_ladir/\$laname"
5457+ func_append newdlprefiles " $dir/$linklib"
5458+ else
5459+ func_append newdlprefiles " $dir/$old_library"
5460+ # Keep a list of preopened convenience libraries to check
5461+ # that they are being used correctly in the link pass.
5462+ test -z "$libdir" && \
5463+ func_append dlpreconveniencelibs " $dir/$old_library"
5464+ fi
5465+ ;;
5466+ * )
5467+ # Prefer using a static library (so that no silly _DYNAMIC symbols
5468+ # are required to link).
5469+ if test -n "$old_library"; then
5470+ func_append newdlprefiles " $dir/$old_library"
5471+ # Keep a list of preopened convenience libraries to check
5472+ # that they are being used correctly in the link pass.
5473+ test -z "$libdir" && \
5474+ func_append dlpreconveniencelibs " $dir/$old_library"
5475+ # Otherwise, use the dlname, so that lt_dlopen finds it.
5476+ elif test -n "$dlname"; then
5477+ func_append newdlprefiles " $dir/$dlname"
5478+ else
5479+ func_append newdlprefiles " $dir/$linklib"
5480+ fi
5481+ ;;
5482+ esac
5483 fi # $pass = dlpreopen
5484
5485 if test -z "$libdir"; then
5486@@ -5684,7 +6593,7 @@ func_mode_link ()
5487
5488
5489 if test "$linkmode" = prog && test "$pass" != link; then
5490- newlib_search_path="$newlib_search_path $ladir"
5491+ func_append newlib_search_path " $ladir"
5492 deplibs="$lib $deplibs"
5493
5494 linkalldeplibs=no
5495@@ -5697,7 +6606,8 @@ func_mode_link ()
5496 for deplib in $dependency_libs; do
5497 case $deplib in
5498 -L*) func_stripname '-L' '' "$deplib"
5499- newlib_search_path="$newlib_search_path $func_stripname_result"
5500+ func_resolve_sysroot "$func_stripname_result"
5501+ func_append newlib_search_path " $func_resolve_sysroot_result"
5502 ;;
5503 esac
5504 # Need to link against all dependency_libs?
5505@@ -5708,12 +6618,12 @@ func_mode_link ()
5506 # or/and link against static libraries
5507 newdependency_libs="$deplib $newdependency_libs"
5508 fi
5509- if $opt_duplicate_deps ; then
5510+ if $opt_preserve_dup_deps ; then
5511 case "$tmp_libs " in
5512- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
5513+ *" $deplib "*) func_append specialdeplibs " $deplib" ;;
5514 esac
5515 fi
5516- tmp_libs="$tmp_libs $deplib"
5517+ func_append tmp_libs " $deplib"
5518 done # for deplib
5519 continue
5520 fi # $linkmode = prog...
5521@@ -5728,7 +6638,7 @@ func_mode_link ()
5522 # Make sure the rpath contains only unique directories.
5523 case "$temp_rpath:" in
5524 *"$absdir:"*) ;;
5525- *) temp_rpath="$temp_rpath$absdir:" ;;
5526+ *) func_append temp_rpath "$absdir:" ;;
5527 esac
5528 fi
5529
5530@@ -5740,7 +6650,7 @@ func_mode_link ()
5531 *)
5532 case "$compile_rpath " in
5533 *" $absdir "*) ;;
5534- *) compile_rpath="$compile_rpath $absdir"
5535+ *) func_append compile_rpath " $absdir" ;;
5536 esac
5537 ;;
5538 esac
5539@@ -5749,7 +6659,7 @@ func_mode_link ()
5540 *)
5541 case "$finalize_rpath " in
5542 *" $libdir "*) ;;
5543- *) finalize_rpath="$finalize_rpath $libdir"
5544+ *) func_append finalize_rpath " $libdir" ;;
5545 esac
5546 ;;
5547 esac
5548@@ -5774,12 +6684,12 @@ func_mode_link ()
5549 case $host in
5550 *cygwin* | *mingw* | *cegcc*)
5551 # No point in relinking DLLs because paths are not encoded
5552- notinst_deplibs="$notinst_deplibs $lib"
5553+ func_append notinst_deplibs " $lib"
5554 need_relink=no
5555 ;;
5556 *)
5557 if test "$installed" = no; then
5558- notinst_deplibs="$notinst_deplibs $lib"
5559+ func_append notinst_deplibs " $lib"
5560 need_relink=yes
5561 fi
5562 ;;
5563@@ -5814,7 +6724,7 @@ func_mode_link ()
5564 *)
5565 case "$compile_rpath " in
5566 *" $absdir "*) ;;
5567- *) compile_rpath="$compile_rpath $absdir"
5568+ *) func_append compile_rpath " $absdir" ;;
5569 esac
5570 ;;
5571 esac
5572@@ -5823,7 +6733,7 @@ func_mode_link ()
5573 *)
5574 case "$finalize_rpath " in
5575 *" $libdir "*) ;;
5576- *) finalize_rpath="$finalize_rpath $libdir"
5577+ *) func_append finalize_rpath " $libdir" ;;
5578 esac
5579 ;;
5580 esac
5581@@ -5835,7 +6745,7 @@ func_mode_link ()
5582 shift
5583 realname="$1"
5584 shift
5585- eval "libname=\"$libname_spec\""
5586+ libname=`eval "\\$ECHO \"$libname_spec\""`
5587 # use dlname if we got it. it's perfectly good, no?
5588 if test -n "$dlname"; then
5589 soname="$dlname"
5590@@ -5848,7 +6758,7 @@ func_mode_link ()
5591 versuffix="-$major"
5592 ;;
5593 esac
5594- eval "soname=\"$soname_spec\""
5595+ eval soname=\"$soname_spec\"
5596 else
5597 soname="$realname"
5598 fi
5599@@ -5877,7 +6787,7 @@ func_mode_link ()
5600 linklib=$newlib
5601 fi # test -n "$old_archive_from_expsyms_cmds"
5602
5603- if test "$linkmode" = prog || test "$mode" != relink; then
5604+ if test "$linkmode" = prog || test "$opt_mode" != relink; then
5605 add_shlibpath=
5606 add_dir=
5607 add=
5608@@ -5933,7 +6843,7 @@ func_mode_link ()
5609 if test -n "$inst_prefix_dir"; then
5610 case $libdir in
5611 [\\/]*)
5612- add_dir="$add_dir -L$inst_prefix_dir$libdir"
5613+ func_append add_dir " -L$inst_prefix_dir$libdir"
5614 ;;
5615 esac
5616 fi
5617@@ -5955,7 +6865,7 @@ func_mode_link ()
5618 if test -n "$add_shlibpath"; then
5619 case :$compile_shlibpath: in
5620 *":$add_shlibpath:"*) ;;
5621- *) compile_shlibpath="$compile_shlibpath$add_shlibpath:" ;;
5622+ *) func_append compile_shlibpath "$add_shlibpath:" ;;
5623 esac
5624 fi
5625 if test "$linkmode" = prog; then
5626@@ -5969,13 +6879,13 @@ func_mode_link ()
5627 test "$hardcode_shlibpath_var" = yes; then
5628 case :$finalize_shlibpath: in
5629 *":$libdir:"*) ;;
5630- *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
5631+ *) func_append finalize_shlibpath "$libdir:" ;;
5632 esac
5633 fi
5634 fi
5635 fi
5636
5637- if test "$linkmode" = prog || test "$mode" = relink; then
5638+ if test "$linkmode" = prog || test "$opt_mode" = relink; then
5639 add_shlibpath=
5640 add_dir=
5641 add=
5642@@ -5989,7 +6899,7 @@ func_mode_link ()
5643 elif test "$hardcode_shlibpath_var" = yes; then
5644 case :$finalize_shlibpath: in
5645 *":$libdir:"*) ;;
5646- *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
5647+ *) func_append finalize_shlibpath "$libdir:" ;;
5648 esac
5649 add="-l$name"
5650 elif test "$hardcode_automatic" = yes; then
5651@@ -6001,12 +6911,12 @@ func_mode_link ()
5652 fi
5653 else
5654 # We cannot seem to hardcode it, guess we'll fake it.
5655- add_dir="-L$libdir"
5656+ add_dir="-L$lt_sysroot$libdir"
5657 # Try looking first in the location we're being installed to.
5658 if test -n "$inst_prefix_dir"; then
5659 case $libdir in
5660 [\\/]*)
5661- add_dir="$add_dir -L$inst_prefix_dir$libdir"
5662+ func_append add_dir " -L$inst_prefix_dir$libdir"
5663 ;;
5664 esac
5665 fi
5666@@ -6083,27 +6993,33 @@ func_mode_link ()
5667 temp_xrpath=$func_stripname_result
5668 case " $xrpath " in
5669 *" $temp_xrpath "*) ;;
5670- *) xrpath="$xrpath $temp_xrpath";;
5671+ *) func_append xrpath " $temp_xrpath";;
5672 esac;;
5673- *) temp_deplibs="$temp_deplibs $libdir";;
5674+ *) func_append temp_deplibs " $libdir";;
5675 esac
5676 done
5677 dependency_libs="$temp_deplibs"
5678 fi
5679
5680- newlib_search_path="$newlib_search_path $absdir"
5681+ func_append newlib_search_path " $absdir"
5682 # Link against this library
5683 test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs"
5684 # ... and its dependency_libs
5685 tmp_libs=
5686 for deplib in $dependency_libs; do
5687 newdependency_libs="$deplib $newdependency_libs"
5688- if $opt_duplicate_deps ; then
5689+ case $deplib in
5690+ -L*) func_stripname '-L' '' "$deplib"
5691+ func_resolve_sysroot "$func_stripname_result";;
5692+ *) func_resolve_sysroot "$deplib" ;;
5693+ esac
5694+ if $opt_preserve_dup_deps ; then
5695 case "$tmp_libs " in
5696- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
5697+ *" $func_resolve_sysroot_result "*)
5698+ func_append specialdeplibs " $func_resolve_sysroot_result" ;;
5699 esac
5700 fi
5701- tmp_libs="$tmp_libs $deplib"
5702+ func_append tmp_libs " $func_resolve_sysroot_result"
5703 done
5704
5705 if test "$link_all_deplibs" != no; then
5706@@ -6113,8 +7029,10 @@ func_mode_link ()
5707 case $deplib in
5708 -L*) path="$deplib" ;;
5709 *.la)
5710+ func_resolve_sysroot "$deplib"
5711+ deplib=$func_resolve_sysroot_result
5712 func_dirname "$deplib" "" "."
5713- dir="$func_dirname_result"
5714+ dir=$func_dirname_result
5715 # We need an absolute path.
5716 case $dir in
5717 [\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;;
5718@@ -6130,7 +7048,7 @@ func_mode_link ()
5719 case $host in
5720 *-*-darwin*)
5721 depdepl=
5722- deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
5723+ eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
5724 if test -n "$deplibrary_names" ; then
5725 for tmp in $deplibrary_names ; do
5726 depdepl=$tmp
5727@@ -6141,8 +7059,8 @@ func_mode_link ()
5728 if test -z "$darwin_install_name"; then
5729 darwin_install_name=`${OTOOL64} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'`
5730 fi
5731- compiler_flags="$compiler_flags ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}"
5732- linker_flags="$linker_flags -dylib_file ${darwin_install_name}:${depdepl}"
5733+ func_append compiler_flags " ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}"
5734+ func_append linker_flags " -dylib_file ${darwin_install_name}:${depdepl}"
5735 path=
5736 fi
5737 fi
5738@@ -6152,7 +7070,7 @@ func_mode_link ()
5739 ;;
5740 esac
5741 else
5742- libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
5743+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
5744 test -z "$libdir" && \
5745 func_fatal_error "\`$deplib' is not a valid libtool archive"
5746 test "$absdir" != "$libdir" && \
5747@@ -6192,7 +7110,7 @@ func_mode_link ()
5748 for dir in $newlib_search_path; do
5749 case "$lib_search_path " in
5750 *" $dir "*) ;;
5751- *) lib_search_path="$lib_search_path $dir" ;;
5752+ *) func_append lib_search_path " $dir" ;;
5753 esac
5754 done
5755 newlib_search_path=
5756@@ -6205,7 +7123,7 @@ func_mode_link ()
5757 fi
5758 for var in $vars dependency_libs; do
5759 # Add libraries to $var in reverse order
5760- eval tmp_libs=\$$var
5761+ eval tmp_libs=\"\$$var\"
5762 new_libs=
5763 for deplib in $tmp_libs; do
5764 # FIXME: Pedantically, this is the right thing to do, so
5765@@ -6250,13 +7168,13 @@ func_mode_link ()
5766 -L*)
5767 case " $tmp_libs " in
5768 *" $deplib "*) ;;
5769- *) tmp_libs="$tmp_libs $deplib" ;;
5770+ *) func_append tmp_libs " $deplib" ;;
5771 esac
5772 ;;
5773- *) tmp_libs="$tmp_libs $deplib" ;;
5774+ *) func_append tmp_libs " $deplib" ;;
5775 esac
5776 done
5777- eval $var=\$tmp_libs
5778+ eval $var=\"$tmp_libs\"
5779 done # for var
5780 fi
5781 # Last step: remove runtime libs from dependency_libs
5782@@ -6269,7 +7187,7 @@ func_mode_link ()
5783 ;;
5784 esac
5785 if test -n "$i" ; then
5786- tmp_libs="$tmp_libs $i"
5787+ func_append tmp_libs " $i"
5788 fi
5789 done
5790 dependency_libs=$tmp_libs
5791@@ -6310,7 +7228,7 @@ func_mode_link ()
5792 # Now set the variables for building old libraries.
5793 build_libtool_libs=no
5794 oldlibs="$output"
5795- objs="$objs$old_deplibs"
5796+ func_append objs "$old_deplibs"
5797 ;;
5798
5799 lib)
5800@@ -6319,8 +7237,8 @@ func_mode_link ()
5801 lib*)
5802 func_stripname 'lib' '.la' "$outputname"
5803 name=$func_stripname_result
5804- eval "shared_ext=\"$shrext_cmds\""
5805- eval "libname=\"$libname_spec\""
5806+ eval shared_ext=\"$shrext_cmds\"
5807+ eval libname=\"$libname_spec\"
5808 ;;
5809 *)
5810 test "$module" = no && \
5811@@ -6330,8 +7248,8 @@ func_mode_link ()
5812 # Add the "lib" prefix for modules if required
5813 func_stripname '' '.la' "$outputname"
5814 name=$func_stripname_result
5815- eval "shared_ext=\"$shrext_cmds\""
5816- eval "libname=\"$libname_spec\""
5817+ eval shared_ext=\"$shrext_cmds\"
5818+ eval libname=\"$libname_spec\"
5819 else
5820 func_stripname '' '.la' "$outputname"
5821 libname=$func_stripname_result
5822@@ -6346,7 +7264,7 @@ func_mode_link ()
5823 echo
5824 $ECHO "*** Warning: Linking the shared library $output against the non-libtool"
5825 $ECHO "*** objects $objs is not portable!"
5826- libobjs="$libobjs $objs"
5827+ func_append libobjs " $objs"
5828 fi
5829 fi
5830
5831@@ -6544,7 +7462,7 @@ func_mode_link ()
5832 done
5833
5834 # Make executables depend on our current version.
5835- verstring="$verstring:${current}.0"
5836+ func_append verstring ":${current}.0"
5837 ;;
5838
5839 qnx)
5840@@ -6612,10 +7530,10 @@ func_mode_link ()
5841 fi
5842
5843 func_generate_dlsyms "$libname" "$libname" "yes"
5844- libobjs="$libobjs $symfileobj"
5845+ func_append libobjs " $symfileobj"
5846 test "X$libobjs" = "X " && libobjs=
5847
5848- if test "$mode" != relink; then
5849+ if test "$opt_mode" != relink; then
5850 # Remove our outputs, but don't remove object files since they
5851 # may have been created when compiling PIC objects.
5852 removelist=
5853@@ -6631,7 +7549,7 @@ func_mode_link ()
5854 continue
5855 fi
5856 fi
5857- removelist="$removelist $p"
5858+ func_append removelist " $p"
5859 ;;
5860 *) ;;
5861 esac
5862@@ -6642,7 +7560,7 @@ func_mode_link ()
5863
5864 # Now set the variables for building old libraries.
5865 if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then
5866- oldlibs="$oldlibs $output_objdir/$libname.$libext"
5867+ func_append oldlibs " $output_objdir/$libname.$libext"
5868
5869 # Transform .lo files to .o files.
5870 oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; $lo2o" | $NL2SP`
5871@@ -6659,10 +7577,11 @@ func_mode_link ()
5872 # If the user specified any rpath flags, then add them.
5873 temp_xrpath=
5874 for libdir in $xrpath; do
5875- temp_xrpath="$temp_xrpath -R$libdir"
5876+ func_replace_sysroot "$libdir"
5877+ func_append temp_xrpath " -R$func_replace_sysroot_result"
5878 case "$finalize_rpath " in
5879 *" $libdir "*) ;;
5880- *) finalize_rpath="$finalize_rpath $libdir" ;;
5881+ *) func_append finalize_rpath " $libdir" ;;
5882 esac
5883 done
5884 if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then
5885@@ -6676,7 +7595,7 @@ func_mode_link ()
5886 for lib in $old_dlfiles; do
5887 case " $dlprefiles $dlfiles " in
5888 *" $lib "*) ;;
5889- *) dlfiles="$dlfiles $lib" ;;
5890+ *) func_append dlfiles " $lib" ;;
5891 esac
5892 done
5893
5894@@ -6686,7 +7605,7 @@ func_mode_link ()
5895 for lib in $old_dlprefiles; do
5896 case "$dlprefiles " in
5897 *" $lib "*) ;;
5898- *) dlprefiles="$dlprefiles $lib" ;;
5899+ *) func_append dlprefiles " $lib" ;;
5900 esac
5901 done
5902
5903@@ -6698,7 +7617,7 @@ func_mode_link ()
5904 ;;
5905 *-*-rhapsody* | *-*-darwin1.[012])
5906 # Rhapsody C library is in the System framework
5907- deplibs="$deplibs System.ltframework"
5908+ func_append deplibs " System.ltframework"
5909 ;;
5910 *-*-netbsd*)
5911 # Don't link with libc until the a.out ld.so is fixed.
5912@@ -6715,7 +7634,7 @@ func_mode_link ()
5913 *)
5914 # Add libc to deplibs on all other systems if necessary.
5915 if test "$build_libtool_need_lc" = "yes"; then
5916- deplibs="$deplibs -lc"
5917+ func_append deplibs " -lc"
5918 fi
5919 ;;
5920 esac
5921@@ -6764,18 +7683,18 @@ EOF
5922 if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
5923 case " $predeps $postdeps " in
5924 *" $i "*)
5925- newdeplibs="$newdeplibs $i"
5926+ func_append newdeplibs " $i"
5927 i=""
5928 ;;
5929 esac
5930 fi
5931 if test -n "$i" ; then
5932- eval "libname=\"$libname_spec\""
5933- eval "deplib_matches=\"$library_names_spec\""
5934+ libname=`eval "\\$ECHO \"$libname_spec\""`
5935+ deplib_matches=`eval "\\$ECHO \"$library_names_spec\""`
5936 set dummy $deplib_matches; shift
5937 deplib_match=$1
5938 if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
5939- newdeplibs="$newdeplibs $i"
5940+ func_append newdeplibs " $i"
5941 else
5942 droppeddeps=yes
5943 echo
5944@@ -6789,7 +7708,7 @@ EOF
5945 fi
5946 ;;
5947 *)
5948- newdeplibs="$newdeplibs $i"
5949+ func_append newdeplibs " $i"
5950 ;;
5951 esac
5952 done
5953@@ -6807,18 +7726,18 @@ EOF
5954 if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
5955 case " $predeps $postdeps " in
5956 *" $i "*)
5957- newdeplibs="$newdeplibs $i"
5958+ func_append newdeplibs " $i"
5959 i=""
5960 ;;
5961 esac
5962 fi
5963 if test -n "$i" ; then
5964- eval "libname=\"$libname_spec\""
5965- eval "deplib_matches=\"$library_names_spec\""
5966+ libname=`eval "\\$ECHO \"$libname_spec\""`
5967+ deplib_matches=`eval "\\$ECHO \"$library_names_spec\""`
5968 set dummy $deplib_matches; shift
5969 deplib_match=$1
5970 if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
5971- newdeplibs="$newdeplibs $i"
5972+ func_append newdeplibs " $i"
5973 else
5974 droppeddeps=yes
5975 echo
5976@@ -6840,7 +7759,7 @@ EOF
5977 fi
5978 ;;
5979 *)
5980- newdeplibs="$newdeplibs $i"
5981+ func_append newdeplibs " $i"
5982 ;;
5983 esac
5984 done
5985@@ -6857,15 +7776,27 @@ EOF
5986 if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
5987 case " $predeps $postdeps " in
5988 *" $a_deplib "*)
5989- newdeplibs="$newdeplibs $a_deplib"
5990+ func_append newdeplibs " $a_deplib"
5991 a_deplib=""
5992 ;;
5993 esac
5994 fi
5995 if test -n "$a_deplib" ; then
5996- eval "libname=\"$libname_spec\""
5997+ libname=`eval "\\$ECHO \"$libname_spec\""`
5998+ if test -n "$file_magic_glob"; then
5999+ libnameglob=`func_echo_all "$libname" | $SED -e $file_magic_glob`
6000+ else
6001+ libnameglob=$libname
6002+ fi
6003+ test "$want_nocaseglob" = yes && nocaseglob=`shopt -p nocaseglob`
6004 for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
6005- potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
6006+ if test "$want_nocaseglob" = yes; then
6007+ shopt -s nocaseglob
6008+ potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null`
6009+ $nocaseglob
6010+ else
6011+ potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null`
6012+ fi
6013 for potent_lib in $potential_libs; do
6014 # Follow soft links.
6015 if ls -lLd "$potent_lib" 2>/dev/null |
6016@@ -6885,10 +7816,10 @@ EOF
6017 *) potlib=`$ECHO "$potlib" | $SED 's,[^/]*$,,'`"$potliblink";;
6018 esac
6019 done
6020- if eval "$file_magic_cmd \"\$potlib\"" 2>/dev/null |
6021+ if eval $file_magic_cmd \"\$potlib\" 2>/dev/null |
6022 $SED -e 10q |
6023 $EGREP "$file_magic_regex" > /dev/null; then
6024- newdeplibs="$newdeplibs $a_deplib"
6025+ func_append newdeplibs " $a_deplib"
6026 a_deplib=""
6027 break 2
6028 fi
6029@@ -6913,7 +7844,7 @@ EOF
6030 ;;
6031 *)
6032 # Add a -L argument.
6033- newdeplibs="$newdeplibs $a_deplib"
6034+ func_append newdeplibs " $a_deplib"
6035 ;;
6036 esac
6037 done # Gone through all deplibs.
6038@@ -6929,20 +7860,20 @@ EOF
6039 if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
6040 case " $predeps $postdeps " in
6041 *" $a_deplib "*)
6042- newdeplibs="$newdeplibs $a_deplib"
6043+ func_append newdeplibs " $a_deplib"
6044 a_deplib=""
6045 ;;
6046 esac
6047 fi
6048 if test -n "$a_deplib" ; then
6049- eval "libname=\"$libname_spec\""
6050+ libname=`eval "\\$ECHO \"$libname_spec\""`
6051 for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
6052 potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
6053 for potent_lib in $potential_libs; do
6054 potlib="$potent_lib" # see symlink-check above in file_magic test
6055 if eval "\$ECHO \"$potent_lib\"" 2>/dev/null | $SED 10q | \
6056 $EGREP "$match_pattern_regex" > /dev/null; then
6057- newdeplibs="$newdeplibs $a_deplib"
6058+ func_append newdeplibs " $a_deplib"
6059 a_deplib=""
6060 break 2
6061 fi
6062@@ -6967,7 +7898,7 @@ EOF
6063 ;;
6064 *)
6065 # Add a -L argument.
6066- newdeplibs="$newdeplibs $a_deplib"
6067+ func_append newdeplibs " $a_deplib"
6068 ;;
6069 esac
6070 done # Gone through all deplibs.
6071@@ -7071,7 +8002,7 @@ EOF
6072 *)
6073 case " $deplibs " in
6074 *" -L$path/$objdir "*)
6075- new_libs="$new_libs -L$path/$objdir" ;;
6076+ func_append new_libs " -L$path/$objdir" ;;
6077 esac
6078 ;;
6079 esac
6080@@ -7081,10 +8012,10 @@ EOF
6081 -L*)
6082 case " $new_libs " in
6083 *" $deplib "*) ;;
6084- *) new_libs="$new_libs $deplib" ;;
6085+ *) func_append new_libs " $deplib" ;;
6086 esac
6087 ;;
6088- *) new_libs="$new_libs $deplib" ;;
6089+ *) func_append new_libs " $deplib" ;;
6090 esac
6091 done
6092 deplibs="$new_libs"
6093@@ -7101,10 +8032,12 @@ EOF
6094 hardcode_libdirs=
6095 dep_rpath=
6096 rpath="$finalize_rpath"
6097- test "$mode" != relink && rpath="$compile_rpath$rpath"
6098+ test "$opt_mode" != relink && rpath="$compile_rpath$rpath"
6099 for libdir in $rpath; do
6100 if test -n "$hardcode_libdir_flag_spec"; then
6101 if test -n "$hardcode_libdir_separator"; then
6102+ func_replace_sysroot "$libdir"
6103+ libdir=$func_replace_sysroot_result
6104 if test -z "$hardcode_libdirs"; then
6105 hardcode_libdirs="$libdir"
6106 else
6107@@ -7113,18 +8046,18 @@ EOF
6108 *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
6109 ;;
6110 *)
6111- hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
6112+ func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
6113 ;;
6114 esac
6115 fi
6116 else
6117- eval "flag=\"$hardcode_libdir_flag_spec\""
6118- dep_rpath="$dep_rpath $flag"
6119+ eval flag=\"$hardcode_libdir_flag_spec\"
6120+ func_append dep_rpath " $flag"
6121 fi
6122 elif test -n "$runpath_var"; then
6123 case "$perm_rpath " in
6124 *" $libdir "*) ;;
6125- *) perm_rpath="$perm_rpath $libdir" ;;
6126+ *) func_apped perm_rpath " $libdir" ;;
6127 esac
6128 fi
6129 done
6130@@ -7133,40 +8066,38 @@ EOF
6131 test -n "$hardcode_libdirs"; then
6132 libdir="$hardcode_libdirs"
6133 if test -n "$hardcode_libdir_flag_spec_ld"; then
6134- eval "dep_rpath=\"$hardcode_libdir_flag_spec_ld\""
6135+ eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\"
6136 else
6137- eval "dep_rpath=\"$hardcode_libdir_flag_spec\""
6138+ eval dep_rpath=\"$hardcode_libdir_flag_spec\"
6139 fi
6140 fi
6141 if test -n "$runpath_var" && test -n "$perm_rpath"; then
6142 # We should set the runpath_var.
6143 rpath=
6144 for dir in $perm_rpath; do
6145- rpath="$rpath$dir:"
6146+ func_append rpath "$dir:"
6147 done
6148- eval $runpath_var=\$rpath\$$runpath_var
6149- export $runpath_var
6150+ eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var"
6151 fi
6152 test -n "$dep_rpath" && deplibs="$dep_rpath $deplibs"
6153 fi
6154
6155 shlibpath="$finalize_shlibpath"
6156- test "$mode" != relink && shlibpath="$compile_shlibpath$shlibpath"
6157+ test "$opt_mode" != relink && shlibpath="$compile_shlibpath$shlibpath"
6158 if test -n "$shlibpath"; then
6159- eval $shlibpath_var=\$shlibpath\$$shlibpath_var
6160- export $shlibpath_var
6161+ eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var"
6162 fi
6163
6164 # Get the real and link names of the library.
6165- eval "shared_ext=\"$shrext_cmds\""
6166- eval "library_names=\"$library_names_spec\""
6167+ eval shared_ext=\"$shrext_cmds\"
6168+ eval library_names=\"$library_names_spec\"
6169 set dummy $library_names
6170 shift
6171 realname="$1"
6172 shift
6173
6174 if test -n "$soname_spec"; then
6175- eval "soname=\"$soname_spec\""
6176+ eval soname=\"$soname_spec\"
6177 else
6178 soname="$realname"
6179 fi
6180@@ -7178,7 +8109,7 @@ EOF
6181 linknames=
6182 for link
6183 do
6184- linknames="$linknames $link"
6185+ func_append linknames " $link"
6186 done
6187
6188 # Use standard objects if they are pic
6189@@ -7189,7 +8120,7 @@ EOF
6190 if test -n "$export_symbols" && test -n "$include_expsyms"; then
6191 $opt_dry_run || cp "$export_symbols" "$output_objdir/$libname.uexp"
6192 export_symbols="$output_objdir/$libname.uexp"
6193- delfiles="$delfiles $export_symbols"
6194+ func_append delfiles " $export_symbols"
6195 fi
6196
6197 orig_export_symbols=
6198@@ -7220,13 +8151,45 @@ EOF
6199 $opt_dry_run || $RM $export_symbols
6200 cmds=$export_symbols_cmds
6201 save_ifs="$IFS"; IFS='~'
6202- for cmd in $cmds; do
6203+ for cmd1 in $cmds; do
6204 IFS="$save_ifs"
6205- eval "cmd=\"$cmd\""
6206- func_len " $cmd"
6207- len=$func_len_result
6208- if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
6209+ # Take the normal branch if the nm_file_list_spec branch
6210+ # doesn't work or if tool conversion is not needed.
6211+ case $nm_file_list_spec~$to_tool_file_cmd in
6212+ *~func_convert_file_noop | *~func_convert_file_msys_to_w32 | ~*)
6213+ try_normal_branch=yes
6214+ eval cmd=\"$cmd1\"
6215+ func_len " $cmd"
6216+ len=$func_len_result
6217+ ;;
6218+ *)
6219+ try_normal_branch=no
6220+ ;;
6221+ esac
6222+ if test "$try_normal_branch" = yes \
6223+ && { test "$len" -lt "$max_cmd_len" \
6224+ || test "$max_cmd_len" -le -1; }
6225+ then
6226+ func_show_eval "$cmd" 'exit $?'
6227+ skipped_export=false
6228+ elif test -n "$nm_file_list_spec"; then
6229+ func_basename "$output"
6230+ output_la=$func_basename_result
6231+ save_libobjs=$libobjs
6232+ save_output=$output
6233+ output=${output_objdir}/${output_la}.nm
6234+ func_to_tool_file "$output"
6235+ libobjs=$nm_file_list_spec$func_to_tool_file_result
6236+ func_append delfiles " $output"
6237+ func_verbose "creating $NM input file list: $output"
6238+ for obj in $save_libobjs; do
6239+ func_to_tool_file "$obj"
6240+ $ECHO "$func_to_tool_file_result"
6241+ done > "$output"
6242+ eval cmd=\"$cmd1\"
6243 func_show_eval "$cmd" 'exit $?'
6244+ output=$save_output
6245+ libobjs=$save_libobjs
6246 skipped_export=false
6247 else
6248 # The command line is too long to execute in one step.
6249@@ -7248,7 +8211,7 @@ EOF
6250 if test -n "$export_symbols" && test -n "$include_expsyms"; then
6251 tmp_export_symbols="$export_symbols"
6252 test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols"
6253- $opt_dry_run || $ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"
6254+ $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"'
6255 fi
6256
6257 if test "X$skipped_export" != "X:" && test -n "$orig_export_symbols"; then
6258@@ -7260,7 +8223,7 @@ EOF
6259 # global variables. join(1) would be nice here, but unfortunately
6260 # isn't a blessed tool.
6261 $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter
6262- delfiles="$delfiles $export_symbols $output_objdir/$libname.filter"
6263+ func_append delfiles " $export_symbols $output_objdir/$libname.filter"
6264 export_symbols=$output_objdir/$libname.def
6265 $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
6266 fi
6267@@ -7270,7 +8233,7 @@ EOF
6268 case " $convenience " in
6269 *" $test_deplib "*) ;;
6270 *)
6271- tmp_deplibs="$tmp_deplibs $test_deplib"
6272+ func_append tmp_deplibs " $test_deplib"
6273 ;;
6274 esac
6275 done
6276@@ -7286,43 +8249,43 @@ EOF
6277 fi
6278 if test -n "$whole_archive_flag_spec"; then
6279 save_libobjs=$libobjs
6280- eval "libobjs=\"\$libobjs $whole_archive_flag_spec\""
6281+ eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
6282 test "X$libobjs" = "X " && libobjs=
6283 else
6284 gentop="$output_objdir/${outputname}x"
6285- generated="$generated $gentop"
6286+ func_append generated " $gentop"
6287
6288 func_extract_archives $gentop $convenience
6289- libobjs="$libobjs $func_extract_archives_result"
6290+ func_append libobjs " $func_extract_archives_result"
6291 test "X$libobjs" = "X " && libobjs=
6292 fi
6293 fi
6294
6295 if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then
6296- eval "flag=\"$thread_safe_flag_spec\""
6297- linker_flags="$linker_flags $flag"
6298+ eval flag=\"$thread_safe_flag_spec\"
6299+ func_append linker_flags " $flag"
6300 fi
6301
6302 # Make a backup of the uninstalled library when relinking
6303- if test "$mode" = relink; then
6304- $opt_dry_run || (cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U) || exit $?
6305+ if test "$opt_mode" = relink; then
6306+ $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U)' || exit $?
6307 fi
6308
6309 # Do each of the archive commands.
6310 if test "$module" = yes && test -n "$module_cmds" ; then
6311 if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
6312- eval "test_cmds=\"$module_expsym_cmds\""
6313+ eval test_cmds=\"$module_expsym_cmds\"
6314 cmds=$module_expsym_cmds
6315 else
6316- eval "test_cmds=\"$module_cmds\""
6317+ eval test_cmds=\"$module_cmds\"
6318 cmds=$module_cmds
6319 fi
6320 else
6321 if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
6322- eval "test_cmds=\"$archive_expsym_cmds\""
6323+ eval test_cmds=\"$archive_expsym_cmds\"
6324 cmds=$archive_expsym_cmds
6325 else
6326- eval "test_cmds=\"$archive_cmds\""
6327+ eval test_cmds=\"$archive_cmds\"
6328 cmds=$archive_cmds
6329 fi
6330 fi
6331@@ -7366,10 +8329,13 @@ EOF
6332 echo 'INPUT (' > $output
6333 for obj in $save_libobjs
6334 do
6335- $ECHO "$obj" >> $output
6336+ func_to_tool_file "$obj"
6337+ $ECHO "$func_to_tool_file_result" >> $output
6338 done
6339 echo ')' >> $output
6340- delfiles="$delfiles $output"
6341+ func_append delfiles " $output"
6342+ func_to_tool_file "$output"
6343+ output=$func_to_tool_file_result
6344 elif test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "X$file_list_spec" != X; then
6345 output=${output_objdir}/${output_la}.lnk
6346 func_verbose "creating linker input file list: $output"
6347@@ -7383,15 +8349,17 @@ EOF
6348 fi
6349 for obj
6350 do
6351- $ECHO "$obj" >> $output
6352+ func_to_tool_file "$obj"
6353+ $ECHO "$func_to_tool_file_result" >> $output
6354 done
6355- delfiles="$delfiles $output"
6356- output=$firstobj\"$file_list_spec$output\"
6357+ func_append delfiles " $output"
6358+ func_to_tool_file "$output"
6359+ output=$firstobj\"$file_list_spec$func_to_tool_file_result\"
6360 else
6361 if test -n "$save_libobjs"; then
6362 func_verbose "creating reloadable object files..."
6363 output=$output_objdir/$output_la-${k}.$objext
6364- eval "test_cmds=\"$reload_cmds\""
6365+ eval test_cmds=\"$reload_cmds\"
6366 func_len " $test_cmds"
6367 len0=$func_len_result
6368 len=$len0
6369@@ -7411,12 +8379,12 @@ EOF
6370 if test "$k" -eq 1 ; then
6371 # The first file doesn't have a previous command to add.
6372 reload_objs=$objlist
6373- eval "concat_cmds=\"$reload_cmds\""
6374+ eval concat_cmds=\"$reload_cmds\"
6375 else
6376 # All subsequent reloadable object files will link in
6377 # the last one created.
6378 reload_objs="$objlist $last_robj"
6379- eval "concat_cmds=\"\$concat_cmds~$reload_cmds~\$RM $last_robj\""
6380+ eval concat_cmds=\"\$concat_cmds~$reload_cmds~\$RM $last_robj\"
6381 fi
6382 last_robj=$output_objdir/$output_la-${k}.$objext
6383 func_arith $k + 1
6384@@ -7433,11 +8401,11 @@ EOF
6385 # files will link in the last one created.
6386 test -z "$concat_cmds" || concat_cmds=$concat_cmds~
6387 reload_objs="$objlist $last_robj"
6388- eval "concat_cmds=\"\${concat_cmds}$reload_cmds\""
6389+ eval concat_cmds=\"\${concat_cmds}$reload_cmds\"
6390 if test -n "$last_robj"; then
6391- eval "concat_cmds=\"\${concat_cmds}~\$RM $last_robj\""
6392+ eval concat_cmds=\"\${concat_cmds}~\$RM $last_robj\"
6393 fi
6394- delfiles="$delfiles $output"
6395+ func_append delfiles " $output"
6396
6397 else
6398 output=
6399@@ -7450,9 +8418,9 @@ EOF
6400 libobjs=$output
6401 # Append the command to create the export file.
6402 test -z "$concat_cmds" || concat_cmds=$concat_cmds~
6403- eval "concat_cmds=\"\$concat_cmds$export_symbols_cmds\""
6404+ eval concat_cmds=\"\$concat_cmds$export_symbols_cmds\"
6405 if test -n "$last_robj"; then
6406- eval "concat_cmds=\"\$concat_cmds~\$RM $last_robj\""
6407+ eval concat_cmds=\"\$concat_cmds~\$RM $last_robj\"
6408 fi
6409 fi
6410
6411@@ -7471,7 +8439,7 @@ EOF
6412 lt_exit=$?
6413
6414 # Restore the uninstalled library and exit
6415- if test "$mode" = relink; then
6416+ if test "$opt_mode" = relink; then
6417 ( cd "$output_objdir" && \
6418 $RM "${realname}T" && \
6419 $MV "${realname}U" "$realname" )
6420@@ -7492,7 +8460,7 @@ EOF
6421 if test -n "$export_symbols" && test -n "$include_expsyms"; then
6422 tmp_export_symbols="$export_symbols"
6423 test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols"
6424- $opt_dry_run || $ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"
6425+ $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"'
6426 fi
6427
6428 if test -n "$orig_export_symbols"; then
6429@@ -7504,7 +8472,7 @@ EOF
6430 # global variables. join(1) would be nice here, but unfortunately
6431 # isn't a blessed tool.
6432 $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter
6433- delfiles="$delfiles $export_symbols $output_objdir/$libname.filter"
6434+ func_append delfiles " $export_symbols $output_objdir/$libname.filter"
6435 export_symbols=$output_objdir/$libname.def
6436 $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
6437 fi
6438@@ -7515,7 +8483,7 @@ EOF
6439 output=$save_output
6440
6441 if test -n "$convenience" && test -n "$whole_archive_flag_spec"; then
6442- eval "libobjs=\"\$libobjs $whole_archive_flag_spec\""
6443+ eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
6444 test "X$libobjs" = "X " && libobjs=
6445 fi
6446 # Expand the library linking commands again to reset the
6447@@ -7539,23 +8507,23 @@ EOF
6448
6449 if test -n "$delfiles"; then
6450 # Append the command to remove temporary files to $cmds.
6451- eval "cmds=\"\$cmds~\$RM $delfiles\""
6452+ eval cmds=\"\$cmds~\$RM $delfiles\"
6453 fi
6454
6455 # Add any objects from preloaded convenience libraries
6456 if test -n "$dlprefiles"; then
6457 gentop="$output_objdir/${outputname}x"
6458- generated="$generated $gentop"
6459+ func_append generated " $gentop"
6460
6461 func_extract_archives $gentop $dlprefiles
6462- libobjs="$libobjs $func_extract_archives_result"
6463+ func_append libobjs " $func_extract_archives_result"
6464 test "X$libobjs" = "X " && libobjs=
6465 fi
6466
6467 save_ifs="$IFS"; IFS='~'
6468 for cmd in $cmds; do
6469 IFS="$save_ifs"
6470- eval "cmd=\"$cmd\""
6471+ eval cmd=\"$cmd\"
6472 $opt_silent || {
6473 func_quote_for_expand "$cmd"
6474 eval "func_echo $func_quote_for_expand_result"
6475@@ -7564,7 +8532,7 @@ EOF
6476 lt_exit=$?
6477
6478 # Restore the uninstalled library and exit
6479- if test "$mode" = relink; then
6480+ if test "$opt_mode" = relink; then
6481 ( cd "$output_objdir" && \
6482 $RM "${realname}T" && \
6483 $MV "${realname}U" "$realname" )
6484@@ -7576,8 +8544,8 @@ EOF
6485 IFS="$save_ifs"
6486
6487 # Restore the uninstalled library and exit
6488- if test "$mode" = relink; then
6489- $opt_dry_run || (cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname) || exit $?
6490+ if test "$opt_mode" = relink; then
6491+ $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname)' || exit $?
6492
6493 if test -n "$convenience"; then
6494 if test -z "$whole_archive_flag_spec"; then
6495@@ -7656,17 +8624,20 @@ EOF
6496
6497 if test -n "$convenience"; then
6498 if test -n "$whole_archive_flag_spec"; then
6499- eval "tmp_whole_archive_flags=\"$whole_archive_flag_spec\""
6500+ eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\"
6501 reload_conv_objs=$reload_objs\ `$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'`
6502 else
6503 gentop="$output_objdir/${obj}x"
6504- generated="$generated $gentop"
6505+ func_append generated " $gentop"
6506
6507 func_extract_archives $gentop $convenience
6508 reload_conv_objs="$reload_objs $func_extract_archives_result"
6509 fi
6510 fi
6511
6512+ # If we're not building shared, we need to use non_pic_objs
6513+ test "$build_libtool_libs" != yes && libobjs="$non_pic_objects"
6514+
6515 # Create the old-style object.
6516 reload_objs="$objs$old_deplibs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; /\.lib$/d; $lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test
6517
6518@@ -7690,7 +8661,7 @@ EOF
6519 # Create an invalid libtool object if no PIC, so that we don't
6520 # accidentally link it into a program.
6521 # $show "echo timestamp > $libobj"
6522- # $opt_dry_run || echo timestamp > $libobj || exit $?
6523+ # $opt_dry_run || eval "echo timestamp > $libobj" || exit $?
6524 exit $EXIT_SUCCESS
6525 fi
6526
6527@@ -7740,8 +8711,8 @@ EOF
6528 if test "$tagname" = CXX ; then
6529 case ${MACOSX_DEPLOYMENT_TARGET-10.0} in
6530 10.[0123])
6531- compile_command="$compile_command ${wl}-bind_at_load"
6532- finalize_command="$finalize_command ${wl}-bind_at_load"
6533+ func_append compile_command " ${wl}-bind_at_load"
6534+ func_append finalize_command " ${wl}-bind_at_load"
6535 ;;
6536 esac
6537 fi
6538@@ -7761,7 +8732,7 @@ EOF
6539 *)
6540 case " $compile_deplibs " in
6541 *" -L$path/$objdir "*)
6542- new_libs="$new_libs -L$path/$objdir" ;;
6543+ func_append new_libs " -L$path/$objdir" ;;
6544 esac
6545 ;;
6546 esac
6547@@ -7771,17 +8742,17 @@ EOF
6548 -L*)
6549 case " $new_libs " in
6550 *" $deplib "*) ;;
6551- *) new_libs="$new_libs $deplib" ;;
6552+ *) func_append new_libs " $deplib" ;;
6553 esac
6554 ;;
6555- *) new_libs="$new_libs $deplib" ;;
6556+ *) func_append new_libs " $deplib" ;;
6557 esac
6558 done
6559 compile_deplibs="$new_libs"
6560
6561
6562- compile_command="$compile_command $compile_deplibs"
6563- finalize_command="$finalize_command $finalize_deplibs"
6564+ func_append compile_command " $compile_deplibs"
6565+ func_append finalize_command " $finalize_deplibs"
6566
6567 if test -n "$rpath$xrpath"; then
6568 # If the user specified any rpath flags, then add them.
6569@@ -7789,7 +8760,7 @@ EOF
6570 # This is the magic to use -rpath.
6571 case "$finalize_rpath " in
6572 *" $libdir "*) ;;
6573- *) finalize_rpath="$finalize_rpath $libdir" ;;
6574+ *) func_append finalize_rpath " $libdir" ;;
6575 esac
6576 done
6577 fi
6578@@ -7808,18 +8779,18 @@ EOF
6579 *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
6580 ;;
6581 *)
6582- hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
6583+ func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
6584 ;;
6585 esac
6586 fi
6587 else
6588- eval "flag=\"$hardcode_libdir_flag_spec\""
6589- rpath="$rpath $flag"
6590+ eval flag=\"$hardcode_libdir_flag_spec\"
6591+ func_append rpath " $flag"
6592 fi
6593 elif test -n "$runpath_var"; then
6594 case "$perm_rpath " in
6595 *" $libdir "*) ;;
6596- *) perm_rpath="$perm_rpath $libdir" ;;
6597+ *) func_append perm_rpath " $libdir" ;;
6598 esac
6599 fi
6600 case $host in
6601@@ -7828,12 +8799,12 @@ EOF
6602 case :$dllsearchpath: in
6603 *":$libdir:"*) ;;
6604 ::) dllsearchpath=$libdir;;
6605- *) dllsearchpath="$dllsearchpath:$libdir";;
6606+ *) func_append dllsearchpath ":$libdir";;
6607 esac
6608 case :$dllsearchpath: in
6609 *":$testbindir:"*) ;;
6610 ::) dllsearchpath=$testbindir;;
6611- *) dllsearchpath="$dllsearchpath:$testbindir";;
6612+ *) func_append dllsearchpath ":$testbindir";;
6613 esac
6614 ;;
6615 esac
6616@@ -7842,7 +8813,7 @@ EOF
6617 if test -n "$hardcode_libdir_separator" &&
6618 test -n "$hardcode_libdirs"; then
6619 libdir="$hardcode_libdirs"
6620- eval "rpath=\" $hardcode_libdir_flag_spec\""
6621+ eval rpath=\" $hardcode_libdir_flag_spec\"
6622 fi
6623 compile_rpath="$rpath"
6624
6625@@ -7859,18 +8830,18 @@ EOF
6626 *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
6627 ;;
6628 *)
6629- hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
6630+ func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
6631 ;;
6632 esac
6633 fi
6634 else
6635- eval "flag=\"$hardcode_libdir_flag_spec\""
6636- rpath="$rpath $flag"
6637+ eval flag=\"$hardcode_libdir_flag_spec\"
6638+ func_append rpath " $flag"
6639 fi
6640 elif test -n "$runpath_var"; then
6641 case "$finalize_perm_rpath " in
6642 *" $libdir "*) ;;
6643- *) finalize_perm_rpath="$finalize_perm_rpath $libdir" ;;
6644+ *) func_append finalize_perm_rpath " $libdir" ;;
6645 esac
6646 fi
6647 done
6648@@ -7878,7 +8849,7 @@ EOF
6649 if test -n "$hardcode_libdir_separator" &&
6650 test -n "$hardcode_libdirs"; then
6651 libdir="$hardcode_libdirs"
6652- eval "rpath=\" $hardcode_libdir_flag_spec\""
6653+ eval rpath=\" $hardcode_libdir_flag_spec\"
6654 fi
6655 finalize_rpath="$rpath"
6656
6657@@ -7921,6 +8892,12 @@ EOF
6658 exit_status=0
6659 func_show_eval "$link_command" 'exit_status=$?'
6660
6661+ if test -n "$postlink_cmds"; then
6662+ func_to_tool_file "$output"
6663+ postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'`
6664+ func_execute_cmds "$postlink_cmds" 'exit $?'
6665+ fi
6666+
6667 # Delete the generated files.
6668 if test -f "$output_objdir/${outputname}S.${objext}"; then
6669 func_show_eval '$RM "$output_objdir/${outputname}S.${objext}"'
6670@@ -7943,7 +8920,7 @@ EOF
6671 # We should set the runpath_var.
6672 rpath=
6673 for dir in $perm_rpath; do
6674- rpath="$rpath$dir:"
6675+ func_append rpath "$dir:"
6676 done
6677 compile_var="$runpath_var=\"$rpath\$$runpath_var\" "
6678 fi
6679@@ -7951,7 +8928,7 @@ EOF
6680 # We should set the runpath_var.
6681 rpath=
6682 for dir in $finalize_perm_rpath; do
6683- rpath="$rpath$dir:"
6684+ func_append rpath "$dir:"
6685 done
6686 finalize_var="$runpath_var=\"$rpath\$$runpath_var\" "
6687 fi
6688@@ -7966,6 +8943,13 @@ EOF
6689 $opt_dry_run || $RM $output
6690 # Link the executable and exit
6691 func_show_eval "$link_command" 'exit $?'
6692+
6693+ if test -n "$postlink_cmds"; then
6694+ func_to_tool_file "$output"
6695+ postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'`
6696+ func_execute_cmds "$postlink_cmds" 'exit $?'
6697+ fi
6698+
6699 exit $EXIT_SUCCESS
6700 fi
6701
6702@@ -7999,6 +8983,12 @@ EOF
6703
6704 func_show_eval "$link_command" 'exit $?'
6705
6706+ if test -n "$postlink_cmds"; then
6707+ func_to_tool_file "$output_objdir/$outputname"
6708+ 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'`
6709+ func_execute_cmds "$postlink_cmds" 'exit $?'
6710+ fi
6711+
6712 # Now create the wrapper script.
6713 func_verbose "creating $output"
6714
6715@@ -8096,7 +9086,7 @@ EOF
6716 else
6717 oldobjs="$old_deplibs $non_pic_objects"
6718 if test "$preload" = yes && test -f "$symfileobj"; then
6719- oldobjs="$oldobjs $symfileobj"
6720+ func_append oldobjs " $symfileobj"
6721 fi
6722 fi
6723 addlibs="$old_convenience"
6724@@ -8104,10 +9094,10 @@ EOF
6725
6726 if test -n "$addlibs"; then
6727 gentop="$output_objdir/${outputname}x"
6728- generated="$generated $gentop"
6729+ func_append generated " $gentop"
6730
6731 func_extract_archives $gentop $addlibs
6732- oldobjs="$oldobjs $func_extract_archives_result"
6733+ func_append oldobjs " $func_extract_archives_result"
6734 fi
6735
6736 # Do each command in the archive commands.
6737@@ -8118,10 +9108,10 @@ EOF
6738 # Add any objects from preloaded convenience libraries
6739 if test -n "$dlprefiles"; then
6740 gentop="$output_objdir/${outputname}x"
6741- generated="$generated $gentop"
6742+ func_append generated " $gentop"
6743
6744 func_extract_archives $gentop $dlprefiles
6745- oldobjs="$oldobjs $func_extract_archives_result"
6746+ func_append oldobjs " $func_extract_archives_result"
6747 fi
6748
6749 # POSIX demands no paths to be encoded in archives. We have
6750@@ -8139,7 +9129,7 @@ EOF
6751 else
6752 echo "copying selected object files to avoid basename conflicts..."
6753 gentop="$output_objdir/${outputname}x"
6754- generated="$generated $gentop"
6755+ func_append generated " $gentop"
6756 func_mkdir_p "$gentop"
6757 save_oldobjs=$oldobjs
6758 oldobjs=
6759@@ -8163,18 +9153,28 @@ EOF
6760 esac
6761 done
6762 func_show_eval "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj"
6763- oldobjs="$oldobjs $gentop/$newobj"
6764+ func_append oldobjs " $gentop/$newobj"
6765 ;;
6766- *) oldobjs="$oldobjs $obj" ;;
6767+ *) func_append oldobjs " $obj" ;;
6768 esac
6769 done
6770 fi
6771- eval "cmds=\"$old_archive_cmds\""
6772+ eval cmds=\"$old_archive_cmds\"
6773
6774 func_len " $cmds"
6775 len=$func_len_result
6776 if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
6777 cmds=$old_archive_cmds
6778+ elif test -n "$archiver_list_spec"; then
6779+ func_verbose "using command file archive linking..."
6780+ for obj in $oldobjs
6781+ do
6782+ func_to_tool_file "$obj"
6783+ $ECHO "$func_to_tool_file_result"
6784+ done > $output_objdir/$libname.libcmd
6785+ func_to_tool_file "$output_objdir/$libname.libcmd"
6786+ oldobjs=" $archiver_list_spec$func_to_tool_file_result"
6787+ cmds=$old_archive_cmds
6788 else
6789 # the command line is too long to link in one step, link in parts
6790 func_verbose "using piecewise archive linking..."
6791@@ -8189,7 +9189,7 @@ EOF
6792 do
6793 last_oldobj=$obj
6794 done
6795- eval "test_cmds=\"$old_archive_cmds\""
6796+ eval test_cmds=\"$old_archive_cmds\"
6797 func_len " $test_cmds"
6798 len0=$func_len_result
6799 len=$len0
6800@@ -8208,7 +9208,7 @@ EOF
6801 RANLIB=$save_RANLIB
6802 fi
6803 test -z "$concat_cmds" || concat_cmds=$concat_cmds~
6804- eval "concat_cmds=\"\${concat_cmds}$old_archive_cmds\""
6805+ eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\"
6806 objlist=
6807 len=$len0
6808 fi
6809@@ -8216,9 +9216,9 @@ EOF
6810 RANLIB=$save_RANLIB
6811 oldobjs=$objlist
6812 if test "X$oldobjs" = "X" ; then
6813- eval "cmds=\"\$concat_cmds\""
6814+ eval cmds=\"\$concat_cmds\"
6815 else
6816- eval "cmds=\"\$concat_cmds~\$old_archive_cmds\""
6817+ eval cmds=\"\$concat_cmds~\$old_archive_cmds\"
6818 fi
6819 fi
6820 fi
6821@@ -8268,12 +9268,23 @@ EOF
6822 *.la)
6823 func_basename "$deplib"
6824 name="$func_basename_result"
6825- libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
6826+ func_resolve_sysroot "$deplib"
6827+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result`
6828 test -z "$libdir" && \
6829 func_fatal_error "\`$deplib' is not a valid libtool archive"
6830- newdependency_libs="$newdependency_libs $libdir/$name"
6831+ func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name"
6832+ ;;
6833+ -L*)
6834+ func_stripname -L '' "$deplib"
6835+ func_replace_sysroot "$func_stripname_result"
6836+ func_append newdependency_libs " -L$func_replace_sysroot_result"
6837 ;;
6838- *) newdependency_libs="$newdependency_libs $deplib" ;;
6839+ -R*)
6840+ func_stripname -R '' "$deplib"
6841+ func_replace_sysroot "$func_stripname_result"
6842+ func_append newdependency_libs " -R$func_replace_sysroot_result"
6843+ ;;
6844+ *) func_append newdependency_libs " $deplib" ;;
6845 esac
6846 done
6847 dependency_libs="$newdependency_libs"
6848@@ -8284,12 +9295,14 @@ EOF
6849 *.la)
6850 func_basename "$lib"
6851 name="$func_basename_result"
6852- libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
6853+ func_resolve_sysroot "$lib"
6854+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result`
6855+
6856 test -z "$libdir" && \
6857 func_fatal_error "\`$lib' is not a valid libtool archive"
6858- newdlfiles="$newdlfiles $libdir/$name"
6859+ func_append newdlfiles " ${lt_sysroot:+=}$libdir/$name"
6860 ;;
6861- *) newdlfiles="$newdlfiles $lib" ;;
6862+ *) func_append newdlfiles " $lib" ;;
6863 esac
6864 done
6865 dlfiles="$newdlfiles"
6866@@ -8303,10 +9316,11 @@ EOF
6867 # the library:
6868 func_basename "$lib"
6869 name="$func_basename_result"
6870- libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
6871+ func_resolve_sysroot "$lib"
6872+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result`
6873 test -z "$libdir" && \
6874 func_fatal_error "\`$lib' is not a valid libtool archive"
6875- newdlprefiles="$newdlprefiles $libdir/$name"
6876+ func_append newdlprefiles " ${lt_sysroot:+=}$libdir/$name"
6877 ;;
6878 esac
6879 done
6880@@ -8318,7 +9332,7 @@ EOF
6881 [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
6882 *) abs=`pwd`"/$lib" ;;
6883 esac
6884- newdlfiles="$newdlfiles $abs"
6885+ func_append newdlfiles " $abs"
6886 done
6887 dlfiles="$newdlfiles"
6888 newdlprefiles=
6889@@ -8327,7 +9341,7 @@ EOF
6890 [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
6891 *) abs=`pwd`"/$lib" ;;
6892 esac
6893- newdlprefiles="$newdlprefiles $abs"
6894+ func_append newdlprefiles " $abs"
6895 done
6896 dlprefiles="$newdlprefiles"
6897 fi
6898@@ -8412,7 +9426,7 @@ relink_command=\"$relink_command\""
6899 exit $EXIT_SUCCESS
6900 }
6901
6902-{ test "$mode" = link || test "$mode" = relink; } &&
6903+{ test "$opt_mode" = link || test "$opt_mode" = relink; } &&
6904 func_mode_link ${1+"$@"}
6905
6906
6907@@ -8432,9 +9446,9 @@ func_mode_uninstall ()
6908 for arg
6909 do
6910 case $arg in
6911- -f) RM="$RM $arg"; rmforce=yes ;;
6912- -*) RM="$RM $arg" ;;
6913- *) files="$files $arg" ;;
6914+ -f) func_append RM " $arg"; rmforce=yes ;;
6915+ -*) func_append RM " $arg" ;;
6916+ *) func_append files " $arg" ;;
6917 esac
6918 done
6919
6920@@ -8443,24 +9457,23 @@ func_mode_uninstall ()
6921
6922 rmdirs=
6923
6924- origobjdir="$objdir"
6925 for file in $files; do
6926 func_dirname "$file" "" "."
6927 dir="$func_dirname_result"
6928 if test "X$dir" = X.; then
6929- objdir="$origobjdir"
6930+ odir="$objdir"
6931 else
6932- objdir="$dir/$origobjdir"
6933+ odir="$dir/$objdir"
6934 fi
6935 func_basename "$file"
6936 name="$func_basename_result"
6937- test "$mode" = uninstall && objdir="$dir"
6938+ test "$opt_mode" = uninstall && odir="$dir"
6939
6940- # Remember objdir for removal later, being careful to avoid duplicates
6941- if test "$mode" = clean; then
6942+ # Remember odir for removal later, being careful to avoid duplicates
6943+ if test "$opt_mode" = clean; then
6944 case " $rmdirs " in
6945- *" $objdir "*) ;;
6946- *) rmdirs="$rmdirs $objdir" ;;
6947+ *" $odir "*) ;;
6948+ *) func_append rmdirs " $odir" ;;
6949 esac
6950 fi
6951
6952@@ -8486,18 +9499,17 @@ func_mode_uninstall ()
6953
6954 # Delete the libtool libraries and symlinks.
6955 for n in $library_names; do
6956- rmfiles="$rmfiles $objdir/$n"
6957+ func_append rmfiles " $odir/$n"
6958 done
6959- test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library"
6960+ test -n "$old_library" && func_append rmfiles " $odir/$old_library"
6961
6962- case "$mode" in
6963+ case "$opt_mode" in
6964 clean)
6965- case " $library_names " in
6966- # " " in the beginning catches empty $dlname
6967+ case " $library_names " in
6968 *" $dlname "*) ;;
6969- *) rmfiles="$rmfiles $objdir/$dlname" ;;
6970+ *) test -n "$dlname" && func_append rmfiles " $odir/$dlname" ;;
6971 esac
6972- test -n "$libdir" && rmfiles="$rmfiles $objdir/$name $objdir/${name}i"
6973+ test -n "$libdir" && func_append rmfiles " $odir/$name $odir/${name}i"
6974 ;;
6975 uninstall)
6976 if test -n "$library_names"; then
6977@@ -8525,19 +9537,19 @@ func_mode_uninstall ()
6978 # Add PIC object to the list of files to remove.
6979 if test -n "$pic_object" &&
6980 test "$pic_object" != none; then
6981- rmfiles="$rmfiles $dir/$pic_object"
6982+ func_append rmfiles " $dir/$pic_object"
6983 fi
6984
6985 # Add non-PIC object to the list of files to remove.
6986 if test -n "$non_pic_object" &&
6987 test "$non_pic_object" != none; then
6988- rmfiles="$rmfiles $dir/$non_pic_object"
6989+ func_append rmfiles " $dir/$non_pic_object"
6990 fi
6991 fi
6992 ;;
6993
6994 *)
6995- if test "$mode" = clean ; then
6996+ if test "$opt_mode" = clean ; then
6997 noexename=$name
6998 case $file in
6999 *.exe)
7000@@ -8547,7 +9559,7 @@ func_mode_uninstall ()
7001 noexename=$func_stripname_result
7002 # $file with .exe has already been added to rmfiles,
7003 # add $file without .exe
7004- rmfiles="$rmfiles $file"
7005+ func_append rmfiles " $file"
7006 ;;
7007 esac
7008 # Do a test to see if this is a libtool program.
7009@@ -8556,7 +9568,7 @@ func_mode_uninstall ()
7010 func_ltwrapper_scriptname "$file"
7011 relink_command=
7012 func_source $func_ltwrapper_scriptname_result
7013- rmfiles="$rmfiles $func_ltwrapper_scriptname_result"
7014+ func_append rmfiles " $func_ltwrapper_scriptname_result"
7015 else
7016 relink_command=
7017 func_source $dir/$noexename
7018@@ -8564,12 +9576,12 @@ func_mode_uninstall ()
7019
7020 # note $name still contains .exe if it was in $file originally
7021 # as does the version of $file that was added into $rmfiles
7022- rmfiles="$rmfiles $objdir/$name $objdir/${name}S.${objext}"
7023+ func_append rmfiles " $odir/$name $odir/${name}S.${objext}"
7024 if test "$fast_install" = yes && test -n "$relink_command"; then
7025- rmfiles="$rmfiles $objdir/lt-$name"
7026+ func_append rmfiles " $odir/lt-$name"
7027 fi
7028 if test "X$noexename" != "X$name" ; then
7029- rmfiles="$rmfiles $objdir/lt-${noexename}.c"
7030+ func_append rmfiles " $odir/lt-${noexename}.c"
7031 fi
7032 fi
7033 fi
7034@@ -8577,7 +9589,6 @@ func_mode_uninstall ()
7035 esac
7036 func_show_eval "$RM $rmfiles" 'exit_status=1'
7037 done
7038- objdir="$origobjdir"
7039
7040 # Try to remove the ${objdir}s in the directories where we deleted files
7041 for dir in $rmdirs; do
7042@@ -8589,16 +9600,16 @@ func_mode_uninstall ()
7043 exit $exit_status
7044 }
7045
7046-{ test "$mode" = uninstall || test "$mode" = clean; } &&
7047+{ test "$opt_mode" = uninstall || test "$opt_mode" = clean; } &&
7048 func_mode_uninstall ${1+"$@"}
7049
7050-test -z "$mode" && {
7051+test -z "$opt_mode" && {
7052 help="$generic_help"
7053 func_fatal_help "you must specify a MODE"
7054 }
7055
7056 test -z "$exec_cmd" && \
7057- func_fatal_help "invalid operation mode \`$mode'"
7058+ func_fatal_help "invalid operation mode \`$opt_mode'"
7059
7060 if test -n "$exec_cmd"; then
7061 eval exec "$exec_cmd"
7062diff --git a/ltoptions.m4 b/ltoptions.m4
7063index 5ef12ced2a..17cfd51c0b 100644
7064--- a/ltoptions.m4
7065+++ b/ltoptions.m4
7066@@ -8,7 +8,7 @@
7067 # unlimited permission to copy and/or distribute it, with or without
7068 # modifications, as long as this notice is preserved.
7069
7070-# serial 6 ltoptions.m4
7071+# serial 7 ltoptions.m4
7072
7073 # This is to help aclocal find these macros, as it can't see m4_define.
7074 AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])])
7075diff --git a/ltversion.m4 b/ltversion.m4
7076index bf87f77132..9c7b5d4118 100644
7077--- a/ltversion.m4
7078+++ b/ltversion.m4
7079@@ -7,17 +7,17 @@
7080 # unlimited permission to copy and/or distribute it, with or without
7081 # modifications, as long as this notice is preserved.
7082
7083-# Generated from ltversion.in.
7084+# @configure_input@
7085
7086-# serial 3134 ltversion.m4
7087+# serial 3293 ltversion.m4
7088 # This file is part of GNU Libtool
7089
7090-m4_define([LT_PACKAGE_VERSION], [2.2.7a])
7091-m4_define([LT_PACKAGE_REVISION], [1.3134])
7092+m4_define([LT_PACKAGE_VERSION], [2.4])
7093+m4_define([LT_PACKAGE_REVISION], [1.3293])
7094
7095 AC_DEFUN([LTVERSION_VERSION],
7096-[macro_version='2.2.7a'
7097-macro_revision='1.3134'
7098+[macro_version='2.4'
7099+macro_revision='1.3293'
7100 _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
7101 _LT_DECL(, macro_revision, 0)
7102 ])
7103diff --git a/lt~obsolete.m4 b/lt~obsolete.m4
7104index bf92b5e079..c573da90c5 100644
7105--- a/lt~obsolete.m4
7106+++ b/lt~obsolete.m4
7107@@ -7,7 +7,7 @@
7108 # unlimited permission to copy and/or distribute it, with or without
7109 # modifications, as long as this notice is preserved.
7110
7111-# serial 4 lt~obsolete.m4
7112+# serial 5 lt~obsolete.m4
7113
7114 # These exist entirely to fool aclocal when bootstrapping libtool.
7115 #
diff --git a/meta/recipes-devtools/binutils/binutils/0007-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch b/meta/recipes-devtools/binutils/binutils/0008-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch
index 5a195054f6..b0e94ab1cb 100644
--- a/meta/recipes-devtools/binutils/binutils/0007-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch
+++ b/meta/recipes-devtools/binutils/binutils/0008-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch
@@ -1,4 +1,4 @@
1From cd6151c8423a0550fd5758ce17664e34560a103c Mon Sep 17 00:00:00 2001 1From e36a4e05f900bbe6a8d744a93f3a407bc55c96f7 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 2 Mar 2015 01:39:01 +0000 3Date: Mon, 2 Mar 2015 01:39:01 +0000
4Subject: [PATCH] don't let the distro compiler point to the wrong installation 4Subject: [PATCH] don't let the distro compiler point to the wrong installation
@@ -17,10 +17,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
17 1 file changed, 2 insertions(+), 1 deletion(-) 17 1 file changed, 2 insertions(+), 1 deletion(-)
18 18
19diff --git a/libiberty/Makefile.in b/libiberty/Makefile.in 19diff --git a/libiberty/Makefile.in b/libiberty/Makefile.in
20index 0be45b4ae8..4817616bb2 100644 20index fe738d0db4..27d818f253 100644
21--- a/libiberty/Makefile.in 21--- a/libiberty/Makefile.in
22+++ b/libiberty/Makefile.in 22+++ b/libiberty/Makefile.in
23@@ -364,7 +364,8 @@ install-strip: install 23@@ -365,7 +365,8 @@ install-strip: install
24 # multilib-specific flags, it's overridden by FLAGS_TO_PASS from the 24 # multilib-specific flags, it's overridden by FLAGS_TO_PASS from the
25 # default multilib, so we have to take CFLAGS into account as well, 25 # default multilib, so we have to take CFLAGS into account as well,
26 # since it will be passed the multilib flags. 26 # since it will be passed the multilib flags.
diff --git a/meta/recipes-devtools/binutils/binutils/0008-warn-for-uses-of-system-directories-when-cross-linki.patch b/meta/recipes-devtools/binutils/binutils/0009-warn-for-uses-of-system-directories-when-cross-linki.patch
index 655cc375a9..11a8110d40 100644
--- a/meta/recipes-devtools/binutils/binutils/0008-warn-for-uses-of-system-directories-when-cross-linki.patch
+++ b/meta/recipes-devtools/binutils/binutils/0009-warn-for-uses-of-system-directories-when-cross-linki.patch
@@ -1,4 +1,4 @@
1From 8ee1a4986ea35bd1e8ab867c5639d5fdbd944d9f Mon Sep 17 00:00:00 2001 1From 7b24f81e04c9d00d96de7dbd250beade6d2c6e44 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 15 Jan 2016 06:31:09 +0000 3Date: Fri, 15 Jan 2016 06:31:09 +0000
4Subject: [PATCH] warn for uses of system directories when cross linking 4Subject: [PATCH] warn for uses of system directories when cross linking
@@ -59,9 +59,11 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
59 ld/ldfile.c | 17 +++++++++++++++++ 59 ld/ldfile.c | 17 +++++++++++++++++
60 ld/ldlex.h | 2 ++ 60 ld/ldlex.h | 2 ++
61 ld/ldmain.c | 2 ++ 61 ld/ldmain.c | 2 ++
62 ld/lexsup.c | 16 ++++++++++++++++ 62 ld/lexsup.c | 15 +++++++++++++++
63 9 files changed, 86 insertions(+) 63 9 files changed, 85 insertions(+)
64 64
65diff --git a/ld/config.in b/ld/config.in
66index d93c9b0830..5da2742bea 100644
65--- a/ld/config.in 67--- a/ld/config.in
66+++ b/ld/config.in 68+++ b/ld/config.in
67@@ -31,6 +31,9 @@ 69@@ -31,6 +31,9 @@
@@ -74,9 +76,11 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
74 /* Additional extension a shared object might have. */ 76 /* Additional extension a shared object might have. */
75 #undef EXTRA_SHLIB_EXTENSION 77 #undef EXTRA_SHLIB_EXTENSION
76 78
79diff --git a/ld/configure b/ld/configure
80index 811134a503..f8c17c19ae 100755
77--- a/ld/configure 81--- a/ld/configure
78+++ b/ld/configure 82+++ b/ld/configure
79@@ -827,6 +827,7 @@ with_lib_path 83@@ -826,6 +826,7 @@ with_lib_path
80 enable_targets 84 enable_targets
81 enable_64_bit_bfd 85 enable_64_bit_bfd
82 with_sysroot 86 with_sysroot
@@ -93,7 +97,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
93 --enable-gold[=ARG] build gold [ARG={default,yes,no}] 97 --enable-gold[=ARG] build gold [ARG={default,yes,no}]
94 --enable-got=<type> GOT handling scheme (target, single, negative, 98 --enable-got=<type> GOT handling scheme (target, single, negative,
95 multigot) 99 multigot)
96@@ -16619,6 +16622,19 @@ fi 100@@ -15788,6 +15791,19 @@ fi
97 101
98 102
99 103
@@ -113,6 +117,8 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
113 # Check whether --enable-gold was given. 117 # Check whether --enable-gold was given.
114 if test "${enable_gold+set}" = set; then : 118 if test "${enable_gold+set}" = set; then :
115 enableval=$enable_gold; case "${enableval}" in 119 enableval=$enable_gold; case "${enableval}" in
120diff --git a/ld/configure.ac b/ld/configure.ac
121index b5e849d84a..22e022ec03 100644
116--- a/ld/configure.ac 122--- a/ld/configure.ac
117+++ b/ld/configure.ac 123+++ b/ld/configure.ac
118@@ -94,6 +94,16 @@ AC_SUBST(use_sysroot) 124@@ -94,6 +94,16 @@ AC_SUBST(use_sysroot)
@@ -132,9 +138,11 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
132 dnl Use --enable-gold to decide if this linker should be the default. 138 dnl Use --enable-gold to decide if this linker should be the default.
133 dnl "install_as_default" is set to false if gold is the default linker. 139 dnl "install_as_default" is set to false if gold is the default linker.
134 dnl "installed_linker" is the installed BFD linker name. 140 dnl "installed_linker" is the installed BFD linker name.
141diff --git a/ld/ld.h b/ld/ld.h
142index 71fd781267..5c7843100b 100644
135--- a/ld/ld.h 143--- a/ld/ld.h
136+++ b/ld/ld.h 144+++ b/ld/ld.h
137@@ -180,6 +180,14 @@ typedef struct 145@@ -166,6 +166,14 @@ typedef struct
138 in the linker script. */ 146 in the linker script. */
139 bfd_boolean force_group_allocation; 147 bfd_boolean force_group_allocation;
140 148
@@ -149,9 +157,11 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
149 /* Big or little endian as set on command line. */ 157 /* Big or little endian as set on command line. */
150 enum endian_enum endian; 158 enum endian_enum endian;
151 159
160diff --git a/ld/ld.texi b/ld/ld.texi
161index eb7bcb9933..3c73d445a0 100644
152--- a/ld/ld.texi 162--- a/ld/ld.texi
153+++ b/ld/ld.texi 163+++ b/ld/ld.texi
154@@ -2557,6 +2557,18 @@ string identifying the original linked f 164@@ -2551,6 +2551,18 @@ string identifying the original linked file does not change.
155 165
156 Passing @code{none} for @var{style} disables the setting from any 166 Passing @code{none} for @var{style} disables the setting from any
157 @code{--build-id} options earlier on the command line. 167 @code{--build-id} options earlier on the command line.
@@ -170,9 +180,11 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
170 @end table 180 @end table
171 181
172 @c man end 182 @c man end
183diff --git a/ld/ldfile.c b/ld/ldfile.c
184index 411f7ddf97..17db16c2cc 100644
173--- a/ld/ldfile.c 185--- a/ld/ldfile.c
174+++ b/ld/ldfile.c 186+++ b/ld/ldfile.c
175@@ -116,6 +116,23 @@ ldfile_add_library_path (const char *nam 187@@ -117,6 +117,23 @@ ldfile_add_library_path (const char *name, bfd_boolean cmdline)
176 new_dirs->name = concat (ld_sysroot, name + strlen ("$SYSROOT"), (const char *) NULL); 188 new_dirs->name = concat (ld_sysroot, name + strlen ("$SYSROOT"), (const char *) NULL);
177 else 189 else
178 new_dirs->name = xstrdup (name); 190 new_dirs->name = xstrdup (name);
@@ -196,6 +208,8 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
196 } 208 }
197 209
198 /* Try to open a BFD for a lang_input_statement. */ 210 /* Try to open a BFD for a lang_input_statement. */
211diff --git a/ld/ldlex.h b/ld/ldlex.h
212index 5287f19a7f..55096e4fc9 100644
199--- a/ld/ldlex.h 213--- a/ld/ldlex.h
200+++ b/ld/ldlex.h 214+++ b/ld/ldlex.h
201@@ -150,6 +150,8 @@ enum option_values 215@@ -150,6 +150,8 @@ enum option_values
@@ -207,9 +221,11 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
207 }; 221 };
208 222
209 /* The initial parser states. */ 223 /* The initial parser states. */
224diff --git a/ld/ldmain.c b/ld/ldmain.c
225index da1ad17763..12d0b07d8a 100644
210--- a/ld/ldmain.c 226--- a/ld/ldmain.c
211+++ b/ld/ldmain.c 227+++ b/ld/ldmain.c
212@@ -270,6 +270,8 @@ main (int argc, char **argv) 228@@ -274,6 +274,8 @@ main (int argc, char **argv)
213 command_line.warn_mismatch = TRUE; 229 command_line.warn_mismatch = TRUE;
214 command_line.warn_search_mismatch = TRUE; 230 command_line.warn_search_mismatch = TRUE;
215 command_line.check_section_addresses = -1; 231 command_line.check_section_addresses = -1;
@@ -218,9 +234,11 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
218 234
219 /* We initialize DEMANGLING based on the environment variable 235 /* We initialize DEMANGLING based on the environment variable
220 COLLECT_NO_DEMANGLE. The gcc collect2 program will demangle the 236 COLLECT_NO_DEMANGLE. The gcc collect2 program will demangle the
237diff --git a/ld/lexsup.c b/ld/lexsup.c
238index 3d15cc491d..0e8b4f2b7a 100644
221--- a/ld/lexsup.c 239--- a/ld/lexsup.c
222+++ b/ld/lexsup.c 240+++ b/ld/lexsup.c
223@@ -549,6 +549,14 @@ static const struct ld_option ld_options 241@@ -550,6 +550,14 @@ static const struct ld_option ld_options[] =
224 { {"no-print-map-discarded", no_argument, NULL, OPTION_NO_PRINT_MAP_DISCARDED}, 242 { {"no-print-map-discarded", no_argument, NULL, OPTION_NO_PRINT_MAP_DISCARDED},
225 '\0', NULL, N_("Do not show discarded sections in map file output"), 243 '\0', NULL, N_("Do not show discarded sections in map file output"),
226 TWO_DASHES }, 244 TWO_DASHES },
@@ -235,7 +253,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
235 }; 253 };
236 254
237 #define OPTION_COUNT ARRAY_SIZE (ld_options) 255 #define OPTION_COUNT ARRAY_SIZE (ld_options)
238@@ -1590,6 +1598,13 @@ parse_args (unsigned argc, char **argv) 256@@ -1603,6 +1611,13 @@ parse_args (unsigned argc, char **argv)
239 257
240 case OPTION_PRINT_MAP_DISCARDED: 258 case OPTION_PRINT_MAP_DISCARDED:
241 config.print_map_discarded = TRUE; 259 config.print_map_discarded = TRUE;
diff --git a/meta/recipes-devtools/binutils/binutils/0009-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch b/meta/recipes-devtools/binutils/binutils/0010-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch
index e63d278bcd..f4f1a068cb 100644
--- a/meta/recipes-devtools/binutils/binutils/0009-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch
+++ b/meta/recipes-devtools/binutils/binutils/0010-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch
@@ -1,4 +1,4 @@
1From 903a43f07b7229adadff0f01d560646eb4b0e200 Mon Sep 17 00:00:00 2001 1From 70f3f2d9e912ea777fa113e02cdbc3465a66e40d Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 2 Mar 2015 01:42:38 +0000 3Date: Mon, 2 Mar 2015 01:42:38 +0000
4Subject: [PATCH] Fix rpath in libtool when sysroot is enabled 4Subject: [PATCH] Fix rpath in libtool when sysroot is enabled
diff --git a/meta/recipes-devtools/binutils/binutils/0010-Change-default-emulation-for-mips64-linux.patch b/meta/recipes-devtools/binutils/binutils/0011-Change-default-emulation-for-mips64-linux.patch
index e6b50dbcde..c49b8e863f 100644
--- a/meta/recipes-devtools/binutils/binutils/0010-Change-default-emulation-for-mips64-linux.patch
+++ b/meta/recipes-devtools/binutils/binutils/0011-Change-default-emulation-for-mips64-linux.patch
@@ -1,4 +1,4 @@
1From 84349ede307f61d624e5d97397074f5177a5bdc9 Mon Sep 17 00:00:00 2001 1From 2182791a453f34bee6968b3e72848608cf7d7abe Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 2 Mar 2015 01:44:14 +0000 3Date: Mon, 2 Mar 2015 01:44:14 +0000
4Subject: [PATCH] Change default emulation for mips64*-*-linux 4Subject: [PATCH] Change default emulation for mips64*-*-linux
@@ -13,9 +13,11 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
13 ld/configure.tgt | 8 ++++---- 13 ld/configure.tgt | 8 ++++----
14 2 files changed, 8 insertions(+), 8 deletions(-) 14 2 files changed, 8 insertions(+), 8 deletions(-)
15 15
16diff --git a/bfd/config.bfd b/bfd/config.bfd
17index b96931f52e..847f9f0ba9 100644
16--- a/bfd/config.bfd 18--- a/bfd/config.bfd
17+++ b/bfd/config.bfd 19+++ b/bfd/config.bfd
18@@ -915,12 +915,12 @@ case "${targ}" in 20@@ -911,12 +911,12 @@ case "${targ}" in
19 targ_selvecs="mips_elf32_le_vec mips_elf64_be_vec mips_elf64_le_vec mips_ecoff_be_vec mips_ecoff_le_vec" 21 targ_selvecs="mips_elf32_le_vec mips_elf64_be_vec mips_elf64_le_vec mips_ecoff_be_vec mips_ecoff_le_vec"
20 ;; 22 ;;
21 mips64*el-*-linux*) 23 mips64*el-*-linux*)
@@ -32,21 +34,24 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
32 ;; 34 ;;
33 mips*el-*-linux*) 35 mips*el-*-linux*)
34 targ_defvec=mips_elf32_trad_le_vec 36 targ_defvec=mips_elf32_trad_le_vec
37diff --git a/ld/configure.tgt b/ld/configure.tgt
38index 23194e357f..f4f0eaf9b2 100644
35--- a/ld/configure.tgt 39--- a/ld/configure.tgt
36+++ b/ld/configure.tgt 40+++ b/ld/configure.tgt
37@@ -468,11 +468,11 @@ mips*el-*-vxworks*) targ_emul=elf32elmip 41@@ -541,12 +541,12 @@ mips*-*-vxworks*) targ_emul=elf32ebmipvxworks
38 mips*-*-vxworks*) targ_emul=elf32ebmipvxworks 42 ;;
39 targ_extra_emuls="elf32elmipvxworks" ;; 43 mips*-*-windiss) targ_emul=elf32mipswindiss
40 mips*-*-windiss) targ_emul=elf32mipswindiss ;; 44 ;;
41-mips64*el-*-linux-*) targ_emul=elf32ltsmipn32 45-mips64*el-*-linux-*) targ_emul=elf32ltsmipn32
42- targ_extra_emuls="elf32btsmipn32 elf32ltsmip elf32btsmip elf64ltsmip elf64btsmip" 46- targ_extra_emuls="elf32btsmipn32 elf32ltsmip elf32btsmip elf64ltsmip elf64btsmip"
43+mips64*el-*-linux-*) targ_emul=elf64ltsmip 47+mips64*el-*-linux-*) targ_emul=elf64ltsmip
44+ targ_extra_emuls="elf32btsmipn32 elf32ltsmipn32 elf32ltsmip elf32btsmip elf64btsmip" 48+ targ_extra_emuls="elf32btsmipn32 elf32ltsmipn32 elf32ltsmip elf32btsmip elf64btsmip"
45 targ_extra_libpath=$targ_extra_emuls ;; 49 targ_extra_libpath=$targ_extra_emuls
50 ;;
46-mips64*-*-linux-*) targ_emul=elf32btsmipn32 51-mips64*-*-linux-*) targ_emul=elf32btsmipn32
47- targ_extra_emuls="elf32ltsmipn32 elf32btsmip elf32ltsmip elf64btsmip elf64ltsmip" 52- targ_extra_emuls="elf32ltsmipn32 elf32btsmip elf32ltsmip elf64btsmip elf64ltsmip"
48+mips64*-*-linux-*) targ_emul=elf64btsmip 53+mips64*-*-linux-*) targ_emul=elf64btsmip
49+ targ_extra_emuls="elf32btsmipn32 elf32ltsmipn32 elf32btsmip elf32ltsmip elf64ltsmip" 54+ targ_extra_emuls="elf32btsmipn32 elf32ltsmipn32 elf32btsmip elf32ltsmip elf64ltsmip"
50 targ_extra_libpath=$targ_extra_emuls ;; 55 targ_extra_libpath=$targ_extra_emuls
56 ;;
51 mips*el-*-linux-*) targ_emul=elf32ltsmip 57 mips*el-*-linux-*) targ_emul=elf32ltsmip
52 targ_extra_emuls="elf32btsmip elf32ltsmipn32 elf64ltsmip elf32btsmipn32 elf64btsmip"
diff --git a/meta/recipes-devtools/binutils/binutils/0011-Add-support-for-Netlogic-XLP.patch b/meta/recipes-devtools/binutils/binutils/0012-Add-support-for-Netlogic-XLP.patch
index b710752245..c32867a238 100644
--- a/meta/recipes-devtools/binutils/binutils/0011-Add-support-for-Netlogic-XLP.patch
+++ b/meta/recipes-devtools/binutils/binutils/0012-Add-support-for-Netlogic-XLP.patch
@@ -1,4 +1,4 @@
1From 97e0fdbf8e85a7e690ac09d01a2ae93ba00cfb5d Mon Sep 17 00:00:00 2001 1From a0237ec2d1e58bd35c236df39dd5a06504c6d2ed Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Sun, 14 Feb 2016 17:06:19 +0000 3Date: Sun, 14 Feb 2016 17:06:19 +0000
4Subject: [PATCH] Add support for Netlogic XLP 4Subject: [PATCH] Add support for Netlogic XLP
@@ -26,16 +26,19 @@ Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
26 binutils/readelf.c | 1 + 26 binutils/readelf.c | 1 +
27 gas/config/tc-mips.c | 4 +++- 27 gas/config/tc-mips.c | 4 +++-
28 gas/configure | 3 +++ 28 gas/configure | 3 +++
29 gas/configure.ac | 3 +++
29 include/elf/mips.h | 1 + 30 include/elf/mips.h | 1 +
30 include/opcode/mips.h | 6 ++++++ 31 include/opcode/mips.h | 6 ++++++
31 ld/configure.tgt | 3 +++ 32 ld/configure.tgt | 3 +++
32 opcodes/mips-dis.c | 12 +++++------- 33 opcodes/mips-dis.c | 12 +++++-------
33 opcodes/mips-opc.c | 31 ++++++++++++++++++++----------- 34 opcodes/mips-opc.c | 31 ++++++++++++++++++++-----------
34 14 files changed, 62 insertions(+), 21 deletions(-) 35 15 files changed, 65 insertions(+), 21 deletions(-)
35 36
37diff --git a/bfd/aoutx.h b/bfd/aoutx.h
38index fa3a9746b6..5078024fd5 100644
36--- a/bfd/aoutx.h 39--- a/bfd/aoutx.h
37+++ b/bfd/aoutx.h 40+++ b/bfd/aoutx.h
38@@ -799,6 +799,7 @@ NAME (aout, machine_type) (enum bfd_arch 41@@ -799,6 +799,7 @@ NAME (aout, machine_type) (enum bfd_architecture arch,
39 case bfd_mach_mipsisa64r6: 42 case bfd_mach_mipsisa64r6:
40 case bfd_mach_mips_sb1: 43 case bfd_mach_mips_sb1:
41 case bfd_mach_mips_xlr: 44 case bfd_mach_mips_xlr:
@@ -43,6 +46,8 @@ Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
43 /* FIXME: These should be MIPS3, MIPS4, MIPS16, MIPS32, etc. */ 46 /* FIXME: These should be MIPS3, MIPS4, MIPS16, MIPS32, etc. */
44 arch_flags = M_MIPS2; 47 arch_flags = M_MIPS2;
45 break; 48 break;
49diff --git a/bfd/archures.c b/bfd/archures.c
50index 232103817c..b2b3b8c124 100644
46--- a/bfd/archures.c 51--- a/bfd/archures.c
47+++ b/bfd/archures.c 52+++ b/bfd/archures.c
48@@ -185,6 +185,7 @@ DESCRIPTION 53@@ -185,6 +185,7 @@ DESCRIPTION
@@ -53,9 +58,11 @@ Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
53 .#define bfd_mach_mipsisa32 32 58 .#define bfd_mach_mipsisa32 32
54 .#define bfd_mach_mipsisa32r2 33 59 .#define bfd_mach_mipsisa32r2 33
55 .#define bfd_mach_mipsisa32r3 34 60 .#define bfd_mach_mipsisa32r3 34
61diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h
62index 7c13bc8c91..2e453c50c1 100644
56--- a/bfd/bfd-in2.h 63--- a/bfd/bfd-in2.h
57+++ b/bfd/bfd-in2.h 64+++ b/bfd/bfd-in2.h
58@@ -2125,6 +2125,7 @@ enum bfd_architecture 65@@ -1568,6 +1568,7 @@ enum bfd_architecture
59 #define bfd_mach_mips_octeon3 6503 66 #define bfd_mach_mips_octeon3 6503
60 #define bfd_mach_mips_xlr 887682 /* decimal 'XLR'. */ 67 #define bfd_mach_mips_xlr 887682 /* decimal 'XLR'. */
61 #define bfd_mach_mips_interaptiv_mr2 736550 /* decimal 'IA2'. */ 68 #define bfd_mach_mips_interaptiv_mr2 736550 /* decimal 'IA2'. */
@@ -63,9 +70,11 @@ Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
63 #define bfd_mach_mipsisa32 32 70 #define bfd_mach_mipsisa32 32
64 #define bfd_mach_mipsisa32r2 33 71 #define bfd_mach_mipsisa32r2 33
65 #define bfd_mach_mipsisa32r3 34 72 #define bfd_mach_mipsisa32r3 34
73diff --git a/bfd/config.bfd b/bfd/config.bfd
74index 847f9f0ba9..a12707f827 100644
66--- a/bfd/config.bfd 75--- a/bfd/config.bfd
67+++ b/bfd/config.bfd 76+++ b/bfd/config.bfd
68@@ -898,6 +898,11 @@ case "${targ}" in 77@@ -894,6 +894,11 @@ case "${targ}" in
69 targ_defvec=mips_elf32_le_vec 78 targ_defvec=mips_elf32_le_vec
70 targ_selvecs="mips_elf32_be_vec mips_elf64_be_vec mips_elf64_le_vec" 79 targ_selvecs="mips_elf32_be_vec mips_elf64_be_vec mips_elf64_le_vec"
71 ;; 80 ;;
@@ -77,9 +86,11 @@ Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
77 mips*-*-elf* | mips*-*-rtems* | mips*-*-windiss | mips*-*-none) 86 mips*-*-elf* | mips*-*-rtems* | mips*-*-windiss | mips*-*-none)
78 targ_defvec=mips_elf32_be_vec 87 targ_defvec=mips_elf32_be_vec
79 targ_selvecs="mips_elf32_le_vec mips_elf64_be_vec mips_elf64_le_vec" 88 targ_selvecs="mips_elf32_le_vec mips_elf64_be_vec mips_elf64_le_vec"
89diff --git a/bfd/cpu-mips.c b/bfd/cpu-mips.c
90index 802acb45f1..fd9ec4c0ad 100644
80--- a/bfd/cpu-mips.c 91--- a/bfd/cpu-mips.c
81+++ b/bfd/cpu-mips.c 92+++ b/bfd/cpu-mips.c
82@@ -107,7 +107,8 @@ enum 93@@ -108,7 +108,8 @@ enum
83 I_mipsocteon3, 94 I_mipsocteon3,
84 I_xlr, 95 I_xlr,
85 I_interaptiv_mr2, 96 I_interaptiv_mr2,
@@ -89,16 +100,18 @@ Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
89 }; 100 };
90 101
91 #define NN(index) (&arch_info_struct[(index) + 1]) 102 #define NN(index) (&arch_info_struct[(index) + 1])
92@@ -162,7 +163,8 @@ static const bfd_arch_info_type arch_inf 103@@ -163,7 +164,8 @@ static const bfd_arch_info_type arch_info_struct[] =
93 N (64, 64, bfd_mach_mips_xlr, "mips:xlr", FALSE, NN(I_xlr)), 104 N (64, 64, bfd_mach_mips_xlr, "mips:xlr", FALSE, NN(I_xlr)),
94 N (32, 32, bfd_mach_mips_interaptiv_mr2, "mips:interaptiv-mr2", FALSE, 105 N (32, 32, bfd_mach_mips_interaptiv_mr2, "mips:interaptiv-mr2", FALSE,
95 NN(I_interaptiv_mr2)), 106 NN(I_interaptiv_mr2)),
96- N (64, 64, bfd_mach_mips_micromips,"mips:micromips",FALSE,0) 107- N (64, 64, bfd_mach_mips_micromips, "mips:micromips", FALSE, NULL)
97+ N (64, 64, bfd_mach_mips_micromips, "mips:micromips", FALSE, NN(I_micromips)), 108+ N (64, 64, bfd_mach_mips_micromips, "mips:micromips", FALSE, NN(I_micromips)),
98+ N (64, 64, bfd_mach_mips_xlp, "mips:xlp", FALSE, NULL) 109+ N (64, 64, bfd_mach_mips_xlp, "mips:xlp", FALSE, NULL)
99 }; 110 };
100 111
101 /* The default architecture is mips:3000, but with a machine number of 112 /* The default architecture is mips:3000, but with a machine number of
113diff --git a/bfd/elfxx-mips.c b/bfd/elfxx-mips.c
114index d7e3aed3b6..7baeee9ee3 100644
102--- a/bfd/elfxx-mips.c 115--- a/bfd/elfxx-mips.c
103+++ b/bfd/elfxx-mips.c 116+++ b/bfd/elfxx-mips.c
104@@ -6999,6 +6999,9 @@ _bfd_elf_mips_mach (flagword flags) 117@@ -6999,6 +6999,9 @@ _bfd_elf_mips_mach (flagword flags)
@@ -111,7 +124,7 @@ Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
111 default: 124 default:
112 switch (flags & EF_MIPS_ARCH) 125 switch (flags & EF_MIPS_ARCH)
113 { 126 {
114@@ -12360,6 +12363,10 @@ mips_set_isa_flags (bfd *abfd) 127@@ -12355,6 +12358,10 @@ mips_set_isa_flags (bfd *abfd)
115 val = E_MIPS_ARCH_64R2 | E_MIPS_MACH_OCTEON2; 128 val = E_MIPS_ARCH_64R2 | E_MIPS_MACH_OCTEON2;
116 break; 129 break;
117 130
@@ -122,7 +135,7 @@ Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
122 case bfd_mach_mipsisa32: 135 case bfd_mach_mipsisa32:
123 val = E_MIPS_ARCH_32; 136 val = E_MIPS_ARCH_32;
124 break; 137 break;
125@@ -14394,6 +14401,7 @@ static const struct mips_mach_extension 138@@ -14379,6 +14386,7 @@ static const struct mips_mach_extension mips_mach_extensions[] =
126 { bfd_mach_mips_gs264e, bfd_mach_mips_gs464e }, 139 { bfd_mach_mips_gs264e, bfd_mach_mips_gs464e },
127 { bfd_mach_mips_gs464e, bfd_mach_mips_gs464 }, 140 { bfd_mach_mips_gs464e, bfd_mach_mips_gs464 },
128 { bfd_mach_mips_gs464, bfd_mach_mipsisa64r2 }, 141 { bfd_mach_mips_gs464, bfd_mach_mipsisa64r2 },
@@ -130,9 +143,11 @@ Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
130 143
131 /* MIPS64 extensions. */ 144 /* MIPS64 extensions. */
132 { bfd_mach_mipsisa64r2, bfd_mach_mipsisa64 }, 145 { bfd_mach_mipsisa64r2, bfd_mach_mipsisa64 },
146diff --git a/binutils/readelf.c b/binutils/readelf.c
147index 6b5bebe743..d15a7828db 100644
133--- a/binutils/readelf.c 148--- a/binutils/readelf.c
134+++ b/binutils/readelf.c 149+++ b/binutils/readelf.c
135@@ -3446,6 +3446,7 @@ get_machine_flags (Filedata * filedata, 150@@ -3440,6 +3440,7 @@ get_machine_flags (Filedata * filedata, unsigned e_flags, unsigned e_machine)
136 case E_MIPS_MACH_OCTEON3: strcat (buf, ", octeon3"); break; 151 case E_MIPS_MACH_OCTEON3: strcat (buf, ", octeon3"); break;
137 case E_MIPS_MACH_XLR: strcat (buf, ", xlr"); break; 152 case E_MIPS_MACH_XLR: strcat (buf, ", xlr"); break;
138 case E_MIPS_MACH_IAMR2: strcat (buf, ", interaptiv-mr2"); break; 153 case E_MIPS_MACH_IAMR2: strcat (buf, ", interaptiv-mr2"); break;
@@ -140,6 +155,8 @@ Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
140 case 0: 155 case 0:
141 /* We simply ignore the field in this case to avoid confusion: 156 /* We simply ignore the field in this case to avoid confusion:
142 MIPS ELF does not specify EF_MIPS_MACH, it is a GNU 157 MIPS ELF does not specify EF_MIPS_MACH, it is a GNU
158diff --git a/gas/config/tc-mips.c b/gas/config/tc-mips.c
159index fc6898834e..2c7151ccdb 100644
143--- a/gas/config/tc-mips.c 160--- a/gas/config/tc-mips.c
144+++ b/gas/config/tc-mips.c 161+++ b/gas/config/tc-mips.c
145@@ -568,6 +568,7 @@ static int mips_32bitmode = 0; 162@@ -568,6 +568,7 @@ static int mips_32bitmode = 0;
@@ -158,7 +175,7 @@ Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
158 ) 175 )
159 176
160 /* Whether the processor uses hardware interlocks to protect reads 177 /* Whether the processor uses hardware interlocks to protect reads
161@@ -20138,7 +20140,7 @@ static const struct mips_cpu_info mips_c 178@@ -20135,7 +20137,7 @@ static const struct mips_cpu_info mips_cpu_info_table[] =
162 /* Broadcom XLP. 179 /* Broadcom XLP.
163 XLP is mostly like XLR, with the prominent exception that it is 180 XLP is mostly like XLR, with the prominent exception that it is
164 MIPS64R2 rather than MIPS64. */ 181 MIPS64R2 rather than MIPS64. */
@@ -167,18 +184,36 @@ Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
167 184
168 /* MIPS 64 Release 6. */ 185 /* MIPS 64 Release 6. */
169 { "i6400", 0, ASE_VIRT | ASE_MSA, ISA_MIPS64R6, CPU_MIPS64R6}, 186 { "i6400", 0, ASE_VIRT | ASE_MSA, ISA_MIPS64R6, CPU_MIPS64R6},
187diff --git a/gas/configure b/gas/configure
188index 60c1a055ae..59d6d11215 100755
170--- a/gas/configure 189--- a/gas/configure
171+++ b/gas/configure 190+++ b/gas/configure
172@@ -13377,6 +13377,9 @@ _ACEOF 191@@ -12722,6 +12722,9 @@ _ACEOF
173 mipsisa64r6 | mipsisa64r6el) 192 mipsisa64r6 | mipsisa64r6el)
174 mips_cpu=mips64r6 193 mips_cpu=mips64r6
175 ;; 194 ;;
176+ mipsisa64r2nlm | mipsisa64r2nlmel) 195+ mipsisa64r2nlm | mipsisa64r2nlmel)
177+ mips_cpu=xlp 196+ mips_cpu=xlp
178+ ;; 197+ ;;
179 mipstx39 | mipstx39el) 198 mipstx39 | mipstx39el)
180 mips_cpu=r3900 199 mips_cpu=r3900
181 ;; 200 ;;
201diff --git a/gas/configure.ac b/gas/configure.ac
202index 6f32e55a1a..11c2e0d273 100644
203--- a/gas/configure.ac
204+++ b/gas/configure.ac
205@@ -325,6 +325,9 @@ changequote([,])dnl
206 mipsisa64r6 | mipsisa64r6el)
207 mips_cpu=mips64r6
208 ;;
209+ mipsisa64r2nlm | mipsisa64r2nlmel)
210+ mips_cpu=xlp
211+ ;;
212 mipstx39 | mipstx39el)
213 mips_cpu=r3900
214 ;;
215diff --git a/include/elf/mips.h b/include/elf/mips.h
216index d116b036b6..dceeb3f156 100644
182--- a/include/elf/mips.h 217--- a/include/elf/mips.h
183+++ b/include/elf/mips.h 218+++ b/include/elf/mips.h
184@@ -290,6 +290,7 @@ END_RELOC_NUMBERS (R_MIPS_maxext) 219@@ -290,6 +290,7 @@ END_RELOC_NUMBERS (R_MIPS_maxext)
@@ -189,9 +224,11 @@ Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
189 #define E_MIPS_MACH_OCTEON2 0x008d0000 224 #define E_MIPS_MACH_OCTEON2 0x008d0000
190 #define E_MIPS_MACH_OCTEON3 0x008e0000 225 #define E_MIPS_MACH_OCTEON3 0x008e0000
191 #define E_MIPS_MACH_5400 0x00910000 226 #define E_MIPS_MACH_5400 0x00910000
227diff --git a/include/opcode/mips.h b/include/opcode/mips.h
228index fd031f3758..a96a44df84 100644
192--- a/include/opcode/mips.h 229--- a/include/opcode/mips.h
193+++ b/include/opcode/mips.h 230+++ b/include/opcode/mips.h
194@@ -1260,6 +1260,8 @@ static const unsigned int mips_isa_table 231@@ -1260,6 +1260,8 @@ static const unsigned int mips_isa_table[] = {
195 #define INSN_XLR 0x00000020 232 #define INSN_XLR 0x00000020
196 /* Imagination interAptiv MR2. */ 233 /* Imagination interAptiv MR2. */
197 #define INSN_INTERAPTIV_MR2 0x04000000 234 #define INSN_INTERAPTIV_MR2 0x04000000
@@ -200,7 +237,7 @@ Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
200 237
201 /* DSP ASE */ 238 /* DSP ASE */
202 #define ASE_DSP 0x00000001 239 #define ASE_DSP 0x00000001
203@@ -1384,6 +1386,7 @@ static const unsigned int mips_isa_table 240@@ -1384,6 +1386,7 @@ static const unsigned int mips_isa_table[] = {
204 #define CPU_OCTEON3 6503 241 #define CPU_OCTEON3 6503
205 #define CPU_XLR 887682 /* decimal 'XLR' */ 242 #define CPU_XLR 887682 /* decimal 'XLR' */
206 #define CPU_INTERAPTIV_MR2 736550 /* decimal 'IA2' */ 243 #define CPU_INTERAPTIV_MR2 736550 /* decimal 'IA2' */
@@ -208,7 +245,7 @@ Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
208 245
209 /* Return true if the given CPU is included in INSN_* mask MASK. */ 246 /* Return true if the given CPU is included in INSN_* mask MASK. */
210 247
211@@ -1461,6 +1464,9 @@ cpu_is_member (int cpu, unsigned int mas 248@@ -1461,6 +1464,9 @@ cpu_is_member (int cpu, unsigned int mask)
212 return ((mask & INSN_ISA_MASK) == INSN_ISA32R6) 249 return ((mask & INSN_ISA_MASK) == INSN_ISA32R6)
213 || ((mask & INSN_ISA_MASK) == INSN_ISA64R6); 250 || ((mask & INSN_ISA_MASK) == INSN_ISA64R6);
214 251
@@ -218,20 +255,25 @@ Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
218 default: 255 default:
219 return FALSE; 256 return FALSE;
220 } 257 }
258diff --git a/ld/configure.tgt b/ld/configure.tgt
259index f4f0eaf9b2..0da3eca19c 100644
221--- a/ld/configure.tgt 260--- a/ld/configure.tgt
222+++ b/ld/configure.tgt 261+++ b/ld/configure.tgt
223@@ -454,6 +454,8 @@ mips*el-sde-elf* | mips*el-mti-elf* | mi 262@@ -520,6 +520,9 @@ mips*-sde-elf* | mips*-mti-elf* | mips*-img-elf*)
224 mips*-sde-elf* | mips*-mti-elf* | mips*-img-elf*)
225 targ_emul=elf32btsmip 263 targ_emul=elf32btsmip
226 targ_extra_emuls="elf32ltsmip elf32btsmipn32 elf64btsmip elf32ltsmipn32 elf64ltsmip" ;; 264 targ_extra_emuls="elf32ltsmip elf32btsmipn32 elf64btsmip elf32ltsmipn32 elf64ltsmip"
265 ;;
227+mipsisa64*-*-elf*) targ_emul=elf32btsmip 266+mipsisa64*-*-elf*) targ_emul=elf32btsmip
228+ targ_extra_emuls="elf32ltsmip elf64btsmip elf64ltsmip" ;; 267+ targ_extra_emuls="elf32ltsmip elf64btsmip elf64ltsmip"
268+ ;;
229 mips64*el-ps2-elf*) targ_emul=elf32lr5900n32 269 mips64*el-ps2-elf*) targ_emul=elf32lr5900n32
230 targ_extra_emuls="elf32lr5900" 270 targ_extra_emuls="elf32lr5900"
231 targ_extra_libpath=$targ_extra_emuls ;; 271 targ_extra_libpath=$targ_extra_emuls
272diff --git a/opcodes/mips-dis.c b/opcodes/mips-dis.c
273index 755bbe294b..ce22ef683a 100644
232--- a/opcodes/mips-dis.c 274--- a/opcodes/mips-dis.c
233+++ b/opcodes/mips-dis.c 275+++ b/opcodes/mips-dis.c
234@@ -673,13 +673,11 @@ const struct mips_arch_choice mips_arch_ 276@@ -674,13 +674,11 @@ const struct mips_arch_choice mips_arch_choices[] =
235 mips_cp0sel_names_xlr, ARRAY_SIZE (mips_cp0sel_names_xlr), 277 mips_cp0sel_names_xlr, ARRAY_SIZE (mips_cp0sel_names_xlr),
236 mips_cp1_names_mips3264, mips_hwr_names_numeric }, 278 mips_cp1_names_mips3264, mips_hwr_names_numeric },
237 279
@@ -250,6 +292,8 @@ Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
250 292
251 /* This entry, mips16, is here only for ISA/processor selection; do 293 /* This entry, mips16, is here only for ISA/processor selection; do
252 not print its name. */ 294 not print its name. */
295diff --git a/opcodes/mips-opc.c b/opcodes/mips-opc.c
296index 5270aeefa8..d17dc78cd7 100644
253--- a/opcodes/mips-opc.c 297--- a/opcodes/mips-opc.c
254+++ b/opcodes/mips-opc.c 298+++ b/opcodes/mips-opc.c
255@@ -328,6 +328,7 @@ decode_mips_operand (const char *p) 299@@ -328,6 +328,7 @@ decode_mips_operand (const char *p)
@@ -260,7 +304,7 @@ Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
260 #define IVIRT ASE_VIRT 304 #define IVIRT ASE_VIRT
261 #define IVIRT64 ASE_VIRT64 305 #define IVIRT64 ASE_VIRT64
262 306
263@@ -990,6 +991,7 @@ const struct mips_opcode mips_builtin_op 307@@ -990,6 +991,7 @@ const struct mips_opcode mips_builtin_opcodes[] =
264 {"clo", "U,s", 0x70000021, 0xfc0007ff, WR_1|RD_2, 0, I32|N55, 0, I37 }, 308 {"clo", "U,s", 0x70000021, 0xfc0007ff, WR_1|RD_2, 0, I32|N55, 0, I37 },
265 {"clz", "d,s", 0x00000050, 0xfc1f07ff, WR_1|RD_2, 0, I37, 0, 0 }, 309 {"clz", "d,s", 0x00000050, 0xfc1f07ff, WR_1|RD_2, 0, I37, 0, 0 },
266 {"clz", "U,s", 0x70000020, 0xfc0007ff, WR_1|RD_2, 0, I32|N55, 0, I37 }, 310 {"clz", "U,s", 0x70000020, 0xfc0007ff, WR_1|RD_2, 0, I32|N55, 0, I37 },
@@ -268,7 +312,7 @@ Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
268 /* ctc0 is at the bottom of the table. */ 312 /* ctc0 is at the bottom of the table. */
269 {"ctc1", "t,G", 0x44c00000, 0xffe007ff, RD_1|WR_CC|CM, 0, I1, 0, 0 }, 313 {"ctc1", "t,G", 0x44c00000, 0xffe007ff, RD_1|WR_CC|CM, 0, I1, 0, 0 },
270 {"ctc1", "t,S", 0x44c00000, 0xffe007ff, RD_1|WR_CC|CM, 0, I1, 0, 0 }, 314 {"ctc1", "t,S", 0x44c00000, 0xffe007ff, RD_1|WR_CC|CM, 0, I1, 0, 0 },
271@@ -1022,12 +1024,13 @@ const struct mips_opcode mips_builtin_op 315@@ -1022,12 +1024,13 @@ const struct mips_opcode mips_builtin_opcodes[] =
272 {"daddiu", "t,r,j", 0x64000000, 0xfc000000, WR_1|RD_2, 0, I3, 0, 0 }, 316 {"daddiu", "t,r,j", 0x64000000, 0xfc000000, WR_1|RD_2, 0, I3, 0, 0 },
273 {"daddu", "d,v,t", 0x0000002d, 0xfc0007ff, WR_1|RD_2|RD_3, 0, I3, 0, 0 }, 317 {"daddu", "d,v,t", 0x0000002d, 0xfc0007ff, WR_1|RD_2|RD_3, 0, I3, 0, 0 },
274 {"daddu", "t,r,I", 0, (int) M_DADDU_I, INSN_MACRO, 0, I3, 0, 0 }, 318 {"daddu", "t,r,I", 0, (int) M_DADDU_I, INSN_MACRO, 0, I3, 0, 0 },
@@ -283,7 +327,7 @@ Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
283 /* dctr and dctw are used on the r5000. */ 327 /* dctr and dctw are used on the r5000. */
284 {"dctr", "o(b)", 0xbc050000, 0xfc1f0000, RD_2, 0, I3, 0, 0 }, 328 {"dctr", "o(b)", 0xbc050000, 0xfc1f0000, RD_2, 0, I3, 0, 0 },
285 {"dctw", "o(b)", 0xbc090000, 0xfc1f0000, RD_2, 0, I3, 0, 0 }, 329 {"dctw", "o(b)", 0xbc090000, 0xfc1f0000, RD_2, 0, I3, 0, 0 },
286@@ -1099,6 +1102,7 @@ const struct mips_opcode mips_builtin_op 330@@ -1099,6 +1102,7 @@ const struct mips_opcode mips_builtin_opcodes[] =
287 {"dmfc0", "t,G,H", 0x40200000, 0xffe007f8, WR_1|RD_C0|LC, 0, I64, 0, 0 }, 331 {"dmfc0", "t,G,H", 0x40200000, 0xffe007f8, WR_1|RD_C0|LC, 0, I64, 0, 0 },
288 {"dmfgc0", "t,G", 0x40600100, 0xffe007ff, WR_1|RD_C0|LC, 0, 0, IVIRT64, 0 }, 332 {"dmfgc0", "t,G", 0x40600100, 0xffe007ff, WR_1|RD_C0|LC, 0, 0, IVIRT64, 0 },
289 {"dmfgc0", "t,G,H", 0x40600100, 0xffe007f8, WR_1|RD_C0|LC, 0, 0, IVIRT64, 0 }, 333 {"dmfgc0", "t,G,H", 0x40600100, 0xffe007f8, WR_1|RD_C0|LC, 0, 0, IVIRT64, 0 },
@@ -291,7 +335,7 @@ Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
291 {"dmt", "", 0x41600bc1, 0xffffffff, TRAP, 0, 0, MT32, 0 }, 335 {"dmt", "", 0x41600bc1, 0xffffffff, TRAP, 0, 0, MT32, 0 },
292 {"dmt", "t", 0x41600bc1, 0xffe0ffff, WR_1|TRAP, 0, 0, MT32, 0 }, 336 {"dmt", "t", 0x41600bc1, 0xffe0ffff, WR_1|TRAP, 0, 0, MT32, 0 },
293 {"dmtc0", "t,G", 0x40a00000, 0xffe007ff, RD_1|WR_C0|WR_CC|CM, 0, I3, 0, EE }, 337 {"dmtc0", "t,G", 0x40a00000, 0xffe007ff, RD_1|WR_C0|WR_CC|CM, 0, I3, 0, EE },
294@@ -1114,6 +1118,8 @@ const struct mips_opcode mips_builtin_op 338@@ -1114,6 +1118,8 @@ const struct mips_opcode mips_builtin_opcodes[] =
295 /* dmfc3 is at the bottom of the table. */ 339 /* dmfc3 is at the bottom of the table. */
296 /* dmtc3 is at the bottom of the table. */ 340 /* dmtc3 is at the bottom of the table. */
297 {"dmuh", "d,s,t", 0x000000dc, 0xfc0007ff, WR_1|RD_2|RD_3, 0, I69, 0, 0 }, 341 {"dmuh", "d,s,t", 0x000000dc, 0xfc0007ff, WR_1|RD_2|RD_3, 0, I69, 0, 0 },
@@ -300,7 +344,7 @@ Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
300 {"dmul", "d,s,t", 0x0000009c, 0xfc0007ff, WR_1|RD_2|RD_3, 0, I69, 0, 0 }, 344 {"dmul", "d,s,t", 0x0000009c, 0xfc0007ff, WR_1|RD_2|RD_3, 0, I69, 0, 0 },
301 {"dmul", "d,v,t", 0x70000003, 0xfc0007ff, WR_1|RD_2|RD_3|WR_HILO, 0, IOCT, 0, 0 }, 345 {"dmul", "d,v,t", 0x70000003, 0xfc0007ff, WR_1|RD_2|RD_3|WR_HILO, 0, IOCT, 0, 0 },
302 {"dmul", "d,v,t", 0, (int) M_DMUL, INSN_MACRO, 0, I3, 0, M32|I69 }, 346 {"dmul", "d,v,t", 0, (int) M_DMUL, INSN_MACRO, 0, I3, 0, M32|I69 },
303@@ -1267,9 +1273,9 @@ const struct mips_opcode mips_builtin_op 347@@ -1267,9 +1273,9 @@ const struct mips_opcode mips_builtin_opcodes[] =
304 {"ld", "s,-b(+R)", 0xec180000, 0xfc1c0000, WR_1, RD_pc, I69, 0, 0 }, 348 {"ld", "s,-b(+R)", 0xec180000, 0xfc1c0000, WR_1, RD_pc, I69, 0, 0 },
305 {"ld", "t,A(b)", 0, (int) M_LD_AB, INSN_MACRO, 0, I1, 0, 0 }, 349 {"ld", "t,A(b)", 0, (int) M_LD_AB, INSN_MACRO, 0, I1, 0, 0 },
306 {"ld", "t,o(b)", 0xdc000000, 0xfc000000, WR_1|RD_3|LM, 0, I3, 0, 0 }, 350 {"ld", "t,o(b)", 0xdc000000, 0xfc000000, WR_1|RD_3|LM, 0, I3, 0, 0 },
@@ -313,7 +357,7 @@ Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
313 {"ldc1", "T,o(b)", 0xd4000000, 0xfc000000, WR_1|RD_3|CLD|FP_D, 0, I2, 0, SF }, 357 {"ldc1", "T,o(b)", 0xd4000000, 0xfc000000, WR_1|RD_3|CLD|FP_D, 0, I2, 0, SF },
314 {"ldc1", "E,o(b)", 0xd4000000, 0xfc000000, WR_1|RD_3|CLD|FP_D, 0, I2, 0, SF }, 358 {"ldc1", "E,o(b)", 0xd4000000, 0xfc000000, WR_1|RD_3|CLD|FP_D, 0, I2, 0, SF },
315 {"ldc1", "T,A(b)", 0, (int) M_LDC1_AB, INSN_MACRO, INSN2_M_FP_D, I2, 0, SF }, 359 {"ldc1", "T,A(b)", 0, (int) M_LDC1_AB, INSN_MACRO, INSN2_M_FP_D, I2, 0, SF },
316@@ -1438,7 +1444,7 @@ const struct mips_opcode mips_builtin_op 360@@ -1438,7 +1444,7 @@ const struct mips_opcode mips_builtin_opcodes[] =
317 {"mflo", "d,9", 0x00000012, 0xff9f07ff, WR_1|RD_LO, 0, 0, D32, 0 }, 361 {"mflo", "d,9", 0x00000012, 0xff9f07ff, WR_1|RD_LO, 0, 0, D32, 0 },
318 {"mflo1", "d", 0x70000012, 0xffff07ff, WR_1|RD_LO, 0, EE, 0, 0 }, 362 {"mflo1", "d", 0x70000012, 0xffff07ff, WR_1|RD_LO, 0, EE, 0, 0 },
319 {"mflhxu", "d", 0x00000052, 0xffff07ff, WR_1|MOD_HILO, 0, 0, SMT, 0 }, 363 {"mflhxu", "d", 0x00000052, 0xffff07ff, WR_1|MOD_HILO, 0, 0, SMT, 0 },
@@ -322,7 +366,7 @@ Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
322 {"mfsa", "d", 0x00000028, 0xffff07ff, WR_1, 0, EE, 0, 0 }, 366 {"mfsa", "d", 0x00000028, 0xffff07ff, WR_1, 0, EE, 0, 0 },
323 {"min.ob", "X,Y,Q", 0x78000006, 0xfc20003f, WR_1|RD_2|RD_3|FP_D, 0, SB1, MX, 0 }, 367 {"min.ob", "X,Y,Q", 0x78000006, 0xfc20003f, WR_1|RD_2|RD_3|FP_D, 0, SB1, MX, 0 },
324 {"min.ob", "D,S,Q", 0x48000006, 0xfc20003f, WR_1|RD_2|RD_3|FP_D, 0, N54, 0, 0 }, 368 {"min.ob", "D,S,Q", 0x48000006, 0xfc20003f, WR_1|RD_2|RD_3|FP_D, 0, N54, 0, 0 },
325@@ -1483,10 +1489,13 @@ const struct mips_opcode mips_builtin_op 369@@ -1483,10 +1489,13 @@ const struct mips_opcode mips_builtin_opcodes[] =
326 /* move is at the top of the table. */ 370 /* move is at the top of the table. */
327 {"msgn.qh", "X,Y,Q", 0x78200000, 0xfc20003f, WR_1|RD_2|RD_3|FP_D, 0, 0, MX, 0 }, 371 {"msgn.qh", "X,Y,Q", 0x78200000, 0xfc20003f, WR_1|RD_2|RD_3|FP_D, 0, 0, MX, 0 },
328 {"msgsnd", "t", 0, (int) M_MSGSND, INSN_MACRO, 0, XLR, 0, 0 }, 372 {"msgsnd", "t", 0, (int) M_MSGSND, INSN_MACRO, 0, XLR, 0, 0 },
@@ -338,7 +382,7 @@ Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
338 {"msub.d", "D,R,S,T", 0x4c000029, 0xfc00003f, WR_1|RD_2|RD_3|RD_4|FP_D, 0, I4_33, 0, I37 }, 382 {"msub.d", "D,R,S,T", 0x4c000029, 0xfc00003f, WR_1|RD_2|RD_3|RD_4|FP_D, 0, I4_33, 0, I37 },
339 {"msub.d", "D,S,T", 0x46200019, 0xffe0003f, WR_1|RD_2|RD_3|FP_D, 0, IL2E, 0, 0 }, 383 {"msub.d", "D,S,T", 0x46200019, 0xffe0003f, WR_1|RD_2|RD_3|FP_D, 0, IL2E, 0, 0 },
340 {"msub.d", "D,S,T", 0x72200019, 0xffe0003f, WR_1|RD_2|RD_3|FP_D, 0, IL2F, 0, 0 }, 384 {"msub.d", "D,S,T", 0x72200019, 0xffe0003f, WR_1|RD_2|RD_3|FP_D, 0, IL2F, 0, 0 },
341@@ -1536,7 +1545,7 @@ const struct mips_opcode mips_builtin_op 385@@ -1536,7 +1545,7 @@ const struct mips_opcode mips_builtin_opcodes[] =
342 {"mtlo", "s,7", 0x00000013, 0xfc1fe7ff, RD_1|WR_LO, 0, 0, D32, 0 }, 386 {"mtlo", "s,7", 0x00000013, 0xfc1fe7ff, RD_1|WR_LO, 0, 0, D32, 0 },
343 {"mtlo1", "s", 0x70000013, 0xfc1fffff, RD_1|WR_LO, 0, EE, 0, 0 }, 387 {"mtlo1", "s", 0x70000013, 0xfc1fffff, RD_1|WR_LO, 0, EE, 0, 0 },
344 {"mtlhx", "s", 0x00000053, 0xfc1fffff, RD_1|MOD_HILO, 0, 0, SMT, 0 }, 388 {"mtlhx", "s", 0x00000053, 0xfc1fffff, RD_1|MOD_HILO, 0, 0, SMT, 0 },
@@ -347,7 +391,7 @@ Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
347 {"mtm0", "s", 0x70000008, 0xfc1fffff, RD_1, 0, IOCT, 0, 0 }, 391 {"mtm0", "s", 0x70000008, 0xfc1fffff, RD_1, 0, IOCT, 0, 0 },
348 {"mtm0", "s,t", 0x70000008, 0xfc00ffff, RD_1|RD_2, 0, IOCT3, 0, 0 }, 392 {"mtm0", "s,t", 0x70000008, 0xfc00ffff, RD_1|RD_2, 0, IOCT3, 0, 0 },
349 {"mtm1", "s", 0x7000000c, 0xfc1fffff, RD_1, 0, IOCT, 0, 0 }, 393 {"mtm1", "s", 0x7000000c, 0xfc1fffff, RD_1, 0, IOCT, 0, 0 },
350@@ -1978,9 +1987,9 @@ const struct mips_opcode mips_builtin_op 394@@ -1978,9 +1987,9 @@ const struct mips_opcode mips_builtin_opcodes[] =
351 {"suxc1", "S,t(b)", 0x4c00000d, 0xfc0007ff, RD_1|RD_2|RD_3|SM|FP_D, 0, I5_33|N55, 0, I37}, 395 {"suxc1", "S,t(b)", 0x4c00000d, 0xfc0007ff, RD_1|RD_2|RD_3|SM|FP_D, 0, I5_33|N55, 0, I37},
352 {"sw", "t,o(b)", 0xac000000, 0xfc000000, RD_1|RD_3|SM, 0, I1, 0, 0 }, 396 {"sw", "t,o(b)", 0xac000000, 0xfc000000, RD_1|RD_3|SM, 0, I1, 0, 0 },
353 {"sw", "t,A(b)", 0, (int) M_SW_AB, INSN_MACRO, 0, I1, 0, 0 }, 397 {"sw", "t,A(b)", 0, (int) M_SW_AB, INSN_MACRO, 0, I1, 0, 0 },
diff --git a/meta/recipes-devtools/binutils/binutils/0012-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch b/meta/recipes-devtools/binutils/binutils/0013-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch
index f686763594..463de80638 100644
--- a/meta/recipes-devtools/binutils/binutils/0012-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch
+++ b/meta/recipes-devtools/binutils/binutils/0013-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch
@@ -1,4 +1,4 @@
1From f34aac4314b821396fe745013dc8ec8683ea2598 Mon Sep 17 00:00:00 2001 1From ef4ad1cb9ff1b5a871ffa792a71b3ad6d14eb3dc Mon Sep 17 00:00:00 2001
2From: Zhenhua Luo <zhenhua.luo@nxp.com> 2From: Zhenhua Luo <zhenhua.luo@nxp.com>
3Date: Sat, 11 Jun 2016 22:08:29 -0500 3Date: Sat, 11 Jun 2016 22:08:29 -0500
4Subject: [PATCH] fix the incorrect assembling for ppc wait mnemonic 4Subject: [PATCH] fix the incorrect assembling for ppc wait mnemonic
@@ -11,7 +11,7 @@ Upstream-Status: Pending
11 1 file changed, 1 insertion(+), 2 deletions(-) 11 1 file changed, 1 insertion(+), 2 deletions(-)
12 12
13diff --git a/opcodes/ppc-opc.c b/opcodes/ppc-opc.c 13diff --git a/opcodes/ppc-opc.c b/opcodes/ppc-opc.c
14index b56fe3e21a..696fe83a7b 100644 14index 7ef91d819b..145953d3c4 100644
15--- a/opcodes/ppc-opc.c 15--- a/opcodes/ppc-opc.c
16+++ b/opcodes/ppc-opc.c 16+++ b/opcodes/ppc-opc.c
17@@ -5709,7 +5709,6 @@ const struct powerpc_opcode powerpc_opcodes[] = { 17@@ -5709,7 +5709,6 @@ const struct powerpc_opcode powerpc_opcodes[] = {
diff --git a/meta/recipes-devtools/binutils/binutils/0013-Detect-64-bit-MIPS-targets.patch b/meta/recipes-devtools/binutils/binutils/0014-Detect-64-bit-MIPS-targets.patch
index 493b05026d..6acde1f781 100644
--- a/meta/recipes-devtools/binutils/binutils/0013-Detect-64-bit-MIPS-targets.patch
+++ b/meta/recipes-devtools/binutils/binutils/0014-Detect-64-bit-MIPS-targets.patch
@@ -1,4 +1,4 @@
1From ebb74c39acb171fd24c2698646134ce88dd96a15 Mon Sep 17 00:00:00 2001 1From 2f7f2389764ef1d699f6ad32057314024b7e84e7 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 31 Mar 2017 11:42:03 -0700 3Date: Fri, 31 Mar 2017 11:42:03 -0700
4Subject: [PATCH] Detect 64-bit MIPS targets 4Subject: [PATCH] Detect 64-bit MIPS targets
@@ -14,7 +14,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
14 1 file changed, 14 insertions(+) 14 1 file changed, 14 insertions(+)
15 15
16diff --git a/gold/configure.tgt b/gold/configure.tgt 16diff --git a/gold/configure.tgt b/gold/configure.tgt
17index 3e066edaa8..caf130ceda 100644 17index aa7ec552ae..470515062e 100644
18--- a/gold/configure.tgt 18--- a/gold/configure.tgt
19+++ b/gold/configure.tgt 19+++ b/gold/configure.tgt
20@@ -153,6 +153,13 @@ aarch64*-*) 20@@ -153,6 +153,13 @@ aarch64*-*)
diff --git a/meta/recipes-devtools/binutils/binutils/0015-binutils-enable-x86_64-pep-for-producing-EFI-binarie.patch b/meta/recipes-devtools/binutils/binutils/0015-binutils-enable-x86_64-pep-for-producing-EFI-binarie.patch
deleted file mode 100644
index d25ce61626..0000000000
--- a/meta/recipes-devtools/binutils/binutils/0015-binutils-enable-x86_64-pep-for-producing-EFI-binarie.patch
+++ /dev/null
@@ -1,46 +0,0 @@
1From a326a8feb445a5713ff3d17c55f43d5681e26585 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Thu, 29 Nov 2018 17:46:40 -0800
4Subject: [PATCH] binutils : enable x86_64-pep for producing EFI binaries on
5 x86-64
6
7Add x86_64-pep emulation support to the set enabled for x86_64 targets
8to enable the linker to produce Portable Executables for EFI binaries.
9
10Enables building the x86-64 EFI variant of the Xen hypervisor for
11the OpenXT Project.
12
13Upstream-Status: Inappropriate [OE configuration specific]
14
15Signed-off-by: Christopher Clark <christopher.clark6@baesystems.com>
16Signed-off-by: Khem Raj <raj.khem@gmail.com>
17---
18 bfd/config.bfd | 2 +-
19 ld/configure.tgt | 5 +++--
20 2 files changed, 4 insertions(+), 3 deletions(-)
21
22--- a/bfd/config.bfd
23+++ b/bfd/config.bfd
24@@ -694,7 +694,7 @@ case "${targ}" in
25 ;;
26 x86_64-*-linux-*)
27 targ_defvec=x86_64_elf64_vec
28- targ_selvecs="i386_elf32_vec iamcu_elf32_vec x86_64_elf32_vec i386_pei_vec x86_64_pei_vec l1om_elf64_vec k1om_elf64_vec"
29+ targ_selvecs="i386_elf32_vec iamcu_elf32_vec x86_64_elf32_vec i386_pei_vec x86_64_pei_vec l1om_elf64_vec k1om_elf64_vec x86_64_pe_vec x86_64_pe_be_vec i386_pe_vec"
30 want64=true
31 ;;
32 x86_64-*-nacl*)
33--- a/ld/configure.tgt
34+++ b/ld/configure.tgt
35@@ -258,8 +258,9 @@ x86_64-*-linux-gnux32) targ_emul=elf32_x
36 tdir_elf_iamcu=`echo ${targ_alias} | sed -e 's/x86_64/i386/' -e 's/-linux-gnux32/-linux-gnu/'`
37 tdir_elf_i386=`echo ${targ_alias} | sed -e 's/x86_64/i386/' -e 's/-linux-gnux32/-linux-gnu/'` ;;
38 x86_64-*-linux-*) targ_emul=elf_x86_64
39- targ_extra_emuls="elf32_x86_64 elf_i386 elf_iamcu elf_l1om elf_k1om"
40- targ_extra_libpath="elf_i386 elf32_x86_64 elf_l1om elf_k1om"
41+ targ_extra_emuls="elf32_x86_64 elf_i386 elf_iamcu elf_l1om elf_k1om i386pe i386pep"
42+ targ_extra_libpath="elf_i386 elf32_x86_64 elf_l1om elf_k1om i386pep"
43+ targ_extra_ofiles="deffilep.o pep-dll.o pe-dll.o"
44 tdir_elf_i386=`echo ${targ_alias} | sed -e 's/x86_64/i386/'` ;;
45 i[3-7]86-*-redox*) targ_emul=elf_i386
46 targ_extra_emuls=elf_x86_64 ;;
diff --git a/meta/recipes-devtools/binutils/binutils/0014-sync-with-OE-libtool-changes.patch b/meta/recipes-devtools/binutils/binutils/0015-sync-with-OE-libtool-changes.patch
index ae5915d39b..a794719bd2 100644
--- a/meta/recipes-devtools/binutils/binutils/0014-sync-with-OE-libtool-changes.patch
+++ b/meta/recipes-devtools/binutils/binutils/0015-sync-with-OE-libtool-changes.patch
@@ -1,4 +1,4 @@
1From 6bc49e9a581eb46265935ea2756a99faa7d0562e Mon Sep 17 00:00:00 2001 1From 392d474a72d37b669f53ab9f0fa913b958af93f6 Mon Sep 17 00:00:00 2001
2From: Ross Burton <ross.burton@intel.com> 2From: Ross Burton <ross.burton@intel.com>
3Date: Mon, 6 Mar 2017 23:33:27 -0800 3Date: Mon, 6 Mar 2017 23:33:27 -0800
4Subject: [PATCH] sync with OE libtool changes 4Subject: [PATCH] sync with OE libtool changes
diff --git a/meta/recipes-devtools/binutils/binutils/CVE-2019-17450.patch b/meta/recipes-devtools/binutils/binutils/CVE-2019-17450.patch
deleted file mode 100644
index ce5b9f392d..0000000000
--- a/meta/recipes-devtools/binutils/binutils/CVE-2019-17450.patch
+++ /dev/null
@@ -1,94 +0,0 @@
1From 09dd135df9ebc7a4b640537e23e26a03a288a789 Mon Sep 17 00:00:00 2001
2From: Alan Modra <amodra@gmail.com>
3Date: Wed, 9 Oct 2019 00:07:29 +1030
4Subject: [PATCH] PR25078, stack overflow in function find_abstract_instance
5
6Selectively backporting fix for bfd/dwarf2.c, but not the ChangeLog
7file. There are newer versions of binutils, but none of them contain the
8commit fixing CVE-2019-17450, so backport it to master and zeus.
9
10Upstream-Status: Backport [https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=063c511bd79]
11CVE: CVE-2019-17450
12Signed-off-by: Trevor Gamblin <trevor.gamblin@windriver.com>
13
14 PR 25078
15 * dwarf2.c (find_abstract_instance): Delete orig_info_ptr, add
16 recur_count. Error on recur_count reaching 100 rather than
17 info_ptr matching orig_info_ptr. Adjust calls.
18
19---
20 bfd/dwarf2.c | 35 +++++++++++++++++------------------
21 1 file changed, 17 insertions(+), 18 deletions(-)
22
23--- a/bfd/dwarf2.c
24+++ b/bfd/dwarf2.c
25@@ -2812,13 +2812,13 @@ static bfd_boolean comp_unit_maybe_decod
26 struct dwarf2_debug *);
27
28 static bfd_boolean
29-find_abstract_instance (struct comp_unit * unit,
30- bfd_byte * orig_info_ptr,
31- struct attribute * attr_ptr,
32- const char ** pname,
33- bfd_boolean * is_linkage,
34- char ** filename_ptr,
35- int * linenumber_ptr)
36+find_abstract_instance (struct comp_unit *unit,
37+ struct attribute *attr_ptr,
38+ unsigned int recur_count,
39+ const char **pname,
40+ bfd_boolean *is_linkage,
41+ char **filename_ptr,
42+ int *linenumber_ptr)
43 {
44 bfd *abfd = unit->abfd;
45 bfd_byte *info_ptr;
46@@ -2829,6 +2829,14 @@ find_abstract_instance (struct comp_unit
47 struct attribute attr;
48 const char *name = NULL;
49
50+ if (recur_count == 100)
51+ {
52+ _bfd_error_handler
53+ (_("DWARF error: abstract instance recursion detected"));
54+ bfd_set_error (bfd_error_bad_value);
55+ return FALSE;
56+ }
57+
58 /* DW_FORM_ref_addr can reference an entry in a different CU. It
59 is an offset from the .debug_info section, not the current CU. */
60 if (attr_ptr->form == DW_FORM_ref_addr)
61@@ -2962,15 +2970,6 @@ find_abstract_instance (struct comp_unit
62 info_ptr, info_ptr_end);
63 if (info_ptr == NULL)
64 break;
65- /* It doesn't ever make sense for DW_AT_specification to
66- refer to the same DIE. Stop simple recursion. */
67- if (info_ptr == orig_info_ptr)
68- {
69- _bfd_error_handler
70- (_("DWARF error: abstract instance recursion detected"));
71- bfd_set_error (bfd_error_bad_value);
72- return FALSE;
73- }
74 switch (attr.name)
75 {
76 case DW_AT_name:
77@@ -2984,7 +2983,7 @@ find_abstract_instance (struct comp_unit
78 }
79 break;
80 case DW_AT_specification:
81- if (!find_abstract_instance (unit, info_ptr, &attr,
82+ if (!find_abstract_instance (unit, &attr, recur_count + 1,
83 &name, is_linkage,
84 filename_ptr, linenumber_ptr))
85 return FALSE;
86@@ -3200,7 +3199,7 @@ scan_unit_for_symbols (struct comp_unit
87
88 case DW_AT_abstract_origin:
89 case DW_AT_specification:
90- if (!find_abstract_instance (unit, info_ptr, &attr,
91+ if (!find_abstract_instance (unit, &attr, 0,
92 &func->name,
93 &func->is_linkage,
94 &func->file,
diff --git a/meta/recipes-devtools/binutils/binutils/CVE-2019-17451.patch b/meta/recipes-devtools/binutils/binutils/CVE-2019-17451.patch
deleted file mode 100644
index 1fe05d310e..0000000000
--- a/meta/recipes-devtools/binutils/binutils/CVE-2019-17451.patch
+++ /dev/null
@@ -1,46 +0,0 @@
1From 0192438051a7e781585647d5581a2a6f62fda362 Mon Sep 17 00:00:00 2001
2From: Alan Modra <amodra@gmail.com>
3Date: Wed, 9 Oct 2019 10:47:13 +1030
4Subject: [PATCH] PR25070, SEGV in function _bfd_dwarf2_find_nearest_line
5
6Selectively backporting fix for bfd/dwarf2.c, but not the ChangeLog
7file. There are newer versions of binutils, but none of them contain the
8commit fixing CVE-2019-17451, so backport it to master and zeus.
9
10Upstream-Status: Backport
11[https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=336bfbeb1848]
12CVE: CVE-2019-17451
13Signed-off-by: Trevor Gamblin <trevor.gamblin@windriver.com>
14
15
16Evil testcase with two debug info sections, with sizes of 2aaaabac4ec1
17and ffffd5555453b140 result in a total size of 1. Reading the first
18section of course overflows the buffer and tramples on other memory.
19
20 PR 25070
21 * dwarf2.c (_bfd_dwarf2_slurp_debug_info): Catch overflow of
22 total_size calculation.
23---
24 bfd/dwarf2.c | 11 ++++++++++-
25 1 file changed, 10 insertions(+), 1 deletion(-)
26
27--- a/bfd/dwarf2.c
28+++ b/bfd/dwarf2.c
29@@ -4439,7 +4439,16 @@ _bfd_dwarf2_slurp_debug_info (bfd *abfd,
30 for (total_size = 0;
31 msec;
32 msec = find_debug_info (debug_bfd, debug_sections, msec))
33- total_size += msec->size;
34+ {
35+ /* Catch PR25070 testcase overflowing size calculation here. */
36+ if (total_size + msec->size < total_size
37+ || total_size + msec->size < msec->size)
38+ {
39+ bfd_set_error (bfd_error_no_memory);
40+ return FALSE;
41+ }
42+ total_size += msec->size;
43+ }
44
45 stash->info_ptr_memory = (bfd_byte *) bfd_malloc (total_size);
46 if (stash->info_ptr_memory == NULL)
diff --git a/meta/recipes-devtools/binutils/binutils_2.33.bb b/meta/recipes-devtools/binutils/binutils_2.34.bb
index 8bd2bf778c..bfc9346822 100644
--- a/meta/recipes-devtools/binutils/binutils_2.33.bb
+++ b/meta/recipes-devtools/binutils/binutils_2.34.bb
@@ -49,9 +49,9 @@ do_install_class-native () {
49 49
50# Split out libbfd-*.so so including perf doesn't include extra stuff 50# Split out libbfd-*.so so including perf doesn't include extra stuff
51PACKAGE_BEFORE_PN += "libbfd" 51PACKAGE_BEFORE_PN += "libbfd"
52FILES_libbfd = "${libdir}/libbfd-*.so" 52FILES_libbfd = "${libdir}/libbfd-*.so.* ${libdir}/libbfd-*.so"
53 53
54SRC_URI_append_class-nativesdk = " file://nativesdk-relocation.patch " 54SRC_URI_append_class-nativesdk = " file://0003-binutils-nativesdk-Search-for-alternative-ld.so.conf.patch "
55 55
56USE_ALTERNATIVES_FOR_class-nativesdk = "" 56USE_ALTERNATIVES_FOR_class-nativesdk = ""
57FILES_${PN}_append_class-nativesdk = " ${bindir}" 57FILES_${PN}_append_class-nativesdk = " ${bindir}"