summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2018-07-17 00:41:04 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-07-26 13:16:40 +0100
commit26810bc160bd78924a7f1fddac31afb4981f5b6b (patch)
treed47c36cb8ff424c8e88b14cb92198e80de9c5e32 /meta
parent9245162e8bfc346c97d8e6c2ee5b77fc2c4bde92 (diff)
downloadpoky-26810bc160bd78924a7f1fddac31afb4981f5b6b.tar.gz
binutils: Upgrade to 2.31 release branch
(From OE-Core rev: 7eeec2ad91eca6ba44ea7b761d47082f4ebb04cc) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/conf/distro/include/tcmode-default.inc2
-rw-r--r--meta/recipes-devtools/binutils/binutils-2.31.inc (renamed from meta/recipes-devtools/binutils/binutils-2.30.inc)2
-rw-r--r--meta/recipes-devtools/binutils/binutils-cross-canadian_2.31.bb (renamed from meta/recipes-devtools/binutils/binutils-cross-canadian_2.30.bb)0
-rw-r--r--meta/recipes-devtools/binutils/binutils-cross_2.31.bb (renamed from meta/recipes-devtools/binutils/binutils-cross_2.30.bb)0
-rw-r--r--meta/recipes-devtools/binutils/binutils-crosssdk_2.31.bb (renamed from meta/recipes-devtools/binutils/binutils-crosssdk_2.30.bb)0
-rw-r--r--meta/recipes-devtools/binutils/binutils/0001-binutils-crosssdk-Generate-relocatable-SDKs.patch12
-rw-r--r--meta/recipes-devtools/binutils/binutils/0002-binutils-cross-Do-not-generate-linker-script-directo.patch22
-rw-r--r--meta/recipes-devtools/binutils/binutils/0003-configure-widen-the-regexp-for-SH-architectures.patch12
-rw-r--r--meta/recipes-devtools/binutils/binutils/0004-Point-scripts-location-to-libdir.patch10
-rw-r--r--meta/recipes-devtools/binutils/binutils/0005-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch10
-rw-r--r--meta/recipes-devtools/binutils/binutils/0006-Use-libtool-2.4.patch2278
-rw-r--r--meta/recipes-devtools/binutils/binutils/0007-Add-the-armv5e-architecture-to-binutils.patch8
-rw-r--r--meta/recipes-devtools/binutils/binutils/0008-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch4
-rw-r--r--meta/recipes-devtools/binutils/binutils/0009-warn-for-uses-of-system-directories-when-cross-linki.patch50
-rw-r--r--meta/recipes-devtools/binutils/binutils/0010-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch4
-rw-r--r--meta/recipes-devtools/binutils/binutils/0011-Change-default-emulation-for-mips64-linux.patch12
-rw-r--r--meta/recipes-devtools/binutils/binutils/0012-Add-support-for-Netlogic-XLP.patch80
-rw-r--r--meta/recipes-devtools/binutils/binutils/0013-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch10
-rw-r--r--meta/recipes-devtools/binutils/binutils/0014-Detect-64-bit-MIPS-targets.patch4
-rw-r--r--meta/recipes-devtools/binutils/binutils/0015-sync-with-OE-libtool-changes.patch4
-rw-r--r--meta/recipes-devtools/binutils/binutils_2.31.bb (renamed from meta/recipes-devtools/binutils/binutils_2.30.bb)0
21 files changed, 1318 insertions, 1206 deletions
diff --git a/meta/conf/distro/include/tcmode-default.inc b/meta/conf/distro/include/tcmode-default.inc
index cb17061706..24a21b5837 100644
--- a/meta/conf/distro/include/tcmode-default.inc
+++ b/meta/conf/distro/include/tcmode-default.inc
@@ -24,7 +24,7 @@ PREFERRED_PROVIDER_virtual/gettext ??= "gettext"
24 24
25GCCVERSION ?= "8.%" 25GCCVERSION ?= "8.%"
26SDKGCCVERSION ?= "${GCCVERSION}" 26SDKGCCVERSION ?= "${GCCVERSION}"
27BINUVERSION ?= "2.30%" 27BINUVERSION ?= "2.31%"
28GDBVERSION ?= "8.1%" 28GDBVERSION ?= "8.1%"
29GLIBCVERSION ?= "2.27%" 29GLIBCVERSION ?= "2.27%"
30LINUXLIBCVERSION ?= "4.15%" 30LINUXLIBCVERSION ?= "4.15%"
diff --git a/meta/recipes-devtools/binutils/binutils-2.30.inc b/meta/recipes-devtools/binutils/binutils-2.31.inc
index 9c883acc52..ec9e9c330d 100644
--- a/meta/recipes-devtools/binutils/binutils-2.30.inc
+++ b/meta/recipes-devtools/binutils/binutils-2.31.inc
@@ -18,7 +18,7 @@ BINUPV = "${@binutils_branch_version(d)}"
18 18
19UPSTREAM_CHECK_GITTAGREGEX = "binutils-(?P<pver>\d+_(\d_?)*)" 19UPSTREAM_CHECK_GITTAGREGEX = "binutils-(?P<pver>\d+_(\d_?)*)"
20 20
21SRCREV ?= "caa839fba66600a6c36d3639906ed9110b79c307" 21SRCREV ?= "f8b4d71490df766ca9c474f7ab9c82b3a8029a5a"
22BINUTILS_GIT_URI ?= "git://sourceware.org/git/binutils-gdb.git;branch=binutils-${BINUPV}-branch;protocol=git" 22BINUTILS_GIT_URI ?= "git://sourceware.org/git/binutils-gdb.git;branch=binutils-${BINUPV}-branch;protocol=git"
23SRC_URI = "\ 23SRC_URI = "\
24 ${BINUTILS_GIT_URI} \ 24 ${BINUTILS_GIT_URI} \
diff --git a/meta/recipes-devtools/binutils/binutils-cross-canadian_2.30.bb b/meta/recipes-devtools/binutils/binutils-cross-canadian_2.31.bb
index 5dbaa03017..5dbaa03017 100644
--- a/meta/recipes-devtools/binutils/binutils-cross-canadian_2.30.bb
+++ b/meta/recipes-devtools/binutils/binutils-cross-canadian_2.31.bb
diff --git a/meta/recipes-devtools/binutils/binutils-cross_2.30.bb b/meta/recipes-devtools/binutils/binutils-cross_2.31.bb
index fbd1f7d25a..fbd1f7d25a 100644
--- a/meta/recipes-devtools/binutils/binutils-cross_2.30.bb
+++ b/meta/recipes-devtools/binutils/binutils-cross_2.31.bb
diff --git a/meta/recipes-devtools/binutils/binutils-crosssdk_2.30.bb b/meta/recipes-devtools/binutils/binutils-crosssdk_2.31.bb
index 37f4d6d2e9..37f4d6d2e9 100644
--- a/meta/recipes-devtools/binutils/binutils-crosssdk_2.30.bb
+++ b/meta/recipes-devtools/binutils/binutils-crosssdk_2.31.bb
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 2df836057d..6bdb407b1e 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,4 +1,4 @@
1From 2e1b5e24a6759de7f73aa6060a574848d9131b5a Mon Sep 17 00:00:00 2001 1From 4a99f058030c86794bb96b582a7dbd631f963b06 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:58:54 +0000 3Date: Mon, 2 Mar 2015 01:58:54 +0000
4Subject: [PATCH 01/15] binutils-crosssdk: Generate relocatable SDKs 4Subject: [PATCH 01/15] binutils-crosssdk: Generate relocatable SDKs
@@ -18,10 +18,10 @@ 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 8732422b3a..1f257e99ca 100755 21index 370b22269d..a5c367aa8f 100755
22--- a/ld/genscripts.sh 22--- a/ld/genscripts.sh
23+++ b/ld/genscripts.sh 23+++ b/ld/genscripts.sh
24@@ -277,6 +277,7 @@ DATA_ALIGNMENT_u="${DATA_ALIGNMENT_u-${DATA_ALIGNMENT_r}}" 24@@ -279,6 +279,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})"
@@ -29,7 +29,7 @@ index 8732422b3a..1f257e99ca 100755
29 ( echo "/* Script for ld -r: link without relocation */" 29 ( echo "/* Script for ld -r: link without relocation */"
30 . ${CUSTOMIZER_SCRIPT} 30 . ${CUSTOMIZER_SCRIPT}
31 . ${srcdir}/scripttempl/${SCRIPT_NAME}.sc 31 . ${srcdir}/scripttempl/${SCRIPT_NAME}.sc
32@@ -285,10 +286,12 @@ DEFAULT_DATA_ALIGNMENT="ALIGN(${SEGMENT_SIZE})" 32@@ -287,10 +288,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=" "
@@ -43,7 +43,7 @@ index 8732422b3a..1f257e99ca 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 9787ab5dac..0c8a93c2c8 100644 46index 444aef2942..afa99f736d 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@@ -139,8 +139,8 @@ if test -z "$DATA_SEGMENT_ALIGN"; then 49@@ -139,8 +139,8 @@ if test -z "$DATA_SEGMENT_ALIGN"; then
@@ -58,5 +58,5 @@ index 9787ab5dac..0c8a93c2c8 100644
58 if test -z "$PLT"; then 58 if test -z "$PLT"; then
59 IPLT=".iplt ${RELOCATING-0} : { *(.iplt) }" 59 IPLT=".iplt ${RELOCATING-0} : { *(.iplt) }"
60-- 60--
612.16.1 612.18.0
62 62
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 bac7fb2d1a..0208213832 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 58ddf38fa53abb48b69dd76e398c73451ad1a5eb Mon Sep 17 00:00:00 2001 1From 6e78b1c88c040a742b7af82542ac7eb92eddda3d 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 02/15] binutils-cross: Do not generate linker script 4Subject: [PATCH 02/15] binutils-cross: Do not generate linker script
@@ -19,14 +19,14 @@ RP 2017/01/30
19 19
20Signed-off-by: Khem Raj <raj.khem@gmail.com> 20Signed-off-by: Khem Raj <raj.khem@gmail.com>
21--- 21---
22 ld/genscripts.sh | 23 ----------------------- 22 ld/genscripts.sh | 25 -------------------------
23 1 file changed, 23 deletions(-) 23 1 file changed, 25 deletions(-)
24 24
25diff --git a/ld/genscripts.sh b/ld/genscripts.sh 25diff --git a/ld/genscripts.sh b/ld/genscripts.sh
26index 1f257e99ca..1583b73a2b 100755 26index a5c367aa8f..6cc9eed976 100755
27--- a/ld/genscripts.sh 27--- a/ld/genscripts.sh
28+++ b/ld/genscripts.sh 28+++ b/ld/genscripts.sh
29@@ -189,29 +189,6 @@ append_to_lib_path() 29@@ -189,31 +189,6 @@ append_to_lib_path()
30 fi 30 fi
31 } 31 }
32 32
@@ -44,10 +44,12 @@ index 1f257e99ca..1583b73a2b 100755
44- # because 64bit libraries may be in both places, depending on 44- # because 64bit libraries may be in both places, depending on
45- # cross-development setup method (e.g.: /usr/s390x-linux/lib64 45- # cross-development setup method (e.g.: /usr/s390x-linux/lib64
46- # vs. /usr/s390-linux/lib64) 46- # vs. /usr/s390-linux/lib64)
47- case "${NATIVE}:${LIBPATH_SUFFIX}:${TOOL_LIB}" in 47- for libpath_suffix in ${LIBPATH_SUFFIX}; do
48- :* | *::* | *:*:*${LIBPATH_SUFFIX}) ;; 48- case "${NATIVE}:${libpath_suffix}:${TOOL_LIB}" in
49- *) libs="${exec_prefix}/${target_alias}/lib${LIBPATH_SUFFIX}" ;; 49- :* | *::* | *:*:*${libpath_suffix}) ;;
50- esac 50- *) libs="${exec_prefix}/${target_alias}/lib${libpath_suffix}" ;;
51- esac
52- done
51- libs="${exec_prefix}/${TOOL_LIB}/lib ${libs}" 53- libs="${exec_prefix}/${TOOL_LIB}/lib ${libs}"
52- fi 54- fi
53- append_to_lib_path ${libs} 55- append_to_lib_path ${libs}
@@ -57,5 +59,5 @@ index 1f257e99ca..1583b73a2b 100755
57 libs=${NATIVE_LIB_DIRS} 59 libs=${NATIVE_LIB_DIRS}
58 if [ "x${NATIVE}" = "xyes" ] ; then 60 if [ "x${NATIVE}" = "xyes" ] ; then
59-- 61--
602.16.1 622.18.0
61 63
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
index 306afe7018..15193c10a6 100644
--- 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
@@ -1,4 +1,4 @@
1From 5089be88f670bcadf7db0e778894f900b2c05d7b Mon Sep 17 00:00:00 2001 1From 4c6fd8f5eb9bc7c0d02f1a98ad86e395d4d2ab3b 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:07:33 +0000 3Date: Mon, 2 Mar 2015 01:07:33 +0000
4Subject: [PATCH 03/15] configure: widen the regexp for SH architectures 4Subject: [PATCH 03/15] configure: widen the regexp for SH architectures
@@ -14,10 +14,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
14 2 files changed, 6 insertions(+), 1 deletion(-) 14 2 files changed, 6 insertions(+), 1 deletion(-)
15 15
16diff --git a/configure b/configure 16diff --git a/configure b/configure
17index 2d615a9996..c4ad45c06c 100755 17index 08dd35c3ea..815e74ddb7 100755
18--- a/configure 18--- a/configure
19+++ b/configure 19+++ b/configure
20@@ -3835,7 +3835,7 @@ case "${target}" in 20@@ -3855,7 +3855,7 @@ case "${target}" in
21 nvptx*-*-*) 21 nvptx*-*-*)
22 noconfigdirs="$noconfigdirs target-libssp target-libstdc++-v3 target-libobjc" 22 noconfigdirs="$noconfigdirs target-libssp target-libstdc++-v3 target-libobjc"
23 ;; 23 ;;
@@ -27,10 +27,10 @@ index 2d615a9996..c4ad45c06c 100755
27 sh*-*-elf) 27 sh*-*-elf)
28 ;; 28 ;;
29diff --git a/gprof/configure b/gprof/configure 29diff --git a/gprof/configure b/gprof/configure
30index 1e25102976..6b43bf2b18 100755 30index 447cea7884..a730e20509 100755
31--- a/gprof/configure 31--- a/gprof/configure
32+++ b/gprof/configure 32+++ b/gprof/configure
33@@ -5874,6 +5874,11 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu) 33@@ -6162,6 +6162,11 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu)
34 lt_cv_deplibs_check_method=pass_all 34 lt_cv_deplibs_check_method=pass_all
35 ;; 35 ;;
36 36
@@ -43,5 +43,5 @@ index 1e25102976..6b43bf2b18 100755
43 if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then 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)$' 44 lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
45-- 45--
462.16.1 462.18.0
47 47
diff --git a/meta/recipes-devtools/binutils/binutils/0004-Point-scripts-location-to-libdir.patch b/meta/recipes-devtools/binutils/binutils/0004-Point-scripts-location-to-libdir.patch
index 3e29c5815a..bf1c1be27d 100644
--- a/meta/recipes-devtools/binutils/binutils/0004-Point-scripts-location-to-libdir.patch
+++ b/meta/recipes-devtools/binutils/binutils/0004-Point-scripts-location-to-libdir.patch
@@ -1,4 +1,4 @@
1From a0e893ea094c48fa803046ffa89e31907aee0597 Mon Sep 17 00:00:00 2001 1From 48ad5292b10408d4e5d5739022753a7183a1cbb3 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 04/15] Point scripts location to libdir 4Subject: [PATCH 04/15] Point scripts location to libdir
@@ -12,7 +12,7 @@ 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 6243c12528..3c5d6c8202 100644 15index d86ad0940c..c95b0ef025 100644
16--- a/ld/Makefile.am 16--- a/ld/Makefile.am
17+++ b/ld/Makefile.am 17+++ b/ld/Makefile.am
18@@ -57,7 +57,7 @@ endif 18@@ -57,7 +57,7 @@ endif
@@ -25,10 +25,10 @@ index 6243c12528..3c5d6c8202 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 760c037f9d..6dea692869 100644 28index 4792b2b013..789df2d01b 100644
29--- a/ld/Makefile.in 29--- a/ld/Makefile.in
30+++ b/ld/Makefile.in 30+++ b/ld/Makefile.in
31@@ -446,7 +446,7 @@ AM_CFLAGS = $(WARN_CFLAGS) $(ELF_CLFAGS) 31@@ -563,7 +563,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.
@@ -38,5 +38,5 @@ index 760c037f9d..6dea692869 100644
38 BFDDIR = $(BASEDIR)/bfd 38 BFDDIR = $(BASEDIR)/bfd
39 INCDIR = $(BASEDIR)/include 39 INCDIR = $(BASEDIR)/include
40-- 40--
412.16.1 412.18.0
42 42
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/0005-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch
index 2f49969371..1f589718ed 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/0005-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch
@@ -1,4 +1,4 @@
1From 518abb195d0eb47d8eef581d7fd0a5fd9fa73f7d Mon Sep 17 00:00:00 2001 1From 79e53510b1f9e16a21db312698fb1c1c442481e7 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 05/15] Only generate an RPATH entry if LD_RUN_PATH is not 4Subject: [PATCH 05/15] Only generate an RPATH entry if LD_RUN_PATH is not
@@ -15,10 +15,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
15 1 file changed, 4 insertions(+) 15 1 file changed, 4 insertions(+)
16 16
17diff --git a/ld/emultempl/elf32.em b/ld/emultempl/elf32.em 17diff --git a/ld/emultempl/elf32.em b/ld/emultempl/elf32.em
18index c0925fc9b9..7d7670a89f 100644 18index 1ad9d6b6fa..6a025a45b4 100644
19--- a/ld/emultempl/elf32.em 19--- a/ld/emultempl/elf32.em
20+++ b/ld/emultempl/elf32.em 20+++ b/ld/emultempl/elf32.em
21@@ -1470,6 +1470,8 @@ fragment <<EOF 21@@ -1471,6 +1471,8 @@ fragment <<EOF
22 && command_line.rpath == NULL) 22 && command_line.rpath == NULL)
23 { 23 {
24 path = (const char *) getenv ("LD_RUN_PATH"); 24 path = (const char *) getenv ("LD_RUN_PATH");
@@ -27,7 +27,7 @@ index c0925fc9b9..7d7670a89f 100644
27 if (path 27 if (path
28 && gld${EMULATION_NAME}_search_needed (path, &n, force)) 28 && gld${EMULATION_NAME}_search_needed (path, &n, force))
29 break; 29 break;
30@@ -1750,6 +1752,8 @@ gld${EMULATION_NAME}_before_allocation (void) 30@@ -1751,6 +1753,8 @@ gld${EMULATION_NAME}_before_allocation (void)
31 rpath = command_line.rpath; 31 rpath = command_line.rpath;
32 if (rpath == NULL) 32 if (rpath == NULL)
33 rpath = (const char *) getenv ("LD_RUN_PATH"); 33 rpath = (const char *) getenv ("LD_RUN_PATH");
@@ -37,5 +37,5 @@ index c0925fc9b9..7d7670a89f 100644
37 for (abfd = link_info.input_bfds; abfd; abfd = abfd->link.next) 37 for (abfd = link_info.input_bfds; abfd; abfd = abfd->link.next)
38 if (bfd_get_flavour (abfd) == bfd_target_elf_flavour) 38 if (bfd_get_flavour (abfd) == bfd_target_elf_flavour)
39-- 39--
402.16.1 402.18.0
41 41
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
index 333e2ee176..8550df0cb0 100644
--- a/meta/recipes-devtools/binutils/binutils/0006-Use-libtool-2.4.patch
+++ b/meta/recipes-devtools/binutils/binutils/0006-Use-libtool-2.4.patch
@@ -1,4 +1,4 @@
1From fad053cc59baa6277182b0fc90415a214060ba99 Mon Sep 17 00:00:00 2001 1From 11f6d2889725ad592ab789534ca9b858073df4d1 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Sun, 14 Feb 2016 17:04:07 +0000 3Date: Sun, 14 Feb 2016 17:04:07 +0000
4Subject: [PATCH 06/15] Use libtool 2.4 4Subject: [PATCH 06/15] Use libtool 2.4
@@ -9,27 +9,27 @@ Upstream-Status: Pending
9 9
10Signed-off-by: Khem Raj <raj.khem@gmail.com> 10Signed-off-by: Khem Raj <raj.khem@gmail.com>
11--- 11---
12 bfd/configure | 1318 +++++++++++++++++------ 12 bfd/configure | 1322 ++++++++++++++-----
13 bfd/configure.ac | 2 +- 13 bfd/configure.ac | 2 +-
14 binutils/configure | 1316 +++++++++++++++++------ 14 binutils/configure | 1320 ++++++++++++++-----
15 gas/configure | 1314 +++++++++++++++++------ 15 gas/configure | 1320 ++++++++++++++-----
16 gprof/configure | 1321 +++++++++++++++++------ 16 gprof/configure | 1327 ++++++++++++++-----
17 ld/configure | 1691 +++++++++++++++++++++-------- 17 ld/configure | 1695 ++++++++++++++++++------
18 libtool.m4 | 1080 +++++++++++++------ 18 libtool.m4 | 1080 +++++++++++-----
19 ltmain.sh | 2925 +++++++++++++++++++++++++++++++++----------------- 19 ltmain.sh | 2925 ++++++++++++++++++++++++++++--------------
20 ltoptions.m4 | 2 +- 20 ltoptions.m4 | 2 +-
21 ltversion.m4 | 12 +- 21 ltversion.m4 | 12 +-
22 lt~obsolete.m4 | 2 +- 22 lt~obsolete.m4 | 2 +-
23 opcodes/configure | 1318 +++++++++++++++++------ 23 opcodes/configure | 1322 ++++++++++++++-----
24 opcodes/configure.ac | 2 +- 24 opcodes/configure.ac | 2 +-
25 zlib/configure | 1316 +++++++++++++++++------ 25 zlib/configure | 1320 ++++++++++++++-----
26 14 files changed, 9926 insertions(+), 3693 deletions(-) 26 14 files changed, 9948 insertions(+), 3703 deletions(-)
27 27
28diff --git a/bfd/configure b/bfd/configure 28Index: git/bfd/configure
29index 6c2b24ebe3..5fdd723b7f 100755 29===================================================================
30--- a/bfd/configure 30--- git.orig/bfd/configure
31+++ b/bfd/configure 31+++ git/bfd/configure
32@@ -672,6 +672,9 @@ OTOOL 32@@ -704,6 +704,9 @@ OTOOL
33 LIPO 33 LIPO
34 NMEDIT 34 NMEDIT
35 DSYMUTIL 35 DSYMUTIL
@@ -39,7 +39,7 @@ index 6c2b24ebe3..5fdd723b7f 100755
39 OBJDUMP 39 OBJDUMP
40 LN_S 40 LN_S
41 NM 41 NM
42@@ -785,6 +788,7 @@ enable_static 42@@ -822,6 +825,7 @@ enable_static
43 with_pic 43 with_pic
44 enable_fast_install 44 enable_fast_install
45 with_gnu_ld 45 with_gnu_ld
@@ -47,7 +47,7 @@ index 6c2b24ebe3..5fdd723b7f 100755
47 enable_libtool_lock 47 enable_libtool_lock
48 enable_plugins 48 enable_plugins
49 enable_largefile 49 enable_largefile
50@@ -1461,6 +1465,8 @@ Optional Packages: 50@@ -1504,6 +1508,8 @@ Optional Packages:
51 --with-pic try to use only PIC/non-PIC objects [default=use 51 --with-pic try to use only PIC/non-PIC objects [default=use
52 both] 52 both]
53 --with-gnu-ld assume the C compiler uses GNU ld [default=no] 53 --with-gnu-ld assume the C compiler uses GNU ld [default=no]
@@ -56,7 +56,7 @@ index 6c2b24ebe3..5fdd723b7f 100755
56 --with-mmap try using mmap for BFD input files if available 56 --with-mmap try using mmap for BFD input files if available
57 --with-separate-debug-dir=DIR 57 --with-separate-debug-dir=DIR
58 Look for global separate debug info in DIR 58 Look for global separate debug info in DIR
59@@ -5393,8 +5399,8 @@ esac 59@@ -5693,8 +5699,8 @@ esac
60 60
61 61
62 62
@@ -67,7 +67,7 @@ index 6c2b24ebe3..5fdd723b7f 100755
67 67
68 68
69 69
70@@ -5434,7 +5440,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO 70@@ -5734,7 +5740,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
71 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 71 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
72 $as_echo_n "checking how to print strings... " >&6; } 72 $as_echo_n "checking how to print strings... " >&6; }
73 # Test print first, because it will be a builtin if present. 73 # Test print first, because it will be a builtin if present.
@@ -76,7 +76,7 @@ index 6c2b24ebe3..5fdd723b7f 100755
76 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then 76 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
77 ECHO='print -r --' 77 ECHO='print -r --'
78 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then 78 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
79@@ -6120,8 +6126,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; 79@@ -6420,8 +6426,8 @@ $as_echo_n "checking whether the shell u
80 # Try some XSI features 80 # Try some XSI features
81 xsi_shell=no 81 xsi_shell=no
82 ( _lt_dummy="a/b/c" 82 ( _lt_dummy="a/b/c"
@@ -87,13 +87,13 @@ index 6c2b24ebe3..5fdd723b7f 100755
87 && eval 'test $(( 1 + 1 )) -eq 2 \ 87 && eval 'test $(( 1 + 1 )) -eq 2 \
88 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ 88 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
89 && xsi_shell=yes 89 && xsi_shell=yes
90@@ -6170,6 +6176,80 @@ esac 90@@ -6470,6 +6476,80 @@ esac
91 91
92 92
93 93
94+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5 94+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5
95+$as_echo_n "checking how to convert $build file names to $host format... " >&6; } 95+$as_echo_n "checking how to convert $build file names to $host format... " >&6; }
96+if test "${lt_cv_to_host_file_cmd+set}" = set; then : 96+if ${lt_cv_to_host_file_cmd+:} false; then :
97+ $as_echo_n "(cached) " >&6 97+ $as_echo_n "(cached) " >&6
98+else 98+else
99+ case $host in 99+ case $host in
@@ -140,7 +140,7 @@ index 6c2b24ebe3..5fdd723b7f 100755
140+ 140+
141+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5 141+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5
142+$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; } 142+$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; }
143+if test "${lt_cv_to_tool_file_cmd+set}" = set; then : 143+if ${lt_cv_to_tool_file_cmd+:} false; then :
144+ $as_echo_n "(cached) " >&6 144+ $as_echo_n "(cached) " >&6
145+else 145+else
146+ #assume ordinary cross tools, or native build. 146+ #assume ordinary cross tools, or native build.
@@ -167,8 +167,8 @@ index 6c2b24ebe3..5fdd723b7f 100755
167+ 167+
168 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 168 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
169 $as_echo_n "checking for $LD option to reload object files... " >&6; } 169 $as_echo_n "checking for $LD option to reload object files... " >&6; }
170 if test "${lt_cv_ld_reload_flag+set}" = set; then : 170 if ${lt_cv_ld_reload_flag+:} false; then :
171@@ -6186,6 +6266,11 @@ case $reload_flag in 171@@ -6486,6 +6566,11 @@ case $reload_flag in
172 esac 172 esac
173 reload_cmds='$LD$reload_flag -o $output$reload_objs' 173 reload_cmds='$LD$reload_flag -o $output$reload_objs'
174 case $host_os in 174 case $host_os in
@@ -180,7 +180,7 @@ index 6c2b24ebe3..5fdd723b7f 100755
180 darwin*) 180 darwin*)
181 if test "$GCC" = yes; then 181 if test "$GCC" = yes; then
182 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' 182 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
183@@ -6354,7 +6439,8 @@ mingw* | pw32*) 183@@ -6654,7 +6739,8 @@ mingw* | pw32*)
184 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' 184 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
185 lt_cv_file_magic_cmd='func_win32_libid' 185 lt_cv_file_magic_cmd='func_win32_libid'
186 else 186 else
@@ -190,7 +190,7 @@ index 6c2b24ebe3..5fdd723b7f 100755
190 lt_cv_file_magic_cmd='$OBJDUMP -f' 190 lt_cv_file_magic_cmd='$OBJDUMP -f'
191 fi 191 fi
192 ;; 192 ;;
193@@ -6508,6 +6594,21 @@ esac 193@@ -6808,6 +6894,21 @@ esac
194 fi 194 fi
195 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 195 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
196 $as_echo "$lt_cv_deplibs_check_method" >&6; } 196 $as_echo "$lt_cv_deplibs_check_method" >&6; }
@@ -212,7 +212,7 @@ index 6c2b24ebe3..5fdd723b7f 100755
212 file_magic_cmd=$lt_cv_file_magic_cmd 212 file_magic_cmd=$lt_cv_file_magic_cmd
213 deplibs_check_method=$lt_cv_deplibs_check_method 213 deplibs_check_method=$lt_cv_deplibs_check_method
214 test -z "$deplibs_check_method" && deplibs_check_method=unknown 214 test -z "$deplibs_check_method" && deplibs_check_method=unknown
215@@ -6521,11 +6622,164 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown 215@@ -6823,9 +6924,162 @@ test -z "$deplibs_check_method" && depli
216 216
217 217
218 218
@@ -226,8 +226,6 @@ index 6c2b24ebe3..5fdd723b7f 100755
226+ 226+
227+ 227+
228+ 228+
229
230
231 if test -n "$ac_tool_prefix"; then 229 if test -n "$ac_tool_prefix"; then
232- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. 230- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
233-set dummy ${ac_tool_prefix}ar; ac_word=$2 231-set dummy ${ac_tool_prefix}ar; ac_word=$2
@@ -235,7 +233,7 @@ index 6c2b24ebe3..5fdd723b7f 100755
235+set dummy ${ac_tool_prefix}dlltool; ac_word=$2 233+set dummy ${ac_tool_prefix}dlltool; ac_word=$2
236+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 234+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
237+$as_echo_n "checking for $ac_word... " >&6; } 235+$as_echo_n "checking for $ac_word... " >&6; }
238+if test "${ac_cv_prog_DLLTOOL+set}" = set; then : 236+if ${ac_cv_prog_DLLTOOL+:} false; then :
239+ $as_echo_n "(cached) " >&6 237+ $as_echo_n "(cached) " >&6
240+else 238+else
241+ if test -n "$DLLTOOL"; then 239+ if test -n "$DLLTOOL"; then
@@ -247,7 +245,7 @@ index 6c2b24ebe3..5fdd723b7f 100755
247+ IFS=$as_save_IFS 245+ IFS=$as_save_IFS
248+ test -z "$as_dir" && as_dir=. 246+ test -z "$as_dir" && as_dir=.
249+ for ac_exec_ext in '' $ac_executable_extensions; do 247+ for ac_exec_ext in '' $ac_executable_extensions; do
250+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 248+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
251+ ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" 249+ ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
252+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 250+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
253+ break 2 251+ break 2
@@ -275,7 +273,7 @@ index 6c2b24ebe3..5fdd723b7f 100755
275+set dummy dlltool; ac_word=$2 273+set dummy dlltool; ac_word=$2
276+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 274+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
277+$as_echo_n "checking for $ac_word... " >&6; } 275+$as_echo_n "checking for $ac_word... " >&6; }
278+if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then : 276+if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then :
279+ $as_echo_n "(cached) " >&6 277+ $as_echo_n "(cached) " >&6
280+else 278+else
281+ if test -n "$ac_ct_DLLTOOL"; then 279+ if test -n "$ac_ct_DLLTOOL"; then
@@ -287,7 +285,7 @@ index 6c2b24ebe3..5fdd723b7f 100755
287+ IFS=$as_save_IFS 285+ IFS=$as_save_IFS
288+ test -z "$as_dir" && as_dir=. 286+ test -z "$as_dir" && as_dir=.
289+ for ac_exec_ext in '' $ac_executable_extensions; do 287+ for ac_exec_ext in '' $ac_executable_extensions; do
290+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 288+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
291+ ac_cv_prog_ac_ct_DLLTOOL="dlltool" 289+ ac_cv_prog_ac_ct_DLLTOOL="dlltool"
292+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 290+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
293+ break 2 291+ break 2
@@ -335,7 +333,7 @@ index 6c2b24ebe3..5fdd723b7f 100755
335+ 333+
336+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5 334+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5
337+$as_echo_n "checking how to associate runtime and link libraries... " >&6; } 335+$as_echo_n "checking how to associate runtime and link libraries... " >&6; }
338+if test "${lt_cv_sharedlib_from_linklib_cmd+set}" = set; then : 336+if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then :
339+ $as_echo_n "(cached) " >&6 337+ $as_echo_n "(cached) " >&6
340+else 338+else
341+ lt_cv_sharedlib_from_linklib_cmd='unknown' 339+ lt_cv_sharedlib_from_linklib_cmd='unknown'
@@ -378,17 +376,17 @@ index 6c2b24ebe3..5fdd723b7f 100755
378+set dummy $ac_tool_prefix$ac_prog; ac_word=$2 376+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
379 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 377 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
380 $as_echo_n "checking for $ac_word... " >&6; } 378 $as_echo_n "checking for $ac_word... " >&6; }
381 if test "${ac_cv_prog_AR+set}" = set; then : 379 if ${ac_cv_prog_AR+:} false; then :
382@@ -6541,7 +6795,7 @@ do 380@@ -6841,7 +7095,7 @@ do
383 test -z "$as_dir" && as_dir=. 381 test -z "$as_dir" && as_dir=.
384 for ac_exec_ext in '' $ac_executable_extensions; do 382 for ac_exec_ext in '' $ac_executable_extensions; do
385 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 383 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
386- ac_cv_prog_AR="${ac_tool_prefix}ar" 384- ac_cv_prog_AR="${ac_tool_prefix}ar"
387+ ac_cv_prog_AR="$ac_tool_prefix$ac_prog" 385+ ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
388 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 386 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
389 break 2 387 break 2
390 fi 388 fi
391@@ -6561,11 +6815,15 @@ $as_echo "no" >&6; } 389@@ -6861,11 +7115,15 @@ $as_echo "no" >&6; }
392 fi 390 fi
393 391
394 392
@@ -406,17 +404,17 @@ index 6c2b24ebe3..5fdd723b7f 100755
406+set dummy $ac_prog; ac_word=$2 404+set dummy $ac_prog; ac_word=$2
407 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 405 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
408 $as_echo_n "checking for $ac_word... " >&6; } 406 $as_echo_n "checking for $ac_word... " >&6; }
409 if test "${ac_cv_prog_ac_ct_AR+set}" = set; then : 407 if ${ac_cv_prog_ac_ct_AR+:} false; then :
410@@ -6581,7 +6839,7 @@ do 408@@ -6881,7 +7139,7 @@ do
411 test -z "$as_dir" && as_dir=. 409 test -z "$as_dir" && as_dir=.
412 for ac_exec_ext in '' $ac_executable_extensions; do 410 for ac_exec_ext in '' $ac_executable_extensions; do
413 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 411 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
414- ac_cv_prog_ac_ct_AR="ar" 412- ac_cv_prog_ac_ct_AR="ar"
415+ ac_cv_prog_ac_ct_AR="$ac_prog" 413+ ac_cv_prog_ac_ct_AR="$ac_prog"
416 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 414 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
417 break 2 415 break 2
418 fi 416 fi
419@@ -6600,6 +6858,10 @@ else 417@@ -6900,6 +7158,10 @@ else
420 $as_echo "no" >&6; } 418 $as_echo "no" >&6; }
421 fi 419 fi
422 420
@@ -427,7 +425,7 @@ index 6c2b24ebe3..5fdd723b7f 100755
427 if test "x$ac_ct_AR" = x; then 425 if test "x$ac_ct_AR" = x; then
428 AR="false" 426 AR="false"
429 else 427 else
430@@ -6611,16 +6873,72 @@ ac_tool_warned=yes ;; 428@@ -6911,16 +7173,72 @@ ac_tool_warned=yes ;;
431 esac 429 esac
432 AR=$ac_ct_AR 430 AR=$ac_ct_AR
433 fi 431 fi
@@ -449,16 +447,16 @@ index 6c2b24ebe3..5fdd723b7f 100755
449+ 447+
450+ 448+
451+ 449+
452+ 450
453+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 451+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
454+$as_echo_n "checking for archiver @FILE support... " >&6; } 452+$as_echo_n "checking for archiver @FILE support... " >&6; }
455+if test "${lt_cv_ar_at_file+set}" = set; then : 453+if ${lt_cv_ar_at_file+:} false; then :
456+ $as_echo_n "(cached) " >&6 454+ $as_echo_n "(cached) " >&6
457+else 455+else
458+ lt_cv_ar_at_file=no 456+ lt_cv_ar_at_file=no
459+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext 457+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
460+/* end confdefs.h. */ 458+/* end confdefs.h. */
461+ 459
462+int 460+int
463+main () 461+main ()
464+{ 462+{
@@ -491,11 +489,11 @@ index 6c2b24ebe3..5fdd723b7f 100755
491 489
492+fi 490+fi
493+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext 491+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
494 492+
495+fi 493+fi
496+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 494+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
497+$as_echo "$lt_cv_ar_at_file" >&6; } 495+$as_echo "$lt_cv_ar_at_file" >&6; }
498 496+
499+if test "x$lt_cv_ar_at_file" = xno; then 497+if test "x$lt_cv_ar_at_file" = xno; then
500+ archiver_list_spec= 498+ archiver_list_spec=
501+else 499+else
@@ -504,7 +502,7 @@ index 6c2b24ebe3..5fdd723b7f 100755
504 502
505 503
506 504
507@@ -6962,8 +7280,8 @@ esac 505@@ -7262,8 +7580,8 @@ esac
508 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" 506 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
509 507
510 # Transform an extracted symbol line into symbol name and symbol address 508 # Transform an extracted symbol line into symbol name and symbol address
@@ -515,7 +513,7 @@ index 6c2b24ebe3..5fdd723b7f 100755
515 513
516 # Handle CRLF in mingw tool chain 514 # Handle CRLF in mingw tool chain
517 opt_cr= 515 opt_cr=
518@@ -6999,6 +7317,7 @@ for ac_symprfx in "" "_"; do 516@@ -7299,6 +7617,7 @@ for ac_symprfx in "" "_"; do
519 else 517 else
520 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" 518 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
521 fi 519 fi
@@ -523,7 +521,7 @@ index 6c2b24ebe3..5fdd723b7f 100755
523 521
524 # Check to see that the pipe works correctly. 522 # Check to see that the pipe works correctly.
525 pipe_works=no 523 pipe_works=no
526@@ -7040,6 +7359,18 @@ _LT_EOF 524@@ -7340,6 +7659,18 @@ _LT_EOF
527 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then 525 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
528 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then 526 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
529 cat <<_LT_EOF > conftest.$ac_ext 527 cat <<_LT_EOF > conftest.$ac_ext
@@ -542,7 +540,7 @@ index 6c2b24ebe3..5fdd723b7f 100755
542 #ifdef __cplusplus 540 #ifdef __cplusplus
543 extern "C" { 541 extern "C" {
544 #endif 542 #endif
545@@ -7051,7 +7382,7 @@ _LT_EOF 543@@ -7351,7 +7682,7 @@ _LT_EOF
546 cat <<_LT_EOF >> conftest.$ac_ext 544 cat <<_LT_EOF >> conftest.$ac_ext
547 545
548 /* The mapping between symbol names and symbols. */ 546 /* The mapping between symbol names and symbols. */
@@ -551,7 +549,7 @@ index 6c2b24ebe3..5fdd723b7f 100755
551 const char *name; 549 const char *name;
552 void *address; 550 void *address;
553 } 551 }
554@@ -7077,8 +7408,8 @@ static const void *lt_preloaded_setup() { 552@@ -7377,8 +7708,8 @@ static const void *lt_preloaded_setup()
555 _LT_EOF 553 _LT_EOF
556 # Now try linking the two files. 554 # Now try linking the two files.
557 mv conftest.$ac_objext conftstm.$ac_objext 555 mv conftest.$ac_objext conftstm.$ac_objext
@@ -562,7 +560,7 @@ index 6c2b24ebe3..5fdd723b7f 100755
562 LIBS="conftstm.$ac_objext" 560 LIBS="conftstm.$ac_objext"
563 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" 561 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
564 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 562 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
565@@ -7088,8 +7419,8 @@ _LT_EOF 563@@ -7388,8 +7719,8 @@ _LT_EOF
566 test $ac_status = 0; } && test -s conftest${ac_exeext}; then 564 test $ac_status = 0; } && test -s conftest${ac_exeext}; then
567 pipe_works=yes 565 pipe_works=yes
568 fi 566 fi
@@ -573,7 +571,7 @@ index 6c2b24ebe3..5fdd723b7f 100755
573 else 571 else
574 echo "cannot find nm_test_func in $nlist" >&5 572 echo "cannot find nm_test_func in $nlist" >&5
575 fi 573 fi
576@@ -7126,6 +7457,16 @@ else 574@@ -7426,6 +7757,20 @@ else
577 $as_echo "ok" >&6; } 575 $as_echo "ok" >&6; }
578 fi 576 fi
579 577
@@ -587,20 +585,17 @@ index 6c2b24ebe3..5fdd723b7f 100755
587+ 585+
588+ 586+
589+ 587+
588+
589+
590+
591+
590 592
591 593
592 594
593@@ -7142,6 +7483,45 @@ fi 595@@ -7445,6 +7790,41 @@ fi
594 596
595 597
596 598
597+
598+
599+
600+
601+
602+
603+
604+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 599+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
605+$as_echo_n "checking for sysroot... " >&6; } 600+$as_echo_n "checking for sysroot... " >&6; }
606+ 601+
@@ -627,16 +622,19 @@ index 6c2b24ebe3..5fdd723b7f 100755
627+ *) 622+ *)
628+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5 623+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5
629+$as_echo "${with_libtool_sysroot}" >&6; } 624+$as_echo "${with_libtool_sysroot}" >&6; }
630+ as_fn_error "The sysroot must be an absolute path." "$LINENO" 5 625+ as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5
631+ ;; 626+ ;;
632+esac 627+esac
633+ 628+
634+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 629+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
635+$as_echo "${lt_sysroot:-no}" >&6; } 630+$as_echo "${lt_sysroot:-no}" >&6; }
631+
632+
633+
636 634
637 635
638 636 # Check whether --enable-libtool-lock was given.
639@@ -7353,6 +7733,123 @@ esac 637@@ -7653,6 +8033,123 @@ esac
640 638
641 need_locks="$enable_libtool_lock" 639 need_locks="$enable_libtool_lock"
642 640
@@ -645,7 +643,7 @@ index 6c2b24ebe3..5fdd723b7f 100755
645+set dummy ${ac_tool_prefix}mt; ac_word=$2 643+set dummy ${ac_tool_prefix}mt; ac_word=$2
646+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 644+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
647+$as_echo_n "checking for $ac_word... " >&6; } 645+$as_echo_n "checking for $ac_word... " >&6; }
648+if test "${ac_cv_prog_MANIFEST_TOOL+set}" = set; then : 646+if ${ac_cv_prog_MANIFEST_TOOL+:} false; then :
649+ $as_echo_n "(cached) " >&6 647+ $as_echo_n "(cached) " >&6
650+else 648+else
651+ if test -n "$MANIFEST_TOOL"; then 649+ if test -n "$MANIFEST_TOOL"; then
@@ -657,7 +655,7 @@ index 6c2b24ebe3..5fdd723b7f 100755
657+ IFS=$as_save_IFS 655+ IFS=$as_save_IFS
658+ test -z "$as_dir" && as_dir=. 656+ test -z "$as_dir" && as_dir=.
659+ for ac_exec_ext in '' $ac_executable_extensions; do 657+ for ac_exec_ext in '' $ac_executable_extensions; do
660+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 658+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
661+ ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" 659+ ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
662+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 660+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
663+ break 2 661+ break 2
@@ -685,7 +683,7 @@ index 6c2b24ebe3..5fdd723b7f 100755
685+set dummy mt; ac_word=$2 683+set dummy mt; ac_word=$2
686+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 684+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
687+$as_echo_n "checking for $ac_word... " >&6; } 685+$as_echo_n "checking for $ac_word... " >&6; }
688+if test "${ac_cv_prog_ac_ct_MANIFEST_TOOL+set}" = set; then : 686+if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then :
689+ $as_echo_n "(cached) " >&6 687+ $as_echo_n "(cached) " >&6
690+else 688+else
691+ if test -n "$ac_ct_MANIFEST_TOOL"; then 689+ if test -n "$ac_ct_MANIFEST_TOOL"; then
@@ -697,7 +695,7 @@ index 6c2b24ebe3..5fdd723b7f 100755
697+ IFS=$as_save_IFS 695+ IFS=$as_save_IFS
698+ test -z "$as_dir" && as_dir=. 696+ test -z "$as_dir" && as_dir=.
699+ for ac_exec_ext in '' $ac_executable_extensions; do 697+ for ac_exec_ext in '' $ac_executable_extensions; do
700+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 698+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
701+ ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" 699+ ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
702+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 700+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
703+ break 2 701+ break 2
@@ -735,7 +733,7 @@ index 6c2b24ebe3..5fdd723b7f 100755
735+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt 733+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
736+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5 734+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5
737+$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; } 735+$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; }
738+if test "${lt_cv_path_mainfest_tool+set}" = set; then : 736+if ${lt_cv_path_mainfest_tool+:} false; then :
739+ $as_echo_n "(cached) " >&6 737+ $as_echo_n "(cached) " >&6
740+else 738+else
741+ lt_cv_path_mainfest_tool=no 739+ lt_cv_path_mainfest_tool=no
@@ -760,7 +758,7 @@ index 6c2b24ebe3..5fdd723b7f 100755
760 758
761 case $host_os in 759 case $host_os in
762 rhapsody* | darwin*) 760 rhapsody* | darwin*)
763@@ -7916,6 +8413,8 @@ _LT_EOF 761@@ -8216,6 +8713,8 @@ _LT_EOF
764 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 762 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
765 echo "$AR cru libconftest.a conftest.o" >&5 763 echo "$AR cru libconftest.a conftest.o" >&5
766 $AR cru libconftest.a conftest.o 2>&5 764 $AR cru libconftest.a conftest.o 2>&5
@@ -769,7 +767,7 @@ index 6c2b24ebe3..5fdd723b7f 100755
769 cat > conftest.c << _LT_EOF 767 cat > conftest.c << _LT_EOF
770 int main() { return 0;} 768 int main() { return 0;}
771 _LT_EOF 769 _LT_EOF
772@@ -8080,7 +8579,8 @@ fi 770@@ -8380,7 +8879,8 @@ fi
773 LIBTOOL_DEPS="$ltmain" 771 LIBTOOL_DEPS="$ltmain"
774 772
775 # Always use our own libtool. 773 # Always use our own libtool.
@@ -779,7 +777,7 @@ index 6c2b24ebe3..5fdd723b7f 100755
779 777
780 778
781 779
782@@ -8169,7 +8669,7 @@ aix3*) 780@@ -8469,7 +8969,7 @@ aix3*)
783 esac 781 esac
784 782
785 # Global variables: 783 # Global variables:
@@ -788,7 +786,7 @@ index 6c2b24ebe3..5fdd723b7f 100755
788 can_build_shared=yes 786 can_build_shared=yes
789 787
790 # All known linkers require a `.a' archive for static linking (except MSVC, 788 # All known linkers require a `.a' archive for static linking (except MSVC,
791@@ -8467,8 +8967,6 @@ fi 789@@ -8767,8 +9267,6 @@ fi
792 lt_prog_compiler_pic= 790 lt_prog_compiler_pic=
793 lt_prog_compiler_static= 791 lt_prog_compiler_static=
794 792
@@ -797,7 +795,7 @@ index 6c2b24ebe3..5fdd723b7f 100755
797 795
798 if test "$GCC" = yes; then 796 if test "$GCC" = yes; then
799 lt_prog_compiler_wl='-Wl,' 797 lt_prog_compiler_wl='-Wl,'
800@@ -8634,6 +9132,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 798@@ -8934,6 +9432,12 @@ $as_echo_n "checking for $compiler optio
801 lt_prog_compiler_pic='--shared' 799 lt_prog_compiler_pic='--shared'
802 lt_prog_compiler_static='--static' 800 lt_prog_compiler_static='--static'
803 ;; 801 ;;
@@ -810,7 +808,7 @@ index 6c2b24ebe3..5fdd723b7f 100755
810 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) 808 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
811 # Portland Group compilers (*not* the Pentium gcc compiler, 809 # Portland Group compilers (*not* the Pentium gcc compiler,
812 # which looks to be a dead project) 810 # which looks to be a dead project)
813@@ -8696,7 +9200,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 811@@ -8996,7 +9500,7 @@ $as_echo_n "checking for $compiler optio
814 lt_prog_compiler_pic='-KPIC' 812 lt_prog_compiler_pic='-KPIC'
815 lt_prog_compiler_static='-Bstatic' 813 lt_prog_compiler_static='-Bstatic'
816 case $cc_basename in 814 case $cc_basename in
@@ -819,7 +817,7 @@ index 6c2b24ebe3..5fdd723b7f 100755
819 lt_prog_compiler_wl='-Qoption ld ';; 817 lt_prog_compiler_wl='-Qoption ld ';;
820 *) 818 *)
821 lt_prog_compiler_wl='-Wl,';; 819 lt_prog_compiler_wl='-Wl,';;
822@@ -8753,13 +9257,17 @@ case $host_os in 820@@ -9053,13 +9557,17 @@ case $host_os in
823 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" 821 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
824 ;; 822 ;;
825 esac 823 esac
@@ -832,7 +830,7 @@ index 6c2b24ebe3..5fdd723b7f 100755
832 830
833+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 831+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
834+$as_echo_n "checking for $compiler option to produce PIC... " >&6; } 832+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
835+if test "${lt_cv_prog_compiler_pic+set}" = set; then : 833+if ${lt_cv_prog_compiler_pic+:} false; then :
836+ $as_echo_n "(cached) " >&6 834+ $as_echo_n "(cached) " >&6
837+else 835+else
838+ lt_cv_prog_compiler_pic=$lt_prog_compiler_pic 836+ lt_cv_prog_compiler_pic=$lt_prog_compiler_pic
@@ -843,7 +841,7 @@ index 6c2b24ebe3..5fdd723b7f 100755
843 841
844 # 842 #
845 # Check to make sure the PIC flag actually works. 843 # Check to make sure the PIC flag actually works.
846@@ -8820,6 +9328,11 @@ fi 844@@ -9120,6 +9628,11 @@ fi
847 845
848 846
849 847
@@ -855,7 +853,7 @@ index 6c2b24ebe3..5fdd723b7f 100755
855 # 853 #
856 # Check to make sure the static flag actually works. 854 # Check to make sure the static flag actually works.
857 # 855 #
858@@ -9170,7 +9683,8 @@ _LT_EOF 856@@ -9470,7 +9983,8 @@ _LT_EOF
859 allow_undefined_flag=unsupported 857 allow_undefined_flag=unsupported
860 always_export_symbols=no 858 always_export_symbols=no
861 enable_shared_with_static_runtimes=yes 859 enable_shared_with_static_runtimes=yes
@@ -865,7 +863,7 @@ index 6c2b24ebe3..5fdd723b7f 100755
865 863
866 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then 864 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
867 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' 865 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
868@@ -9269,12 +9783,12 @@ _LT_EOF 866@@ -9569,12 +10083,12 @@ _LT_EOF
869 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' 867 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
870 hardcode_libdir_flag_spec= 868 hardcode_libdir_flag_spec=
871 hardcode_libdir_flag_spec_ld='-rpath $libdir' 869 hardcode_libdir_flag_spec_ld='-rpath $libdir'
@@ -880,7 +878,7 @@ index 6c2b24ebe3..5fdd723b7f 100755
880 fi 878 fi
881 ;; 879 ;;
882 esac 880 esac
883@@ -9288,8 +9802,8 @@ _LT_EOF 881@@ -9588,8 +10102,8 @@ _LT_EOF
884 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' 882 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
885 wlarc= 883 wlarc=
886 else 884 else
@@ -891,7 +889,7 @@ index 6c2b24ebe3..5fdd723b7f 100755
891 fi 889 fi
892 ;; 890 ;;
893 891
894@@ -9307,8 +9821,8 @@ _LT_EOF 892@@ -9607,8 +10121,8 @@ _LT_EOF
895 893
896 _LT_EOF 894 _LT_EOF
897 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 895 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -902,7 +900,7 @@ index 6c2b24ebe3..5fdd723b7f 100755
902 else 900 else
903 ld_shlibs=no 901 ld_shlibs=no
904 fi 902 fi
905@@ -9354,8 +9868,8 @@ _LT_EOF 903@@ -9654,8 +10168,8 @@ _LT_EOF
906 904
907 *) 905 *)
908 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 906 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -913,7 +911,7 @@ index 6c2b24ebe3..5fdd723b7f 100755
913 else 911 else
914 ld_shlibs=no 912 ld_shlibs=no
915 fi 913 fi
916@@ -9485,7 +9999,13 @@ _LT_EOF 914@@ -9785,7 +10299,13 @@ _LT_EOF
917 allow_undefined_flag='-berok' 915 allow_undefined_flag='-berok'
918 # Determine the default libpath from the value encoded in an 916 # Determine the default libpath from the value encoded in an
919 # empty executable. 917 # empty executable.
@@ -921,14 +919,14 @@ index 6c2b24ebe3..5fdd723b7f 100755
921+ if test "${lt_cv_aix_libpath+set}" = set; then 919+ if test "${lt_cv_aix_libpath+set}" = set; then
922+ aix_libpath=$lt_cv_aix_libpath 920+ aix_libpath=$lt_cv_aix_libpath
923+else 921+else
924+ if test "${lt_cv_aix_libpath_+set}" = set; then : 922+ if ${lt_cv_aix_libpath_+:} false; then :
925+ $as_echo_n "(cached) " >&6 923+ $as_echo_n "(cached) " >&6
926+else 924+else
927+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext 925+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
928 /* end confdefs.h. */ 926 /* end confdefs.h. */
929 927
930 int 928 int
931@@ -9498,22 +10018,29 @@ main () 929@@ -9798,22 +10318,29 @@ main ()
932 _ACEOF 930 _ACEOF
933 if ac_fn_c_try_link "$LINENO"; then : 931 if ac_fn_c_try_link "$LINENO"; then :
934 932
@@ -971,7 +969,7 @@ index 6c2b24ebe3..5fdd723b7f 100755
971 969
972 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 970 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
973 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" 971 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"
974@@ -9525,7 +10052,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 972@@ -9825,7 +10352,13 @@ if test -z "$aix_libpath"; then aix_libp
975 else 973 else
976 # Determine the default libpath from the value encoded in an 974 # Determine the default libpath from the value encoded in an
977 # empty executable. 975 # empty executable.
@@ -979,14 +977,14 @@ index 6c2b24ebe3..5fdd723b7f 100755
979+ if test "${lt_cv_aix_libpath+set}" = set; then 977+ if test "${lt_cv_aix_libpath+set}" = set; then
980+ aix_libpath=$lt_cv_aix_libpath 978+ aix_libpath=$lt_cv_aix_libpath
981+else 979+else
982+ if test "${lt_cv_aix_libpath_+set}" = set; then : 980+ if ${lt_cv_aix_libpath_+:} false; then :
983+ $as_echo_n "(cached) " >&6 981+ $as_echo_n "(cached) " >&6
984+else 982+else
985+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext 983+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
986 /* end confdefs.h. */ 984 /* end confdefs.h. */
987 985
988 int 986 int
989@@ -9538,22 +10071,29 @@ main () 987@@ -9838,22 +10371,29 @@ main ()
990 _ACEOF 988 _ACEOF
991 if ac_fn_c_try_link "$LINENO"; then : 989 if ac_fn_c_try_link "$LINENO"; then :
992 990
@@ -1029,7 +1027,7 @@ index 6c2b24ebe3..5fdd723b7f 100755
1029 1027
1030 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 1028 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
1031 # Warning - without using the other run time loading flags, 1029 # Warning - without using the other run time loading flags,
1032@@ -9598,20 +10138,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 1030@@ -9898,20 +10438,63 @@ if test -z "$aix_libpath"; then aix_libp
1033 # Microsoft Visual C++. 1031 # Microsoft Visual C++.
1034 # hardcode_libdir_flag_spec is actually meaningless, as there is 1032 # hardcode_libdir_flag_spec is actually meaningless, as there is
1035 # no search path for DLLs. 1033 # no search path for DLLs.
@@ -1107,7 +1105,7 @@ index 6c2b24ebe3..5fdd723b7f 100755
1107 ;; 1105 ;;
1108 1106
1109 darwin* | rhapsody*) 1107 darwin* | rhapsody*)
1110@@ -9672,7 +10255,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 1108@@ -9972,7 +10555,7 @@ if test -z "$aix_libpath"; then aix_libp
1111 1109
1112 # FreeBSD 3 and greater uses gcc -shared to do shared libraries. 1110 # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
1113 freebsd* | dragonfly*) 1111 freebsd* | dragonfly*)
@@ -1116,7 +1114,7 @@ index 6c2b24ebe3..5fdd723b7f 100755
1116 hardcode_libdir_flag_spec='-R$libdir' 1114 hardcode_libdir_flag_spec='-R$libdir'
1117 hardcode_direct=yes 1115 hardcode_direct=yes
1118 hardcode_shlibpath_var=no 1116 hardcode_shlibpath_var=no
1119@@ -9680,7 +10263,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 1117@@ -9980,7 +10563,7 @@ if test -z "$aix_libpath"; then aix_libp
1120 1118
1121 hpux9*) 1119 hpux9*)
1122 if test "$GCC" = yes; then 1120 if test "$GCC" = yes; then
@@ -1125,7 +1123,7 @@ index 6c2b24ebe3..5fdd723b7f 100755
1125 else 1123 else
1126 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' 1124 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'
1127 fi 1125 fi
1128@@ -9696,7 +10279,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 1126@@ -9996,7 +10579,7 @@ if test -z "$aix_libpath"; then aix_libp
1129 1127
1130 hpux10*) 1128 hpux10*)
1131 if test "$GCC" = yes && test "$with_gnu_ld" = no; then 1129 if test "$GCC" = yes && test "$with_gnu_ld" = no; then
@@ -1134,7 +1132,7 @@ index 6c2b24ebe3..5fdd723b7f 100755
1134 else 1132 else
1135 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' 1133 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
1136 fi 1134 fi
1137@@ -9720,10 +10303,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 1135@@ -10020,10 +10603,10 @@ if test -z "$aix_libpath"; then aix_libp
1138 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' 1136 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
1139 ;; 1137 ;;
1140 ia64*) 1138 ia64*)
@@ -1147,7 +1145,7 @@ index 6c2b24ebe3..5fdd723b7f 100755
1147 ;; 1145 ;;
1148 esac 1146 esac
1149 else 1147 else
1150@@ -9802,23 +10385,36 @@ fi 1148@@ -10102,23 +10685,36 @@ fi
1151 1149
1152 irix5* | irix6* | nonstopux*) 1150 irix5* | irix6* | nonstopux*)
1153 if test "$GCC" = yes; then 1151 if test "$GCC" = yes; then
@@ -1162,7 +1160,7 @@ index 6c2b24ebe3..5fdd723b7f 100755
1162+ # This should be the same for all languages, so no per-tag cache variable. 1160+ # This should be the same for all languages, so no per-tag cache variable.
1163+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5 1161+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5
1164+$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; } 1162+$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; }
1165+if test "${lt_cv_irix_exported_symbol+set}" = set; then : 1163+if ${lt_cv_irix_exported_symbol+:} false; then :
1166+ $as_echo_n "(cached) " >&6 1164+ $as_echo_n "(cached) " >&6
1167+else 1165+else
1168+ save_LDFLAGS="$LDFLAGS" 1166+ save_LDFLAGS="$LDFLAGS"
@@ -1192,7 +1190,7 @@ index 6c2b24ebe3..5fdd723b7f 100755
1192 else 1190 else
1193 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' 1191 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'
1194 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' 1192 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'
1195@@ -9903,7 +10499,7 @@ rm -f core conftest.err conftest.$ac_objext \ 1193@@ -10203,7 +10799,7 @@ rm -f core conftest.err conftest.$ac_obj
1196 osf4* | osf5*) # as osf3* with the addition of -msym flag 1194 osf4* | osf5*) # as osf3* with the addition of -msym flag
1197 if test "$GCC" = yes; then 1195 if test "$GCC" = yes; then
1198 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' 1196 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
@@ -1201,7 +1199,7 @@ index 6c2b24ebe3..5fdd723b7f 100755
1201 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' 1199 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
1202 else 1200 else
1203 allow_undefined_flag=' -expect_unresolved \*' 1201 allow_undefined_flag=' -expect_unresolved \*'
1204@@ -9922,9 +10518,9 @@ rm -f core conftest.err conftest.$ac_objext \ 1202@@ -10222,9 +10818,9 @@ rm -f core conftest.err conftest.$ac_obj
1205 no_undefined_flag=' -z defs' 1203 no_undefined_flag=' -z defs'
1206 if test "$GCC" = yes; then 1204 if test "$GCC" = yes; then
1207 wlarc='${wl}' 1205 wlarc='${wl}'
@@ -1213,7 +1211,7 @@ index 6c2b24ebe3..5fdd723b7f 100755
1213 else 1211 else
1214 case `$CC -V 2>&1` in 1212 case `$CC -V 2>&1` in
1215 *"Compilers 5.0"*) 1213 *"Compilers 5.0"*)
1216@@ -10500,8 +11096,9 @@ cygwin* | mingw* | pw32* | cegcc*) 1214@@ -10800,8 +11396,9 @@ cygwin* | mingw* | pw32* | cegcc*)
1217 need_version=no 1215 need_version=no
1218 need_lib_prefix=no 1216 need_lib_prefix=no
1219 1217
@@ -1225,7 +1223,7 @@ index 6c2b24ebe3..5fdd723b7f 100755
1225 library_names_spec='$libname.dll.a' 1223 library_names_spec='$libname.dll.a'
1226 # DLL is installed to $(libdir)/../bin by postinstall_cmds 1224 # DLL is installed to $(libdir)/../bin by postinstall_cmds
1227 postinstall_cmds='base_file=`basename \${file}`~ 1225 postinstall_cmds='base_file=`basename \${file}`~
1228@@ -10534,13 +11131,71 @@ cygwin* | mingw* | pw32* | cegcc*) 1226@@ -10834,13 +11431,71 @@ cygwin* | mingw* | pw32* | cegcc*)
1229 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' 1227 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
1230 ;; 1228 ;;
1231 esac 1229 esac
@@ -1298,7 +1296,7 @@ index 6c2b24ebe3..5fdd723b7f 100755
1298 # FIXME: first we should search . and the directory the executable is in 1296 # FIXME: first we should search . and the directory the executable is in
1299 shlibpath_var=PATH 1297 shlibpath_var=PATH
1300 ;; 1298 ;;
1301@@ -10632,7 +11287,7 @@ haiku*) 1299@@ -10932,7 +11587,7 @@ haiku*)
1302 soname_spec='${libname}${release}${shared_ext}$major' 1300 soname_spec='${libname}${release}${shared_ext}$major'
1303 shlibpath_var=LIBRARY_PATH 1301 shlibpath_var=LIBRARY_PATH
1304 shlibpath_overrides_runpath=yes 1302 shlibpath_overrides_runpath=yes
@@ -1307,7 +1305,16 @@ index 6c2b24ebe3..5fdd723b7f 100755
1307 hardcode_into_libs=yes 1305 hardcode_into_libs=yes
1308 ;; 1306 ;;
1309 1307
1310@@ -11472,10 +12127,10 @@ else 1308@@ -11728,7 +12383,7 @@ else
1309 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
1310 lt_status=$lt_dlunknown
1311 cat > conftest.$ac_ext <<_LT_EOF
1312-#line 11731 "configure"
1313+#line $LINENO "configure"
1314 #include "confdefs.h"
1315
1316 #if HAVE_DLFCN_H
1317@@ -11772,10 +12427,10 @@ else
1311 /* When -fvisbility=hidden is used, assume the code has been annotated 1318 /* When -fvisbility=hidden is used, assume the code has been annotated
1312 correspondingly for the symbols needed. */ 1319 correspondingly for the symbols needed. */
1313 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 1320 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
@@ -1320,7 +1327,16 @@ index 6c2b24ebe3..5fdd723b7f 100755
1320 int main () 1327 int main ()
1321 { 1328 {
1322 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 1329 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
1323@@ -11578,10 +12233,10 @@ else 1330@@ -11834,7 +12489,7 @@ else
1331 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
1332 lt_status=$lt_dlunknown
1333 cat > conftest.$ac_ext <<_LT_EOF
1334-#line 11837 "configure"
1335+#line $LINENO "configure"
1336 #include "confdefs.h"
1337
1338 #if HAVE_DLFCN_H
1339@@ -11878,10 +12533,10 @@ else
1324 /* When -fvisbility=hidden is used, assume the code has been annotated 1340 /* When -fvisbility=hidden is used, assume the code has been annotated
1325 correspondingly for the symbols needed. */ 1341 correspondingly for the symbols needed. */
1326 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 1342 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
@@ -1333,7 +1349,7 @@ index 6c2b24ebe3..5fdd723b7f 100755
1333 int main () 1349 int main ()
1334 { 1350 {
1335 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 1351 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
1336@@ -14172,7 +14827,7 @@ SHARED_LDFLAGS= 1352@@ -14525,7 +15180,7 @@ SHARED_LDFLAGS=
1337 if test "$enable_shared" = "yes"; then 1353 if test "$enable_shared" = "yes"; then
1338 x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'` 1354 x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'`
1339 if test -n "$x"; then 1355 if test -n "$x"; then
@@ -1342,7 +1358,7 @@ index 6c2b24ebe3..5fdd723b7f 100755
1342 fi 1358 fi
1343 1359
1344 # More hacks to build DLLs on Windows. 1360 # More hacks to build DLLs on Windows.
1345@@ -16879,13 +17534,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' 1361@@ -17139,13 +17794,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_
1346 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' 1362 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
1347 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' 1363 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
1348 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' 1364 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
@@ -1363,7 +1379,7 @@ index 6c2b24ebe3..5fdd723b7f 100755
1363 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' 1379 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
1364 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' 1380 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
1365 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' 1381 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
1366@@ -16900,14 +17562,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de 1382@@ -17160,14 +17822,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$l
1367 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' 1383 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
1368 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' 1384 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
1369 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"`' 1385 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"`'
@@ -1382,7 +1398,7 @@ index 6c2b24ebe3..5fdd723b7f 100755
1382 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' 1398 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
1383 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' 1399 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
1384 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' 1400 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
1385@@ -16940,12 +17605,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q 1401@@ -17200,12 +17865,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcod
1386 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' 1402 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
1387 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' 1403 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
1388 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' 1404 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
@@ -1396,7 +1412,7 @@ index 6c2b24ebe3..5fdd723b7f 100755
1396 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' 1412 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
1397 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' 1413 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
1398 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' 1414 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
1399@@ -17000,8 +17665,13 @@ reload_flag \ 1415@@ -17260,8 +17925,13 @@ reload_flag \
1400 OBJDUMP \ 1416 OBJDUMP \
1401 deplibs_check_method \ 1417 deplibs_check_method \
1402 file_magic_cmd \ 1418 file_magic_cmd \
@@ -1410,7 +1426,7 @@ index 6c2b24ebe3..5fdd723b7f 100755
1410 STRIP \ 1426 STRIP \
1411 RANLIB \ 1427 RANLIB \
1412 CC \ 1428 CC \
1413@@ -17011,12 +17681,14 @@ lt_cv_sys_global_symbol_pipe \ 1429@@ -17271,12 +17941,14 @@ lt_cv_sys_global_symbol_pipe \
1414 lt_cv_sys_global_symbol_to_cdecl \ 1430 lt_cv_sys_global_symbol_to_cdecl \
1415 lt_cv_sys_global_symbol_to_c_name_address \ 1431 lt_cv_sys_global_symbol_to_c_name_address \
1416 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ 1432 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
@@ -1426,7 +1442,7 @@ index 6c2b24ebe3..5fdd723b7f 100755
1426 DSYMUTIL \ 1442 DSYMUTIL \
1427 NMEDIT \ 1443 NMEDIT \
1428 LIPO \ 1444 LIPO \
1429@@ -17032,7 +17704,6 @@ no_undefined_flag \ 1445@@ -17292,7 +17964,6 @@ no_undefined_flag \
1430 hardcode_libdir_flag_spec \ 1446 hardcode_libdir_flag_spec \
1431 hardcode_libdir_flag_spec_ld \ 1447 hardcode_libdir_flag_spec_ld \
1432 hardcode_libdir_separator \ 1448 hardcode_libdir_separator \
@@ -1434,7 +1450,7 @@ index 6c2b24ebe3..5fdd723b7f 100755
1434 exclude_expsyms \ 1450 exclude_expsyms \
1435 include_expsyms \ 1451 include_expsyms \
1436 file_list_spec \ 1452 file_list_spec \
1437@@ -17068,6 +17739,7 @@ module_cmds \ 1453@@ -17328,6 +17999,7 @@ module_cmds \
1438 module_expsym_cmds \ 1454 module_expsym_cmds \
1439 export_symbols_cmds \ 1455 export_symbols_cmds \
1440 prelink_cmds \ 1456 prelink_cmds \
@@ -1442,7 +1458,7 @@ index 6c2b24ebe3..5fdd723b7f 100755
1442 postinstall_cmds \ 1458 postinstall_cmds \
1443 postuninstall_cmds \ 1459 postuninstall_cmds \
1444 finish_cmds \ 1460 finish_cmds \
1445@@ -17847,7 +18519,8 @@ $as_echo X"$file" | 1461@@ -18116,7 +18788,8 @@ $as_echo X"$file" |
1446 # NOTE: Changes made to this file will be lost: look at ltmain.sh. 1462 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
1447 # 1463 #
1448 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 1464 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
@@ -1452,7 +1468,7 @@ index 6c2b24ebe3..5fdd723b7f 100755
1452 # Written by Gordon Matzigkeit, 1996 1468 # Written by Gordon Matzigkeit, 1996
1453 # 1469 #
1454 # This file is part of GNU Libtool. 1470 # This file is part of GNU Libtool.
1455@@ -17950,19 +18623,42 @@ SP2NL=$lt_lt_SP2NL 1471@@ -18219,19 +18892,42 @@ SP2NL=$lt_lt_SP2NL
1456 # turn newlines into spaces. 1472 # turn newlines into spaces.
1457 NL2SP=$lt_lt_NL2SP 1473 NL2SP=$lt_lt_NL2SP
1458 1474
@@ -1496,7 +1512,7 @@ index 6c2b24ebe3..5fdd723b7f 100755
1496 # A symbol stripping program. 1512 # A symbol stripping program.
1497 STRIP=$lt_STRIP 1513 STRIP=$lt_STRIP
1498 1514
1499@@ -17992,6 +18688,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address 1515@@ -18261,6 +18957,12 @@ global_symbol_to_c_name_address=$lt_lt_c
1500 # Transform the output of nm in a C name address pair when lib prefix is needed. 1516 # Transform the output of nm in a C name address pair when lib prefix is needed.
1501 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix 1517 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
1502 1518
@@ -1509,7 +1525,7 @@ index 6c2b24ebe3..5fdd723b7f 100755
1509 # The name of the directory that contains temporary libtool files. 1525 # The name of the directory that contains temporary libtool files.
1510 objdir=$objdir 1526 objdir=$objdir
1511 1527
1512@@ -18001,6 +18703,9 @@ MAGIC_CMD=$MAGIC_CMD 1528@@ -18270,6 +18972,9 @@ MAGIC_CMD=$MAGIC_CMD
1513 # Must we lock files when doing compilation? 1529 # Must we lock files when doing compilation?
1514 need_locks=$lt_need_locks 1530 need_locks=$lt_need_locks
1515 1531
@@ -1519,7 +1535,7 @@ index 6c2b24ebe3..5fdd723b7f 100755
1519 # Tool to manipulate archived DWARF debug symbol files on Mac OS X. 1535 # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
1520 DSYMUTIL=$lt_DSYMUTIL 1536 DSYMUTIL=$lt_DSYMUTIL
1521 1537
1522@@ -18115,12 +18820,12 @@ with_gcc=$GCC 1538@@ -18384,12 +19089,12 @@ with_gcc=$GCC
1523 # Compiler flag to turn off builtin functions. 1539 # Compiler flag to turn off builtin functions.
1524 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag 1540 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
1525 1541
@@ -1535,7 +1551,7 @@ index 6c2b24ebe3..5fdd723b7f 100755
1535 # Compiler flag to prevent dynamic linking. 1551 # Compiler flag to prevent dynamic linking.
1536 link_static_flag=$lt_lt_prog_compiler_static 1552 link_static_flag=$lt_lt_prog_compiler_static
1537 1553
1538@@ -18207,9 +18912,6 @@ inherit_rpath=$inherit_rpath 1554@@ -18476,9 +19181,6 @@ inherit_rpath=$inherit_rpath
1539 # Whether libtool must link a program against all its dependency libraries. 1555 # Whether libtool must link a program against all its dependency libraries.
1540 link_all_deplibs=$link_all_deplibs 1556 link_all_deplibs=$link_all_deplibs
1541 1557
@@ -1545,7 +1561,7 @@ index 6c2b24ebe3..5fdd723b7f 100755
1545 # Set to "yes" if exported symbols are required. 1561 # Set to "yes" if exported symbols are required.
1546 always_export_symbols=$always_export_symbols 1562 always_export_symbols=$always_export_symbols
1547 1563
1548@@ -18225,6 +18927,9 @@ include_expsyms=$lt_include_expsyms 1564@@ -18494,6 +19196,9 @@ include_expsyms=$lt_include_expsyms
1549 # Commands necessary for linking programs (against libraries) with templates. 1565 # Commands necessary for linking programs (against libraries) with templates.
1550 prelink_cmds=$lt_prelink_cmds 1566 prelink_cmds=$lt_prelink_cmds
1551 1567
@@ -1555,7 +1571,7 @@ index 6c2b24ebe3..5fdd723b7f 100755
1555 # Specify filename containing input files. 1571 # Specify filename containing input files.
1556 file_list_spec=$lt_file_list_spec 1572 file_list_spec=$lt_file_list_spec
1557 1573
1558@@ -18257,210 +18962,169 @@ ltmain="$ac_aux_dir/ltmain.sh" 1574@@ -18526,210 +19231,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
1559 # if finds mixed CR/LF and LF-only lines. Since sed operates in 1575 # if finds mixed CR/LF and LF-only lines. Since sed operates in
1560 # text mode, it properly converts lines to CR/LF. This bash problem 1576 # text mode, it properly converts lines to CR/LF. This bash problem
1561 # is reportedly fixed, but why not run on old versions too? 1577 # is reportedly fixed, but why not run on old versions too?
@@ -1757,15 +1773,9 @@ index 6c2b24ebe3..5fdd723b7f 100755
1757-_LT_EOF 1773-_LT_EOF
1758- ;; 1774- ;;
1759- esac 1775- esac
1760-
1761-
1762- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
1763- || (rm -f "$cfgfile"; exit 1)
1764-
1765- mv -f "$cfgfile" "$ofile" ||
1766+ sed '$q' "$ltmain" >> "$cfgfile" \ 1776+ sed '$q' "$ltmain" >> "$cfgfile" \
1767+ || (rm -f "$cfgfile"; exit 1) 1777+ || (rm -f "$cfgfile"; exit 1)
1768+ 1778
1769+ if test x"$xsi_shell" = xyes; then 1779+ if test x"$xsi_shell" = xyes; then
1770+ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ 1780+ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\
1771+func_dirname ()\ 1781+func_dirname ()\
@@ -1923,17 +1933,20 @@ index 6c2b24ebe3..5fdd723b7f 100755
1923+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 1933+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5
1924+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} 1934+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;}
1925+fi 1935+fi
1926+ 1936
1927+ 1937- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
1938- || (rm -f "$cfgfile"; exit 1)
1939
1940- mv -f "$cfgfile" "$ofile" ||
1928+ mv -f "$cfgfile" "$ofile" || 1941+ mv -f "$cfgfile" "$ofile" ||
1929 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") 1942 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
1930 chmod +x "$ofile" 1943 chmod +x "$ofile"
1931 1944
1932diff --git a/bfd/configure.ac b/bfd/configure.ac 1945Index: git/bfd/configure.ac
1933index 2342f3faea..a6451fccda 100644 1946===================================================================
1934--- a/bfd/configure.ac 1947--- git.orig/bfd/configure.ac
1935+++ b/bfd/configure.ac 1948+++ git/bfd/configure.ac
1936@@ -254,7 +254,7 @@ changequote(,)dnl 1949@@ -293,7 +293,7 @@ changequote(,)dnl
1937 x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'` 1950 x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'`
1938 changequote([,])dnl 1951 changequote([,])dnl
1939 if test -n "$x"; then 1952 if test -n "$x"; then
@@ -1942,11 +1955,11 @@ index 2342f3faea..a6451fccda 100644
1942 fi 1955 fi
1943 1956
1944 # More hacks to build DLLs on Windows. 1957 # More hacks to build DLLs on Windows.
1945diff --git a/binutils/configure b/binutils/configure 1958Index: git/binutils/configure
1946index 5d9c9105a7..a65b2b4518 100755 1959===================================================================
1947--- a/binutils/configure 1960--- git.orig/binutils/configure
1948+++ b/binutils/configure 1961+++ git/binutils/configure
1949@@ -659,8 +659,11 @@ OTOOL 1962@@ -688,8 +688,11 @@ OTOOL
1950 LIPO 1963 LIPO
1951 NMEDIT 1964 NMEDIT
1952 DSYMUTIL 1965 DSYMUTIL
@@ -1958,7 +1971,7 @@ index 5d9c9105a7..a65b2b4518 100755
1958 OBJDUMP 1971 OBJDUMP
1959 LN_S 1972 LN_S
1960 NM 1973 NM
1961@@ -772,6 +775,7 @@ enable_static 1974@@ -806,6 +809,7 @@ enable_static
1962 with_pic 1975 with_pic
1963 enable_fast_install 1976 enable_fast_install
1964 with_gnu_ld 1977 with_gnu_ld
@@ -1966,7 +1979,7 @@ index 5d9c9105a7..a65b2b4518 100755
1966 enable_libtool_lock 1979 enable_libtool_lock
1967 enable_plugins 1980 enable_plugins
1968 enable_largefile 1981 enable_largefile
1969@@ -1444,6 +1448,8 @@ Optional Packages: 1982@@ -1482,6 +1486,8 @@ Optional Packages:
1970 --with-pic try to use only PIC/non-PIC objects [default=use 1983 --with-pic try to use only PIC/non-PIC objects [default=use
1971 both] 1984 both]
1972 --with-gnu-ld assume the C compiler uses GNU ld [default=no] 1985 --with-gnu-ld assume the C compiler uses GNU ld [default=no]
@@ -1975,7 +1988,7 @@ index 5d9c9105a7..a65b2b4518 100755
1975 --with-system-zlib use installed libz 1988 --with-system-zlib use installed libz
1976 --with-gnu-ld assume the C compiler uses GNU ld default=no 1989 --with-gnu-ld assume the C compiler uses GNU ld default=no
1977 --with-libiconv-prefix[=DIR] search for libiconv in DIR/include and DIR/lib 1990 --with-libiconv-prefix[=DIR] search for libiconv in DIR/include and DIR/lib
1978@@ -5160,8 +5166,8 @@ esac 1991@@ -5453,8 +5459,8 @@ esac
1979 1992
1980 1993
1981 1994
@@ -1986,7 +1999,7 @@ index 5d9c9105a7..a65b2b4518 100755
1986 1999
1987 2000
1988 2001
1989@@ -5201,7 +5207,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO 2002@@ -5494,7 +5500,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
1990 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 2003 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
1991 $as_echo_n "checking how to print strings... " >&6; } 2004 $as_echo_n "checking how to print strings... " >&6; }
1992 # Test print first, because it will be a builtin if present. 2005 # Test print first, because it will be a builtin if present.
@@ -1995,7 +2008,7 @@ index 5d9c9105a7..a65b2b4518 100755
1995 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then 2008 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
1996 ECHO='print -r --' 2009 ECHO='print -r --'
1997 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then 2010 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
1998@@ -5887,8 +5893,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; 2011@@ -6180,8 +6186,8 @@ $as_echo_n "checking whether the shell u
1999 # Try some XSI features 2012 # Try some XSI features
2000 xsi_shell=no 2013 xsi_shell=no
2001 ( _lt_dummy="a/b/c" 2014 ( _lt_dummy="a/b/c"
@@ -2006,13 +2019,13 @@ index 5d9c9105a7..a65b2b4518 100755
2006 && eval 'test $(( 1 + 1 )) -eq 2 \ 2019 && eval 'test $(( 1 + 1 )) -eq 2 \
2007 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ 2020 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
2008 && xsi_shell=yes 2021 && xsi_shell=yes
2009@@ -5937,6 +5943,80 @@ esac 2022@@ -6230,6 +6236,80 @@ esac
2010 2023
2011 2024
2012 2025
2013+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5 2026+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5
2014+$as_echo_n "checking how to convert $build file names to $host format... " >&6; } 2027+$as_echo_n "checking how to convert $build file names to $host format... " >&6; }
2015+if test "${lt_cv_to_host_file_cmd+set}" = set; then : 2028+if ${lt_cv_to_host_file_cmd+:} false; then :
2016+ $as_echo_n "(cached) " >&6 2029+ $as_echo_n "(cached) " >&6
2017+else 2030+else
2018+ case $host in 2031+ case $host in
@@ -2059,7 +2072,7 @@ index 5d9c9105a7..a65b2b4518 100755
2059+ 2072+
2060+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5 2073+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5
2061+$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; } 2074+$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; }
2062+if test "${lt_cv_to_tool_file_cmd+set}" = set; then : 2075+if ${lt_cv_to_tool_file_cmd+:} false; then :
2063+ $as_echo_n "(cached) " >&6 2076+ $as_echo_n "(cached) " >&6
2064+else 2077+else
2065+ #assume ordinary cross tools, or native build. 2078+ #assume ordinary cross tools, or native build.
@@ -2086,8 +2099,8 @@ index 5d9c9105a7..a65b2b4518 100755
2086+ 2099+
2087 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 2100 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
2088 $as_echo_n "checking for $LD option to reload object files... " >&6; } 2101 $as_echo_n "checking for $LD option to reload object files... " >&6; }
2089 if test "${lt_cv_ld_reload_flag+set}" = set; then : 2102 if ${lt_cv_ld_reload_flag+:} false; then :
2090@@ -5953,6 +6033,11 @@ case $reload_flag in 2103@@ -6246,6 +6326,11 @@ case $reload_flag in
2091 esac 2104 esac
2092 reload_cmds='$LD$reload_flag -o $output$reload_objs' 2105 reload_cmds='$LD$reload_flag -o $output$reload_objs'
2093 case $host_os in 2106 case $host_os in
@@ -2099,7 +2112,7 @@ index 5d9c9105a7..a65b2b4518 100755
2099 darwin*) 2112 darwin*)
2100 if test "$GCC" = yes; then 2113 if test "$GCC" = yes; then
2101 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' 2114 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
2102@@ -6121,7 +6206,8 @@ mingw* | pw32*) 2115@@ -6414,7 +6499,8 @@ mingw* | pw32*)
2103 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' 2116 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
2104 lt_cv_file_magic_cmd='func_win32_libid' 2117 lt_cv_file_magic_cmd='func_win32_libid'
2105 else 2118 else
@@ -2109,7 +2122,7 @@ index 5d9c9105a7..a65b2b4518 100755
2109 lt_cv_file_magic_cmd='$OBJDUMP -f' 2122 lt_cv_file_magic_cmd='$OBJDUMP -f'
2110 fi 2123 fi
2111 ;; 2124 ;;
2112@@ -6275,6 +6361,21 @@ esac 2125@@ -6568,6 +6654,21 @@ esac
2113 fi 2126 fi
2114 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 2127 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
2115 $as_echo "$lt_cv_deplibs_check_method" >&6; } 2128 $as_echo "$lt_cv_deplibs_check_method" >&6; }
@@ -2131,7 +2144,7 @@ index 5d9c9105a7..a65b2b4518 100755
2131 file_magic_cmd=$lt_cv_file_magic_cmd 2144 file_magic_cmd=$lt_cv_file_magic_cmd
2132 deplibs_check_method=$lt_cv_deplibs_check_method 2145 deplibs_check_method=$lt_cv_deplibs_check_method
2133 test -z "$deplibs_check_method" && deplibs_check_method=unknown 2146 test -z "$deplibs_check_method" && deplibs_check_method=unknown
2134@@ -6290,9 +6391,162 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown 2147@@ -6583,9 +6684,162 @@ test -z "$deplibs_check_method" && depli
2135 2148
2136 2149
2137 2150
@@ -2150,7 +2163,7 @@ index 5d9c9105a7..a65b2b4518 100755
2150+set dummy ${ac_tool_prefix}dlltool; ac_word=$2 2163+set dummy ${ac_tool_prefix}dlltool; ac_word=$2
2151+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 2164+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
2152+$as_echo_n "checking for $ac_word... " >&6; } 2165+$as_echo_n "checking for $ac_word... " >&6; }
2153+if test "${ac_cv_prog_DLLTOOL+set}" = set; then : 2166+if ${ac_cv_prog_DLLTOOL+:} false; then :
2154+ $as_echo_n "(cached) " >&6 2167+ $as_echo_n "(cached) " >&6
2155+else 2168+else
2156+ if test -n "$DLLTOOL"; then 2169+ if test -n "$DLLTOOL"; then
@@ -2162,7 +2175,7 @@ index 5d9c9105a7..a65b2b4518 100755
2162+ IFS=$as_save_IFS 2175+ IFS=$as_save_IFS
2163+ test -z "$as_dir" && as_dir=. 2176+ test -z "$as_dir" && as_dir=.
2164+ for ac_exec_ext in '' $ac_executable_extensions; do 2177+ for ac_exec_ext in '' $ac_executable_extensions; do
2165+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 2178+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
2166+ ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" 2179+ ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
2167+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 2180+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
2168+ break 2 2181+ break 2
@@ -2190,7 +2203,7 @@ index 5d9c9105a7..a65b2b4518 100755
2190+set dummy dlltool; ac_word=$2 2203+set dummy dlltool; ac_word=$2
2191+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 2204+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
2192+$as_echo_n "checking for $ac_word... " >&6; } 2205+$as_echo_n "checking for $ac_word... " >&6; }
2193+if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then : 2206+if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then :
2194+ $as_echo_n "(cached) " >&6 2207+ $as_echo_n "(cached) " >&6
2195+else 2208+else
2196+ if test -n "$ac_ct_DLLTOOL"; then 2209+ if test -n "$ac_ct_DLLTOOL"; then
@@ -2202,7 +2215,7 @@ index 5d9c9105a7..a65b2b4518 100755
2202+ IFS=$as_save_IFS 2215+ IFS=$as_save_IFS
2203+ test -z "$as_dir" && as_dir=. 2216+ test -z "$as_dir" && as_dir=.
2204+ for ac_exec_ext in '' $ac_executable_extensions; do 2217+ for ac_exec_ext in '' $ac_executable_extensions; do
2205+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 2218+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
2206+ ac_cv_prog_ac_ct_DLLTOOL="dlltool" 2219+ ac_cv_prog_ac_ct_DLLTOOL="dlltool"
2207+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 2220+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
2208+ break 2 2221+ break 2
@@ -2250,7 +2263,7 @@ index 5d9c9105a7..a65b2b4518 100755
2250+ 2263+
2251+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5 2264+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5
2252+$as_echo_n "checking how to associate runtime and link libraries... " >&6; } 2265+$as_echo_n "checking how to associate runtime and link libraries... " >&6; }
2253+if test "${lt_cv_sharedlib_from_linklib_cmd+set}" = set; then : 2266+if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then :
2254+ $as_echo_n "(cached) " >&6 2267+ $as_echo_n "(cached) " >&6
2255+else 2268+else
2256+ lt_cv_sharedlib_from_linklib_cmd='unknown' 2269+ lt_cv_sharedlib_from_linklib_cmd='unknown'
@@ -2295,17 +2308,17 @@ index 5d9c9105a7..a65b2b4518 100755
2295+set dummy $ac_tool_prefix$ac_prog; ac_word=$2 2308+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
2296 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 2309 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
2297 $as_echo_n "checking for $ac_word... " >&6; } 2310 $as_echo_n "checking for $ac_word... " >&6; }
2298 if test "${ac_cv_prog_AR+set}" = set; then : 2311 if ${ac_cv_prog_AR+:} false; then :
2299@@ -6308,7 +6562,7 @@ do 2312@@ -6601,7 +6855,7 @@ do
2300 test -z "$as_dir" && as_dir=. 2313 test -z "$as_dir" && as_dir=.
2301 for ac_exec_ext in '' $ac_executable_extensions; do 2314 for ac_exec_ext in '' $ac_executable_extensions; do
2302 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 2315 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
2303- ac_cv_prog_AR="${ac_tool_prefix}ar" 2316- ac_cv_prog_AR="${ac_tool_prefix}ar"
2304+ ac_cv_prog_AR="$ac_tool_prefix$ac_prog" 2317+ ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
2305 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 2318 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
2306 break 2 2319 break 2
2307 fi 2320 fi
2308@@ -6328,11 +6582,15 @@ $as_echo "no" >&6; } 2321@@ -6621,11 +6875,15 @@ $as_echo "no" >&6; }
2309 fi 2322 fi
2310 2323
2311 2324
@@ -2323,17 +2336,17 @@ index 5d9c9105a7..a65b2b4518 100755
2323+set dummy $ac_prog; ac_word=$2 2336+set dummy $ac_prog; ac_word=$2
2324 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 2337 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
2325 $as_echo_n "checking for $ac_word... " >&6; } 2338 $as_echo_n "checking for $ac_word... " >&6; }
2326 if test "${ac_cv_prog_ac_ct_AR+set}" = set; then : 2339 if ${ac_cv_prog_ac_ct_AR+:} false; then :
2327@@ -6348,7 +6606,7 @@ do 2340@@ -6641,7 +6899,7 @@ do
2328 test -z "$as_dir" && as_dir=. 2341 test -z "$as_dir" && as_dir=.
2329 for ac_exec_ext in '' $ac_executable_extensions; do 2342 for ac_exec_ext in '' $ac_executable_extensions; do
2330 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 2343 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
2331- ac_cv_prog_ac_ct_AR="ar" 2344- ac_cv_prog_ac_ct_AR="ar"
2332+ ac_cv_prog_ac_ct_AR="$ac_prog" 2345+ ac_cv_prog_ac_ct_AR="$ac_prog"
2333 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 2346 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
2334 break 2 2347 break 2
2335 fi 2348 fi
2336@@ -6367,6 +6625,10 @@ else 2349@@ -6660,6 +6918,10 @@ else
2337 $as_echo "no" >&6; } 2350 $as_echo "no" >&6; }
2338 fi 2351 fi
2339 2352
@@ -2344,7 +2357,7 @@ index 5d9c9105a7..a65b2b4518 100755
2344 if test "x$ac_ct_AR" = x; then 2357 if test "x$ac_ct_AR" = x; then
2345 AR="false" 2358 AR="false"
2346 else 2359 else
2347@@ -6378,12 +6640,10 @@ ac_tool_warned=yes ;; 2360@@ -6671,12 +6933,10 @@ ac_tool_warned=yes ;;
2348 esac 2361 esac
2349 AR=$ac_ct_AR 2362 AR=$ac_ct_AR
2350 fi 2363 fi
@@ -2359,13 +2372,13 @@ index 5d9c9105a7..a65b2b4518 100755
2359 2372
2360 2373
2361 2374
2362@@ -6395,6 +6655,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru 2375@@ -6688,6 +6948,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru
2363 2376
2364 2377
2365 2378
2366+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 2379+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
2367+$as_echo_n "checking for archiver @FILE support... " >&6; } 2380+$as_echo_n "checking for archiver @FILE support... " >&6; }
2368+if test "${lt_cv_ar_at_file+set}" = set; then : 2381+if ${lt_cv_ar_at_file+:} false; then :
2369+ $as_echo_n "(cached) " >&6 2382+ $as_echo_n "(cached) " >&6
2370+else 2383+else
2371+ lt_cv_ar_at_file=no 2384+ lt_cv_ar_at_file=no
@@ -2424,7 +2437,7 @@ index 5d9c9105a7..a65b2b4518 100755
2424 if test -n "$ac_tool_prefix"; then 2437 if test -n "$ac_tool_prefix"; then
2425 # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. 2438 # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
2426 set dummy ${ac_tool_prefix}strip; ac_word=$2 2439 set dummy ${ac_tool_prefix}strip; ac_word=$2
2427@@ -6729,8 +7047,8 @@ esac 2440@@ -7022,8 +7340,8 @@ esac
2428 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" 2441 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
2429 2442
2430 # Transform an extracted symbol line into symbol name and symbol address 2443 # Transform an extracted symbol line into symbol name and symbol address
@@ -2435,7 +2448,7 @@ index 5d9c9105a7..a65b2b4518 100755
2435 2448
2436 # Handle CRLF in mingw tool chain 2449 # Handle CRLF in mingw tool chain
2437 opt_cr= 2450 opt_cr=
2438@@ -6766,6 +7084,7 @@ for ac_symprfx in "" "_"; do 2451@@ -7059,6 +7377,7 @@ for ac_symprfx in "" "_"; do
2439 else 2452 else
2440 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" 2453 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
2441 fi 2454 fi
@@ -2443,7 +2456,7 @@ index 5d9c9105a7..a65b2b4518 100755
2443 2456
2444 # Check to see that the pipe works correctly. 2457 # Check to see that the pipe works correctly.
2445 pipe_works=no 2458 pipe_works=no
2446@@ -6807,6 +7126,18 @@ _LT_EOF 2459@@ -7100,6 +7419,18 @@ _LT_EOF
2447 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then 2460 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
2448 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then 2461 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
2449 cat <<_LT_EOF > conftest.$ac_ext 2462 cat <<_LT_EOF > conftest.$ac_ext
@@ -2462,7 +2475,7 @@ index 5d9c9105a7..a65b2b4518 100755
2462 #ifdef __cplusplus 2475 #ifdef __cplusplus
2463 extern "C" { 2476 extern "C" {
2464 #endif 2477 #endif
2465@@ -6818,7 +7149,7 @@ _LT_EOF 2478@@ -7111,7 +7442,7 @@ _LT_EOF
2466 cat <<_LT_EOF >> conftest.$ac_ext 2479 cat <<_LT_EOF >> conftest.$ac_ext
2467 2480
2468 /* The mapping between symbol names and symbols. */ 2481 /* The mapping between symbol names and symbols. */
@@ -2471,7 +2484,7 @@ index 5d9c9105a7..a65b2b4518 100755
2471 const char *name; 2484 const char *name;
2472 void *address; 2485 void *address;
2473 } 2486 }
2474@@ -6844,8 +7175,8 @@ static const void *lt_preloaded_setup() { 2487@@ -7137,8 +7468,8 @@ static const void *lt_preloaded_setup()
2475 _LT_EOF 2488 _LT_EOF
2476 # Now try linking the two files. 2489 # Now try linking the two files.
2477 mv conftest.$ac_objext conftstm.$ac_objext 2490 mv conftest.$ac_objext conftstm.$ac_objext
@@ -2482,7 +2495,7 @@ index 5d9c9105a7..a65b2b4518 100755
2482 LIBS="conftstm.$ac_objext" 2495 LIBS="conftstm.$ac_objext"
2483 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" 2496 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
2484 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 2497 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
2485@@ -6855,8 +7186,8 @@ _LT_EOF 2498@@ -7148,8 +7479,8 @@ _LT_EOF
2486 test $ac_status = 0; } && test -s conftest${ac_exeext}; then 2499 test $ac_status = 0; } && test -s conftest${ac_exeext}; then
2487 pipe_works=yes 2500 pipe_works=yes
2488 fi 2501 fi
@@ -2493,7 +2506,7 @@ index 5d9c9105a7..a65b2b4518 100755
2493 else 2506 else
2494 echo "cannot find nm_test_func in $nlist" >&5 2507 echo "cannot find nm_test_func in $nlist" >&5
2495 fi 2508 fi
2496@@ -6893,6 +7224,21 @@ else 2509@@ -7186,6 +7517,18 @@ else
2497 $as_echo "ok" >&6; } 2510 $as_echo "ok" >&6; }
2498 fi 2511 fi
2499 2512
@@ -2509,18 +2522,13 @@ index 5d9c9105a7..a65b2b4518 100755
2509+ 2522+
2510+ 2523+
2511+ 2524+
2512+
2513+
2514+
2515 2525
2516 2526
2517 2527
2518@@ -6908,6 +7254,40 @@ fi 2528@@ -7207,6 +7550,43 @@ fi
2519 2529
2520 2530
2521 2531
2522+
2523+
2524+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 2532+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
2525+$as_echo_n "checking for sysroot... " >&6; } 2533+$as_echo_n "checking for sysroot... " >&6; }
2526+ 2534+
@@ -2547,16 +2555,21 @@ index 5d9c9105a7..a65b2b4518 100755
2547+ *) 2555+ *)
2548+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5 2556+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5
2549+$as_echo "${with_libtool_sysroot}" >&6; } 2557+$as_echo "${with_libtool_sysroot}" >&6; }
2550+ as_fn_error "The sysroot must be an absolute path." "$LINENO" 5 2558+ as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5
2551+ ;; 2559+ ;;
2552+esac 2560+esac
2553+ 2561+
2554+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 2562+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
2555+$as_echo "${lt_sysroot:-no}" >&6; } 2563+$as_echo "${lt_sysroot:-no}" >&6; }
2556 2564+
2557 2565+
2558 2566+
2559@@ -7120,6 +7500,123 @@ esac 2567+
2568+
2569 # Check whether --enable-libtool-lock was given.
2570 if test "${enable_libtool_lock+set}" = set; then :
2571 enableval=$enable_libtool_lock;
2572@@ -7413,6 +7793,123 @@ esac
2560 2573
2561 need_locks="$enable_libtool_lock" 2574 need_locks="$enable_libtool_lock"
2562 2575
@@ -2565,7 +2578,7 @@ index 5d9c9105a7..a65b2b4518 100755
2565+set dummy ${ac_tool_prefix}mt; ac_word=$2 2578+set dummy ${ac_tool_prefix}mt; ac_word=$2
2566+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 2579+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
2567+$as_echo_n "checking for $ac_word... " >&6; } 2580+$as_echo_n "checking for $ac_word... " >&6; }
2568+if test "${ac_cv_prog_MANIFEST_TOOL+set}" = set; then : 2581+if ${ac_cv_prog_MANIFEST_TOOL+:} false; then :
2569+ $as_echo_n "(cached) " >&6 2582+ $as_echo_n "(cached) " >&6
2570+else 2583+else
2571+ if test -n "$MANIFEST_TOOL"; then 2584+ if test -n "$MANIFEST_TOOL"; then
@@ -2577,7 +2590,7 @@ index 5d9c9105a7..a65b2b4518 100755
2577+ IFS=$as_save_IFS 2590+ IFS=$as_save_IFS
2578+ test -z "$as_dir" && as_dir=. 2591+ test -z "$as_dir" && as_dir=.
2579+ for ac_exec_ext in '' $ac_executable_extensions; do 2592+ for ac_exec_ext in '' $ac_executable_extensions; do
2580+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 2593+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
2581+ ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" 2594+ ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
2582+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 2595+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
2583+ break 2 2596+ break 2
@@ -2605,7 +2618,7 @@ index 5d9c9105a7..a65b2b4518 100755
2605+set dummy mt; ac_word=$2 2618+set dummy mt; ac_word=$2
2606+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 2619+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
2607+$as_echo_n "checking for $ac_word... " >&6; } 2620+$as_echo_n "checking for $ac_word... " >&6; }
2608+if test "${ac_cv_prog_ac_ct_MANIFEST_TOOL+set}" = set; then : 2621+if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then :
2609+ $as_echo_n "(cached) " >&6 2622+ $as_echo_n "(cached) " >&6
2610+else 2623+else
2611+ if test -n "$ac_ct_MANIFEST_TOOL"; then 2624+ if test -n "$ac_ct_MANIFEST_TOOL"; then
@@ -2617,7 +2630,7 @@ index 5d9c9105a7..a65b2b4518 100755
2617+ IFS=$as_save_IFS 2630+ IFS=$as_save_IFS
2618+ test -z "$as_dir" && as_dir=. 2631+ test -z "$as_dir" && as_dir=.
2619+ for ac_exec_ext in '' $ac_executable_extensions; do 2632+ for ac_exec_ext in '' $ac_executable_extensions; do
2620+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 2633+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
2621+ ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" 2634+ ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
2622+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 2635+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
2623+ break 2 2636+ break 2
@@ -2655,7 +2668,7 @@ index 5d9c9105a7..a65b2b4518 100755
2655+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt 2668+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
2656+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5 2669+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5
2657+$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; } 2670+$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; }
2658+if test "${lt_cv_path_mainfest_tool+set}" = set; then : 2671+if ${lt_cv_path_mainfest_tool+:} false; then :
2659+ $as_echo_n "(cached) " >&6 2672+ $as_echo_n "(cached) " >&6
2660+else 2673+else
2661+ lt_cv_path_mainfest_tool=no 2674+ lt_cv_path_mainfest_tool=no
@@ -2680,7 +2693,7 @@ index 5d9c9105a7..a65b2b4518 100755
2680 2693
2681 case $host_os in 2694 case $host_os in
2682 rhapsody* | darwin*) 2695 rhapsody* | darwin*)
2683@@ -7683,6 +8180,8 @@ _LT_EOF 2696@@ -7976,6 +8473,8 @@ _LT_EOF
2684 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 2697 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
2685 echo "$AR cru libconftest.a conftest.o" >&5 2698 echo "$AR cru libconftest.a conftest.o" >&5
2686 $AR cru libconftest.a conftest.o 2>&5 2699 $AR cru libconftest.a conftest.o 2>&5
@@ -2689,7 +2702,7 @@ index 5d9c9105a7..a65b2b4518 100755
2689 cat > conftest.c << _LT_EOF 2702 cat > conftest.c << _LT_EOF
2690 int main() { return 0;} 2703 int main() { return 0;}
2691 _LT_EOF 2704 _LT_EOF
2692@@ -7878,7 +8377,8 @@ fi 2705@@ -8171,7 +8670,8 @@ fi
2693 LIBTOOL_DEPS="$ltmain" 2706 LIBTOOL_DEPS="$ltmain"
2694 2707
2695 # Always use our own libtool. 2708 # Always use our own libtool.
@@ -2699,7 +2712,7 @@ index 5d9c9105a7..a65b2b4518 100755
2699 2712
2700 2713
2701 2714
2702@@ -7967,7 +8467,7 @@ aix3*) 2715@@ -8260,7 +8760,7 @@ aix3*)
2703 esac 2716 esac
2704 2717
2705 # Global variables: 2718 # Global variables:
@@ -2708,7 +2721,7 @@ index 5d9c9105a7..a65b2b4518 100755
2708 can_build_shared=yes 2721 can_build_shared=yes
2709 2722
2710 # All known linkers require a `.a' archive for static linking (except MSVC, 2723 # All known linkers require a `.a' archive for static linking (except MSVC,
2711@@ -8265,8 +8765,6 @@ fi 2724@@ -8558,8 +9058,6 @@ fi
2712 lt_prog_compiler_pic= 2725 lt_prog_compiler_pic=
2713 lt_prog_compiler_static= 2726 lt_prog_compiler_static=
2714 2727
@@ -2717,7 +2730,7 @@ index 5d9c9105a7..a65b2b4518 100755
2717 2730
2718 if test "$GCC" = yes; then 2731 if test "$GCC" = yes; then
2719 lt_prog_compiler_wl='-Wl,' 2732 lt_prog_compiler_wl='-Wl,'
2720@@ -8432,6 +8930,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 2733@@ -8725,6 +9223,12 @@ $as_echo_n "checking for $compiler optio
2721 lt_prog_compiler_pic='--shared' 2734 lt_prog_compiler_pic='--shared'
2722 lt_prog_compiler_static='--static' 2735 lt_prog_compiler_static='--static'
2723 ;; 2736 ;;
@@ -2730,7 +2743,7 @@ index 5d9c9105a7..a65b2b4518 100755
2730 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) 2743 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
2731 # Portland Group compilers (*not* the Pentium gcc compiler, 2744 # Portland Group compilers (*not* the Pentium gcc compiler,
2732 # which looks to be a dead project) 2745 # which looks to be a dead project)
2733@@ -8494,7 +8998,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 2746@@ -8787,7 +9291,7 @@ $as_echo_n "checking for $compiler optio
2734 lt_prog_compiler_pic='-KPIC' 2747 lt_prog_compiler_pic='-KPIC'
2735 lt_prog_compiler_static='-Bstatic' 2748 lt_prog_compiler_static='-Bstatic'
2736 case $cc_basename in 2749 case $cc_basename in
@@ -2739,7 +2752,7 @@ index 5d9c9105a7..a65b2b4518 100755
2739 lt_prog_compiler_wl='-Qoption ld ';; 2752 lt_prog_compiler_wl='-Qoption ld ';;
2740 *) 2753 *)
2741 lt_prog_compiler_wl='-Wl,';; 2754 lt_prog_compiler_wl='-Wl,';;
2742@@ -8551,13 +9055,17 @@ case $host_os in 2755@@ -8844,13 +9348,17 @@ case $host_os in
2743 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" 2756 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
2744 ;; 2757 ;;
2745 esac 2758 esac
@@ -2752,7 +2765,7 @@ index 5d9c9105a7..a65b2b4518 100755
2752 2765
2753+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 2766+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
2754+$as_echo_n "checking for $compiler option to produce PIC... " >&6; } 2767+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
2755+if test "${lt_cv_prog_compiler_pic+set}" = set; then : 2768+if ${lt_cv_prog_compiler_pic+:} false; then :
2756+ $as_echo_n "(cached) " >&6 2769+ $as_echo_n "(cached) " >&6
2757+else 2770+else
2758+ lt_cv_prog_compiler_pic=$lt_prog_compiler_pic 2771+ lt_cv_prog_compiler_pic=$lt_prog_compiler_pic
@@ -2763,7 +2776,7 @@ index 5d9c9105a7..a65b2b4518 100755
2763 2776
2764 # 2777 #
2765 # Check to make sure the PIC flag actually works. 2778 # Check to make sure the PIC flag actually works.
2766@@ -8618,6 +9126,11 @@ fi 2779@@ -8911,6 +9419,11 @@ fi
2767 2780
2768 2781
2769 2782
@@ -2775,7 +2788,7 @@ index 5d9c9105a7..a65b2b4518 100755
2775 # 2788 #
2776 # Check to make sure the static flag actually works. 2789 # Check to make sure the static flag actually works.
2777 # 2790 #
2778@@ -8968,7 +9481,8 @@ _LT_EOF 2791@@ -9261,7 +9774,8 @@ _LT_EOF
2779 allow_undefined_flag=unsupported 2792 allow_undefined_flag=unsupported
2780 always_export_symbols=no 2793 always_export_symbols=no
2781 enable_shared_with_static_runtimes=yes 2794 enable_shared_with_static_runtimes=yes
@@ -2785,7 +2798,7 @@ index 5d9c9105a7..a65b2b4518 100755
2785 2798
2786 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then 2799 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
2787 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' 2800 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
2788@@ -9067,12 +9581,12 @@ _LT_EOF 2801@@ -9360,12 +9874,12 @@ _LT_EOF
2789 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' 2802 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
2790 hardcode_libdir_flag_spec= 2803 hardcode_libdir_flag_spec=
2791 hardcode_libdir_flag_spec_ld='-rpath $libdir' 2804 hardcode_libdir_flag_spec_ld='-rpath $libdir'
@@ -2800,7 +2813,7 @@ index 5d9c9105a7..a65b2b4518 100755
2800 fi 2813 fi
2801 ;; 2814 ;;
2802 esac 2815 esac
2803@@ -9086,8 +9600,8 @@ _LT_EOF 2816@@ -9379,8 +9893,8 @@ _LT_EOF
2804 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' 2817 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
2805 wlarc= 2818 wlarc=
2806 else 2819 else
@@ -2811,7 +2824,7 @@ index 5d9c9105a7..a65b2b4518 100755
2811 fi 2824 fi
2812 ;; 2825 ;;
2813 2826
2814@@ -9105,8 +9619,8 @@ _LT_EOF 2827@@ -9398,8 +9912,8 @@ _LT_EOF
2815 2828
2816 _LT_EOF 2829 _LT_EOF
2817 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 2830 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -2822,7 +2835,7 @@ index 5d9c9105a7..a65b2b4518 100755
2822 else 2835 else
2823 ld_shlibs=no 2836 ld_shlibs=no
2824 fi 2837 fi
2825@@ -9152,8 +9666,8 @@ _LT_EOF 2838@@ -9445,8 +9959,8 @@ _LT_EOF
2826 2839
2827 *) 2840 *)
2828 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 2841 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -2833,7 +2846,7 @@ index 5d9c9105a7..a65b2b4518 100755
2833 else 2846 else
2834 ld_shlibs=no 2847 ld_shlibs=no
2835 fi 2848 fi
2836@@ -9283,7 +9797,13 @@ _LT_EOF 2849@@ -9576,7 +10090,13 @@ _LT_EOF
2837 allow_undefined_flag='-berok' 2850 allow_undefined_flag='-berok'
2838 # Determine the default libpath from the value encoded in an 2851 # Determine the default libpath from the value encoded in an
2839 # empty executable. 2852 # empty executable.
@@ -2841,14 +2854,14 @@ index 5d9c9105a7..a65b2b4518 100755
2841+ if test "${lt_cv_aix_libpath+set}" = set; then 2854+ if test "${lt_cv_aix_libpath+set}" = set; then
2842+ aix_libpath=$lt_cv_aix_libpath 2855+ aix_libpath=$lt_cv_aix_libpath
2843+else 2856+else
2844+ if test "${lt_cv_aix_libpath_+set}" = set; then : 2857+ if ${lt_cv_aix_libpath_+:} false; then :
2845+ $as_echo_n "(cached) " >&6 2858+ $as_echo_n "(cached) " >&6
2846+else 2859+else
2847+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext 2860+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
2848 /* end confdefs.h. */ 2861 /* end confdefs.h. */
2849 2862
2850 int 2863 int
2851@@ -9296,22 +9816,29 @@ main () 2864@@ -9589,22 +10109,29 @@ main ()
2852 _ACEOF 2865 _ACEOF
2853 if ac_fn_c_try_link "$LINENO"; then : 2866 if ac_fn_c_try_link "$LINENO"; then :
2854 2867
@@ -2891,7 +2904,7 @@ index 5d9c9105a7..a65b2b4518 100755
2891 2904
2892 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 2905 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
2893 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" 2906 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"
2894@@ -9323,7 +9850,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 2907@@ -9616,7 +10143,13 @@ if test -z "$aix_libpath"; then aix_libp
2895 else 2908 else
2896 # Determine the default libpath from the value encoded in an 2909 # Determine the default libpath from the value encoded in an
2897 # empty executable. 2910 # empty executable.
@@ -2899,14 +2912,14 @@ index 5d9c9105a7..a65b2b4518 100755
2899+ if test "${lt_cv_aix_libpath+set}" = set; then 2912+ if test "${lt_cv_aix_libpath+set}" = set; then
2900+ aix_libpath=$lt_cv_aix_libpath 2913+ aix_libpath=$lt_cv_aix_libpath
2901+else 2914+else
2902+ if test "${lt_cv_aix_libpath_+set}" = set; then : 2915+ if ${lt_cv_aix_libpath_+:} false; then :
2903+ $as_echo_n "(cached) " >&6 2916+ $as_echo_n "(cached) " >&6
2904+else 2917+else
2905+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext 2918+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
2906 /* end confdefs.h. */ 2919 /* end confdefs.h. */
2907 2920
2908 int 2921 int
2909@@ -9336,22 +9869,29 @@ main () 2922@@ -9629,22 +10162,29 @@ main ()
2910 _ACEOF 2923 _ACEOF
2911 if ac_fn_c_try_link "$LINENO"; then : 2924 if ac_fn_c_try_link "$LINENO"; then :
2912 2925
@@ -2949,7 +2962,7 @@ index 5d9c9105a7..a65b2b4518 100755
2949 2962
2950 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 2963 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
2951 # Warning - without using the other run time loading flags, 2964 # Warning - without using the other run time loading flags,
2952@@ -9396,20 +9936,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 2965@@ -9689,20 +10229,63 @@ if test -z "$aix_libpath"; then aix_libp
2953 # Microsoft Visual C++. 2966 # Microsoft Visual C++.
2954 # hardcode_libdir_flag_spec is actually meaningless, as there is 2967 # hardcode_libdir_flag_spec is actually meaningless, as there is
2955 # no search path for DLLs. 2968 # no search path for DLLs.
@@ -3027,7 +3040,7 @@ index 5d9c9105a7..a65b2b4518 100755
3027 ;; 3040 ;;
3028 3041
3029 darwin* | rhapsody*) 3042 darwin* | rhapsody*)
3030@@ -9470,7 +10053,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 3043@@ -9763,7 +10346,7 @@ if test -z "$aix_libpath"; then aix_libp
3031 3044
3032 # FreeBSD 3 and greater uses gcc -shared to do shared libraries. 3045 # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
3033 freebsd* | dragonfly*) 3046 freebsd* | dragonfly*)
@@ -3036,7 +3049,7 @@ index 5d9c9105a7..a65b2b4518 100755
3036 hardcode_libdir_flag_spec='-R$libdir' 3049 hardcode_libdir_flag_spec='-R$libdir'
3037 hardcode_direct=yes 3050 hardcode_direct=yes
3038 hardcode_shlibpath_var=no 3051 hardcode_shlibpath_var=no
3039@@ -9478,7 +10061,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 3052@@ -9771,7 +10354,7 @@ if test -z "$aix_libpath"; then aix_libp
3040 3053
3041 hpux9*) 3054 hpux9*)
3042 if test "$GCC" = yes; then 3055 if test "$GCC" = yes; then
@@ -3045,7 +3058,7 @@ index 5d9c9105a7..a65b2b4518 100755
3045 else 3058 else
3046 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' 3059 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'
3047 fi 3060 fi
3048@@ -9494,7 +10077,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 3061@@ -9787,7 +10370,7 @@ if test -z "$aix_libpath"; then aix_libp
3049 3062
3050 hpux10*) 3063 hpux10*)
3051 if test "$GCC" = yes && test "$with_gnu_ld" = no; then 3064 if test "$GCC" = yes && test "$with_gnu_ld" = no; then
@@ -3054,7 +3067,7 @@ index 5d9c9105a7..a65b2b4518 100755
3054 else 3067 else
3055 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' 3068 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
3056 fi 3069 fi
3057@@ -9518,10 +10101,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 3070@@ -9811,10 +10394,10 @@ if test -z "$aix_libpath"; then aix_libp
3058 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' 3071 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
3059 ;; 3072 ;;
3060 ia64*) 3073 ia64*)
@@ -3067,7 +3080,7 @@ index 5d9c9105a7..a65b2b4518 100755
3067 ;; 3080 ;;
3068 esac 3081 esac
3069 else 3082 else
3070@@ -9600,23 +10183,36 @@ fi 3083@@ -9893,23 +10476,36 @@ fi
3071 3084
3072 irix5* | irix6* | nonstopux*) 3085 irix5* | irix6* | nonstopux*)
3073 if test "$GCC" = yes; then 3086 if test "$GCC" = yes; then
@@ -3082,7 +3095,7 @@ index 5d9c9105a7..a65b2b4518 100755
3082+ # This should be the same for all languages, so no per-tag cache variable. 3095+ # This should be the same for all languages, so no per-tag cache variable.
3083+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5 3096+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5
3084+$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; } 3097+$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; }
3085+if test "${lt_cv_irix_exported_symbol+set}" = set; then : 3098+if ${lt_cv_irix_exported_symbol+:} false; then :
3086+ $as_echo_n "(cached) " >&6 3099+ $as_echo_n "(cached) " >&6
3087+else 3100+else
3088+ save_LDFLAGS="$LDFLAGS" 3101+ save_LDFLAGS="$LDFLAGS"
@@ -3112,7 +3125,7 @@ index 5d9c9105a7..a65b2b4518 100755
3112 else 3125 else
3113 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' 3126 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'
3114 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' 3127 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'
3115@@ -9701,7 +10297,7 @@ rm -f core conftest.err conftest.$ac_objext \ 3128@@ -9994,7 +10590,7 @@ rm -f core conftest.err conftest.$ac_obj
3116 osf4* | osf5*) # as osf3* with the addition of -msym flag 3129 osf4* | osf5*) # as osf3* with the addition of -msym flag
3117 if test "$GCC" = yes; then 3130 if test "$GCC" = yes; then
3118 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' 3131 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
@@ -3121,7 +3134,7 @@ index 5d9c9105a7..a65b2b4518 100755
3121 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' 3134 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
3122 else 3135 else
3123 allow_undefined_flag=' -expect_unresolved \*' 3136 allow_undefined_flag=' -expect_unresolved \*'
3124@@ -9720,9 +10316,9 @@ rm -f core conftest.err conftest.$ac_objext \ 3137@@ -10013,9 +10609,9 @@ rm -f core conftest.err conftest.$ac_obj
3125 no_undefined_flag=' -z defs' 3138 no_undefined_flag=' -z defs'
3126 if test "$GCC" = yes; then 3139 if test "$GCC" = yes; then
3127 wlarc='${wl}' 3140 wlarc='${wl}'
@@ -3133,7 +3146,7 @@ index 5d9c9105a7..a65b2b4518 100755
3133 else 3146 else
3134 case `$CC -V 2>&1` in 3147 case `$CC -V 2>&1` in
3135 *"Compilers 5.0"*) 3148 *"Compilers 5.0"*)
3136@@ -10298,8 +10894,9 @@ cygwin* | mingw* | pw32* | cegcc*) 3149@@ -10591,8 +11187,9 @@ cygwin* | mingw* | pw32* | cegcc*)
3137 need_version=no 3150 need_version=no
3138 need_lib_prefix=no 3151 need_lib_prefix=no
3139 3152
@@ -3145,7 +3158,7 @@ index 5d9c9105a7..a65b2b4518 100755
3145 library_names_spec='$libname.dll.a' 3158 library_names_spec='$libname.dll.a'
3146 # DLL is installed to $(libdir)/../bin by postinstall_cmds 3159 # DLL is installed to $(libdir)/../bin by postinstall_cmds
3147 postinstall_cmds='base_file=`basename \${file}`~ 3160 postinstall_cmds='base_file=`basename \${file}`~
3148@@ -10332,13 +10929,71 @@ cygwin* | mingw* | pw32* | cegcc*) 3161@@ -10625,13 +11222,71 @@ cygwin* | mingw* | pw32* | cegcc*)
3149 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' 3162 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
3150 ;; 3163 ;;
3151 esac 3164 esac
@@ -3218,7 +3231,7 @@ index 5d9c9105a7..a65b2b4518 100755
3218 # FIXME: first we should search . and the directory the executable is in 3231 # FIXME: first we should search . and the directory the executable is in
3219 shlibpath_var=PATH 3232 shlibpath_var=PATH
3220 ;; 3233 ;;
3221@@ -10430,7 +11085,7 @@ haiku*) 3234@@ -10723,7 +11378,7 @@ haiku*)
3222 soname_spec='${libname}${release}${shared_ext}$major' 3235 soname_spec='${libname}${release}${shared_ext}$major'
3223 shlibpath_var=LIBRARY_PATH 3236 shlibpath_var=LIBRARY_PATH
3224 shlibpath_overrides_runpath=yes 3237 shlibpath_overrides_runpath=yes
@@ -3227,7 +3240,16 @@ index 5d9c9105a7..a65b2b4518 100755
3227 hardcode_into_libs=yes 3240 hardcode_into_libs=yes
3228 ;; 3241 ;;
3229 3242
3230@@ -11270,10 +11925,10 @@ else 3243@@ -11519,7 +12174,7 @@ else
3244 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
3245 lt_status=$lt_dlunknown
3246 cat > conftest.$ac_ext <<_LT_EOF
3247-#line 11522 "configure"
3248+#line $LINENO "configure"
3249 #include "confdefs.h"
3250
3251 #if HAVE_DLFCN_H
3252@@ -11563,10 +12218,10 @@ else
3231 /* When -fvisbility=hidden is used, assume the code has been annotated 3253 /* When -fvisbility=hidden is used, assume the code has been annotated
3232 correspondingly for the symbols needed. */ 3254 correspondingly for the symbols needed. */
3233 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 3255 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
@@ -3240,7 +3262,16 @@ index 5d9c9105a7..a65b2b4518 100755
3240 int main () 3262 int main ()
3241 { 3263 {
3242 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 3264 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
3243@@ -11376,10 +12031,10 @@ else 3265@@ -11625,7 +12280,7 @@ else
3266 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
3267 lt_status=$lt_dlunknown
3268 cat > conftest.$ac_ext <<_LT_EOF
3269-#line 11628 "configure"
3270+#line $LINENO "configure"
3271 #include "confdefs.h"
3272
3273 #if HAVE_DLFCN_H
3274@@ -11669,10 +12324,10 @@ else
3244 /* When -fvisbility=hidden is used, assume the code has been annotated 3275 /* When -fvisbility=hidden is used, assume the code has been annotated
3245 correspondingly for the symbols needed. */ 3276 correspondingly for the symbols needed. */
3246 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 3277 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
@@ -3253,7 +3284,7 @@ index 5d9c9105a7..a65b2b4518 100755
3253 int main () 3284 int main ()
3254 { 3285 {
3255 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 3286 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
3256@@ -15446,13 +16101,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' 3287@@ -15731,13 +16386,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_
3257 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' 3288 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
3258 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' 3289 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
3259 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' 3290 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
@@ -3274,7 +3305,7 @@ index 5d9c9105a7..a65b2b4518 100755
3274 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' 3305 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
3275 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' 3306 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
3276 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' 3307 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
3277@@ -15467,14 +16129,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de 3308@@ -15752,14 +16414,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$l
3278 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' 3309 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
3279 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' 3310 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
3280 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"`' 3311 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"`'
@@ -3293,7 +3324,7 @@ index 5d9c9105a7..a65b2b4518 100755
3293 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' 3324 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
3294 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' 3325 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
3295 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' 3326 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
3296@@ -15507,12 +16172,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q 3327@@ -15792,12 +16457,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcod
3297 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' 3328 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
3298 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' 3329 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
3299 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' 3330 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
@@ -3307,7 +3338,7 @@ index 5d9c9105a7..a65b2b4518 100755
3307 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' 3338 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
3308 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' 3339 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
3309 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' 3340 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
3310@@ -15567,8 +16232,13 @@ reload_flag \ 3341@@ -15852,8 +16517,13 @@ reload_flag \
3311 OBJDUMP \ 3342 OBJDUMP \
3312 deplibs_check_method \ 3343 deplibs_check_method \
3313 file_magic_cmd \ 3344 file_magic_cmd \
@@ -3321,7 +3352,7 @@ index 5d9c9105a7..a65b2b4518 100755
3321 STRIP \ 3352 STRIP \
3322 RANLIB \ 3353 RANLIB \
3323 CC \ 3354 CC \
3324@@ -15578,12 +16248,14 @@ lt_cv_sys_global_symbol_pipe \ 3355@@ -15863,12 +16533,14 @@ lt_cv_sys_global_symbol_pipe \
3325 lt_cv_sys_global_symbol_to_cdecl \ 3356 lt_cv_sys_global_symbol_to_cdecl \
3326 lt_cv_sys_global_symbol_to_c_name_address \ 3357 lt_cv_sys_global_symbol_to_c_name_address \
3327 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ 3358 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
@@ -3337,7 +3368,7 @@ index 5d9c9105a7..a65b2b4518 100755
3337 DSYMUTIL \ 3368 DSYMUTIL \
3338 NMEDIT \ 3369 NMEDIT \
3339 LIPO \ 3370 LIPO \
3340@@ -15599,7 +16271,6 @@ no_undefined_flag \ 3371@@ -15884,7 +16556,6 @@ no_undefined_flag \
3341 hardcode_libdir_flag_spec \ 3372 hardcode_libdir_flag_spec \
3342 hardcode_libdir_flag_spec_ld \ 3373 hardcode_libdir_flag_spec_ld \
3343 hardcode_libdir_separator \ 3374 hardcode_libdir_separator \
@@ -3345,7 +3376,7 @@ index 5d9c9105a7..a65b2b4518 100755
3345 exclude_expsyms \ 3376 exclude_expsyms \
3346 include_expsyms \ 3377 include_expsyms \
3347 file_list_spec \ 3378 file_list_spec \
3348@@ -15635,6 +16306,7 @@ module_cmds \ 3379@@ -15920,6 +16591,7 @@ module_cmds \
3349 module_expsym_cmds \ 3380 module_expsym_cmds \
3350 export_symbols_cmds \ 3381 export_symbols_cmds \
3351 prelink_cmds \ 3382 prelink_cmds \
@@ -3353,7 +3384,7 @@ index 5d9c9105a7..a65b2b4518 100755
3353 postinstall_cmds \ 3384 postinstall_cmds \
3354 postuninstall_cmds \ 3385 postuninstall_cmds \
3355 finish_cmds \ 3386 finish_cmds \
3356@@ -16392,7 +17064,8 @@ $as_echo X"$file" | 3387@@ -16686,7 +17358,8 @@ $as_echo X"$file" |
3357 # NOTE: Changes made to this file will be lost: look at ltmain.sh. 3388 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
3358 # 3389 #
3359 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 3390 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
@@ -3363,7 +3394,7 @@ index 5d9c9105a7..a65b2b4518 100755
3363 # Written by Gordon Matzigkeit, 1996 3394 # Written by Gordon Matzigkeit, 1996
3364 # 3395 #
3365 # This file is part of GNU Libtool. 3396 # This file is part of GNU Libtool.
3366@@ -16495,19 +17168,42 @@ SP2NL=$lt_lt_SP2NL 3397@@ -16789,19 +17462,42 @@ SP2NL=$lt_lt_SP2NL
3367 # turn newlines into spaces. 3398 # turn newlines into spaces.
3368 NL2SP=$lt_lt_NL2SP 3399 NL2SP=$lt_lt_NL2SP
3369 3400
@@ -3407,7 +3438,7 @@ index 5d9c9105a7..a65b2b4518 100755
3407 # A symbol stripping program. 3438 # A symbol stripping program.
3408 STRIP=$lt_STRIP 3439 STRIP=$lt_STRIP
3409 3440
3410@@ -16537,6 +17233,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address 3441@@ -16831,6 +17527,12 @@ global_symbol_to_c_name_address=$lt_lt_c
3411 # Transform the output of nm in a C name address pair when lib prefix is needed. 3442 # Transform the output of nm in a C name address pair when lib prefix is needed.
3412 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix 3443 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
3413 3444
@@ -3420,7 +3451,7 @@ index 5d9c9105a7..a65b2b4518 100755
3420 # The name of the directory that contains temporary libtool files. 3451 # The name of the directory that contains temporary libtool files.
3421 objdir=$objdir 3452 objdir=$objdir
3422 3453
3423@@ -16546,6 +17248,9 @@ MAGIC_CMD=$MAGIC_CMD 3454@@ -16840,6 +17542,9 @@ MAGIC_CMD=$MAGIC_CMD
3424 # Must we lock files when doing compilation? 3455 # Must we lock files when doing compilation?
3425 need_locks=$lt_need_locks 3456 need_locks=$lt_need_locks
3426 3457
@@ -3430,7 +3461,7 @@ index 5d9c9105a7..a65b2b4518 100755
3430 # Tool to manipulate archived DWARF debug symbol files on Mac OS X. 3461 # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
3431 DSYMUTIL=$lt_DSYMUTIL 3462 DSYMUTIL=$lt_DSYMUTIL
3432 3463
3433@@ -16660,12 +17365,12 @@ with_gcc=$GCC 3464@@ -16954,12 +17659,12 @@ with_gcc=$GCC
3434 # Compiler flag to turn off builtin functions. 3465 # Compiler flag to turn off builtin functions.
3435 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag 3466 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
3436 3467
@@ -3446,7 +3477,7 @@ index 5d9c9105a7..a65b2b4518 100755
3446 # Compiler flag to prevent dynamic linking. 3477 # Compiler flag to prevent dynamic linking.
3447 link_static_flag=$lt_lt_prog_compiler_static 3478 link_static_flag=$lt_lt_prog_compiler_static
3448 3479
3449@@ -16752,9 +17457,6 @@ inherit_rpath=$inherit_rpath 3480@@ -17046,9 +17751,6 @@ inherit_rpath=$inherit_rpath
3450 # Whether libtool must link a program against all its dependency libraries. 3481 # Whether libtool must link a program against all its dependency libraries.
3451 link_all_deplibs=$link_all_deplibs 3482 link_all_deplibs=$link_all_deplibs
3452 3483
@@ -3456,7 +3487,7 @@ index 5d9c9105a7..a65b2b4518 100755
3456 # Set to "yes" if exported symbols are required. 3487 # Set to "yes" if exported symbols are required.
3457 always_export_symbols=$always_export_symbols 3488 always_export_symbols=$always_export_symbols
3458 3489
3459@@ -16770,6 +17472,9 @@ include_expsyms=$lt_include_expsyms 3490@@ -17064,6 +17766,9 @@ include_expsyms=$lt_include_expsyms
3460 # Commands necessary for linking programs (against libraries) with templates. 3491 # Commands necessary for linking programs (against libraries) with templates.
3461 prelink_cmds=$lt_prelink_cmds 3492 prelink_cmds=$lt_prelink_cmds
3462 3493
@@ -3466,7 +3497,7 @@ index 5d9c9105a7..a65b2b4518 100755
3466 # Specify filename containing input files. 3497 # Specify filename containing input files.
3467 file_list_spec=$lt_file_list_spec 3498 file_list_spec=$lt_file_list_spec
3468 3499
3469@@ -16802,210 +17507,169 @@ ltmain="$ac_aux_dir/ltmain.sh" 3500@@ -17096,210 +17801,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
3470 # if finds mixed CR/LF and LF-only lines. Since sed operates in 3501 # if finds mixed CR/LF and LF-only lines. Since sed operates in
3471 # text mode, it properly converts lines to CR/LF. This bash problem 3502 # text mode, it properly converts lines to CR/LF. This bash problem
3472 # is reportedly fixed, but why not run on old versions too? 3503 # is reportedly fixed, but why not run on old versions too?
@@ -3668,15 +3699,9 @@ index 5d9c9105a7..a65b2b4518 100755
3668-_LT_EOF 3699-_LT_EOF
3669- ;; 3700- ;;
3670- esac 3701- esac
3671-
3672-
3673- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
3674- || (rm -f "$cfgfile"; exit 1)
3675-
3676- mv -f "$cfgfile" "$ofile" ||
3677+ sed '$q' "$ltmain" >> "$cfgfile" \ 3702+ sed '$q' "$ltmain" >> "$cfgfile" \
3678+ || (rm -f "$cfgfile"; exit 1) 3703+ || (rm -f "$cfgfile"; exit 1)
3679+ 3704
3680+ if test x"$xsi_shell" = xyes; then 3705+ if test x"$xsi_shell" = xyes; then
3681+ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ 3706+ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\
3682+func_dirname ()\ 3707+func_dirname ()\
@@ -3834,17 +3859,20 @@ index 5d9c9105a7..a65b2b4518 100755
3834+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 3859+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5
3835+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} 3860+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;}
3836+fi 3861+fi
3837+ 3862
3838+ 3863- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
3864- || (rm -f "$cfgfile"; exit 1)
3865
3866- mv -f "$cfgfile" "$ofile" ||
3839+ mv -f "$cfgfile" "$ofile" || 3867+ mv -f "$cfgfile" "$ofile" ||
3840 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") 3868 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
3841 chmod +x "$ofile" 3869 chmod +x "$ofile"
3842 3870
3843diff --git a/gas/configure b/gas/configure 3871Index: git/gas/configure
3844index fbac8f44d5..a40ac2144f 100755 3872===================================================================
3845--- a/gas/configure 3873--- git.orig/gas/configure
3846+++ b/gas/configure 3874+++ git/gas/configure
3847@@ -650,8 +650,11 @@ OTOOL 3875@@ -681,8 +681,11 @@ OTOOL
3848 LIPO 3876 LIPO
3849 NMEDIT 3877 NMEDIT
3850 DSYMUTIL 3878 DSYMUTIL
@@ -3856,7 +3884,7 @@ index fbac8f44d5..a40ac2144f 100755
3856 OBJDUMP 3884 OBJDUMP
3857 LN_S 3885 LN_S
3858 NM 3886 NM
3859@@ -763,6 +766,7 @@ enable_static 3887@@ -799,6 +802,7 @@ enable_static
3860 with_pic 3888 with_pic
3861 enable_fast_install 3889 enable_fast_install
3862 with_gnu_ld 3890 with_gnu_ld
@@ -3864,7 +3892,16 @@ index fbac8f44d5..a40ac2144f 100755
3864 enable_libtool_lock 3892 enable_libtool_lock
3865 enable_plugins 3893 enable_plugins
3866 enable_largefile 3894 enable_largefile
3867@@ -4921,8 +4925,8 @@ esac 3895@@ -1482,6 +1486,8 @@ Optional Packages:
3896 --with-pic try to use only PIC/non-PIC objects [default=use
3897 both]
3898 --with-gnu-ld assume the C compiler uses GNU ld [default=no]
3899+ --with-libtool-sysroot=DIR Search for dependent libraries within DIR
3900+ (or the compiler's sysroot if not specified).
3901 --with-cpu=CPU default cpu variant is CPU (currently only supported
3902 on ARC)
3903 --with-system-zlib use installed libz
3904@@ -5269,8 +5275,8 @@ esac
3868 3905
3869 3906
3870 3907
@@ -3875,7 +3912,7 @@ index fbac8f44d5..a40ac2144f 100755
3875 3912
3876 3913
3877 3914
3878@@ -4962,7 +4966,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO 3915@@ -5310,7 +5316,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
3879 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 3916 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
3880 $as_echo_n "checking how to print strings... " >&6; } 3917 $as_echo_n "checking how to print strings... " >&6; }
3881 # Test print first, because it will be a builtin if present. 3918 # Test print first, because it will be a builtin if present.
@@ -3884,7 +3921,7 @@ index fbac8f44d5..a40ac2144f 100755
3884 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then 3921 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
3885 ECHO='print -r --' 3922 ECHO='print -r --'
3886 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then 3923 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
3887@@ -5648,8 +5652,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; 3924@@ -5996,8 +6002,8 @@ $as_echo_n "checking whether the shell u
3888 # Try some XSI features 3925 # Try some XSI features
3889 xsi_shell=no 3926 xsi_shell=no
3890 ( _lt_dummy="a/b/c" 3927 ( _lt_dummy="a/b/c"
@@ -3895,13 +3932,13 @@ index fbac8f44d5..a40ac2144f 100755
3895 && eval 'test $(( 1 + 1 )) -eq 2 \ 3932 && eval 'test $(( 1 + 1 )) -eq 2 \
3896 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ 3933 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
3897 && xsi_shell=yes 3934 && xsi_shell=yes
3898@@ -5698,6 +5702,80 @@ esac 3935@@ -6046,6 +6052,80 @@ esac
3899 3936
3900 3937
3901 3938
3902+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5 3939+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5
3903+$as_echo_n "checking how to convert $build file names to $host format... " >&6; } 3940+$as_echo_n "checking how to convert $build file names to $host format... " >&6; }
3904+if test "${lt_cv_to_host_file_cmd+set}" = set; then : 3941+if ${lt_cv_to_host_file_cmd+:} false; then :
3905+ $as_echo_n "(cached) " >&6 3942+ $as_echo_n "(cached) " >&6
3906+else 3943+else
3907+ case $host in 3944+ case $host in
@@ -3948,7 +3985,7 @@ index fbac8f44d5..a40ac2144f 100755
3948+ 3985+
3949+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5 3986+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5
3950+$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; } 3987+$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; }
3951+if test "${lt_cv_to_tool_file_cmd+set}" = set; then : 3988+if ${lt_cv_to_tool_file_cmd+:} false; then :
3952+ $as_echo_n "(cached) " >&6 3989+ $as_echo_n "(cached) " >&6
3953+else 3990+else
3954+ #assume ordinary cross tools, or native build. 3991+ #assume ordinary cross tools, or native build.
@@ -3975,8 +4012,8 @@ index fbac8f44d5..a40ac2144f 100755
3975+ 4012+
3976 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 4013 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
3977 $as_echo_n "checking for $LD option to reload object files... " >&6; } 4014 $as_echo_n "checking for $LD option to reload object files... " >&6; }
3978 if test "${lt_cv_ld_reload_flag+set}" = set; then : 4015 if ${lt_cv_ld_reload_flag+:} false; then :
3979@@ -5714,6 +5792,11 @@ case $reload_flag in 4016@@ -6062,6 +6142,11 @@ case $reload_flag in
3980 esac 4017 esac
3981 reload_cmds='$LD$reload_flag -o $output$reload_objs' 4018 reload_cmds='$LD$reload_flag -o $output$reload_objs'
3982 case $host_os in 4019 case $host_os in
@@ -3988,7 +4025,7 @@ index fbac8f44d5..a40ac2144f 100755
3988 darwin*) 4025 darwin*)
3989 if test "$GCC" = yes; then 4026 if test "$GCC" = yes; then
3990 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' 4027 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
3991@@ -5882,7 +5965,8 @@ mingw* | pw32*) 4028@@ -6230,7 +6315,8 @@ mingw* | pw32*)
3992 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' 4029 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
3993 lt_cv_file_magic_cmd='func_win32_libid' 4030 lt_cv_file_magic_cmd='func_win32_libid'
3994 else 4031 else
@@ -3998,7 +4035,7 @@ index fbac8f44d5..a40ac2144f 100755
3998 lt_cv_file_magic_cmd='$OBJDUMP -f' 4035 lt_cv_file_magic_cmd='$OBJDUMP -f'
3999 fi 4036 fi
4000 ;; 4037 ;;
4001@@ -6036,6 +6120,21 @@ esac 4038@@ -6384,6 +6470,21 @@ esac
4002 fi 4039 fi
4003 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 4040 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
4004 $as_echo "$lt_cv_deplibs_check_method" >&6; } 4041 $as_echo "$lt_cv_deplibs_check_method" >&6; }
@@ -4020,7 +4057,7 @@ index fbac8f44d5..a40ac2144f 100755
4020 file_magic_cmd=$lt_cv_file_magic_cmd 4057 file_magic_cmd=$lt_cv_file_magic_cmd
4021 deplibs_check_method=$lt_cv_deplibs_check_method 4058 deplibs_check_method=$lt_cv_deplibs_check_method
4022 test -z "$deplibs_check_method" && deplibs_check_method=unknown 4059 test -z "$deplibs_check_method" && deplibs_check_method=unknown
4023@@ -6051,9 +6150,162 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown 4060@@ -6399,9 +6500,162 @@ test -z "$deplibs_check_method" && depli
4024 4061
4025 4062
4026 4063
@@ -4034,12 +4071,14 @@ index fbac8f44d5..a40ac2144f 100755
4034+ 4071+
4035+ 4072+
4036+ 4073+
4037+if test -n "$ac_tool_prefix"; then 4074 if test -n "$ac_tool_prefix"; then
4075- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
4076-set dummy ${ac_tool_prefix}ar; ac_word=$2
4038+ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. 4077+ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
4039+set dummy ${ac_tool_prefix}dlltool; ac_word=$2 4078+set dummy ${ac_tool_prefix}dlltool; ac_word=$2
4040+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 4079+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
4041+$as_echo_n "checking for $ac_word... " >&6; } 4080+$as_echo_n "checking for $ac_word... " >&6; }
4042+if test "${ac_cv_prog_DLLTOOL+set}" = set; then : 4081+if ${ac_cv_prog_DLLTOOL+:} false; then :
4043+ $as_echo_n "(cached) " >&6 4082+ $as_echo_n "(cached) " >&6
4044+else 4083+else
4045+ if test -n "$DLLTOOL"; then 4084+ if test -n "$DLLTOOL"; then
@@ -4051,7 +4090,7 @@ index fbac8f44d5..a40ac2144f 100755
4051+ IFS=$as_save_IFS 4090+ IFS=$as_save_IFS
4052+ test -z "$as_dir" && as_dir=. 4091+ test -z "$as_dir" && as_dir=.
4053+ for ac_exec_ext in '' $ac_executable_extensions; do 4092+ for ac_exec_ext in '' $ac_executable_extensions; do
4054+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 4093+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
4055+ ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" 4094+ ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
4056+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 4095+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
4057+ break 2 4096+ break 2
@@ -4079,7 +4118,7 @@ index fbac8f44d5..a40ac2144f 100755
4079+set dummy dlltool; ac_word=$2 4118+set dummy dlltool; ac_word=$2
4080+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 4119+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
4081+$as_echo_n "checking for $ac_word... " >&6; } 4120+$as_echo_n "checking for $ac_word... " >&6; }
4082+if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then : 4121+if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then :
4083+ $as_echo_n "(cached) " >&6 4122+ $as_echo_n "(cached) " >&6
4084+else 4123+else
4085+ if test -n "$ac_ct_DLLTOOL"; then 4124+ if test -n "$ac_ct_DLLTOOL"; then
@@ -4091,7 +4130,7 @@ index fbac8f44d5..a40ac2144f 100755
4091+ IFS=$as_save_IFS 4130+ IFS=$as_save_IFS
4092+ test -z "$as_dir" && as_dir=. 4131+ test -z "$as_dir" && as_dir=.
4093+ for ac_exec_ext in '' $ac_executable_extensions; do 4132+ for ac_exec_ext in '' $ac_executable_extensions; do
4094+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 4133+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
4095+ ac_cv_prog_ac_ct_DLLTOOL="dlltool" 4134+ ac_cv_prog_ac_ct_DLLTOOL="dlltool"
4096+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 4135+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
4097+ break 2 4136+ break 2
@@ -4139,7 +4178,7 @@ index fbac8f44d5..a40ac2144f 100755
4139+ 4178+
4140+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5 4179+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5
4141+$as_echo_n "checking how to associate runtime and link libraries... " >&6; } 4180+$as_echo_n "checking how to associate runtime and link libraries... " >&6; }
4142+if test "${lt_cv_sharedlib_from_linklib_cmd+set}" = set; then : 4181+if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then :
4143+ $as_echo_n "(cached) " >&6 4182+ $as_echo_n "(cached) " >&6
4144+else 4183+else
4145+ lt_cv_sharedlib_from_linklib_cmd='unknown' 4184+ lt_cv_sharedlib_from_linklib_cmd='unknown'
@@ -4175,26 +4214,24 @@ index fbac8f44d5..a40ac2144f 100755
4175+ 4214+
4176+ 4215+
4177+ 4216+
4178 if test -n "$ac_tool_prefix"; then 4217+if test -n "$ac_tool_prefix"; then
4179- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
4180-set dummy ${ac_tool_prefix}ar; ac_word=$2
4181+ for ac_prog in ar 4218+ for ac_prog in ar
4182+ do 4219+ do
4183+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. 4220+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
4184+set dummy $ac_tool_prefix$ac_prog; ac_word=$2 4221+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
4185 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 4222 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
4186 $as_echo_n "checking for $ac_word... " >&6; } 4223 $as_echo_n "checking for $ac_word... " >&6; }
4187 if test "${ac_cv_prog_AR+set}" = set; then : 4224 if ${ac_cv_prog_AR+:} false; then :
4188@@ -6069,7 +6321,7 @@ do 4225@@ -6417,7 +6671,7 @@ do
4189 test -z "$as_dir" && as_dir=. 4226 test -z "$as_dir" && as_dir=.
4190 for ac_exec_ext in '' $ac_executable_extensions; do 4227 for ac_exec_ext in '' $ac_executable_extensions; do
4191 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 4228 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
4192- ac_cv_prog_AR="${ac_tool_prefix}ar" 4229- ac_cv_prog_AR="${ac_tool_prefix}ar"
4193+ ac_cv_prog_AR="$ac_tool_prefix$ac_prog" 4230+ ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
4194 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 4231 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
4195 break 2 4232 break 2
4196 fi 4233 fi
4197@@ -6089,11 +6341,15 @@ $as_echo "no" >&6; } 4234@@ -6437,11 +6691,15 @@ $as_echo "no" >&6; }
4198 fi 4235 fi
4199 4236
4200 4237
@@ -4212,17 +4249,17 @@ index fbac8f44d5..a40ac2144f 100755
4212+set dummy $ac_prog; ac_word=$2 4249+set dummy $ac_prog; ac_word=$2
4213 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 4250 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
4214 $as_echo_n "checking for $ac_word... " >&6; } 4251 $as_echo_n "checking for $ac_word... " >&6; }
4215 if test "${ac_cv_prog_ac_ct_AR+set}" = set; then : 4252 if ${ac_cv_prog_ac_ct_AR+:} false; then :
4216@@ -6109,7 +6365,7 @@ do 4253@@ -6457,7 +6715,7 @@ do
4217 test -z "$as_dir" && as_dir=. 4254 test -z "$as_dir" && as_dir=.
4218 for ac_exec_ext in '' $ac_executable_extensions; do 4255 for ac_exec_ext in '' $ac_executable_extensions; do
4219 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 4256 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
4220- ac_cv_prog_ac_ct_AR="ar" 4257- ac_cv_prog_ac_ct_AR="ar"
4221+ ac_cv_prog_ac_ct_AR="$ac_prog" 4258+ ac_cv_prog_ac_ct_AR="$ac_prog"
4222 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 4259 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
4223 break 2 4260 break 2
4224 fi 4261 fi
4225@@ -6128,6 +6384,10 @@ else 4262@@ -6476,6 +6734,10 @@ else
4226 $as_echo "no" >&6; } 4263 $as_echo "no" >&6; }
4227 fi 4264 fi
4228 4265
@@ -4233,7 +4270,7 @@ index fbac8f44d5..a40ac2144f 100755
4233 if test "x$ac_ct_AR" = x; then 4270 if test "x$ac_ct_AR" = x; then
4234 AR="false" 4271 AR="false"
4235 else 4272 else
4236@@ -6139,12 +6399,10 @@ ac_tool_warned=yes ;; 4273@@ -6487,12 +6749,10 @@ ac_tool_warned=yes ;;
4237 esac 4274 esac
4238 AR=$ac_ct_AR 4275 AR=$ac_ct_AR
4239 fi 4276 fi
@@ -4248,13 +4285,13 @@ index fbac8f44d5..a40ac2144f 100755
4248 4285
4249 4286
4250 4287
4251@@ -6156,6 +6414,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru 4288@@ -6504,6 +6764,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru
4252 4289
4253 4290
4254 4291
4255+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 4292+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
4256+$as_echo_n "checking for archiver @FILE support... " >&6; } 4293+$as_echo_n "checking for archiver @FILE support... " >&6; }
4257+if test "${lt_cv_ar_at_file+set}" = set; then : 4294+if ${lt_cv_ar_at_file+:} false; then :
4258+ $as_echo_n "(cached) " >&6 4295+ $as_echo_n "(cached) " >&6
4259+else 4296+else
4260+ lt_cv_ar_at_file=no 4297+ lt_cv_ar_at_file=no
@@ -4313,7 +4350,7 @@ index fbac8f44d5..a40ac2144f 100755
4313 if test -n "$ac_tool_prefix"; then 4350 if test -n "$ac_tool_prefix"; then
4314 # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. 4351 # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
4315 set dummy ${ac_tool_prefix}strip; ac_word=$2 4352 set dummy ${ac_tool_prefix}strip; ac_word=$2
4316@@ -6490,8 +6806,8 @@ esac 4353@@ -6838,8 +7156,8 @@ esac
4317 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" 4354 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
4318 4355
4319 # Transform an extracted symbol line into symbol name and symbol address 4356 # Transform an extracted symbol line into symbol name and symbol address
@@ -4324,7 +4361,7 @@ index fbac8f44d5..a40ac2144f 100755
4324 4361
4325 # Handle CRLF in mingw tool chain 4362 # Handle CRLF in mingw tool chain
4326 opt_cr= 4363 opt_cr=
4327@@ -6527,6 +6843,7 @@ for ac_symprfx in "" "_"; do 4364@@ -6875,6 +7193,7 @@ for ac_symprfx in "" "_"; do
4328 else 4365 else
4329 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" 4366 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
4330 fi 4367 fi
@@ -4332,7 +4369,7 @@ index fbac8f44d5..a40ac2144f 100755
4332 4369
4333 # Check to see that the pipe works correctly. 4370 # Check to see that the pipe works correctly.
4334 pipe_works=no 4371 pipe_works=no
4335@@ -6568,6 +6885,18 @@ _LT_EOF 4372@@ -6916,6 +7235,18 @@ _LT_EOF
4336 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then 4373 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
4337 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then 4374 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
4338 cat <<_LT_EOF > conftest.$ac_ext 4375 cat <<_LT_EOF > conftest.$ac_ext
@@ -4351,7 +4388,7 @@ index fbac8f44d5..a40ac2144f 100755
4351 #ifdef __cplusplus 4388 #ifdef __cplusplus
4352 extern "C" { 4389 extern "C" {
4353 #endif 4390 #endif
4354@@ -6579,7 +6908,7 @@ _LT_EOF 4391@@ -6927,7 +7258,7 @@ _LT_EOF
4355 cat <<_LT_EOF >> conftest.$ac_ext 4392 cat <<_LT_EOF >> conftest.$ac_ext
4356 4393
4357 /* The mapping between symbol names and symbols. */ 4394 /* The mapping between symbol names and symbols. */
@@ -4360,7 +4397,7 @@ index fbac8f44d5..a40ac2144f 100755
4360 const char *name; 4397 const char *name;
4361 void *address; 4398 void *address;
4362 } 4399 }
4363@@ -6605,8 +6934,8 @@ static const void *lt_preloaded_setup() { 4400@@ -6953,8 +7284,8 @@ static const void *lt_preloaded_setup()
4364 _LT_EOF 4401 _LT_EOF
4365 # Now try linking the two files. 4402 # Now try linking the two files.
4366 mv conftest.$ac_objext conftstm.$ac_objext 4403 mv conftest.$ac_objext conftstm.$ac_objext
@@ -4371,7 +4408,7 @@ index fbac8f44d5..a40ac2144f 100755
4371 LIBS="conftstm.$ac_objext" 4408 LIBS="conftstm.$ac_objext"
4372 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" 4409 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
4373 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 4410 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
4374@@ -6616,8 +6945,8 @@ _LT_EOF 4411@@ -6964,8 +7295,8 @@ _LT_EOF
4375 test $ac_status = 0; } && test -s conftest${ac_exeext}; then 4412 test $ac_status = 0; } && test -s conftest${ac_exeext}; then
4376 pipe_works=yes 4413 pipe_works=yes
4377 fi 4414 fi
@@ -4382,7 +4419,7 @@ index fbac8f44d5..a40ac2144f 100755
4382 else 4419 else
4383 echo "cannot find nm_test_func in $nlist" >&5 4420 echo "cannot find nm_test_func in $nlist" >&5
4384 fi 4421 fi
4385@@ -6654,6 +6983,21 @@ else 4422@@ -7002,6 +7333,19 @@ else
4386 $as_echo "ok" >&6; } 4423 $as_echo "ok" >&6; }
4387 fi 4424 fi
4388 4425
@@ -4399,17 +4436,13 @@ index fbac8f44d5..a40ac2144f 100755
4399+ 4436+
4400+ 4437+
4401+ 4438+
4402+
4403+
4404 4439
4405 4440
4406 4441
4407@@ -6669,6 +7013,40 @@ fi 4442@@ -7022,6 +7366,42 @@ fi
4408 4443
4409 4444
4410 4445
4411+
4412+
4413+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 4446+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
4414+$as_echo_n "checking for sysroot... " >&6; } 4447+$as_echo_n "checking for sysroot... " >&6; }
4415+ 4448+
@@ -4436,16 +4469,20 @@ index fbac8f44d5..a40ac2144f 100755
4436+ *) 4469+ *)
4437+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5 4470+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5
4438+$as_echo "${with_libtool_sysroot}" >&6; } 4471+$as_echo "${with_libtool_sysroot}" >&6; }
4439+ as_fn_error "The sysroot must be an absolute path." "$LINENO" 5 4472+ as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5
4440+ ;; 4473+ ;;
4441+esac 4474+esac
4442+ 4475+
4443+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 4476+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
4444+$as_echo "${lt_sysroot:-no}" >&6; } 4477+$as_echo "${lt_sysroot:-no}" >&6; }
4478+
4479+
4480+
4481+
4445 4482
4446 4483 # Check whether --enable-libtool-lock was given.
4447 4484 if test "${enable_libtool_lock+set}" = set; then :
4448@@ -6881,6 +7259,123 @@ esac 4485@@ -7229,6 +7609,123 @@ esac
4449 4486
4450 need_locks="$enable_libtool_lock" 4487 need_locks="$enable_libtool_lock"
4451 4488
@@ -4454,7 +4491,7 @@ index fbac8f44d5..a40ac2144f 100755
4454+set dummy ${ac_tool_prefix}mt; ac_word=$2 4491+set dummy ${ac_tool_prefix}mt; ac_word=$2
4455+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 4492+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
4456+$as_echo_n "checking for $ac_word... " >&6; } 4493+$as_echo_n "checking for $ac_word... " >&6; }
4457+if test "${ac_cv_prog_MANIFEST_TOOL+set}" = set; then : 4494+if ${ac_cv_prog_MANIFEST_TOOL+:} false; then :
4458+ $as_echo_n "(cached) " >&6 4495+ $as_echo_n "(cached) " >&6
4459+else 4496+else
4460+ if test -n "$MANIFEST_TOOL"; then 4497+ if test -n "$MANIFEST_TOOL"; then
@@ -4466,7 +4503,7 @@ index fbac8f44d5..a40ac2144f 100755
4466+ IFS=$as_save_IFS 4503+ IFS=$as_save_IFS
4467+ test -z "$as_dir" && as_dir=. 4504+ test -z "$as_dir" && as_dir=.
4468+ for ac_exec_ext in '' $ac_executable_extensions; do 4505+ for ac_exec_ext in '' $ac_executable_extensions; do
4469+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 4506+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
4470+ ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" 4507+ ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
4471+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 4508+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
4472+ break 2 4509+ break 2
@@ -4494,7 +4531,7 @@ index fbac8f44d5..a40ac2144f 100755
4494+set dummy mt; ac_word=$2 4531+set dummy mt; ac_word=$2
4495+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 4532+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
4496+$as_echo_n "checking for $ac_word... " >&6; } 4533+$as_echo_n "checking for $ac_word... " >&6; }
4497+if test "${ac_cv_prog_ac_ct_MANIFEST_TOOL+set}" = set; then : 4534+if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then :
4498+ $as_echo_n "(cached) " >&6 4535+ $as_echo_n "(cached) " >&6
4499+else 4536+else
4500+ if test -n "$ac_ct_MANIFEST_TOOL"; then 4537+ if test -n "$ac_ct_MANIFEST_TOOL"; then
@@ -4506,7 +4543,7 @@ index fbac8f44d5..a40ac2144f 100755
4506+ IFS=$as_save_IFS 4543+ IFS=$as_save_IFS
4507+ test -z "$as_dir" && as_dir=. 4544+ test -z "$as_dir" && as_dir=.
4508+ for ac_exec_ext in '' $ac_executable_extensions; do 4545+ for ac_exec_ext in '' $ac_executable_extensions; do
4509+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 4546+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
4510+ ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" 4547+ ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
4511+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 4548+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
4512+ break 2 4549+ break 2
@@ -4544,7 +4581,7 @@ index fbac8f44d5..a40ac2144f 100755
4544+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt 4581+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
4545+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5 4582+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5
4546+$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; } 4583+$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; }
4547+if test "${lt_cv_path_mainfest_tool+set}" = set; then : 4584+if ${lt_cv_path_mainfest_tool+:} false; then :
4548+ $as_echo_n "(cached) " >&6 4585+ $as_echo_n "(cached) " >&6
4549+else 4586+else
4550+ lt_cv_path_mainfest_tool=no 4587+ lt_cv_path_mainfest_tool=no
@@ -4569,7 +4606,7 @@ index fbac8f44d5..a40ac2144f 100755
4569 4606
4570 case $host_os in 4607 case $host_os in
4571 rhapsody* | darwin*) 4608 rhapsody* | darwin*)
4572@@ -7444,6 +7939,8 @@ _LT_EOF 4609@@ -7792,6 +8289,8 @@ _LT_EOF
4573 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 4610 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
4574 echo "$AR cru libconftest.a conftest.o" >&5 4611 echo "$AR cru libconftest.a conftest.o" >&5
4575 $AR cru libconftest.a conftest.o 2>&5 4612 $AR cru libconftest.a conftest.o 2>&5
@@ -4578,7 +4615,7 @@ index fbac8f44d5..a40ac2144f 100755
4578 cat > conftest.c << _LT_EOF 4615 cat > conftest.c << _LT_EOF
4579 int main() { return 0;} 4616 int main() { return 0;}
4580 _LT_EOF 4617 _LT_EOF
4581@@ -7639,7 +8136,8 @@ fi 4618@@ -7987,7 +8486,8 @@ fi
4582 LIBTOOL_DEPS="$ltmain" 4619 LIBTOOL_DEPS="$ltmain"
4583 4620
4584 # Always use our own libtool. 4621 # Always use our own libtool.
@@ -4588,7 +4625,7 @@ index fbac8f44d5..a40ac2144f 100755
4588 4625
4589 4626
4590 4627
4591@@ -7728,7 +8226,7 @@ aix3*) 4628@@ -8076,7 +8576,7 @@ aix3*)
4592 esac 4629 esac
4593 4630
4594 # Global variables: 4631 # Global variables:
@@ -4597,7 +4634,7 @@ index fbac8f44d5..a40ac2144f 100755
4597 can_build_shared=yes 4634 can_build_shared=yes
4598 4635
4599 # All known linkers require a `.a' archive for static linking (except MSVC, 4636 # All known linkers require a `.a' archive for static linking (except MSVC,
4600@@ -8026,8 +8524,6 @@ fi 4637@@ -8374,8 +8874,6 @@ fi
4601 lt_prog_compiler_pic= 4638 lt_prog_compiler_pic=
4602 lt_prog_compiler_static= 4639 lt_prog_compiler_static=
4603 4640
@@ -4606,7 +4643,7 @@ index fbac8f44d5..a40ac2144f 100755
4606 4643
4607 if test "$GCC" = yes; then 4644 if test "$GCC" = yes; then
4608 lt_prog_compiler_wl='-Wl,' 4645 lt_prog_compiler_wl='-Wl,'
4609@@ -8193,6 +8689,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 4646@@ -8541,6 +9039,12 @@ $as_echo_n "checking for $compiler optio
4610 lt_prog_compiler_pic='--shared' 4647 lt_prog_compiler_pic='--shared'
4611 lt_prog_compiler_static='--static' 4648 lt_prog_compiler_static='--static'
4612 ;; 4649 ;;
@@ -4619,7 +4656,7 @@ index fbac8f44d5..a40ac2144f 100755
4619 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) 4656 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
4620 # Portland Group compilers (*not* the Pentium gcc compiler, 4657 # Portland Group compilers (*not* the Pentium gcc compiler,
4621 # which looks to be a dead project) 4658 # which looks to be a dead project)
4622@@ -8255,7 +8757,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 4659@@ -8603,7 +9107,7 @@ $as_echo_n "checking for $compiler optio
4623 lt_prog_compiler_pic='-KPIC' 4660 lt_prog_compiler_pic='-KPIC'
4624 lt_prog_compiler_static='-Bstatic' 4661 lt_prog_compiler_static='-Bstatic'
4625 case $cc_basename in 4662 case $cc_basename in
@@ -4628,7 +4665,7 @@ index fbac8f44d5..a40ac2144f 100755
4628 lt_prog_compiler_wl='-Qoption ld ';; 4665 lt_prog_compiler_wl='-Qoption ld ';;
4629 *) 4666 *)
4630 lt_prog_compiler_wl='-Wl,';; 4667 lt_prog_compiler_wl='-Wl,';;
4631@@ -8312,13 +8814,17 @@ case $host_os in 4668@@ -8660,13 +9164,17 @@ case $host_os in
4632 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" 4669 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
4633 ;; 4670 ;;
4634 esac 4671 esac
@@ -4641,7 +4678,7 @@ index fbac8f44d5..a40ac2144f 100755
4641 4678
4642+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 4679+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
4643+$as_echo_n "checking for $compiler option to produce PIC... " >&6; } 4680+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
4644+if test "${lt_cv_prog_compiler_pic+set}" = set; then : 4681+if ${lt_cv_prog_compiler_pic+:} false; then :
4645+ $as_echo_n "(cached) " >&6 4682+ $as_echo_n "(cached) " >&6
4646+else 4683+else
4647+ lt_cv_prog_compiler_pic=$lt_prog_compiler_pic 4684+ lt_cv_prog_compiler_pic=$lt_prog_compiler_pic
@@ -4652,7 +4689,7 @@ index fbac8f44d5..a40ac2144f 100755
4652 4689
4653 # 4690 #
4654 # Check to make sure the PIC flag actually works. 4691 # Check to make sure the PIC flag actually works.
4655@@ -8379,6 +8885,11 @@ fi 4692@@ -8727,6 +9235,11 @@ fi
4656 4693
4657 4694
4658 4695
@@ -4664,7 +4701,7 @@ index fbac8f44d5..a40ac2144f 100755
4664 # 4701 #
4665 # Check to make sure the static flag actually works. 4702 # Check to make sure the static flag actually works.
4666 # 4703 #
4667@@ -8729,7 +9240,8 @@ _LT_EOF 4704@@ -9077,7 +9590,8 @@ _LT_EOF
4668 allow_undefined_flag=unsupported 4705 allow_undefined_flag=unsupported
4669 always_export_symbols=no 4706 always_export_symbols=no
4670 enable_shared_with_static_runtimes=yes 4707 enable_shared_with_static_runtimes=yes
@@ -4674,7 +4711,7 @@ index fbac8f44d5..a40ac2144f 100755
4674 4711
4675 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then 4712 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
4676 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' 4713 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
4677@@ -8828,12 +9340,12 @@ _LT_EOF 4714@@ -9176,12 +9690,12 @@ _LT_EOF
4678 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' 4715 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
4679 hardcode_libdir_flag_spec= 4716 hardcode_libdir_flag_spec=
4680 hardcode_libdir_flag_spec_ld='-rpath $libdir' 4717 hardcode_libdir_flag_spec_ld='-rpath $libdir'
@@ -4689,7 +4726,7 @@ index fbac8f44d5..a40ac2144f 100755
4689 fi 4726 fi
4690 ;; 4727 ;;
4691 esac 4728 esac
4692@@ -8847,8 +9359,8 @@ _LT_EOF 4729@@ -9195,8 +9709,8 @@ _LT_EOF
4693 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' 4730 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
4694 wlarc= 4731 wlarc=
4695 else 4732 else
@@ -4700,7 +4737,7 @@ index fbac8f44d5..a40ac2144f 100755
4700 fi 4737 fi
4701 ;; 4738 ;;
4702 4739
4703@@ -8866,8 +9378,8 @@ _LT_EOF 4740@@ -9214,8 +9728,8 @@ _LT_EOF
4704 4741
4705 _LT_EOF 4742 _LT_EOF
4706 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 4743 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -4711,7 +4748,7 @@ index fbac8f44d5..a40ac2144f 100755
4711 else 4748 else
4712 ld_shlibs=no 4749 ld_shlibs=no
4713 fi 4750 fi
4714@@ -8913,8 +9425,8 @@ _LT_EOF 4751@@ -9261,8 +9775,8 @@ _LT_EOF
4715 4752
4716 *) 4753 *)
4717 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 4754 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -4722,7 +4759,7 @@ index fbac8f44d5..a40ac2144f 100755
4722 else 4759 else
4723 ld_shlibs=no 4760 ld_shlibs=no
4724 fi 4761 fi
4725@@ -9044,7 +9556,13 @@ _LT_EOF 4762@@ -9392,7 +9906,13 @@ _LT_EOF
4726 allow_undefined_flag='-berok' 4763 allow_undefined_flag='-berok'
4727 # Determine the default libpath from the value encoded in an 4764 # Determine the default libpath from the value encoded in an
4728 # empty executable. 4765 # empty executable.
@@ -4730,14 +4767,14 @@ index fbac8f44d5..a40ac2144f 100755
4730+ if test "${lt_cv_aix_libpath+set}" = set; then 4767+ if test "${lt_cv_aix_libpath+set}" = set; then
4731+ aix_libpath=$lt_cv_aix_libpath 4768+ aix_libpath=$lt_cv_aix_libpath
4732+else 4769+else
4733+ if test "${lt_cv_aix_libpath_+set}" = set; then : 4770+ if ${lt_cv_aix_libpath_+:} false; then :
4734+ $as_echo_n "(cached) " >&6 4771+ $as_echo_n "(cached) " >&6
4735+else 4772+else
4736+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext 4773+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
4737 /* end confdefs.h. */ 4774 /* end confdefs.h. */
4738 4775
4739 int 4776 int
4740@@ -9057,22 +9575,29 @@ main () 4777@@ -9405,22 +9925,29 @@ main ()
4741 _ACEOF 4778 _ACEOF
4742 if ac_fn_c_try_link "$LINENO"; then : 4779 if ac_fn_c_try_link "$LINENO"; then :
4743 4780
@@ -4780,7 +4817,7 @@ index fbac8f44d5..a40ac2144f 100755
4780 4817
4781 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 4818 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
4782 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" 4819 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"
4783@@ -9084,7 +9609,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 4820@@ -9432,7 +9959,13 @@ if test -z "$aix_libpath"; then aix_libp
4784 else 4821 else
4785 # Determine the default libpath from the value encoded in an 4822 # Determine the default libpath from the value encoded in an
4786 # empty executable. 4823 # empty executable.
@@ -4788,14 +4825,14 @@ index fbac8f44d5..a40ac2144f 100755
4788+ if test "${lt_cv_aix_libpath+set}" = set; then 4825+ if test "${lt_cv_aix_libpath+set}" = set; then
4789+ aix_libpath=$lt_cv_aix_libpath 4826+ aix_libpath=$lt_cv_aix_libpath
4790+else 4827+else
4791+ if test "${lt_cv_aix_libpath_+set}" = set; then : 4828+ if ${lt_cv_aix_libpath_+:} false; then :
4792+ $as_echo_n "(cached) " >&6 4829+ $as_echo_n "(cached) " >&6
4793+else 4830+else
4794+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext 4831+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
4795 /* end confdefs.h. */ 4832 /* end confdefs.h. */
4796 4833
4797 int 4834 int
4798@@ -9097,22 +9628,29 @@ main () 4835@@ -9445,22 +9978,29 @@ main ()
4799 _ACEOF 4836 _ACEOF
4800 if ac_fn_c_try_link "$LINENO"; then : 4837 if ac_fn_c_try_link "$LINENO"; then :
4801 4838
@@ -4838,7 +4875,7 @@ index fbac8f44d5..a40ac2144f 100755
4838 4875
4839 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 4876 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
4840 # Warning - without using the other run time loading flags, 4877 # Warning - without using the other run time loading flags,
4841@@ -9157,20 +9695,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 4878@@ -9505,20 +10045,63 @@ if test -z "$aix_libpath"; then aix_libp
4842 # Microsoft Visual C++. 4879 # Microsoft Visual C++.
4843 # hardcode_libdir_flag_spec is actually meaningless, as there is 4880 # hardcode_libdir_flag_spec is actually meaningless, as there is
4844 # no search path for DLLs. 4881 # no search path for DLLs.
@@ -4916,7 +4953,7 @@ index fbac8f44d5..a40ac2144f 100755
4916 ;; 4953 ;;
4917 4954
4918 darwin* | rhapsody*) 4955 darwin* | rhapsody*)
4919@@ -9231,7 +9812,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 4956@@ -9579,7 +10162,7 @@ if test -z "$aix_libpath"; then aix_libp
4920 4957
4921 # FreeBSD 3 and greater uses gcc -shared to do shared libraries. 4958 # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
4922 freebsd* | dragonfly*) 4959 freebsd* | dragonfly*)
@@ -4925,7 +4962,7 @@ index fbac8f44d5..a40ac2144f 100755
4925 hardcode_libdir_flag_spec='-R$libdir' 4962 hardcode_libdir_flag_spec='-R$libdir'
4926 hardcode_direct=yes 4963 hardcode_direct=yes
4927 hardcode_shlibpath_var=no 4964 hardcode_shlibpath_var=no
4928@@ -9239,7 +9820,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 4965@@ -9587,7 +10170,7 @@ if test -z "$aix_libpath"; then aix_libp
4929 4966
4930 hpux9*) 4967 hpux9*)
4931 if test "$GCC" = yes; then 4968 if test "$GCC" = yes; then
@@ -4934,7 +4971,7 @@ index fbac8f44d5..a40ac2144f 100755
4934 else 4971 else
4935 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' 4972 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'
4936 fi 4973 fi
4937@@ -9255,7 +9836,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 4974@@ -9603,7 +10186,7 @@ if test -z "$aix_libpath"; then aix_libp
4938 4975
4939 hpux10*) 4976 hpux10*)
4940 if test "$GCC" = yes && test "$with_gnu_ld" = no; then 4977 if test "$GCC" = yes && test "$with_gnu_ld" = no; then
@@ -4943,7 +4980,7 @@ index fbac8f44d5..a40ac2144f 100755
4943 else 4980 else
4944 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' 4981 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
4945 fi 4982 fi
4946@@ -9279,10 +9860,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 4983@@ -9627,10 +10210,10 @@ if test -z "$aix_libpath"; then aix_libp
4947 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' 4984 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
4948 ;; 4985 ;;
4949 ia64*) 4986 ia64*)
@@ -4956,7 +4993,7 @@ index fbac8f44d5..a40ac2144f 100755
4956 ;; 4993 ;;
4957 esac 4994 esac
4958 else 4995 else
4959@@ -9361,23 +9942,36 @@ fi 4996@@ -9709,23 +10292,36 @@ fi
4960 4997
4961 irix5* | irix6* | nonstopux*) 4998 irix5* | irix6* | nonstopux*)
4962 if test "$GCC" = yes; then 4999 if test "$GCC" = yes; then
@@ -4971,7 +5008,7 @@ index fbac8f44d5..a40ac2144f 100755
4971+ # This should be the same for all languages, so no per-tag cache variable. 5008+ # This should be the same for all languages, so no per-tag cache variable.
4972+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5 5009+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5
4973+$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; } 5010+$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; }
4974+if test "${lt_cv_irix_exported_symbol+set}" = set; then : 5011+if ${lt_cv_irix_exported_symbol+:} false; then :
4975+ $as_echo_n "(cached) " >&6 5012+ $as_echo_n "(cached) " >&6
4976+else 5013+else
4977+ save_LDFLAGS="$LDFLAGS" 5014+ save_LDFLAGS="$LDFLAGS"
@@ -5001,7 +5038,7 @@ index fbac8f44d5..a40ac2144f 100755
5001 else 5038 else
5002 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' 5039 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'
5003 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' 5040 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'
5004@@ -9462,7 +10056,7 @@ rm -f core conftest.err conftest.$ac_objext \ 5041@@ -9810,7 +10406,7 @@ rm -f core conftest.err conftest.$ac_obj
5005 osf4* | osf5*) # as osf3* with the addition of -msym flag 5042 osf4* | osf5*) # as osf3* with the addition of -msym flag
5006 if test "$GCC" = yes; then 5043 if test "$GCC" = yes; then
5007 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' 5044 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
@@ -5010,7 +5047,7 @@ index fbac8f44d5..a40ac2144f 100755
5010 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' 5047 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
5011 else 5048 else
5012 allow_undefined_flag=' -expect_unresolved \*' 5049 allow_undefined_flag=' -expect_unresolved \*'
5013@@ -9481,9 +10075,9 @@ rm -f core conftest.err conftest.$ac_objext \ 5050@@ -9829,9 +10425,9 @@ rm -f core conftest.err conftest.$ac_obj
5014 no_undefined_flag=' -z defs' 5051 no_undefined_flag=' -z defs'
5015 if test "$GCC" = yes; then 5052 if test "$GCC" = yes; then
5016 wlarc='${wl}' 5053 wlarc='${wl}'
@@ -5022,7 +5059,7 @@ index fbac8f44d5..a40ac2144f 100755
5022 else 5059 else
5023 case `$CC -V 2>&1` in 5060 case `$CC -V 2>&1` in
5024 *"Compilers 5.0"*) 5061 *"Compilers 5.0"*)
5025@@ -10059,8 +10653,9 @@ cygwin* | mingw* | pw32* | cegcc*) 5062@@ -10407,8 +11003,9 @@ cygwin* | mingw* | pw32* | cegcc*)
5026 need_version=no 5063 need_version=no
5027 need_lib_prefix=no 5064 need_lib_prefix=no
5028 5065
@@ -5034,7 +5071,7 @@ index fbac8f44d5..a40ac2144f 100755
5034 library_names_spec='$libname.dll.a' 5071 library_names_spec='$libname.dll.a'
5035 # DLL is installed to $(libdir)/../bin by postinstall_cmds 5072 # DLL is installed to $(libdir)/../bin by postinstall_cmds
5036 postinstall_cmds='base_file=`basename \${file}`~ 5073 postinstall_cmds='base_file=`basename \${file}`~
5037@@ -10093,13 +10688,71 @@ cygwin* | mingw* | pw32* | cegcc*) 5074@@ -10441,13 +11038,71 @@ cygwin* | mingw* | pw32* | cegcc*)
5038 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' 5075 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
5039 ;; 5076 ;;
5040 esac 5077 esac
@@ -5107,7 +5144,7 @@ index fbac8f44d5..a40ac2144f 100755
5107 # FIXME: first we should search . and the directory the executable is in 5144 # FIXME: first we should search . and the directory the executable is in
5108 shlibpath_var=PATH 5145 shlibpath_var=PATH
5109 ;; 5146 ;;
5110@@ -10191,7 +10844,7 @@ haiku*) 5147@@ -10539,7 +11194,7 @@ haiku*)
5111 soname_spec='${libname}${release}${shared_ext}$major' 5148 soname_spec='${libname}${release}${shared_ext}$major'
5112 shlibpath_var=LIBRARY_PATH 5149 shlibpath_var=LIBRARY_PATH
5113 shlibpath_overrides_runpath=yes 5150 shlibpath_overrides_runpath=yes
@@ -5116,7 +5153,16 @@ index fbac8f44d5..a40ac2144f 100755
5116 hardcode_into_libs=yes 5153 hardcode_into_libs=yes
5117 ;; 5154 ;;
5118 5155
5119@@ -11031,10 +11684,10 @@ else 5156@@ -11335,7 +11990,7 @@ else
5157 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
5158 lt_status=$lt_dlunknown
5159 cat > conftest.$ac_ext <<_LT_EOF
5160-#line 11338 "configure"
5161+#line $LINENO "configure"
5162 #include "confdefs.h"
5163
5164 #if HAVE_DLFCN_H
5165@@ -11379,10 +12034,10 @@ else
5120 /* When -fvisbility=hidden is used, assume the code has been annotated 5166 /* When -fvisbility=hidden is used, assume the code has been annotated
5121 correspondingly for the symbols needed. */ 5167 correspondingly for the symbols needed. */
5122 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 5168 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
@@ -5129,7 +5175,16 @@ index fbac8f44d5..a40ac2144f 100755
5129 int main () 5175 int main ()
5130 { 5176 {
5131 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 5177 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
5132@@ -11137,10 +11790,10 @@ else 5178@@ -11441,7 +12096,7 @@ else
5179 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
5180 lt_status=$lt_dlunknown
5181 cat > conftest.$ac_ext <<_LT_EOF
5182-#line 11444 "configure"
5183+#line $LINENO "configure"
5184 #include "confdefs.h"
5185
5186 #if HAVE_DLFCN_H
5187@@ -11485,10 +12140,10 @@ else
5133 /* When -fvisbility=hidden is used, assume the code has been annotated 5188 /* When -fvisbility=hidden is used, assume the code has been annotated
5134 correspondingly for the symbols needed. */ 5189 correspondingly for the symbols needed. */
5135 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 5190 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
@@ -5142,7 +5197,7 @@ index fbac8f44d5..a40ac2144f 100755
5142 int main () 5197 int main ()
5143 { 5198 {
5144 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 5199 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
5145@@ -15437,13 +16090,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' 5200@@ -15803,13 +16458,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_
5146 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' 5201 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
5147 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' 5202 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
5148 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' 5203 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
@@ -5163,7 +5218,7 @@ index fbac8f44d5..a40ac2144f 100755
5163 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' 5218 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
5164 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' 5219 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
5165 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' 5220 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
5166@@ -15458,14 +16118,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de 5221@@ -15824,14 +16486,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$l
5167 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' 5222 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
5168 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' 5223 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
5169 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"`' 5224 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"`'
@@ -5182,7 +5237,7 @@ index fbac8f44d5..a40ac2144f 100755
5182 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' 5237 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
5183 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' 5238 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
5184 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' 5239 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
5185@@ -15498,12 +16161,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q 5240@@ -15864,12 +16529,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcod
5186 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' 5241 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
5187 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' 5242 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
5188 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' 5243 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
@@ -5196,7 +5251,7 @@ index fbac8f44d5..a40ac2144f 100755
5196 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' 5251 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
5197 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' 5252 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
5198 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' 5253 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
5199@@ -15558,8 +16221,13 @@ reload_flag \ 5254@@ -15924,8 +16589,13 @@ reload_flag \
5200 OBJDUMP \ 5255 OBJDUMP \
5201 deplibs_check_method \ 5256 deplibs_check_method \
5202 file_magic_cmd \ 5257 file_magic_cmd \
@@ -5210,7 +5265,7 @@ index fbac8f44d5..a40ac2144f 100755
5210 STRIP \ 5265 STRIP \
5211 RANLIB \ 5266 RANLIB \
5212 CC \ 5267 CC \
5213@@ -15569,12 +16237,14 @@ lt_cv_sys_global_symbol_pipe \ 5268@@ -15935,12 +16605,14 @@ lt_cv_sys_global_symbol_pipe \
5214 lt_cv_sys_global_symbol_to_cdecl \ 5269 lt_cv_sys_global_symbol_to_cdecl \
5215 lt_cv_sys_global_symbol_to_c_name_address \ 5270 lt_cv_sys_global_symbol_to_c_name_address \
5216 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ 5271 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
@@ -5226,7 +5281,7 @@ index fbac8f44d5..a40ac2144f 100755
5226 DSYMUTIL \ 5281 DSYMUTIL \
5227 NMEDIT \ 5282 NMEDIT \
5228 LIPO \ 5283 LIPO \
5229@@ -15590,7 +16260,6 @@ no_undefined_flag \ 5284@@ -15956,7 +16628,6 @@ no_undefined_flag \
5230 hardcode_libdir_flag_spec \ 5285 hardcode_libdir_flag_spec \
5231 hardcode_libdir_flag_spec_ld \ 5286 hardcode_libdir_flag_spec_ld \
5232 hardcode_libdir_separator \ 5287 hardcode_libdir_separator \
@@ -5234,7 +5289,7 @@ index fbac8f44d5..a40ac2144f 100755
5234 exclude_expsyms \ 5289 exclude_expsyms \
5235 include_expsyms \ 5290 include_expsyms \
5236 file_list_spec \ 5291 file_list_spec \
5237@@ -15626,6 +16295,7 @@ module_cmds \ 5292@@ -15992,6 +16663,7 @@ module_cmds \
5238 module_expsym_cmds \ 5293 module_expsym_cmds \
5239 export_symbols_cmds \ 5294 export_symbols_cmds \
5240 prelink_cmds \ 5295 prelink_cmds \
@@ -5242,7 +5297,7 @@ index fbac8f44d5..a40ac2144f 100755
5242 postinstall_cmds \ 5297 postinstall_cmds \
5243 postuninstall_cmds \ 5298 postuninstall_cmds \
5244 finish_cmds \ 5299 finish_cmds \
5245@@ -16390,7 +17060,8 @@ $as_echo X"$file" | 5300@@ -16765,7 +17437,8 @@ $as_echo X"$file" |
5246 # NOTE: Changes made to this file will be lost: look at ltmain.sh. 5301 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
5247 # 5302 #
5248 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 5303 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
@@ -5252,7 +5307,7 @@ index fbac8f44d5..a40ac2144f 100755
5252 # Written by Gordon Matzigkeit, 1996 5307 # Written by Gordon Matzigkeit, 1996
5253 # 5308 #
5254 # This file is part of GNU Libtool. 5309 # This file is part of GNU Libtool.
5255@@ -16493,19 +17164,42 @@ SP2NL=$lt_lt_SP2NL 5310@@ -16868,19 +17541,42 @@ SP2NL=$lt_lt_SP2NL
5256 # turn newlines into spaces. 5311 # turn newlines into spaces.
5257 NL2SP=$lt_lt_NL2SP 5312 NL2SP=$lt_lt_NL2SP
5258 5313
@@ -5296,7 +5351,7 @@ index fbac8f44d5..a40ac2144f 100755
5296 # A symbol stripping program. 5351 # A symbol stripping program.
5297 STRIP=$lt_STRIP 5352 STRIP=$lt_STRIP
5298 5353
5299@@ -16535,6 +17229,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address 5354@@ -16910,6 +17606,12 @@ global_symbol_to_c_name_address=$lt_lt_c
5300 # Transform the output of nm in a C name address pair when lib prefix is needed. 5355 # Transform the output of nm in a C name address pair when lib prefix is needed.
5301 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix 5356 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
5302 5357
@@ -5309,7 +5364,7 @@ index fbac8f44d5..a40ac2144f 100755
5309 # The name of the directory that contains temporary libtool files. 5364 # The name of the directory that contains temporary libtool files.
5310 objdir=$objdir 5365 objdir=$objdir
5311 5366
5312@@ -16544,6 +17244,9 @@ MAGIC_CMD=$MAGIC_CMD 5367@@ -16919,6 +17621,9 @@ MAGIC_CMD=$MAGIC_CMD
5313 # Must we lock files when doing compilation? 5368 # Must we lock files when doing compilation?
5314 need_locks=$lt_need_locks 5369 need_locks=$lt_need_locks
5315 5370
@@ -5319,7 +5374,7 @@ index fbac8f44d5..a40ac2144f 100755
5319 # Tool to manipulate archived DWARF debug symbol files on Mac OS X. 5374 # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
5320 DSYMUTIL=$lt_DSYMUTIL 5375 DSYMUTIL=$lt_DSYMUTIL
5321 5376
5322@@ -16658,12 +17361,12 @@ with_gcc=$GCC 5377@@ -17033,12 +17738,12 @@ with_gcc=$GCC
5323 # Compiler flag to turn off builtin functions. 5378 # Compiler flag to turn off builtin functions.
5324 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag 5379 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
5325 5380
@@ -5335,7 +5390,7 @@ index fbac8f44d5..a40ac2144f 100755
5335 # Compiler flag to prevent dynamic linking. 5390 # Compiler flag to prevent dynamic linking.
5336 link_static_flag=$lt_lt_prog_compiler_static 5391 link_static_flag=$lt_lt_prog_compiler_static
5337 5392
5338@@ -16750,9 +17453,6 @@ inherit_rpath=$inherit_rpath 5393@@ -17125,9 +17830,6 @@ inherit_rpath=$inherit_rpath
5339 # Whether libtool must link a program against all its dependency libraries. 5394 # Whether libtool must link a program against all its dependency libraries.
5340 link_all_deplibs=$link_all_deplibs 5395 link_all_deplibs=$link_all_deplibs
5341 5396
@@ -5345,7 +5400,7 @@ index fbac8f44d5..a40ac2144f 100755
5345 # Set to "yes" if exported symbols are required. 5400 # Set to "yes" if exported symbols are required.
5346 always_export_symbols=$always_export_symbols 5401 always_export_symbols=$always_export_symbols
5347 5402
5348@@ -16768,6 +17468,9 @@ include_expsyms=$lt_include_expsyms 5403@@ -17143,6 +17845,9 @@ include_expsyms=$lt_include_expsyms
5349 # Commands necessary for linking programs (against libraries) with templates. 5404 # Commands necessary for linking programs (against libraries) with templates.
5350 prelink_cmds=$lt_prelink_cmds 5405 prelink_cmds=$lt_prelink_cmds
5351 5406
@@ -5355,7 +5410,7 @@ index fbac8f44d5..a40ac2144f 100755
5355 # Specify filename containing input files. 5410 # Specify filename containing input files.
5356 file_list_spec=$lt_file_list_spec 5411 file_list_spec=$lt_file_list_spec
5357 5412
5358@@ -16800,210 +17503,169 @@ ltmain="$ac_aux_dir/ltmain.sh" 5413@@ -17175,210 +17880,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
5359 # if finds mixed CR/LF and LF-only lines. Since sed operates in 5414 # if finds mixed CR/LF and LF-only lines. Since sed operates in
5360 # text mode, it properly converts lines to CR/LF. This bash problem 5415 # text mode, it properly converts lines to CR/LF. This bash problem
5361 # is reportedly fixed, but why not run on old versions too? 5416 # is reportedly fixed, but why not run on old versions too?
@@ -5557,15 +5612,9 @@ index fbac8f44d5..a40ac2144f 100755
5557-_LT_EOF 5612-_LT_EOF
5558- ;; 5613- ;;
5559- esac 5614- esac
5560-
5561-
5562- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
5563- || (rm -f "$cfgfile"; exit 1)
5564-
5565- mv -f "$cfgfile" "$ofile" ||
5566+ sed '$q' "$ltmain" >> "$cfgfile" \ 5615+ sed '$q' "$ltmain" >> "$cfgfile" \
5567+ || (rm -f "$cfgfile"; exit 1) 5616+ || (rm -f "$cfgfile"; exit 1)
5568+ 5617
5569+ if test x"$xsi_shell" = xyes; then 5618+ if test x"$xsi_shell" = xyes; then
5570+ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ 5619+ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\
5571+func_dirname ()\ 5620+func_dirname ()\
@@ -5723,17 +5772,20 @@ index fbac8f44d5..a40ac2144f 100755
5723+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 5772+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5
5724+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} 5773+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;}
5725+fi 5774+fi
5726+ 5775
5727+ 5776- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
5777- || (rm -f "$cfgfile"; exit 1)
5778
5779- mv -f "$cfgfile" "$ofile" ||
5728+ mv -f "$cfgfile" "$ofile" || 5780+ mv -f "$cfgfile" "$ofile" ||
5729 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") 5781 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
5730 chmod +x "$ofile" 5782 chmod +x "$ofile"
5731 5783
5732diff --git a/gprof/configure b/gprof/configure 5784Index: git/gprof/configure
5733index 6b43bf2b18..245ee48bc3 100755 5785===================================================================
5734--- a/gprof/configure 5786--- git.orig/gprof/configure
5735+++ b/gprof/configure 5787+++ git/gprof/configure
5736@@ -631,8 +631,11 @@ OTOOL 5788@@ -662,8 +662,11 @@ OTOOL
5737 LIPO 5789 LIPO
5738 NMEDIT 5790 NMEDIT
5739 DSYMUTIL 5791 DSYMUTIL
@@ -5745,7 +5797,7 @@ index 6b43bf2b18..245ee48bc3 100755
5745 OBJDUMP 5797 OBJDUMP
5746 LN_S 5798 LN_S
5747 NM 5799 NM
5748@@ -744,6 +747,7 @@ enable_static 5800@@ -780,6 +783,7 @@ enable_static
5749 with_pic 5801 with_pic
5750 enable_fast_install 5802 enable_fast_install
5751 with_gnu_ld 5803 with_gnu_ld
@@ -5753,7 +5805,7 @@ index 6b43bf2b18..245ee48bc3 100755
5753 enable_libtool_lock 5805 enable_libtool_lock
5754 enable_plugins 5806 enable_plugins
5755 enable_largefile 5807 enable_largefile
5756@@ -1402,6 +1406,8 @@ Optional Packages: 5808@@ -1442,6 +1446,8 @@ Optional Packages:
5757 --with-pic try to use only PIC/non-PIC objects [default=use 5809 --with-pic try to use only PIC/non-PIC objects [default=use
5758 both] 5810 both]
5759 --with-gnu-ld assume the C compiler uses GNU ld [default=no] 5811 --with-gnu-ld assume the C compiler uses GNU ld [default=no]
@@ -5762,7 +5814,7 @@ index 6b43bf2b18..245ee48bc3 100755
5762 5814
5763 Some influential environment variables: 5815 Some influential environment variables:
5764 CC C compiler command 5816 CC C compiler command
5765@@ -4836,8 +4842,8 @@ esac 5817@@ -5124,8 +5130,8 @@ esac
5766 5818
5767 5819
5768 5820
@@ -5773,7 +5825,7 @@ index 6b43bf2b18..245ee48bc3 100755
5773 5825
5774 5826
5775 5827
5776@@ -4877,7 +4883,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO 5828@@ -5165,7 +5171,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
5777 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 5829 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
5778 $as_echo_n "checking how to print strings... " >&6; } 5830 $as_echo_n "checking how to print strings... " >&6; }
5779 # Test print first, because it will be a builtin if present. 5831 # Test print first, because it will be a builtin if present.
@@ -5782,7 +5834,7 @@ index 6b43bf2b18..245ee48bc3 100755
5782 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then 5834 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
5783 ECHO='print -r --' 5835 ECHO='print -r --'
5784 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then 5836 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
5785@@ -5563,8 +5569,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; 5837@@ -5851,8 +5857,8 @@ $as_echo_n "checking whether the shell u
5786 # Try some XSI features 5838 # Try some XSI features
5787 xsi_shell=no 5839 xsi_shell=no
5788 ( _lt_dummy="a/b/c" 5840 ( _lt_dummy="a/b/c"
@@ -5793,13 +5845,13 @@ index 6b43bf2b18..245ee48bc3 100755
5793 && eval 'test $(( 1 + 1 )) -eq 2 \ 5845 && eval 'test $(( 1 + 1 )) -eq 2 \
5794 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ 5846 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
5795 && xsi_shell=yes 5847 && xsi_shell=yes
5796@@ -5613,6 +5619,80 @@ esac 5848@@ -5901,6 +5907,80 @@ esac
5797 5849
5798 5850
5799 5851
5800+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5 5852+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5
5801+$as_echo_n "checking how to convert $build file names to $host format... " >&6; } 5853+$as_echo_n "checking how to convert $build file names to $host format... " >&6; }
5802+if test "${lt_cv_to_host_file_cmd+set}" = set; then : 5854+if ${lt_cv_to_host_file_cmd+:} false; then :
5803+ $as_echo_n "(cached) " >&6 5855+ $as_echo_n "(cached) " >&6
5804+else 5856+else
5805+ case $host in 5857+ case $host in
@@ -5846,7 +5898,7 @@ index 6b43bf2b18..245ee48bc3 100755
5846+ 5898+
5847+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5 5899+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5
5848+$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; } 5900+$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; }
5849+if test "${lt_cv_to_tool_file_cmd+set}" = set; then : 5901+if ${lt_cv_to_tool_file_cmd+:} false; then :
5850+ $as_echo_n "(cached) " >&6 5902+ $as_echo_n "(cached) " >&6
5851+else 5903+else
5852+ #assume ordinary cross tools, or native build. 5904+ #assume ordinary cross tools, or native build.
@@ -5873,8 +5925,8 @@ index 6b43bf2b18..245ee48bc3 100755
5873+ 5925+
5874 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 5926 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
5875 $as_echo_n "checking for $LD option to reload object files... " >&6; } 5927 $as_echo_n "checking for $LD option to reload object files... " >&6; }
5876 if test "${lt_cv_ld_reload_flag+set}" = set; then : 5928 if ${lt_cv_ld_reload_flag+:} false; then :
5877@@ -5629,6 +5709,11 @@ case $reload_flag in 5929@@ -5917,6 +5997,11 @@ case $reload_flag in
5878 esac 5930 esac
5879 reload_cmds='$LD$reload_flag -o $output$reload_objs' 5931 reload_cmds='$LD$reload_flag -o $output$reload_objs'
5880 case $host_os in 5932 case $host_os in
@@ -5886,7 +5938,7 @@ index 6b43bf2b18..245ee48bc3 100755
5886 darwin*) 5938 darwin*)
5887 if test "$GCC" = yes; then 5939 if test "$GCC" = yes; then
5888 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' 5940 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
5889@@ -5797,7 +5882,8 @@ mingw* | pw32*) 5941@@ -6085,7 +6170,8 @@ mingw* | pw32*)
5890 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' 5942 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
5891 lt_cv_file_magic_cmd='func_win32_libid' 5943 lt_cv_file_magic_cmd='func_win32_libid'
5892 else 5944 else
@@ -5896,7 +5948,7 @@ index 6b43bf2b18..245ee48bc3 100755
5896 lt_cv_file_magic_cmd='$OBJDUMP -f' 5948 lt_cv_file_magic_cmd='$OBJDUMP -f'
5897 fi 5949 fi
5898 ;; 5950 ;;
5899@@ -5874,11 +5960,6 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu) 5951@@ -6162,11 +6248,6 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu)
5900 lt_cv_deplibs_check_method=pass_all 5952 lt_cv_deplibs_check_method=pass_all
5901 ;; 5953 ;;
5902 5954
@@ -5908,7 +5960,7 @@ index 6b43bf2b18..245ee48bc3 100755
5908 netbsd*) 5960 netbsd*)
5909 if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then 5961 if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
5910 lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' 5962 lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
5911@@ -5956,6 +6037,21 @@ esac 5963@@ -6244,6 +6325,21 @@ esac
5912 fi 5964 fi
5913 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 5965 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
5914 $as_echo "$lt_cv_deplibs_check_method" >&6; } 5966 $as_echo "$lt_cv_deplibs_check_method" >&6; }
@@ -5930,7 +5982,7 @@ index 6b43bf2b18..245ee48bc3 100755
5930 file_magic_cmd=$lt_cv_file_magic_cmd 5982 file_magic_cmd=$lt_cv_file_magic_cmd
5931 deplibs_check_method=$lt_cv_deplibs_check_method 5983 deplibs_check_method=$lt_cv_deplibs_check_method
5932 test -z "$deplibs_check_method" && deplibs_check_method=unknown 5984 test -z "$deplibs_check_method" && deplibs_check_method=unknown
5933@@ -5971,9 +6067,162 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown 5985@@ -6259,9 +6355,162 @@ test -z "$deplibs_check_method" && depli
5934 5986
5935 5987
5936 5988
@@ -5944,12 +5996,14 @@ index 6b43bf2b18..245ee48bc3 100755
5944+ 5996+
5945+ 5997+
5946+ 5998+
5947+if test -n "$ac_tool_prefix"; then 5999 if test -n "$ac_tool_prefix"; then
6000- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
6001-set dummy ${ac_tool_prefix}ar; ac_word=$2
5948+ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. 6002+ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
5949+set dummy ${ac_tool_prefix}dlltool; ac_word=$2 6003+set dummy ${ac_tool_prefix}dlltool; ac_word=$2
5950+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 6004+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
5951+$as_echo_n "checking for $ac_word... " >&6; } 6005+$as_echo_n "checking for $ac_word... " >&6; }
5952+if test "${ac_cv_prog_DLLTOOL+set}" = set; then : 6006+if ${ac_cv_prog_DLLTOOL+:} false; then :
5953+ $as_echo_n "(cached) " >&6 6007+ $as_echo_n "(cached) " >&6
5954+else 6008+else
5955+ if test -n "$DLLTOOL"; then 6009+ if test -n "$DLLTOOL"; then
@@ -5961,7 +6015,7 @@ index 6b43bf2b18..245ee48bc3 100755
5961+ IFS=$as_save_IFS 6015+ IFS=$as_save_IFS
5962+ test -z "$as_dir" && as_dir=. 6016+ test -z "$as_dir" && as_dir=.
5963+ for ac_exec_ext in '' $ac_executable_extensions; do 6017+ for ac_exec_ext in '' $ac_executable_extensions; do
5964+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 6018+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
5965+ ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" 6019+ ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
5966+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 6020+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
5967+ break 2 6021+ break 2
@@ -5989,7 +6043,7 @@ index 6b43bf2b18..245ee48bc3 100755
5989+set dummy dlltool; ac_word=$2 6043+set dummy dlltool; ac_word=$2
5990+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 6044+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
5991+$as_echo_n "checking for $ac_word... " >&6; } 6045+$as_echo_n "checking for $ac_word... " >&6; }
5992+if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then : 6046+if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then :
5993+ $as_echo_n "(cached) " >&6 6047+ $as_echo_n "(cached) " >&6
5994+else 6048+else
5995+ if test -n "$ac_ct_DLLTOOL"; then 6049+ if test -n "$ac_ct_DLLTOOL"; then
@@ -6001,7 +6055,7 @@ index 6b43bf2b18..245ee48bc3 100755
6001+ IFS=$as_save_IFS 6055+ IFS=$as_save_IFS
6002+ test -z "$as_dir" && as_dir=. 6056+ test -z "$as_dir" && as_dir=.
6003+ for ac_exec_ext in '' $ac_executable_extensions; do 6057+ for ac_exec_ext in '' $ac_executable_extensions; do
6004+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 6058+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
6005+ ac_cv_prog_ac_ct_DLLTOOL="dlltool" 6059+ ac_cv_prog_ac_ct_DLLTOOL="dlltool"
6006+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 6060+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
6007+ break 2 6061+ break 2
@@ -6049,7 +6103,7 @@ index 6b43bf2b18..245ee48bc3 100755
6049+ 6103+
6050+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5 6104+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5
6051+$as_echo_n "checking how to associate runtime and link libraries... " >&6; } 6105+$as_echo_n "checking how to associate runtime and link libraries... " >&6; }
6052+if test "${lt_cv_sharedlib_from_linklib_cmd+set}" = set; then : 6106+if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then :
6053+ $as_echo_n "(cached) " >&6 6107+ $as_echo_n "(cached) " >&6
6054+else 6108+else
6055+ lt_cv_sharedlib_from_linklib_cmd='unknown' 6109+ lt_cv_sharedlib_from_linklib_cmd='unknown'
@@ -6085,26 +6139,24 @@ index 6b43bf2b18..245ee48bc3 100755
6085+ 6139+
6086+ 6140+
6087+ 6141+
6088 if test -n "$ac_tool_prefix"; then 6142+if test -n "$ac_tool_prefix"; then
6089- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
6090-set dummy ${ac_tool_prefix}ar; ac_word=$2
6091+ for ac_prog in ar 6143+ for ac_prog in ar
6092+ do 6144+ do
6093+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. 6145+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
6094+set dummy $ac_tool_prefix$ac_prog; ac_word=$2 6146+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
6095 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 6147 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
6096 $as_echo_n "checking for $ac_word... " >&6; } 6148 $as_echo_n "checking for $ac_word... " >&6; }
6097 if test "${ac_cv_prog_AR+set}" = set; then : 6149 if ${ac_cv_prog_AR+:} false; then :
6098@@ -5989,7 +6238,7 @@ do 6150@@ -6277,7 +6526,7 @@ do
6099 test -z "$as_dir" && as_dir=. 6151 test -z "$as_dir" && as_dir=.
6100 for ac_exec_ext in '' $ac_executable_extensions; do 6152 for ac_exec_ext in '' $ac_executable_extensions; do
6101 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 6153 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
6102- ac_cv_prog_AR="${ac_tool_prefix}ar" 6154- ac_cv_prog_AR="${ac_tool_prefix}ar"
6103+ ac_cv_prog_AR="$ac_tool_prefix$ac_prog" 6155+ ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
6104 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 6156 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
6105 break 2 6157 break 2
6106 fi 6158 fi
6107@@ -6009,11 +6258,15 @@ $as_echo "no" >&6; } 6159@@ -6297,11 +6546,15 @@ $as_echo "no" >&6; }
6108 fi 6160 fi
6109 6161
6110 6162
@@ -6122,17 +6174,17 @@ index 6b43bf2b18..245ee48bc3 100755
6122+set dummy $ac_prog; ac_word=$2 6174+set dummy $ac_prog; ac_word=$2
6123 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 6175 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
6124 $as_echo_n "checking for $ac_word... " >&6; } 6176 $as_echo_n "checking for $ac_word... " >&6; }
6125 if test "${ac_cv_prog_ac_ct_AR+set}" = set; then : 6177 if ${ac_cv_prog_ac_ct_AR+:} false; then :
6126@@ -6029,7 +6282,7 @@ do 6178@@ -6317,7 +6570,7 @@ do
6127 test -z "$as_dir" && as_dir=. 6179 test -z "$as_dir" && as_dir=.
6128 for ac_exec_ext in '' $ac_executable_extensions; do 6180 for ac_exec_ext in '' $ac_executable_extensions; do
6129 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 6181 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
6130- ac_cv_prog_ac_ct_AR="ar" 6182- ac_cv_prog_ac_ct_AR="ar"
6131+ ac_cv_prog_ac_ct_AR="$ac_prog" 6183+ ac_cv_prog_ac_ct_AR="$ac_prog"
6132 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 6184 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
6133 break 2 6185 break 2
6134 fi 6186 fi
6135@@ -6048,6 +6301,10 @@ else 6187@@ -6336,6 +6589,10 @@ else
6136 $as_echo "no" >&6; } 6188 $as_echo "no" >&6; }
6137 fi 6189 fi
6138 6190
@@ -6143,7 +6195,7 @@ index 6b43bf2b18..245ee48bc3 100755
6143 if test "x$ac_ct_AR" = x; then 6195 if test "x$ac_ct_AR" = x; then
6144 AR="false" 6196 AR="false"
6145 else 6197 else
6146@@ -6059,12 +6316,10 @@ ac_tool_warned=yes ;; 6198@@ -6347,16 +6604,72 @@ ac_tool_warned=yes ;;
6147 esac 6199 esac
6148 AR=$ac_ct_AR 6200 AR=$ac_ct_AR
6149 fi 6201 fi
@@ -6155,16 +6207,20 @@ index 6b43bf2b18..245ee48bc3 100755
6155-test -z "$AR_FLAGS" && AR_FLAGS=cru 6207-test -z "$AR_FLAGS" && AR_FLAGS=cru
6156+: ${AR=ar} 6208+: ${AR=ar}
6157+: ${AR_FLAGS=cru} 6209+: ${AR_FLAGS=cru}
6158 6210+
6159 6211+
6160 6212+
6161@@ -6076,6 +6331,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru 6213+
6162 6214+
6163 6215+
6164 6216+
6217+
6218+
6219+
6220+
6165+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 6221+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
6166+$as_echo_n "checking for archiver @FILE support... " >&6; } 6222+$as_echo_n "checking for archiver @FILE support... " >&6; }
6167+if test "${lt_cv_ar_at_file+set}" = set; then : 6223+if ${lt_cv_ar_at_file+:} false; then :
6168+ $as_echo_n "(cached) " >&6 6224+ $as_echo_n "(cached) " >&6
6169+else 6225+else
6170+ lt_cv_ar_at_file=no 6226+ lt_cv_ar_at_file=no
@@ -6174,7 +6230,7 @@ index 6b43bf2b18..245ee48bc3 100755
6174+int 6230+int
6175+main () 6231+main ()
6176+{ 6232+{
6177+ 6233
6178+ ; 6234+ ;
6179+ return 0; 6235+ return 0;
6180+} 6236+}
@@ -6200,30 +6256,23 @@ index 6b43bf2b18..245ee48bc3 100755
6200+ fi 6256+ fi
6201+ fi 6257+ fi
6202+ rm -f conftest.* libconftest.a 6258+ rm -f conftest.* libconftest.a
6203+ 6259
6204+fi 6260+fi
6205+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext 6261+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
6206+ 6262
6207+fi 6263+fi
6208+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 6264+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
6209+$as_echo "$lt_cv_ar_at_file" >&6; } 6265+$as_echo "$lt_cv_ar_at_file" >&6; }
6210+ 6266
6211+if test "x$lt_cv_ar_at_file" = xno; then 6267+if test "x$lt_cv_ar_at_file" = xno; then
6212+ archiver_list_spec= 6268+ archiver_list_spec=
6213+else 6269+else
6214+ archiver_list_spec=$lt_cv_ar_at_file 6270+ archiver_list_spec=$lt_cv_ar_at_file
6215+fi 6271+fi
6216+ 6272
6217+ 6273
6218+ 6274
6219+ 6275@@ -6698,8 +7011,8 @@ esac
6220+
6221+
6222+
6223 if test -n "$ac_tool_prefix"; then
6224 # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
6225 set dummy ${ac_tool_prefix}strip; ac_word=$2
6226@@ -6410,8 +6723,8 @@ esac
6227 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" 6276 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
6228 6277
6229 # Transform an extracted symbol line into symbol name and symbol address 6278 # Transform an extracted symbol line into symbol name and symbol address
@@ -6234,7 +6283,7 @@ index 6b43bf2b18..245ee48bc3 100755
6234 6283
6235 # Handle CRLF in mingw tool chain 6284 # Handle CRLF in mingw tool chain
6236 opt_cr= 6285 opt_cr=
6237@@ -6447,6 +6760,7 @@ for ac_symprfx in "" "_"; do 6286@@ -6735,6 +7048,7 @@ for ac_symprfx in "" "_"; do
6238 else 6287 else
6239 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" 6288 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
6240 fi 6289 fi
@@ -6242,7 +6291,7 @@ index 6b43bf2b18..245ee48bc3 100755
6242 6291
6243 # Check to see that the pipe works correctly. 6292 # Check to see that the pipe works correctly.
6244 pipe_works=no 6293 pipe_works=no
6245@@ -6488,6 +6802,18 @@ _LT_EOF 6294@@ -6776,6 +7090,18 @@ _LT_EOF
6246 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then 6295 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
6247 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then 6296 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
6248 cat <<_LT_EOF > conftest.$ac_ext 6297 cat <<_LT_EOF > conftest.$ac_ext
@@ -6261,7 +6310,7 @@ index 6b43bf2b18..245ee48bc3 100755
6261 #ifdef __cplusplus 6310 #ifdef __cplusplus
6262 extern "C" { 6311 extern "C" {
6263 #endif 6312 #endif
6264@@ -6499,7 +6825,7 @@ _LT_EOF 6313@@ -6787,7 +7113,7 @@ _LT_EOF
6265 cat <<_LT_EOF >> conftest.$ac_ext 6314 cat <<_LT_EOF >> conftest.$ac_ext
6266 6315
6267 /* The mapping between symbol names and symbols. */ 6316 /* The mapping between symbol names and symbols. */
@@ -6270,7 +6319,7 @@ index 6b43bf2b18..245ee48bc3 100755
6270 const char *name; 6319 const char *name;
6271 void *address; 6320 void *address;
6272 } 6321 }
6273@@ -6525,8 +6851,8 @@ static const void *lt_preloaded_setup() { 6322@@ -6813,8 +7139,8 @@ static const void *lt_preloaded_setup()
6274 _LT_EOF 6323 _LT_EOF
6275 # Now try linking the two files. 6324 # Now try linking the two files.
6276 mv conftest.$ac_objext conftstm.$ac_objext 6325 mv conftest.$ac_objext conftstm.$ac_objext
@@ -6281,7 +6330,7 @@ index 6b43bf2b18..245ee48bc3 100755
6281 LIBS="conftstm.$ac_objext" 6330 LIBS="conftstm.$ac_objext"
6282 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" 6331 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
6283 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 6332 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
6284@@ -6536,8 +6862,8 @@ _LT_EOF 6333@@ -6824,8 +7150,8 @@ _LT_EOF
6285 test $ac_status = 0; } && test -s conftest${ac_exeext}; then 6334 test $ac_status = 0; } && test -s conftest${ac_exeext}; then
6286 pipe_works=yes 6335 pipe_works=yes
6287 fi 6336 fi
@@ -6292,7 +6341,7 @@ index 6b43bf2b18..245ee48bc3 100755
6292 else 6341 else
6293 echo "cannot find nm_test_func in $nlist" >&5 6342 echo "cannot find nm_test_func in $nlist" >&5
6294 fi 6343 fi
6295@@ -6574,6 +6900,18 @@ else 6344@@ -6862,6 +7188,17 @@ else
6296 $as_echo "ok" >&6; } 6345 $as_echo "ok" >&6; }
6297 fi 6346 fi
6298 6347
@@ -6307,19 +6356,14 @@ index 6b43bf2b18..245ee48bc3 100755
6307+ 6356+
6308+ 6357+
6309+ 6358+
6310+
6311 6359
6312 6360
6313 6361
6314@@ -6590,6 +6928,43 @@ fi 6362@@ -6883,6 +7220,44 @@ fi
6315 6363
6316 6364
6317 6365
6318+ 6366+
6319+
6320+
6321+
6322+
6323+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 6367+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
6324+$as_echo_n "checking for sysroot... " >&6; } 6368+$as_echo_n "checking for sysroot... " >&6; }
6325+ 6369+
@@ -6346,16 +6390,21 @@ index 6b43bf2b18..245ee48bc3 100755
6346+ *) 6390+ *)
6347+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5 6391+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5
6348+$as_echo "${with_libtool_sysroot}" >&6; } 6392+$as_echo "${with_libtool_sysroot}" >&6; }
6349+ as_fn_error "The sysroot must be an absolute path." "$LINENO" 5 6393+ as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5
6350+ ;; 6394+ ;;
6351+esac 6395+esac
6352+ 6396+
6353+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 6397+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
6354+$as_echo "${lt_sysroot:-no}" >&6; } 6398+$as_echo "${lt_sysroot:-no}" >&6; }
6355 6399+
6356 6400+
6357 6401+
6358@@ -6801,6 +7176,123 @@ esac 6402+
6403+
6404 # Check whether --enable-libtool-lock was given.
6405 if test "${enable_libtool_lock+set}" = set; then :
6406 enableval=$enable_libtool_lock;
6407@@ -7089,6 +7464,123 @@ esac
6359 6408
6360 need_locks="$enable_libtool_lock" 6409 need_locks="$enable_libtool_lock"
6361 6410
@@ -6364,7 +6413,7 @@ index 6b43bf2b18..245ee48bc3 100755
6364+set dummy ${ac_tool_prefix}mt; ac_word=$2 6413+set dummy ${ac_tool_prefix}mt; ac_word=$2
6365+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 6414+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
6366+$as_echo_n "checking for $ac_word... " >&6; } 6415+$as_echo_n "checking for $ac_word... " >&6; }
6367+if test "${ac_cv_prog_MANIFEST_TOOL+set}" = set; then : 6416+if ${ac_cv_prog_MANIFEST_TOOL+:} false; then :
6368+ $as_echo_n "(cached) " >&6 6417+ $as_echo_n "(cached) " >&6
6369+else 6418+else
6370+ if test -n "$MANIFEST_TOOL"; then 6419+ if test -n "$MANIFEST_TOOL"; then
@@ -6376,7 +6425,7 @@ index 6b43bf2b18..245ee48bc3 100755
6376+ IFS=$as_save_IFS 6425+ IFS=$as_save_IFS
6377+ test -z "$as_dir" && as_dir=. 6426+ test -z "$as_dir" && as_dir=.
6378+ for ac_exec_ext in '' $ac_executable_extensions; do 6427+ for ac_exec_ext in '' $ac_executable_extensions; do
6379+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 6428+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
6380+ ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" 6429+ ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
6381+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 6430+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
6382+ break 2 6431+ break 2
@@ -6404,7 +6453,7 @@ index 6b43bf2b18..245ee48bc3 100755
6404+set dummy mt; ac_word=$2 6453+set dummy mt; ac_word=$2
6405+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 6454+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
6406+$as_echo_n "checking for $ac_word... " >&6; } 6455+$as_echo_n "checking for $ac_word... " >&6; }
6407+if test "${ac_cv_prog_ac_ct_MANIFEST_TOOL+set}" = set; then : 6456+if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then :
6408+ $as_echo_n "(cached) " >&6 6457+ $as_echo_n "(cached) " >&6
6409+else 6458+else
6410+ if test -n "$ac_ct_MANIFEST_TOOL"; then 6459+ if test -n "$ac_ct_MANIFEST_TOOL"; then
@@ -6416,7 +6465,7 @@ index 6b43bf2b18..245ee48bc3 100755
6416+ IFS=$as_save_IFS 6465+ IFS=$as_save_IFS
6417+ test -z "$as_dir" && as_dir=. 6466+ test -z "$as_dir" && as_dir=.
6418+ for ac_exec_ext in '' $ac_executable_extensions; do 6467+ for ac_exec_ext in '' $ac_executable_extensions; do
6419+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 6468+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
6420+ ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" 6469+ ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
6421+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 6470+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
6422+ break 2 6471+ break 2
@@ -6454,7 +6503,7 @@ index 6b43bf2b18..245ee48bc3 100755
6454+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt 6503+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
6455+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5 6504+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5
6456+$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; } 6505+$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; }
6457+if test "${lt_cv_path_mainfest_tool+set}" = set; then : 6506+if ${lt_cv_path_mainfest_tool+:} false; then :
6458+ $as_echo_n "(cached) " >&6 6507+ $as_echo_n "(cached) " >&6
6459+else 6508+else
6460+ lt_cv_path_mainfest_tool=no 6509+ lt_cv_path_mainfest_tool=no
@@ -6479,7 +6528,7 @@ index 6b43bf2b18..245ee48bc3 100755
6479 6528
6480 case $host_os in 6529 case $host_os in
6481 rhapsody* | darwin*) 6530 rhapsody* | darwin*)
6482@@ -7364,6 +7856,8 @@ _LT_EOF 6531@@ -7652,6 +8144,8 @@ _LT_EOF
6483 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 6532 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
6484 echo "$AR cru libconftest.a conftest.o" >&5 6533 echo "$AR cru libconftest.a conftest.o" >&5
6485 $AR cru libconftest.a conftest.o 2>&5 6534 $AR cru libconftest.a conftest.o 2>&5
@@ -6488,7 +6537,7 @@ index 6b43bf2b18..245ee48bc3 100755
6488 cat > conftest.c << _LT_EOF 6537 cat > conftest.c << _LT_EOF
6489 int main() { return 0;} 6538 int main() { return 0;}
6490 _LT_EOF 6539 _LT_EOF
6491@@ -7559,7 +8053,8 @@ fi 6540@@ -7847,7 +8341,8 @@ fi
6492 LIBTOOL_DEPS="$ltmain" 6541 LIBTOOL_DEPS="$ltmain"
6493 6542
6494 # Always use our own libtool. 6543 # Always use our own libtool.
@@ -6498,7 +6547,7 @@ index 6b43bf2b18..245ee48bc3 100755
6498 6547
6499 6548
6500 6549
6501@@ -7648,7 +8143,7 @@ aix3*) 6550@@ -7936,7 +8431,7 @@ aix3*)
6502 esac 6551 esac
6503 6552
6504 # Global variables: 6553 # Global variables:
@@ -6507,7 +6556,7 @@ index 6b43bf2b18..245ee48bc3 100755
6507 can_build_shared=yes 6556 can_build_shared=yes
6508 6557
6509 # All known linkers require a `.a' archive for static linking (except MSVC, 6558 # All known linkers require a `.a' archive for static linking (except MSVC,
6510@@ -7946,8 +8441,6 @@ fi 6559@@ -8234,8 +8729,6 @@ fi
6511 lt_prog_compiler_pic= 6560 lt_prog_compiler_pic=
6512 lt_prog_compiler_static= 6561 lt_prog_compiler_static=
6513 6562
@@ -6516,7 +6565,7 @@ index 6b43bf2b18..245ee48bc3 100755
6516 6565
6517 if test "$GCC" = yes; then 6566 if test "$GCC" = yes; then
6518 lt_prog_compiler_wl='-Wl,' 6567 lt_prog_compiler_wl='-Wl,'
6519@@ -8113,6 +8606,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 6568@@ -8401,6 +8894,12 @@ $as_echo_n "checking for $compiler optio
6520 lt_prog_compiler_pic='--shared' 6569 lt_prog_compiler_pic='--shared'
6521 lt_prog_compiler_static='--static' 6570 lt_prog_compiler_static='--static'
6522 ;; 6571 ;;
@@ -6529,7 +6578,7 @@ index 6b43bf2b18..245ee48bc3 100755
6529 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) 6578 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
6530 # Portland Group compilers (*not* the Pentium gcc compiler, 6579 # Portland Group compilers (*not* the Pentium gcc compiler,
6531 # which looks to be a dead project) 6580 # which looks to be a dead project)
6532@@ -8175,7 +8674,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 6581@@ -8463,7 +8962,7 @@ $as_echo_n "checking for $compiler optio
6533 lt_prog_compiler_pic='-KPIC' 6582 lt_prog_compiler_pic='-KPIC'
6534 lt_prog_compiler_static='-Bstatic' 6583 lt_prog_compiler_static='-Bstatic'
6535 case $cc_basename in 6584 case $cc_basename in
@@ -6538,7 +6587,7 @@ index 6b43bf2b18..245ee48bc3 100755
6538 lt_prog_compiler_wl='-Qoption ld ';; 6587 lt_prog_compiler_wl='-Qoption ld ';;
6539 *) 6588 *)
6540 lt_prog_compiler_wl='-Wl,';; 6589 lt_prog_compiler_wl='-Wl,';;
6541@@ -8232,13 +8731,17 @@ case $host_os in 6590@@ -8520,13 +9019,17 @@ case $host_os in
6542 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" 6591 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
6543 ;; 6592 ;;
6544 esac 6593 esac
@@ -6551,7 +6600,7 @@ index 6b43bf2b18..245ee48bc3 100755
6551 6600
6552+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 6601+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
6553+$as_echo_n "checking for $compiler option to produce PIC... " >&6; } 6602+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
6554+if test "${lt_cv_prog_compiler_pic+set}" = set; then : 6603+if ${lt_cv_prog_compiler_pic+:} false; then :
6555+ $as_echo_n "(cached) " >&6 6604+ $as_echo_n "(cached) " >&6
6556+else 6605+else
6557+ lt_cv_prog_compiler_pic=$lt_prog_compiler_pic 6606+ lt_cv_prog_compiler_pic=$lt_prog_compiler_pic
@@ -6562,7 +6611,7 @@ index 6b43bf2b18..245ee48bc3 100755
6562 6611
6563 # 6612 #
6564 # Check to make sure the PIC flag actually works. 6613 # Check to make sure the PIC flag actually works.
6565@@ -8299,6 +8802,11 @@ fi 6614@@ -8587,6 +9090,11 @@ fi
6566 6615
6567 6616
6568 6617
@@ -6574,7 +6623,7 @@ index 6b43bf2b18..245ee48bc3 100755
6574 # 6623 #
6575 # Check to make sure the static flag actually works. 6624 # Check to make sure the static flag actually works.
6576 # 6625 #
6577@@ -8649,7 +9157,8 @@ _LT_EOF 6626@@ -8937,7 +9445,8 @@ _LT_EOF
6578 allow_undefined_flag=unsupported 6627 allow_undefined_flag=unsupported
6579 always_export_symbols=no 6628 always_export_symbols=no
6580 enable_shared_with_static_runtimes=yes 6629 enable_shared_with_static_runtimes=yes
@@ -6584,7 +6633,7 @@ index 6b43bf2b18..245ee48bc3 100755
6584 6633
6585 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then 6634 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
6586 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' 6635 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
6587@@ -8748,12 +9257,12 @@ _LT_EOF 6636@@ -9036,12 +9545,12 @@ _LT_EOF
6588 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' 6637 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
6589 hardcode_libdir_flag_spec= 6638 hardcode_libdir_flag_spec=
6590 hardcode_libdir_flag_spec_ld='-rpath $libdir' 6639 hardcode_libdir_flag_spec_ld='-rpath $libdir'
@@ -6599,7 +6648,7 @@ index 6b43bf2b18..245ee48bc3 100755
6599 fi 6648 fi
6600 ;; 6649 ;;
6601 esac 6650 esac
6602@@ -8767,8 +9276,8 @@ _LT_EOF 6651@@ -9055,8 +9564,8 @@ _LT_EOF
6603 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' 6652 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
6604 wlarc= 6653 wlarc=
6605 else 6654 else
@@ -6610,7 +6659,7 @@ index 6b43bf2b18..245ee48bc3 100755
6610 fi 6659 fi
6611 ;; 6660 ;;
6612 6661
6613@@ -8786,8 +9295,8 @@ _LT_EOF 6662@@ -9074,8 +9583,8 @@ _LT_EOF
6614 6663
6615 _LT_EOF 6664 _LT_EOF
6616 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 6665 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -6621,7 +6670,7 @@ index 6b43bf2b18..245ee48bc3 100755
6621 else 6670 else
6622 ld_shlibs=no 6671 ld_shlibs=no
6623 fi 6672 fi
6624@@ -8833,8 +9342,8 @@ _LT_EOF 6673@@ -9121,8 +9630,8 @@ _LT_EOF
6625 6674
6626 *) 6675 *)
6627 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 6676 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -6632,7 +6681,7 @@ index 6b43bf2b18..245ee48bc3 100755
6632 else 6681 else
6633 ld_shlibs=no 6682 ld_shlibs=no
6634 fi 6683 fi
6635@@ -8964,7 +9473,13 @@ _LT_EOF 6684@@ -9252,7 +9761,13 @@ _LT_EOF
6636 allow_undefined_flag='-berok' 6685 allow_undefined_flag='-berok'
6637 # Determine the default libpath from the value encoded in an 6686 # Determine the default libpath from the value encoded in an
6638 # empty executable. 6687 # empty executable.
@@ -6640,14 +6689,14 @@ index 6b43bf2b18..245ee48bc3 100755
6640+ if test "${lt_cv_aix_libpath+set}" = set; then 6689+ if test "${lt_cv_aix_libpath+set}" = set; then
6641+ aix_libpath=$lt_cv_aix_libpath 6690+ aix_libpath=$lt_cv_aix_libpath
6642+else 6691+else
6643+ if test "${lt_cv_aix_libpath_+set}" = set; then : 6692+ if ${lt_cv_aix_libpath_+:} false; then :
6644+ $as_echo_n "(cached) " >&6 6693+ $as_echo_n "(cached) " >&6
6645+else 6694+else
6646+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext 6695+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
6647 /* end confdefs.h. */ 6696 /* end confdefs.h. */
6648 6697
6649 int 6698 int
6650@@ -8977,22 +9492,29 @@ main () 6699@@ -9265,22 +9780,29 @@ main ()
6651 _ACEOF 6700 _ACEOF
6652 if ac_fn_c_try_link "$LINENO"; then : 6701 if ac_fn_c_try_link "$LINENO"; then :
6653 6702
@@ -6690,7 +6739,7 @@ index 6b43bf2b18..245ee48bc3 100755
6690 6739
6691 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 6740 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
6692 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" 6741 archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
6693@@ -9004,7 +9526,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 6742@@ -9292,7 +9814,13 @@ if test -z "$aix_libpath"; then aix_libp
6694 else 6743 else
6695 # Determine the default libpath from the value encoded in an 6744 # Determine the default libpath from the value encoded in an
6696 # empty executable. 6745 # empty executable.
@@ -6698,14 +6747,14 @@ index 6b43bf2b18..245ee48bc3 100755
6698+ if test "${lt_cv_aix_libpath+set}" = set; then 6747+ if test "${lt_cv_aix_libpath+set}" = set; then
6699+ aix_libpath=$lt_cv_aix_libpath 6748+ aix_libpath=$lt_cv_aix_libpath
6700+else 6749+else
6701+ if test "${lt_cv_aix_libpath_+set}" = set; then : 6750+ if ${lt_cv_aix_libpath_+:} false; then :
6702+ $as_echo_n "(cached) " >&6 6751+ $as_echo_n "(cached) " >&6
6703+else 6752+else
6704+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext 6753+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
6705 /* end confdefs.h. */ 6754 /* end confdefs.h. */
6706 6755
6707 int 6756 int
6708@@ -9017,22 +9545,29 @@ main () 6757@@ -9305,22 +9833,29 @@ main ()
6709 _ACEOF 6758 _ACEOF
6710 if ac_fn_c_try_link "$LINENO"; then : 6759 if ac_fn_c_try_link "$LINENO"; then :
6711 6760
@@ -6748,7 +6797,7 @@ index 6b43bf2b18..245ee48bc3 100755
6748 6797
6749 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 6798 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
6750 # Warning - without using the other run time loading flags, 6799 # Warning - without using the other run time loading flags,
6751@@ -9077,20 +9612,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 6800@@ -9365,20 +9900,63 @@ if test -z "$aix_libpath"; then aix_libp
6752 # Microsoft Visual C++. 6801 # Microsoft Visual C++.
6753 # hardcode_libdir_flag_spec is actually meaningless, as there is 6802 # hardcode_libdir_flag_spec is actually meaningless, as there is
6754 # no search path for DLLs. 6803 # no search path for DLLs.
@@ -6826,7 +6875,7 @@ index 6b43bf2b18..245ee48bc3 100755
6826 ;; 6875 ;;
6827 6876
6828 darwin* | rhapsody*) 6877 darwin* | rhapsody*)
6829@@ -9151,7 +9729,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 6878@@ -9439,7 +10017,7 @@ if test -z "$aix_libpath"; then aix_libp
6830 6879
6831 # FreeBSD 3 and greater uses gcc -shared to do shared libraries. 6880 # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
6832 freebsd* | dragonfly*) 6881 freebsd* | dragonfly*)
@@ -6835,7 +6884,7 @@ index 6b43bf2b18..245ee48bc3 100755
6835 hardcode_libdir_flag_spec='-R$libdir' 6884 hardcode_libdir_flag_spec='-R$libdir'
6836 hardcode_direct=yes 6885 hardcode_direct=yes
6837 hardcode_shlibpath_var=no 6886 hardcode_shlibpath_var=no
6838@@ -9159,7 +9737,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 6887@@ -9447,7 +10025,7 @@ if test -z "$aix_libpath"; then aix_libp
6839 6888
6840 hpux9*) 6889 hpux9*)
6841 if test "$GCC" = yes; then 6890 if test "$GCC" = yes; then
@@ -6844,7 +6893,7 @@ index 6b43bf2b18..245ee48bc3 100755
6844 else 6893 else
6845 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' 6894 archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
6846 fi 6895 fi
6847@@ -9175,7 +9753,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 6896@@ -9463,7 +10041,7 @@ if test -z "$aix_libpath"; then aix_libp
6848 6897
6849 hpux10*) 6898 hpux10*)
6850 if test "$GCC" = yes && test "$with_gnu_ld" = no; then 6899 if test "$GCC" = yes && test "$with_gnu_ld" = no; then
@@ -6853,7 +6902,7 @@ index 6b43bf2b18..245ee48bc3 100755
6853 else 6902 else
6854 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' 6903 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
6855 fi 6904 fi
6856@@ -9199,10 +9777,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 6905@@ -9487,10 +10065,10 @@ if test -z "$aix_libpath"; then aix_libp
6857 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' 6906 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
6858 ;; 6907 ;;
6859 ia64*) 6908 ia64*)
@@ -6866,7 +6915,7 @@ index 6b43bf2b18..245ee48bc3 100755
6866 ;; 6915 ;;
6867 esac 6916 esac
6868 else 6917 else
6869@@ -9281,23 +9859,36 @@ fi 6918@@ -9569,23 +10147,36 @@ fi
6870 6919
6871 irix5* | irix6* | nonstopux*) 6920 irix5* | irix6* | nonstopux*)
6872 if test "$GCC" = yes; then 6921 if test "$GCC" = yes; then
@@ -6881,7 +6930,7 @@ index 6b43bf2b18..245ee48bc3 100755
6881+ # This should be the same for all languages, so no per-tag cache variable. 6930+ # This should be the same for all languages, so no per-tag cache variable.
6882+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5 6931+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5
6883+$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; } 6932+$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; }
6884+if test "${lt_cv_irix_exported_symbol+set}" = set; then : 6933+if ${lt_cv_irix_exported_symbol+:} false; then :
6885+ $as_echo_n "(cached) " >&6 6934+ $as_echo_n "(cached) " >&6
6886+else 6935+else
6887+ save_LDFLAGS="$LDFLAGS" 6936+ save_LDFLAGS="$LDFLAGS"
@@ -6911,7 +6960,7 @@ index 6b43bf2b18..245ee48bc3 100755
6911 else 6960 else
6912 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' 6961 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
6913 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' 6962 archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
6914@@ -9382,7 +9973,7 @@ rm -f core conftest.err conftest.$ac_objext \ 6963@@ -9670,7 +10261,7 @@ rm -f core conftest.err conftest.$ac_obj
6915 osf4* | osf5*) # as osf3* with the addition of -msym flag 6964 osf4* | osf5*) # as osf3* with the addition of -msym flag
6916 if test "$GCC" = yes; then 6965 if test "$GCC" = yes; then
6917 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' 6966 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
@@ -6920,7 +6969,7 @@ index 6b43bf2b18..245ee48bc3 100755
6920 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' 6969 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
6921 else 6970 else
6922 allow_undefined_flag=' -expect_unresolved \*' 6971 allow_undefined_flag=' -expect_unresolved \*'
6923@@ -9401,9 +9992,9 @@ rm -f core conftest.err conftest.$ac_objext \ 6972@@ -9689,9 +10280,9 @@ rm -f core conftest.err conftest.$ac_obj
6924 no_undefined_flag=' -z defs' 6973 no_undefined_flag=' -z defs'
6925 if test "$GCC" = yes; then 6974 if test "$GCC" = yes; then
6926 wlarc='${wl}' 6975 wlarc='${wl}'
@@ -6932,7 +6981,7 @@ index 6b43bf2b18..245ee48bc3 100755
6932 else 6981 else
6933 case `$CC -V 2>&1` in 6982 case `$CC -V 2>&1` in
6934 *"Compilers 5.0"*) 6983 *"Compilers 5.0"*)
6935@@ -9979,8 +10570,9 @@ cygwin* | mingw* | pw32* | cegcc*) 6984@@ -10267,8 +10858,9 @@ cygwin* | mingw* | pw32* | cegcc*)
6936 need_version=no 6985 need_version=no
6937 need_lib_prefix=no 6986 need_lib_prefix=no
6938 6987
@@ -6944,7 +6993,7 @@ index 6b43bf2b18..245ee48bc3 100755
6944 library_names_spec='$libname.dll.a' 6993 library_names_spec='$libname.dll.a'
6945 # DLL is installed to $(libdir)/../bin by postinstall_cmds 6994 # DLL is installed to $(libdir)/../bin by postinstall_cmds
6946 postinstall_cmds='base_file=`basename \${file}`~ 6995 postinstall_cmds='base_file=`basename \${file}`~
6947@@ -10013,13 +10605,71 @@ cygwin* | mingw* | pw32* | cegcc*) 6996@@ -10301,13 +10893,71 @@ cygwin* | mingw* | pw32* | cegcc*)
6948 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' 6997 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
6949 ;; 6998 ;;
6950 esac 6999 esac
@@ -7017,7 +7066,7 @@ index 6b43bf2b18..245ee48bc3 100755
7017 # FIXME: first we should search . and the directory the executable is in 7066 # FIXME: first we should search . and the directory the executable is in
7018 shlibpath_var=PATH 7067 shlibpath_var=PATH
7019 ;; 7068 ;;
7020@@ -10111,7 +10761,7 @@ haiku*) 7069@@ -10399,7 +11049,7 @@ haiku*)
7021 soname_spec='${libname}${release}${shared_ext}$major' 7070 soname_spec='${libname}${release}${shared_ext}$major'
7022 shlibpath_var=LIBRARY_PATH 7071 shlibpath_var=LIBRARY_PATH
7023 shlibpath_overrides_runpath=yes 7072 shlibpath_overrides_runpath=yes
@@ -7026,7 +7075,16 @@ index 6b43bf2b18..245ee48bc3 100755
7026 hardcode_into_libs=yes 7075 hardcode_into_libs=yes
7027 ;; 7076 ;;
7028 7077
7029@@ -10951,10 +11601,10 @@ else 7078@@ -11195,7 +11845,7 @@ else
7079 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
7080 lt_status=$lt_dlunknown
7081 cat > conftest.$ac_ext <<_LT_EOF
7082-#line 11193 "configure"
7083+#line $LINENO "configure"
7084 #include "confdefs.h"
7085
7086 #if HAVE_DLFCN_H
7087@@ -11239,10 +11889,10 @@ else
7030 /* When -fvisbility=hidden is used, assume the code has been annotated 7088 /* When -fvisbility=hidden is used, assume the code has been annotated
7031 correspondingly for the symbols needed. */ 7089 correspondingly for the symbols needed. */
7032 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 7090 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
@@ -7039,7 +7097,16 @@ index 6b43bf2b18..245ee48bc3 100755
7039 int main () 7097 int main ()
7040 { 7098 {
7041 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 7099 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
7042@@ -11057,10 +11707,10 @@ else 7100@@ -11301,7 +11951,7 @@ else
7101 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
7102 lt_status=$lt_dlunknown
7103 cat > conftest.$ac_ext <<_LT_EOF
7104-#line 11299 "configure"
7105+#line $LINENO "configure"
7106 #include "confdefs.h"
7107
7108 #if HAVE_DLFCN_H
7109@@ -11345,10 +11995,10 @@ else
7043 /* When -fvisbility=hidden is used, assume the code has been annotated 7110 /* When -fvisbility=hidden is used, assume the code has been annotated
7044 correspondingly for the symbols needed. */ 7111 correspondingly for the symbols needed. */
7045 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 7112 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
@@ -7052,7 +7119,7 @@ index 6b43bf2b18..245ee48bc3 100755
7052 int main () 7119 int main ()
7053 { 7120 {
7054 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 7121 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
7055@@ -13005,13 +13655,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' 7122@@ -13314,13 +13964,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_
7056 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' 7123 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
7057 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' 7124 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
7058 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' 7125 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
@@ -7073,7 +7140,7 @@ index 6b43bf2b18..245ee48bc3 100755
7073 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' 7140 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
7074 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' 7141 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
7075 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' 7142 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
7076@@ -13026,14 +13683,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de 7143@@ -13335,14 +13992,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$l
7077 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' 7144 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
7078 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' 7145 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
7079 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"`' 7146 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`'
@@ -7092,7 +7159,7 @@ index 6b43bf2b18..245ee48bc3 100755
7092 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' 7159 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
7093 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' 7160 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
7094 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' 7161 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
7095@@ -13066,12 +13726,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q 7162@@ -13375,12 +14035,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcod
7096 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' 7163 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
7097 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' 7164 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
7098 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' 7165 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
@@ -7106,7 +7173,7 @@ index 6b43bf2b18..245ee48bc3 100755
7106 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' 7173 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
7107 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' 7174 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
7108 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' 7175 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
7109@@ -13126,8 +13786,13 @@ reload_flag \ 7176@@ -13435,8 +14095,13 @@ reload_flag \
7110 OBJDUMP \ 7177 OBJDUMP \
7111 deplibs_check_method \ 7178 deplibs_check_method \
7112 file_magic_cmd \ 7179 file_magic_cmd \
@@ -7120,7 +7187,7 @@ index 6b43bf2b18..245ee48bc3 100755
7120 STRIP \ 7187 STRIP \
7121 RANLIB \ 7188 RANLIB \
7122 CC \ 7189 CC \
7123@@ -13137,12 +13802,14 @@ lt_cv_sys_global_symbol_pipe \ 7190@@ -13446,12 +14111,14 @@ lt_cv_sys_global_symbol_pipe \
7124 lt_cv_sys_global_symbol_to_cdecl \ 7191 lt_cv_sys_global_symbol_to_cdecl \
7125 lt_cv_sys_global_symbol_to_c_name_address \ 7192 lt_cv_sys_global_symbol_to_c_name_address \
7126 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ 7193 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
@@ -7136,7 +7203,7 @@ index 6b43bf2b18..245ee48bc3 100755
7136 DSYMUTIL \ 7203 DSYMUTIL \
7137 NMEDIT \ 7204 NMEDIT \
7138 LIPO \ 7205 LIPO \
7139@@ -13158,7 +13825,6 @@ no_undefined_flag \ 7206@@ -13467,7 +14134,6 @@ no_undefined_flag \
7140 hardcode_libdir_flag_spec \ 7207 hardcode_libdir_flag_spec \
7141 hardcode_libdir_flag_spec_ld \ 7208 hardcode_libdir_flag_spec_ld \
7142 hardcode_libdir_separator \ 7209 hardcode_libdir_separator \
@@ -7144,7 +7211,7 @@ index 6b43bf2b18..245ee48bc3 100755
7144 exclude_expsyms \ 7211 exclude_expsyms \
7145 include_expsyms \ 7212 include_expsyms \
7146 file_list_spec \ 7213 file_list_spec \
7147@@ -13194,6 +13860,7 @@ module_cmds \ 7214@@ -13503,6 +14169,7 @@ module_cmds \
7148 module_expsym_cmds \ 7215 module_expsym_cmds \
7149 export_symbols_cmds \ 7216 export_symbols_cmds \
7150 prelink_cmds \ 7217 prelink_cmds \
@@ -7152,7 +7219,7 @@ index 6b43bf2b18..245ee48bc3 100755
7152 postinstall_cmds \ 7219 postinstall_cmds \
7153 postuninstall_cmds \ 7220 postuninstall_cmds \
7154 finish_cmds \ 7221 finish_cmds \
7155@@ -13950,7 +14617,8 @@ $as_echo X"$file" | 7222@@ -14268,7 +14935,8 @@ $as_echo X"$file" |
7156 # NOTE: Changes made to this file will be lost: look at ltmain.sh. 7223 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
7157 # 7224 #
7158 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 7225 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
@@ -7162,7 +7229,7 @@ index 6b43bf2b18..245ee48bc3 100755
7162 # Written by Gordon Matzigkeit, 1996 7229 # Written by Gordon Matzigkeit, 1996
7163 # 7230 #
7164 # This file is part of GNU Libtool. 7231 # This file is part of GNU Libtool.
7165@@ -14053,19 +14721,42 @@ SP2NL=$lt_lt_SP2NL 7232@@ -14371,19 +15039,42 @@ SP2NL=$lt_lt_SP2NL
7166 # turn newlines into spaces. 7233 # turn newlines into spaces.
7167 NL2SP=$lt_lt_NL2SP 7234 NL2SP=$lt_lt_NL2SP
7168 7235
@@ -7206,7 +7273,7 @@ index 6b43bf2b18..245ee48bc3 100755
7206 # A symbol stripping program. 7273 # A symbol stripping program.
7207 STRIP=$lt_STRIP 7274 STRIP=$lt_STRIP
7208 7275
7209@@ -14095,6 +14786,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address 7276@@ -14413,6 +15104,12 @@ global_symbol_to_c_name_address=$lt_lt_c
7210 # Transform the output of nm in a C name address pair when lib prefix is needed. 7277 # Transform the output of nm in a C name address pair when lib prefix is needed.
7211 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix 7278 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
7212 7279
@@ -7219,7 +7286,7 @@ index 6b43bf2b18..245ee48bc3 100755
7219 # The name of the directory that contains temporary libtool files. 7286 # The name of the directory that contains temporary libtool files.
7220 objdir=$objdir 7287 objdir=$objdir
7221 7288
7222@@ -14104,6 +14801,9 @@ MAGIC_CMD=$MAGIC_CMD 7289@@ -14422,6 +15119,9 @@ MAGIC_CMD=$MAGIC_CMD
7223 # Must we lock files when doing compilation? 7290 # Must we lock files when doing compilation?
7224 need_locks=$lt_need_locks 7291 need_locks=$lt_need_locks
7225 7292
@@ -7229,7 +7296,7 @@ index 6b43bf2b18..245ee48bc3 100755
7229 # Tool to manipulate archived DWARF debug symbol files on Mac OS X. 7296 # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
7230 DSYMUTIL=$lt_DSYMUTIL 7297 DSYMUTIL=$lt_DSYMUTIL
7231 7298
7232@@ -14218,12 +14918,12 @@ with_gcc=$GCC 7299@@ -14536,12 +15236,12 @@ with_gcc=$GCC
7233 # Compiler flag to turn off builtin functions. 7300 # Compiler flag to turn off builtin functions.
7234 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag 7301 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
7235 7302
@@ -7245,7 +7312,7 @@ index 6b43bf2b18..245ee48bc3 100755
7245 # Compiler flag to prevent dynamic linking. 7312 # Compiler flag to prevent dynamic linking.
7246 link_static_flag=$lt_lt_prog_compiler_static 7313 link_static_flag=$lt_lt_prog_compiler_static
7247 7314
7248@@ -14310,9 +15010,6 @@ inherit_rpath=$inherit_rpath 7315@@ -14628,9 +15328,6 @@ inherit_rpath=$inherit_rpath
7249 # Whether libtool must link a program against all its dependency libraries. 7316 # Whether libtool must link a program against all its dependency libraries.
7250 link_all_deplibs=$link_all_deplibs 7317 link_all_deplibs=$link_all_deplibs
7251 7318
@@ -7255,7 +7322,7 @@ index 6b43bf2b18..245ee48bc3 100755
7255 # Set to "yes" if exported symbols are required. 7322 # Set to "yes" if exported symbols are required.
7256 always_export_symbols=$always_export_symbols 7323 always_export_symbols=$always_export_symbols
7257 7324
7258@@ -14328,6 +15025,9 @@ include_expsyms=$lt_include_expsyms 7325@@ -14646,6 +15343,9 @@ include_expsyms=$lt_include_expsyms
7259 # Commands necessary for linking programs (against libraries) with templates. 7326 # Commands necessary for linking programs (against libraries) with templates.
7260 prelink_cmds=$lt_prelink_cmds 7327 prelink_cmds=$lt_prelink_cmds
7261 7328
@@ -7265,7 +7332,7 @@ index 6b43bf2b18..245ee48bc3 100755
7265 # Specify filename containing input files. 7332 # Specify filename containing input files.
7266 file_list_spec=$lt_file_list_spec 7333 file_list_spec=$lt_file_list_spec
7267 7334
7268@@ -14360,210 +15060,169 @@ ltmain="$ac_aux_dir/ltmain.sh" 7335@@ -14678,210 +15378,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
7269 # if finds mixed CR/LF and LF-only lines. Since sed operates in 7336 # if finds mixed CR/LF and LF-only lines. Since sed operates in
7270 # text mode, it properly converts lines to CR/LF. This bash problem 7337 # text mode, it properly converts lines to CR/LF. This bash problem
7271 # is reportedly fixed, but why not run on old versions too? 7338 # is reportedly fixed, but why not run on old versions too?
@@ -7467,15 +7534,9 @@ index 6b43bf2b18..245ee48bc3 100755
7467-_LT_EOF 7534-_LT_EOF
7468- ;; 7535- ;;
7469- esac 7536- esac
7470-
7471-
7472- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
7473- || (rm -f "$cfgfile"; exit 1)
7474-
7475- mv -f "$cfgfile" "$ofile" ||
7476+ sed '$q' "$ltmain" >> "$cfgfile" \ 7537+ sed '$q' "$ltmain" >> "$cfgfile" \
7477+ || (rm -f "$cfgfile"; exit 1) 7538+ || (rm -f "$cfgfile"; exit 1)
7478+ 7539
7479+ if test x"$xsi_shell" = xyes; then 7540+ if test x"$xsi_shell" = xyes; then
7480+ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ 7541+ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\
7481+func_dirname ()\ 7542+func_dirname ()\
@@ -7633,17 +7694,20 @@ index 6b43bf2b18..245ee48bc3 100755
7633+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 7694+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5
7634+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} 7695+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;}
7635+fi 7696+fi
7636+ 7697
7637+ 7698- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
7699- || (rm -f "$cfgfile"; exit 1)
7700
7701- mv -f "$cfgfile" "$ofile" ||
7638+ mv -f "$cfgfile" "$ofile" || 7702+ mv -f "$cfgfile" "$ofile" ||
7639 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") 7703 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
7640 chmod +x "$ofile" 7704 chmod +x "$ofile"
7641 7705
7642diff --git a/ld/configure b/ld/configure 7706Index: git/ld/configure
7643index 0cc6e8a50f..db8b998722 100755 7707===================================================================
7644--- a/ld/configure 7708--- git.orig/ld/configure
7645+++ b/ld/configure 7709+++ git/ld/configure
7646@@ -655,8 +655,11 @@ OTOOL 7710@@ -687,8 +687,11 @@ OTOOL
7647 LIPO 7711 LIPO
7648 NMEDIT 7712 NMEDIT
7649 DSYMUTIL 7713 DSYMUTIL
@@ -7655,7 +7719,7 @@ index 0cc6e8a50f..db8b998722 100755
7655 OBJDUMP 7719 OBJDUMP
7656 LN_S 7720 LN_S
7657 NM 7721 NM
7658@@ -778,6 +781,7 @@ enable_static 7722@@ -815,6 +818,7 @@ enable_static
7659 with_pic 7723 with_pic
7660 enable_fast_install 7724 enable_fast_install
7661 with_gnu_ld 7725 with_gnu_ld
@@ -7663,7 +7727,7 @@ index 0cc6e8a50f..db8b998722 100755
7663 enable_libtool_lock 7727 enable_libtool_lock
7664 enable_plugins 7728 enable_plugins
7665 enable_largefile 7729 enable_largefile
7666@@ -1464,6 +1468,8 @@ Optional Packages: 7730@@ -1507,6 +1511,8 @@ Optional Packages:
7667 --with-pic try to use only PIC/non-PIC objects [default=use 7731 --with-pic try to use only PIC/non-PIC objects [default=use
7668 both] 7732 both]
7669 --with-gnu-ld assume the C compiler uses GNU ld [default=no] 7733 --with-gnu-ld assume the C compiler uses GNU ld [default=no]
@@ -7672,7 +7736,7 @@ index 0cc6e8a50f..db8b998722 100755
7672 --with-lib-path=dir1:dir2... set default LIB_PATH 7736 --with-lib-path=dir1:dir2... set default LIB_PATH
7673 --with-sysroot=DIR Search for usr/lib et al within DIR. 7737 --with-sysroot=DIR Search for usr/lib et al within DIR.
7674 7738
7675@@ -5658,8 +5664,8 @@ esac 7739@@ -5959,8 +5965,8 @@ esac
7676 7740
7677 7741
7678 7742
@@ -7683,7 +7747,7 @@ index 0cc6e8a50f..db8b998722 100755
7683 7747
7684 7748
7685 7749
7686@@ -5699,7 +5705,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO 7750@@ -6000,7 +6006,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
7687 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 7751 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
7688 $as_echo_n "checking how to print strings... " >&6; } 7752 $as_echo_n "checking how to print strings... " >&6; }
7689 # Test print first, because it will be a builtin if present. 7753 # Test print first, because it will be a builtin if present.
@@ -7692,7 +7756,7 @@ index 0cc6e8a50f..db8b998722 100755
7692 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then 7756 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
7693 ECHO='print -r --' 7757 ECHO='print -r --'
7694 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then 7758 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
7695@@ -6385,8 +6391,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; 7759@@ -6686,8 +6692,8 @@ $as_echo_n "checking whether the shell u
7696 # Try some XSI features 7760 # Try some XSI features
7697 xsi_shell=no 7761 xsi_shell=no
7698 ( _lt_dummy="a/b/c" 7762 ( _lt_dummy="a/b/c"
@@ -7703,13 +7767,13 @@ index 0cc6e8a50f..db8b998722 100755
7703 && eval 'test $(( 1 + 1 )) -eq 2 \ 7767 && eval 'test $(( 1 + 1 )) -eq 2 \
7704 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ 7768 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
7705 && xsi_shell=yes 7769 && xsi_shell=yes
7706@@ -6435,6 +6441,80 @@ esac 7770@@ -6736,6 +6742,80 @@ esac
7707 7771
7708 7772
7709 7773
7710+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5 7774+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5
7711+$as_echo_n "checking how to convert $build file names to $host format... " >&6; } 7775+$as_echo_n "checking how to convert $build file names to $host format... " >&6; }
7712+if test "${lt_cv_to_host_file_cmd+set}" = set; then : 7776+if ${lt_cv_to_host_file_cmd+:} false; then :
7713+ $as_echo_n "(cached) " >&6 7777+ $as_echo_n "(cached) " >&6
7714+else 7778+else
7715+ case $host in 7779+ case $host in
@@ -7756,7 +7820,7 @@ index 0cc6e8a50f..db8b998722 100755
7756+ 7820+
7757+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5 7821+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5
7758+$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; } 7822+$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; }
7759+if test "${lt_cv_to_tool_file_cmd+set}" = set; then : 7823+if ${lt_cv_to_tool_file_cmd+:} false; then :
7760+ $as_echo_n "(cached) " >&6 7824+ $as_echo_n "(cached) " >&6
7761+else 7825+else
7762+ #assume ordinary cross tools, or native build. 7826+ #assume ordinary cross tools, or native build.
@@ -7783,8 +7847,8 @@ index 0cc6e8a50f..db8b998722 100755
7783+ 7847+
7784 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 7848 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
7785 $as_echo_n "checking for $LD option to reload object files... " >&6; } 7849 $as_echo_n "checking for $LD option to reload object files... " >&6; }
7786 if test "${lt_cv_ld_reload_flag+set}" = set; then : 7850 if ${lt_cv_ld_reload_flag+:} false; then :
7787@@ -6451,6 +6531,11 @@ case $reload_flag in 7851@@ -6752,6 +6832,11 @@ case $reload_flag in
7788 esac 7852 esac
7789 reload_cmds='$LD$reload_flag -o $output$reload_objs' 7853 reload_cmds='$LD$reload_flag -o $output$reload_objs'
7790 case $host_os in 7854 case $host_os in
@@ -7796,7 +7860,7 @@ index 0cc6e8a50f..db8b998722 100755
7796 darwin*) 7860 darwin*)
7797 if test "$GCC" = yes; then 7861 if test "$GCC" = yes; then
7798 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' 7862 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
7799@@ -6619,7 +6704,8 @@ mingw* | pw32*) 7863@@ -6920,7 +7005,8 @@ mingw* | pw32*)
7800 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' 7864 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
7801 lt_cv_file_magic_cmd='func_win32_libid' 7865 lt_cv_file_magic_cmd='func_win32_libid'
7802 else 7866 else
@@ -7806,7 +7870,7 @@ index 0cc6e8a50f..db8b998722 100755
7806 lt_cv_file_magic_cmd='$OBJDUMP -f' 7870 lt_cv_file_magic_cmd='$OBJDUMP -f'
7807 fi 7871 fi
7808 ;; 7872 ;;
7809@@ -6773,6 +6859,21 @@ esac 7873@@ -7074,6 +7160,21 @@ esac
7810 fi 7874 fi
7811 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 7875 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
7812 $as_echo "$lt_cv_deplibs_check_method" >&6; } 7876 $as_echo "$lt_cv_deplibs_check_method" >&6; }
@@ -7828,7 +7892,7 @@ index 0cc6e8a50f..db8b998722 100755
7828 file_magic_cmd=$lt_cv_file_magic_cmd 7892 file_magic_cmd=$lt_cv_file_magic_cmd
7829 deplibs_check_method=$lt_cv_deplibs_check_method 7893 deplibs_check_method=$lt_cv_deplibs_check_method
7830 test -z "$deplibs_check_method" && deplibs_check_method=unknown 7894 test -z "$deplibs_check_method" && deplibs_check_method=unknown
7831@@ -6788,9 +6889,162 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown 7895@@ -7089,9 +7190,162 @@ test -z "$deplibs_check_method" && depli
7832 7896
7833 7897
7834 7898
@@ -7847,7 +7911,7 @@ index 0cc6e8a50f..db8b998722 100755
7847+set dummy ${ac_tool_prefix}dlltool; ac_word=$2 7911+set dummy ${ac_tool_prefix}dlltool; ac_word=$2
7848+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 7912+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
7849+$as_echo_n "checking for $ac_word... " >&6; } 7913+$as_echo_n "checking for $ac_word... " >&6; }
7850+if test "${ac_cv_prog_DLLTOOL+set}" = set; then : 7914+if ${ac_cv_prog_DLLTOOL+:} false; then :
7851+ $as_echo_n "(cached) " >&6 7915+ $as_echo_n "(cached) " >&6
7852+else 7916+else
7853+ if test -n "$DLLTOOL"; then 7917+ if test -n "$DLLTOOL"; then
@@ -7859,7 +7923,7 @@ index 0cc6e8a50f..db8b998722 100755
7859+ IFS=$as_save_IFS 7923+ IFS=$as_save_IFS
7860+ test -z "$as_dir" && as_dir=. 7924+ test -z "$as_dir" && as_dir=.
7861+ for ac_exec_ext in '' $ac_executable_extensions; do 7925+ for ac_exec_ext in '' $ac_executable_extensions; do
7862+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 7926+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
7863+ ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" 7927+ ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
7864+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 7928+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
7865+ break 2 7929+ break 2
@@ -7887,7 +7951,7 @@ index 0cc6e8a50f..db8b998722 100755
7887+set dummy dlltool; ac_word=$2 7951+set dummy dlltool; ac_word=$2
7888+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 7952+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
7889+$as_echo_n "checking for $ac_word... " >&6; } 7953+$as_echo_n "checking for $ac_word... " >&6; }
7890+if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then : 7954+if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then :
7891+ $as_echo_n "(cached) " >&6 7955+ $as_echo_n "(cached) " >&6
7892+else 7956+else
7893+ if test -n "$ac_ct_DLLTOOL"; then 7957+ if test -n "$ac_ct_DLLTOOL"; then
@@ -7899,7 +7963,7 @@ index 0cc6e8a50f..db8b998722 100755
7899+ IFS=$as_save_IFS 7963+ IFS=$as_save_IFS
7900+ test -z "$as_dir" && as_dir=. 7964+ test -z "$as_dir" && as_dir=.
7901+ for ac_exec_ext in '' $ac_executable_extensions; do 7965+ for ac_exec_ext in '' $ac_executable_extensions; do
7902+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 7966+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
7903+ ac_cv_prog_ac_ct_DLLTOOL="dlltool" 7967+ ac_cv_prog_ac_ct_DLLTOOL="dlltool"
7904+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 7968+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
7905+ break 2 7969+ break 2
@@ -7947,7 +8011,7 @@ index 0cc6e8a50f..db8b998722 100755
7947+ 8011+
7948+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5 8012+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5
7949+$as_echo_n "checking how to associate runtime and link libraries... " >&6; } 8013+$as_echo_n "checking how to associate runtime and link libraries... " >&6; }
7950+if test "${lt_cv_sharedlib_from_linklib_cmd+set}" = set; then : 8014+if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then :
7951+ $as_echo_n "(cached) " >&6 8015+ $as_echo_n "(cached) " >&6
7952+else 8016+else
7953+ lt_cv_sharedlib_from_linklib_cmd='unknown' 8017+ lt_cv_sharedlib_from_linklib_cmd='unknown'
@@ -7992,17 +8056,17 @@ index 0cc6e8a50f..db8b998722 100755
7992+set dummy $ac_tool_prefix$ac_prog; ac_word=$2 8056+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
7993 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 8057 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
7994 $as_echo_n "checking for $ac_word... " >&6; } 8058 $as_echo_n "checking for $ac_word... " >&6; }
7995 if test "${ac_cv_prog_AR+set}" = set; then : 8059 if ${ac_cv_prog_AR+:} false; then :
7996@@ -6806,7 +7060,7 @@ do 8060@@ -7107,7 +7361,7 @@ do
7997 test -z "$as_dir" && as_dir=. 8061 test -z "$as_dir" && as_dir=.
7998 for ac_exec_ext in '' $ac_executable_extensions; do 8062 for ac_exec_ext in '' $ac_executable_extensions; do
7999 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 8063 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
8000- ac_cv_prog_AR="${ac_tool_prefix}ar" 8064- ac_cv_prog_AR="${ac_tool_prefix}ar"
8001+ ac_cv_prog_AR="$ac_tool_prefix$ac_prog" 8065+ ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
8002 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 8066 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
8003 break 2 8067 break 2
8004 fi 8068 fi
8005@@ -6826,11 +7080,15 @@ $as_echo "no" >&6; } 8069@@ -7127,11 +7381,15 @@ $as_echo "no" >&6; }
8006 fi 8070 fi
8007 8071
8008 8072
@@ -8020,17 +8084,17 @@ index 0cc6e8a50f..db8b998722 100755
8020+set dummy $ac_prog; ac_word=$2 8084+set dummy $ac_prog; ac_word=$2
8021 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 8085 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
8022 $as_echo_n "checking for $ac_word... " >&6; } 8086 $as_echo_n "checking for $ac_word... " >&6; }
8023 if test "${ac_cv_prog_ac_ct_AR+set}" = set; then : 8087 if ${ac_cv_prog_ac_ct_AR+:} false; then :
8024@@ -6846,7 +7104,7 @@ do 8088@@ -7147,7 +7405,7 @@ do
8025 test -z "$as_dir" && as_dir=. 8089 test -z "$as_dir" && as_dir=.
8026 for ac_exec_ext in '' $ac_executable_extensions; do 8090 for ac_exec_ext in '' $ac_executable_extensions; do
8027 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 8091 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
8028- ac_cv_prog_ac_ct_AR="ar" 8092- ac_cv_prog_ac_ct_AR="ar"
8029+ ac_cv_prog_ac_ct_AR="$ac_prog" 8093+ ac_cv_prog_ac_ct_AR="$ac_prog"
8030 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 8094 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
8031 break 2 8095 break 2
8032 fi 8096 fi
8033@@ -6865,6 +7123,10 @@ else 8097@@ -7166,6 +7424,10 @@ else
8034 $as_echo "no" >&6; } 8098 $as_echo "no" >&6; }
8035 fi 8099 fi
8036 8100
@@ -8041,7 +8105,7 @@ index 0cc6e8a50f..db8b998722 100755
8041 if test "x$ac_ct_AR" = x; then 8105 if test "x$ac_ct_AR" = x; then
8042 AR="false" 8106 AR="false"
8043 else 8107 else
8044@@ -6876,12 +7138,12 @@ ac_tool_warned=yes ;; 8108@@ -7177,12 +7439,11 @@ ac_tool_warned=yes ;;
8045 esac 8109 esac
8046 AR=$ac_ct_AR 8110 AR=$ac_ct_AR
8047 fi 8111 fi
@@ -8054,17 +8118,16 @@ index 0cc6e8a50f..db8b998722 100755
8054+: ${AR=ar} 8118+: ${AR=ar}
8055+: ${AR_FLAGS=cru} 8119+: ${AR_FLAGS=cru}
8056+ 8120+
8057+
8058 8121
8059 8122
8060 8123
8061@@ -6891,6 +7153,62 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru 8124@@ -7193,6 +7454,63 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru
8062 8125
8063 8126
8064 8127
8065+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 8128+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
8066+$as_echo_n "checking for archiver @FILE support... " >&6; } 8129+$as_echo_n "checking for archiver @FILE support... " >&6; }
8067+if test "${lt_cv_ar_at_file+set}" = set; then : 8130+if ${lt_cv_ar_at_file+:} false; then :
8068+ $as_echo_n "(cached) " >&6 8131+ $as_echo_n "(cached) " >&6
8069+else 8132+else
8070+ lt_cv_ar_at_file=no 8133+ lt_cv_ar_at_file=no
@@ -8118,10 +8181,11 @@ index 0cc6e8a50f..db8b998722 100755
8118+ 8181+
8119+ 8182+
8120+ 8183+
8121 8184+
8122 8185
8123 if test -n "$ac_tool_prefix"; then 8186 if test -n "$ac_tool_prefix"; then
8124@@ -7227,8 +7545,8 @@ esac 8187 # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
8188@@ -7528,8 +7846,8 @@ esac
8125 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" 8189 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
8126 8190
8127 # Transform an extracted symbol line into symbol name and symbol address 8191 # Transform an extracted symbol line into symbol name and symbol address
@@ -8132,7 +8196,7 @@ index 0cc6e8a50f..db8b998722 100755
8132 8196
8133 # Handle CRLF in mingw tool chain 8197 # Handle CRLF in mingw tool chain
8134 opt_cr= 8198 opt_cr=
8135@@ -7264,6 +7582,7 @@ for ac_symprfx in "" "_"; do 8199@@ -7565,6 +7883,7 @@ for ac_symprfx in "" "_"; do
8136 else 8200 else
8137 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" 8201 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
8138 fi 8202 fi
@@ -8140,7 +8204,7 @@ index 0cc6e8a50f..db8b998722 100755
8140 8204
8141 # Check to see that the pipe works correctly. 8205 # Check to see that the pipe works correctly.
8142 pipe_works=no 8206 pipe_works=no
8143@@ -7305,6 +7624,18 @@ _LT_EOF 8207@@ -7606,6 +7925,18 @@ _LT_EOF
8144 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then 8208 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
8145 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then 8209 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
8146 cat <<_LT_EOF > conftest.$ac_ext 8210 cat <<_LT_EOF > conftest.$ac_ext
@@ -8159,7 +8223,7 @@ index 0cc6e8a50f..db8b998722 100755
8159 #ifdef __cplusplus 8223 #ifdef __cplusplus
8160 extern "C" { 8224 extern "C" {
8161 #endif 8225 #endif
8162@@ -7316,7 +7647,7 @@ _LT_EOF 8226@@ -7617,7 +7948,7 @@ _LT_EOF
8163 cat <<_LT_EOF >> conftest.$ac_ext 8227 cat <<_LT_EOF >> conftest.$ac_ext
8164 8228
8165 /* The mapping between symbol names and symbols. */ 8229 /* The mapping between symbol names and symbols. */
@@ -8168,7 +8232,7 @@ index 0cc6e8a50f..db8b998722 100755
8168 const char *name; 8232 const char *name;
8169 void *address; 8233 void *address;
8170 } 8234 }
8171@@ -7342,8 +7673,8 @@ static const void *lt_preloaded_setup() { 8235@@ -7643,8 +7974,8 @@ static const void *lt_preloaded_setup()
8172 _LT_EOF 8236 _LT_EOF
8173 # Now try linking the two files. 8237 # Now try linking the two files.
8174 mv conftest.$ac_objext conftstm.$ac_objext 8238 mv conftest.$ac_objext conftstm.$ac_objext
@@ -8179,7 +8243,7 @@ index 0cc6e8a50f..db8b998722 100755
8179 LIBS="conftstm.$ac_objext" 8243 LIBS="conftstm.$ac_objext"
8180 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" 8244 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
8181 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 8245 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
8182@@ -7353,8 +7684,8 @@ _LT_EOF 8246@@ -7654,8 +7985,8 @@ _LT_EOF
8183 test $ac_status = 0; } && test -s conftest${ac_exeext}; then 8247 test $ac_status = 0; } && test -s conftest${ac_exeext}; then
8184 pipe_works=yes 8248 pipe_works=yes
8185 fi 8249 fi
@@ -8190,7 +8254,7 @@ index 0cc6e8a50f..db8b998722 100755
8190 else 8254 else
8191 echo "cannot find nm_test_func in $nlist" >&5 8255 echo "cannot find nm_test_func in $nlist" >&5
8192 fi 8256 fi
8193@@ -7391,6 +7722,19 @@ else 8257@@ -7692,6 +8023,13 @@ else
8194 $as_echo "ok" >&6; } 8258 $as_echo "ok" >&6; }
8195 fi 8259 fi
8196 8260
@@ -8201,16 +8265,10 @@ index 0cc6e8a50f..db8b998722 100755
8201+ nm_file_list_spec='@' 8265+ nm_file_list_spec='@'
8202+fi 8266+fi
8203+ 8267+
8204+
8205+
8206+
8207+
8208+
8209+
8210 8268
8211 8269
8212 8270
8213@@ -7404,6 +7748,42 @@ fi 8271@@ -7713,6 +8051,48 @@ fi
8214 8272
8215 8273
8216 8274
@@ -8218,6 +8276,7 @@ index 0cc6e8a50f..db8b998722 100755
8218+ 8276+
8219+ 8277+
8220+ 8278+
8279+
8221+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 8280+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
8222+$as_echo_n "checking for sysroot... " >&6; } 8281+$as_echo_n "checking for sysroot... " >&6; }
8223+ 8282+
@@ -8244,16 +8303,21 @@ index 0cc6e8a50f..db8b998722 100755
8244+ *) 8303+ *)
8245+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5 8304+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5
8246+$as_echo "${with_libtool_sysroot}" >&6; } 8305+$as_echo "${with_libtool_sysroot}" >&6; }
8247+ as_fn_error "The sysroot must be an absolute path." "$LINENO" 5 8306+ as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5
8248+ ;; 8307+ ;;
8249+esac 8308+esac
8250+ 8309+
8251+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 8310+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
8252+$as_echo "${lt_sysroot:-no}" >&6; } 8311+$as_echo "${lt_sysroot:-no}" >&6; }
8253 8312+
8254 8313+
8255 8314+
8256@@ -7618,6 +7998,123 @@ esac 8315+
8316+
8317 # Check whether --enable-libtool-lock was given.
8318 if test "${enable_libtool_lock+set}" = set; then :
8319 enableval=$enable_libtool_lock;
8320@@ -7919,6 +8299,123 @@ esac
8257 8321
8258 need_locks="$enable_libtool_lock" 8322 need_locks="$enable_libtool_lock"
8259 8323
@@ -8262,7 +8326,7 @@ index 0cc6e8a50f..db8b998722 100755
8262+set dummy ${ac_tool_prefix}mt; ac_word=$2 8326+set dummy ${ac_tool_prefix}mt; ac_word=$2
8263+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 8327+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
8264+$as_echo_n "checking for $ac_word... " >&6; } 8328+$as_echo_n "checking for $ac_word... " >&6; }
8265+if test "${ac_cv_prog_MANIFEST_TOOL+set}" = set; then : 8329+if ${ac_cv_prog_MANIFEST_TOOL+:} false; then :
8266+ $as_echo_n "(cached) " >&6 8330+ $as_echo_n "(cached) " >&6
8267+else 8331+else
8268+ if test -n "$MANIFEST_TOOL"; then 8332+ if test -n "$MANIFEST_TOOL"; then
@@ -8274,7 +8338,7 @@ index 0cc6e8a50f..db8b998722 100755
8274+ IFS=$as_save_IFS 8338+ IFS=$as_save_IFS
8275+ test -z "$as_dir" && as_dir=. 8339+ test -z "$as_dir" && as_dir=.
8276+ for ac_exec_ext in '' $ac_executable_extensions; do 8340+ for ac_exec_ext in '' $ac_executable_extensions; do
8277+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 8341+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
8278+ ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" 8342+ ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
8279+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 8343+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
8280+ break 2 8344+ break 2
@@ -8302,7 +8366,7 @@ index 0cc6e8a50f..db8b998722 100755
8302+set dummy mt; ac_word=$2 8366+set dummy mt; ac_word=$2
8303+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 8367+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
8304+$as_echo_n "checking for $ac_word... " >&6; } 8368+$as_echo_n "checking for $ac_word... " >&6; }
8305+if test "${ac_cv_prog_ac_ct_MANIFEST_TOOL+set}" = set; then : 8369+if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then :
8306+ $as_echo_n "(cached) " >&6 8370+ $as_echo_n "(cached) " >&6
8307+else 8371+else
8308+ if test -n "$ac_ct_MANIFEST_TOOL"; then 8372+ if test -n "$ac_ct_MANIFEST_TOOL"; then
@@ -8314,7 +8378,7 @@ index 0cc6e8a50f..db8b998722 100755
8314+ IFS=$as_save_IFS 8378+ IFS=$as_save_IFS
8315+ test -z "$as_dir" && as_dir=. 8379+ test -z "$as_dir" && as_dir=.
8316+ for ac_exec_ext in '' $ac_executable_extensions; do 8380+ for ac_exec_ext in '' $ac_executable_extensions; do
8317+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 8381+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
8318+ ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" 8382+ ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
8319+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 8383+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
8320+ break 2 8384+ break 2
@@ -8352,7 +8416,7 @@ index 0cc6e8a50f..db8b998722 100755
8352+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt 8416+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
8353+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5 8417+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5
8354+$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; } 8418+$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; }
8355+if test "${lt_cv_path_mainfest_tool+set}" = set; then : 8419+if ${lt_cv_path_mainfest_tool+:} false; then :
8356+ $as_echo_n "(cached) " >&6 8420+ $as_echo_n "(cached) " >&6
8357+else 8421+else
8358+ lt_cv_path_mainfest_tool=no 8422+ lt_cv_path_mainfest_tool=no
@@ -8377,7 +8441,7 @@ index 0cc6e8a50f..db8b998722 100755
8377 8441
8378 case $host_os in 8442 case $host_os in
8379 rhapsody* | darwin*) 8443 rhapsody* | darwin*)
8380@@ -8181,6 +8678,8 @@ _LT_EOF 8444@@ -8482,6 +8979,8 @@ _LT_EOF
8381 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 8445 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
8382 echo "$AR cru libconftest.a conftest.o" >&5 8446 echo "$AR cru libconftest.a conftest.o" >&5
8383 $AR cru libconftest.a conftest.o 2>&5 8447 $AR cru libconftest.a conftest.o 2>&5
@@ -8386,7 +8450,7 @@ index 0cc6e8a50f..db8b998722 100755
8386 cat > conftest.c << _LT_EOF 8450 cat > conftest.c << _LT_EOF
8387 int main() { return 0;} 8451 int main() { return 0;}
8388 _LT_EOF 8452 _LT_EOF
8389@@ -8249,6 +8748,16 @@ done 8453@@ -8550,6 +9049,16 @@ done
8390 8454
8391 8455
8392 8456
@@ -8403,7 +8467,7 @@ index 0cc6e8a50f..db8b998722 100755
8403 8467
8404 8468
8405 # Set options 8469 # Set options
8406@@ -8377,7 +8886,8 @@ fi 8470@@ -8678,7 +9187,8 @@ fi
8407 LIBTOOL_DEPS="$ltmain" 8471 LIBTOOL_DEPS="$ltmain"
8408 8472
8409 # Always use our own libtool. 8473 # Always use our own libtool.
@@ -8413,7 +8477,7 @@ index 0cc6e8a50f..db8b998722 100755
8413 8477
8414 8478
8415 8479
8416@@ -8466,7 +8976,7 @@ aix3*) 8480@@ -8767,7 +9277,7 @@ aix3*)
8417 esac 8481 esac
8418 8482
8419 # Global variables: 8483 # Global variables:
@@ -8422,7 +8486,7 @@ index 0cc6e8a50f..db8b998722 100755
8422 can_build_shared=yes 8486 can_build_shared=yes
8423 8487
8424 # All known linkers require a `.a' archive for static linking (except MSVC, 8488 # All known linkers require a `.a' archive for static linking (except MSVC,
8425@@ -8764,8 +9274,6 @@ fi 8489@@ -9065,8 +9575,6 @@ fi
8426 lt_prog_compiler_pic= 8490 lt_prog_compiler_pic=
8427 lt_prog_compiler_static= 8491 lt_prog_compiler_static=
8428 8492
@@ -8431,7 +8495,7 @@ index 0cc6e8a50f..db8b998722 100755
8431 8495
8432 if test "$GCC" = yes; then 8496 if test "$GCC" = yes; then
8433 lt_prog_compiler_wl='-Wl,' 8497 lt_prog_compiler_wl='-Wl,'
8434@@ -8931,6 +9439,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 8498@@ -9232,6 +9740,12 @@ $as_echo_n "checking for $compiler optio
8435 lt_prog_compiler_pic='--shared' 8499 lt_prog_compiler_pic='--shared'
8436 lt_prog_compiler_static='--static' 8500 lt_prog_compiler_static='--static'
8437 ;; 8501 ;;
@@ -8444,7 +8508,7 @@ index 0cc6e8a50f..db8b998722 100755
8444 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) 8508 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
8445 # Portland Group compilers (*not* the Pentium gcc compiler, 8509 # Portland Group compilers (*not* the Pentium gcc compiler,
8446 # which looks to be a dead project) 8510 # which looks to be a dead project)
8447@@ -8993,7 +9507,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 8511@@ -9294,7 +9808,7 @@ $as_echo_n "checking for $compiler optio
8448 lt_prog_compiler_pic='-KPIC' 8512 lt_prog_compiler_pic='-KPIC'
8449 lt_prog_compiler_static='-Bstatic' 8513 lt_prog_compiler_static='-Bstatic'
8450 case $cc_basename in 8514 case $cc_basename in
@@ -8453,7 +8517,7 @@ index 0cc6e8a50f..db8b998722 100755
8453 lt_prog_compiler_wl='-Qoption ld ';; 8517 lt_prog_compiler_wl='-Qoption ld ';;
8454 *) 8518 *)
8455 lt_prog_compiler_wl='-Wl,';; 8519 lt_prog_compiler_wl='-Wl,';;
8456@@ -9050,13 +9564,17 @@ case $host_os in 8520@@ -9351,13 +9865,17 @@ case $host_os in
8457 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" 8521 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
8458 ;; 8522 ;;
8459 esac 8523 esac
@@ -8466,7 +8530,7 @@ index 0cc6e8a50f..db8b998722 100755
8466 8530
8467+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 8531+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
8468+$as_echo_n "checking for $compiler option to produce PIC... " >&6; } 8532+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
8469+if test "${lt_cv_prog_compiler_pic+set}" = set; then : 8533+if ${lt_cv_prog_compiler_pic+:} false; then :
8470+ $as_echo_n "(cached) " >&6 8534+ $as_echo_n "(cached) " >&6
8471+else 8535+else
8472+ lt_cv_prog_compiler_pic=$lt_prog_compiler_pic 8536+ lt_cv_prog_compiler_pic=$lt_prog_compiler_pic
@@ -8477,7 +8541,7 @@ index 0cc6e8a50f..db8b998722 100755
8477 8541
8478 # 8542 #
8479 # Check to make sure the PIC flag actually works. 8543 # Check to make sure the PIC flag actually works.
8480@@ -9117,6 +9635,11 @@ fi 8544@@ -9418,6 +9936,11 @@ fi
8481 8545
8482 8546
8483 8547
@@ -8489,7 +8553,7 @@ index 0cc6e8a50f..db8b998722 100755
8489 # 8553 #
8490 # Check to make sure the static flag actually works. 8554 # Check to make sure the static flag actually works.
8491 # 8555 #
8492@@ -9467,7 +9990,8 @@ _LT_EOF 8556@@ -9768,7 +10291,8 @@ _LT_EOF
8493 allow_undefined_flag=unsupported 8557 allow_undefined_flag=unsupported
8494 always_export_symbols=no 8558 always_export_symbols=no
8495 enable_shared_with_static_runtimes=yes 8559 enable_shared_with_static_runtimes=yes
@@ -8499,7 +8563,7 @@ index 0cc6e8a50f..db8b998722 100755
8499 8563
8500 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then 8564 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
8501 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' 8565 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
8502@@ -9566,12 +10090,12 @@ _LT_EOF 8566@@ -9867,12 +10391,12 @@ _LT_EOF
8503 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' 8567 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
8504 hardcode_libdir_flag_spec= 8568 hardcode_libdir_flag_spec=
8505 hardcode_libdir_flag_spec_ld='-rpath $libdir' 8569 hardcode_libdir_flag_spec_ld='-rpath $libdir'
@@ -8514,7 +8578,7 @@ index 0cc6e8a50f..db8b998722 100755
8514 fi 8578 fi
8515 ;; 8579 ;;
8516 esac 8580 esac
8517@@ -9585,8 +10109,8 @@ _LT_EOF 8581@@ -9886,8 +10410,8 @@ _LT_EOF
8518 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' 8582 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
8519 wlarc= 8583 wlarc=
8520 else 8584 else
@@ -8525,7 +8589,7 @@ index 0cc6e8a50f..db8b998722 100755
8525 fi 8589 fi
8526 ;; 8590 ;;
8527 8591
8528@@ -9604,8 +10128,8 @@ _LT_EOF 8592@@ -9905,8 +10429,8 @@ _LT_EOF
8529 8593
8530 _LT_EOF 8594 _LT_EOF
8531 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 8595 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -8536,7 +8600,7 @@ index 0cc6e8a50f..db8b998722 100755
8536 else 8600 else
8537 ld_shlibs=no 8601 ld_shlibs=no
8538 fi 8602 fi
8539@@ -9651,8 +10175,8 @@ _LT_EOF 8603@@ -9952,8 +10476,8 @@ _LT_EOF
8540 8604
8541 *) 8605 *)
8542 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 8606 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -8547,7 +8611,7 @@ index 0cc6e8a50f..db8b998722 100755
8547 else 8611 else
8548 ld_shlibs=no 8612 ld_shlibs=no
8549 fi 8613 fi
8550@@ -9782,7 +10306,13 @@ _LT_EOF 8614@@ -10083,7 +10607,13 @@ _LT_EOF
8551 allow_undefined_flag='-berok' 8615 allow_undefined_flag='-berok'
8552 # Determine the default libpath from the value encoded in an 8616 # Determine the default libpath from the value encoded in an
8553 # empty executable. 8617 # empty executable.
@@ -8555,14 +8619,14 @@ index 0cc6e8a50f..db8b998722 100755
8555+ if test "${lt_cv_aix_libpath+set}" = set; then 8619+ if test "${lt_cv_aix_libpath+set}" = set; then
8556+ aix_libpath=$lt_cv_aix_libpath 8620+ aix_libpath=$lt_cv_aix_libpath
8557+else 8621+else
8558+ if test "${lt_cv_aix_libpath_+set}" = set; then : 8622+ if ${lt_cv_aix_libpath_+:} false; then :
8559+ $as_echo_n "(cached) " >&6 8623+ $as_echo_n "(cached) " >&6
8560+else 8624+else
8561+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext 8625+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
8562 /* end confdefs.h. */ 8626 /* end confdefs.h. */
8563 8627
8564 int 8628 int
8565@@ -9795,22 +10325,29 @@ main () 8629@@ -10096,22 +10626,29 @@ main ()
8566 _ACEOF 8630 _ACEOF
8567 if ac_fn_c_try_link "$LINENO"; then : 8631 if ac_fn_c_try_link "$LINENO"; then :
8568 8632
@@ -8605,7 +8669,7 @@ index 0cc6e8a50f..db8b998722 100755
8605 8669
8606 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 8670 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
8607 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" 8671 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"
8608@@ -9822,7 +10359,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 8672@@ -10123,7 +10660,13 @@ if test -z "$aix_libpath"; then aix_libp
8609 else 8673 else
8610 # Determine the default libpath from the value encoded in an 8674 # Determine the default libpath from the value encoded in an
8611 # empty executable. 8675 # empty executable.
@@ -8613,14 +8677,14 @@ index 0cc6e8a50f..db8b998722 100755
8613+ if test "${lt_cv_aix_libpath+set}" = set; then 8677+ if test "${lt_cv_aix_libpath+set}" = set; then
8614+ aix_libpath=$lt_cv_aix_libpath 8678+ aix_libpath=$lt_cv_aix_libpath
8615+else 8679+else
8616+ if test "${lt_cv_aix_libpath_+set}" = set; then : 8680+ if ${lt_cv_aix_libpath_+:} false; then :
8617+ $as_echo_n "(cached) " >&6 8681+ $as_echo_n "(cached) " >&6
8618+else 8682+else
8619+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext 8683+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
8620 /* end confdefs.h. */ 8684 /* end confdefs.h. */
8621 8685
8622 int 8686 int
8623@@ -9835,22 +10378,29 @@ main () 8687@@ -10136,22 +10679,29 @@ main ()
8624 _ACEOF 8688 _ACEOF
8625 if ac_fn_c_try_link "$LINENO"; then : 8689 if ac_fn_c_try_link "$LINENO"; then :
8626 8690
@@ -8663,11 +8727,10 @@ index 0cc6e8a50f..db8b998722 100755
8663 8727
8664 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 8728 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
8665 # Warning - without using the other run time loading flags, 8729 # Warning - without using the other run time loading flags,
8666@@ -9894,21 +10444,64 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 8730@@ -10196,20 +10746,63 @@ if test -z "$aix_libpath"; then aix_libp
8667 # When not using gcc, we currently assume that we are using
8668 # Microsoft Visual C++. 8731 # Microsoft Visual C++.
8669 # hardcode_libdir_flag_spec is actually meaningless, as there is 8732 # hardcode_libdir_flag_spec is actually meaningless, as there is
8670- # no search path for DLLs. 8733 # no search path for DLLs.
8671- hardcode_libdir_flag_spec=' ' 8734- hardcode_libdir_flag_spec=' '
8672- allow_undefined_flag=unsupported 8735- allow_undefined_flag=unsupported
8673- # Tell ltmain to make .lib files, not .a files. 8736- # Tell ltmain to make .lib files, not .a files.
@@ -8682,7 +8745,6 @@ index 0cc6e8a50f..db8b998722 100755
8682- old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' 8745- old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
8683- fix_srcfile_path='`cygpath -w "$srcfile"`' 8746- fix_srcfile_path='`cygpath -w "$srcfile"`'
8684- enable_shared_with_static_runtimes=yes 8747- enable_shared_with_static_runtimes=yes
8685+ # no search path for DLLs.
8686+ case $cc_basename in 8748+ case $cc_basename in
8687+ cl*) 8749+ cl*)
8688+ # Native MSVC 8750+ # Native MSVC
@@ -8743,7 +8805,7 @@ index 0cc6e8a50f..db8b998722 100755
8743 ;; 8805 ;;
8744 8806
8745 darwin* | rhapsody*) 8807 darwin* | rhapsody*)
8746@@ -9969,7 +10562,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 8808@@ -10270,7 +10863,7 @@ if test -z "$aix_libpath"; then aix_libp
8747 8809
8748 # FreeBSD 3 and greater uses gcc -shared to do shared libraries. 8810 # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
8749 freebsd* | dragonfly*) 8811 freebsd* | dragonfly*)
@@ -8752,7 +8814,7 @@ index 0cc6e8a50f..db8b998722 100755
8752 hardcode_libdir_flag_spec='-R$libdir' 8814 hardcode_libdir_flag_spec='-R$libdir'
8753 hardcode_direct=yes 8815 hardcode_direct=yes
8754 hardcode_shlibpath_var=no 8816 hardcode_shlibpath_var=no
8755@@ -9977,7 +10570,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 8817@@ -10278,7 +10871,7 @@ if test -z "$aix_libpath"; then aix_libp
8756 8818
8757 hpux9*) 8819 hpux9*)
8758 if test "$GCC" = yes; then 8820 if test "$GCC" = yes; then
@@ -8761,7 +8823,7 @@ index 0cc6e8a50f..db8b998722 100755
8761 else 8823 else
8762 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' 8824 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'
8763 fi 8825 fi
8764@@ -9993,7 +10586,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 8826@@ -10294,7 +10887,7 @@ if test -z "$aix_libpath"; then aix_libp
8765 8827
8766 hpux10*) 8828 hpux10*)
8767 if test "$GCC" = yes && test "$with_gnu_ld" = no; then 8829 if test "$GCC" = yes && test "$with_gnu_ld" = no; then
@@ -8770,7 +8832,7 @@ index 0cc6e8a50f..db8b998722 100755
8770 else 8832 else
8771 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' 8833 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
8772 fi 8834 fi
8773@@ -10017,10 +10610,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 8835@@ -10318,10 +10911,10 @@ if test -z "$aix_libpath"; then aix_libp
8774 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' 8836 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
8775 ;; 8837 ;;
8776 ia64*) 8838 ia64*)
@@ -8783,7 +8845,7 @@ index 0cc6e8a50f..db8b998722 100755
8783 ;; 8845 ;;
8784 esac 8846 esac
8785 else 8847 else
8786@@ -10099,23 +10692,36 @@ fi 8848@@ -10400,23 +10993,36 @@ fi
8787 8849
8788 irix5* | irix6* | nonstopux*) 8850 irix5* | irix6* | nonstopux*)
8789 if test "$GCC" = yes; then 8851 if test "$GCC" = yes; then
@@ -8798,7 +8860,7 @@ index 0cc6e8a50f..db8b998722 100755
8798+ # This should be the same for all languages, so no per-tag cache variable. 8860+ # This should be the same for all languages, so no per-tag cache variable.
8799+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5 8861+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5
8800+$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; } 8862+$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; }
8801+if test "${lt_cv_irix_exported_symbol+set}" = set; then : 8863+if ${lt_cv_irix_exported_symbol+:} false; then :
8802+ $as_echo_n "(cached) " >&6 8864+ $as_echo_n "(cached) " >&6
8803+else 8865+else
8804+ save_LDFLAGS="$LDFLAGS" 8866+ save_LDFLAGS="$LDFLAGS"
@@ -8828,7 +8890,7 @@ index 0cc6e8a50f..db8b998722 100755
8828 else 8890 else
8829 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' 8891 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'
8830 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' 8892 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'
8831@@ -10200,7 +10806,7 @@ rm -f core conftest.err conftest.$ac_objext \ 8893@@ -10501,7 +11107,7 @@ rm -f core conftest.err conftest.$ac_obj
8832 osf4* | osf5*) # as osf3* with the addition of -msym flag 8894 osf4* | osf5*) # as osf3* with the addition of -msym flag
8833 if test "$GCC" = yes; then 8895 if test "$GCC" = yes; then
8834 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' 8896 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
@@ -8837,7 +8899,7 @@ index 0cc6e8a50f..db8b998722 100755
8837 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' 8899 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
8838 else 8900 else
8839 allow_undefined_flag=' -expect_unresolved \*' 8901 allow_undefined_flag=' -expect_unresolved \*'
8840@@ -10219,9 +10825,9 @@ rm -f core conftest.err conftest.$ac_objext \ 8902@@ -10520,9 +11126,9 @@ rm -f core conftest.err conftest.$ac_obj
8841 no_undefined_flag=' -z defs' 8903 no_undefined_flag=' -z defs'
8842 if test "$GCC" = yes; then 8904 if test "$GCC" = yes; then
8843 wlarc='${wl}' 8905 wlarc='${wl}'
@@ -8849,7 +8911,7 @@ index 0cc6e8a50f..db8b998722 100755
8849 else 8911 else
8850 case `$CC -V 2>&1` in 8912 case `$CC -V 2>&1` in
8851 *"Compilers 5.0"*) 8913 *"Compilers 5.0"*)
8852@@ -10797,8 +11403,9 @@ cygwin* | mingw* | pw32* | cegcc*) 8914@@ -11098,8 +11704,9 @@ cygwin* | mingw* | pw32* | cegcc*)
8853 need_version=no 8915 need_version=no
8854 need_lib_prefix=no 8916 need_lib_prefix=no
8855 8917
@@ -8861,7 +8923,7 @@ index 0cc6e8a50f..db8b998722 100755
8861 library_names_spec='$libname.dll.a' 8923 library_names_spec='$libname.dll.a'
8862 # DLL is installed to $(libdir)/../bin by postinstall_cmds 8924 # DLL is installed to $(libdir)/../bin by postinstall_cmds
8863 postinstall_cmds='base_file=`basename \${file}`~ 8925 postinstall_cmds='base_file=`basename \${file}`~
8864@@ -10831,13 +11438,71 @@ cygwin* | mingw* | pw32* | cegcc*) 8926@@ -11132,13 +11739,71 @@ cygwin* | mingw* | pw32* | cegcc*)
8865 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' 8927 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
8866 ;; 8928 ;;
8867 esac 8929 esac
@@ -8934,7 +8996,7 @@ index 0cc6e8a50f..db8b998722 100755
8934 # FIXME: first we should search . and the directory the executable is in 8996 # FIXME: first we should search . and the directory the executable is in
8935 shlibpath_var=PATH 8997 shlibpath_var=PATH
8936 ;; 8998 ;;
8937@@ -10929,7 +11594,7 @@ haiku*) 8999@@ -11230,7 +11895,7 @@ haiku*)
8938 soname_spec='${libname}${release}${shared_ext}$major' 9000 soname_spec='${libname}${release}${shared_ext}$major'
8939 shlibpath_var=LIBRARY_PATH 9001 shlibpath_var=LIBRARY_PATH
8940 shlibpath_overrides_runpath=yes 9002 shlibpath_overrides_runpath=yes
@@ -8943,7 +9005,16 @@ index 0cc6e8a50f..db8b998722 100755
8943 hardcode_into_libs=yes 9005 hardcode_into_libs=yes
8944 ;; 9006 ;;
8945 9007
8946@@ -11769,10 +12434,10 @@ else 9008@@ -12026,7 +12691,7 @@ else
9009 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
9010 lt_status=$lt_dlunknown
9011 cat > conftest.$ac_ext <<_LT_EOF
9012-#line 12029 "configure"
9013+#line $LINENO "configure"
9014 #include "confdefs.h"
9015
9016 #if HAVE_DLFCN_H
9017@@ -12070,10 +12735,10 @@ else
8947 /* When -fvisbility=hidden is used, assume the code has been annotated 9018 /* When -fvisbility=hidden is used, assume the code has been annotated
8948 correspondingly for the symbols needed. */ 9019 correspondingly for the symbols needed. */
8949 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 9020 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
@@ -8956,7 +9027,16 @@ index 0cc6e8a50f..db8b998722 100755
8956 int main () 9027 int main ()
8957 { 9028 {
8958 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 9029 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
8959@@ -11875,10 +12540,10 @@ else 9030@@ -12132,7 +12797,7 @@ else
9031 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
9032 lt_status=$lt_dlunknown
9033 cat > conftest.$ac_ext <<_LT_EOF
9034-#line 12135 "configure"
9035+#line $LINENO "configure"
9036 #include "confdefs.h"
9037
9038 #if HAVE_DLFCN_H
9039@@ -12176,10 +12841,10 @@ else
8960 /* When -fvisbility=hidden is used, assume the code has been annotated 9040 /* When -fvisbility=hidden is used, assume the code has been annotated
8961 correspondingly for the symbols needed. */ 9041 correspondingly for the symbols needed. */
8962 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 9042 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
@@ -8969,7 +9049,7 @@ index 0cc6e8a50f..db8b998722 100755
8969 int main () 9049 int main ()
8970 { 9050 {
8971 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 9051 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
8972@@ -12270,6 +12935,7 @@ $RM -r conftest* 9052@@ -12571,6 +13236,7 @@ $RM -r conftest*
8973 9053
8974 # Allow CC to be a program name with arguments. 9054 # Allow CC to be a program name with arguments.
8975 lt_save_CC=$CC 9055 lt_save_CC=$CC
@@ -8977,7 +9057,7 @@ index 0cc6e8a50f..db8b998722 100755
8977 lt_save_LD=$LD 9057 lt_save_LD=$LD
8978 lt_save_GCC=$GCC 9058 lt_save_GCC=$GCC
8979 GCC=$GXX 9059 GCC=$GXX
8980@@ -12287,6 +12953,7 @@ $RM -r conftest* 9060@@ -12588,6 +13254,7 @@ $RM -r conftest*
8981 fi 9061 fi
8982 test -z "${LDCXX+set}" || LD=$LDCXX 9062 test -z "${LDCXX+set}" || LD=$LDCXX
8983 CC=${CXX-"c++"} 9063 CC=${CXX-"c++"}
@@ -8985,7 +9065,7 @@ index 0cc6e8a50f..db8b998722 100755
8985 compiler=$CC 9065 compiler=$CC
8986 compiler_CXX=$CC 9066 compiler_CXX=$CC
8987 for cc_temp in $compiler""; do 9067 for cc_temp in $compiler""; do
8988@@ -12569,7 +13236,13 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie 9068@@ -12870,7 +13537,13 @@ $as_echo_n "checking whether the $compil
8989 allow_undefined_flag_CXX='-berok' 9069 allow_undefined_flag_CXX='-berok'
8990 # Determine the default libpath from the value encoded in an empty 9070 # Determine the default libpath from the value encoded in an empty
8991 # executable. 9071 # executable.
@@ -8993,14 +9073,14 @@ index 0cc6e8a50f..db8b998722 100755
8993+ if test "${lt_cv_aix_libpath+set}" = set; then 9073+ if test "${lt_cv_aix_libpath+set}" = set; then
8994+ aix_libpath=$lt_cv_aix_libpath 9074+ aix_libpath=$lt_cv_aix_libpath
8995+else 9075+else
8996+ if test "${lt_cv_aix_libpath__CXX+set}" = set; then : 9076+ if ${lt_cv_aix_libpath__CXX+:} false; then :
8997+ $as_echo_n "(cached) " >&6 9077+ $as_echo_n "(cached) " >&6
8998+else 9078+else
8999+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext 9079+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
9000 /* end confdefs.h. */ 9080 /* end confdefs.h. */
9001 9081
9002 int 9082 int
9003@@ -12582,22 +13255,29 @@ main () 9083@@ -12883,22 +13556,29 @@ main ()
9004 _ACEOF 9084 _ACEOF
9005 if ac_fn_cxx_try_link "$LINENO"; then : 9085 if ac_fn_cxx_try_link "$LINENO"; then :
9006 9086
@@ -9043,7 +9123,7 @@ index 0cc6e8a50f..db8b998722 100755
9043 9123
9044 hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" 9124 hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
9045 9125
9046@@ -12610,7 +13290,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 9126@@ -12911,7 +13591,13 @@ if test -z "$aix_libpath"; then aix_libp
9047 else 9127 else
9048 # Determine the default libpath from the value encoded in an 9128 # Determine the default libpath from the value encoded in an
9049 # empty executable. 9129 # empty executable.
@@ -9051,14 +9131,14 @@ index 0cc6e8a50f..db8b998722 100755
9051+ if test "${lt_cv_aix_libpath+set}" = set; then 9131+ if test "${lt_cv_aix_libpath+set}" = set; then
9052+ aix_libpath=$lt_cv_aix_libpath 9132+ aix_libpath=$lt_cv_aix_libpath
9053+else 9133+else
9054+ if test "${lt_cv_aix_libpath__CXX+set}" = set; then : 9134+ if ${lt_cv_aix_libpath__CXX+:} false; then :
9055+ $as_echo_n "(cached) " >&6 9135+ $as_echo_n "(cached) " >&6
9056+else 9136+else
9057+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext 9137+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
9058 /* end confdefs.h. */ 9138 /* end confdefs.h. */
9059 9139
9060 int 9140 int
9061@@ -12623,22 +13309,29 @@ main () 9141@@ -12924,22 +13610,29 @@ main ()
9062 _ACEOF 9142 _ACEOF
9063 if ac_fn_cxx_try_link "$LINENO"; then : 9143 if ac_fn_cxx_try_link "$LINENO"; then :
9064 9144
@@ -9101,7 +9181,7 @@ index 0cc6e8a50f..db8b998722 100755
9101 9181
9102 hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" 9182 hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
9103 # Warning - without using the other run time loading flags, 9183 # Warning - without using the other run time loading flags,
9104@@ -12681,29 +13374,75 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 9184@@ -12982,29 +13675,75 @@ if test -z "$aix_libpath"; then aix_libp
9105 ;; 9185 ;;
9106 9186
9107 cygwin* | mingw* | pw32* | cegcc*) 9187 cygwin* | mingw* | pw32* | cegcc*)
@@ -9200,7 +9280,7 @@ index 0cc6e8a50f..db8b998722 100755
9200 darwin* | rhapsody*) 9280 darwin* | rhapsody*)
9201 9281
9202 9282
9203@@ -12809,7 +13548,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 9283@@ -13110,7 +13849,7 @@ if test -z "$aix_libpath"; then aix_libp
9204 ;; 9284 ;;
9205 *) 9285 *)
9206 if test "$GXX" = yes; then 9286 if test "$GXX" = yes; then
@@ -9209,7 +9289,7 @@ index 0cc6e8a50f..db8b998722 100755
9209 else 9289 else
9210 # FIXME: insert proper C++ library support 9290 # FIXME: insert proper C++ library support
9211 ld_shlibs_CXX=no 9291 ld_shlibs_CXX=no
9212@@ -12880,10 +13619,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 9292@@ -13181,10 +13920,10 @@ if test -z "$aix_libpath"; then aix_libp
9213 archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' 9293 archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
9214 ;; 9294 ;;
9215 ia64*) 9295 ia64*)
@@ -9222,7 +9302,7 @@ index 0cc6e8a50f..db8b998722 100755
9222 ;; 9302 ;;
9223 esac 9303 esac
9224 fi 9304 fi
9225@@ -12924,9 +13663,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 9305@@ -13225,9 +13964,9 @@ if test -z "$aix_libpath"; then aix_libp
9226 *) 9306 *)
9227 if test "$GXX" = yes; then 9307 if test "$GXX" = yes; then
9228 if test "$with_gnu_ld" = no; then 9308 if test "$with_gnu_ld" = no; then
@@ -9234,7 +9314,7 @@ index 0cc6e8a50f..db8b998722 100755
9234 fi 9314 fi
9235 fi 9315 fi
9236 link_all_deplibs_CXX=yes 9316 link_all_deplibs_CXX=yes
9237@@ -12996,20 +13735,20 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 9317@@ -13297,20 +14036,20 @@ if test -z "$aix_libpath"; then aix_libp
9238 prelink_cmds_CXX='tpldir=Template.dir~ 9318 prelink_cmds_CXX='tpldir=Template.dir~
9239 rm -rf $tpldir~ 9319 rm -rf $tpldir~
9240 $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ 9320 $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
@@ -9259,7 +9339,7 @@ index 0cc6e8a50f..db8b998722 100755
9259 ;; 9339 ;;
9260 *) # Version 6 and above use weak symbols 9340 *) # Version 6 and above use weak symbols
9261 archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' 9341 archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
9262@@ -13204,7 +13943,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 9342@@ -13505,7 +14244,7 @@ if test -z "$aix_libpath"; then aix_libp
9263 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' 9343 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'
9264 ;; 9344 ;;
9265 *) 9345 *)
@@ -9268,7 +9348,7 @@ index 0cc6e8a50f..db8b998722 100755
9268 ;; 9348 ;;
9269 esac 9349 esac
9270 9350
9271@@ -13250,7 +13989,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 9351@@ -13551,7 +14290,7 @@ if test -z "$aix_libpath"; then aix_libp
9272 9352
9273 solaris*) 9353 solaris*)
9274 case $cc_basename in 9354 case $cc_basename in
@@ -9277,7 +9357,7 @@ index 0cc6e8a50f..db8b998722 100755
9277 # Sun C++ 4.2, 5.x and Centerline C++ 9357 # Sun C++ 4.2, 5.x and Centerline C++
9278 archive_cmds_need_lc_CXX=yes 9358 archive_cmds_need_lc_CXX=yes
9279 no_undefined_flag_CXX=' -zdefs' 9359 no_undefined_flag_CXX=' -zdefs'
9280@@ -13291,9 +14030,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 9360@@ -13592,9 +14331,9 @@ if test -z "$aix_libpath"; then aix_libp
9281 if test "$GXX" = yes && test "$with_gnu_ld" = no; then 9361 if test "$GXX" = yes && test "$with_gnu_ld" = no; then
9282 no_undefined_flag_CXX=' ${wl}-z ${wl}defs' 9362 no_undefined_flag_CXX=' ${wl}-z ${wl}defs'
9283 if $CC --version | $GREP -v '^2\.7' > /dev/null; then 9363 if $CC --version | $GREP -v '^2\.7' > /dev/null; then
@@ -9289,7 +9369,7 @@ index 0cc6e8a50f..db8b998722 100755
9289 9369
9290 # Commands to make compiler produce verbose output that lists 9370 # Commands to make compiler produce verbose output that lists
9291 # what "hidden" libraries, object files and flags are used when 9371 # what "hidden" libraries, object files and flags are used when
9292@@ -13428,6 +14167,13 @@ private: 9372@@ -13729,6 +14468,13 @@ private:
9293 }; 9373 };
9294 _LT_EOF 9374 _LT_EOF
9295 9375
@@ -9303,7 +9383,7 @@ index 0cc6e8a50f..db8b998722 100755
9303 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 9383 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
9304 (eval $ac_compile) 2>&5 9384 (eval $ac_compile) 2>&5
9305 ac_status=$? 9385 ac_status=$?
9306@@ -13441,7 +14187,7 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 9386@@ -13742,7 +14488,7 @@ if { { eval echo "\"\$as_me\":${as_linen
9307 pre_test_object_deps_done=no 9387 pre_test_object_deps_done=no
9308 9388
9309 for p in `eval "$output_verbose_link_cmd"`; do 9389 for p in `eval "$output_verbose_link_cmd"`; do
@@ -9312,7 +9392,7 @@ index 0cc6e8a50f..db8b998722 100755
9312 9392
9313 -L* | -R* | -l*) 9393 -L* | -R* | -l*)
9314 # Some compilers place space between "-{L,R}" and the path. 9394 # Some compilers place space between "-{L,R}" and the path.
9315@@ -13450,13 +14196,22 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 9395@@ -13751,13 +14497,22 @@ if { { eval echo "\"\$as_me\":${as_linen
9316 test $p = "-R"; then 9396 test $p = "-R"; then
9317 prev=$p 9397 prev=$p
9318 continue 9398 continue
@@ -9339,7 +9419,7 @@ index 0cc6e8a50f..db8b998722 100755
9339 # Internal compiler library paths should come after those 9419 # Internal compiler library paths should come after those
9340 # provided the user. The postdeps already come after the 9420 # provided the user. The postdeps already come after the
9341 # user supplied libs so there is no need to process them. 9421 # user supplied libs so there is no need to process them.
9342@@ -13476,8 +14231,10 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 9422@@ -13777,8 +14532,10 @@ if { { eval echo "\"\$as_me\":${as_linen
9343 postdeps_CXX="${postdeps_CXX} ${prev}${p}" 9423 postdeps_CXX="${postdeps_CXX} ${prev}${p}"
9344 fi 9424 fi
9345 fi 9425 fi
@@ -9350,7 +9430,7 @@ index 0cc6e8a50f..db8b998722 100755
9350 *.$objext) 9430 *.$objext)
9351 # This assumes that the test object file only shows up 9431 # This assumes that the test object file only shows up
9352 # once in the compiler output. 9432 # once in the compiler output.
9353@@ -13513,6 +14270,7 @@ else 9433@@ -13814,6 +14571,7 @@ else
9354 fi 9434 fi
9355 9435
9356 $RM -f confest.$objext 9436 $RM -f confest.$objext
@@ -9358,7 +9438,7 @@ index 0cc6e8a50f..db8b998722 100755
9358 9438
9359 # PORTME: override above test on systems where it is broken 9439 # PORTME: override above test on systems where it is broken
9360 case $host_os in 9440 case $host_os in
9361@@ -13548,7 +14306,7 @@ linux*) 9441@@ -13849,7 +14607,7 @@ linux*)
9362 9442
9363 solaris*) 9443 solaris*)
9364 case $cc_basename in 9444 case $cc_basename in
@@ -9367,7 +9447,7 @@ index 0cc6e8a50f..db8b998722 100755
9367 # The more standards-conforming stlport4 library is 9447 # The more standards-conforming stlport4 library is
9368 # incompatible with the Cstd library. Avoid specifying 9448 # incompatible with the Cstd library. Avoid specifying
9369 # it if it's in CXXFLAGS. Ignore libCrun as 9449 # it if it's in CXXFLAGS. Ignore libCrun as
9370@@ -13613,8 +14371,6 @@ fi 9450@@ -13914,8 +14672,6 @@ fi
9371 lt_prog_compiler_pic_CXX= 9451 lt_prog_compiler_pic_CXX=
9372 lt_prog_compiler_static_CXX= 9452 lt_prog_compiler_static_CXX=
9373 9453
@@ -9376,7 +9456,7 @@ index 0cc6e8a50f..db8b998722 100755
9376 9456
9377 # C++ specific cases for pic, static, wl, etc. 9457 # C++ specific cases for pic, static, wl, etc.
9378 if test "$GXX" = yes; then 9458 if test "$GXX" = yes; then
9379@@ -13719,6 +14475,11 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 9459@@ -14020,6 +14776,11 @@ $as_echo_n "checking for $compiler optio
9380 ;; 9460 ;;
9381 esac 9461 esac
9382 ;; 9462 ;;
@@ -9388,7 +9468,7 @@ index 0cc6e8a50f..db8b998722 100755
9388 dgux*) 9468 dgux*)
9389 case $cc_basename in 9469 case $cc_basename in
9390 ec++*) 9470 ec++*)
9391@@ -13871,7 +14632,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 9471@@ -14172,7 +14933,7 @@ $as_echo_n "checking for $compiler optio
9392 ;; 9472 ;;
9393 solaris*) 9473 solaris*)
9394 case $cc_basename in 9474 case $cc_basename in
@@ -9397,7 +9477,7 @@ index 0cc6e8a50f..db8b998722 100755
9397 # Sun C++ 4.2, 5.x and Centerline C++ 9477 # Sun C++ 4.2, 5.x and Centerline C++
9398 lt_prog_compiler_pic_CXX='-KPIC' 9478 lt_prog_compiler_pic_CXX='-KPIC'
9399 lt_prog_compiler_static_CXX='-Bstatic' 9479 lt_prog_compiler_static_CXX='-Bstatic'
9400@@ -13936,10 +14697,17 @@ case $host_os in 9480@@ -14237,10 +14998,17 @@ case $host_os in
9401 lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC" 9481 lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC"
9402 ;; 9482 ;;
9403 esac 9483 esac
@@ -9407,7 +9487,7 @@ index 0cc6e8a50f..db8b998722 100755
9407 9487
9408+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 9488+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
9409+$as_echo_n "checking for $compiler option to produce PIC... " >&6; } 9489+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
9410+if test "${lt_cv_prog_compiler_pic_CXX+set}" = set; then : 9490+if ${lt_cv_prog_compiler_pic_CXX+:} false; then :
9411+ $as_echo_n "(cached) " >&6 9491+ $as_echo_n "(cached) " >&6
9412+else 9492+else
9413+ lt_cv_prog_compiler_pic_CXX=$lt_prog_compiler_pic_CXX 9493+ lt_cv_prog_compiler_pic_CXX=$lt_prog_compiler_pic_CXX
@@ -9418,7 +9498,7 @@ index 0cc6e8a50f..db8b998722 100755
9418 9498
9419 # 9499 #
9420 # Check to make sure the PIC flag actually works. 9500 # Check to make sure the PIC flag actually works.
9421@@ -13997,6 +14765,8 @@ fi 9501@@ -14298,6 +15066,8 @@ fi
9422 9502
9423 9503
9424 9504
@@ -9427,7 +9507,7 @@ index 0cc6e8a50f..db8b998722 100755
9427 # 9507 #
9428 # Check to make sure the static flag actually works. 9508 # Check to make sure the static flag actually works.
9429 # 9509 #
9430@@ -14174,6 +14944,7 @@ fi 9510@@ -14475,6 +15245,7 @@ fi
9431 $as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } 9511 $as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
9432 9512
9433 export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' 9513 export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
@@ -9435,7 +9515,7 @@ index 0cc6e8a50f..db8b998722 100755
9435 case $host_os in 9515 case $host_os in
9436 aix[4-9]*) 9516 aix[4-9]*)
9437 # If we're using GNU nm, then we don't want the "-C" option. 9517 # If we're using GNU nm, then we don't want the "-C" option.
9438@@ -14188,15 +14959,20 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie 9518@@ -14489,15 +15260,20 @@ $as_echo_n "checking whether the $compil
9439 ;; 9519 ;;
9440 pw32*) 9520 pw32*)
9441 export_symbols_cmds_CXX="$ltdll_cmds" 9521 export_symbols_cmds_CXX="$ltdll_cmds"
@@ -9461,7 +9541,7 @@ index 0cc6e8a50f..db8b998722 100755
9461 9541
9462 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5 9542 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5
9463 $as_echo "$ld_shlibs_CXX" >&6; } 9543 $as_echo "$ld_shlibs_CXX" >&6; }
9464@@ -14459,8 +15235,9 @@ cygwin* | mingw* | pw32* | cegcc*) 9544@@ -14760,8 +15536,9 @@ cygwin* | mingw* | pw32* | cegcc*)
9465 need_version=no 9545 need_version=no
9466 need_lib_prefix=no 9546 need_lib_prefix=no
9467 9547
@@ -9473,7 +9553,7 @@ index 0cc6e8a50f..db8b998722 100755
9473 library_names_spec='$libname.dll.a' 9553 library_names_spec='$libname.dll.a'
9474 # DLL is installed to $(libdir)/../bin by postinstall_cmds 9554 # DLL is installed to $(libdir)/../bin by postinstall_cmds
9475 postinstall_cmds='base_file=`basename \${file}`~ 9555 postinstall_cmds='base_file=`basename \${file}`~
9476@@ -14492,13 +15269,71 @@ cygwin* | mingw* | pw32* | cegcc*) 9556@@ -14793,13 +15570,71 @@ cygwin* | mingw* | pw32* | cegcc*)
9477 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' 9557 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
9478 ;; 9558 ;;
9479 esac 9559 esac
@@ -9546,7 +9626,7 @@ index 0cc6e8a50f..db8b998722 100755
9546 # FIXME: first we should search . and the directory the executable is in 9626 # FIXME: first we should search . and the directory the executable is in
9547 shlibpath_var=PATH 9627 shlibpath_var=PATH
9548 ;; 9628 ;;
9549@@ -14589,7 +15424,7 @@ haiku*) 9629@@ -14890,7 +15725,7 @@ haiku*)
9550 soname_spec='${libname}${release}${shared_ext}$major' 9630 soname_spec='${libname}${release}${shared_ext}$major'
9551 shlibpath_var=LIBRARY_PATH 9631 shlibpath_var=LIBRARY_PATH
9552 shlibpath_overrides_runpath=yes 9632 shlibpath_overrides_runpath=yes
@@ -9555,7 +9635,7 @@ index 0cc6e8a50f..db8b998722 100755
9555 hardcode_into_libs=yes 9635 hardcode_into_libs=yes
9556 ;; 9636 ;;
9557 9637
9558@@ -15048,6 +15883,7 @@ fi 9638@@ -15349,6 +16184,7 @@ fi
9559 fi # test -n "$compiler" 9639 fi # test -n "$compiler"
9560 9640
9561 CC=$lt_save_CC 9641 CC=$lt_save_CC
@@ -9563,7 +9643,7 @@ index 0cc6e8a50f..db8b998722 100755
9563 LDCXX=$LD 9643 LDCXX=$LD
9564 LD=$lt_save_LD 9644 LD=$lt_save_LD
9565 GCC=$lt_save_GCC 9645 GCC=$lt_save_GCC
9566@@ -18083,13 +18919,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' 9646@@ -18444,13 +19280,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_
9567 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' 9647 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
9568 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' 9648 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
9569 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' 9649 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
@@ -9584,7 +9664,7 @@ index 0cc6e8a50f..db8b998722 100755
9584 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' 9664 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
9585 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' 9665 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
9586 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' 9666 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
9587@@ -18104,14 +18947,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de 9667@@ -18465,14 +19308,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$l
9588 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' 9668 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
9589 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' 9669 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
9590 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"`' 9670 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"`'
@@ -9603,7 +9683,7 @@ index 0cc6e8a50f..db8b998722 100755
9603 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' 9683 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
9604 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' 9684 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
9605 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' 9685 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
9606@@ -18144,12 +18990,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q 9686@@ -18505,12 +19351,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcod
9607 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' 9687 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
9608 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' 9688 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
9609 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' 9689 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
@@ -9617,7 +9697,7 @@ index 0cc6e8a50f..db8b998722 100755
9617 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' 9697 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
9618 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' 9698 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
9619 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' 9699 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
9620@@ -18188,8 +19034,8 @@ old_archive_cmds_CXX='`$ECHO "$old_archive_cmds_CXX" | $SED "$delay_single_quote 9700@@ -18549,8 +19395,8 @@ old_archive_cmds_CXX='`$ECHO "$old_archi
9621 compiler_CXX='`$ECHO "$compiler_CXX" | $SED "$delay_single_quote_subst"`' 9701 compiler_CXX='`$ECHO "$compiler_CXX" | $SED "$delay_single_quote_subst"`'
9622 GCC_CXX='`$ECHO "$GCC_CXX" | $SED "$delay_single_quote_subst"`' 9702 GCC_CXX='`$ECHO "$GCC_CXX" | $SED "$delay_single_quote_subst"`'
9623 lt_prog_compiler_no_builtin_flag_CXX='`$ECHO "$lt_prog_compiler_no_builtin_flag_CXX" | $SED "$delay_single_quote_subst"`' 9703 lt_prog_compiler_no_builtin_flag_CXX='`$ECHO "$lt_prog_compiler_no_builtin_flag_CXX" | $SED "$delay_single_quote_subst"`'
@@ -9627,7 +9707,7 @@ index 0cc6e8a50f..db8b998722 100755
9627 lt_prog_compiler_static_CXX='`$ECHO "$lt_prog_compiler_static_CXX" | $SED "$delay_single_quote_subst"`' 9707 lt_prog_compiler_static_CXX='`$ECHO "$lt_prog_compiler_static_CXX" | $SED "$delay_single_quote_subst"`'
9628 lt_cv_prog_compiler_c_o_CXX='`$ECHO "$lt_cv_prog_compiler_c_o_CXX" | $SED "$delay_single_quote_subst"`' 9708 lt_cv_prog_compiler_c_o_CXX='`$ECHO "$lt_cv_prog_compiler_c_o_CXX" | $SED "$delay_single_quote_subst"`'
9629 archive_cmds_need_lc_CXX='`$ECHO "$archive_cmds_need_lc_CXX" | $SED "$delay_single_quote_subst"`' 9709 archive_cmds_need_lc_CXX='`$ECHO "$archive_cmds_need_lc_CXX" | $SED "$delay_single_quote_subst"`'
9630@@ -18216,12 +19062,12 @@ hardcode_shlibpath_var_CXX='`$ECHO "$hardcode_shlibpath_var_CXX" | $SED "$delay_ 9710@@ -18577,12 +19423,12 @@ hardcode_shlibpath_var_CXX='`$ECHO "$har
9631 hardcode_automatic_CXX='`$ECHO "$hardcode_automatic_CXX" | $SED "$delay_single_quote_subst"`' 9711 hardcode_automatic_CXX='`$ECHO "$hardcode_automatic_CXX" | $SED "$delay_single_quote_subst"`'
9632 inherit_rpath_CXX='`$ECHO "$inherit_rpath_CXX" | $SED "$delay_single_quote_subst"`' 9712 inherit_rpath_CXX='`$ECHO "$inherit_rpath_CXX" | $SED "$delay_single_quote_subst"`'
9633 link_all_deplibs_CXX='`$ECHO "$link_all_deplibs_CXX" | $SED "$delay_single_quote_subst"`' 9713 link_all_deplibs_CXX='`$ECHO "$link_all_deplibs_CXX" | $SED "$delay_single_quote_subst"`'
@@ -9641,7 +9721,7 @@ index 0cc6e8a50f..db8b998722 100755
9641 file_list_spec_CXX='`$ECHO "$file_list_spec_CXX" | $SED "$delay_single_quote_subst"`' 9721 file_list_spec_CXX='`$ECHO "$file_list_spec_CXX" | $SED "$delay_single_quote_subst"`'
9642 hardcode_action_CXX='`$ECHO "$hardcode_action_CXX" | $SED "$delay_single_quote_subst"`' 9722 hardcode_action_CXX='`$ECHO "$hardcode_action_CXX" | $SED "$delay_single_quote_subst"`'
9643 compiler_lib_search_dirs_CXX='`$ECHO "$compiler_lib_search_dirs_CXX" | $SED "$delay_single_quote_subst"`' 9723 compiler_lib_search_dirs_CXX='`$ECHO "$compiler_lib_search_dirs_CXX" | $SED "$delay_single_quote_subst"`'
9644@@ -18259,8 +19105,13 @@ reload_flag \ 9724@@ -18620,8 +19466,13 @@ reload_flag \
9645 OBJDUMP \ 9725 OBJDUMP \
9646 deplibs_check_method \ 9726 deplibs_check_method \
9647 file_magic_cmd \ 9727 file_magic_cmd \
@@ -9655,7 +9735,7 @@ index 0cc6e8a50f..db8b998722 100755
9655 STRIP \ 9735 STRIP \
9656 RANLIB \ 9736 RANLIB \
9657 CC \ 9737 CC \
9658@@ -18270,12 +19121,14 @@ lt_cv_sys_global_symbol_pipe \ 9738@@ -18631,12 +19482,14 @@ lt_cv_sys_global_symbol_pipe \
9659 lt_cv_sys_global_symbol_to_cdecl \ 9739 lt_cv_sys_global_symbol_to_cdecl \
9660 lt_cv_sys_global_symbol_to_c_name_address \ 9740 lt_cv_sys_global_symbol_to_c_name_address \
9661 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ 9741 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
@@ -9671,7 +9751,7 @@ index 0cc6e8a50f..db8b998722 100755
9671 DSYMUTIL \ 9751 DSYMUTIL \
9672 NMEDIT \ 9752 NMEDIT \
9673 LIPO \ 9753 LIPO \
9674@@ -18291,7 +19144,6 @@ no_undefined_flag \ 9754@@ -18652,7 +19505,6 @@ no_undefined_flag \
9675 hardcode_libdir_flag_spec \ 9755 hardcode_libdir_flag_spec \
9676 hardcode_libdir_flag_spec_ld \ 9756 hardcode_libdir_flag_spec_ld \
9677 hardcode_libdir_separator \ 9757 hardcode_libdir_separator \
@@ -9679,7 +9759,7 @@ index 0cc6e8a50f..db8b998722 100755
9679 exclude_expsyms \ 9759 exclude_expsyms \
9680 include_expsyms \ 9760 include_expsyms \
9681 file_list_spec \ 9761 file_list_spec \
9682@@ -18313,8 +19165,8 @@ LD_CXX \ 9762@@ -18674,8 +19526,8 @@ LD_CXX \
9683 reload_flag_CXX \ 9763 reload_flag_CXX \
9684 compiler_CXX \ 9764 compiler_CXX \
9685 lt_prog_compiler_no_builtin_flag_CXX \ 9765 lt_prog_compiler_no_builtin_flag_CXX \
@@ -9689,7 +9769,7 @@ index 0cc6e8a50f..db8b998722 100755
9689 lt_prog_compiler_static_CXX \ 9769 lt_prog_compiler_static_CXX \
9690 lt_cv_prog_compiler_c_o_CXX \ 9770 lt_cv_prog_compiler_c_o_CXX \
9691 export_dynamic_flag_spec_CXX \ 9771 export_dynamic_flag_spec_CXX \
9692@@ -18326,7 +19178,6 @@ no_undefined_flag_CXX \ 9772@@ -18687,7 +19539,6 @@ no_undefined_flag_CXX \
9693 hardcode_libdir_flag_spec_CXX \ 9773 hardcode_libdir_flag_spec_CXX \
9694 hardcode_libdir_flag_spec_ld_CXX \ 9774 hardcode_libdir_flag_spec_ld_CXX \
9695 hardcode_libdir_separator_CXX \ 9775 hardcode_libdir_separator_CXX \
@@ -9697,7 +9777,7 @@ index 0cc6e8a50f..db8b998722 100755
9697 exclude_expsyms_CXX \ 9777 exclude_expsyms_CXX \
9698 include_expsyms_CXX \ 9778 include_expsyms_CXX \
9699 file_list_spec_CXX \ 9779 file_list_spec_CXX \
9700@@ -18360,6 +19211,7 @@ module_cmds \ 9780@@ -18721,6 +19572,7 @@ module_cmds \
9701 module_expsym_cmds \ 9781 module_expsym_cmds \
9702 export_symbols_cmds \ 9782 export_symbols_cmds \
9703 prelink_cmds \ 9783 prelink_cmds \
@@ -9705,7 +9785,7 @@ index 0cc6e8a50f..db8b998722 100755
9705 postinstall_cmds \ 9785 postinstall_cmds \
9706 postuninstall_cmds \ 9786 postuninstall_cmds \
9707 finish_cmds \ 9787 finish_cmds \
9708@@ -18374,7 +19226,8 @@ archive_expsym_cmds_CXX \ 9788@@ -18735,7 +19587,8 @@ archive_expsym_cmds_CXX \
9709 module_cmds_CXX \ 9789 module_cmds_CXX \
9710 module_expsym_cmds_CXX \ 9790 module_expsym_cmds_CXX \
9711 export_symbols_cmds_CXX \ 9791 export_symbols_cmds_CXX \
@@ -9715,7 +9795,7 @@ index 0cc6e8a50f..db8b998722 100755
9715 case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in 9795 case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
9716 *[\\\\\\\`\\"\\\$]*) 9796 *[\\\\\\\`\\"\\\$]*)
9717 eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" 9797 eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
9718@@ -19167,7 +20020,8 @@ $as_echo X"$file" | 9798@@ -19539,7 +20392,8 @@ $as_echo X"$file" |
9719 # NOTE: Changes made to this file will be lost: look at ltmain.sh. 9799 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
9720 # 9800 #
9721 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 9801 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
@@ -9725,7 +9805,7 @@ index 0cc6e8a50f..db8b998722 100755
9725 # Written by Gordon Matzigkeit, 1996 9805 # Written by Gordon Matzigkeit, 1996
9726 # 9806 #
9727 # This file is part of GNU Libtool. 9807 # This file is part of GNU Libtool.
9728@@ -19270,19 +20124,42 @@ SP2NL=$lt_lt_SP2NL 9808@@ -19642,19 +20496,42 @@ SP2NL=$lt_lt_SP2NL
9729 # turn newlines into spaces. 9809 # turn newlines into spaces.
9730 NL2SP=$lt_lt_NL2SP 9810 NL2SP=$lt_lt_NL2SP
9731 9811
@@ -9769,7 +9849,7 @@ index 0cc6e8a50f..db8b998722 100755
9769 # A symbol stripping program. 9849 # A symbol stripping program.
9770 STRIP=$lt_STRIP 9850 STRIP=$lt_STRIP
9771 9851
9772@@ -19312,6 +20189,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address 9852@@ -19684,6 +20561,12 @@ global_symbol_to_c_name_address=$lt_lt_c
9773 # Transform the output of nm in a C name address pair when lib prefix is needed. 9853 # Transform the output of nm in a C name address pair when lib prefix is needed.
9774 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix 9854 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
9775 9855
@@ -9782,7 +9862,7 @@ index 0cc6e8a50f..db8b998722 100755
9782 # The name of the directory that contains temporary libtool files. 9862 # The name of the directory that contains temporary libtool files.
9783 objdir=$objdir 9863 objdir=$objdir
9784 9864
9785@@ -19321,6 +20204,9 @@ MAGIC_CMD=$MAGIC_CMD 9865@@ -19693,6 +20576,9 @@ MAGIC_CMD=$MAGIC_CMD
9786 # Must we lock files when doing compilation? 9866 # Must we lock files when doing compilation?
9787 need_locks=$lt_need_locks 9867 need_locks=$lt_need_locks
9788 9868
@@ -9792,7 +9872,7 @@ index 0cc6e8a50f..db8b998722 100755
9792 # Tool to manipulate archived DWARF debug symbol files on Mac OS X. 9872 # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
9793 DSYMUTIL=$lt_DSYMUTIL 9873 DSYMUTIL=$lt_DSYMUTIL
9794 9874
9795@@ -19435,12 +20321,12 @@ with_gcc=$GCC 9875@@ -19807,12 +20693,12 @@ with_gcc=$GCC
9796 # Compiler flag to turn off builtin functions. 9876 # Compiler flag to turn off builtin functions.
9797 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag 9877 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
9798 9878
@@ -9808,7 +9888,7 @@ index 0cc6e8a50f..db8b998722 100755
9808 # Compiler flag to prevent dynamic linking. 9888 # Compiler flag to prevent dynamic linking.
9809 link_static_flag=$lt_lt_prog_compiler_static 9889 link_static_flag=$lt_lt_prog_compiler_static
9810 9890
9811@@ -19527,9 +20413,6 @@ inherit_rpath=$inherit_rpath 9891@@ -19899,9 +20785,6 @@ inherit_rpath=$inherit_rpath
9812 # Whether libtool must link a program against all its dependency libraries. 9892 # Whether libtool must link a program against all its dependency libraries.
9813 link_all_deplibs=$link_all_deplibs 9893 link_all_deplibs=$link_all_deplibs
9814 9894
@@ -9818,7 +9898,7 @@ index 0cc6e8a50f..db8b998722 100755
9818 # Set to "yes" if exported symbols are required. 9898 # Set to "yes" if exported symbols are required.
9819 always_export_symbols=$always_export_symbols 9899 always_export_symbols=$always_export_symbols
9820 9900
9821@@ -19545,6 +20428,9 @@ include_expsyms=$lt_include_expsyms 9901@@ -19917,6 +20800,9 @@ include_expsyms=$lt_include_expsyms
9822 # Commands necessary for linking programs (against libraries) with templates. 9902 # Commands necessary for linking programs (against libraries) with templates.
9823 prelink_cmds=$lt_prelink_cmds 9903 prelink_cmds=$lt_prelink_cmds
9824 9904
@@ -9828,7 +9908,7 @@ index 0cc6e8a50f..db8b998722 100755
9828 # Specify filename containing input files. 9908 # Specify filename containing input files.
9829 file_list_spec=$lt_file_list_spec 9909 file_list_spec=$lt_file_list_spec
9830 9910
9831@@ -19591,210 +20477,169 @@ ltmain="$ac_aux_dir/ltmain.sh" 9911@@ -19963,210 +20849,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
9832 # if finds mixed CR/LF and LF-only lines. Since sed operates in 9912 # if finds mixed CR/LF and LF-only lines. Since sed operates in
9833 # text mode, it properly converts lines to CR/LF. This bash problem 9913 # text mode, it properly converts lines to CR/LF. This bash problem
9834 # is reportedly fixed, but why not run on old versions too? 9914 # is reportedly fixed, but why not run on old versions too?
@@ -10030,15 +10110,9 @@ index 0cc6e8a50f..db8b998722 100755
10030-_LT_EOF 10110-_LT_EOF
10031- ;; 10111- ;;
10032- esac 10112- esac
10033-
10034-
10035- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
10036- || (rm -f "$cfgfile"; exit 1)
10037-
10038- mv -f "$cfgfile" "$ofile" ||
10039+ sed '$q' "$ltmain" >> "$cfgfile" \ 10113+ sed '$q' "$ltmain" >> "$cfgfile" \
10040+ || (rm -f "$cfgfile"; exit 1) 10114+ || (rm -f "$cfgfile"; exit 1)
10041+ 10115
10042+ if test x"$xsi_shell" = xyes; then 10116+ if test x"$xsi_shell" = xyes; then
10043+ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ 10117+ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\
10044+func_dirname ()\ 10118+func_dirname ()\
@@ -10196,13 +10270,16 @@ index 0cc6e8a50f..db8b998722 100755
10196+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 10270+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5
10197+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} 10271+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;}
10198+fi 10272+fi
10199+ 10273
10200+ 10274- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
10275- || (rm -f "$cfgfile"; exit 1)
10276
10277- mv -f "$cfgfile" "$ofile" ||
10201+ mv -f "$cfgfile" "$ofile" || 10278+ mv -f "$cfgfile" "$ofile" ||
10202 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") 10279 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
10203 chmod +x "$ofile" 10280 chmod +x "$ofile"
10204 10281
10205@@ -19822,12 +20667,12 @@ with_gcc=$GCC_CXX 10282@@ -20194,12 +21039,12 @@ with_gcc=$GCC_CXX
10206 # Compiler flag to turn off builtin functions. 10283 # Compiler flag to turn off builtin functions.
10207 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX 10284 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX
10208 10285
@@ -10218,7 +10295,7 @@ index 0cc6e8a50f..db8b998722 100755
10218 # Compiler flag to prevent dynamic linking. 10295 # Compiler flag to prevent dynamic linking.
10219 link_static_flag=$lt_lt_prog_compiler_static_CXX 10296 link_static_flag=$lt_lt_prog_compiler_static_CXX
10220 10297
10221@@ -19914,9 +20759,6 @@ inherit_rpath=$inherit_rpath_CXX 10298@@ -20286,9 +21131,6 @@ inherit_rpath=$inherit_rpath_CXX
10222 # Whether libtool must link a program against all its dependency libraries. 10299 # Whether libtool must link a program against all its dependency libraries.
10223 link_all_deplibs=$link_all_deplibs_CXX 10300 link_all_deplibs=$link_all_deplibs_CXX
10224 10301
@@ -10228,7 +10305,7 @@ index 0cc6e8a50f..db8b998722 100755
10228 # Set to "yes" if exported symbols are required. 10305 # Set to "yes" if exported symbols are required.
10229 always_export_symbols=$always_export_symbols_CXX 10306 always_export_symbols=$always_export_symbols_CXX
10230 10307
10231@@ -19932,6 +20774,9 @@ include_expsyms=$lt_include_expsyms_CXX 10308@@ -20304,6 +21146,9 @@ include_expsyms=$lt_include_expsyms_CXX
10232 # Commands necessary for linking programs (against libraries) with templates. 10309 # Commands necessary for linking programs (against libraries) with templates.
10233 prelink_cmds=$lt_prelink_cmds_CXX 10310 prelink_cmds=$lt_prelink_cmds_CXX
10234 10311
@@ -10238,10 +10315,10 @@ index 0cc6e8a50f..db8b998722 100755
10238 # Specify filename containing input files. 10315 # Specify filename containing input files.
10239 file_list_spec=$lt_file_list_spec_CXX 10316 file_list_spec=$lt_file_list_spec_CXX
10240 10317
10241diff --git a/libtool.m4 b/libtool.m4 10318Index: git/libtool.m4
10242index 24d13f3440..e45fdc6998 100644 10319===================================================================
10243--- a/libtool.m4 10320--- git.orig/libtool.m4
10244+++ b/libtool.m4 10321+++ git/libtool.m4
10245@@ -1,7 +1,8 @@ 10322@@ -1,7 +1,8 @@
10246 # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- 10323 # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
10247 # 10324 #
@@ -10281,7 +10358,7 @@ index 24d13f3440..e45fdc6998 100644
10281 AC_SUBST(LIBTOOL)dnl 10358 AC_SUBST(LIBTOOL)dnl
10282 10359
10283 _LT_SETUP 10360 _LT_SETUP
10284@@ -166,10 +169,13 @@ _LT_DECL([], [exeext], [0], [Executable file suffix (normally "")])dnl 10361@@ -166,10 +169,13 @@ _LT_DECL([], [exeext], [0], [Executable
10285 dnl 10362 dnl
10286 m4_require([_LT_FILEUTILS_DEFAULTS])dnl 10363 m4_require([_LT_FILEUTILS_DEFAULTS])dnl
10287 m4_require([_LT_CHECK_SHELL_FEATURES])dnl 10364 m4_require([_LT_CHECK_SHELL_FEATURES])dnl
@@ -10304,7 +10381,7 @@ index 24d13f3440..e45fdc6998 100644
10304 can_build_shared=yes 10381 can_build_shared=yes
10305 10382
10306 # All known linkers require a `.a' archive for static linking (except MSVC, 10383 # All known linkers require a `.a' archive for static linking (except MSVC,
10307@@ -632,7 +638,7 @@ m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])config.lt[]dnl 10384@@ -632,7 +638,7 @@ m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_
10308 m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION]) 10385 m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION])
10309 configured by $[0], generated by m4_PACKAGE_STRING. 10386 configured by $[0], generated by m4_PACKAGE_STRING.
10310 10387
@@ -10360,7 +10437,7 @@ index 24d13f3440..e45fdc6998 100644
10360+# Allow to override them for all tags through lt_cv_aix_libpath. 10437+# Allow to override them for all tags through lt_cv_aix_libpath.
10361 m4_defun([_LT_SYS_MODULE_PATH_AIX], 10438 m4_defun([_LT_SYS_MODULE_PATH_AIX],
10362 [m4_require([_LT_DECL_SED])dnl 10439 [m4_require([_LT_DECL_SED])dnl
10363-AC_LINK_IFELSE(AC_LANG_PROGRAM,[ 10440-AC_LINK_IFELSE([AC_LANG_SOURCE([AC_LANG_PROGRAM])],[
10364-lt_aix_libpath_sed=' 10441-lt_aix_libpath_sed='
10365- /Import File Strings/,/^$/ { 10442- /Import File Strings/,/^$/ {
10366- /^0/ { 10443- /^0/ {
@@ -10409,7 +10486,7 @@ index 24d13f3440..e45fdc6998 100644
10409 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then 10486 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
10410 ECHO='print -r --' 10487 ECHO='print -r --'
10411 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then 10488 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
10412@@ -1161,6 +1177,39 @@ _LT_DECL([], [ECHO], [1], [An echo program that protects backslashes]) 10489@@ -1161,6 +1177,39 @@ _LT_DECL([], [ECHO], [1], [An echo progr
10413 ])# _LT_PROG_ECHO_BACKSLASH 10490 ])# _LT_PROG_ECHO_BACKSLASH
10414 10491
10415 10492
@@ -10662,7 +10739,7 @@ index 24d13f3440..e45fdc6998 100644
10662 file_magic_cmd=$lt_cv_file_magic_cmd 10739 file_magic_cmd=$lt_cv_file_magic_cmd
10663 deplibs_check_method=$lt_cv_deplibs_check_method 10740 deplibs_check_method=$lt_cv_deplibs_check_method
10664 test -z "$deplibs_check_method" && deplibs_check_method=unknown 10741 test -z "$deplibs_check_method" && deplibs_check_method=unknown
10665@@ -3174,7 +3336,11 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown 10742@@ -3174,7 +3336,11 @@ test -z "$deplibs_check_method" && depli
10666 _LT_DECL([], [deplibs_check_method], [1], 10743 _LT_DECL([], [deplibs_check_method], [1],
10667 [Method to check whether dependent libraries are shared objects]) 10744 [Method to check whether dependent libraries are shared objects])
10668 _LT_DECL([], [file_magic_cmd], [1], 10745 _LT_DECL([], [file_magic_cmd], [1],
@@ -10790,7 +10867,7 @@ index 24d13f3440..e45fdc6998 100644
10790 const char *name; 10867 const char *name;
10791 void *address; 10868 void *address;
10792 } 10869 }
10793@@ -3510,15 +3750,15 @@ static const void *lt_preloaded_setup() { 10870@@ -3510,15 +3750,15 @@ static const void *lt_preloaded_setup()
10794 _LT_EOF 10871 _LT_EOF
10795 # Now try linking the two files. 10872 # Now try linking the two files.
10796 mv conftest.$ac_objext conftstm.$ac_objext 10873 mv conftest.$ac_objext conftstm.$ac_objext
@@ -10824,7 +10901,7 @@ index 24d13f3440..e45fdc6998 100644
10824 _LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1], 10901 _LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1],
10825 [Take the output of nm and produce a listing of raw symbols and C names]) 10902 [Take the output of nm and produce a listing of raw symbols and C names])
10826 _LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1], 10903 _LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1],
10827@@ -3561,6 +3808,8 @@ _LT_DECL([global_symbol_to_c_name_address], 10904@@ -3561,6 +3808,8 @@ _LT_DECL([global_symbol_to_c_name_addres
10828 _LT_DECL([global_symbol_to_c_name_address_lib_prefix], 10905 _LT_DECL([global_symbol_to_c_name_address_lib_prefix],
10829 [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1], 10906 [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1],
10830 [Transform the output of nm in a C name address pair when lib prefix is needed]) 10907 [Transform the output of nm in a C name address pair when lib prefix is needed])
@@ -10909,7 +10986,7 @@ index 24d13f3440..e45fdc6998 100644
10909 # 10986 #
10910 # Check to make sure the static flag actually works. 10987 # Check to make sure the static flag actually works.
10911 # 10988 #
10912@@ -4213,6 +4477,7 @@ _LT_TAGDECL([link_static_flag], [lt_prog_compiler_static], [1], 10989@@ -4213,6 +4477,7 @@ _LT_TAGDECL([link_static_flag], [lt_prog
10913 m4_defun([_LT_LINKER_SHLIBS], 10990 m4_defun([_LT_LINKER_SHLIBS],
10914 [AC_REQUIRE([LT_PATH_LD])dnl 10991 [AC_REQUIRE([LT_PATH_LD])dnl
10915 AC_REQUIRE([LT_PATH_NM])dnl 10992 AC_REQUIRE([LT_PATH_NM])dnl
@@ -11156,7 +11233,7 @@ index 24d13f3440..e45fdc6998 100644
11156 # implicitly export all symbols. 11233 # implicitly export all symbols.
11157- save_LDFLAGS="$LDFLAGS" 11234- save_LDFLAGS="$LDFLAGS"
11158- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" 11235- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
11159- AC_LINK_IFELSE(int foo(void) {}, 11236- AC_LINK_IFELSE([AC_LANG_SOURCE([int foo(void) {}])],
11160- _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' 11237- _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'
11161- ) 11238- )
11162- LDFLAGS="$save_LDFLAGS" 11239- LDFLAGS="$save_LDFLAGS"
@@ -11231,7 +11308,7 @@ index 24d13f3440..e45fdc6998 100644
11231 if test -n "$CXX" && ( test "X$CXX" != "Xno" && 11308 if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
11232 ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || 11309 ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
11233 (test "X$CXX" != "Xg++"))) ; then 11310 (test "X$CXX" != "Xg++"))) ; then
11234@@ -5487,6 +5818,7 @@ if test "$_lt_caught_CXX_error" != yes; then 11311@@ -5487,6 +5818,7 @@ if test "$_lt_caught_CXX_error" != yes;
11235 11312
11236 # Allow CC to be a program name with arguments. 11313 # Allow CC to be a program name with arguments.
11237 lt_save_CC=$CC 11314 lt_save_CC=$CC
@@ -11239,7 +11316,7 @@ index 24d13f3440..e45fdc6998 100644
11239 lt_save_LD=$LD 11316 lt_save_LD=$LD
11240 lt_save_GCC=$GCC 11317 lt_save_GCC=$GCC
11241 GCC=$GXX 11318 GCC=$GXX
11242@@ -5504,6 +5836,7 @@ if test "$_lt_caught_CXX_error" != yes; then 11319@@ -5504,6 +5836,7 @@ if test "$_lt_caught_CXX_error" != yes;
11243 fi 11320 fi
11244 test -z "${LDCXX+set}" || LD=$LDCXX 11321 test -z "${LDCXX+set}" || LD=$LDCXX
11245 CC=${CXX-"c++"} 11322 CC=${CXX-"c++"}
@@ -11247,7 +11324,7 @@ index 24d13f3440..e45fdc6998 100644
11247 compiler=$CC 11324 compiler=$CC
11248 _LT_TAGVAR(compiler, $1)=$CC 11325 _LT_TAGVAR(compiler, $1)=$CC
11249 _LT_CC_BASENAME([$compiler]) 11326 _LT_CC_BASENAME([$compiler])
11250@@ -5667,7 +6000,7 @@ if test "$_lt_caught_CXX_error" != yes; then 11327@@ -5667,7 +6000,7 @@ if test "$_lt_caught_CXX_error" != yes;
11251 _LT_TAGVAR(allow_undefined_flag, $1)='-berok' 11328 _LT_TAGVAR(allow_undefined_flag, $1)='-berok'
11252 # Determine the default libpath from the value encoded in an empty 11329 # Determine the default libpath from the value encoded in an empty
11253 # executable. 11330 # executable.
@@ -11256,7 +11333,7 @@ index 24d13f3440..e45fdc6998 100644
11256 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" 11333 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
11257 11334
11258 _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" 11335 _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"
11259@@ -5679,7 +6012,7 @@ if test "$_lt_caught_CXX_error" != yes; then 11336@@ -5679,7 +6012,7 @@ if test "$_lt_caught_CXX_error" != yes;
11260 else 11337 else
11261 # Determine the default libpath from the value encoded in an 11338 # Determine the default libpath from the value encoded in an
11262 # empty executable. 11339 # empty executable.
@@ -11265,7 +11342,7 @@ index 24d13f3440..e45fdc6998 100644
11265 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" 11342 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
11266 # Warning - without using the other run time loading flags, 11343 # Warning - without using the other run time loading flags,
11267 # -berok will link without error, but may produce a broken library. 11344 # -berok will link without error, but may produce a broken library.
11268@@ -5721,29 +6054,75 @@ if test "$_lt_caught_CXX_error" != yes; then 11345@@ -5721,29 +6054,75 @@ if test "$_lt_caught_CXX_error" != yes;
11269 ;; 11346 ;;
11270 11347
11271 cygwin* | mingw* | pw32* | cegcc*) 11348 cygwin* | mingw* | pw32* | cegcc*)
@@ -11364,7 +11441,7 @@ index 24d13f3440..e45fdc6998 100644
11364 darwin* | rhapsody*) 11441 darwin* | rhapsody*)
11365 _LT_DARWIN_LINKER_FEATURES($1) 11442 _LT_DARWIN_LINKER_FEATURES($1)
11366 ;; 11443 ;;
11367@@ -5818,7 +6197,7 @@ if test "$_lt_caught_CXX_error" != yes; then 11444@@ -5818,7 +6197,7 @@ if test "$_lt_caught_CXX_error" != yes;
11368 ;; 11445 ;;
11369 *) 11446 *)
11370 if test "$GXX" = yes; then 11447 if test "$GXX" = yes; then
@@ -11373,7 +11450,7 @@ index 24d13f3440..e45fdc6998 100644
11373 else 11450 else
11374 # FIXME: insert proper C++ library support 11451 # FIXME: insert proper C++ library support
11375 _LT_TAGVAR(ld_shlibs, $1)=no 11452 _LT_TAGVAR(ld_shlibs, $1)=no
11376@@ -5889,10 +6268,10 @@ if test "$_lt_caught_CXX_error" != yes; then 11453@@ -5889,10 +6268,10 @@ if test "$_lt_caught_CXX_error" != yes;
11377 _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' 11454 _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
11378 ;; 11455 ;;
11379 ia64*) 11456 ia64*)
@@ -11386,7 +11463,7 @@ index 24d13f3440..e45fdc6998 100644
11386 ;; 11463 ;;
11387 esac 11464 esac
11388 fi 11465 fi
11389@@ -5933,9 +6312,9 @@ if test "$_lt_caught_CXX_error" != yes; then 11466@@ -5933,9 +6312,9 @@ if test "$_lt_caught_CXX_error" != yes;
11390 *) 11467 *)
11391 if test "$GXX" = yes; then 11468 if test "$GXX" = yes; then
11392 if test "$with_gnu_ld" = no; then 11469 if test "$with_gnu_ld" = no; then
@@ -11398,7 +11475,7 @@ index 24d13f3440..e45fdc6998 100644
11398 fi 11475 fi
11399 fi 11476 fi
11400 _LT_TAGVAR(link_all_deplibs, $1)=yes 11477 _LT_TAGVAR(link_all_deplibs, $1)=yes
11401@@ -6005,20 +6384,20 @@ if test "$_lt_caught_CXX_error" != yes; then 11478@@ -6005,20 +6384,20 @@ if test "$_lt_caught_CXX_error" != yes;
11402 _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~ 11479 _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~
11403 rm -rf $tpldir~ 11480 rm -rf $tpldir~
11404 $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ 11481 $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
@@ -11423,7 +11500,7 @@ index 24d13f3440..e45fdc6998 100644
11423 ;; 11500 ;;
11424 *) # Version 6 and above use weak symbols 11501 *) # Version 6 and above use weak symbols
11425 _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' 11502 _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
11426@@ -6213,7 +6592,7 @@ if test "$_lt_caught_CXX_error" != yes; then 11503@@ -6213,7 +6592,7 @@ if test "$_lt_caught_CXX_error" != yes;
11427 _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' 11504 _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'
11428 ;; 11505 ;;
11429 *) 11506 *)
@@ -11432,7 +11509,7 @@ index 24d13f3440..e45fdc6998 100644
11432 ;; 11509 ;;
11433 esac 11510 esac
11434 11511
11435@@ -6259,7 +6638,7 @@ if test "$_lt_caught_CXX_error" != yes; then 11512@@ -6259,7 +6638,7 @@ if test "$_lt_caught_CXX_error" != yes;
11436 11513
11437 solaris*) 11514 solaris*)
11438 case $cc_basename in 11515 case $cc_basename in
@@ -11441,7 +11518,7 @@ index 24d13f3440..e45fdc6998 100644
11441 # Sun C++ 4.2, 5.x and Centerline C++ 11518 # Sun C++ 4.2, 5.x and Centerline C++
11442 _LT_TAGVAR(archive_cmds_need_lc,$1)=yes 11519 _LT_TAGVAR(archive_cmds_need_lc,$1)=yes
11443 _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs' 11520 _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
11444@@ -6300,9 +6679,9 @@ if test "$_lt_caught_CXX_error" != yes; then 11521@@ -6300,9 +6679,9 @@ if test "$_lt_caught_CXX_error" != yes;
11445 if test "$GXX" = yes && test "$with_gnu_ld" = no; then 11522 if test "$GXX" = yes && test "$with_gnu_ld" = no; then
11446 _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs' 11523 _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
11447 if $CC --version | $GREP -v '^2\.7' > /dev/null; then 11524 if $CC --version | $GREP -v '^2\.7' > /dev/null; then
@@ -11453,7 +11530,7 @@ index 24d13f3440..e45fdc6998 100644
11453 11530
11454 # Commands to make compiler produce verbose output that lists 11531 # Commands to make compiler produce verbose output that lists
11455 # what "hidden" libraries, object files and flags are used when 11532 # what "hidden" libraries, object files and flags are used when
11456@@ -6431,6 +6810,7 @@ if test "$_lt_caught_CXX_error" != yes; then 11533@@ -6431,6 +6810,7 @@ if test "$_lt_caught_CXX_error" != yes;
11457 fi # test -n "$compiler" 11534 fi # test -n "$compiler"
11458 11535
11459 CC=$lt_save_CC 11536 CC=$lt_save_CC
@@ -11661,7 +11738,7 @@ index 24d13f3440..e45fdc6998 100644
11661 ])# _LT_LANG_RC_CONFIG 11738 ])# _LT_LANG_RC_CONFIG
11662 11739
11663 11740
11664@@ -7101,6 +7536,15 @@ _LT_DECL([], [OBJDUMP], [1], [An object symbol dumper]) 11741@@ -7101,6 +7536,15 @@ _LT_DECL([], [OBJDUMP], [1], [An object
11665 AC_SUBST([OBJDUMP]) 11742 AC_SUBST([OBJDUMP])
11666 ]) 11743 ])
11667 11744
@@ -11688,7 +11765,7 @@ index 24d13f3440..e45fdc6998 100644
11688 && eval 'test $(( 1 + 1 )) -eq 2 \ 11765 && eval 'test $(( 1 + 1 )) -eq 2 \
11689 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ 11766 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
11690 && xsi_shell=yes 11767 && xsi_shell=yes
11691@@ -7234,206 +7678,162 @@ _LT_DECL([NL2SP], [lt_NL2SP], [1], [turn newlines into spaces])dnl 11768@@ -7234,206 +7678,162 @@ _LT_DECL([NL2SP], [lt_NL2SP], [1], [turn
11692 ])# _LT_CHECK_SHELL_FEATURES 11769 ])# _LT_CHECK_SHELL_FEATURES
11693 11770
11694 11771
@@ -11786,6 +11863,31 @@ index 24d13f3440..e45fdc6998 100644
11786-{ 11863-{
11787- func_len_result=${#1} 11864- func_len_result=${#1}
11788-} 11865-}
11866-
11867-_LT_EOF
11868- ;;
11869- *) # Bourne compatible functions.
11870- cat << \_LT_EOF >> "$cfgfile"
11871-
11872-# func_dirname file append nondir_replacement
11873-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
11874-# otherwise set result to NONDIR_REPLACEMENT.
11875-func_dirname ()
11876-{
11877- # Extract subdirectory from the argument.
11878- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
11879- if test "X$func_dirname_result" = "X${1}"; then
11880- func_dirname_result="${3}"
11881- else
11882- func_dirname_result="$func_dirname_result${2}"
11883- fi
11884-}
11885-
11886-# func_basename file
11887-func_basename ()
11888-{
11889- func_basename_result=`$ECHO "${1}" | $SED "$basename"`
11890-}
11789+# _LT_PROG_FUNCTION_REPLACE (FUNCNAME, REPLACEMENT-BODY) 11891+# _LT_PROG_FUNCTION_REPLACE (FUNCNAME, REPLACEMENT-BODY)
11790+# ------------------------------------------------------ 11892+# ------------------------------------------------------
11791+# In `$cfgfile', look for function FUNCNAME delimited by `^FUNCNAME ()$' and 11893+# In `$cfgfile', look for function FUNCNAME delimited by `^FUNCNAME ()$' and
@@ -11802,23 +11904,22 @@ index 24d13f3440..e45fdc6998 100644
11802+test 0 -eq $? || _lt_function_replace_fail=: 11904+test 0 -eq $? || _lt_function_replace_fail=:
11803+]) 11905+])
11804 11906
11805-_LT_EOF 11907-dnl func_dirname_and_basename
11806- ;; 11908-dnl A portable version of this function is already defined in general.m4sh
11807- *) # Bourne compatible functions. 11909-dnl so there is no need for it here.
11808- cat << \_LT_EOF >> "$cfgfile"
11809 11910
11810-# func_dirname file append nondir_replacement 11911-# func_stripname prefix suffix name
11811-# Compute the dirname of FILE. If nonempty, add APPEND to the result, 11912-# strip PREFIX and SUFFIX off of NAME.
11812-# otherwise set result to NONDIR_REPLACEMENT. 11913-# PREFIX and SUFFIX must not contain globbing or regex special
11813-func_dirname () 11914-# characters, hashes, percent signs, but SUFFIX may contain a leading
11915-# dot (in which case that matches only a dot).
11916-# func_strip_suffix prefix name
11917-func_stripname ()
11814-{ 11918-{
11815- # Extract subdirectory from the argument. 11919- case ${2} in
11816- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` 11920- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
11817- if test "X$func_dirname_result" = "X${1}"; then 11921- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
11818- func_dirname_result="${3}" 11922- esac
11819- else
11820- func_dirname_result="$func_dirname_result${2}"
11821- fi
11822-} 11923-}
11823+# _LT_PROG_REPLACE_SHELLFNS 11924+# _LT_PROG_REPLACE_SHELLFNS
11824+# ------------------------- 11925+# -------------------------
@@ -11842,45 +11943,24 @@ index 24d13f3440..e45fdc6998 100644
11842+ esac 11943+ esac
11843+ func_basename_result="${1##*/}"]) 11944+ func_basename_result="${1##*/}"])
11844 11945
11845-# func_basename file 11946-# sed scripts:
11846-func_basename () 11947-my_sed_long_opt='1s/^\(-[[^=]]*\)=.*/\1/;q'
11847-{ 11948-my_sed_long_arg='1s/^-[[^=]]*=//'
11848- func_basename_result=`$ECHO "${1}" | $SED "$basename"`
11849-}
11850+ _LT_PROG_FUNCTION_REPLACE([func_stripname], [dnl 11949+ _LT_PROG_FUNCTION_REPLACE([func_stripname], [dnl
11851+ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are 11950+ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
11852+ # positional parameters, so assign one to ordinary parameter first. 11951+ # positional parameters, so assign one to ordinary parameter first.
11853+ func_stripname_result=${3} 11952+ func_stripname_result=${3}
11854+ func_stripname_result=${func_stripname_result#"${1}"} 11953+ func_stripname_result=${func_stripname_result#"${1}"}
11855+ func_stripname_result=${func_stripname_result%"${2}"}]) 11954+ func_stripname_result=${func_stripname_result%"${2}"}])
11856 11955+
11857-dnl func_dirname_and_basename
11858-dnl A portable version of this function is already defined in general.m4sh
11859-dnl so there is no need for it here.
11860+ _LT_PROG_FUNCTION_REPLACE([func_split_long_opt], [dnl 11956+ _LT_PROG_FUNCTION_REPLACE([func_split_long_opt], [dnl
11861+ func_split_long_opt_name=${1%%=*} 11957+ func_split_long_opt_name=${1%%=*}
11862+ func_split_long_opt_arg=${1#*=}]) 11958+ func_split_long_opt_arg=${1#*=}])
11863 11959+
11864-# func_stripname prefix suffix name
11865-# strip PREFIX and SUFFIX off of NAME.
11866-# PREFIX and SUFFIX must not contain globbing or regex special
11867-# characters, hashes, percent signs, but SUFFIX may contain a leading
11868-# dot (in which case that matches only a dot).
11869-# func_strip_suffix prefix name
11870-func_stripname ()
11871-{
11872- case ${2} in
11873- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
11874- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
11875- esac
11876-}
11877+ _LT_PROG_FUNCTION_REPLACE([func_split_short_opt], [dnl 11960+ _LT_PROG_FUNCTION_REPLACE([func_split_short_opt], [dnl
11878+ func_split_short_opt_arg=${1#??} 11961+ func_split_short_opt_arg=${1#??}
11879+ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}]) 11962+ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}])
11880 11963+
11881-# sed scripts:
11882-my_sed_long_opt='1s/^\(-[[^=]]*\)=.*/\1/;q'
11883-my_sed_long_arg='1s/^-[[^=]]*=//'
11884+ _LT_PROG_FUNCTION_REPLACE([func_lo2o], [dnl 11964+ _LT_PROG_FUNCTION_REPLACE([func_lo2o], [dnl
11885+ case ${1} in 11965+ case ${1} in
11886+ *.lo) func_lo2o_result=${1%.lo}.${objext} ;; 11966+ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
@@ -11928,9 +12008,7 @@ index 24d13f3440..e45fdc6998 100644
11928+ func_quote_for_eval "${2}" 12008+ func_quote_for_eval "${2}"
11929+dnl m4 expansion turns \\\\ into \\, and then the shell eval turns that into \ 12009+dnl m4 expansion turns \\\\ into \\, and then the shell eval turns that into \
11930+ eval "${1}+=\\\\ \\$func_quote_for_eval_result"]) 12010+ eval "${1}+=\\\\ \\$func_quote_for_eval_result"])
11931 12011+
11932-_LT_EOF
11933-esac
11934+ # Save a `func_append' function call where possible by direct use of '+=' 12012+ # Save a `func_append' function call where possible by direct use of '+='
11935+ sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ 12013+ sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
11936+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 12014+ && mv -f "$cfgfile.tmp" "$cfgfile" \
@@ -11944,14 +12022,17 @@ index 24d13f3440..e45fdc6998 100644
11944+ test 0 -eq $? || _lt_function_replace_fail=: 12022+ test 0 -eq $? || _lt_function_replace_fail=:
11945+fi 12023+fi
11946 12024
11947-case $lt_shell_append in 12025-_LT_EOF
11948- yes) 12026-esac
11949- cat << \_LT_EOF >> "$cfgfile"
11950+if test x"$_lt_function_replace_fail" = x":"; then 12027+if test x"$_lt_function_replace_fail" = x":"; then
11951+ AC_MSG_WARN([Unable to substitute extended shell functions in $ofile]) 12028+ AC_MSG_WARN([Unable to substitute extended shell functions in $ofile])
11952+fi 12029+fi
11953+]) 12030+])
11954 12031
12032-case $lt_shell_append in
12033- yes)
12034- cat << \_LT_EOF >> "$cfgfile"
12035-
11955-# func_append var value 12036-# func_append var value
11956-# Append VALUE to the end of shell variable VAR. 12037-# Append VALUE to the end of shell variable VAR.
11957-func_append () 12038-func_append ()
@@ -12037,10 +12118,10 @@ index 24d13f3440..e45fdc6998 100644
12037+_LT_DECL([to_tool_file_cmd], [lt_cv_to_tool_file_cmd], 12118+_LT_DECL([to_tool_file_cmd], [lt_cv_to_tool_file_cmd],
12038+ [0], [convert $build files to toolchain format])dnl 12119+ [0], [convert $build files to toolchain format])dnl
12039+])# _LT_PATH_CONVERSION_FUNCTIONS 12120+])# _LT_PATH_CONVERSION_FUNCTIONS
12040diff --git a/ltmain.sh b/ltmain.sh 12121Index: git/ltmain.sh
12041index 9503ec85d7..70e856e065 100644 12122===================================================================
12042--- a/ltmain.sh 12123--- git.orig/ltmain.sh
12043+++ b/ltmain.sh 12124+++ git/ltmain.sh
12044@@ -1,10 +1,9 @@ 12125@@ -1,10 +1,9 @@
12045-# Generated from ltmain.m4sh. 12126-# Generated from ltmain.m4sh.
12046 12127
@@ -12470,31 +12551,7 @@ index 9503ec85d7..70e856e065 100644
12470+$progname: of $PACKAGE $VERSION and run autoconf again. 12551+$progname: of $PACKAGE $VERSION and run autoconf again.
12471+_LT_EOF 12552+_LT_EOF
12472+ fi 12553+ fi
12473 12554+
12474- # Shorthand for --mode=foo, only valid as the first argument
12475- case $1 in
12476- clean|clea|cle|cl)
12477- shift; set dummy --mode clean ${1+"$@"}; shift
12478- ;;
12479- compile|compil|compi|comp|com|co|c)
12480- shift; set dummy --mode compile ${1+"$@"}; shift
12481- ;;
12482- execute|execut|execu|exec|exe|ex|e)
12483- shift; set dummy --mode execute ${1+"$@"}; shift
12484- ;;
12485- finish|finis|fini|fin|fi|f)
12486- shift; set dummy --mode finish ${1+"$@"}; shift
12487- ;;
12488- install|instal|insta|inst|ins|in|i)
12489- shift; set dummy --mode install ${1+"$@"}; shift
12490- ;;
12491- link|lin|li|l)
12492- shift; set dummy --mode link ${1+"$@"}; shift
12493- ;;
12494- uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u)
12495- shift; set dummy --mode uninstall ${1+"$@"}; shift
12496- ;;
12497- esac
12498+ exit $EXIT_MISMATCH 12555+ exit $EXIT_MISMATCH
12499+ fi 12556+ fi
12500+} 12557+}
@@ -12524,9 +12581,7 @@ index 9503ec85d7..70e856e065 100644
12524+ shift; set dummy --mode uninstall ${1+"$@"}; shift 12581+ shift; set dummy --mode uninstall ${1+"$@"}; shift
12525+ ;; 12582+ ;;
12526+esac 12583+esac
12527 12584+
12528- # Parse non-mode specific arguments:
12529- while test "$#" -gt 0; do
12530+ 12585+
12531+ 12586+
12532+# Option defaults: 12587+# Option defaults:
@@ -12542,8 +12597,34 @@ index 9503ec85d7..70e856e065 100644
12542+opt_verbose=: 12597+opt_verbose=:
12543+opt_silent=false 12598+opt_silent=false
12544+opt_verbose=false 12599+opt_verbose=false
12545+ 12600
12546+ 12601- # Shorthand for --mode=foo, only valid as the first argument
12602- case $1 in
12603- clean|clea|cle|cl)
12604- shift; set dummy --mode clean ${1+"$@"}; shift
12605- ;;
12606- compile|compil|compi|comp|com|co|c)
12607- shift; set dummy --mode compile ${1+"$@"}; shift
12608- ;;
12609- execute|execut|execu|exec|exe|ex|e)
12610- shift; set dummy --mode execute ${1+"$@"}; shift
12611- ;;
12612- finish|finis|fini|fin|fi|f)
12613- shift; set dummy --mode finish ${1+"$@"}; shift
12614- ;;
12615- install|instal|insta|inst|ins|in|i)
12616- shift; set dummy --mode install ${1+"$@"}; shift
12617- ;;
12618- link|lin|li|l)
12619- shift; set dummy --mode link ${1+"$@"}; shift
12620- ;;
12621- uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u)
12622- shift; set dummy --mode uninstall ${1+"$@"}; shift
12623- ;;
12624- esac
12625
12626- # Parse non-mode specific arguments:
12627- while test "$#" -gt 0; do
12547+# Parse options once, thoroughly. This comes as soon as possible in the 12628+# Parse options once, thoroughly. This comes as soon as possible in the
12548+# script to make things like `--version' happen as quickly as we can. 12629+# script to make things like `--version' happen as quickly as we can.
12549+{ 12630+{
@@ -12787,13 +12868,13 @@ index 9503ec85d7..70e856e065 100644
12787- fi 12868- fi
12788-} 12869-}
12789- 12870-
12790+ # Darwin sucks 12871-
12791+ eval std_shrext=\"$shrext_cmds\"
12792
12793-## ----------- ## 12872-## ----------- ##
12794-## Main. ## 12873-## Main. ##
12795-## ----------- ## 12874-## ----------- ##
12796- 12875+ # Darwin sucks
12876+ eval std_shrext=\"$shrext_cmds\"
12877
12797-$opt_help || { 12878-$opt_help || {
12798- # Sanity checks first: 12879- # Sanity checks first:
12799- func_check_version_match 12880- func_check_version_match
@@ -13514,7 +13595,7 @@ index 9503ec85d7..70e856e065 100644
13514 "") 13595 "")
13515 # Generic help is extracted from the usage comments 13596 # Generic help is extracted from the usage comments
13516 # at the start of this file. 13597 # at the start of this file.
13517@@ -1659,8 +2327,8 @@ This mode accepts the following additional options: 13598@@ -1659,8 +2327,8 @@ This mode accepts the following addition
13518 13599
13519 -o OUTPUT-FILE set the output file name to OUTPUT-FILE 13600 -o OUTPUT-FILE set the output file name to OUTPUT-FILE
13520 -no-suppress do not suppress compiler output for multiple passes 13601 -no-suppress do not suppress compiler output for multiple passes
@@ -13525,7 +13606,7 @@ index 9503ec85d7..70e856e065 100644
13525 -shared do not build a \`.o' file suitable for static linking 13606 -shared do not build a \`.o' file suitable for static linking
13526 -static only build a \`.o' file suitable for static linking 13607 -static only build a \`.o' file suitable for static linking
13527 -Wc,FLAG pass FLAG directly to the compiler 13608 -Wc,FLAG pass FLAG directly to the compiler
13528@@ -1804,7 +2472,7 @@ Otherwise, only FILE itself is deleted using RM." 13609@@ -1804,7 +2472,7 @@ Otherwise, only FILE itself is deleted u
13529 ;; 13610 ;;
13530 13611
13531 *) 13612 *)
@@ -13627,7 +13708,7 @@ index 9503ec85d7..70e856e065 100644
13627+ do 13708+ do
13628+ if test -d "$opt"; then 13709+ if test -d "$opt"; then
13629+ func_append libdirs " $opt" 13710+ func_append libdirs " $opt"
13630 13711+
13631+ elif test -f "$opt"; then 13712+ elif test -f "$opt"; then
13632+ if func_lalib_unsafe_p "$opt"; then 13713+ if func_lalib_unsafe_p "$opt"; then
13633+ func_append libs " $opt" 13714+ func_append libs " $opt"
@@ -13647,7 +13728,7 @@ index 9503ec85d7..70e856e065 100644
13647+ else 13728+ else
13648+ sysroot_cmd= 13729+ sysroot_cmd=
13649+ fi 13730+ fi
13650+ 13731
13651+ # Remove sysroot references 13732+ # Remove sysroot references
13652+ if $opt_dry_run; then 13733+ if $opt_dry_run; then
13653+ for lib in $libs; do 13734+ for lib in $libs; do
@@ -14059,7 +14140,7 @@ index 9503ec85d7..70e856e065 100644
14059 lt_${my_prefix}_LTX_preloaded_symbols[] = 14140 lt_${my_prefix}_LTX_preloaded_symbols[] =
14060 {\ 14141 {\
14061 { \"$my_originator\", (void *) 0 }," 14142 { \"$my_originator\", (void *) 0 },"
14062@@ -2736,7 +3493,7 @@ static const void *lt_preloaded_setup() { 14143@@ -2736,7 +3493,7 @@ static const void *lt_preloaded_setup()
14063 for arg in $LTCFLAGS; do 14144 for arg in $LTCFLAGS; do
14064 case $arg in 14145 case $arg in
14065 -pie | -fpie | -fPIE) ;; 14146 -pie | -fpie | -fPIE) ;;
@@ -14588,7 +14669,7 @@ index 9503ec85d7..70e856e065 100644
14588 */ 14669 */
14589 EOF 14670 EOF
14590 cat <<"EOF" 14671 cat <<"EOF"
14591@@ -3462,22 +4272,13 @@ int setenv (const char *, const char *, int); 14672@@ -3462,22 +4272,13 @@ int setenv (const char *, const char *,
14592 if (stale) { free ((void *) stale); stale = 0; } \ 14673 if (stale) { free ((void *) stale); stale = 0; } \
14593 } while (0) 14674 } while (0)
14594 14675
@@ -14615,7 +14696,7 @@ index 9503ec85d7..70e856e065 100644
14615 14696
14616 void *xmalloc (size_t num); 14697 void *xmalloc (size_t num);
14617 char *xstrdup (const char *string); 14698 char *xstrdup (const char *string);
14618@@ -3487,7 +4288,10 @@ char *chase_symlinks (const char *pathspec); 14699@@ -3487,7 +4288,10 @@ char *chase_symlinks (const char *pathsp
14619 int make_executable (const char *path); 14700 int make_executable (const char *path);
14620 int check_executable (const char *path); 14701 int check_executable (const char *path);
14621 char *strendzap (char *str, const char *pat); 14702 char *strendzap (char *str, const char *pat);
@@ -14943,7 +15024,7 @@ index 9503ec85d7..70e856e065 100644
14943 vfprintf (stderr, message, ap); 15024 vfprintf (stderr, message, ap);
14944 fprintf (stderr, ".\n"); 15025 fprintf (stderr, ".\n");
14945 15026
14946@@ -3988,20 +4832,32 @@ lt_error_core (int exit_status, const char *mode, 15027@@ -3988,20 +4832,32 @@ lt_error_core (int exit_status, const ch
14947 } 15028 }
14948 15029
14949 void 15030 void
@@ -14981,7 +15062,7 @@ index 9503ec85d7..70e856e065 100644
14981 { 15062 {
14982 #ifdef HAVE_SETENV 15063 #ifdef HAVE_SETENV
14983 /* always make a copy, for consistency with !HAVE_SETENV */ 15064 /* always make a copy, for consistency with !HAVE_SETENV */
14984@@ -4049,9 +4905,9 @@ lt_extend_str (const char *orig_value, const char *add, int to_end) 15065@@ -4049,9 +4905,9 @@ lt_extend_str (const char *orig_value, c
14985 void 15066 void
14986 lt_update_exe_path (const char *name, const char *value) 15067 lt_update_exe_path (const char *name, const char *value)
14987 { 15068 {
@@ -14994,7 +15075,7 @@ index 9503ec85d7..70e856e065 100644
14994 15075
14995 if (name && *name && value && *value) 15076 if (name && *name && value && *value)
14996 { 15077 {
14997@@ -4070,9 +4926,9 @@ lt_update_exe_path (const char *name, const char *value) 15078@@ -4070,9 +4926,9 @@ lt_update_exe_path (const char *name, co
14998 void 15079 void
14999 lt_update_lib_path (const char *name, const char *value) 15080 lt_update_lib_path (const char *name, const char *value)
15000 { 15081 {
@@ -17267,10 +17348,10 @@ index 9503ec85d7..70e856e065 100644
17267 17348
17268 if test -n "$exec_cmd"; then 17349 if test -n "$exec_cmd"; then
17269 eval exec "$exec_cmd" 17350 eval exec "$exec_cmd"
17270diff --git a/ltoptions.m4 b/ltoptions.m4 17351Index: git/ltoptions.m4
17271index 5ef12ced2a..17cfd51c0b 100644 17352===================================================================
17272--- a/ltoptions.m4 17353--- git.orig/ltoptions.m4
17273+++ b/ltoptions.m4 17354+++ git/ltoptions.m4
17274@@ -8,7 +8,7 @@ 17355@@ -8,7 +8,7 @@
17275 # unlimited permission to copy and/or distribute it, with or without 17356 # unlimited permission to copy and/or distribute it, with or without
17276 # modifications, as long as this notice is preserved. 17357 # modifications, as long as this notice is preserved.
@@ -17280,10 +17361,10 @@ index 5ef12ced2a..17cfd51c0b 100644
17280 17361
17281 # This is to help aclocal find these macros, as it can't see m4_define. 17362 # This is to help aclocal find these macros, as it can't see m4_define.
17282 AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])]) 17363 AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])])
17283diff --git a/ltversion.m4 b/ltversion.m4 17364Index: git/ltversion.m4
17284index bf87f77132..9c7b5d4118 100644 17365===================================================================
17285--- a/ltversion.m4 17366--- git.orig/ltversion.m4
17286+++ b/ltversion.m4 17367+++ git/ltversion.m4
17287@@ -7,17 +7,17 @@ 17368@@ -7,17 +7,17 @@
17288 # unlimited permission to copy and/or distribute it, with or without 17369 # unlimited permission to copy and/or distribute it, with or without
17289 # modifications, as long as this notice is preserved. 17370 # modifications, as long as this notice is preserved.
@@ -17308,10 +17389,10 @@ index bf87f77132..9c7b5d4118 100644
17308 _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) 17389 _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
17309 _LT_DECL(, macro_revision, 0) 17390 _LT_DECL(, macro_revision, 0)
17310 ]) 17391 ])
17311diff --git a/lt~obsolete.m4 b/lt~obsolete.m4 17392Index: git/lt~obsolete.m4
17312index bf92b5e079..c573da90c5 100644 17393===================================================================
17313--- a/lt~obsolete.m4 17394--- git.orig/lt~obsolete.m4
17314+++ b/lt~obsolete.m4 17395+++ git/lt~obsolete.m4
17315@@ -7,7 +7,7 @@ 17396@@ -7,7 +7,7 @@
17316 # unlimited permission to copy and/or distribute it, with or without 17397 # unlimited permission to copy and/or distribute it, with or without
17317 # modifications, as long as this notice is preserved. 17398 # modifications, as long as this notice is preserved.
@@ -17321,11 +17402,11 @@ index bf92b5e079..c573da90c5 100644
17321 17402
17322 # These exist entirely to fool aclocal when bootstrapping libtool. 17403 # These exist entirely to fool aclocal when bootstrapping libtool.
17323 # 17404 #
17324diff --git a/opcodes/configure b/opcodes/configure 17405Index: git/opcodes/configure
17325index 4f29887098..2127d39288 100755 17406===================================================================
17326--- a/opcodes/configure 17407--- git.orig/opcodes/configure
17327+++ b/opcodes/configure 17408+++ git/opcodes/configure
17328@@ -650,6 +650,9 @@ OTOOL 17409@@ -681,6 +681,9 @@ OTOOL
17329 LIPO 17410 LIPO
17330 NMEDIT 17411 NMEDIT
17331 DSYMUTIL 17412 DSYMUTIL
@@ -17335,7 +17416,7 @@ index 4f29887098..2127d39288 100755
17335 OBJDUMP 17416 OBJDUMP
17336 LN_S 17417 LN_S
17337 NM 17418 NM
17338@@ -763,6 +766,7 @@ enable_static 17419@@ -799,6 +802,7 @@ enable_static
17339 with_pic 17420 with_pic
17340 enable_fast_install 17421 enable_fast_install
17341 with_gnu_ld 17422 with_gnu_ld
@@ -17343,7 +17424,7 @@ index 4f29887098..2127d39288 100755
17343 enable_libtool_lock 17424 enable_libtool_lock
17344 enable_targets 17425 enable_targets
17345 enable_werror 17426 enable_werror
17346@@ -1423,6 +1427,8 @@ Optional Packages: 17427@@ -1463,6 +1467,8 @@ Optional Packages:
17347 --with-pic try to use only PIC/non-PIC objects [default=use 17428 --with-pic try to use only PIC/non-PIC objects [default=use
17348 both] 17429 both]
17349 --with-gnu-ld assume the C compiler uses GNU ld [default=no] 17430 --with-gnu-ld assume the C compiler uses GNU ld [default=no]
@@ -17352,7 +17433,7 @@ index 4f29887098..2127d39288 100755
17352 17433
17353 Some influential environment variables: 17434 Some influential environment variables:
17354 CC C compiler command 17435 CC C compiler command
17355@@ -5115,8 +5121,8 @@ esac 17436@@ -5404,8 +5410,8 @@ esac
17356 17437
17357 17438
17358 17439
@@ -17363,7 +17444,7 @@ index 4f29887098..2127d39288 100755
17363 17444
17364 17445
17365 17446
17366@@ -5156,7 +5162,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO 17447@@ -5445,7 +5451,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
17367 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 17448 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
17368 $as_echo_n "checking how to print strings... " >&6; } 17449 $as_echo_n "checking how to print strings... " >&6; }
17369 # Test print first, because it will be a builtin if present. 17450 # Test print first, because it will be a builtin if present.
@@ -17372,7 +17453,7 @@ index 4f29887098..2127d39288 100755
17372 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then 17453 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
17373 ECHO='print -r --' 17454 ECHO='print -r --'
17374 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then 17455 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
17375@@ -5842,8 +5848,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; 17456@@ -6131,8 +6137,8 @@ $as_echo_n "checking whether the shell u
17376 # Try some XSI features 17457 # Try some XSI features
17377 xsi_shell=no 17458 xsi_shell=no
17378 ( _lt_dummy="a/b/c" 17459 ( _lt_dummy="a/b/c"
@@ -17383,13 +17464,13 @@ index 4f29887098..2127d39288 100755
17383 && eval 'test $(( 1 + 1 )) -eq 2 \ 17464 && eval 'test $(( 1 + 1 )) -eq 2 \
17384 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ 17465 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
17385 && xsi_shell=yes 17466 && xsi_shell=yes
17386@@ -5892,6 +5898,80 @@ esac 17467@@ -6181,6 +6187,80 @@ esac
17387 17468
17388 17469
17389 17470
17390+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5 17471+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5
17391+$as_echo_n "checking how to convert $build file names to $host format... " >&6; } 17472+$as_echo_n "checking how to convert $build file names to $host format... " >&6; }
17392+if test "${lt_cv_to_host_file_cmd+set}" = set; then : 17473+if ${lt_cv_to_host_file_cmd+:} false; then :
17393+ $as_echo_n "(cached) " >&6 17474+ $as_echo_n "(cached) " >&6
17394+else 17475+else
17395+ case $host in 17476+ case $host in
@@ -17436,7 +17517,7 @@ index 4f29887098..2127d39288 100755
17436+ 17517+
17437+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5 17518+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5
17438+$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; } 17519+$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; }
17439+if test "${lt_cv_to_tool_file_cmd+set}" = set; then : 17520+if ${lt_cv_to_tool_file_cmd+:} false; then :
17440+ $as_echo_n "(cached) " >&6 17521+ $as_echo_n "(cached) " >&6
17441+else 17522+else
17442+ #assume ordinary cross tools, or native build. 17523+ #assume ordinary cross tools, or native build.
@@ -17463,8 +17544,8 @@ index 4f29887098..2127d39288 100755
17463+ 17544+
17464 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 17545 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
17465 $as_echo_n "checking for $LD option to reload object files... " >&6; } 17546 $as_echo_n "checking for $LD option to reload object files... " >&6; }
17466 if test "${lt_cv_ld_reload_flag+set}" = set; then : 17547 if ${lt_cv_ld_reload_flag+:} false; then :
17467@@ -5908,6 +5988,11 @@ case $reload_flag in 17548@@ -6197,6 +6277,11 @@ case $reload_flag in
17468 esac 17549 esac
17469 reload_cmds='$LD$reload_flag -o $output$reload_objs' 17550 reload_cmds='$LD$reload_flag -o $output$reload_objs'
17470 case $host_os in 17551 case $host_os in
@@ -17476,7 +17557,7 @@ index 4f29887098..2127d39288 100755
17476 darwin*) 17557 darwin*)
17477 if test "$GCC" = yes; then 17558 if test "$GCC" = yes; then
17478 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' 17559 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
17479@@ -6076,7 +6161,8 @@ mingw* | pw32*) 17560@@ -6365,7 +6450,8 @@ mingw* | pw32*)
17480 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' 17561 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
17481 lt_cv_file_magic_cmd='func_win32_libid' 17562 lt_cv_file_magic_cmd='func_win32_libid'
17482 else 17563 else
@@ -17486,7 +17567,7 @@ index 4f29887098..2127d39288 100755
17486 lt_cv_file_magic_cmd='$OBJDUMP -f' 17567 lt_cv_file_magic_cmd='$OBJDUMP -f'
17487 fi 17568 fi
17488 ;; 17569 ;;
17489@@ -6230,6 +6316,21 @@ esac 17570@@ -6519,6 +6605,21 @@ esac
17490 fi 17571 fi
17491 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 17572 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
17492 $as_echo "$lt_cv_deplibs_check_method" >&6; } 17573 $as_echo "$lt_cv_deplibs_check_method" >&6; }
@@ -17508,7 +17589,7 @@ index 4f29887098..2127d39288 100755
17508 file_magic_cmd=$lt_cv_file_magic_cmd 17589 file_magic_cmd=$lt_cv_file_magic_cmd
17509 deplibs_check_method=$lt_cv_deplibs_check_method 17590 deplibs_check_method=$lt_cv_deplibs_check_method
17510 test -z "$deplibs_check_method" && deplibs_check_method=unknown 17591 test -z "$deplibs_check_method" && deplibs_check_method=unknown
17511@@ -6243,11 +6344,164 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown 17592@@ -6534,9 +6635,162 @@ test -z "$deplibs_check_method" && depli
17512 17593
17513 17594
17514 17595
@@ -17522,8 +17603,6 @@ index 4f29887098..2127d39288 100755
17522+ 17603+
17523+ 17604+
17524+ 17605+
17525
17526
17527 if test -n "$ac_tool_prefix"; then 17606 if test -n "$ac_tool_prefix"; then
17528- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. 17607- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
17529-set dummy ${ac_tool_prefix}ar; ac_word=$2 17608-set dummy ${ac_tool_prefix}ar; ac_word=$2
@@ -17531,7 +17610,7 @@ index 4f29887098..2127d39288 100755
17531+set dummy ${ac_tool_prefix}dlltool; ac_word=$2 17610+set dummy ${ac_tool_prefix}dlltool; ac_word=$2
17532+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 17611+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
17533+$as_echo_n "checking for $ac_word... " >&6; } 17612+$as_echo_n "checking for $ac_word... " >&6; }
17534+if test "${ac_cv_prog_DLLTOOL+set}" = set; then : 17613+if ${ac_cv_prog_DLLTOOL+:} false; then :
17535+ $as_echo_n "(cached) " >&6 17614+ $as_echo_n "(cached) " >&6
17536+else 17615+else
17537+ if test -n "$DLLTOOL"; then 17616+ if test -n "$DLLTOOL"; then
@@ -17543,7 +17622,7 @@ index 4f29887098..2127d39288 100755
17543+ IFS=$as_save_IFS 17622+ IFS=$as_save_IFS
17544+ test -z "$as_dir" && as_dir=. 17623+ test -z "$as_dir" && as_dir=.
17545+ for ac_exec_ext in '' $ac_executable_extensions; do 17624+ for ac_exec_ext in '' $ac_executable_extensions; do
17546+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 17625+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
17547+ ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" 17626+ ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
17548+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 17627+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
17549+ break 2 17628+ break 2
@@ -17571,7 +17650,7 @@ index 4f29887098..2127d39288 100755
17571+set dummy dlltool; ac_word=$2 17650+set dummy dlltool; ac_word=$2
17572+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 17651+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
17573+$as_echo_n "checking for $ac_word... " >&6; } 17652+$as_echo_n "checking for $ac_word... " >&6; }
17574+if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then : 17653+if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then :
17575+ $as_echo_n "(cached) " >&6 17654+ $as_echo_n "(cached) " >&6
17576+else 17655+else
17577+ if test -n "$ac_ct_DLLTOOL"; then 17656+ if test -n "$ac_ct_DLLTOOL"; then
@@ -17583,7 +17662,7 @@ index 4f29887098..2127d39288 100755
17583+ IFS=$as_save_IFS 17662+ IFS=$as_save_IFS
17584+ test -z "$as_dir" && as_dir=. 17663+ test -z "$as_dir" && as_dir=.
17585+ for ac_exec_ext in '' $ac_executable_extensions; do 17664+ for ac_exec_ext in '' $ac_executable_extensions; do
17586+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 17665+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
17587+ ac_cv_prog_ac_ct_DLLTOOL="dlltool" 17666+ ac_cv_prog_ac_ct_DLLTOOL="dlltool"
17588+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 17667+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
17589+ break 2 17668+ break 2
@@ -17631,7 +17710,7 @@ index 4f29887098..2127d39288 100755
17631+ 17710+
17632+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5 17711+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5
17633+$as_echo_n "checking how to associate runtime and link libraries... " >&6; } 17712+$as_echo_n "checking how to associate runtime and link libraries... " >&6; }
17634+if test "${lt_cv_sharedlib_from_linklib_cmd+set}" = set; then : 17713+if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then :
17635+ $as_echo_n "(cached) " >&6 17714+ $as_echo_n "(cached) " >&6
17636+else 17715+else
17637+ lt_cv_sharedlib_from_linklib_cmd='unknown' 17716+ lt_cv_sharedlib_from_linklib_cmd='unknown'
@@ -17674,17 +17753,17 @@ index 4f29887098..2127d39288 100755
17674+set dummy $ac_tool_prefix$ac_prog; ac_word=$2 17753+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
17675 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 17754 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
17676 $as_echo_n "checking for $ac_word... " >&6; } 17755 $as_echo_n "checking for $ac_word... " >&6; }
17677 if test "${ac_cv_prog_AR+set}" = set; then : 17756 if ${ac_cv_prog_AR+:} false; then :
17678@@ -6263,7 +6517,7 @@ do 17757@@ -6552,7 +6806,7 @@ do
17679 test -z "$as_dir" && as_dir=. 17758 test -z "$as_dir" && as_dir=.
17680 for ac_exec_ext in '' $ac_executable_extensions; do 17759 for ac_exec_ext in '' $ac_executable_extensions; do
17681 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 17760 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
17682- ac_cv_prog_AR="${ac_tool_prefix}ar" 17761- ac_cv_prog_AR="${ac_tool_prefix}ar"
17683+ ac_cv_prog_AR="$ac_tool_prefix$ac_prog" 17762+ ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
17684 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 17763 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
17685 break 2 17764 break 2
17686 fi 17765 fi
17687@@ -6283,11 +6537,15 @@ $as_echo "no" >&6; } 17766@@ -6572,11 +6826,15 @@ $as_echo "no" >&6; }
17688 fi 17767 fi
17689 17768
17690 17769
@@ -17702,17 +17781,17 @@ index 4f29887098..2127d39288 100755
17702+set dummy $ac_prog; ac_word=$2 17781+set dummy $ac_prog; ac_word=$2
17703 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 17782 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
17704 $as_echo_n "checking for $ac_word... " >&6; } 17783 $as_echo_n "checking for $ac_word... " >&6; }
17705 if test "${ac_cv_prog_ac_ct_AR+set}" = set; then : 17784 if ${ac_cv_prog_ac_ct_AR+:} false; then :
17706@@ -6303,7 +6561,7 @@ do 17785@@ -6592,7 +6850,7 @@ do
17707 test -z "$as_dir" && as_dir=. 17786 test -z "$as_dir" && as_dir=.
17708 for ac_exec_ext in '' $ac_executable_extensions; do 17787 for ac_exec_ext in '' $ac_executable_extensions; do
17709 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 17788 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
17710- ac_cv_prog_ac_ct_AR="ar" 17789- ac_cv_prog_ac_ct_AR="ar"
17711+ ac_cv_prog_ac_ct_AR="$ac_prog" 17790+ ac_cv_prog_ac_ct_AR="$ac_prog"
17712 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 17791 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
17713 break 2 17792 break 2
17714 fi 17793 fi
17715@@ -6322,6 +6580,10 @@ else 17794@@ -6611,6 +6869,10 @@ else
17716 $as_echo "no" >&6; } 17795 $as_echo "no" >&6; }
17717 fi 17796 fi
17718 17797
@@ -17723,7 +17802,7 @@ index 4f29887098..2127d39288 100755
17723 if test "x$ac_ct_AR" = x; then 17802 if test "x$ac_ct_AR" = x; then
17724 AR="false" 17803 AR="false"
17725 else 17804 else
17726@@ -6333,16 +6595,72 @@ ac_tool_warned=yes ;; 17805@@ -6622,12 +6884,11 @@ ac_tool_warned=yes ;;
17727 esac 17806 esac
17728 AR=$ac_ct_AR 17807 AR=$ac_ct_AR
17729 fi 17808 fi
@@ -17736,19 +17815,16 @@ index 4f29887098..2127d39288 100755
17736+: ${AR=ar} 17815+: ${AR=ar}
17737+: ${AR_FLAGS=cru} 17816+: ${AR_FLAGS=cru}
17738+ 17817+
17739+ 17818
17740+ 17819
17741+ 17820
17742+ 17821@@ -6638,6 +6899,63 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru
17743+ 17822
17744+ 17823
17745+ 17824
17746+
17747+
17748+
17749+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 17825+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
17750+$as_echo_n "checking for archiver @FILE support... " >&6; } 17826+$as_echo_n "checking for archiver @FILE support... " >&6; }
17751+if test "${lt_cv_ar_at_file+set}" = set; then : 17827+if ${lt_cv_ar_at_file+:} false; then :
17752+ $as_echo_n "(cached) " >&6 17828+ $as_echo_n "(cached) " >&6
17753+else 17829+else
17754+ lt_cv_ar_at_file=no 17830+ lt_cv_ar_at_file=no
@@ -17758,7 +17834,7 @@ index 4f29887098..2127d39288 100755
17758+int 17834+int
17759+main () 17835+main ()
17760+{ 17836+{
17761 17837+
17762+ ; 17838+ ;
17763+ return 0; 17839+ return 0;
17764+} 17840+}
@@ -17784,23 +17860,29 @@ index 4f29887098..2127d39288 100755
17784+ fi 17860+ fi
17785+ fi 17861+ fi
17786+ rm -f conftest.* libconftest.a 17862+ rm -f conftest.* libconftest.a
17787 17863+
17788+fi 17864+fi
17789+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext 17865+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
17790 17866+
17791+fi 17867+fi
17792+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 17868+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
17793+$as_echo "$lt_cv_ar_at_file" >&6; } 17869+$as_echo "$lt_cv_ar_at_file" >&6; }
17794 17870+
17795+if test "x$lt_cv_ar_at_file" = xno; then 17871+if test "x$lt_cv_ar_at_file" = xno; then
17796+ archiver_list_spec= 17872+ archiver_list_spec=
17797+else 17873+else
17798+ archiver_list_spec=$lt_cv_ar_at_file 17874+ archiver_list_spec=$lt_cv_ar_at_file
17799+fi 17875+fi
17876+
17877+
17878+
17879+
17880+
17881+
17800 17882
17801 17883 if test -n "$ac_tool_prefix"; then
17802 17884 # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
17803@@ -6684,8 +7002,8 @@ esac 17885@@ -6973,8 +7291,8 @@ esac
17804 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" 17886 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
17805 17887
17806 # Transform an extracted symbol line into symbol name and symbol address 17888 # Transform an extracted symbol line into symbol name and symbol address
@@ -17811,7 +17893,7 @@ index 4f29887098..2127d39288 100755
17811 17893
17812 # Handle CRLF in mingw tool chain 17894 # Handle CRLF in mingw tool chain
17813 opt_cr= 17895 opt_cr=
17814@@ -6721,6 +7039,7 @@ for ac_symprfx in "" "_"; do 17896@@ -7010,6 +7328,7 @@ for ac_symprfx in "" "_"; do
17815 else 17897 else
17816 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" 17898 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
17817 fi 17899 fi
@@ -17819,7 +17901,7 @@ index 4f29887098..2127d39288 100755
17819 17901
17820 # Check to see that the pipe works correctly. 17902 # Check to see that the pipe works correctly.
17821 pipe_works=no 17903 pipe_works=no
17822@@ -6762,6 +7081,18 @@ _LT_EOF 17904@@ -7051,6 +7370,18 @@ _LT_EOF
17823 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then 17905 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
17824 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then 17906 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
17825 cat <<_LT_EOF > conftest.$ac_ext 17907 cat <<_LT_EOF > conftest.$ac_ext
@@ -17838,7 +17920,7 @@ index 4f29887098..2127d39288 100755
17838 #ifdef __cplusplus 17920 #ifdef __cplusplus
17839 extern "C" { 17921 extern "C" {
17840 #endif 17922 #endif
17841@@ -6773,7 +7104,7 @@ _LT_EOF 17923@@ -7062,7 +7393,7 @@ _LT_EOF
17842 cat <<_LT_EOF >> conftest.$ac_ext 17924 cat <<_LT_EOF >> conftest.$ac_ext
17843 17925
17844 /* The mapping between symbol names and symbols. */ 17926 /* The mapping between symbol names and symbols. */
@@ -17847,7 +17929,7 @@ index 4f29887098..2127d39288 100755
17847 const char *name; 17929 const char *name;
17848 void *address; 17930 void *address;
17849 } 17931 }
17850@@ -6799,8 +7130,8 @@ static const void *lt_preloaded_setup() { 17932@@ -7088,8 +7419,8 @@ static const void *lt_preloaded_setup()
17851 _LT_EOF 17933 _LT_EOF
17852 # Now try linking the two files. 17934 # Now try linking the two files.
17853 mv conftest.$ac_objext conftstm.$ac_objext 17935 mv conftest.$ac_objext conftstm.$ac_objext
@@ -17858,7 +17940,7 @@ index 4f29887098..2127d39288 100755
17858 LIBS="conftstm.$ac_objext" 17940 LIBS="conftstm.$ac_objext"
17859 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" 17941 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
17860 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 17942 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
17861@@ -6810,8 +7141,8 @@ _LT_EOF 17943@@ -7099,8 +7430,8 @@ _LT_EOF
17862 test $ac_status = 0; } && test -s conftest${ac_exeext}; then 17944 test $ac_status = 0; } && test -s conftest${ac_exeext}; then
17863 pipe_works=yes 17945 pipe_works=yes
17864 fi 17946 fi
@@ -17869,7 +17951,7 @@ index 4f29887098..2127d39288 100755
17869 else 17951 else
17870 echo "cannot find nm_test_func in $nlist" >&5 17952 echo "cannot find nm_test_func in $nlist" >&5
17871 fi 17953 fi
17872@@ -6848,6 +7179,16 @@ else 17954@@ -7137,6 +7468,14 @@ else
17873 $as_echo "ok" >&6; } 17955 $as_echo "ok" >&6; }
17874 fi 17956 fi
17875 17957
@@ -17881,12 +17963,10 @@ index 4f29887098..2127d39288 100755
17881+fi 17963+fi
17882+ 17964+
17883+ 17965+
17884+
17885+
17886 17966
17887 17967
17888 17968
17889@@ -6864,6 +7205,45 @@ fi 17969@@ -7158,6 +7497,47 @@ fi
17890 17970
17891 17971
17892 17972
@@ -17894,9 +17974,6 @@ index 4f29887098..2127d39288 100755
17894+ 17974+
17895+ 17975+
17896+ 17976+
17897+
17898+
17899+
17900+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 17977+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
17901+$as_echo_n "checking for sysroot... " >&6; } 17978+$as_echo_n "checking for sysroot... " >&6; }
17902+ 17979+
@@ -17923,16 +18000,21 @@ index 4f29887098..2127d39288 100755
17923+ *) 18000+ *)
17924+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5 18001+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5
17925+$as_echo "${with_libtool_sysroot}" >&6; } 18002+$as_echo "${with_libtool_sysroot}" >&6; }
17926+ as_fn_error "The sysroot must be an absolute path." "$LINENO" 5 18003+ as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5
17927+ ;; 18004+ ;;
17928+esac 18005+esac
17929+ 18006+
17930+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 18007+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
17931+$as_echo "${lt_sysroot:-no}" >&6; } 18008+$as_echo "${lt_sysroot:-no}" >&6; }
17932 18009+
17933 18010+
17934 18011+
17935@@ -7075,6 +7455,123 @@ esac 18012+
18013+
18014 # Check whether --enable-libtool-lock was given.
18015 if test "${enable_libtool_lock+set}" = set; then :
18016 enableval=$enable_libtool_lock;
18017@@ -7364,6 +7744,123 @@ esac
17936 18018
17937 need_locks="$enable_libtool_lock" 18019 need_locks="$enable_libtool_lock"
17938 18020
@@ -17941,7 +18023,7 @@ index 4f29887098..2127d39288 100755
17941+set dummy ${ac_tool_prefix}mt; ac_word=$2 18023+set dummy ${ac_tool_prefix}mt; ac_word=$2
17942+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 18024+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
17943+$as_echo_n "checking for $ac_word... " >&6; } 18025+$as_echo_n "checking for $ac_word... " >&6; }
17944+if test "${ac_cv_prog_MANIFEST_TOOL+set}" = set; then : 18026+if ${ac_cv_prog_MANIFEST_TOOL+:} false; then :
17945+ $as_echo_n "(cached) " >&6 18027+ $as_echo_n "(cached) " >&6
17946+else 18028+else
17947+ if test -n "$MANIFEST_TOOL"; then 18029+ if test -n "$MANIFEST_TOOL"; then
@@ -17953,7 +18035,7 @@ index 4f29887098..2127d39288 100755
17953+ IFS=$as_save_IFS 18035+ IFS=$as_save_IFS
17954+ test -z "$as_dir" && as_dir=. 18036+ test -z "$as_dir" && as_dir=.
17955+ for ac_exec_ext in '' $ac_executable_extensions; do 18037+ for ac_exec_ext in '' $ac_executable_extensions; do
17956+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 18038+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
17957+ ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" 18039+ ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
17958+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 18040+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
17959+ break 2 18041+ break 2
@@ -17981,7 +18063,7 @@ index 4f29887098..2127d39288 100755
17981+set dummy mt; ac_word=$2 18063+set dummy mt; ac_word=$2
17982+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 18064+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
17983+$as_echo_n "checking for $ac_word... " >&6; } 18065+$as_echo_n "checking for $ac_word... " >&6; }
17984+if test "${ac_cv_prog_ac_ct_MANIFEST_TOOL+set}" = set; then : 18066+if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then :
17985+ $as_echo_n "(cached) " >&6 18067+ $as_echo_n "(cached) " >&6
17986+else 18068+else
17987+ if test -n "$ac_ct_MANIFEST_TOOL"; then 18069+ if test -n "$ac_ct_MANIFEST_TOOL"; then
@@ -17993,7 +18075,7 @@ index 4f29887098..2127d39288 100755
17993+ IFS=$as_save_IFS 18075+ IFS=$as_save_IFS
17994+ test -z "$as_dir" && as_dir=. 18076+ test -z "$as_dir" && as_dir=.
17995+ for ac_exec_ext in '' $ac_executable_extensions; do 18077+ for ac_exec_ext in '' $ac_executable_extensions; do
17996+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 18078+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
17997+ ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" 18079+ ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
17998+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 18080+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
17999+ break 2 18081+ break 2
@@ -18031,7 +18113,7 @@ index 4f29887098..2127d39288 100755
18031+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt 18113+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
18032+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5 18114+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5
18033+$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; } 18115+$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; }
18034+if test "${lt_cv_path_mainfest_tool+set}" = set; then : 18116+if ${lt_cv_path_mainfest_tool+:} false; then :
18035+ $as_echo_n "(cached) " >&6 18117+ $as_echo_n "(cached) " >&6
18036+else 18118+else
18037+ lt_cv_path_mainfest_tool=no 18119+ lt_cv_path_mainfest_tool=no
@@ -18056,7 +18138,7 @@ index 4f29887098..2127d39288 100755
18056 18138
18057 case $host_os in 18139 case $host_os in
18058 rhapsody* | darwin*) 18140 rhapsody* | darwin*)
18059@@ -7638,6 +8135,8 @@ _LT_EOF 18141@@ -7927,6 +8424,8 @@ _LT_EOF
18060 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 18142 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
18061 echo "$AR cru libconftest.a conftest.o" >&5 18143 echo "$AR cru libconftest.a conftest.o" >&5
18062 $AR cru libconftest.a conftest.o 2>&5 18144 $AR cru libconftest.a conftest.o 2>&5
@@ -18065,7 +18147,7 @@ index 4f29887098..2127d39288 100755
18065 cat > conftest.c << _LT_EOF 18147 cat > conftest.c << _LT_EOF
18066 int main() { return 0;} 18148 int main() { return 0;}
18067 _LT_EOF 18149 _LT_EOF
18068@@ -7803,7 +8302,8 @@ fi 18150@@ -8092,7 +8591,8 @@ fi
18069 LIBTOOL_DEPS="$ltmain" 18151 LIBTOOL_DEPS="$ltmain"
18070 18152
18071 # Always use our own libtool. 18153 # Always use our own libtool.
@@ -18075,7 +18157,7 @@ index 4f29887098..2127d39288 100755
18075 18157
18076 18158
18077 18159
18078@@ -7892,7 +8392,7 @@ aix3*) 18160@@ -8181,7 +8681,7 @@ aix3*)
18079 esac 18161 esac
18080 18162
18081 # Global variables: 18163 # Global variables:
@@ -18084,7 +18166,7 @@ index 4f29887098..2127d39288 100755
18084 can_build_shared=yes 18166 can_build_shared=yes
18085 18167
18086 # All known linkers require a `.a' archive for static linking (except MSVC, 18168 # All known linkers require a `.a' archive for static linking (except MSVC,
18087@@ -8190,8 +8690,6 @@ fi 18169@@ -8479,8 +8979,6 @@ fi
18088 lt_prog_compiler_pic= 18170 lt_prog_compiler_pic=
18089 lt_prog_compiler_static= 18171 lt_prog_compiler_static=
18090 18172
@@ -18093,7 +18175,7 @@ index 4f29887098..2127d39288 100755
18093 18175
18094 if test "$GCC" = yes; then 18176 if test "$GCC" = yes; then
18095 lt_prog_compiler_wl='-Wl,' 18177 lt_prog_compiler_wl='-Wl,'
18096@@ -8357,6 +8855,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 18178@@ -8646,6 +9144,12 @@ $as_echo_n "checking for $compiler optio
18097 lt_prog_compiler_pic='--shared' 18179 lt_prog_compiler_pic='--shared'
18098 lt_prog_compiler_static='--static' 18180 lt_prog_compiler_static='--static'
18099 ;; 18181 ;;
@@ -18106,7 +18188,7 @@ index 4f29887098..2127d39288 100755
18106 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) 18188 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
18107 # Portland Group compilers (*not* the Pentium gcc compiler, 18189 # Portland Group compilers (*not* the Pentium gcc compiler,
18108 # which looks to be a dead project) 18190 # which looks to be a dead project)
18109@@ -8419,7 +8923,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 18191@@ -8708,7 +9212,7 @@ $as_echo_n "checking for $compiler optio
18110 lt_prog_compiler_pic='-KPIC' 18192 lt_prog_compiler_pic='-KPIC'
18111 lt_prog_compiler_static='-Bstatic' 18193 lt_prog_compiler_static='-Bstatic'
18112 case $cc_basename in 18194 case $cc_basename in
@@ -18115,7 +18197,7 @@ index 4f29887098..2127d39288 100755
18115 lt_prog_compiler_wl='-Qoption ld ';; 18197 lt_prog_compiler_wl='-Qoption ld ';;
18116 *) 18198 *)
18117 lt_prog_compiler_wl='-Wl,';; 18199 lt_prog_compiler_wl='-Wl,';;
18118@@ -8476,13 +8980,17 @@ case $host_os in 18200@@ -8765,13 +9269,17 @@ case $host_os in
18119 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" 18201 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
18120 ;; 18202 ;;
18121 esac 18203 esac
@@ -18128,7 +18210,7 @@ index 4f29887098..2127d39288 100755
18128 18210
18129+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 18211+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
18130+$as_echo_n "checking for $compiler option to produce PIC... " >&6; } 18212+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
18131+if test "${lt_cv_prog_compiler_pic+set}" = set; then : 18213+if ${lt_cv_prog_compiler_pic+:} false; then :
18132+ $as_echo_n "(cached) " >&6 18214+ $as_echo_n "(cached) " >&6
18133+else 18215+else
18134+ lt_cv_prog_compiler_pic=$lt_prog_compiler_pic 18216+ lt_cv_prog_compiler_pic=$lt_prog_compiler_pic
@@ -18139,7 +18221,7 @@ index 4f29887098..2127d39288 100755
18139 18221
18140 # 18222 #
18141 # Check to make sure the PIC flag actually works. 18223 # Check to make sure the PIC flag actually works.
18142@@ -8543,6 +9051,11 @@ fi 18224@@ -8832,6 +9340,11 @@ fi
18143 18225
18144 18226
18145 18227
@@ -18151,7 +18233,7 @@ index 4f29887098..2127d39288 100755
18151 # 18233 #
18152 # Check to make sure the static flag actually works. 18234 # Check to make sure the static flag actually works.
18153 # 18235 #
18154@@ -8893,7 +9406,8 @@ _LT_EOF 18236@@ -9182,7 +9695,8 @@ _LT_EOF
18155 allow_undefined_flag=unsupported 18237 allow_undefined_flag=unsupported
18156 always_export_symbols=no 18238 always_export_symbols=no
18157 enable_shared_with_static_runtimes=yes 18239 enable_shared_with_static_runtimes=yes
@@ -18161,7 +18243,7 @@ index 4f29887098..2127d39288 100755
18161 18243
18162 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then 18244 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
18163 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' 18245 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
18164@@ -8992,12 +9506,12 @@ _LT_EOF 18246@@ -9281,12 +9795,12 @@ _LT_EOF
18165 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' 18247 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
18166 hardcode_libdir_flag_spec= 18248 hardcode_libdir_flag_spec=
18167 hardcode_libdir_flag_spec_ld='-rpath $libdir' 18249 hardcode_libdir_flag_spec_ld='-rpath $libdir'
@@ -18176,7 +18258,7 @@ index 4f29887098..2127d39288 100755
18176 fi 18258 fi
18177 ;; 18259 ;;
18178 esac 18260 esac
18179@@ -9011,8 +9525,8 @@ _LT_EOF 18261@@ -9300,8 +9814,8 @@ _LT_EOF
18180 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' 18262 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
18181 wlarc= 18263 wlarc=
18182 else 18264 else
@@ -18187,7 +18269,7 @@ index 4f29887098..2127d39288 100755
18187 fi 18269 fi
18188 ;; 18270 ;;
18189 18271
18190@@ -9030,8 +9544,8 @@ _LT_EOF 18272@@ -9319,8 +9833,8 @@ _LT_EOF
18191 18273
18192 _LT_EOF 18274 _LT_EOF
18193 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 18275 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -18198,7 +18280,7 @@ index 4f29887098..2127d39288 100755
18198 else 18280 else
18199 ld_shlibs=no 18281 ld_shlibs=no
18200 fi 18282 fi
18201@@ -9077,8 +9591,8 @@ _LT_EOF 18283@@ -9366,8 +9880,8 @@ _LT_EOF
18202 18284
18203 *) 18285 *)
18204 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 18286 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -18209,7 +18291,7 @@ index 4f29887098..2127d39288 100755
18209 else 18291 else
18210 ld_shlibs=no 18292 ld_shlibs=no
18211 fi 18293 fi
18212@@ -9208,7 +9722,13 @@ _LT_EOF 18294@@ -9497,7 +10011,13 @@ _LT_EOF
18213 allow_undefined_flag='-berok' 18295 allow_undefined_flag='-berok'
18214 # Determine the default libpath from the value encoded in an 18296 # Determine the default libpath from the value encoded in an
18215 # empty executable. 18297 # empty executable.
@@ -18217,14 +18299,14 @@ index 4f29887098..2127d39288 100755
18217+ if test "${lt_cv_aix_libpath+set}" = set; then 18299+ if test "${lt_cv_aix_libpath+set}" = set; then
18218+ aix_libpath=$lt_cv_aix_libpath 18300+ aix_libpath=$lt_cv_aix_libpath
18219+else 18301+else
18220+ if test "${lt_cv_aix_libpath_+set}" = set; then : 18302+ if ${lt_cv_aix_libpath_+:} false; then :
18221+ $as_echo_n "(cached) " >&6 18303+ $as_echo_n "(cached) " >&6
18222+else 18304+else
18223+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext 18305+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
18224 /* end confdefs.h. */ 18306 /* end confdefs.h. */
18225 18307
18226 int 18308 int
18227@@ -9221,22 +9741,29 @@ main () 18309@@ -9510,22 +10030,29 @@ main ()
18228 _ACEOF 18310 _ACEOF
18229 if ac_fn_c_try_link "$LINENO"; then : 18311 if ac_fn_c_try_link "$LINENO"; then :
18230 18312
@@ -18267,7 +18349,7 @@ index 4f29887098..2127d39288 100755
18267 18349
18268 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 18350 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
18269 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" 18351 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"
18270@@ -9248,7 +9775,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 18352@@ -9537,7 +10064,13 @@ if test -z "$aix_libpath"; then aix_libp
18271 else 18353 else
18272 # Determine the default libpath from the value encoded in an 18354 # Determine the default libpath from the value encoded in an
18273 # empty executable. 18355 # empty executable.
@@ -18275,14 +18357,14 @@ index 4f29887098..2127d39288 100755
18275+ if test "${lt_cv_aix_libpath+set}" = set; then 18357+ if test "${lt_cv_aix_libpath+set}" = set; then
18276+ aix_libpath=$lt_cv_aix_libpath 18358+ aix_libpath=$lt_cv_aix_libpath
18277+else 18359+else
18278+ if test "${lt_cv_aix_libpath_+set}" = set; then : 18360+ if ${lt_cv_aix_libpath_+:} false; then :
18279+ $as_echo_n "(cached) " >&6 18361+ $as_echo_n "(cached) " >&6
18280+else 18362+else
18281+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext 18363+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
18282 /* end confdefs.h. */ 18364 /* end confdefs.h. */
18283 18365
18284 int 18366 int
18285@@ -9261,22 +9794,29 @@ main () 18367@@ -9550,22 +10083,29 @@ main ()
18286 _ACEOF 18368 _ACEOF
18287 if ac_fn_c_try_link "$LINENO"; then : 18369 if ac_fn_c_try_link "$LINENO"; then :
18288 18370
@@ -18325,7 +18407,7 @@ index 4f29887098..2127d39288 100755
18325 18407
18326 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 18408 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
18327 # Warning - without using the other run time loading flags, 18409 # Warning - without using the other run time loading flags,
18328@@ -9321,20 +9861,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 18410@@ -9610,20 +10150,63 @@ if test -z "$aix_libpath"; then aix_libp
18329 # Microsoft Visual C++. 18411 # Microsoft Visual C++.
18330 # hardcode_libdir_flag_spec is actually meaningless, as there is 18412 # hardcode_libdir_flag_spec is actually meaningless, as there is
18331 # no search path for DLLs. 18413 # no search path for DLLs.
@@ -18403,7 +18485,7 @@ index 4f29887098..2127d39288 100755
18403 ;; 18485 ;;
18404 18486
18405 darwin* | rhapsody*) 18487 darwin* | rhapsody*)
18406@@ -9395,7 +9978,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 18488@@ -9684,7 +10267,7 @@ if test -z "$aix_libpath"; then aix_libp
18407 18489
18408 # FreeBSD 3 and greater uses gcc -shared to do shared libraries. 18490 # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
18409 freebsd* | dragonfly*) 18491 freebsd* | dragonfly*)
@@ -18412,7 +18494,7 @@ index 4f29887098..2127d39288 100755
18412 hardcode_libdir_flag_spec='-R$libdir' 18494 hardcode_libdir_flag_spec='-R$libdir'
18413 hardcode_direct=yes 18495 hardcode_direct=yes
18414 hardcode_shlibpath_var=no 18496 hardcode_shlibpath_var=no
18415@@ -9403,7 +9986,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 18497@@ -9692,7 +10275,7 @@ if test -z "$aix_libpath"; then aix_libp
18416 18498
18417 hpux9*) 18499 hpux9*)
18418 if test "$GCC" = yes; then 18500 if test "$GCC" = yes; then
@@ -18421,7 +18503,7 @@ index 4f29887098..2127d39288 100755
18421 else 18503 else
18422 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' 18504 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'
18423 fi 18505 fi
18424@@ -9419,7 +10002,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 18506@@ -9708,7 +10291,7 @@ if test -z "$aix_libpath"; then aix_libp
18425 18507
18426 hpux10*) 18508 hpux10*)
18427 if test "$GCC" = yes && test "$with_gnu_ld" = no; then 18509 if test "$GCC" = yes && test "$with_gnu_ld" = no; then
@@ -18430,7 +18512,7 @@ index 4f29887098..2127d39288 100755
18430 else 18512 else
18431 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' 18513 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
18432 fi 18514 fi
18433@@ -9443,10 +10026,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 18515@@ -9732,10 +10315,10 @@ if test -z "$aix_libpath"; then aix_libp
18434 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' 18516 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
18435 ;; 18517 ;;
18436 ia64*) 18518 ia64*)
@@ -18443,7 +18525,7 @@ index 4f29887098..2127d39288 100755
18443 ;; 18525 ;;
18444 esac 18526 esac
18445 else 18527 else
18446@@ -9525,23 +10108,36 @@ fi 18528@@ -9814,23 +10397,36 @@ fi
18447 18529
18448 irix5* | irix6* | nonstopux*) 18530 irix5* | irix6* | nonstopux*)
18449 if test "$GCC" = yes; then 18531 if test "$GCC" = yes; then
@@ -18458,7 +18540,7 @@ index 4f29887098..2127d39288 100755
18458+ # This should be the same for all languages, so no per-tag cache variable. 18540+ # This should be the same for all languages, so no per-tag cache variable.
18459+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5 18541+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5
18460+$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; } 18542+$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; }
18461+if test "${lt_cv_irix_exported_symbol+set}" = set; then : 18543+if ${lt_cv_irix_exported_symbol+:} false; then :
18462+ $as_echo_n "(cached) " >&6 18544+ $as_echo_n "(cached) " >&6
18463+else 18545+else
18464+ save_LDFLAGS="$LDFLAGS" 18546+ save_LDFLAGS="$LDFLAGS"
@@ -18488,7 +18570,7 @@ index 4f29887098..2127d39288 100755
18488 else 18570 else
18489 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' 18571 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'
18490 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' 18572 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'
18491@@ -9626,7 +10222,7 @@ rm -f core conftest.err conftest.$ac_objext \ 18573@@ -9915,7 +10511,7 @@ rm -f core conftest.err conftest.$ac_obj
18492 osf4* | osf5*) # as osf3* with the addition of -msym flag 18574 osf4* | osf5*) # as osf3* with the addition of -msym flag
18493 if test "$GCC" = yes; then 18575 if test "$GCC" = yes; then
18494 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' 18576 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
@@ -18497,7 +18579,7 @@ index 4f29887098..2127d39288 100755
18497 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' 18579 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
18498 else 18580 else
18499 allow_undefined_flag=' -expect_unresolved \*' 18581 allow_undefined_flag=' -expect_unresolved \*'
18500@@ -9645,9 +10241,9 @@ rm -f core conftest.err conftest.$ac_objext \ 18582@@ -9934,9 +10530,9 @@ rm -f core conftest.err conftest.$ac_obj
18501 no_undefined_flag=' -z defs' 18583 no_undefined_flag=' -z defs'
18502 if test "$GCC" = yes; then 18584 if test "$GCC" = yes; then
18503 wlarc='${wl}' 18585 wlarc='${wl}'
@@ -18509,7 +18591,7 @@ index 4f29887098..2127d39288 100755
18509 else 18591 else
18510 case `$CC -V 2>&1` in 18592 case `$CC -V 2>&1` in
18511 *"Compilers 5.0"*) 18593 *"Compilers 5.0"*)
18512@@ -10223,8 +10819,9 @@ cygwin* | mingw* | pw32* | cegcc*) 18594@@ -10512,8 +11108,9 @@ cygwin* | mingw* | pw32* | cegcc*)
18513 need_version=no 18595 need_version=no
18514 need_lib_prefix=no 18596 need_lib_prefix=no
18515 18597
@@ -18521,7 +18603,7 @@ index 4f29887098..2127d39288 100755
18521 library_names_spec='$libname.dll.a' 18603 library_names_spec='$libname.dll.a'
18522 # DLL is installed to $(libdir)/../bin by postinstall_cmds 18604 # DLL is installed to $(libdir)/../bin by postinstall_cmds
18523 postinstall_cmds='base_file=`basename \${file}`~ 18605 postinstall_cmds='base_file=`basename \${file}`~
18524@@ -10257,13 +10854,71 @@ cygwin* | mingw* | pw32* | cegcc*) 18606@@ -10546,13 +11143,71 @@ cygwin* | mingw* | pw32* | cegcc*)
18525 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' 18607 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
18526 ;; 18608 ;;
18527 esac 18609 esac
@@ -18594,7 +18676,7 @@ index 4f29887098..2127d39288 100755
18594 # FIXME: first we should search . and the directory the executable is in 18676 # FIXME: first we should search . and the directory the executable is in
18595 shlibpath_var=PATH 18677 shlibpath_var=PATH
18596 ;; 18678 ;;
18597@@ -10355,7 +11010,7 @@ haiku*) 18679@@ -10644,7 +11299,7 @@ haiku*)
18598 soname_spec='${libname}${release}${shared_ext}$major' 18680 soname_spec='${libname}${release}${shared_ext}$major'
18599 shlibpath_var=LIBRARY_PATH 18681 shlibpath_var=LIBRARY_PATH
18600 shlibpath_overrides_runpath=yes 18682 shlibpath_overrides_runpath=yes
@@ -18603,7 +18685,16 @@ index 4f29887098..2127d39288 100755
18603 hardcode_into_libs=yes 18685 hardcode_into_libs=yes
18604 ;; 18686 ;;
18605 18687
18606@@ -11195,10 +11850,10 @@ else 18688@@ -11440,7 +12095,7 @@ else
18689 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
18690 lt_status=$lt_dlunknown
18691 cat > conftest.$ac_ext <<_LT_EOF
18692-#line 11443 "configure"
18693+#line $LINENO "configure"
18694 #include "confdefs.h"
18695
18696 #if HAVE_DLFCN_H
18697@@ -11484,10 +12139,10 @@ else
18607 /* When -fvisbility=hidden is used, assume the code has been annotated 18698 /* When -fvisbility=hidden is used, assume the code has been annotated
18608 correspondingly for the symbols needed. */ 18699 correspondingly for the symbols needed. */
18609 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 18700 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
@@ -18616,7 +18707,16 @@ index 4f29887098..2127d39288 100755
18616 int main () 18707 int main ()
18617 { 18708 {
18618 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 18709 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
18619@@ -11301,10 +11956,10 @@ else 18710@@ -11546,7 +12201,7 @@ else
18711 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
18712 lt_status=$lt_dlunknown
18713 cat > conftest.$ac_ext <<_LT_EOF
18714-#line 11549 "configure"
18715+#line $LINENO "configure"
18716 #include "confdefs.h"
18717
18718 #if HAVE_DLFCN_H
18719@@ -11590,10 +12245,10 @@ else
18620 /* When -fvisbility=hidden is used, assume the code has been annotated 18720 /* When -fvisbility=hidden is used, assume the code has been annotated
18621 correspondingly for the symbols needed. */ 18721 correspondingly for the symbols needed. */
18622 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 18722 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
@@ -18629,7 +18729,7 @@ index 4f29887098..2127d39288 100755
18629 int main () 18729 int main ()
18630 { 18730 {
18631 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 18731 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
18632@@ -12543,7 +13198,7 @@ if test "$enable_shared" = "yes"; then 18732@@ -12831,7 +13486,7 @@ if test "$enable_shared" = "yes"; then
18633 # since libbfd may not pull in the entirety of libiberty. 18733 # since libbfd may not pull in the entirety of libiberty.
18634 x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'` 18734 x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'`
18635 if test -n "$x"; then 18735 if test -n "$x"; then
@@ -18638,7 +18738,7 @@ index 4f29887098..2127d39288 100755
18638 fi 18738 fi
18639 18739
18640 case "${host}" in 18740 case "${host}" in
18641@@ -13520,13 +14175,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' 18741@@ -13807,13 +14462,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_
18642 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' 18742 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
18643 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' 18743 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
18644 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' 18744 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
@@ -18659,7 +18759,7 @@ index 4f29887098..2127d39288 100755
18659 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' 18759 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
18660 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' 18760 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
18661 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' 18761 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
18662@@ -13541,14 +14203,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de 18762@@ -13828,14 +14490,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$l
18663 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' 18763 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
18664 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' 18764 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
18665 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"`' 18765 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"`'
@@ -18678,7 +18778,7 @@ index 4f29887098..2127d39288 100755
18678 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' 18778 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
18679 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' 18779 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
18680 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' 18780 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
18681@@ -13581,12 +14246,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q 18781@@ -13868,12 +14533,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcod
18682 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' 18782 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
18683 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' 18783 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
18684 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' 18784 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
@@ -18692,7 +18792,7 @@ index 4f29887098..2127d39288 100755
18692 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' 18792 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
18693 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' 18793 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
18694 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' 18794 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
18695@@ -13641,8 +14306,13 @@ reload_flag \ 18795@@ -13928,8 +14593,13 @@ reload_flag \
18696 OBJDUMP \ 18796 OBJDUMP \
18697 deplibs_check_method \ 18797 deplibs_check_method \
18698 file_magic_cmd \ 18798 file_magic_cmd \
@@ -18706,7 +18806,7 @@ index 4f29887098..2127d39288 100755
18706 STRIP \ 18806 STRIP \
18707 RANLIB \ 18807 RANLIB \
18708 CC \ 18808 CC \
18709@@ -13652,12 +14322,14 @@ lt_cv_sys_global_symbol_pipe \ 18809@@ -13939,12 +14609,14 @@ lt_cv_sys_global_symbol_pipe \
18710 lt_cv_sys_global_symbol_to_cdecl \ 18810 lt_cv_sys_global_symbol_to_cdecl \
18711 lt_cv_sys_global_symbol_to_c_name_address \ 18811 lt_cv_sys_global_symbol_to_c_name_address \
18712 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ 18812 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
@@ -18722,7 +18822,7 @@ index 4f29887098..2127d39288 100755
18722 DSYMUTIL \ 18822 DSYMUTIL \
18723 NMEDIT \ 18823 NMEDIT \
18724 LIPO \ 18824 LIPO \
18725@@ -13673,7 +14345,6 @@ no_undefined_flag \ 18825@@ -13960,7 +14632,6 @@ no_undefined_flag \
18726 hardcode_libdir_flag_spec \ 18826 hardcode_libdir_flag_spec \
18727 hardcode_libdir_flag_spec_ld \ 18827 hardcode_libdir_flag_spec_ld \
18728 hardcode_libdir_separator \ 18828 hardcode_libdir_separator \
@@ -18730,7 +18830,7 @@ index 4f29887098..2127d39288 100755
18730 exclude_expsyms \ 18830 exclude_expsyms \
18731 include_expsyms \ 18831 include_expsyms \
18732 file_list_spec \ 18832 file_list_spec \
18733@@ -13709,6 +14380,7 @@ module_cmds \ 18833@@ -13996,6 +14667,7 @@ module_cmds \
18734 module_expsym_cmds \ 18834 module_expsym_cmds \
18735 export_symbols_cmds \ 18835 export_symbols_cmds \
18736 prelink_cmds \ 18836 prelink_cmds \
@@ -18738,7 +18838,7 @@ index 4f29887098..2127d39288 100755
18738 postinstall_cmds \ 18838 postinstall_cmds \
18739 postuninstall_cmds \ 18839 postuninstall_cmds \
18740 finish_cmds \ 18840 finish_cmds \
18741@@ -14465,7 +15137,8 @@ $as_echo X"$file" | 18841@@ -14761,7 +15433,8 @@ $as_echo X"$file" |
18742 # NOTE: Changes made to this file will be lost: look at ltmain.sh. 18842 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
18743 # 18843 #
18744 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 18844 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
@@ -18748,7 +18848,7 @@ index 4f29887098..2127d39288 100755
18748 # Written by Gordon Matzigkeit, 1996 18848 # Written by Gordon Matzigkeit, 1996
18749 # 18849 #
18750 # This file is part of GNU Libtool. 18850 # This file is part of GNU Libtool.
18751@@ -14568,19 +15241,42 @@ SP2NL=$lt_lt_SP2NL 18851@@ -14864,19 +15537,42 @@ SP2NL=$lt_lt_SP2NL
18752 # turn newlines into spaces. 18852 # turn newlines into spaces.
18753 NL2SP=$lt_lt_NL2SP 18853 NL2SP=$lt_lt_NL2SP
18754 18854
@@ -18792,7 +18892,7 @@ index 4f29887098..2127d39288 100755
18792 # A symbol stripping program. 18892 # A symbol stripping program.
18793 STRIP=$lt_STRIP 18893 STRIP=$lt_STRIP
18794 18894
18795@@ -14610,6 +15306,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address 18895@@ -14906,6 +15602,12 @@ global_symbol_to_c_name_address=$lt_lt_c
18796 # Transform the output of nm in a C name address pair when lib prefix is needed. 18896 # Transform the output of nm in a C name address pair when lib prefix is needed.
18797 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix 18897 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
18798 18898
@@ -18805,7 +18905,7 @@ index 4f29887098..2127d39288 100755
18805 # The name of the directory that contains temporary libtool files. 18905 # The name of the directory that contains temporary libtool files.
18806 objdir=$objdir 18906 objdir=$objdir
18807 18907
18808@@ -14619,6 +15321,9 @@ MAGIC_CMD=$MAGIC_CMD 18908@@ -14915,6 +15617,9 @@ MAGIC_CMD=$MAGIC_CMD
18809 # Must we lock files when doing compilation? 18909 # Must we lock files when doing compilation?
18810 need_locks=$lt_need_locks 18910 need_locks=$lt_need_locks
18811 18911
@@ -18815,7 +18915,7 @@ index 4f29887098..2127d39288 100755
18815 # Tool to manipulate archived DWARF debug symbol files on Mac OS X. 18915 # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
18816 DSYMUTIL=$lt_DSYMUTIL 18916 DSYMUTIL=$lt_DSYMUTIL
18817 18917
18818@@ -14733,12 +15438,12 @@ with_gcc=$GCC 18918@@ -15029,12 +15734,12 @@ with_gcc=$GCC
18819 # Compiler flag to turn off builtin functions. 18919 # Compiler flag to turn off builtin functions.
18820 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag 18920 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
18821 18921
@@ -18831,7 +18931,7 @@ index 4f29887098..2127d39288 100755
18831 # Compiler flag to prevent dynamic linking. 18931 # Compiler flag to prevent dynamic linking.
18832 link_static_flag=$lt_lt_prog_compiler_static 18932 link_static_flag=$lt_lt_prog_compiler_static
18833 18933
18834@@ -14825,9 +15530,6 @@ inherit_rpath=$inherit_rpath 18934@@ -15121,9 +15826,6 @@ inherit_rpath=$inherit_rpath
18835 # Whether libtool must link a program against all its dependency libraries. 18935 # Whether libtool must link a program against all its dependency libraries.
18836 link_all_deplibs=$link_all_deplibs 18936 link_all_deplibs=$link_all_deplibs
18837 18937
@@ -18841,7 +18941,7 @@ index 4f29887098..2127d39288 100755
18841 # Set to "yes" if exported symbols are required. 18941 # Set to "yes" if exported symbols are required.
18842 always_export_symbols=$always_export_symbols 18942 always_export_symbols=$always_export_symbols
18843 18943
18844@@ -14843,6 +15545,9 @@ include_expsyms=$lt_include_expsyms 18944@@ -15139,6 +15841,9 @@ include_expsyms=$lt_include_expsyms
18845 # Commands necessary for linking programs (against libraries) with templates. 18945 # Commands necessary for linking programs (against libraries) with templates.
18846 prelink_cmds=$lt_prelink_cmds 18946 prelink_cmds=$lt_prelink_cmds
18847 18947
@@ -18851,7 +18951,7 @@ index 4f29887098..2127d39288 100755
18851 # Specify filename containing input files. 18951 # Specify filename containing input files.
18852 file_list_spec=$lt_file_list_spec 18952 file_list_spec=$lt_file_list_spec
18853 18953
18854@@ -14875,210 +15580,169 @@ ltmain="$ac_aux_dir/ltmain.sh" 18954@@ -15171,210 +15876,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
18855 # if finds mixed CR/LF and LF-only lines. Since sed operates in 18955 # if finds mixed CR/LF and LF-only lines. Since sed operates in
18856 # text mode, it properly converts lines to CR/LF. This bash problem 18956 # text mode, it properly converts lines to CR/LF. This bash problem
18857 # is reportedly fixed, but why not run on old versions too? 18957 # is reportedly fixed, but why not run on old versions too?
@@ -19053,15 +19153,9 @@ index 4f29887098..2127d39288 100755
19053-_LT_EOF 19153-_LT_EOF
19054- ;; 19154- ;;
19055- esac 19155- esac
19056-
19057-
19058- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
19059- || (rm -f "$cfgfile"; exit 1)
19060-
19061- mv -f "$cfgfile" "$ofile" ||
19062+ sed '$q' "$ltmain" >> "$cfgfile" \ 19156+ sed '$q' "$ltmain" >> "$cfgfile" \
19063+ || (rm -f "$cfgfile"; exit 1) 19157+ || (rm -f "$cfgfile"; exit 1)
19064+ 19158
19065+ if test x"$xsi_shell" = xyes; then 19159+ if test x"$xsi_shell" = xyes; then
19066+ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ 19160+ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\
19067+func_dirname ()\ 19161+func_dirname ()\
@@ -19219,17 +19313,20 @@ index 4f29887098..2127d39288 100755
19219+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 19313+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5
19220+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} 19314+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;}
19221+fi 19315+fi
19222+ 19316
19223+ 19317- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
19318- || (rm -f "$cfgfile"; exit 1)
19319
19320- mv -f "$cfgfile" "$ofile" ||
19224+ mv -f "$cfgfile" "$ofile" || 19321+ mv -f "$cfgfile" "$ofile" ||
19225 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") 19322 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
19226 chmod +x "$ofile" 19323 chmod +x "$ofile"
19227 19324
19228diff --git a/opcodes/configure.ac b/opcodes/configure.ac 19325Index: git/opcodes/configure.ac
19229index b07f3f3629..5a32d9b1fc 100644 19326===================================================================
19230--- a/opcodes/configure.ac 19327--- git.orig/opcodes/configure.ac
19231+++ b/opcodes/configure.ac 19328+++ git/opcodes/configure.ac
19232@@ -167,7 +167,7 @@ changequote(,)dnl 19329@@ -166,7 +166,7 @@ changequote(,)dnl
19233 x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'` 19330 x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'`
19234 changequote([,])dnl 19331 changequote([,])dnl
19235 if test -n "$x"; then 19332 if test -n "$x"; then
@@ -19238,11 +19335,11 @@ index b07f3f3629..5a32d9b1fc 100644
19238 fi 19335 fi
19239 19336
19240 case "${host}" in 19337 case "${host}" in
19241diff --git a/zlib/configure b/zlib/configure 19338Index: git/zlib/configure
19242index dc2d9ed383..ed9a492f5c 100755 19339===================================================================
19243--- a/zlib/configure 19340--- git.orig/zlib/configure
19244+++ b/zlib/configure 19341+++ git/zlib/configure
19245@@ -614,8 +614,11 @@ OTOOL 19342@@ -646,8 +646,11 @@ OTOOL
19246 LIPO 19343 LIPO
19247 NMEDIT 19344 NMEDIT
19248 DSYMUTIL 19345 DSYMUTIL
@@ -19254,7 +19351,7 @@ index dc2d9ed383..ed9a492f5c 100755
19254 OBJDUMP 19351 OBJDUMP
19255 LN_S 19352 LN_S
19256 NM 19353 NM
19257@@ -737,6 +740,7 @@ enable_static 19354@@ -774,6 +777,7 @@ enable_static
19258 with_pic 19355 with_pic
19259 enable_fast_install 19356 enable_fast_install
19260 with_gnu_ld 19357 with_gnu_ld
@@ -19262,7 +19359,7 @@ index dc2d9ed383..ed9a492f5c 100755
19262 enable_libtool_lock 19359 enable_libtool_lock
19263 enable_host_shared 19360 enable_host_shared
19264 ' 19361 '
19265@@ -1385,6 +1389,8 @@ Optional Packages: 19362@@ -1428,6 +1432,8 @@ Optional Packages:
19266 --with-pic try to use only PIC/non-PIC objects [default=use 19363 --with-pic try to use only PIC/non-PIC objects [default=use
19267 both] 19364 both]
19268 --with-gnu-ld assume the C compiler uses GNU ld [default=no] 19365 --with-gnu-ld assume the C compiler uses GNU ld [default=no]
@@ -19271,7 +19368,7 @@ index dc2d9ed383..ed9a492f5c 100755
19271 19368
19272 Some influential environment variables: 19369 Some influential environment variables:
19273 CC C compiler command 19370 CC C compiler command
19274@@ -3910,8 +3916,8 @@ esac 19371@@ -4147,8 +4153,8 @@ esac
19275 19372
19276 19373
19277 19374
@@ -19282,7 +19379,7 @@ index dc2d9ed383..ed9a492f5c 100755
19282 19379
19283 19380
19284 19381
19285@@ -3951,7 +3957,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO 19382@@ -4188,7 +4194,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
19286 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 19383 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
19287 $as_echo_n "checking how to print strings... " >&6; } 19384 $as_echo_n "checking how to print strings... " >&6; }
19288 # Test print first, because it will be a builtin if present. 19385 # Test print first, because it will be a builtin if present.
@@ -19291,7 +19388,7 @@ index dc2d9ed383..ed9a492f5c 100755
19291 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then 19388 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
19292 ECHO='print -r --' 19389 ECHO='print -r --'
19293 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then 19390 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
19294@@ -4767,8 +4773,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; 19391@@ -5004,8 +5010,8 @@ $as_echo_n "checking whether the shell u
19295 # Try some XSI features 19392 # Try some XSI features
19296 xsi_shell=no 19393 xsi_shell=no
19297 ( _lt_dummy="a/b/c" 19394 ( _lt_dummy="a/b/c"
@@ -19302,13 +19399,13 @@ index dc2d9ed383..ed9a492f5c 100755
19302 && eval 'test $(( 1 + 1 )) -eq 2 \ 19399 && eval 'test $(( 1 + 1 )) -eq 2 \
19303 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ 19400 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
19304 && xsi_shell=yes 19401 && xsi_shell=yes
19305@@ -4817,6 +4823,80 @@ esac 19402@@ -5054,6 +5060,80 @@ esac
19306 19403
19307 19404
19308 19405
19309+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5 19406+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5
19310+$as_echo_n "checking how to convert $build file names to $host format... " >&6; } 19407+$as_echo_n "checking how to convert $build file names to $host format... " >&6; }
19311+if test "${lt_cv_to_host_file_cmd+set}" = set; then : 19408+if ${lt_cv_to_host_file_cmd+:} false; then :
19312+ $as_echo_n "(cached) " >&6 19409+ $as_echo_n "(cached) " >&6
19313+else 19410+else
19314+ case $host in 19411+ case $host in
@@ -19355,7 +19452,7 @@ index dc2d9ed383..ed9a492f5c 100755
19355+ 19452+
19356+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5 19453+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5
19357+$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; } 19454+$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; }
19358+if test "${lt_cv_to_tool_file_cmd+set}" = set; then : 19455+if ${lt_cv_to_tool_file_cmd+:} false; then :
19359+ $as_echo_n "(cached) " >&6 19456+ $as_echo_n "(cached) " >&6
19360+else 19457+else
19361+ #assume ordinary cross tools, or native build. 19458+ #assume ordinary cross tools, or native build.
@@ -19382,8 +19479,8 @@ index dc2d9ed383..ed9a492f5c 100755
19382+ 19479+
19383 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 19480 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
19384 $as_echo_n "checking for $LD option to reload object files... " >&6; } 19481 $as_echo_n "checking for $LD option to reload object files... " >&6; }
19385 if test "${lt_cv_ld_reload_flag+set}" = set; then : 19482 if ${lt_cv_ld_reload_flag+:} false; then :
19386@@ -4833,6 +4913,11 @@ case $reload_flag in 19483@@ -5070,6 +5150,11 @@ case $reload_flag in
19387 esac 19484 esac
19388 reload_cmds='$LD$reload_flag -o $output$reload_objs' 19485 reload_cmds='$LD$reload_flag -o $output$reload_objs'
19389 case $host_os in 19486 case $host_os in
@@ -19395,7 +19492,7 @@ index dc2d9ed383..ed9a492f5c 100755
19395 darwin*) 19492 darwin*)
19396 if test "$GCC" = yes; then 19493 if test "$GCC" = yes; then
19397 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' 19494 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
19398@@ -5001,7 +5086,8 @@ mingw* | pw32*) 19495@@ -5238,7 +5323,8 @@ mingw* | pw32*)
19399 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' 19496 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
19400 lt_cv_file_magic_cmd='func_win32_libid' 19497 lt_cv_file_magic_cmd='func_win32_libid'
19401 else 19498 else
@@ -19405,7 +19502,7 @@ index dc2d9ed383..ed9a492f5c 100755
19405 lt_cv_file_magic_cmd='$OBJDUMP -f' 19502 lt_cv_file_magic_cmd='$OBJDUMP -f'
19406 fi 19503 fi
19407 ;; 19504 ;;
19408@@ -5155,6 +5241,21 @@ esac 19505@@ -5392,6 +5478,21 @@ esac
19409 fi 19506 fi
19410 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 19507 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
19411 $as_echo "$lt_cv_deplibs_check_method" >&6; } 19508 $as_echo "$lt_cv_deplibs_check_method" >&6; }
@@ -19427,7 +19524,7 @@ index dc2d9ed383..ed9a492f5c 100755
19427 file_magic_cmd=$lt_cv_file_magic_cmd 19524 file_magic_cmd=$lt_cv_file_magic_cmd
19428 deplibs_check_method=$lt_cv_deplibs_check_method 19525 deplibs_check_method=$lt_cv_deplibs_check_method
19429 test -z "$deplibs_check_method" && deplibs_check_method=unknown 19526 test -z "$deplibs_check_method" && deplibs_check_method=unknown
19430@@ -5168,11 +5269,165 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown 19527@@ -5407,9 +5508,163 @@ test -z "$deplibs_check_method" && depli
19431 19528
19432 19529
19433 19530
@@ -19441,8 +19538,6 @@ index dc2d9ed383..ed9a492f5c 100755
19441+ 19538+
19442+ 19539+
19443+ 19540+
19444
19445
19446 if test -n "$ac_tool_prefix"; then 19541 if test -n "$ac_tool_prefix"; then
19447- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. 19542- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
19448-set dummy ${ac_tool_prefix}ar; ac_word=$2 19543-set dummy ${ac_tool_prefix}ar; ac_word=$2
@@ -19450,7 +19545,7 @@ index dc2d9ed383..ed9a492f5c 100755
19450+set dummy ${ac_tool_prefix}dlltool; ac_word=$2 19545+set dummy ${ac_tool_prefix}dlltool; ac_word=$2
19451+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 19546+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
19452+$as_echo_n "checking for $ac_word... " >&6; } 19547+$as_echo_n "checking for $ac_word... " >&6; }
19453+if test "${ac_cv_prog_DLLTOOL+set}" = set; then : 19548+if ${ac_cv_prog_DLLTOOL+:} false; then :
19454+ $as_echo_n "(cached) " >&6 19549+ $as_echo_n "(cached) " >&6
19455+else 19550+else
19456+ if test -n "$DLLTOOL"; then 19551+ if test -n "$DLLTOOL"; then
@@ -19462,7 +19557,7 @@ index dc2d9ed383..ed9a492f5c 100755
19462+ IFS=$as_save_IFS 19557+ IFS=$as_save_IFS
19463+ test -z "$as_dir" && as_dir=. 19558+ test -z "$as_dir" && as_dir=.
19464+ for ac_exec_ext in '' $ac_executable_extensions; do 19559+ for ac_exec_ext in '' $ac_executable_extensions; do
19465+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 19560+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
19466+ ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" 19561+ ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
19467+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 19562+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
19468+ break 2 19563+ break 2
@@ -19490,7 +19585,7 @@ index dc2d9ed383..ed9a492f5c 100755
19490+set dummy dlltool; ac_word=$2 19585+set dummy dlltool; ac_word=$2
19491+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 19586+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
19492+$as_echo_n "checking for $ac_word... " >&6; } 19587+$as_echo_n "checking for $ac_word... " >&6; }
19493+if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then : 19588+if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then :
19494+ $as_echo_n "(cached) " >&6 19589+ $as_echo_n "(cached) " >&6
19495+else 19590+else
19496+ if test -n "$ac_ct_DLLTOOL"; then 19591+ if test -n "$ac_ct_DLLTOOL"; then
@@ -19502,7 +19597,7 @@ index dc2d9ed383..ed9a492f5c 100755
19502+ IFS=$as_save_IFS 19597+ IFS=$as_save_IFS
19503+ test -z "$as_dir" && as_dir=. 19598+ test -z "$as_dir" && as_dir=.
19504+ for ac_exec_ext in '' $ac_executable_extensions; do 19599+ for ac_exec_ext in '' $ac_executable_extensions; do
19505+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 19600+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
19506+ ac_cv_prog_ac_ct_DLLTOOL="dlltool" 19601+ ac_cv_prog_ac_ct_DLLTOOL="dlltool"
19507+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 19602+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
19508+ break 2 19603+ break 2
@@ -19550,7 +19645,7 @@ index dc2d9ed383..ed9a492f5c 100755
19550+ 19645+
19551+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5 19646+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5
19552+$as_echo_n "checking how to associate runtime and link libraries... " >&6; } 19647+$as_echo_n "checking how to associate runtime and link libraries... " >&6; }
19553+if test "${lt_cv_sharedlib_from_linklib_cmd+set}" = set; then : 19648+if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then :
19554+ $as_echo_n "(cached) " >&6 19649+ $as_echo_n "(cached) " >&6
19555+else 19650+else
19556+ lt_cv_sharedlib_from_linklib_cmd='unknown' 19651+ lt_cv_sharedlib_from_linklib_cmd='unknown'
@@ -19594,17 +19689,17 @@ index dc2d9ed383..ed9a492f5c 100755
19594+set dummy $ac_tool_prefix$ac_prog; ac_word=$2 19689+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
19595 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 19690 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
19596 $as_echo_n "checking for $ac_word... " >&6; } 19691 $as_echo_n "checking for $ac_word... " >&6; }
19597 if test "${ac_cv_prog_AR+set}" = set; then : 19692 if ${ac_cv_prog_AR+:} false; then :
19598@@ -5188,7 +5443,7 @@ do 19693@@ -5425,7 +5680,7 @@ do
19599 test -z "$as_dir" && as_dir=. 19694 test -z "$as_dir" && as_dir=.
19600 for ac_exec_ext in '' $ac_executable_extensions; do 19695 for ac_exec_ext in '' $ac_executable_extensions; do
19601 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 19696 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
19602- ac_cv_prog_AR="${ac_tool_prefix}ar" 19697- ac_cv_prog_AR="${ac_tool_prefix}ar"
19603+ ac_cv_prog_AR="$ac_tool_prefix$ac_prog" 19698+ ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
19604 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 19699 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
19605 break 2 19700 break 2
19606 fi 19701 fi
19607@@ -5208,11 +5463,15 @@ $as_echo "no" >&6; } 19702@@ -5445,11 +5700,15 @@ $as_echo "no" >&6; }
19608 fi 19703 fi
19609 19704
19610 19705
@@ -19622,17 +19717,17 @@ index dc2d9ed383..ed9a492f5c 100755
19622+set dummy $ac_prog; ac_word=$2 19717+set dummy $ac_prog; ac_word=$2
19623 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 19718 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
19624 $as_echo_n "checking for $ac_word... " >&6; } 19719 $as_echo_n "checking for $ac_word... " >&6; }
19625 if test "${ac_cv_prog_ac_ct_AR+set}" = set; then : 19720 if ${ac_cv_prog_ac_ct_AR+:} false; then :
19626@@ -5228,7 +5487,7 @@ do 19721@@ -5465,7 +5724,7 @@ do
19627 test -z "$as_dir" && as_dir=. 19722 test -z "$as_dir" && as_dir=.
19628 for ac_exec_ext in '' $ac_executable_extensions; do 19723 for ac_exec_ext in '' $ac_executable_extensions; do
19629 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 19724 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
19630- ac_cv_prog_ac_ct_AR="ar" 19725- ac_cv_prog_ac_ct_AR="ar"
19631+ ac_cv_prog_ac_ct_AR="$ac_prog" 19726+ ac_cv_prog_ac_ct_AR="$ac_prog"
19632 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 19727 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
19633 break 2 19728 break 2
19634 fi 19729 fi
19635@@ -5247,6 +5506,10 @@ else 19730@@ -5484,6 +5743,10 @@ else
19636 $as_echo "no" >&6; } 19731 $as_echo "no" >&6; }
19637 fi 19732 fi
19638 19733
@@ -19643,7 +19738,7 @@ index dc2d9ed383..ed9a492f5c 100755
19643 if test "x$ac_ct_AR" = x; then 19738 if test "x$ac_ct_AR" = x; then
19644 AR="false" 19739 AR="false"
19645 else 19740 else
19646@@ -5258,16 +5521,72 @@ ac_tool_warned=yes ;; 19741@@ -5495,12 +5758,10 @@ ac_tool_warned=yes ;;
19647 esac 19742 esac
19648 AR=$ac_ct_AR 19743 AR=$ac_ct_AR
19649 fi 19744 fi
@@ -19655,20 +19750,16 @@ index dc2d9ed383..ed9a492f5c 100755
19655-test -z "$AR_FLAGS" && AR_FLAGS=cru 19750-test -z "$AR_FLAGS" && AR_FLAGS=cru
19656+: ${AR=ar} 19751+: ${AR=ar}
19657+: ${AR_FLAGS=cru} 19752+: ${AR_FLAGS=cru}
19658+ 19753
19659+ 19754
19660+ 19755
19661+ 19756@@ -5512,6 +5773,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru
19662+ 19757
19663+ 19758
19664+ 19759
19665+
19666+
19667+
19668+
19669+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 19760+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
19670+$as_echo_n "checking for archiver @FILE support... " >&6; } 19761+$as_echo_n "checking for archiver @FILE support... " >&6; }
19671+if test "${lt_cv_ar_at_file+set}" = set; then : 19762+if ${lt_cv_ar_at_file+:} false; then :
19672+ $as_echo_n "(cached) " >&6 19763+ $as_echo_n "(cached) " >&6
19673+else 19764+else
19674+ lt_cv_ar_at_file=no 19765+ lt_cv_ar_at_file=no
@@ -19678,7 +19769,7 @@ index dc2d9ed383..ed9a492f5c 100755
19678+int 19769+int
19679+main () 19770+main ()
19680+{ 19771+{
19681 19772+
19682+ ; 19773+ ;
19683+ return 0; 19774+ return 0;
19684+} 19775+}
@@ -19704,23 +19795,30 @@ index dc2d9ed383..ed9a492f5c 100755
19704+ fi 19795+ fi
19705+ fi 19796+ fi
19706+ rm -f conftest.* libconftest.a 19797+ rm -f conftest.* libconftest.a
19707 19798+
19708+fi 19799+fi
19709+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext 19800+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
19710 19801+
19711+fi 19802+fi
19712+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 19803+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
19713+$as_echo "$lt_cv_ar_at_file" >&6; } 19804+$as_echo "$lt_cv_ar_at_file" >&6; }
19714 19805+
19715+if test "x$lt_cv_ar_at_file" = xno; then 19806+if test "x$lt_cv_ar_at_file" = xno; then
19716+ archiver_list_spec= 19807+ archiver_list_spec=
19717+else 19808+else
19718+ archiver_list_spec=$lt_cv_ar_at_file 19809+ archiver_list_spec=$lt_cv_ar_at_file
19719+fi 19810+fi
19720 19811+
19721 19812+
19722 19813+
19723@@ -5609,8 +5928,8 @@ esac 19814+
19815+
19816+
19817+
19818 if test -n "$ac_tool_prefix"; then
19819 # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
19820 set dummy ${ac_tool_prefix}strip; ac_word=$2
19821@@ -5846,8 +6165,8 @@ esac
19724 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" 19822 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
19725 19823
19726 # Transform an extracted symbol line into symbol name and symbol address 19824 # Transform an extracted symbol line into symbol name and symbol address
@@ -19731,7 +19829,7 @@ index dc2d9ed383..ed9a492f5c 100755
19731 19829
19732 # Handle CRLF in mingw tool chain 19830 # Handle CRLF in mingw tool chain
19733 opt_cr= 19831 opt_cr=
19734@@ -5646,6 +5965,7 @@ for ac_symprfx in "" "_"; do 19832@@ -5883,6 +6202,7 @@ for ac_symprfx in "" "_"; do
19735 else 19833 else
19736 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" 19834 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
19737 fi 19835 fi
@@ -19739,7 +19837,7 @@ index dc2d9ed383..ed9a492f5c 100755
19739 19837
19740 # Check to see that the pipe works correctly. 19838 # Check to see that the pipe works correctly.
19741 pipe_works=no 19839 pipe_works=no
19742@@ -5687,6 +6007,18 @@ _LT_EOF 19840@@ -5924,6 +6244,18 @@ _LT_EOF
19743 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then 19841 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
19744 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then 19842 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
19745 cat <<_LT_EOF > conftest.$ac_ext 19843 cat <<_LT_EOF > conftest.$ac_ext
@@ -19758,7 +19856,7 @@ index dc2d9ed383..ed9a492f5c 100755
19758 #ifdef __cplusplus 19856 #ifdef __cplusplus
19759 extern "C" { 19857 extern "C" {
19760 #endif 19858 #endif
19761@@ -5698,7 +6030,7 @@ _LT_EOF 19859@@ -5935,7 +6267,7 @@ _LT_EOF
19762 cat <<_LT_EOF >> conftest.$ac_ext 19860 cat <<_LT_EOF >> conftest.$ac_ext
19763 19861
19764 /* The mapping between symbol names and symbols. */ 19862 /* The mapping between symbol names and symbols. */
@@ -19767,7 +19865,7 @@ index dc2d9ed383..ed9a492f5c 100755
19767 const char *name; 19865 const char *name;
19768 void *address; 19866 void *address;
19769 } 19867 }
19770@@ -5724,8 +6056,8 @@ static const void *lt_preloaded_setup() { 19868@@ -5961,8 +6293,8 @@ static const void *lt_preloaded_setup()
19771 _LT_EOF 19869 _LT_EOF
19772 # Now try linking the two files. 19870 # Now try linking the two files.
19773 mv conftest.$ac_objext conftstm.$ac_objext 19871 mv conftest.$ac_objext conftstm.$ac_objext
@@ -19778,7 +19876,7 @@ index dc2d9ed383..ed9a492f5c 100755
19778 LIBS="conftstm.$ac_objext" 19876 LIBS="conftstm.$ac_objext"
19779 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" 19877 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
19780 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 19878 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
19781@@ -5735,8 +6067,8 @@ _LT_EOF 19879@@ -5972,8 +6304,8 @@ _LT_EOF
19782 test $ac_status = 0; } && test -s conftest${ac_exeext}; then 19880 test $ac_status = 0; } && test -s conftest${ac_exeext}; then
19783 pipe_works=yes 19881 pipe_works=yes
19784 fi 19882 fi
@@ -19789,7 +19887,7 @@ index dc2d9ed383..ed9a492f5c 100755
19789 else 19887 else
19790 echo "cannot find nm_test_func in $nlist" >&5 19888 echo "cannot find nm_test_func in $nlist" >&5
19791 fi 19889 fi
19792@@ -5773,6 +6105,19 @@ else 19890@@ -6010,6 +6342,18 @@ else
19793 $as_echo "ok" >&6; } 19891 $as_echo "ok" >&6; }
19794 fi 19892 fi
19795 19893
@@ -19805,17 +19903,13 @@ index dc2d9ed383..ed9a492f5c 100755
19805+ 19903+
19806+ 19904+
19807+ 19905+
19808+
19809 19906
19810 19907
19811 19908
19812@@ -5790,6 +6135,41 @@ fi 19909@@ -6031,6 +6375,42 @@ fi
19813 19910
19814 19911
19815 19912
19816+
19817+
19818+
19819+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 19913+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
19820+$as_echo_n "checking for sysroot... " >&6; } 19914+$as_echo_n "checking for sysroot... " >&6; }
19821+ 19915+
@@ -19842,16 +19936,20 @@ index dc2d9ed383..ed9a492f5c 100755
19842+ *) 19936+ *)
19843+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5 19937+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5
19844+$as_echo "${with_libtool_sysroot}" >&6; } 19938+$as_echo "${with_libtool_sysroot}" >&6; }
19845+ as_fn_error "The sysroot must be an absolute path." "$LINENO" 5 19939+ as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5
19846+ ;; 19940+ ;;
19847+esac 19941+esac
19848+ 19942+
19849+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 19943+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
19850+$as_echo "${lt_sysroot:-no}" >&6; } 19944+$as_echo "${lt_sysroot:-no}" >&6; }
19945+
19946+
19947+
19948+
19851 19949
19852 19950 # Check whether --enable-libtool-lock was given.
19853 19951 if test "${enable_libtool_lock+set}" = set; then :
19854@@ -6004,6 +6384,123 @@ esac 19952@@ -6241,6 +6621,123 @@ esac
19855 19953
19856 need_locks="$enable_libtool_lock" 19954 need_locks="$enable_libtool_lock"
19857 19955
@@ -19860,7 +19958,7 @@ index dc2d9ed383..ed9a492f5c 100755
19860+set dummy ${ac_tool_prefix}mt; ac_word=$2 19958+set dummy ${ac_tool_prefix}mt; ac_word=$2
19861+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 19959+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
19862+$as_echo_n "checking for $ac_word... " >&6; } 19960+$as_echo_n "checking for $ac_word... " >&6; }
19863+if test "${ac_cv_prog_MANIFEST_TOOL+set}" = set; then : 19961+if ${ac_cv_prog_MANIFEST_TOOL+:} false; then :
19864+ $as_echo_n "(cached) " >&6 19962+ $as_echo_n "(cached) " >&6
19865+else 19963+else
19866+ if test -n "$MANIFEST_TOOL"; then 19964+ if test -n "$MANIFEST_TOOL"; then
@@ -19872,7 +19970,7 @@ index dc2d9ed383..ed9a492f5c 100755
19872+ IFS=$as_save_IFS 19970+ IFS=$as_save_IFS
19873+ test -z "$as_dir" && as_dir=. 19971+ test -z "$as_dir" && as_dir=.
19874+ for ac_exec_ext in '' $ac_executable_extensions; do 19972+ for ac_exec_ext in '' $ac_executable_extensions; do
19875+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 19973+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
19876+ ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" 19974+ ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
19877+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 19975+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
19878+ break 2 19976+ break 2
@@ -19900,7 +19998,7 @@ index dc2d9ed383..ed9a492f5c 100755
19900+set dummy mt; ac_word=$2 19998+set dummy mt; ac_word=$2
19901+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 19999+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
19902+$as_echo_n "checking for $ac_word... " >&6; } 20000+$as_echo_n "checking for $ac_word... " >&6; }
19903+if test "${ac_cv_prog_ac_ct_MANIFEST_TOOL+set}" = set; then : 20001+if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then :
19904+ $as_echo_n "(cached) " >&6 20002+ $as_echo_n "(cached) " >&6
19905+else 20003+else
19906+ if test -n "$ac_ct_MANIFEST_TOOL"; then 20004+ if test -n "$ac_ct_MANIFEST_TOOL"; then
@@ -19912,7 +20010,7 @@ index dc2d9ed383..ed9a492f5c 100755
19912+ IFS=$as_save_IFS 20010+ IFS=$as_save_IFS
19913+ test -z "$as_dir" && as_dir=. 20011+ test -z "$as_dir" && as_dir=.
19914+ for ac_exec_ext in '' $ac_executable_extensions; do 20012+ for ac_exec_ext in '' $ac_executable_extensions; do
19915+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 20013+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
19916+ ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" 20014+ ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
19917+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 20015+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
19918+ break 2 20016+ break 2
@@ -19950,7 +20048,7 @@ index dc2d9ed383..ed9a492f5c 100755
19950+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt 20048+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
19951+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5 20049+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5
19952+$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; } 20050+$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; }
19953+if test "${lt_cv_path_mainfest_tool+set}" = set; then : 20051+if ${lt_cv_path_mainfest_tool+:} false; then :
19954+ $as_echo_n "(cached) " >&6 20052+ $as_echo_n "(cached) " >&6
19955+else 20053+else
19956+ lt_cv_path_mainfest_tool=no 20054+ lt_cv_path_mainfest_tool=no
@@ -19975,7 +20073,7 @@ index dc2d9ed383..ed9a492f5c 100755
19975 20073
19976 case $host_os in 20074 case $host_os in
19977 rhapsody* | darwin*) 20075 rhapsody* | darwin*)
19978@@ -6570,6 +7067,8 @@ _LT_EOF 20076@@ -6807,6 +7304,8 @@ _LT_EOF
19979 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 20077 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
19980 echo "$AR cru libconftest.a conftest.o" >&5 20078 echo "$AR cru libconftest.a conftest.o" >&5
19981 $AR cru libconftest.a conftest.o 2>&5 20079 $AR cru libconftest.a conftest.o 2>&5
@@ -19984,7 +20082,7 @@ index dc2d9ed383..ed9a492f5c 100755
19984 cat > conftest.c << _LT_EOF 20082 cat > conftest.c << _LT_EOF
19985 int main() { return 0;} 20083 int main() { return 0;}
19986 _LT_EOF 20084 _LT_EOF
19987@@ -7033,7 +7532,8 @@ fi 20085@@ -7269,7 +7768,8 @@ fi
19988 LIBTOOL_DEPS="$ltmain" 20086 LIBTOOL_DEPS="$ltmain"
19989 20087
19990 # Always use our own libtool. 20088 # Always use our own libtool.
@@ -19994,7 +20092,7 @@ index dc2d9ed383..ed9a492f5c 100755
19994 20092
19995 20093
19996 20094
19997@@ -7122,7 +7622,7 @@ aix3*) 20095@@ -7358,7 +7858,7 @@ aix3*)
19998 esac 20096 esac
19999 20097
20000 # Global variables: 20098 # Global variables:
@@ -20003,7 +20101,7 @@ index dc2d9ed383..ed9a492f5c 100755
20003 can_build_shared=yes 20101 can_build_shared=yes
20004 20102
20005 # All known linkers require a `.a' archive for static linking (except MSVC, 20103 # All known linkers require a `.a' archive for static linking (except MSVC,
20006@@ -7420,8 +7920,6 @@ fi 20104@@ -7656,8 +8156,6 @@ fi
20007 lt_prog_compiler_pic= 20105 lt_prog_compiler_pic=
20008 lt_prog_compiler_static= 20106 lt_prog_compiler_static=
20009 20107
@@ -20012,7 +20110,7 @@ index dc2d9ed383..ed9a492f5c 100755
20012 20110
20013 if test "$GCC" = yes; then 20111 if test "$GCC" = yes; then
20014 lt_prog_compiler_wl='-Wl,' 20112 lt_prog_compiler_wl='-Wl,'
20015@@ -7587,6 +8085,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 20113@@ -7823,6 +8321,12 @@ $as_echo_n "checking for $compiler optio
20016 lt_prog_compiler_pic='--shared' 20114 lt_prog_compiler_pic='--shared'
20017 lt_prog_compiler_static='--static' 20115 lt_prog_compiler_static='--static'
20018 ;; 20116 ;;
@@ -20025,7 +20123,7 @@ index dc2d9ed383..ed9a492f5c 100755
20025 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) 20123 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
20026 # Portland Group compilers (*not* the Pentium gcc compiler, 20124 # Portland Group compilers (*not* the Pentium gcc compiler,
20027 # which looks to be a dead project) 20125 # which looks to be a dead project)
20028@@ -7649,7 +8153,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 20126@@ -7885,7 +8389,7 @@ $as_echo_n "checking for $compiler optio
20029 lt_prog_compiler_pic='-KPIC' 20127 lt_prog_compiler_pic='-KPIC'
20030 lt_prog_compiler_static='-Bstatic' 20128 lt_prog_compiler_static='-Bstatic'
20031 case $cc_basename in 20129 case $cc_basename in
@@ -20034,7 +20132,7 @@ index dc2d9ed383..ed9a492f5c 100755
20034 lt_prog_compiler_wl='-Qoption ld ';; 20132 lt_prog_compiler_wl='-Qoption ld ';;
20035 *) 20133 *)
20036 lt_prog_compiler_wl='-Wl,';; 20134 lt_prog_compiler_wl='-Wl,';;
20037@@ -7706,13 +8210,17 @@ case $host_os in 20135@@ -7942,13 +8446,17 @@ case $host_os in
20038 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" 20136 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
20039 ;; 20137 ;;
20040 esac 20138 esac
@@ -20047,7 +20145,7 @@ index dc2d9ed383..ed9a492f5c 100755
20047 20145
20048+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 20146+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
20049+$as_echo_n "checking for $compiler option to produce PIC... " >&6; } 20147+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
20050+if test "${lt_cv_prog_compiler_pic+set}" = set; then : 20148+if ${lt_cv_prog_compiler_pic+:} false; then :
20051+ $as_echo_n "(cached) " >&6 20149+ $as_echo_n "(cached) " >&6
20052+else 20150+else
20053+ lt_cv_prog_compiler_pic=$lt_prog_compiler_pic 20151+ lt_cv_prog_compiler_pic=$lt_prog_compiler_pic
@@ -20058,7 +20156,7 @@ index dc2d9ed383..ed9a492f5c 100755
20058 20156
20059 # 20157 #
20060 # Check to make sure the PIC flag actually works. 20158 # Check to make sure the PIC flag actually works.
20061@@ -7773,6 +8281,11 @@ fi 20159@@ -8009,6 +8517,11 @@ fi
20062 20160
20063 20161
20064 20162
@@ -20070,7 +20168,7 @@ index dc2d9ed383..ed9a492f5c 100755
20070 # 20168 #
20071 # Check to make sure the static flag actually works. 20169 # Check to make sure the static flag actually works.
20072 # 20170 #
20073@@ -8123,7 +8636,8 @@ _LT_EOF 20171@@ -8359,7 +8872,8 @@ _LT_EOF
20074 allow_undefined_flag=unsupported 20172 allow_undefined_flag=unsupported
20075 always_export_symbols=no 20173 always_export_symbols=no
20076 enable_shared_with_static_runtimes=yes 20174 enable_shared_with_static_runtimes=yes
@@ -20080,7 +20178,7 @@ index dc2d9ed383..ed9a492f5c 100755
20080 20178
20081 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then 20179 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
20082 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' 20180 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
20083@@ -8222,12 +8736,12 @@ _LT_EOF 20181@@ -8458,12 +8972,12 @@ _LT_EOF
20084 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' 20182 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
20085 hardcode_libdir_flag_spec= 20183 hardcode_libdir_flag_spec=
20086 hardcode_libdir_flag_spec_ld='-rpath $libdir' 20184 hardcode_libdir_flag_spec_ld='-rpath $libdir'
@@ -20095,7 +20193,7 @@ index dc2d9ed383..ed9a492f5c 100755
20095 fi 20193 fi
20096 ;; 20194 ;;
20097 esac 20195 esac
20098@@ -8241,8 +8755,8 @@ _LT_EOF 20196@@ -8477,8 +8991,8 @@ _LT_EOF
20099 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' 20197 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
20100 wlarc= 20198 wlarc=
20101 else 20199 else
@@ -20106,7 +20204,7 @@ index dc2d9ed383..ed9a492f5c 100755
20106 fi 20204 fi
20107 ;; 20205 ;;
20108 20206
20109@@ -8260,8 +8774,8 @@ _LT_EOF 20207@@ -8496,8 +9010,8 @@ _LT_EOF
20110 20208
20111 _LT_EOF 20209 _LT_EOF
20112 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 20210 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -20117,7 +20215,7 @@ index dc2d9ed383..ed9a492f5c 100755
20117 else 20215 else
20118 ld_shlibs=no 20216 ld_shlibs=no
20119 fi 20217 fi
20120@@ -8307,8 +8821,8 @@ _LT_EOF 20218@@ -8543,8 +9057,8 @@ _LT_EOF
20121 20219
20122 *) 20220 *)
20123 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 20221 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -20128,7 +20226,7 @@ index dc2d9ed383..ed9a492f5c 100755
20128 else 20226 else
20129 ld_shlibs=no 20227 ld_shlibs=no
20130 fi 20228 fi
20131@@ -8438,7 +8952,13 @@ _LT_EOF 20229@@ -8674,7 +9188,13 @@ _LT_EOF
20132 allow_undefined_flag='-berok' 20230 allow_undefined_flag='-berok'
20133 # Determine the default libpath from the value encoded in an 20231 # Determine the default libpath from the value encoded in an
20134 # empty executable. 20232 # empty executable.
@@ -20136,14 +20234,14 @@ index dc2d9ed383..ed9a492f5c 100755
20136+ if test "${lt_cv_aix_libpath+set}" = set; then 20234+ if test "${lt_cv_aix_libpath+set}" = set; then
20137+ aix_libpath=$lt_cv_aix_libpath 20235+ aix_libpath=$lt_cv_aix_libpath
20138+else 20236+else
20139+ if test "${lt_cv_aix_libpath_+set}" = set; then : 20237+ if ${lt_cv_aix_libpath_+:} false; then :
20140+ $as_echo_n "(cached) " >&6 20238+ $as_echo_n "(cached) " >&6
20141+else 20239+else
20142+ if test x$gcc_no_link = xyes; then 20240+ if test x$gcc_no_link = xyes; then
20143 as_fn_error "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5 20241 as_fn_error $? "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5
20144 fi 20242 fi
20145 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 20243 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
20146@@ -8454,22 +8974,29 @@ main () 20244@@ -8690,22 +9210,29 @@ main ()
20147 _ACEOF 20245 _ACEOF
20148 if ac_fn_c_try_link "$LINENO"; then : 20246 if ac_fn_c_try_link "$LINENO"; then :
20149 20247
@@ -20186,7 +20284,7 @@ index dc2d9ed383..ed9a492f5c 100755
20186 20284
20187 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 20285 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
20188 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" 20286 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"
20189@@ -8481,7 +9008,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 20287@@ -8717,7 +9244,13 @@ if test -z "$aix_libpath"; then aix_libp
20190 else 20288 else
20191 # Determine the default libpath from the value encoded in an 20289 # Determine the default libpath from the value encoded in an
20192 # empty executable. 20290 # empty executable.
@@ -20194,14 +20292,14 @@ index dc2d9ed383..ed9a492f5c 100755
20194+ if test "${lt_cv_aix_libpath+set}" = set; then 20292+ if test "${lt_cv_aix_libpath+set}" = set; then
20195+ aix_libpath=$lt_cv_aix_libpath 20293+ aix_libpath=$lt_cv_aix_libpath
20196+else 20294+else
20197+ if test "${lt_cv_aix_libpath_+set}" = set; then : 20295+ if ${lt_cv_aix_libpath_+:} false; then :
20198+ $as_echo_n "(cached) " >&6 20296+ $as_echo_n "(cached) " >&6
20199+else 20297+else
20200+ if test x$gcc_no_link = xyes; then 20298+ if test x$gcc_no_link = xyes; then
20201 as_fn_error "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5 20299 as_fn_error $? "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5
20202 fi 20300 fi
20203 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 20301 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
20204@@ -8497,22 +9030,29 @@ main () 20302@@ -8733,22 +9266,29 @@ main ()
20205 _ACEOF 20303 _ACEOF
20206 if ac_fn_c_try_link "$LINENO"; then : 20304 if ac_fn_c_try_link "$LINENO"; then :
20207 20305
@@ -20244,7 +20342,7 @@ index dc2d9ed383..ed9a492f5c 100755
20244 20342
20245 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 20343 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
20246 # Warning - without using the other run time loading flags, 20344 # Warning - without using the other run time loading flags,
20247@@ -8557,20 +9097,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 20345@@ -8793,20 +9333,63 @@ if test -z "$aix_libpath"; then aix_libp
20248 # Microsoft Visual C++. 20346 # Microsoft Visual C++.
20249 # hardcode_libdir_flag_spec is actually meaningless, as there is 20347 # hardcode_libdir_flag_spec is actually meaningless, as there is
20250 # no search path for DLLs. 20348 # no search path for DLLs.
@@ -20322,7 +20420,7 @@ index dc2d9ed383..ed9a492f5c 100755
20322 ;; 20420 ;;
20323 20421
20324 darwin* | rhapsody*) 20422 darwin* | rhapsody*)
20325@@ -8631,7 +9214,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 20423@@ -8867,7 +9450,7 @@ if test -z "$aix_libpath"; then aix_libp
20326 20424
20327 # FreeBSD 3 and greater uses gcc -shared to do shared libraries. 20425 # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
20328 freebsd* | dragonfly*) 20426 freebsd* | dragonfly*)
@@ -20331,7 +20429,7 @@ index dc2d9ed383..ed9a492f5c 100755
20331 hardcode_libdir_flag_spec='-R$libdir' 20429 hardcode_libdir_flag_spec='-R$libdir'
20332 hardcode_direct=yes 20430 hardcode_direct=yes
20333 hardcode_shlibpath_var=no 20431 hardcode_shlibpath_var=no
20334@@ -8639,7 +9222,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 20432@@ -8875,7 +9458,7 @@ if test -z "$aix_libpath"; then aix_libp
20335 20433
20336 hpux9*) 20434 hpux9*)
20337 if test "$GCC" = yes; then 20435 if test "$GCC" = yes; then
@@ -20340,7 +20438,7 @@ index dc2d9ed383..ed9a492f5c 100755
20340 else 20438 else
20341 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' 20439 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'
20342 fi 20440 fi
20343@@ -8655,7 +9238,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 20441@@ -8891,7 +9474,7 @@ if test -z "$aix_libpath"; then aix_libp
20344 20442
20345 hpux10*) 20443 hpux10*)
20346 if test "$GCC" = yes && test "$with_gnu_ld" = no; then 20444 if test "$GCC" = yes && test "$with_gnu_ld" = no; then
@@ -20349,7 +20447,7 @@ index dc2d9ed383..ed9a492f5c 100755
20349 else 20447 else
20350 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' 20448 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
20351 fi 20449 fi
20352@@ -8679,10 +9262,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 20450@@ -8915,10 +9498,10 @@ if test -z "$aix_libpath"; then aix_libp
20353 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' 20451 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
20354 ;; 20452 ;;
20355 ia64*) 20453 ia64*)
@@ -20362,7 +20460,7 @@ index dc2d9ed383..ed9a492f5c 100755
20362 ;; 20460 ;;
20363 esac 20461 esac
20364 else 20462 else
20365@@ -8761,26 +9344,39 @@ fi 20463@@ -8997,26 +9580,39 @@ fi
20366 20464
20367 irix5* | irix6* | nonstopux*) 20465 irix5* | irix6* | nonstopux*)
20368 if test "$GCC" = yes; then 20466 if test "$GCC" = yes; then
@@ -20377,13 +20475,13 @@ index dc2d9ed383..ed9a492f5c 100755
20377+ # This should be the same for all languages, so no per-tag cache variable. 20475+ # This should be the same for all languages, so no per-tag cache variable.
20378+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5 20476+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5
20379+$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; } 20477+$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; }
20380+if test "${lt_cv_irix_exported_symbol+set}" = set; then : 20478+if ${lt_cv_irix_exported_symbol+:} false; then :
20381+ $as_echo_n "(cached) " >&6 20479+ $as_echo_n "(cached) " >&6
20382+else 20480+else
20383+ save_LDFLAGS="$LDFLAGS" 20481+ save_LDFLAGS="$LDFLAGS"
20384+ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" 20482+ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
20385+ if test x$gcc_no_link = xyes; then 20483+ if test x$gcc_no_link = xyes; then
20386 as_fn_error "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5 20484 as_fn_error $? "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5
20387 fi 20485 fi
20388 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 20486 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
20389 /* end confdefs.h. */ 20487 /* end confdefs.h. */
@@ -20410,7 +20508,7 @@ index dc2d9ed383..ed9a492f5c 100755
20410 else 20508 else
20411 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' 20509 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'
20412 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' 20510 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'
20413@@ -8865,7 +9461,7 @@ rm -f core conftest.err conftest.$ac_objext \ 20511@@ -9101,7 +9697,7 @@ rm -f core conftest.err conftest.$ac_obj
20414 osf4* | osf5*) # as osf3* with the addition of -msym flag 20512 osf4* | osf5*) # as osf3* with the addition of -msym flag
20415 if test "$GCC" = yes; then 20513 if test "$GCC" = yes; then
20416 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' 20514 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
@@ -20419,7 +20517,7 @@ index dc2d9ed383..ed9a492f5c 100755
20419 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' 20517 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
20420 else 20518 else
20421 allow_undefined_flag=' -expect_unresolved \*' 20519 allow_undefined_flag=' -expect_unresolved \*'
20422@@ -8884,9 +9480,9 @@ rm -f core conftest.err conftest.$ac_objext \ 20520@@ -9120,9 +9716,9 @@ rm -f core conftest.err conftest.$ac_obj
20423 no_undefined_flag=' -z defs' 20521 no_undefined_flag=' -z defs'
20424 if test "$GCC" = yes; then 20522 if test "$GCC" = yes; then
20425 wlarc='${wl}' 20523 wlarc='${wl}'
@@ -20431,7 +20529,7 @@ index dc2d9ed383..ed9a492f5c 100755
20431 else 20529 else
20432 case `$CC -V 2>&1` in 20530 case `$CC -V 2>&1` in
20433 *"Compilers 5.0"*) 20531 *"Compilers 5.0"*)
20434@@ -9462,8 +10058,9 @@ cygwin* | mingw* | pw32* | cegcc*) 20532@@ -9698,8 +10294,9 @@ cygwin* | mingw* | pw32* | cegcc*)
20435 need_version=no 20533 need_version=no
20436 need_lib_prefix=no 20534 need_lib_prefix=no
20437 20535
@@ -20443,7 +20541,7 @@ index dc2d9ed383..ed9a492f5c 100755
20443 library_names_spec='$libname.dll.a' 20541 library_names_spec='$libname.dll.a'
20444 # DLL is installed to $(libdir)/../bin by postinstall_cmds 20542 # DLL is installed to $(libdir)/../bin by postinstall_cmds
20445 postinstall_cmds='base_file=`basename \${file}`~ 20543 postinstall_cmds='base_file=`basename \${file}`~
20446@@ -9496,13 +10093,71 @@ cygwin* | mingw* | pw32* | cegcc*) 20544@@ -9732,13 +10329,71 @@ cygwin* | mingw* | pw32* | cegcc*)
20447 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' 20545 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
20448 ;; 20546 ;;
20449 esac 20547 esac
@@ -20516,7 +20614,7 @@ index dc2d9ed383..ed9a492f5c 100755
20516 # FIXME: first we should search . and the directory the executable is in 20614 # FIXME: first we should search . and the directory the executable is in
20517 shlibpath_var=PATH 20615 shlibpath_var=PATH
20518 ;; 20616 ;;
20519@@ -9594,7 +10249,7 @@ haiku*) 20617@@ -9830,7 +10485,7 @@ haiku*)
20520 soname_spec='${libname}${release}${shared_ext}$major' 20618 soname_spec='${libname}${release}${shared_ext}$major'
20521 shlibpath_var=LIBRARY_PATH 20619 shlibpath_var=LIBRARY_PATH
20522 shlibpath_overrides_runpath=yes 20620 shlibpath_overrides_runpath=yes
@@ -20525,7 +20623,16 @@ index dc2d9ed383..ed9a492f5c 100755
20525 hardcode_into_libs=yes 20623 hardcode_into_libs=yes
20526 ;; 20624 ;;
20527 20625
20528@@ -10452,10 +11107,10 @@ else 20626@@ -10644,7 +11299,7 @@ else
20627 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
20628 lt_status=$lt_dlunknown
20629 cat > conftest.$ac_ext <<_LT_EOF
20630-#line 10647 "configure"
20631+#line $LINENO "configure"
20632 #include "confdefs.h"
20633
20634 #if HAVE_DLFCN_H
20635@@ -10688,10 +11343,10 @@ else
20529 /* When -fvisbility=hidden is used, assume the code has been annotated 20636 /* When -fvisbility=hidden is used, assume the code has been annotated
20530 correspondingly for the symbols needed. */ 20637 correspondingly for the symbols needed. */
20531 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 20638 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
@@ -20538,7 +20645,16 @@ index dc2d9ed383..ed9a492f5c 100755
20538 int main () 20645 int main ()
20539 { 20646 {
20540 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 20647 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
20541@@ -10558,10 +11213,10 @@ else 20648@@ -10750,7 +11405,7 @@ else
20649 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
20650 lt_status=$lt_dlunknown
20651 cat > conftest.$ac_ext <<_LT_EOF
20652-#line 10753 "configure"
20653+#line $LINENO "configure"
20654 #include "confdefs.h"
20655
20656 #if HAVE_DLFCN_H
20657@@ -10794,10 +11449,10 @@ else
20542 /* When -fvisbility=hidden is used, assume the code has been annotated 20658 /* When -fvisbility=hidden is used, assume the code has been annotated
20543 correspondingly for the symbols needed. */ 20659 correspondingly for the symbols needed. */
20544 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 20660 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
@@ -20551,7 +20667,7 @@ index dc2d9ed383..ed9a492f5c 100755
20551 int main () 20667 int main ()
20552 { 20668 {
20553 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 20669 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
20554@@ -11992,13 +12647,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' 20670@@ -12266,13 +12921,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_
20555 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' 20671 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
20556 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' 20672 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
20557 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' 20673 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
@@ -20572,7 +20688,7 @@ index dc2d9ed383..ed9a492f5c 100755
20572 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' 20688 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
20573 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' 20689 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
20574 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' 20690 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
20575@@ -12013,14 +12675,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de 20691@@ -12287,14 +12949,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$l
20576 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' 20692 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
20577 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' 20693 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
20578 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"`' 20694 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"`'
@@ -20591,7 +20707,7 @@ index dc2d9ed383..ed9a492f5c 100755
20591 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' 20707 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
20592 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' 20708 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
20593 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' 20709 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
20594@@ -12053,12 +12718,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q 20710@@ -12327,12 +12992,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcod
20595 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' 20711 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
20596 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' 20712 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
20597 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' 20713 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
@@ -20605,7 +20721,7 @@ index dc2d9ed383..ed9a492f5c 100755
20605 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' 20721 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
20606 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' 20722 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
20607 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' 20723 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
20608@@ -12113,8 +12778,13 @@ reload_flag \ 20724@@ -12387,8 +13052,13 @@ reload_flag \
20609 OBJDUMP \ 20725 OBJDUMP \
20610 deplibs_check_method \ 20726 deplibs_check_method \
20611 file_magic_cmd \ 20727 file_magic_cmd \
@@ -20619,7 +20735,7 @@ index dc2d9ed383..ed9a492f5c 100755
20619 STRIP \ 20735 STRIP \
20620 RANLIB \ 20736 RANLIB \
20621 CC \ 20737 CC \
20622@@ -12124,12 +12794,14 @@ lt_cv_sys_global_symbol_pipe \ 20738@@ -12398,12 +13068,14 @@ lt_cv_sys_global_symbol_pipe \
20623 lt_cv_sys_global_symbol_to_cdecl \ 20739 lt_cv_sys_global_symbol_to_cdecl \
20624 lt_cv_sys_global_symbol_to_c_name_address \ 20740 lt_cv_sys_global_symbol_to_c_name_address \
20625 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ 20741 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
@@ -20635,7 +20751,7 @@ index dc2d9ed383..ed9a492f5c 100755
20635 DSYMUTIL \ 20751 DSYMUTIL \
20636 NMEDIT \ 20752 NMEDIT \
20637 LIPO \ 20753 LIPO \
20638@@ -12145,7 +12817,6 @@ no_undefined_flag \ 20754@@ -12419,7 +13091,6 @@ no_undefined_flag \
20639 hardcode_libdir_flag_spec \ 20755 hardcode_libdir_flag_spec \
20640 hardcode_libdir_flag_spec_ld \ 20756 hardcode_libdir_flag_spec_ld \
20641 hardcode_libdir_separator \ 20757 hardcode_libdir_separator \
@@ -20643,7 +20759,7 @@ index dc2d9ed383..ed9a492f5c 100755
20643 exclude_expsyms \ 20759 exclude_expsyms \
20644 include_expsyms \ 20760 include_expsyms \
20645 file_list_spec \ 20761 file_list_spec \
20646@@ -12181,6 +12852,7 @@ module_cmds \ 20762@@ -12455,6 +13126,7 @@ module_cmds \
20647 module_expsym_cmds \ 20763 module_expsym_cmds \
20648 export_symbols_cmds \ 20764 export_symbols_cmds \
20649 prelink_cmds \ 20765 prelink_cmds \
@@ -20651,7 +20767,7 @@ index dc2d9ed383..ed9a492f5c 100755
20651 postinstall_cmds \ 20767 postinstall_cmds \
20652 postuninstall_cmds \ 20768 postuninstall_cmds \
20653 finish_cmds \ 20769 finish_cmds \
20654@@ -12770,7 +13442,8 @@ $as_echo X"$file" | 20770@@ -13053,7 +13725,8 @@ $as_echo X"$file" |
20655 # NOTE: Changes made to this file will be lost: look at ltmain.sh. 20771 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
20656 # 20772 #
20657 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 20773 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
@@ -20661,7 +20777,7 @@ index dc2d9ed383..ed9a492f5c 100755
20661 # Written by Gordon Matzigkeit, 1996 20777 # Written by Gordon Matzigkeit, 1996
20662 # 20778 #
20663 # This file is part of GNU Libtool. 20779 # This file is part of GNU Libtool.
20664@@ -12873,19 +13546,42 @@ SP2NL=$lt_lt_SP2NL 20780@@ -13156,19 +13829,42 @@ SP2NL=$lt_lt_SP2NL
20665 # turn newlines into spaces. 20781 # turn newlines into spaces.
20666 NL2SP=$lt_lt_NL2SP 20782 NL2SP=$lt_lt_NL2SP
20667 20783
@@ -20705,7 +20821,7 @@ index dc2d9ed383..ed9a492f5c 100755
20705 # A symbol stripping program. 20821 # A symbol stripping program.
20706 STRIP=$lt_STRIP 20822 STRIP=$lt_STRIP
20707 20823
20708@@ -12915,6 +13611,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address 20824@@ -13198,6 +13894,12 @@ global_symbol_to_c_name_address=$lt_lt_c
20709 # Transform the output of nm in a C name address pair when lib prefix is needed. 20825 # Transform the output of nm in a C name address pair when lib prefix is needed.
20710 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix 20826 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
20711 20827
@@ -20718,7 +20834,7 @@ index dc2d9ed383..ed9a492f5c 100755
20718 # The name of the directory that contains temporary libtool files. 20834 # The name of the directory that contains temporary libtool files.
20719 objdir=$objdir 20835 objdir=$objdir
20720 20836
20721@@ -12924,6 +13626,9 @@ MAGIC_CMD=$MAGIC_CMD 20837@@ -13207,6 +13909,9 @@ MAGIC_CMD=$MAGIC_CMD
20722 # Must we lock files when doing compilation? 20838 # Must we lock files when doing compilation?
20723 need_locks=$lt_need_locks 20839 need_locks=$lt_need_locks
20724 20840
@@ -20728,7 +20844,7 @@ index dc2d9ed383..ed9a492f5c 100755
20728 # Tool to manipulate archived DWARF debug symbol files on Mac OS X. 20844 # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
20729 DSYMUTIL=$lt_DSYMUTIL 20845 DSYMUTIL=$lt_DSYMUTIL
20730 20846
20731@@ -13038,12 +13743,12 @@ with_gcc=$GCC 20847@@ -13321,12 +14026,12 @@ with_gcc=$GCC
20732 # Compiler flag to turn off builtin functions. 20848 # Compiler flag to turn off builtin functions.
20733 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag 20849 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
20734 20850
@@ -20744,7 +20860,7 @@ index dc2d9ed383..ed9a492f5c 100755
20744 # Compiler flag to prevent dynamic linking. 20860 # Compiler flag to prevent dynamic linking.
20745 link_static_flag=$lt_lt_prog_compiler_static 20861 link_static_flag=$lt_lt_prog_compiler_static
20746 20862
20747@@ -13130,9 +13835,6 @@ inherit_rpath=$inherit_rpath 20863@@ -13413,9 +14118,6 @@ inherit_rpath=$inherit_rpath
20748 # Whether libtool must link a program against all its dependency libraries. 20864 # Whether libtool must link a program against all its dependency libraries.
20749 link_all_deplibs=$link_all_deplibs 20865 link_all_deplibs=$link_all_deplibs
20750 20866
@@ -20754,7 +20870,7 @@ index dc2d9ed383..ed9a492f5c 100755
20754 # Set to "yes" if exported symbols are required. 20870 # Set to "yes" if exported symbols are required.
20755 always_export_symbols=$always_export_symbols 20871 always_export_symbols=$always_export_symbols
20756 20872
20757@@ -13148,6 +13850,9 @@ include_expsyms=$lt_include_expsyms 20873@@ -13431,6 +14133,9 @@ include_expsyms=$lt_include_expsyms
20758 # Commands necessary for linking programs (against libraries) with templates. 20874 # Commands necessary for linking programs (against libraries) with templates.
20759 prelink_cmds=$lt_prelink_cmds 20875 prelink_cmds=$lt_prelink_cmds
20760 20876
@@ -20764,7 +20880,7 @@ index dc2d9ed383..ed9a492f5c 100755
20764 # Specify filename containing input files. 20880 # Specify filename containing input files.
20765 file_list_spec=$lt_file_list_spec 20881 file_list_spec=$lt_file_list_spec
20766 20882
20767@@ -13180,210 +13885,169 @@ ltmain="$ac_aux_dir/ltmain.sh" 20883@@ -13463,210 +14168,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
20768 # if finds mixed CR/LF and LF-only lines. Since sed operates in 20884 # if finds mixed CR/LF and LF-only lines. Since sed operates in
20769 # text mode, it properly converts lines to CR/LF. This bash problem 20885 # text mode, it properly converts lines to CR/LF. This bash problem
20770 # is reportedly fixed, but why not run on old versions too? 20886 # is reportedly fixed, but why not run on old versions too?
@@ -20966,15 +21082,9 @@ index dc2d9ed383..ed9a492f5c 100755
20966-_LT_EOF 21082-_LT_EOF
20967- ;; 21083- ;;
20968- esac 21084- esac
20969-
20970-
20971- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
20972- || (rm -f "$cfgfile"; exit 1)
20973-
20974- mv -f "$cfgfile" "$ofile" ||
20975+ sed '$q' "$ltmain" >> "$cfgfile" \ 21085+ sed '$q' "$ltmain" >> "$cfgfile" \
20976+ || (rm -f "$cfgfile"; exit 1) 21086+ || (rm -f "$cfgfile"; exit 1)
20977+ 21087
20978+ if test x"$xsi_shell" = xyes; then 21088+ if test x"$xsi_shell" = xyes; then
20979+ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ 21089+ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\
20980+func_dirname ()\ 21090+func_dirname ()\
@@ -21132,12 +21242,12 @@ index dc2d9ed383..ed9a492f5c 100755
21132+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 21242+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5
21133+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} 21243+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;}
21134+fi 21244+fi
21135+ 21245
21136+ 21246- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
21247- || (rm -f "$cfgfile"; exit 1)
21248
21249- mv -f "$cfgfile" "$ofile" ||
21137+ mv -f "$cfgfile" "$ofile" || 21250+ mv -f "$cfgfile" "$ofile" ||
21138 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") 21251 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
21139 chmod +x "$ofile" 21252 chmod +x "$ofile"
21140 21253
21141--
211422.16.1
21143
diff --git a/meta/recipes-devtools/binutils/binutils/0007-Add-the-armv5e-architecture-to-binutils.patch b/meta/recipes-devtools/binutils/binutils/0007-Add-the-armv5e-architecture-to-binutils.patch
index 4a5127380f..18ef6bb7ff 100644
--- a/meta/recipes-devtools/binutils/binutils/0007-Add-the-armv5e-architecture-to-binutils.patch
+++ b/meta/recipes-devtools/binutils/binutils/0007-Add-the-armv5e-architecture-to-binutils.patch
@@ -1,4 +1,4 @@
1From 697903256e09533778baa8af66402c44d70219d9 Mon Sep 17 00:00:00 2001 1From ef50d848d983f81e4a86dd3eef4933e3579336f1 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:37:10 +0000 3Date: Mon, 2 Mar 2015 01:37:10 +0000
4Subject: [PATCH 07/15] Add the armv5e architecture to binutils 4Subject: [PATCH 07/15] Add the armv5e architecture to binutils
@@ -19,10 +19,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
19 1 file changed, 1 insertion(+) 19 1 file changed, 1 insertion(+)
20 20
21diff --git a/gas/config/tc-arm.c b/gas/config/tc-arm.c 21diff --git a/gas/config/tc-arm.c b/gas/config/tc-arm.c
22index ec50420518..a25d1721af 100644 22index 3f5384e1c7..8d5bc145af 100644
23--- a/gas/config/tc-arm.c 23--- a/gas/config/tc-arm.c
24+++ b/gas/config/tc-arm.c 24+++ b/gas/config/tc-arm.c
25@@ -26195,6 +26195,7 @@ static const struct arm_arch_option_table arm_archs[] = 25@@ -26294,6 +26294,7 @@ static const struct arm_arch_option_table arm_archs[] =
26 ARM_ARCH_OPT ("armv4t", ARM_ARCH_V4T, FPU_ARCH_FPA), 26 ARM_ARCH_OPT ("armv4t", ARM_ARCH_V4T, FPU_ARCH_FPA),
27 ARM_ARCH_OPT ("armv4txm", ARM_ARCH_V4TxM, FPU_ARCH_FPA), 27 ARM_ARCH_OPT ("armv4txm", ARM_ARCH_V4TxM, FPU_ARCH_FPA),
28 ARM_ARCH_OPT ("armv5", ARM_ARCH_V5, FPU_ARCH_VFP), 28 ARM_ARCH_OPT ("armv5", ARM_ARCH_V5, FPU_ARCH_VFP),
@@ -31,5 +31,5 @@ index ec50420518..a25d1721af 100644
31 ARM_ARCH_OPT ("armv5txm", ARM_ARCH_V5TxM, FPU_ARCH_VFP), 31 ARM_ARCH_OPT ("armv5txm", ARM_ARCH_V5TxM, FPU_ARCH_VFP),
32 ARM_ARCH_OPT ("armv5te", ARM_ARCH_V5TE, FPU_ARCH_VFP), 32 ARM_ARCH_OPT ("armv5te", ARM_ARCH_V5TE, FPU_ARCH_VFP),
33-- 33--
342.16.1 342.18.0
35 35
diff --git a/meta/recipes-devtools/binutils/binutils/0008-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 939be67b58..6999ed9c94 100644
--- a/meta/recipes-devtools/binutils/binutils/0008-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 622d66634eb2e509d4126f5bdcab26de367241a1 Mon Sep 17 00:00:00 2001 1From ca25d55cef8398bad508c2b2be29aea5aa3c4d26 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 08/15] don't let the distro compiler point to the wrong 4Subject: [PATCH 08/15] don't let the distro compiler point to the wrong
@@ -31,5 +31,5 @@ index ed1b334c36..d4ffd8b57b 100644
31 if test -n "${target_header_dir}"; then \ 31 if test -n "${target_header_dir}"; then \
32 ${mkinstalldirs} $(DESTDIR)$(libdir)/$(MULTIOSDIR); \ 32 ${mkinstalldirs} $(DESTDIR)$(libdir)/$(MULTIOSDIR); \
33-- 33--
342.16.1 342.18.0
35 35
diff --git a/meta/recipes-devtools/binutils/binutils/0009-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 e75104722b..9a9e319621 100644
--- a/meta/recipes-devtools/binutils/binutils/0009-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 27e38ee92c24fca86b1c3f6ef156a1892dd06bfd Mon Sep 17 00:00:00 2001 1From a3667059fc0d52d890b505bed0e5050ea3d7002e 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 09/15] warn for uses of system directories when cross linking 4Subject: [PATCH 09/15] warn for uses of system directories when cross linking
@@ -55,7 +55,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
55 ld/configure | 16 ++++++++++++++++ 55 ld/configure | 16 ++++++++++++++++
56 ld/configure.ac | 10 ++++++++++ 56 ld/configure.ac | 10 ++++++++++
57 ld/ld.h | 8 ++++++++ 57 ld/ld.h | 8 ++++++++
58 ld/ld.texinfo | 12 ++++++++++++ 58 ld/ld.texi | 12 ++++++++++++
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 ++
@@ -63,10 +63,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
63 9 files changed, 86 insertions(+) 63 9 files changed, 86 insertions(+)
64 64
65diff --git a/ld/config.in b/ld/config.in 65diff --git a/ld/config.in b/ld/config.in
66index a846743da6..df3cd5fb60 100644 66index d93c9b0830..5da2742bea 100644
67--- a/ld/config.in 67--- a/ld/config.in
68+++ b/ld/config.in 68+++ b/ld/config.in
69@@ -27,6 +27,9 @@ 69@@ -31,6 +31,9 @@
70 language is requested. */ 70 language is requested. */
71 #undef ENABLE_NLS 71 #undef ENABLE_NLS
72 72
@@ -77,10 +77,10 @@ index a846743da6..df3cd5fb60 100644
77 #undef EXTRA_SHLIB_EXTENSION 77 #undef EXTRA_SHLIB_EXTENSION
78 78
79diff --git a/ld/configure b/ld/configure 79diff --git a/ld/configure b/ld/configure
80index db8b998722..489ead5c13 100755 80index 2b291f0da8..facc386563 100755
81--- a/ld/configure 81--- a/ld/configure
82+++ b/ld/configure 82+++ b/ld/configure
83@@ -789,6 +789,7 @@ with_lib_path 83@@ -826,6 +826,7 @@ with_lib_path
84 enable_targets 84 enable_targets
85 enable_64_bit_bfd 85 enable_64_bit_bfd
86 with_sysroot 86 with_sysroot
@@ -88,7 +88,7 @@ index db8b998722..489ead5c13 100755
88 enable_gold 88 enable_gold
89 enable_got 89 enable_got
90 enable_compressed_debug_sections 90 enable_compressed_debug_sections
91@@ -1448,6 +1449,8 @@ Optional Features: 91@@ -1490,6 +1491,8 @@ Optional Features:
92 --disable-largefile omit support for large files 92 --disable-largefile omit support for large files
93 --enable-targets alternative target configurations 93 --enable-targets alternative target configurations
94 --enable-64-bit-bfd 64-bit support (on hosts with narrower word sizes) 94 --enable-64-bit-bfd 64-bit support (on hosts with narrower word sizes)
@@ -97,7 +97,7 @@ index db8b998722..489ead5c13 100755
97 --enable-gold[=ARG] build gold [ARG={default,yes,no}] 97 --enable-gold[=ARG] build gold [ARG={default,yes,no}]
98 --enable-got=<type> GOT handling scheme (target, single, negative, 98 --enable-got=<type> GOT handling scheme (target, single, negative,
99 multigot) 99 multigot)
100@@ -16315,6 +16318,19 @@ fi 100@@ -16618,6 +16621,19 @@ fi
101 101
102 102
103 103
@@ -118,10 +118,10 @@ index db8b998722..489ead5c13 100755
118 if test "${enable_gold+set}" = set; then : 118 if test "${enable_gold+set}" = set; then :
119 enableval=$enable_gold; case "${enableval}" in 119 enableval=$enable_gold; case "${enableval}" in
120diff --git a/ld/configure.ac b/ld/configure.ac 120diff --git a/ld/configure.ac b/ld/configure.ac
121index bada1b50b0..d074a3820b 100644 121index d10c553650..9f1b57b120 100644
122--- a/ld/configure.ac 122--- a/ld/configure.ac
123+++ b/ld/configure.ac 123+++ b/ld/configure.ac
124@@ -95,6 +95,16 @@ AC_SUBST(use_sysroot) 124@@ -94,6 +94,16 @@ AC_SUBST(use_sysroot)
125 AC_SUBST(TARGET_SYSTEM_ROOT) 125 AC_SUBST(TARGET_SYSTEM_ROOT)
126 AC_SUBST(TARGET_SYSTEM_ROOT_DEFINE) 126 AC_SUBST(TARGET_SYSTEM_ROOT_DEFINE)
127 127
@@ -157,11 +157,11 @@ index ba914b921e..9df17dab6c 100644
157 /* Big or little endian as set on command line. */ 157 /* Big or little endian as set on command line. */
158 enum endian_enum endian; 158 enum endian_enum endian;
159 159
160diff --git a/ld/ld.texinfo b/ld/ld.texinfo 160diff --git a/ld/ld.texi b/ld/ld.texi
161index c89915f1aa..df430837e2 100644 161index b9fe2324da..43486605e0 100644
162--- a/ld/ld.texinfo 162--- a/ld/ld.texi
163+++ b/ld/ld.texinfo 163+++ b/ld/ld.texi
164@@ -2498,6 +2498,18 @@ string identifying the original linked file does not change. 164@@ -2479,6 +2479,18 @@ string identifying the original linked file does not change.
165 165
166 Passing @code{none} for @var{style} disables the setting from any 166 Passing @code{none} for @var{style} disables the setting from any
167 @code{--build-id} options earlier on the command line. 167 @code{--build-id} options earlier on the command line.
@@ -181,7 +181,7 @@ index c89915f1aa..df430837e2 100644
181 181
182 @c man end 182 @c man end
183diff --git a/ld/ldfile.c b/ld/ldfile.c 183diff --git a/ld/ldfile.c b/ld/ldfile.c
184index 6532a57d96..f943f0b2e5 100644 184index a72ff13526..dc5148f748 100644
185--- a/ld/ldfile.c 185--- a/ld/ldfile.c
186+++ b/ld/ldfile.c 186+++ b/ld/ldfile.c
187@@ -116,6 +116,23 @@ ldfile_add_library_path (const char *name, bfd_boolean cmdline) 187@@ -116,6 +116,23 @@ ldfile_add_library_path (const char *name, bfd_boolean cmdline)
@@ -209,10 +209,10 @@ index 6532a57d96..f943f0b2e5 100644
209 209
210 /* 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 211diff --git a/ld/ldlex.h b/ld/ldlex.h
212index 140ed1d9da..9965cbc04f 100644 212index 04d6fd5f96..d7df005bb2 100644
213--- a/ld/ldlex.h 213--- a/ld/ldlex.h
214+++ b/ld/ldlex.h 214+++ b/ld/ldlex.h
215@@ -147,6 +147,8 @@ enum option_values 215@@ -148,6 +148,8 @@ enum option_values
216 OPTION_REQUIRE_DEFINED_SYMBOL, 216 OPTION_REQUIRE_DEFINED_SYMBOL,
217 OPTION_ORPHAN_HANDLING, 217 OPTION_ORPHAN_HANDLING,
218 OPTION_FORCE_GROUP_ALLOCATION, 218 OPTION_FORCE_GROUP_ALLOCATION,
@@ -222,10 +222,10 @@ index 140ed1d9da..9965cbc04f 100644
222 222
223 /* The initial parser states. */ 223 /* The initial parser states. */
224diff --git a/ld/ldmain.c b/ld/ldmain.c 224diff --git a/ld/ldmain.c b/ld/ldmain.c
225index c473ed24c3..adae0b4610 100644 225index f31eeb29c3..25f8497888 100644
226--- a/ld/ldmain.c 226--- a/ld/ldmain.c
227+++ b/ld/ldmain.c 227+++ b/ld/ldmain.c
228@@ -261,6 +261,8 @@ main (int argc, char **argv) 228@@ -268,6 +268,8 @@ main (int argc, char **argv)
229 command_line.warn_mismatch = TRUE; 229 command_line.warn_mismatch = TRUE;
230 command_line.warn_search_mismatch = TRUE; 230 command_line.warn_search_mismatch = TRUE;
231 command_line.check_section_addresses = -1; 231 command_line.check_section_addresses = -1;
@@ -235,10 +235,10 @@ index c473ed24c3..adae0b4610 100644
235 /* We initialize DEMANGLING based on the environment variable 235 /* We initialize DEMANGLING based on the environment variable
236 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 237diff --git a/ld/lexsup.c b/ld/lexsup.c
238index f2191602d4..bccb3bdeef 100644 238index 86a033a383..4a40d48020 100644
239--- a/ld/lexsup.c 239--- a/ld/lexsup.c
240+++ b/ld/lexsup.c 240+++ b/ld/lexsup.c
241@@ -538,6 +538,14 @@ static const struct ld_option ld_options[] = 241@@ -543,6 +543,14 @@ static const struct ld_option ld_options[] =
242 { {"orphan-handling", required_argument, NULL, OPTION_ORPHAN_HANDLING}, 242 { {"orphan-handling", required_argument, NULL, OPTION_ORPHAN_HANDLING},
243 '\0', N_("=MODE"), N_("Control how orphan sections are handled."), 243 '\0', N_("=MODE"), N_("Control how orphan sections are handled."),
244 TWO_DASHES }, 244 TWO_DASHES },
@@ -253,8 +253,8 @@ index f2191602d4..bccb3bdeef 100644
253 }; 253 };
254 254
255 #define OPTION_COUNT ARRAY_SIZE (ld_options) 255 #define OPTION_COUNT ARRAY_SIZE (ld_options)
256@@ -1568,6 +1576,14 @@ parse_args (unsigned argc, char **argv) 256@@ -1577,6 +1585,14 @@ parse_args (unsigned argc, char **argv)
257 einfo (_("%P%F: invalid argument to option" 257 einfo (_("%F%P: invalid argument to option"
258 " \"--orphan-handling\"\n")); 258 " \"--orphan-handling\"\n"));
259 break; 259 break;
260+ 260+
@@ -269,5 +269,5 @@ index f2191602d4..bccb3bdeef 100644
269 } 269 }
270 270
271-- 271--
2722.16.1 2722.18.0
273 273
diff --git a/meta/recipes-devtools/binutils/binutils/0010-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 33dfff9bd7..8fc00ff456 100644
--- a/meta/recipes-devtools/binutils/binutils/0010-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 e205ae05c41a8cc8d47708f0a3b6f740e2bf2526 Mon Sep 17 00:00:00 2001 1From 9e1d8f9a657a8bd48048c2ea6407cf60b723bd68 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 10/15] Fix rpath in libtool when sysroot is enabled 4Subject: [PATCH 10/15] Fix rpath in libtool when sysroot is enabled
@@ -48,5 +48,5 @@ index 70e856e065..11ee684ccc 100644
48 if test -z "$hardcode_libdirs"; then 48 if test -z "$hardcode_libdirs"; then
49 hardcode_libdirs="$libdir" 49 hardcode_libdirs="$libdir"
50-- 50--
512.16.1 512.18.0
52 52
diff --git a/meta/recipes-devtools/binutils/binutils/0011-Change-default-emulation-for-mips64-linux.patch b/meta/recipes-devtools/binutils/binutils/0011-Change-default-emulation-for-mips64-linux.patch
index 80fcbc1194..2e93b129dd 100644
--- a/meta/recipes-devtools/binutils/binutils/0011-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 7978c1299021033c35c29c94e0997235f7ede248 Mon Sep 17 00:00:00 2001 1From 2d2e2fcdd9646849716ee99d8d3e5d72ae8889bc 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 11/15] Change default emulation for mips64*-*-linux 4Subject: [PATCH 11/15] Change default emulation for mips64*-*-linux
@@ -14,10 +14,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
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 16diff --git a/bfd/config.bfd b/bfd/config.bfd
17index f04a993f06..8777f96bd2 100644 17index 6391f35684..8a11c0680a 100644
18--- a/bfd/config.bfd 18--- a/bfd/config.bfd
19+++ b/bfd/config.bfd 19+++ b/bfd/config.bfd
20@@ -1189,12 +1189,12 @@ case "${targ}" in 20@@ -913,12 +913,12 @@ case "${targ}" in
21 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"
22 ;; 22 ;;
23 mips64*el-*-linux*) 23 mips64*el-*-linux*)
@@ -35,10 +35,10 @@ index f04a993f06..8777f96bd2 100644
35 mips*el-*-linux*) 35 mips*el-*-linux*)
36 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 37diff --git a/ld/configure.tgt b/ld/configure.tgt
38index 6183a85b3d..1d78465590 100644 38index fad8b2e5c8..7fb2168503 100644
39--- a/ld/configure.tgt 39--- a/ld/configure.tgt
40+++ b/ld/configure.tgt 40+++ b/ld/configure.tgt
41@@ -535,11 +535,11 @@ mips*el-*-vxworks*) targ_emul=elf32elmipvxworks 41@@ -464,11 +464,11 @@ mips*el-*-vxworks*) targ_emul=elf32elmipvxworks
42 mips*-*-vxworks*) targ_emul=elf32ebmipvxworks 42 mips*-*-vxworks*) targ_emul=elf32ebmipvxworks
43 targ_extra_emuls="elf32elmipvxworks" ;; 43 targ_extra_emuls="elf32elmipvxworks" ;;
44 mips*-*-windiss) targ_emul=elf32mipswindiss ;; 44 mips*-*-windiss) targ_emul=elf32mipswindiss ;;
@@ -55,5 +55,5 @@ index 6183a85b3d..1d78465590 100644
55 mips*el-*-linux-*) targ_emul=elf32ltsmip 55 mips*el-*-linux-*) targ_emul=elf32ltsmip
56 targ_extra_emuls="elf32btsmip elf32ltsmipn32 elf64ltsmip elf32btsmipn32 elf64btsmip" 56 targ_extra_emuls="elf32btsmip elf32ltsmipn32 elf64ltsmip elf32btsmipn32 elf64btsmip"
57-- 57--
582.16.1 582.18.0
59 59
diff --git a/meta/recipes-devtools/binutils/binutils/0012-Add-support-for-Netlogic-XLP.patch b/meta/recipes-devtools/binutils/binutils/0012-Add-support-for-Netlogic-XLP.patch
index 1fefb680f8..4d64bd53f8 100644
--- a/meta/recipes-devtools/binutils/binutils/0012-Add-support-for-Netlogic-XLP.patch
+++ b/meta/recipes-devtools/binutils/binutils/0012-Add-support-for-Netlogic-XLP.patch
@@ -1,4 +1,4 @@
1From 3b40bf584615f794b85fd50d4d0a5c0a1d2ee7bf Mon Sep 17 00:00:00 2001 1From 96ff7570c29f792c466a933529fefda9b8e97994 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 12/15] Add support for Netlogic XLP 4Subject: [PATCH 12/15] Add support for Netlogic XLP
@@ -34,10 +34,10 @@ Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
34 14 files changed, 61 insertions(+), 21 deletions(-) 34 14 files changed, 61 insertions(+), 21 deletions(-)
35 35
36diff --git a/bfd/aoutx.h b/bfd/aoutx.h 36diff --git a/bfd/aoutx.h b/bfd/aoutx.h
37index eec9c4ad2a..3bf0a71e63 100644 37index 023843b0be..46246fec2d 100644
38--- a/bfd/aoutx.h 38--- a/bfd/aoutx.h
39+++ b/bfd/aoutx.h 39+++ b/bfd/aoutx.h
40@@ -814,6 +814,7 @@ NAME (aout, machine_type) (enum bfd_architecture arch, 40@@ -798,6 +798,7 @@ NAME (aout, machine_type) (enum bfd_architecture arch,
41 case bfd_mach_mipsisa64r6: 41 case bfd_mach_mipsisa64r6:
42 case bfd_mach_mips_sb1: 42 case bfd_mach_mips_sb1:
43 case bfd_mach_mips_xlr: 43 case bfd_mach_mips_xlr:
@@ -46,10 +46,10 @@ index eec9c4ad2a..3bf0a71e63 100644
46 arch_flags = M_MIPS2; 46 arch_flags = M_MIPS2;
47 break; 47 break;
48diff --git a/bfd/archures.c b/bfd/archures.c 48diff --git a/bfd/archures.c b/bfd/archures.c
49index e83c57a2f3..3016ea1bae 100644 49index 282e983086..b38b05d132 100644
50--- a/bfd/archures.c 50--- a/bfd/archures.c
51+++ b/bfd/archures.c 51+++ b/bfd/archures.c
52@@ -201,6 +201,7 @@ DESCRIPTION 52@@ -183,6 +183,7 @@ DESCRIPTION
53 .#define bfd_mach_mips_octeon3 6503 53 .#define bfd_mach_mips_octeon3 6503
54 .#define bfd_mach_mips_xlr 887682 {* decimal 'XLR'. *} 54 .#define bfd_mach_mips_xlr 887682 {* decimal 'XLR'. *}
55 .#define bfd_mach_mips_interaptiv_mr2 736550 {* decimal 'IA2'. *} 55 .#define bfd_mach_mips_interaptiv_mr2 736550 {* decimal 'IA2'. *}
@@ -58,10 +58,10 @@ index e83c57a2f3..3016ea1bae 100644
58 .#define bfd_mach_mipsisa32r2 33 58 .#define bfd_mach_mipsisa32r2 33
59 .#define bfd_mach_mipsisa32r3 34 59 .#define bfd_mach_mipsisa32r3 34
60diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h 60diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h
61index 42991e7848..27abc5d5a8 100644 61index 93745bd3fd..326e9e49ed 100644
62--- a/bfd/bfd-in2.h 62--- a/bfd/bfd-in2.h
63+++ b/bfd/bfd-in2.h 63+++ b/bfd/bfd-in2.h
64@@ -2062,6 +2062,7 @@ enum bfd_architecture 64@@ -2054,6 +2054,7 @@ enum bfd_architecture
65 #define bfd_mach_mips_octeon3 6503 65 #define bfd_mach_mips_octeon3 6503
66 #define bfd_mach_mips_xlr 887682 /* decimal 'XLR'. */ 66 #define bfd_mach_mips_xlr 887682 /* decimal 'XLR'. */
67 #define bfd_mach_mips_interaptiv_mr2 736550 /* decimal 'IA2'. */ 67 #define bfd_mach_mips_interaptiv_mr2 736550 /* decimal 'IA2'. */
@@ -70,10 +70,10 @@ index 42991e7848..27abc5d5a8 100644
70 #define bfd_mach_mipsisa32r2 33 70 #define bfd_mach_mipsisa32r2 33
71 #define bfd_mach_mipsisa32r3 34 71 #define bfd_mach_mipsisa32r3 34
72diff --git a/bfd/config.bfd b/bfd/config.bfd 72diff --git a/bfd/config.bfd b/bfd/config.bfd
73index 8777f96bd2..7b80bda8c9 100644 73index 8a11c0680a..c882421343 100644
74--- a/bfd/config.bfd 74--- a/bfd/config.bfd
75+++ b/bfd/config.bfd 75+++ b/bfd/config.bfd
76@@ -1172,6 +1172,11 @@ case "${targ}" in 76@@ -896,6 +896,11 @@ case "${targ}" in
77 targ_defvec=mips_elf32_le_vec 77 targ_defvec=mips_elf32_le_vec
78 targ_selvecs="mips_elf32_be_vec mips_elf64_be_vec mips_elf64_le_vec" 78 targ_selvecs="mips_elf32_be_vec mips_elf64_be_vec mips_elf64_le_vec"
79 ;; 79 ;;
@@ -110,10 +110,10 @@ index cb50c64371..2b9d1d6ecf 100644
110 110
111 /* The default architecture is mips:3000, but with a machine number of 111 /* The default architecture is mips:3000, but with a machine number of
112diff --git a/bfd/elfxx-mips.c b/bfd/elfxx-mips.c 112diff --git a/bfd/elfxx-mips.c b/bfd/elfxx-mips.c
113index 285401367d..14ebb5f175 100644 113index d91942301c..5d1bd3f0b1 100644
114--- a/bfd/elfxx-mips.c 114--- a/bfd/elfxx-mips.c
115+++ b/bfd/elfxx-mips.c 115+++ b/bfd/elfxx-mips.c
116@@ -6806,6 +6806,9 @@ _bfd_elf_mips_mach (flagword flags) 116@@ -6805,6 +6805,9 @@ _bfd_elf_mips_mach (flagword flags)
117 case E_MIPS_MACH_IAMR2: 117 case E_MIPS_MACH_IAMR2:
118 return bfd_mach_mips_interaptiv_mr2; 118 return bfd_mach_mips_interaptiv_mr2;
119 119
@@ -123,7 +123,7 @@ index 285401367d..14ebb5f175 100644
123 default: 123 default:
124 switch (flags & EF_MIPS_ARCH) 124 switch (flags & EF_MIPS_ARCH)
125 { 125 {
126@@ -11963,6 +11966,10 @@ mips_set_isa_flags (bfd *abfd) 126@@ -12003,6 +12006,10 @@ mips_set_isa_flags (bfd *abfd)
127 val = E_MIPS_ARCH_64R2 | E_MIPS_MACH_OCTEON2; 127 val = E_MIPS_ARCH_64R2 | E_MIPS_MACH_OCTEON2;
128 break; 128 break;
129 129
@@ -134,7 +134,7 @@ index 285401367d..14ebb5f175 100644
134 case bfd_mach_mipsisa32: 134 case bfd_mach_mipsisa32:
135 val = E_MIPS_ARCH_32; 135 val = E_MIPS_ARCH_32;
136 break; 136 break;
137@@ -13936,6 +13943,7 @@ static const struct mips_mach_extension mips_mach_extensions[] = 137@@ -13992,6 +13999,7 @@ static const struct mips_mach_extension mips_mach_extensions[] =
138 { bfd_mach_mips_octeonp, bfd_mach_mips_octeon }, 138 { bfd_mach_mips_octeonp, bfd_mach_mips_octeon },
139 { bfd_mach_mips_octeon, bfd_mach_mipsisa64r2 }, 139 { bfd_mach_mips_octeon, bfd_mach_mipsisa64r2 },
140 { bfd_mach_mips_loongson_3a, bfd_mach_mipsisa64r2 }, 140 { bfd_mach_mips_loongson_3a, bfd_mach_mipsisa64r2 },
@@ -143,10 +143,10 @@ index 285401367d..14ebb5f175 100644
143 /* MIPS64 extensions. */ 143 /* MIPS64 extensions. */
144 { bfd_mach_mipsisa64r2, bfd_mach_mipsisa64 }, 144 { bfd_mach_mipsisa64r2, bfd_mach_mipsisa64 },
145diff --git a/binutils/readelf.c b/binutils/readelf.c 145diff --git a/binutils/readelf.c b/binutils/readelf.c
146index ae1cda9a7b..fed0387a94 100644 146index 2b78db219b..7a7178925f 100644
147--- a/binutils/readelf.c 147--- a/binutils/readelf.c
148+++ b/binutils/readelf.c 148+++ b/binutils/readelf.c
149@@ -3370,6 +3370,7 @@ get_machine_flags (Filedata * filedata, unsigned e_flags, unsigned e_machine) 149@@ -3403,6 +3403,7 @@ get_machine_flags (Filedata * filedata, unsigned e_flags, unsigned e_machine)
150 case E_MIPS_MACH_OCTEON3: strcat (buf, ", octeon3"); break; 150 case E_MIPS_MACH_OCTEON3: strcat (buf, ", octeon3"); break;
151 case E_MIPS_MACH_XLR: strcat (buf, ", xlr"); break; 151 case E_MIPS_MACH_XLR: strcat (buf, ", xlr"); break;
152 case E_MIPS_MACH_IAMR2: strcat (buf, ", interaptiv-mr2"); break; 152 case E_MIPS_MACH_IAMR2: strcat (buf, ", interaptiv-mr2"); break;
@@ -155,7 +155,7 @@ index ae1cda9a7b..fed0387a94 100644
155 /* We simply ignore the field in this case to avoid confusion: 155 /* We simply ignore the field in this case to avoid confusion:
156 MIPS ELF does not specify EF_MIPS_MACH, it is a GNU 156 MIPS ELF does not specify EF_MIPS_MACH, it is a GNU
157diff --git a/gas/config/tc-mips.c b/gas/config/tc-mips.c 157diff --git a/gas/config/tc-mips.c b/gas/config/tc-mips.c
158index c135131b59..d8fbda8e31 100644 158index 59df787155..48537226c0 100644
159--- a/gas/config/tc-mips.c 159--- a/gas/config/tc-mips.c
160+++ b/gas/config/tc-mips.c 160+++ b/gas/config/tc-mips.c
161@@ -552,6 +552,7 @@ static int mips_32bitmode = 0; 161@@ -552,6 +552,7 @@ static int mips_32bitmode = 0;
@@ -174,7 +174,7 @@ index c135131b59..d8fbda8e31 100644
174 ) 174 )
175 175
176 /* Whether the processor uses hardware interlocks to protect reads 176 /* Whether the processor uses hardware interlocks to protect reads
177@@ -19737,7 +19739,7 @@ static const struct mips_cpu_info mips_cpu_info_table[] = 177@@ -19778,7 +19780,7 @@ static const struct mips_cpu_info mips_cpu_info_table[] =
178 /* Broadcom XLP. 178 /* Broadcom XLP.
179 XLP is mostly like XLR, with the prominent exception that it is 179 XLP is mostly like XLR, with the prominent exception that it is
180 MIPS64R2 rather than MIPS64. */ 180 MIPS64R2 rather than MIPS64. */
@@ -184,10 +184,10 @@ index c135131b59..d8fbda8e31 100644
184 /* MIPS 64 Release 6 */ 184 /* MIPS 64 Release 6 */
185 { "i6400", 0, ASE_MSA, ISA_MIPS64R6, CPU_MIPS64R6}, 185 { "i6400", 0, ASE_MSA, ISA_MIPS64R6, CPU_MIPS64R6},
186diff --git a/gas/configure b/gas/configure 186diff --git a/gas/configure b/gas/configure
187index a40ac2144f..65a6995243 100755 187index 134278fa25..2fdca147a1 100755
188--- a/gas/configure 188--- a/gas/configure
189+++ b/gas/configure 189+++ b/gas/configure
190@@ -12989,6 +12989,9 @@ _ACEOF 190@@ -13336,6 +13336,9 @@ _ACEOF
191 mipsisa64r6 | mipsisa64r6el) 191 mipsisa64r6 | mipsisa64r6el)
192 mips_cpu=mips64r6 192 mips_cpu=mips64r6
193 ;; 193 ;;
@@ -198,7 +198,7 @@ index a40ac2144f..65a6995243 100755
198 mips_cpu=r3900 198 mips_cpu=r3900
199 ;; 199 ;;
200diff --git a/include/elf/mips.h b/include/elf/mips.h 200diff --git a/include/elf/mips.h b/include/elf/mips.h
201index 9de0b4e175..74fc4f7e55 100644 201index 4e2cde3279..c329f38929 100644
202--- a/include/elf/mips.h 202--- a/include/elf/mips.h
203+++ b/include/elf/mips.h 203+++ b/include/elf/mips.h
204@@ -290,6 +290,7 @@ END_RELOC_NUMBERS (R_MIPS_maxext) 204@@ -290,6 +290,7 @@ END_RELOC_NUMBERS (R_MIPS_maxext)
@@ -210,10 +210,10 @@ index 9de0b4e175..74fc4f7e55 100644
210 #define E_MIPS_MACH_OCTEON3 0x008e0000 210 #define E_MIPS_MACH_OCTEON3 0x008e0000
211 #define E_MIPS_MACH_5400 0x00910000 211 #define E_MIPS_MACH_5400 0x00910000
212diff --git a/include/opcode/mips.h b/include/opcode/mips.h 212diff --git a/include/opcode/mips.h b/include/opcode/mips.h
213index 5eea72f139..90f6d57e15 100644 213index 1ab1780567..74f457b579 100644
214--- a/include/opcode/mips.h 214--- a/include/opcode/mips.h
215+++ b/include/opcode/mips.h 215+++ b/include/opcode/mips.h
216@@ -1259,6 +1259,8 @@ static const unsigned int mips_isa_table[] = { 216@@ -1262,6 +1262,8 @@ static const unsigned int mips_isa_table[] = {
217 #define INSN_XLR 0x00000020 217 #define INSN_XLR 0x00000020
218 /* Imagination interAptiv MR2. */ 218 /* Imagination interAptiv MR2. */
219 #define INSN_INTERAPTIV_MR2 0x04000000 219 #define INSN_INTERAPTIV_MR2 0x04000000
@@ -222,7 +222,7 @@ index 5eea72f139..90f6d57e15 100644
222 222
223 /* DSP ASE */ 223 /* DSP ASE */
224 #define ASE_DSP 0x00000001 224 #define ASE_DSP 0x00000001
225@@ -1365,6 +1367,7 @@ static const unsigned int mips_isa_table[] = { 225@@ -1373,6 +1375,7 @@ static const unsigned int mips_isa_table[] = {
226 #define CPU_OCTEON3 6503 226 #define CPU_OCTEON3 6503
227 #define CPU_XLR 887682 /* decimal 'XLR' */ 227 #define CPU_XLR 887682 /* decimal 'XLR' */
228 #define CPU_INTERAPTIV_MR2 736550 /* decimal 'IA2' */ 228 #define CPU_INTERAPTIV_MR2 736550 /* decimal 'IA2' */
@@ -230,7 +230,7 @@ index 5eea72f139..90f6d57e15 100644
230 230
231 /* Return true if the given CPU is included in INSN_* mask MASK. */ 231 /* Return true if the given CPU is included in INSN_* mask MASK. */
232 232
233@@ -1445,6 +1448,9 @@ cpu_is_member (int cpu, unsigned int mask) 233@@ -1453,6 +1456,9 @@ cpu_is_member (int cpu, unsigned int mask)
234 return ((mask & INSN_ISA_MASK) == INSN_ISA32R6) 234 return ((mask & INSN_ISA_MASK) == INSN_ISA32R6)
235 || ((mask & INSN_ISA_MASK) == INSN_ISA64R6); 235 || ((mask & INSN_ISA_MASK) == INSN_ISA64R6);
236 236
@@ -241,10 +241,10 @@ index 5eea72f139..90f6d57e15 100644
241 return FALSE; 241 return FALSE;
242 } 242 }
243diff --git a/ld/configure.tgt b/ld/configure.tgt 243diff --git a/ld/configure.tgt b/ld/configure.tgt
244index 1d78465590..307e787b64 100644 244index 7fb2168503..a1db7adfe2 100644
245--- a/ld/configure.tgt 245--- a/ld/configure.tgt
246+++ b/ld/configure.tgt 246+++ b/ld/configure.tgt
247@@ -521,6 +521,8 @@ mips*el-sde-elf* | mips*el-mti-elf* | mips*el-img-elf*) 247@@ -450,6 +450,8 @@ mips*el-sde-elf* | mips*el-mti-elf* | mips*el-img-elf*)
248 mips*-sde-elf* | mips*-mti-elf* | mips*-img-elf*) 248 mips*-sde-elf* | mips*-mti-elf* | mips*-img-elf*)
249 targ_emul=elf32btsmip 249 targ_emul=elf32btsmip
250 targ_extra_emuls="elf32ltsmip elf32btsmipn32 elf64btsmip elf32ltsmipn32 elf64ltsmip" ;; 250 targ_extra_emuls="elf32ltsmip elf32btsmipn32 elf64btsmip elf32ltsmipn32 elf64ltsmip" ;;
@@ -254,10 +254,10 @@ index 1d78465590..307e787b64 100644
254 targ_extra_emuls="elf32lr5900" 254 targ_extra_emuls="elf32lr5900"
255 targ_extra_libpath=$targ_extra_emuls ;; 255 targ_extra_libpath=$targ_extra_emuls ;;
256diff --git a/opcodes/mips-dis.c b/opcodes/mips-dis.c 256diff --git a/opcodes/mips-dis.c b/opcodes/mips-dis.c
257index 984fcbb802..95b107d216 100644 257index bbf21328e8..38e487c16f 100644
258--- a/opcodes/mips-dis.c 258--- a/opcodes/mips-dis.c
259+++ b/opcodes/mips-dis.c 259+++ b/opcodes/mips-dis.c
260@@ -655,13 +655,11 @@ const struct mips_arch_choice mips_arch_choices[] = 260@@ -656,13 +656,11 @@ const struct mips_arch_choice mips_arch_choices[] =
261 mips_cp0sel_names_xlr, ARRAY_SIZE (mips_cp0sel_names_xlr), 261 mips_cp0sel_names_xlr, ARRAY_SIZE (mips_cp0sel_names_xlr),
262 mips_cp1_names_mips3264, mips_hwr_names_numeric }, 262 mips_cp1_names_mips3264, mips_hwr_names_numeric },
263 263
@@ -277,10 +277,10 @@ index 984fcbb802..95b107d216 100644
277 /* This entry, mips16, is here only for ISA/processor selection; do 277 /* This entry, mips16, is here only for ISA/processor selection; do
278 not print its name. */ 278 not print its name. */
279diff --git a/opcodes/mips-opc.c b/opcodes/mips-opc.c 279diff --git a/opcodes/mips-opc.c b/opcodes/mips-opc.c
280index 180d613c93..65b7b8cc23 100644 280index 1cbcbc6abc..e1fbdc89de 100644
281--- a/opcodes/mips-opc.c 281--- a/opcodes/mips-opc.c
282+++ b/opcodes/mips-opc.c 282+++ b/opcodes/mips-opc.c
283@@ -328,6 +328,7 @@ decode_mips_operand (const char *p) 283@@ -329,6 +329,7 @@ decode_mips_operand (const char *p)
284 #define IOCT3 INSN_OCTEON3 284 #define IOCT3 INSN_OCTEON3
285 #define XLR INSN_XLR 285 #define XLR INSN_XLR
286 #define IAMR2 INSN_INTERAPTIV_MR2 286 #define IAMR2 INSN_INTERAPTIV_MR2
@@ -288,7 +288,7 @@ index 180d613c93..65b7b8cc23 100644
288 #define IVIRT ASE_VIRT 288 #define IVIRT ASE_VIRT
289 #define IVIRT64 ASE_VIRT64 289 #define IVIRT64 ASE_VIRT64
290 290
291@@ -966,6 +967,7 @@ const struct mips_opcode mips_builtin_opcodes[] = 291@@ -974,6 +975,7 @@ const struct mips_opcode mips_builtin_opcodes[] =
292 {"clo", "U,s", 0x70000021, 0xfc0007ff, WR_1|RD_2, 0, I32|N55, 0, I37 }, 292 {"clo", "U,s", 0x70000021, 0xfc0007ff, WR_1|RD_2, 0, I32|N55, 0, I37 },
293 {"clz", "d,s", 0x00000050, 0xfc1f07ff, WR_1|RD_2, 0, I37, 0, 0 }, 293 {"clz", "d,s", 0x00000050, 0xfc1f07ff, WR_1|RD_2, 0, I37, 0, 0 },
294 {"clz", "U,s", 0x70000020, 0xfc0007ff, WR_1|RD_2, 0, I32|N55, 0, I37 }, 294 {"clz", "U,s", 0x70000020, 0xfc0007ff, WR_1|RD_2, 0, I32|N55, 0, I37 },
@@ -296,7 +296,7 @@ index 180d613c93..65b7b8cc23 100644
296 /* ctc0 is at the bottom of the table. */ 296 /* ctc0 is at the bottom of the table. */
297 {"ctc1", "t,G", 0x44c00000, 0xffe007ff, RD_1|WR_CC|CM, 0, I1, 0, 0 }, 297 {"ctc1", "t,G", 0x44c00000, 0xffe007ff, RD_1|WR_CC|CM, 0, I1, 0, 0 },
298 {"ctc1", "t,S", 0x44c00000, 0xffe007ff, RD_1|WR_CC|CM, 0, I1, 0, 0 }, 298 {"ctc1", "t,S", 0x44c00000, 0xffe007ff, RD_1|WR_CC|CM, 0, I1, 0, 0 },
299@@ -998,12 +1000,13 @@ const struct mips_opcode mips_builtin_opcodes[] = 299@@ -1006,12 +1008,13 @@ const struct mips_opcode mips_builtin_opcodes[] =
300 {"daddiu", "t,r,j", 0x64000000, 0xfc000000, WR_1|RD_2, 0, I3, 0, 0 }, 300 {"daddiu", "t,r,j", 0x64000000, 0xfc000000, WR_1|RD_2, 0, I3, 0, 0 },
301 {"daddu", "d,v,t", 0x0000002d, 0xfc0007ff, WR_1|RD_2|RD_3, 0, I3, 0, 0 }, 301 {"daddu", "d,v,t", 0x0000002d, 0xfc0007ff, WR_1|RD_2|RD_3, 0, I3, 0, 0 },
302 {"daddu", "t,r,I", 0, (int) M_DADDU_I, INSN_MACRO, 0, I3, 0, 0 }, 302 {"daddu", "t,r,I", 0, (int) M_DADDU_I, INSN_MACRO, 0, I3, 0, 0 },
@@ -311,7 +311,7 @@ index 180d613c93..65b7b8cc23 100644
311 /* dctr and dctw are used on the r5000. */ 311 /* dctr and dctw are used on the r5000. */
312 {"dctr", "o(b)", 0xbc050000, 0xfc1f0000, RD_2, 0, I3, 0, 0 }, 312 {"dctr", "o(b)", 0xbc050000, 0xfc1f0000, RD_2, 0, I3, 0, 0 },
313 {"dctw", "o(b)", 0xbc090000, 0xfc1f0000, RD_2, 0, I3, 0, 0 }, 313 {"dctw", "o(b)", 0xbc090000, 0xfc1f0000, RD_2, 0, I3, 0, 0 },
314@@ -1075,6 +1078,7 @@ const struct mips_opcode mips_builtin_opcodes[] = 314@@ -1083,6 +1086,7 @@ const struct mips_opcode mips_builtin_opcodes[] =
315 {"dmfc0", "t,G,H", 0x40200000, 0xffe007f8, WR_1|RD_C0|LC, 0, I64, 0, 0 }, 315 {"dmfc0", "t,G,H", 0x40200000, 0xffe007f8, WR_1|RD_C0|LC, 0, I64, 0, 0 },
316 {"dmfgc0", "t,G", 0x40600100, 0xffe007ff, WR_1|RD_C0|LC, 0, 0, IVIRT64, 0 }, 316 {"dmfgc0", "t,G", 0x40600100, 0xffe007ff, WR_1|RD_C0|LC, 0, 0, IVIRT64, 0 },
317 {"dmfgc0", "t,G,H", 0x40600100, 0xffe007f8, WR_1|RD_C0|LC, 0, 0, IVIRT64, 0 }, 317 {"dmfgc0", "t,G,H", 0x40600100, 0xffe007f8, WR_1|RD_C0|LC, 0, 0, IVIRT64, 0 },
@@ -319,7 +319,7 @@ index 180d613c93..65b7b8cc23 100644
319 {"dmt", "", 0x41600bc1, 0xffffffff, TRAP, 0, 0, MT32, 0 }, 319 {"dmt", "", 0x41600bc1, 0xffffffff, TRAP, 0, 0, MT32, 0 },
320 {"dmt", "t", 0x41600bc1, 0xffe0ffff, WR_1|TRAP, 0, 0, MT32, 0 }, 320 {"dmt", "t", 0x41600bc1, 0xffe0ffff, WR_1|TRAP, 0, 0, MT32, 0 },
321 {"dmtc0", "t,G", 0x40a00000, 0xffe007ff, RD_1|WR_C0|WR_CC|CM, 0, I3, 0, EE }, 321 {"dmtc0", "t,G", 0x40a00000, 0xffe007ff, RD_1|WR_C0|WR_CC|CM, 0, I3, 0, EE },
322@@ -1090,6 +1094,8 @@ const struct mips_opcode mips_builtin_opcodes[] = 322@@ -1098,6 +1102,8 @@ const struct mips_opcode mips_builtin_opcodes[] =
323 /* dmfc3 is at the bottom of the table. */ 323 /* dmfc3 is at the bottom of the table. */
324 /* dmtc3 is at the bottom of the table. */ 324 /* dmtc3 is at the bottom of the table. */
325 {"dmuh", "d,s,t", 0x000000dc, 0xfc0007ff, WR_1|RD_2|RD_3, 0, I69, 0, 0 }, 325 {"dmuh", "d,s,t", 0x000000dc, 0xfc0007ff, WR_1|RD_2|RD_3, 0, I69, 0, 0 },
@@ -328,7 +328,7 @@ index 180d613c93..65b7b8cc23 100644
328 {"dmul", "d,s,t", 0x0000009c, 0xfc0007ff, WR_1|RD_2|RD_3, 0, I69, 0, 0 }, 328 {"dmul", "d,s,t", 0x0000009c, 0xfc0007ff, WR_1|RD_2|RD_3, 0, I69, 0, 0 },
329 {"dmul", "d,v,t", 0x70000003, 0xfc0007ff, WR_1|RD_2|RD_3|WR_HILO, 0, IOCT, 0, 0 }, 329 {"dmul", "d,v,t", 0x70000003, 0xfc0007ff, WR_1|RD_2|RD_3|WR_HILO, 0, IOCT, 0, 0 },
330 {"dmul", "d,v,t", 0, (int) M_DMUL, INSN_MACRO, 0, I3, 0, M32|I69 }, 330 {"dmul", "d,v,t", 0, (int) M_DMUL, INSN_MACRO, 0, I3, 0, M32|I69 },
331@@ -1243,9 +1249,9 @@ const struct mips_opcode mips_builtin_opcodes[] = 331@@ -1251,9 +1257,9 @@ const struct mips_opcode mips_builtin_opcodes[] =
332 {"ld", "s,-b(+R)", 0xec180000, 0xfc1c0000, WR_1, RD_pc, I69, 0, 0 }, 332 {"ld", "s,-b(+R)", 0xec180000, 0xfc1c0000, WR_1, RD_pc, I69, 0, 0 },
333 {"ld", "t,A(b)", 0, (int) M_LD_AB, INSN_MACRO, 0, I1, 0, 0 }, 333 {"ld", "t,A(b)", 0, (int) M_LD_AB, INSN_MACRO, 0, I1, 0, 0 },
334 {"ld", "t,o(b)", 0xdc000000, 0xfc000000, WR_1|RD_3|LM, 0, I3, 0, 0 }, 334 {"ld", "t,o(b)", 0xdc000000, 0xfc000000, WR_1|RD_3|LM, 0, I3, 0, 0 },
@@ -341,7 +341,7 @@ index 180d613c93..65b7b8cc23 100644
341 {"ldc1", "T,o(b)", 0xd4000000, 0xfc000000, WR_1|RD_3|CLD|FP_D, 0, I2, 0, SF }, 341 {"ldc1", "T,o(b)", 0xd4000000, 0xfc000000, WR_1|RD_3|CLD|FP_D, 0, I2, 0, SF },
342 {"ldc1", "E,o(b)", 0xd4000000, 0xfc000000, WR_1|RD_3|CLD|FP_D, 0, I2, 0, SF }, 342 {"ldc1", "E,o(b)", 0xd4000000, 0xfc000000, WR_1|RD_3|CLD|FP_D, 0, I2, 0, SF },
343 {"ldc1", "T,A(b)", 0, (int) M_LDC1_AB, INSN_MACRO, INSN2_M_FP_D, I2, 0, SF }, 343 {"ldc1", "T,A(b)", 0, (int) M_LDC1_AB, INSN_MACRO, INSN2_M_FP_D, I2, 0, SF },
344@@ -1410,7 +1416,7 @@ const struct mips_opcode mips_builtin_opcodes[] = 344@@ -1418,7 +1424,7 @@ const struct mips_opcode mips_builtin_opcodes[] =
345 {"mflo", "d,9", 0x00000012, 0xff9f07ff, WR_1|RD_LO, 0, 0, D32, 0 }, 345 {"mflo", "d,9", 0x00000012, 0xff9f07ff, WR_1|RD_LO, 0, 0, D32, 0 },
346 {"mflo1", "d", 0x70000012, 0xffff07ff, WR_1|RD_LO, 0, EE, 0, 0 }, 346 {"mflo1", "d", 0x70000012, 0xffff07ff, WR_1|RD_LO, 0, EE, 0, 0 },
347 {"mflhxu", "d", 0x00000052, 0xffff07ff, WR_1|MOD_HILO, 0, 0, SMT, 0 }, 347 {"mflhxu", "d", 0x00000052, 0xffff07ff, WR_1|MOD_HILO, 0, 0, SMT, 0 },
@@ -350,7 +350,7 @@ index 180d613c93..65b7b8cc23 100644
350 {"mfsa", "d", 0x00000028, 0xffff07ff, WR_1, 0, EE, 0, 0 }, 350 {"mfsa", "d", 0x00000028, 0xffff07ff, WR_1, 0, EE, 0, 0 },
351 {"min.ob", "X,Y,Q", 0x78000006, 0xfc20003f, WR_1|RD_2|RD_3|FP_D, 0, SB1, MX, 0 }, 351 {"min.ob", "X,Y,Q", 0x78000006, 0xfc20003f, WR_1|RD_2|RD_3|FP_D, 0, SB1, MX, 0 },
352 {"min.ob", "D,S,Q", 0x48000006, 0xfc20003f, WR_1|RD_2|RD_3|FP_D, 0, N54, 0, 0 }, 352 {"min.ob", "D,S,Q", 0x48000006, 0xfc20003f, WR_1|RD_2|RD_3|FP_D, 0, N54, 0, 0 },
353@@ -1455,10 +1461,13 @@ const struct mips_opcode mips_builtin_opcodes[] = 353@@ -1463,10 +1469,13 @@ const struct mips_opcode mips_builtin_opcodes[] =
354 /* move is at the top of the table. */ 354 /* move is at the top of the table. */
355 {"msgn.qh", "X,Y,Q", 0x78200000, 0xfc20003f, WR_1|RD_2|RD_3|FP_D, 0, 0, MX, 0 }, 355 {"msgn.qh", "X,Y,Q", 0x78200000, 0xfc20003f, WR_1|RD_2|RD_3|FP_D, 0, 0, MX, 0 },
356 {"msgsnd", "t", 0, (int) M_MSGSND, INSN_MACRO, 0, XLR, 0, 0 }, 356 {"msgsnd", "t", 0, (int) M_MSGSND, INSN_MACRO, 0, XLR, 0, 0 },
@@ -366,7 +366,7 @@ index 180d613c93..65b7b8cc23 100644
366 {"msub.d", "D,R,S,T", 0x4c000029, 0xfc00003f, WR_1|RD_2|RD_3|RD_4|FP_D, 0, I4_33, 0, I37 }, 366 {"msub.d", "D,R,S,T", 0x4c000029, 0xfc00003f, WR_1|RD_2|RD_3|RD_4|FP_D, 0, I4_33, 0, I37 },
367 {"msub.d", "D,S,T", 0x46200019, 0xffe0003f, WR_1|RD_2|RD_3|FP_D, 0, IL2E, 0, 0 }, 367 {"msub.d", "D,S,T", 0x46200019, 0xffe0003f, WR_1|RD_2|RD_3|FP_D, 0, IL2E, 0, 0 },
368 {"msub.d", "D,S,T", 0x72200019, 0xffe0003f, WR_1|RD_2|RD_3|FP_D, 0, IL2F, 0, 0 }, 368 {"msub.d", "D,S,T", 0x72200019, 0xffe0003f, WR_1|RD_2|RD_3|FP_D, 0, IL2F, 0, 0 },
369@@ -1508,7 +1517,7 @@ const struct mips_opcode mips_builtin_opcodes[] = 369@@ -1516,7 +1525,7 @@ const struct mips_opcode mips_builtin_opcodes[] =
370 {"mtlo", "s,7", 0x00000013, 0xfc1fe7ff, RD_1|WR_LO, 0, 0, D32, 0 }, 370 {"mtlo", "s,7", 0x00000013, 0xfc1fe7ff, RD_1|WR_LO, 0, 0, D32, 0 },
371 {"mtlo1", "s", 0x70000013, 0xfc1fffff, RD_1|WR_LO, 0, EE, 0, 0 }, 371 {"mtlo1", "s", 0x70000013, 0xfc1fffff, RD_1|WR_LO, 0, EE, 0, 0 },
372 {"mtlhx", "s", 0x00000053, 0xfc1fffff, RD_1|MOD_HILO, 0, 0, SMT, 0 }, 372 {"mtlhx", "s", 0x00000053, 0xfc1fffff, RD_1|MOD_HILO, 0, 0, SMT, 0 },
@@ -375,7 +375,7 @@ index 180d613c93..65b7b8cc23 100644
375 {"mtm0", "s", 0x70000008, 0xfc1fffff, RD_1, 0, IOCT, 0, 0 }, 375 {"mtm0", "s", 0x70000008, 0xfc1fffff, RD_1, 0, IOCT, 0, 0 },
376 {"mtm0", "s,t", 0x70000008, 0xfc00ffff, RD_1|RD_2, 0, IOCT3, 0, 0 }, 376 {"mtm0", "s,t", 0x70000008, 0xfc00ffff, RD_1|RD_2, 0, IOCT3, 0, 0 },
377 {"mtm1", "s", 0x7000000c, 0xfc1fffff, RD_1, 0, IOCT, 0, 0 }, 377 {"mtm1", "s", 0x7000000c, 0xfc1fffff, RD_1, 0, IOCT, 0, 0 },
378@@ -1945,9 +1954,9 @@ const struct mips_opcode mips_builtin_opcodes[] = 378@@ -1953,9 +1962,9 @@ const struct mips_opcode mips_builtin_opcodes[] =
379 {"suxc1", "S,t(b)", 0x4c00000d, 0xfc0007ff, RD_1|RD_2|RD_3|SM|FP_D, 0, I5_33|N55, 0, I37}, 379 {"suxc1", "S,t(b)", 0x4c00000d, 0xfc0007ff, RD_1|RD_2|RD_3|SM|FP_D, 0, I5_33|N55, 0, I37},
380 {"sw", "t,o(b)", 0xac000000, 0xfc000000, RD_1|RD_3|SM, 0, I1, 0, 0 }, 380 {"sw", "t,o(b)", 0xac000000, 0xfc000000, RD_1|RD_3|SM, 0, I1, 0, 0 },
381 {"sw", "t,A(b)", 0, (int) M_SW_AB, INSN_MACRO, 0, I1, 0, 0 }, 381 {"sw", "t,A(b)", 0, (int) M_SW_AB, INSN_MACRO, 0, I1, 0, 0 },
@@ -389,5 +389,5 @@ index 180d613c93..65b7b8cc23 100644
389 {"swc0", "E,A(b)", 0, (int) M_SWC0_AB, INSN_MACRO, 0, I1, 0, IOCT|IOCTP|IOCT2|I37 }, 389 {"swc0", "E,A(b)", 0, (int) M_SWC0_AB, INSN_MACRO, 0, I1, 0, IOCT|IOCTP|IOCT2|I37 },
390 {"swc1", "T,o(b)", 0xe4000000, 0xfc000000, RD_1|RD_3|SM|FP_S, 0, I1, 0, 0 }, 390 {"swc1", "T,o(b)", 0xe4000000, 0xfc000000, RD_1|RD_3|SM|FP_S, 0, I1, 0, 0 },
391-- 391--
3922.16.1 3922.18.0
393 393
diff --git a/meta/recipes-devtools/binutils/binutils/0013-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 c3e1b13841..c9ffdada91 100644
--- a/meta/recipes-devtools/binutils/binutils/0013-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 27ec22ca3cd56cfdf060d2e1f414bedce269b322 Mon Sep 17 00:00:00 2001 1From d45455db35db5693c5efe0e1b384295e4c0db998 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 13/15] fix the incorrect assembling for ppc wait mnemonic 4Subject: [PATCH 13/15] fix the incorrect assembling for ppc wait mnemonic
@@ -11,10 +11,10 @@ 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 bb17f26c2e..dbdd762b4e 100644 14index 4a0fca5f0a..49f72fc35c 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@@ -5338,7 +5338,6 @@ const struct powerpc_opcode powerpc_opcodes[] = { 17@@ -5351,7 +5351,6 @@ const struct powerpc_opcode powerpc_opcodes[] = {
18 {"ldepx", X(31,29), X_MASK, E500MC|PPCA2, 0, {RT, RA0, RB}}, 18 {"ldepx", X(31,29), X_MASK, E500MC|PPCA2, 0, {RT, RA0, RB}},
19 19
20 {"waitasec", X(31,30), XRTRARB_MASK, POWER8, POWER9, {0}}, 20 {"waitasec", X(31,30), XRTRARB_MASK, POWER8, POWER9, {0}},
@@ -22,7 +22,7 @@ index bb17f26c2e..dbdd762b4e 100644
22 22
23 {"lwepx", X(31,31), X_MASK, E500MC|PPCA2, 0, {RT, RA0, RB}}, 23 {"lwepx", X(31,31), X_MASK, E500MC|PPCA2, 0, {RT, RA0, RB}},
24 24
25@@ -5392,7 +5391,7 @@ const struct powerpc_opcode powerpc_opcodes[] = { 25@@ -5405,7 +5404,7 @@ const struct powerpc_opcode powerpc_opcodes[] = {
26 26
27 {"waitrsv", X(31,62)|(1<<21), 0xffffffff, E500MC|PPCA2, 0, {0}}, 27 {"waitrsv", X(31,62)|(1<<21), 0xffffffff, E500MC|PPCA2, 0, {0}},
28 {"waitimpl", X(31,62)|(2<<21), 0xffffffff, E500MC|PPCA2, 0, {0}}, 28 {"waitimpl", X(31,62)|(2<<21), 0xffffffff, E500MC|PPCA2, 0, {0}},
@@ -32,5 +32,5 @@ index bb17f26c2e..dbdd762b4e 100644
32 {"dcbstep", XRT(31,63,0), XRT_MASK, E500MC|PPCA2, 0, {RA0, RB}}, 32 {"dcbstep", XRT(31,63,0), XRT_MASK, E500MC|PPCA2, 0, {RA0, RB}},
33 33
34-- 34--
352.16.1 352.18.0
36 36
diff --git a/meta/recipes-devtools/binutils/binutils/0014-Detect-64-bit-MIPS-targets.patch b/meta/recipes-devtools/binutils/binutils/0014-Detect-64-bit-MIPS-targets.patch
index cf3690f25d..6197df6d5a 100644
--- a/meta/recipes-devtools/binutils/binutils/0014-Detect-64-bit-MIPS-targets.patch
+++ b/meta/recipes-devtools/binutils/binutils/0014-Detect-64-bit-MIPS-targets.patch
@@ -1,4 +1,4 @@
1From 7dfbd6889d868a09d695dd2736104848c1a9c9c3 Mon Sep 17 00:00:00 2001 1From 9af90cfc35ff1fe78755578861473039836c467a 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 14/15] Detect 64-bit MIPS targets 4Subject: [PATCH 14/15] Detect 64-bit MIPS targets
@@ -46,5 +46,5 @@ index 8aef22a318..7030026ffa 100644
46 targ_obj=mips 46 targ_obj=mips
47 targ_machine=EM_MIPS 47 targ_machine=EM_MIPS
48-- 48--
492.16.1 492.18.0
50 50
diff --git a/meta/recipes-devtools/binutils/binutils/0015-sync-with-OE-libtool-changes.patch b/meta/recipes-devtools/binutils/binutils/0015-sync-with-OE-libtool-changes.patch
index 8c9fd237e7..7dc8ba8c37 100644
--- a/meta/recipes-devtools/binutils/binutils/0015-sync-with-OE-libtool-changes.patch
+++ b/meta/recipes-devtools/binutils/binutils/0015-sync-with-OE-libtool-changes.patch
@@ -1,4 +1,4 @@
1From 298804f430939d6cc94b09732ee93e64c5e6be18 Mon Sep 17 00:00:00 2001 1From f9e26bd29b5f017ea1307b51b5036063bff78600 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 15/15] sync with OE libtool changes 4Subject: [PATCH 15/15] sync with OE libtool changes
@@ -85,5 +85,5 @@ index 11ee684ccc..3b19ac1532 100644
85 elif test -n "$runpath_var"; then 85 elif test -n "$runpath_var"; then
86 case "$finalize_perm_rpath " in 86 case "$finalize_perm_rpath " in
87-- 87--
882.16.1 882.18.0
89 89
diff --git a/meta/recipes-devtools/binutils/binutils_2.30.bb b/meta/recipes-devtools/binutils/binutils_2.31.bb
index 51a9748906..51a9748906 100644
--- a/meta/recipes-devtools/binutils/binutils_2.30.bb
+++ b/meta/recipes-devtools/binutils/binutils_2.31.bb
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-19 23:13:09 +0000