summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/binutils
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-devtools/binutils')
-rw-r--r--meta/recipes-devtools/binutils/binutils-2.44.inc (renamed from meta/recipes-devtools/binutils/binutils-2.42.inc)24
-rw-r--r--meta/recipes-devtools/binutils/binutils-cross-canadian.inc2
-rw-r--r--meta/recipes-devtools/binutils/binutils-cross-canadian_2.44.bb (renamed from meta/recipes-devtools/binutils/binutils-cross-canadian_2.42.bb)0
-rw-r--r--meta/recipes-devtools/binutils/binutils-cross.inc3
-rw-r--r--meta/recipes-devtools/binutils/binutils-cross_2.44.bb (renamed from meta/recipes-devtools/binutils/binutils-cross_2.42.bb)0
-rw-r--r--meta/recipes-devtools/binutils/binutils-crosssdk_2.44.bb (renamed from meta/recipes-devtools/binutils/binutils-crosssdk_2.42.bb)0
-rw-r--r--meta/recipes-devtools/binutils/binutils-testsuite_2.44.bb (renamed from meta/recipes-devtools/binutils/binutils-cross-testsuite_2.42.bb)9
-rw-r--r--meta/recipes-devtools/binutils/binutils.inc36
-rw-r--r--meta/recipes-devtools/binutils/binutils/0001-binutils-crosssdk-Generate-relocatable-SDKs.patch18
-rw-r--r--meta/recipes-devtools/binutils/binutils/0002-binutils-cross-Do-not-generate-linker-script-directo.patch6
-rw-r--r--meta/recipes-devtools/binutils/binutils/0003-binutils-nativesdk-Search-for-alternative-ld.so.conf.patch14
-rw-r--r--meta/recipes-devtools/binutils/binutils/0004-Point-scripts-location-to-libdir.patch6
-rw-r--r--meta/recipes-devtools/binutils/binutils/0005-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch4
-rw-r--r--meta/recipes-devtools/binutils/binutils/0006-warn-for-uses-of-system-directories-when-cross-linki.patch48
-rw-r--r--meta/recipes-devtools/binutils/binutils/0007-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch4
-rw-r--r--meta/recipes-devtools/binutils/binutils/0008-Use-libtool-2.4.patch2164
-rw-r--r--meta/recipes-devtools/binutils/binutils/0009-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch8
-rw-r--r--meta/recipes-devtools/binutils/binutils/0010-sync-with-OE-libtool-changes.patch10
-rw-r--r--meta/recipes-devtools/binutils/binutils/0011-Check-for-clang-before-checking-gcc-version.patch10
-rw-r--r--meta/recipes-devtools/binutils/binutils/0012-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch8
-rw-r--r--meta/recipes-devtools/binutils/binutils/0013-Define-alignof-using-_Alignof-when-using-C11-or-newe.patch4
-rw-r--r--meta/recipes-devtools/binutils/binutils/0014-Remove-duplicate-pe-dll.o-entry-deom-targ_extra_ofil.patch6
-rw-r--r--meta/recipes-devtools/binutils/binutils/0015-CVE-2025-1178.patch33
-rw-r--r--meta/recipes-devtools/binutils/binutils/0015-gprofng-change-use-of-bignum-to-bigint.patch17
-rw-r--r--meta/recipes-devtools/binutils/binutils/0016-CVE-2025-1181-1.patch141
-rw-r--r--meta/recipes-devtools/binutils/binutils/0017-CVE-2025-1181-2.patch337
-rw-r--r--meta/recipes-devtools/binutils/binutils/0018-CVE-2025-5245.patch38
-rw-r--r--meta/recipes-devtools/binutils/binutils/0019-CVE-2025-3198.patch28
-rw-r--r--meta/recipes-devtools/binutils/binutils/0019-CVE-2025-5244.patch25
-rw-r--r--meta/recipes-devtools/binutils/binutils/CVE-2025-1180.patch165
-rw-r--r--meta/recipes-devtools/binutils/binutils/CVE-2025-1182.patch36
-rw-r--r--meta/recipes-devtools/binutils/binutils_2.44.bb (renamed from meta/recipes-devtools/binutils/binutils_2.42.bb)7
32 files changed, 2000 insertions, 1211 deletions
diff --git a/meta/recipes-devtools/binutils/binutils-2.42.inc b/meta/recipes-devtools/binutils/binutils-2.44.inc
index 3b6f47d4ce..18bff2816a 100644
--- a/meta/recipes-devtools/binutils/binutils-2.42.inc
+++ b/meta/recipes-devtools/binutils/binutils-2.44.inc
@@ -1,4 +1,4 @@
1LIC_FILES_CHKSUM="\ 1LIC_FILES_CHKSUM = "\
2 file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552\ 2 file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552\
3 file://COPYING.LIB;md5=9f604d8a4f8e74f4f5140845a21b6674\ 3 file://COPYING.LIB;md5=9f604d8a4f8e74f4f5140845a21b6674\
4 file://COPYING3;md5=d32239bcb673463ab874e80d47fae504\ 4 file://COPYING3;md5=d32239bcb673463ab874e80d47fae504\
@@ -10,17 +10,17 @@ LIC_FILES_CHKSUM="\
10 file://bfd/COPYING;md5=d32239bcb673463ab874e80d47fae504\ 10 file://bfd/COPYING;md5=d32239bcb673463ab874e80d47fae504\
11 " 11 "
12 12
13# When upgrading to 2.42, please make sure there is no trailing .0, so 13# When upgrading to next major release, ensure that there is no trailing .0, so
14# that upstream version check can work correctly. 14# that upstream version check can work correctly.
15PV = "2.42" 15PV = "2.44"
16CVE_VERSION = "2.42" 16CVE_VERSION = "2.44"
17SRCBRANCH ?= "binutils-2_42-branch" 17SRCBRANCH ?= "binutils-2_44-branch"
18 18
19UPSTREAM_CHECK_GITTAGREGEX = "binutils-(?P<pver>\d+_(\d_?)*)" 19UPSTREAM_CHECK_GITTAGREGEX = "binutils-(?P<pver>\d+_(\d_?)*)"
20 20
21CVE_STATUS[CVE-2023-25584] = "cpe-incorrect: Applies only for version 2.40 and earlier" 21CVE_STATUS[CVE-2025-1153] = "cpe-stable-backport: fix available in used git hash"
22 22
23SRCREV ?= "553c7f61b74badf91df484450944675efd9cd485" 23SRCREV ?= "96bc9e8081a5dbe8329c1d5b0c94191fd5bed840"
24BINUTILS_GIT_URI ?= "git://sourceware.org/git/binutils-gdb.git;branch=${SRCBRANCH};protocol=https" 24BINUTILS_GIT_URI ?= "git://sourceware.org/git/binutils-gdb.git;branch=${SRCBRANCH};protocol=https"
25SRC_URI = "\ 25SRC_URI = "\
26 ${BINUTILS_GIT_URI} \ 26 ${BINUTILS_GIT_URI} \
@@ -35,6 +35,12 @@ SRC_URI = "\
35 file://0012-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch \ 35 file://0012-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch \
36 file://0013-Define-alignof-using-_Alignof-when-using-C11-or-newe.patch \ 36 file://0013-Define-alignof-using-_Alignof-when-using-C11-or-newe.patch \
37 file://0014-Remove-duplicate-pe-dll.o-entry-deom-targ_extra_ofil.patch \ 37 file://0014-Remove-duplicate-pe-dll.o-entry-deom-targ_extra_ofil.patch \
38 file://0015-gprofng-change-use-of-bignum-to-bigint.patch \ 38 file://0015-CVE-2025-1178.patch \
39 file://CVE-2025-1180.patch \
40 file://CVE-2025-1182.patch \
41 file://0016-CVE-2025-1181-1.patch \
42 file://0017-CVE-2025-1181-2.patch \
43 file://0018-CVE-2025-5245.patch \
44 file://0019-CVE-2025-5244.patch \
45 file://0019-CVE-2025-3198.patch \
39" 46"
40S = "${WORKDIR}/git"
diff --git a/meta/recipes-devtools/binutils/binutils-cross-canadian.inc b/meta/recipes-devtools/binutils/binutils-cross-canadian.inc
index 62ebb3f5bc..c1fda1a465 100644
--- a/meta/recipes-devtools/binutils/binutils-cross-canadian.inc
+++ b/meta/recipes-devtools/binutils/binutils-cross-canadian.inc
@@ -4,7 +4,7 @@ SUMMARY = "GNU binary utilities (cross-canadian for ${TARGET_ARCH} target)"
4PN = "binutils-cross-canadian-${TRANSLATED_TARGET_ARCH}" 4PN = "binutils-cross-canadian-${TRANSLATED_TARGET_ARCH}"
5BPN = "binutils" 5BPN = "binutils"
6 6
7DEPENDS = "flex-native bison-native virtual/${HOST_PREFIX}gcc virtual/nativesdk-libc nativesdk-zlib nativesdk-gettext nativesdk-flex" 7DEPENDS = "flex-native bison-native virtual/nativesdk-cross-cc virtual/nativesdk-libc nativesdk-zlib nativesdk-gettext nativesdk-flex"
8EXTRA_OECONF += "--with-sysroot=${SDKPATH}/sysroots/${TUNE_PKGARCH}${TARGET_VENDOR}-${TARGET_OS} \ 8EXTRA_OECONF += "--with-sysroot=${SDKPATH}/sysroots/${TUNE_PKGARCH}${TARGET_VENDOR}-${TARGET_OS} \
9 --enable-poison-system-directories \ 9 --enable-poison-system-directories \
10 " 10 "
diff --git a/meta/recipes-devtools/binutils/binutils-cross-canadian_2.42.bb b/meta/recipes-devtools/binutils/binutils-cross-canadian_2.44.bb
index 5dbaa03017..5dbaa03017 100644
--- a/meta/recipes-devtools/binutils/binutils-cross-canadian_2.42.bb
+++ b/meta/recipes-devtools/binutils/binutils-cross-canadian_2.44.bb
diff --git a/meta/recipes-devtools/binutils/binutils-cross.inc b/meta/recipes-devtools/binutils/binutils-cross.inc
index 835d4fa69b..c545ea2ad9 100644
--- a/meta/recipes-devtools/binutils/binutils-cross.inc
+++ b/meta/recipes-devtools/binutils/binutils-cross.inc
@@ -1,5 +1,4 @@
1inherit cross 1inherit cross
2PROVIDES = "virtual/${TARGET_PREFIX}binutils"
3 2
4PN = "binutils-cross-${TARGET_ARCH}" 3PN = "binutils-cross-${TARGET_ARCH}"
5BPN = "binutils" 4BPN = "binutils"
@@ -10,6 +9,8 @@ TARGET_ARCH[vardepvalue] = "${TARGET_ARCH}"
10INHIBIT_DEFAULT_DEPS = "1" 9INHIBIT_DEFAULT_DEPS = "1"
11INHIBIT_AUTOTOOLS_DEPS = "1" 10INHIBIT_AUTOTOOLS_DEPS = "1"
12 11
12TOOLCHAIN = "gcc"
13
13SRC_URI += "file://0002-binutils-cross-Do-not-generate-linker-script-directo.patch" 14SRC_URI += "file://0002-binutils-cross-Do-not-generate-linker-script-directo.patch"
14 15
15# Specify lib-path else we use a load of search dirs which we don't use 16# Specify lib-path else we use a load of search dirs which we don't use
diff --git a/meta/recipes-devtools/binutils/binutils-cross_2.42.bb b/meta/recipes-devtools/binutils/binutils-cross_2.44.bb
index fbd1f7d25a..fbd1f7d25a 100644
--- a/meta/recipes-devtools/binutils/binutils-cross_2.42.bb
+++ b/meta/recipes-devtools/binutils/binutils-cross_2.44.bb
diff --git a/meta/recipes-devtools/binutils/binutils-crosssdk_2.42.bb b/meta/recipes-devtools/binutils/binutils-crosssdk_2.44.bb
index 6752659304..6752659304 100644
--- a/meta/recipes-devtools/binutils/binutils-crosssdk_2.42.bb
+++ b/meta/recipes-devtools/binutils/binutils-crosssdk_2.44.bb
diff --git a/meta/recipes-devtools/binutils/binutils-cross-testsuite_2.42.bb b/meta/recipes-devtools/binutils/binutils-testsuite_2.44.bb
index 630815c7a3..e5e159bc71 100644
--- a/meta/recipes-devtools/binutils/binutils-cross-testsuite_2.42.bb
+++ b/meta/recipes-devtools/binutils/binutils-testsuite_2.44.bb
@@ -1,3 +1,6 @@
1# NOTE: This recipe cannot have -cross- in the file name because it triggers
2# the cross build detection in sstate which causes it to use the wrong
3# architecture
1require binutils.inc 4require binutils.inc
2require binutils-${PV}.inc 5require binutils-${PV}.inc
3 6
@@ -18,9 +21,9 @@ do_configure() {
18} 21}
19 22
20# target depends 23# target depends
21DEPENDS += "virtual/${TARGET_PREFIX}binutils" 24DEPENDS += "virtual/cross-binutils"
22DEPENDS += "virtual/${TARGET_PREFIX}gcc" 25DEPENDS += "virtual/cross-cc"
23DEPENDS += "virtual/${MLPREFIX}${TARGET_PREFIX}compilerlibs" 26DEPENDS += "virtual/${MLPREFIX}compilerlibs"
24DEPENDS += "virtual/${MLPREFIX}libc" 27DEPENDS += "virtual/${MLPREFIX}libc"
25 28
26python check_prepare() { 29python check_prepare() {
diff --git a/meta/recipes-devtools/binutils/binutils.inc b/meta/recipes-devtools/binutils/binutils.inc
index e176b5cff1..00b1301258 100644
--- a/meta/recipes-devtools/binutils/binutils.inc
+++ b/meta/recipes-devtools/binutils/binutils.inc
@@ -18,7 +18,7 @@ inherit autotools gettext multilib_header pkgconfig texinfo
18FILES:${PN} = " \ 18FILES:${PN} = " \
19 ${bindir}/${TARGET_PREFIX}* \ 19 ${bindir}/${TARGET_PREFIX}* \
20 ${libdir}/lib*.so.* \ 20 ${libdir}/lib*.so.* \
21 ${libdir}/bfd-plugins/lib*.so \ 21 ${libdir}/bfd-plugins/lib*${SOLIBSDEV} \
22 ${libdir}/lib*-${PV}*.so \ 22 ${libdir}/lib*-${PV}*.so \
23 ${prefix}/${TARGET_SYS}/bin/* \ 23 ${prefix}/${TARGET_SYS}/bin/* \
24 ${bindir}/embedspu" 24 ${bindir}/embedspu"
@@ -39,11 +39,11 @@ FILES:${PN}-staticdev += "${libdir}/gprofng/*.a"
39# list and reuse it. 39# list and reuse it.
40 40
41GPROFNGS = " \ 41GPROFNGS = " \
42 gp-archive \ 42 gprofng-archive \
43 gp-collect-app \ 43 gprofng-collect-app \
44 gp-display-html \ 44 gprofng-display-html \
45 gp-display-src \ 45 gprofng-display-src \
46 gp-display-text \ 46 gprofng-display-text \
47 gprofng \ 47 gprofng \
48" 48"
49 49
@@ -56,12 +56,6 @@ GPROFNG_ALTS:x86 = "${GPROFNGS}"
56GPROFNG_ALTS:x86-64 = "${GPROFNGS}" 56GPROFNG_ALTS:x86-64 = "${GPROFNGS}"
57GPROFNG_ALTS:aarch64 = "${GPROFNGS}" 57GPROFNG_ALTS:aarch64 = "${GPROFNGS}"
58 58
59LDGOLD_ALTS ?= "ld.gold dwp"
60LDGOLD_ALTS:riscv64 = ""
61LDGOLD_ALTS:riscv32 = ""
62LDGOLD_ALTS:loongarch64 = ""
63LDGOLD_ALTS:libc-glibc:mipsarch = ""
64
65USE_ALTERNATIVES_FOR = " \ 59USE_ALTERNATIVES_FOR = " \
66 addr2line \ 60 addr2line \
67 ar \ 61 ar \
@@ -72,7 +66,6 @@ USE_ALTERNATIVES_FOR = " \
72 ${GPROFNG_ALTS} \ 66 ${GPROFNG_ALTS} \
73 ld \ 67 ld \
74 ld.bfd \ 68 ld.bfd \
75 ${LDGOLD_ALTS} \
76 nm \ 69 nm \
77 objcopy \ 70 objcopy \
78 objdump \ 71 objdump \
@@ -104,7 +97,7 @@ EXTRA_OECONF = "--program-prefix=${TARGET_PREFIX} \
104 --disable-libdecnumber \ 97 --disable-libdecnumber \
105 --disable-readline \ 98 --disable-readline \
106 --disable-sim \ 99 --disable-sim \
107 ${LDGOLD} \ 100 --disable-gold \
108 ${EXTRA_TARGETS} \ 101 ${EXTRA_TARGETS} \
109 ${@bb.utils.contains('DISTRO_FEATURES', 'multiarch', '--enable-64-bit-bfd', '', d)}" 102 ${@bb.utils.contains('DISTRO_FEATURES', 'multiarch', '--enable-64-bit-bfd', '', d)}"
110 103
@@ -112,12 +105,6 @@ EXTRA_TARGETS = ""
112EXTRA_TARGETS:x86-64 = " --enable-targets=x86_64-pe,x86_64-pep " 105EXTRA_TARGETS:x86-64 = " --enable-targets=x86_64-pe,x86_64-pep "
113EXTRA_TARGETS:class-native = "" 106EXTRA_TARGETS:class-native = ""
114 107
115LDGOLD:class-native = ""
116LDGOLD:class-crosssdk = ""
117LDGOLD:libc-glibc:mipsarch = ""
118LDGOLD ?= "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', '--enable-gold=default --enable-threads', '--enable-gold --enable-ld=default --enable-threads', d)}"
119
120
121# This is necessary due to a bug in the binutils Makefiles 108# This is necessary due to a bug in the binutils Makefiles
122# EXTRA_OEMAKE = "configure-build-libiberty all" 109# EXTRA_OEMAKE = "configure-build-libiberty all"
123 110
@@ -191,6 +178,10 @@ do_install () {
191 for alt in ${USE_ALTERNATIVES_FOR}; do 178 for alt in ${USE_ALTERNATIVES_FOR}; do
192 rm -f ${D}${bindir}/$alt 179 rm -f ${D}${bindir}/$alt
193 done 180 done
181 # remove old pre 2.44 release gprofng binary names
182 for f in gp-archive gp-collect-app gp-display-html gp-display-src gp-display-text; do
183 rm -f ${D}${bindir}/$f
184 done
194 185
195 oe_multilib_header bfd.h 186 oe_multilib_header bfd.h
196} 187}
@@ -200,8 +191,3 @@ inherit update-alternatives
200ALTERNATIVE_PRIORITY = "100" 191ALTERNATIVE_PRIORITY = "100"
201 192
202ALTERNATIVE:${PN}:class-target = "${USE_ALTERNATIVES_FOR}" 193ALTERNATIVE:${PN}:class-target = "${USE_ALTERNATIVES_FOR}"
203
204python () {
205 if bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', True, False, d) and bb.utils.contains_any('TARGET_ARCH', 'riscv32 riscv64 loongarch64', True, False, d):
206 bb.fatal("Gold linker does not _yet_ support RISC-V and LoongArch architecture please remove ld-is-gold from DISTRO_FEATURES")
207}
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 4ef11c56e7..2443897cad 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 089ee95b342e79af09258b45c888a13b35fadf26 Mon Sep 17 00:00:00 2001 1From df3faaf0a09fd828330d3bac45782868a04f7bc0 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] binutils-crosssdk: Generate relocatable SDKs 4Subject: [PATCH] binutils-crosssdk: Generate relocatable SDKs
@@ -21,7 +21,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
21 3 files changed, 6 insertions(+), 3 deletions(-) 21 3 files changed, 6 insertions(+), 3 deletions(-)
22 22
23diff --git a/gold/layout.cc b/gold/layout.cc 23diff --git a/gold/layout.cc b/gold/layout.cc
24index b43ae841a6c..6101a95195b 100644 24index f690c67618e..9ded8368482 100644
25--- a/gold/layout.cc 25--- a/gold/layout.cc
26+++ b/gold/layout.cc 26+++ b/gold/layout.cc
27@@ -5102,7 +5102,7 @@ Layout::create_interp(const Target* target) 27@@ -5102,7 +5102,7 @@ Layout::create_interp(const Target* target)
@@ -34,10 +34,10 @@ index b43ae841a6c..6101a95195b 100644
34 Output_section_data* odata = new Output_data_const(interp, len, 1); 34 Output_section_data* odata = new Output_data_const(interp, len, 1);
35 35
36diff --git a/ld/genscripts.sh b/ld/genscripts.sh 36diff --git a/ld/genscripts.sh b/ld/genscripts.sh
37index d6ceb3fe4f5..365c0e778cc 100755 37index 77a1fb465ad..5b51c23e141 100755
38--- a/ld/genscripts.sh 38--- a/ld/genscripts.sh
39+++ b/ld/genscripts.sh 39+++ b/ld/genscripts.sh
40@@ -298,6 +298,7 @@ DATA_ALIGNMENT_u="${DATA_ALIGNMENT_u-${DATA_ALIGNMENT_r}}" 40@@ -315,6 +315,7 @@ DATA_ALIGNMENT_u="${DATA_ALIGNMENT_u-${DATA_ALIGNMENT_r}}"
41 LD_FLAG=r 41 LD_FLAG=r
42 DATA_ALIGNMENT=${DATA_ALIGNMENT_r} 42 DATA_ALIGNMENT=${DATA_ALIGNMENT_r}
43 DEFAULT_DATA_ALIGNMENT="ALIGN(${SEGMENT_SIZE})" 43 DEFAULT_DATA_ALIGNMENT="ALIGN(${SEGMENT_SIZE})"
@@ -45,7 +45,7 @@ index d6ceb3fe4f5..365c0e778cc 100755
45 ( echo "/* Script for -r */" 45 ( echo "/* Script for -r */"
46 source_sh ${CUSTOMIZER_SCRIPT} 46 source_sh ${CUSTOMIZER_SCRIPT}
47 source_sh ${srcdir}/scripttempl/${SCRIPT_NAME}.sc 47 source_sh ${srcdir}/scripttempl/${SCRIPT_NAME}.sc
48@@ -306,10 +307,12 @@ DEFAULT_DATA_ALIGNMENT="ALIGN(${SEGMENT_SIZE})" 48@@ -323,10 +324,12 @@ DEFAULT_DATA_ALIGNMENT="ALIGN(${SEGMENT_SIZE})"
49 LD_FLAG=u 49 LD_FLAG=u
50 DATA_ALIGNMENT=${DATA_ALIGNMENT_u} 50 DATA_ALIGNMENT=${DATA_ALIGNMENT_u}
51 CONSTRUCTING=" " 51 CONSTRUCTING=" "
@@ -59,17 +59,17 @@ index d6ceb3fe4f5..365c0e778cc 100755
59 DATA_ALIGNMENT=${DATA_ALIGNMENT_} 59 DATA_ALIGNMENT=${DATA_ALIGNMENT_}
60 RELOCATING=" " 60 RELOCATING=" "
61diff --git a/ld/scripttempl/elf.sc b/ld/scripttempl/elf.sc 61diff --git a/ld/scripttempl/elf.sc b/ld/scripttempl/elf.sc
62index fae7c2ad71c..7fe37eb1874 100644 62index be8d19fcf11..26ecd6dff80 100644
63--- a/ld/scripttempl/elf.sc 63--- a/ld/scripttempl/elf.sc
64+++ b/ld/scripttempl/elf.sc 64+++ b/ld/scripttempl/elf.sc
65@@ -150,8 +150,8 @@ if test -z "$DATA_SEGMENT_ALIGN"; then 65@@ -197,8 +197,8 @@ if test -z "$DATA_SEGMENT_ALIGN"; then
66 DATA_SEGMENT_RELRO_END=". = DATA_SEGMENT_RELRO_END (${SEPARATE_GOTPLT-0}, .);"
67 fi 66 fi
68 fi 67 fi
68
69-if test -z "${INITIAL_READONLY_SECTIONS}${CREATE_SHLIB}"; then 69-if test -z "${INITIAL_READONLY_SECTIONS}${CREATE_SHLIB}"; then
70- INITIAL_READONLY_SECTIONS=".interp ${RELOCATING-0} : { *(.interp) }" 70- INITIAL_READONLY_SECTIONS=".interp ${RELOCATING-0} : { *(.interp) }"
71+if test -z "${INITIAL_READONLY_SECTIONS}${CREATE_SHLIB}${PARTIAL_LINKING}"; then 71+if test -z "${INITIAL_READONLY_SECTIONS}${CREATE_SHLIB}${PARTIAL_LINKING}"; then
72+ INITIAL_READONLY_SECTIONS=".interp ${RELOCATING-0} : { *(.interp); . = 0x1000; }" 72+ INITIAL_READONLY_SECTIONS=".interp ${RELOCATING-0} : { *(.interp); . = 0x1000; }"
73 fi 73 fi
74
74 if test -z "$PLT"; then 75 if test -z "$PLT"; then
75 IPLT=".iplt ${RELOCATING-0} : { *(.iplt) }"
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 1652473bcb..20459fce66 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 6fae7afeb713a60755e17443964e46190bb97ede Mon Sep 17 00:00:00 2001 1From 3105d7ecc3f16d66c19985a6557cd1e9becfab55 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 6 Mar 2017 23:37:05 -0800 3Date: Mon, 6 Mar 2017 23:37:05 -0800
4Subject: [PATCH] binutils-cross: Do not generate linker script directories 4Subject: [PATCH] binutils-cross: Do not generate linker script directories
@@ -22,10 +22,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
22 1 file changed, 25 deletions(-) 22 1 file changed, 25 deletions(-)
23 23
24diff --git a/ld/genscripts.sh b/ld/genscripts.sh 24diff --git a/ld/genscripts.sh b/ld/genscripts.sh
25index 365c0e778cc..b0893fda3c5 100755 25index 5b51c23e141..5d2c54706f8 100755
26--- a/ld/genscripts.sh 26--- a/ld/genscripts.sh
27+++ b/ld/genscripts.sh 27+++ b/ld/genscripts.sh
28@@ -229,31 +229,6 @@ append_to_lib_path() 28@@ -244,31 +244,6 @@ append_to_lib_path()
29 fi 29 fi
30 } 30 }
31 31
diff --git a/meta/recipes-devtools/binutils/binutils/0003-binutils-nativesdk-Search-for-alternative-ld.so.conf.patch b/meta/recipes-devtools/binutils/binutils/0003-binutils-nativesdk-Search-for-alternative-ld.so.conf.patch
index f45690ed68..374fbd6f41 100644
--- a/meta/recipes-devtools/binutils/binutils/0003-binutils-nativesdk-Search-for-alternative-ld.so.conf.patch
+++ b/meta/recipes-devtools/binutils/binutils/0003-binutils-nativesdk-Search-for-alternative-ld.so.conf.patch
@@ -1,4 +1,4 @@
1From 1fe9aa3f25e09281cb018b29081db4cc44bdc01f Mon Sep 17 00:00:00 2001 1From d718e17e1668880a85ff05993f0027d9c9ad6935 Mon Sep 17 00:00:00 2001
2From: Richard Purdie <richard.purdie@linuxfoundation.org> 2From: Richard Purdie <richard.purdie@linuxfoundation.org>
3Date: Wed, 19 Feb 2020 09:51:16 -0800 3Date: Wed, 19 Feb 2020 09:51:16 -0800
4Subject: [PATCH] binutils-nativesdk: Search for alternative ld.so.conf in SDK 4Subject: [PATCH] binutils-nativesdk: Search for alternative ld.so.conf in SDK
@@ -29,7 +29,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
29 5 files changed, 7 insertions(+), 3 deletions(-) 29 5 files changed, 7 insertions(+), 3 deletions(-)
30 30
31diff --git a/ld/Makefile.am b/ld/Makefile.am 31diff --git a/ld/Makefile.am b/ld/Makefile.am
32index f9ee05b1400..07801c2c3ac 100644 32index ccff9289924..cf2c29e89a3 100644
33--- a/ld/Makefile.am 33--- a/ld/Makefile.am
34+++ b/ld/Makefile.am 34+++ b/ld/Makefile.am
35@@ -42,7 +42,8 @@ ZLIBINC = @zlibinc@ 35@@ -42,7 +42,8 @@ ZLIBINC = @zlibinc@
@@ -43,7 +43,7 @@ index f9ee05b1400..07801c2c3ac 100644
43 NO_WERROR = @NO_WERROR@ 43 NO_WERROR = @NO_WERROR@
44 AM_CFLAGS = $(WARN_CFLAGS) $(ELF_CFLAGS) $(JANSSON_CFLAGS) $(ZSTD_CFLAGS) 44 AM_CFLAGS = $(WARN_CFLAGS) $(ELF_CFLAGS) $(JANSSON_CFLAGS) $(ZSTD_CFLAGS)
45diff --git a/ld/Makefile.in b/ld/Makefile.in 45diff --git a/ld/Makefile.in b/ld/Makefile.in
46index abb0565718f..6329a12a0d6 100644 46index 3e24bd4deb2..23d4f1f3132 100644
47--- a/ld/Makefile.in 47--- a/ld/Makefile.in
48+++ b/ld/Makefile.in 48+++ b/ld/Makefile.in
49@@ -576,7 +576,8 @@ ZLIB = @zlibdir@ -lz 49@@ -576,7 +576,8 @@ ZLIB = @zlibdir@ -lz
@@ -57,10 +57,10 @@ index abb0565718f..6329a12a0d6 100644
57 AM_CFLAGS = $(WARN_CFLAGS) $(ELF_CFLAGS) $(JANSSON_CFLAGS) $(ZSTD_CFLAGS) 57 AM_CFLAGS = $(WARN_CFLAGS) $(ELF_CFLAGS) $(JANSSON_CFLAGS) $(ZSTD_CFLAGS)
58 58
59diff --git a/ld/ldelf.c b/ld/ldelf.c 59diff --git a/ld/ldelf.c b/ld/ldelf.c
60index 2852851dcd5..187b359af86 100644 60index 4a1aa044e70..f6f3ac11a76 100644
61--- a/ld/ldelf.c 61--- a/ld/ldelf.c
62+++ b/ld/ldelf.c 62+++ b/ld/ldelf.c
63@@ -939,7 +939,7 @@ ldelf_check_ld_so_conf (const struct bfd_link_needed_list *l, int force, 63@@ -943,7 +943,7 @@ ldelf_check_ld_so_conf (const struct bfd_link_needed_list *l, int force,
64 64
65 info.path = NULL; 65 info.path = NULL;
66 info.len = info.alloc = 0; 66 info.len = info.alloc = 0;
@@ -70,7 +70,7 @@ index 2852851dcd5..187b359af86 100644
70 if (!ldelf_parse_ld_so_conf (&info, tmppath)) 70 if (!ldelf_parse_ld_so_conf (&info, tmppath))
71 { 71 {
72diff --git a/ld/ldmain.c b/ld/ldmain.c 72diff --git a/ld/ldmain.c b/ld/ldmain.c
73index e90c2021b33..01b306e58a1 100644 73index f1c5f7035c5..cce4991b25a 100644
74--- a/ld/ldmain.c 74--- a/ld/ldmain.c
75+++ b/ld/ldmain.c 75+++ b/ld/ldmain.c
76@@ -69,6 +69,7 @@ char *program_name; 76@@ -69,6 +69,7 @@ char *program_name;
@@ -82,7 +82,7 @@ index e90c2021b33..01b306e58a1 100644
82 /* The canonical representation of ld_sysroot. */ 82 /* The canonical representation of ld_sysroot. */
83 char *ld_canon_sysroot; 83 char *ld_canon_sysroot;
84diff --git a/ld/ldmain.h b/ld/ldmain.h 84diff --git a/ld/ldmain.h b/ld/ldmain.h
85index 0238aed0ebd..2dd00db13b3 100644 85index 0baa3c305c3..899c4b591c6 100644
86--- a/ld/ldmain.h 86--- a/ld/ldmain.h
87+++ b/ld/ldmain.h 87+++ b/ld/ldmain.h
88@@ -23,6 +23,7 @@ 88@@ -23,6 +23,7 @@
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 ab12c145ea..8a24408f4f 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 780109902b00652dfdc080607c614f210e96ae9b Mon Sep 17 00:00:00 2001 1From 0ff4f23d3521a45835eaa03731c0b3351a50d8ba Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 2 Mar 2015 01:09:58 +0000 3Date: Mon, 2 Mar 2015 01:09:58 +0000
4Subject: [PATCH] Point scripts location to libdir 4Subject: [PATCH] Point scripts location to libdir
@@ -12,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 07801c2c3ac..a2bcffecf73 100644 15index cf2c29e89a3..0a6eaada129 100644
16--- a/ld/Makefile.am 16--- a/ld/Makefile.am
17+++ b/ld/Makefile.am 17+++ b/ld/Makefile.am
18@@ -51,7 +51,7 @@ AM_CFLAGS = $(WARN_CFLAGS) $(ELF_CFLAGS) $(JANSSON_CFLAGS) $(ZSTD_CFLAGS) 18@@ -51,7 +51,7 @@ AM_CFLAGS = $(WARN_CFLAGS) $(ELF_CFLAGS) $(JANSSON_CFLAGS) $(ZSTD_CFLAGS)
@@ -25,7 +25,7 @@ index 07801c2c3ac..a2bcffecf73 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 6329a12a0d6..15311048855 100644 28index 23d4f1f3132..c3d08edbef1 100644
29--- a/ld/Makefile.in 29--- a/ld/Makefile.in
30+++ b/ld/Makefile.in 30+++ b/ld/Makefile.in
31@@ -584,7 +584,7 @@ AM_CFLAGS = $(WARN_CFLAGS) $(ELF_CFLAGS) $(JANSSON_CFLAGS) $(ZSTD_CFLAGS) 31@@ -584,7 +584,7 @@ AM_CFLAGS = $(WARN_CFLAGS) $(ELF_CFLAGS) $(JANSSON_CFLAGS) $(ZSTD_CFLAGS)
diff --git a/meta/recipes-devtools/binutils/binutils/0005-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch b/meta/recipes-devtools/binutils/binutils/0005-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch
index f7c3987542..4a1cd34f29 100644
--- a/meta/recipes-devtools/binutils/binutils/0005-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch
+++ b/meta/recipes-devtools/binutils/binutils/0005-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch
@@ -1,4 +1,4 @@
1From c8cca8d2364c9f233d6e771136a4d4ff7f405c21 Mon Sep 17 00:00:00 2001 1From 340d2cf058b373ed4fbf6bcea4f6674eab23c73a Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 2 Mar 2015 01:39:01 +0000 3Date: Mon, 2 Mar 2015 01:39:01 +0000
4Subject: [PATCH] don't let the distro compiler point to the wrong installation 4Subject: [PATCH] don't let the distro compiler point to the wrong installation
@@ -17,7 +17,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
17 1 file changed, 2 insertions(+), 1 deletion(-) 17 1 file changed, 2 insertions(+), 1 deletion(-)
18 18
19diff --git a/libiberty/Makefile.in b/libiberty/Makefile.in 19diff --git a/libiberty/Makefile.in b/libiberty/Makefile.in
20index 85c4b6b6ef8..cb6e91c8f9b 100644 20index b11df756b4b..f47269fdc0e 100644
21--- a/libiberty/Makefile.in 21--- a/libiberty/Makefile.in
22+++ b/libiberty/Makefile.in 22+++ b/libiberty/Makefile.in
23@@ -385,7 +385,8 @@ install-strip: install 23@@ -385,7 +385,8 @@ install-strip: install
diff --git a/meta/recipes-devtools/binutils/binutils/0006-warn-for-uses-of-system-directories-when-cross-linki.patch b/meta/recipes-devtools/binutils/binutils/0006-warn-for-uses-of-system-directories-when-cross-linki.patch
index bf6a1a3961..e094c89d1a 100644
--- a/meta/recipes-devtools/binutils/binutils/0006-warn-for-uses-of-system-directories-when-cross-linki.patch
+++ b/meta/recipes-devtools/binutils/binutils/0006-warn-for-uses-of-system-directories-when-cross-linki.patch
@@ -1,4 +1,4 @@
1From a92c46e3703d038d7d810bdc91e8540ad9d9150a Mon Sep 17 00:00:00 2001 1From e9297b35595d7dd6c50ce6ff7282eee248b7e479 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 15 Jan 2016 06:31:09 +0000 3Date: Fri, 15 Jan 2016 06:31:09 +0000
4Subject: [PATCH] warn for uses of system directories when cross linking 4Subject: [PATCH] warn for uses of system directories when cross linking
@@ -63,10 +63,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
63 9 files changed, 87 insertions(+), 2 deletions(-) 63 9 files changed, 87 insertions(+), 2 deletions(-)
64 64
65diff --git a/ld/config.in b/ld/config.in 65diff --git a/ld/config.in b/ld/config.in
66index 52d62f06ff0..b5944e7ba55 100644 66index 2d7b6406d2b..37cd12d20fa 100644
67--- a/ld/config.in 67--- a/ld/config.in
68+++ b/ld/config.in 68+++ b/ld/config.in
69@@ -70,6 +70,9 @@ 69@@ -78,6 +78,9 @@
70 language is requested. */ 70 language is requested. */
71 #undef ENABLE_NLS 71 #undef ENABLE_NLS
72 72
@@ -77,7 +77,7 @@ index 52d62f06ff0..b5944e7ba55 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 6f8a05c3b6c..98a76d6da7f 100755 80index 597d110f57a..d537ec391d2 100755
81--- a/ld/configure 81--- a/ld/configure
82+++ b/ld/configure 82+++ b/ld/configure
83@@ -844,6 +844,7 @@ with_lib_path 83@@ -844,6 +844,7 @@ with_lib_path
@@ -88,7 +88,7 @@ index 6f8a05c3b6c..98a76d6da7f 100755
88 enable_gold 88 enable_gold
89 enable_got 89 enable_got
90 enable_compressed_debug_sections 90 enable_compressed_debug_sections
91@@ -1534,6 +1535,8 @@ Optional Features: 91@@ -1537,6 +1538,8 @@ Optional Features:
92 --enable-checking enable run-time checks 92 --enable-checking enable run-time checks
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 6f8a05c3b6c..98a76d6da7f 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@@ -15566,6 +15569,19 @@ fi 100@@ -15571,6 +15574,19 @@ fi
101 101
102 102
103 103
@@ -118,10 +118,10 @@ index 6f8a05c3b6c..98a76d6da7f 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 4a11787ae71..104a531fb0f 100644 121index 228f2ee4089..50a4b0f4db1 100644
122--- a/ld/configure.ac 122--- a/ld/configure.ac
123+++ b/ld/configure.ac 123+++ b/ld/configure.ac
124@@ -103,6 +103,16 @@ AC_SUBST(use_sysroot) 124@@ -102,6 +102,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
@@ -139,7 +139,7 @@ index 4a11787ae71..104a531fb0f 100644
139 dnl "install_as_default" is set to false if gold is the default linker. 139 dnl "install_as_default" is set to false if gold is the default linker.
140 dnl "installed_linker" is the installed BFD linker name. 140 dnl "installed_linker" is the installed BFD linker name.
141diff --git a/ld/ld.h b/ld/ld.h 141diff --git a/ld/ld.h b/ld/ld.h
142index 54d9079678c..9f0163b2911 100644 142index 254f0a097bb..daf777c65c8 100644
143--- a/ld/ld.h 143--- a/ld/ld.h
144+++ b/ld/ld.h 144+++ b/ld/ld.h
145@@ -166,6 +166,14 @@ typedef struct 145@@ -166,6 +166,14 @@ typedef struct
@@ -158,10 +158,10 @@ index 54d9079678c..9f0163b2911 100644
158 enum endian_enum endian; 158 enum endian_enum endian;
159 159
160diff --git a/ld/ld.texi b/ld/ld.texi 160diff --git a/ld/ld.texi b/ld/ld.texi
161index 4fda259a552..22685f5f1dd 100644 161index f6384ad82dd..26479a6a232 100644
162--- a/ld/ld.texi 162--- a/ld/ld.texi
163+++ b/ld/ld.texi 163+++ b/ld/ld.texi
164@@ -3119,6 +3119,18 @@ creation of the metadata note, if one had been enabled by an earlier 164@@ -3279,6 +3279,18 @@ creation of the metadata note, if one had been enabled by an earlier
165 occurrence of the --package-metadata option. 165 occurrence of the --package-metadata option.
166 If the linker has been built with libjansson, then the JSON string 166 If the linker has been built with libjansson, then the JSON string
167 will be validated. 167 will be validated.
@@ -181,10 +181,10 @@ index 4fda259a552..22685f5f1dd 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 dc9875d8813..49d899ee49d 100644 184index 12551504ae6..8bea4e7048f 100644
185--- a/ld/ldfile.c 185--- a/ld/ldfile.c
186+++ b/ld/ldfile.c 186+++ b/ld/ldfile.c
187@@ -327,6 +327,23 @@ ldfile_add_library_path (const char *name, bool cmdline) 187@@ -328,6 +328,23 @@ ldfile_add_library_path (const char *name, bool cmdline)
188 new_dirs->name = concat (ld_sysroot, name + strlen ("$SYSROOT"), (const char *) NULL); 188 new_dirs->name = concat (ld_sysroot, name + strlen ("$SYSROOT"), (const char *) NULL);
189 else 189 else
190 new_dirs->name = xstrdup (name); 190 new_dirs->name = xstrdup (name);
@@ -207,14 +207,14 @@ index dc9875d8813..49d899ee49d 100644
207+ 207+
208 } 208 }
209 209
210 /* Try to open a BFD for a lang_input_statement. */ 210 static void
211diff --git a/ld/ldlex.h b/ld/ldlex.h 211diff --git a/ld/ldlex.h b/ld/ldlex.h
212index 161a9d4d8dc..757fe2f7650 100644 212index b8b7d6b6829..a8faeb635c4 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@@ -150,6 +150,8 @@ enum option_values
216 OPTION_PLUGIN,
217 OPTION_PLUGIN_OPT, 216 OPTION_PLUGIN_OPT,
217 OPTION_PLUGIN_SAVE_TEMPS,
218 #endif /* BFD_SUPPORTS_PLUGINS */ 218 #endif /* BFD_SUPPORTS_PLUGINS */
219+ OPTION_NO_POISON_SYSTEM_DIRECTORIES, 219+ OPTION_NO_POISON_SYSTEM_DIRECTORIES,
220+ OPTION_ERROR_POISON_SYSTEM_DIRECTORIES, 220+ OPTION_ERROR_POISON_SYSTEM_DIRECTORIES,
@@ -222,10 +222,10 @@ index 161a9d4d8dc..757fe2f7650 100644
222 OPTION_PRINT_OUTPUT_FORMAT, 222 OPTION_PRINT_OUTPUT_FORMAT,
223 OPTION_PRINT_SYSROOT, 223 OPTION_PRINT_SYSROOT,
224diff --git a/ld/ldmain.c b/ld/ldmain.c 224diff --git a/ld/ldmain.c b/ld/ldmain.c
225index 01b306e58a1..eddefc24332 100644 225index cce4991b25a..1859465635d 100644
226--- a/ld/ldmain.c 226--- a/ld/ldmain.c
227+++ b/ld/ldmain.c 227+++ b/ld/ldmain.c
228@@ -326,6 +326,8 @@ main (int argc, char **argv) 228@@ -352,6 +352,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;
@@ -234,7 +234,7 @@ index 01b306e58a1..eddefc24332 100644
234 234
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
237@@ -1458,7 +1460,7 @@ undefined_symbol (struct bfd_link_info *info, 237@@ -1500,7 +1502,7 @@ undefined_symbol (struct bfd_link_info *info,
238 argv[1] = "undefined-symbol"; 238 argv[1] = "undefined-symbol";
239 argv[2] = (char *) name; 239 argv[2] = (char *) name;
240 argv[3] = NULL; 240 argv[3] = NULL;
@@ -243,7 +243,7 @@ index 01b306e58a1..eddefc24332 100644
243 if (verbose) 243 if (verbose)
244 einfo (_("%P: About to run error handling script '%s' with arguments: '%s' '%s'\n"), 244 einfo (_("%P: About to run error handling script '%s' with arguments: '%s' '%s'\n"),
245 argv[0], argv[1], argv[2]); 245 argv[0], argv[1], argv[2]);
246@@ -1479,7 +1481,7 @@ undefined_symbol (struct bfd_link_info *info, 246@@ -1521,7 +1523,7 @@ undefined_symbol (struct bfd_link_info *info,
247 carry on to issue the normal error message. */ 247 carry on to issue the normal error message. */
248 } 248 }
249 #endif /* SUPPORT_ERROR_HANDLING_SCRIPT */ 249 #endif /* SUPPORT_ERROR_HANDLING_SCRIPT */
@@ -253,10 +253,10 @@ index 01b306e58a1..eddefc24332 100644
253 { 253 {
254 if (error_count < MAX_ERRORS_IN_A_ROW) 254 if (error_count < MAX_ERRORS_IN_A_ROW)
255diff --git a/ld/lexsup.c b/ld/lexsup.c 255diff --git a/ld/lexsup.c b/ld/lexsup.c
256index 099dff8ecde..e9939000b2e 100644 256index 5399aa45b72..8f9a221bfba 100644
257--- a/ld/lexsup.c 257--- a/ld/lexsup.c
258+++ b/ld/lexsup.c 258+++ b/ld/lexsup.c
259@@ -642,6 +642,14 @@ static const struct ld_option ld_options[] = 259@@ -650,6 +650,14 @@ static const struct ld_option ld_options[] =
260 " <method> is: share-unconflicted (default),\n" 260 " <method> is: share-unconflicted (default),\n"
261 " share-duplicated"), 261 " share-duplicated"),
262 TWO_DASHES }, 262 TWO_DASHES },
@@ -271,7 +271,7 @@ index 099dff8ecde..e9939000b2e 100644
271 }; 271 };
272 272
273 #define OPTION_COUNT ARRAY_SIZE (ld_options) 273 #define OPTION_COUNT ARRAY_SIZE (ld_options)
274@@ -1818,6 +1826,13 @@ parse_args (unsigned argc, char **argv) 274@@ -1838,6 +1846,13 @@ parse_args (unsigned argc, char **argv)
275 275
276 case OPTION_PRINT_MAP_LOCALS: 276 case OPTION_PRINT_MAP_LOCALS:
277 config.print_map_locals = true; 277 config.print_map_locals = true;
diff --git a/meta/recipes-devtools/binutils/binutils/0007-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch b/meta/recipes-devtools/binutils/binutils/0007-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch
index f9fa0d4f78..7101219bf4 100644
--- a/meta/recipes-devtools/binutils/binutils/0007-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch
+++ b/meta/recipes-devtools/binutils/binutils/0007-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch
@@ -1,4 +1,4 @@
1From d35fd95eee9930ab41d9ad637eacb35aa9fe6f44 Mon Sep 17 00:00:00 2001 1From de07998ce2189c329220a76feb073438c4ec88f5 Mon Sep 17 00:00:00 2001
2From: Zhenhua Luo <zhenhua.luo@nxp.com> 2From: Zhenhua Luo <zhenhua.luo@nxp.com>
3Date: Sat, 11 Jun 2016 22:08:29 -0500 3Date: Sat, 11 Jun 2016 22:08:29 -0500
4Subject: [PATCH] fix the incorrect assembling for ppc wait mnemonic 4Subject: [PATCH] fix the incorrect assembling for ppc wait mnemonic
@@ -14,7 +14,7 @@ Signed-off-by: Zhenhua Luo <zhenhua.luo@nxp.com>
14 1 file changed, 1 insertion(+), 3 deletions(-) 14 1 file changed, 1 insertion(+), 3 deletions(-)
15 15
16diff --git a/opcodes/ppc-opc.c b/opcodes/ppc-opc.c 16diff --git a/opcodes/ppc-opc.c b/opcodes/ppc-opc.c
17index e55bfe846cd..66b37e36e6f 100644 17index aa4484ef9ab..81b6a4c2db9 100644
18--- a/opcodes/ppc-opc.c 18--- a/opcodes/ppc-opc.c
19+++ b/opcodes/ppc-opc.c 19+++ b/opcodes/ppc-opc.c
20@@ -7138,8 +7138,6 @@ const struct powerpc_opcode powerpc_opcodes[] = { 20@@ -7138,8 +7138,6 @@ const struct powerpc_opcode powerpc_opcodes[] = {
diff --git a/meta/recipes-devtools/binutils/binutils/0008-Use-libtool-2.4.patch b/meta/recipes-devtools/binutils/binutils/0008-Use-libtool-2.4.patch
index 05f1ed0dc5..f8dcbd5e4d 100644
--- a/meta/recipes-devtools/binutils/binutils/0008-Use-libtool-2.4.patch
+++ b/meta/recipes-devtools/binutils/binutils/0008-Use-libtool-2.4.patch
@@ -1,4 +1,4 @@
1From da089ddacb6506f406acd8939389183a4356ebf0 Mon Sep 17 00:00:00 2001 1From dc3a330d6525c6276930c3175e5c878fe2cd9784 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] Use libtool 2.4 4Subject: [PATCH] Use libtool 2.4
@@ -10,14 +10,14 @@ Upstream-Status: Pending
10Signed-off-by: Khem Raj <raj.khem@gmail.com> 10Signed-off-by: Khem Raj <raj.khem@gmail.com>
11--- 11---
12 bfd/Makefile.in | 3 + 12 bfd/Makefile.in | 3 +
13 bfd/configure | 1333 +++++++++--- 13 bfd/configure | 1333 ++++++++----
14 bfd/configure.ac | 2 +- 14 bfd/configure.ac | 2 +-
15 binutils/Makefile.in | 3 + 15 binutils/Makefile.in | 3 +
16 binutils/configure | 1331 +++++++++--- 16 binutils/configure | 1331 ++++++++----
17 gas/Makefile.in | 3 + 17 gas/Makefile.in | 3 +
18 gas/configure | 1331 +++++++++--- 18 gas/configure | 1331 ++++++++----
19 gprof/Makefile.in | 3 + 19 gprof/Makefile.in | 3 +
20 gprof/configure | 1331 +++++++++--- 20 gprof/configure | 1331 ++++++++----
21 gprofng/Makefile.in | 2 + 21 gprofng/Makefile.in | 2 +
22 gprofng/configure | 1693 ++++++++++++---- 22 gprofng/configure | 1693 ++++++++++++----
23 gprofng/doc/Makefile.in | 2 + 23 gprofng/doc/Makefile.in | 2 +
@@ -27,27 +27,27 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
27 gprofng/src/Makefile.in | 2 + 27 gprofng/src/Makefile.in | 2 +
28 ld/Makefile.in | 3 + 28 ld/Makefile.in | 3 +
29 ld/configure | 1694 ++++++++++++---- 29 ld/configure | 1694 ++++++++++++----
30 libbacktrace/Makefile.in | 108 +- 30 libbacktrace/Makefile.in | 112 +-
31 libbacktrace/aclocal.m4 | 73 +- 31 libbacktrace/aclocal.m4 | 73 +-
32 libbacktrace/configure | 1441 +++++++++---- 32 libbacktrace/configure | 1441 +++++++++----
33 libctf/Makefile.in | 2 + 33 libctf/Makefile.in | 2 +
34 libctf/configure | 1334 +++++++++--- 34 libctf/configure | 1330 ++++++++----
35 libsframe/Makefile.in | 344 ++-- 35 libsframe/Makefile.in | 344 ++--
36 libsframe/aclocal.m4 | 220 +- 36 libsframe/aclocal.m4 | 220 +-
37 libsframe/configure | 1553 ++++++++++---- 37 libsframe/configure | 1553 ++++++++++----
38 libtool.m4 | 1085 ++++++---- 38 libtool.m4 | 1085 ++++++----
39 ltmain.sh | 2921 ++++++++++++++++++--------- 39 ltmain.sh | 2898 ++++++++++++++++++---------
40 ltoptions.m4 | 2 +- 40 ltoptions.m4 | 2 +-
41 ltversion.m4 | 12 +- 41 ltversion.m4 | 12 +-
42 lt~obsolete.m4 | 2 +- 42 lt~obsolete.m4 | 2 +-
43 opcodes/Makefile.in | 3 + 43 opcodes/Makefile.in | 3 +
44 opcodes/configure | 1331 +++++++++--- 44 opcodes/configure | 1331 ++++++++----
45 zlib/Makefile.in | 3 + 45 zlib/Makefile.in | 3 +
46 zlib/configure | 1331 +++++++++--- 46 zlib/configure | 1331 ++++++++----
47 35 files changed, 16094 insertions(+), 6104 deletions(-) 47 35 files changed, 16078 insertions(+), 6097 deletions(-)
48 48
49diff --git a/bfd/Makefile.in b/bfd/Makefile.in 49diff --git a/bfd/Makefile.in b/bfd/Makefile.in
50index faaa0c424b8..5371e093163 100644 50index ee674a36c5b..130a50d80b0 100644
51--- a/bfd/Makefile.in 51--- a/bfd/Makefile.in
52+++ b/bfd/Makefile.in 52+++ b/bfd/Makefile.in
53@@ -340,6 +340,7 @@ DATADIRNAME = @DATADIRNAME@ 53@@ -340,6 +340,7 @@ DATADIRNAME = @DATADIRNAME@
@@ -75,7 +75,7 @@ index faaa0c424b8..5371e093163 100644
75 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ 75 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
76 all_backends = @all_backends@ 76 all_backends = @all_backends@
77diff --git a/bfd/configure b/bfd/configure 77diff --git a/bfd/configure b/bfd/configure
78index acbac2f364a..a53a9d52719 100755 78index b0f424dffc2..ba3fce10980 100755
79--- a/bfd/configure 79--- a/bfd/configure
80+++ b/bfd/configure 80+++ b/bfd/configure
81@@ -712,6 +712,9 @@ OTOOL 81@@ -712,6 +712,9 @@ OTOOL
@@ -105,7 +105,7 @@ index acbac2f364a..a53a9d52719 100755
105 --with-mmap try using mmap for BFD input files if available 105 --with-mmap try using mmap for BFD input files if available
106 --with-separate-debug-dir=DIR 106 --with-separate-debug-dir=DIR
107 Look for global separate debug info in DIR 107 Look for global separate debug info in DIR
108@@ -5063,8 +5069,8 @@ esac 108@@ -5061,8 +5067,8 @@ esac
109 109
110 110
111 111
@@ -116,7 +116,7 @@ index acbac2f364a..a53a9d52719 100755
116 116
117 117
118 118
119@@ -5104,7 +5110,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO 119@@ -5102,7 +5108,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
120 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 120 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
121 $as_echo_n "checking how to print strings... " >&6; } 121 $as_echo_n "checking how to print strings... " >&6; }
122 # Test print first, because it will be a builtin if present. 122 # Test print first, because it will be a builtin if present.
@@ -125,7 +125,7 @@ index acbac2f364a..a53a9d52719 100755
125 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then 125 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
126 ECHO='print -r --' 126 ECHO='print -r --'
127 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then 127 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
128@@ -5797,8 +5803,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; 128@@ -5795,8 +5801,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6;
129 # Try some XSI features 129 # Try some XSI features
130 xsi_shell=no 130 xsi_shell=no
131 ( _lt_dummy="a/b/c" 131 ( _lt_dummy="a/b/c"
@@ -136,7 +136,7 @@ index acbac2f364a..a53a9d52719 100755
136 && eval 'test $(( 1 + 1 )) -eq 2 \ 136 && eval 'test $(( 1 + 1 )) -eq 2 \
137 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ 137 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
138 && xsi_shell=yes 138 && xsi_shell=yes
139@@ -5847,6 +5853,80 @@ esac 139@@ -5845,6 +5851,80 @@ esac
140 140
141 141
142 142
@@ -217,7 +217,7 @@ index acbac2f364a..a53a9d52719 100755
217 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 217 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
218 $as_echo_n "checking for $LD option to reload object files... " >&6; } 218 $as_echo_n "checking for $LD option to reload object files... " >&6; }
219 if ${lt_cv_ld_reload_flag+:} false; then : 219 if ${lt_cv_ld_reload_flag+:} false; then :
220@@ -5863,6 +5943,11 @@ case $reload_flag in 220@@ -5861,6 +5941,11 @@ case $reload_flag in
221 esac 221 esac
222 reload_cmds='$LD$reload_flag -o $output$reload_objs' 222 reload_cmds='$LD$reload_flag -o $output$reload_objs'
223 case $host_os in 223 case $host_os in
@@ -229,7 +229,7 @@ index acbac2f364a..a53a9d52719 100755
229 darwin*) 229 darwin*)
230 if test "$GCC" = yes; then 230 if test "$GCC" = yes; then
231 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' 231 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
232@@ -6031,7 +6116,8 @@ mingw* | pw32*) 232@@ -6029,7 +6114,8 @@ mingw* | pw32*)
233 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' 233 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
234 lt_cv_file_magic_cmd='func_win32_libid' 234 lt_cv_file_magic_cmd='func_win32_libid'
235 else 235 else
@@ -239,7 +239,7 @@ index acbac2f364a..a53a9d52719 100755
239 lt_cv_file_magic_cmd='$OBJDUMP -f' 239 lt_cv_file_magic_cmd='$OBJDUMP -f'
240 fi 240 fi
241 ;; 241 ;;
242@@ -6190,6 +6276,21 @@ esac 242@@ -6188,6 +6274,21 @@ esac
243 fi 243 fi
244 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 244 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
245 $as_echo "$lt_cv_deplibs_check_method" >&6; } 245 $as_echo "$lt_cv_deplibs_check_method" >&6; }
@@ -261,7 +261,7 @@ index acbac2f364a..a53a9d52719 100755
261 file_magic_cmd=$lt_cv_file_magic_cmd 261 file_magic_cmd=$lt_cv_file_magic_cmd
262 deplibs_check_method=$lt_cv_deplibs_check_method 262 deplibs_check_method=$lt_cv_deplibs_check_method
263 test -z "$deplibs_check_method" && deplibs_check_method=unknown 263 test -z "$deplibs_check_method" && deplibs_check_method=unknown
264@@ -6205,6 +6306,157 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown 264@@ -6203,6 +6304,157 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
265 265
266 266
267 267
@@ -419,7 +419,7 @@ index acbac2f364a..a53a9d52719 100755
419 plugin_option= 419 plugin_option=
420 plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll" 420 plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll"
421 for plugin in $plugin_names; do 421 for plugin in $plugin_names; do
422@@ -6219,8 +6471,10 @@ for plugin in $plugin_names; do 422@@ -6217,8 +6469,10 @@ for plugin in $plugin_names; do
423 done 423 done
424 424
425 if test -n "$ac_tool_prefix"; then 425 if test -n "$ac_tool_prefix"; then
@@ -432,7 +432,7 @@ index acbac2f364a..a53a9d52719 100755
432 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 432 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
433 $as_echo_n "checking for $ac_word... " >&6; } 433 $as_echo_n "checking for $ac_word... " >&6; }
434 if ${ac_cv_prog_AR+:} false; then : 434 if ${ac_cv_prog_AR+:} false; then :
435@@ -6236,7 +6490,7 @@ do 435@@ -6234,7 +6488,7 @@ do
436 test -z "$as_dir" && as_dir=. 436 test -z "$as_dir" && as_dir=.
437 for ac_exec_ext in '' $ac_executable_extensions; do 437 for ac_exec_ext in '' $ac_executable_extensions; do
438 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 438 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
@@ -441,7 +441,7 @@ index acbac2f364a..a53a9d52719 100755
441 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 441 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
442 break 2 442 break 2
443 fi 443 fi
444@@ -6256,11 +6510,15 @@ $as_echo "no" >&6; } 444@@ -6254,11 +6508,15 @@ $as_echo "no" >&6; }
445 fi 445 fi
446 446
447 447
@@ -460,7 +460,7 @@ index acbac2f364a..a53a9d52719 100755
460 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 460 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
461 $as_echo_n "checking for $ac_word... " >&6; } 461 $as_echo_n "checking for $ac_word... " >&6; }
462 if ${ac_cv_prog_ac_ct_AR+:} false; then : 462 if ${ac_cv_prog_ac_ct_AR+:} false; then :
463@@ -6276,7 +6534,7 @@ do 463@@ -6274,7 +6532,7 @@ do
464 test -z "$as_dir" && as_dir=. 464 test -z "$as_dir" && as_dir=.
465 for ac_exec_ext in '' $ac_executable_extensions; do 465 for ac_exec_ext in '' $ac_executable_extensions; do
466 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 466 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
@@ -469,7 +469,7 @@ index acbac2f364a..a53a9d52719 100755
469 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 469 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
470 break 2 470 break 2
471 fi 471 fi
472@@ -6295,6 +6553,10 @@ else 472@@ -6293,6 +6551,10 @@ else
473 $as_echo "no" >&6; } 473 $as_echo "no" >&6; }
474 fi 474 fi
475 475
@@ -480,7 +480,7 @@ index acbac2f364a..a53a9d52719 100755
480 if test "x$ac_ct_AR" = x; then 480 if test "x$ac_ct_AR" = x; then
481 AR="false" 481 AR="false"
482 else 482 else
483@@ -6306,25 +6568,20 @@ ac_tool_warned=yes ;; 483@@ -6304,25 +6566,20 @@ ac_tool_warned=yes ;;
484 esac 484 esac
485 AR=$ac_ct_AR 485 AR=$ac_ct_AR
486 fi 486 fi
@@ -516,7 +516,7 @@ index acbac2f364a..a53a9d52719 100755
516 516
517 517
518 518
519@@ -6335,6 +6592,63 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru 519@@ -6333,6 +6590,63 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru
520 520
521 521
522 522
@@ -580,7 +580,7 @@ index acbac2f364a..a53a9d52719 100755
580 580
581 if test -n "$ac_tool_prefix"; then 581 if test -n "$ac_tool_prefix"; then
582 # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. 582 # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
583@@ -6675,8 +6989,8 @@ esac 583@@ -6673,8 +6987,8 @@ esac
584 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" 584 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
585 585
586 # Transform an extracted symbol line into symbol name and symbol address 586 # Transform an extracted symbol line into symbol name and symbol address
@@ -591,7 +591,7 @@ index acbac2f364a..a53a9d52719 100755
591 591
592 # Handle CRLF in mingw tool chain 592 # Handle CRLF in mingw tool chain
593 opt_cr= 593 opt_cr=
594@@ -6712,6 +7026,7 @@ for ac_symprfx in "" "_"; do 594@@ -6710,6 +7024,7 @@ for ac_symprfx in "" "_"; do
595 else 595 else
596 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" 596 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
597 fi 597 fi
@@ -599,7 +599,7 @@ index acbac2f364a..a53a9d52719 100755
599 599
600 # Check to see that the pipe works correctly. 600 # Check to see that the pipe works correctly.
601 pipe_works=no 601 pipe_works=no
602@@ -6753,6 +7068,18 @@ _LT_EOF 602@@ -6751,6 +7066,18 @@ _LT_EOF
603 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then 603 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
604 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then 604 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
605 cat <<_LT_EOF > conftest.$ac_ext 605 cat <<_LT_EOF > conftest.$ac_ext
@@ -618,7 +618,7 @@ index acbac2f364a..a53a9d52719 100755
618 #ifdef __cplusplus 618 #ifdef __cplusplus
619 extern "C" { 619 extern "C" {
620 #endif 620 #endif
621@@ -6764,7 +7091,7 @@ _LT_EOF 621@@ -6762,7 +7089,7 @@ _LT_EOF
622 cat <<_LT_EOF >> conftest.$ac_ext 622 cat <<_LT_EOF >> conftest.$ac_ext
623 623
624 /* The mapping between symbol names and symbols. */ 624 /* The mapping between symbol names and symbols. */
@@ -627,7 +627,7 @@ index acbac2f364a..a53a9d52719 100755
627 const char *name; 627 const char *name;
628 void *address; 628 void *address;
629 } 629 }
630@@ -6790,8 +7117,8 @@ static const void *lt_preloaded_setup() { 630@@ -6788,8 +7115,8 @@ static const void *lt_preloaded_setup() {
631 _LT_EOF 631 _LT_EOF
632 # Now try linking the two files. 632 # Now try linking the two files.
633 mv conftest.$ac_objext conftstm.$ac_objext 633 mv conftest.$ac_objext conftstm.$ac_objext
@@ -638,7 +638,7 @@ index acbac2f364a..a53a9d52719 100755
638 LIBS="conftstm.$ac_objext" 638 LIBS="conftstm.$ac_objext"
639 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" 639 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
640 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 640 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
641@@ -6801,8 +7128,8 @@ _LT_EOF 641@@ -6799,8 +7126,8 @@ _LT_EOF
642 test $ac_status = 0; } && test -s conftest${ac_exeext}; then 642 test $ac_status = 0; } && test -s conftest${ac_exeext}; then
643 pipe_works=yes 643 pipe_works=yes
644 fi 644 fi
@@ -649,7 +649,7 @@ index acbac2f364a..a53a9d52719 100755
649 else 649 else
650 echo "cannot find nm_test_func in $nlist" >&5 650 echo "cannot find nm_test_func in $nlist" >&5
651 fi 651 fi
652@@ -6839,6 +7166,14 @@ else 652@@ -6837,6 +7164,14 @@ else
653 $as_echo "ok" >&6; } 653 $as_echo "ok" >&6; }
654 fi 654 fi
655 655
@@ -664,7 +664,7 @@ index acbac2f364a..a53a9d52719 100755
664 664
665 665
666 666
667@@ -6857,6 +7192,47 @@ fi 667@@ -6855,6 +7190,47 @@ fi
668 668
669 669
670 670
@@ -712,7 +712,7 @@ index acbac2f364a..a53a9d52719 100755
712 712
713 713
714 714
715@@ -7066,6 +7442,123 @@ esac 715@@ -7064,6 +7440,123 @@ esac
716 716
717 need_locks="$enable_libtool_lock" 717 need_locks="$enable_libtool_lock"
718 718
@@ -836,7 +836,7 @@ index acbac2f364a..a53a9d52719 100755
836 836
837 case $host_os in 837 case $host_os in
838 rhapsody* | darwin*) 838 rhapsody* | darwin*)
839@@ -7629,6 +8122,8 @@ _LT_EOF 839@@ -7627,6 +8120,8 @@ _LT_EOF
840 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 840 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
841 echo "$AR cru libconftest.a conftest.o" >&5 841 echo "$AR cru libconftest.a conftest.o" >&5
842 $AR cru libconftest.a conftest.o 2>&5 842 $AR cru libconftest.a conftest.o 2>&5
@@ -845,7 +845,7 @@ index acbac2f364a..a53a9d52719 100755
845 cat > conftest.c << _LT_EOF 845 cat > conftest.c << _LT_EOF
846 int main() { return 0;} 846 int main() { return 0;}
847 _LT_EOF 847 _LT_EOF
848@@ -8182,8 +8677,6 @@ fi 848@@ -8180,8 +8675,6 @@ fi
849 lt_prog_compiler_pic= 849 lt_prog_compiler_pic=
850 lt_prog_compiler_static= 850 lt_prog_compiler_static=
851 851
@@ -854,7 +854,7 @@ index acbac2f364a..a53a9d52719 100755
854 854
855 if test "$GCC" = yes; then 855 if test "$GCC" = yes; then
856 lt_prog_compiler_wl='-Wl,' 856 lt_prog_compiler_wl='-Wl,'
857@@ -8349,6 +8842,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 857@@ -8347,6 +8840,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
858 lt_prog_compiler_pic='--shared' 858 lt_prog_compiler_pic='--shared'
859 lt_prog_compiler_static='--static' 859 lt_prog_compiler_static='--static'
860 ;; 860 ;;
@@ -867,7 +867,7 @@ index acbac2f364a..a53a9d52719 100755
867 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) 867 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
868 # Portland Group compilers (*not* the Pentium gcc compiler, 868 # Portland Group compilers (*not* the Pentium gcc compiler,
869 # which looks to be a dead project) 869 # which looks to be a dead project)
870@@ -8411,7 +8910,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 870@@ -8409,7 +8908,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
871 lt_prog_compiler_pic='-KPIC' 871 lt_prog_compiler_pic='-KPIC'
872 lt_prog_compiler_static='-Bstatic' 872 lt_prog_compiler_static='-Bstatic'
873 case $cc_basename in 873 case $cc_basename in
@@ -876,7 +876,7 @@ index acbac2f364a..a53a9d52719 100755
876 lt_prog_compiler_wl='-Qoption ld ';; 876 lt_prog_compiler_wl='-Qoption ld ';;
877 *) 877 *)
878 lt_prog_compiler_wl='-Wl,';; 878 lt_prog_compiler_wl='-Wl,';;
879@@ -8468,13 +8967,17 @@ case $host_os in 879@@ -8466,13 +8965,17 @@ case $host_os in
880 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" 880 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
881 ;; 881 ;;
882 esac 882 esac
@@ -900,7 +900,7 @@ index acbac2f364a..a53a9d52719 100755
900 900
901 # 901 #
902 # Check to make sure the PIC flag actually works. 902 # Check to make sure the PIC flag actually works.
903@@ -8535,6 +9038,11 @@ fi 903@@ -8533,6 +9036,11 @@ fi
904 904
905 905
906 906
@@ -912,7 +912,7 @@ index acbac2f364a..a53a9d52719 100755
912 # 912 #
913 # Check to make sure the static flag actually works. 913 # Check to make sure the static flag actually works.
914 # 914 #
915@@ -8885,7 +9393,8 @@ _LT_EOF 915@@ -8883,7 +9391,8 @@ _LT_EOF
916 allow_undefined_flag=unsupported 916 allow_undefined_flag=unsupported
917 always_export_symbols=no 917 always_export_symbols=no
918 enable_shared_with_static_runtimes=yes 918 enable_shared_with_static_runtimes=yes
@@ -922,7 +922,7 @@ index acbac2f364a..a53a9d52719 100755
922 922
923 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then 923 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
924 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' 924 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
925@@ -8984,12 +9493,12 @@ _LT_EOF 925@@ -8982,12 +9491,12 @@ _LT_EOF
926 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' 926 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
927 hardcode_libdir_flag_spec= 927 hardcode_libdir_flag_spec=
928 hardcode_libdir_flag_spec_ld='-rpath $libdir' 928 hardcode_libdir_flag_spec_ld='-rpath $libdir'
@@ -937,7 +937,7 @@ index acbac2f364a..a53a9d52719 100755
937 fi 937 fi
938 ;; 938 ;;
939 esac 939 esac
940@@ -9003,8 +9512,8 @@ _LT_EOF 940@@ -9001,8 +9510,8 @@ _LT_EOF
941 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' 941 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
942 wlarc= 942 wlarc=
943 else 943 else
@@ -948,7 +948,7 @@ index acbac2f364a..a53a9d52719 100755
948 fi 948 fi
949 ;; 949 ;;
950 950
951@@ -9022,8 +9531,8 @@ _LT_EOF 951@@ -9020,8 +9529,8 @@ _LT_EOF
952 952
953 _LT_EOF 953 _LT_EOF
954 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 954 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -959,7 +959,7 @@ index acbac2f364a..a53a9d52719 100755
959 else 959 else
960 ld_shlibs=no 960 ld_shlibs=no
961 fi 961 fi
962@@ -9069,8 +9578,8 @@ _LT_EOF 962@@ -9067,8 +9576,8 @@ _LT_EOF
963 963
964 *) 964 *)
965 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 965 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -970,7 +970,7 @@ index acbac2f364a..a53a9d52719 100755
970 else 970 else
971 ld_shlibs=no 971 ld_shlibs=no
972 fi 972 fi
973@@ -9200,7 +9709,13 @@ _LT_EOF 973@@ -9198,7 +9707,13 @@ _LT_EOF
974 allow_undefined_flag='-berok' 974 allow_undefined_flag='-berok'
975 # Determine the default libpath from the value encoded in an 975 # Determine the default libpath from the value encoded in an
976 # empty executable. 976 # empty executable.
@@ -985,7 +985,7 @@ index acbac2f364a..a53a9d52719 100755
985 /* end confdefs.h. */ 985 /* end confdefs.h. */
986 986
987 int 987 int
988@@ -9213,22 +9728,29 @@ main () 988@@ -9211,22 +9726,29 @@ main ()
989 _ACEOF 989 _ACEOF
990 if ac_fn_c_try_link "$LINENO"; then : 990 if ac_fn_c_try_link "$LINENO"; then :
991 991
@@ -1028,7 +1028,7 @@ index acbac2f364a..a53a9d52719 100755
1028 1028
1029 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 1029 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
1030 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" 1030 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"
1031@@ -9240,7 +9762,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 1031@@ -9238,7 +9760,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
1032 else 1032 else
1033 # Determine the default libpath from the value encoded in an 1033 # Determine the default libpath from the value encoded in an
1034 # empty executable. 1034 # empty executable.
@@ -1043,7 +1043,7 @@ index acbac2f364a..a53a9d52719 100755
1043 /* end confdefs.h. */ 1043 /* end confdefs.h. */
1044 1044
1045 int 1045 int
1046@@ -9253,22 +9781,29 @@ main () 1046@@ -9251,22 +9779,29 @@ main ()
1047 _ACEOF 1047 _ACEOF
1048 if ac_fn_c_try_link "$LINENO"; then : 1048 if ac_fn_c_try_link "$LINENO"; then :
1049 1049
@@ -1086,7 +1086,7 @@ index acbac2f364a..a53a9d52719 100755
1086 1086
1087 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 1087 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
1088 # Warning - without using the other run time loading flags, 1088 # Warning - without using the other run time loading flags,
1089@@ -9313,20 +9848,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 1089@@ -9311,20 +9846,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
1090 # Microsoft Visual C++. 1090 # Microsoft Visual C++.
1091 # hardcode_libdir_flag_spec is actually meaningless, as there is 1091 # hardcode_libdir_flag_spec is actually meaningless, as there is
1092 # no search path for DLLs. 1092 # no search path for DLLs.
@@ -1164,7 +1164,7 @@ index acbac2f364a..a53a9d52719 100755
1164 ;; 1164 ;;
1165 1165
1166 darwin* | rhapsody*) 1166 darwin* | rhapsody*)
1167@@ -9387,7 +9965,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 1167@@ -9385,7 +9963,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
1168 1168
1169 # FreeBSD 3 and greater uses gcc -shared to do shared libraries. 1169 # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
1170 freebsd* | dragonfly*) 1170 freebsd* | dragonfly*)
@@ -1173,7 +1173,7 @@ index acbac2f364a..a53a9d52719 100755
1173 hardcode_libdir_flag_spec='-R$libdir' 1173 hardcode_libdir_flag_spec='-R$libdir'
1174 hardcode_direct=yes 1174 hardcode_direct=yes
1175 hardcode_shlibpath_var=no 1175 hardcode_shlibpath_var=no
1176@@ -9395,7 +9973,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 1176@@ -9393,7 +9971,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
1177 1177
1178 hpux9*) 1178 hpux9*)
1179 if test "$GCC" = yes; then 1179 if test "$GCC" = yes; then
@@ -1182,7 +1182,7 @@ index acbac2f364a..a53a9d52719 100755
1182 else 1182 else
1183 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' 1183 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'
1184 fi 1184 fi
1185@@ -9411,7 +9989,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 1185@@ -9409,7 +9987,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
1186 1186
1187 hpux10*) 1187 hpux10*)
1188 if test "$GCC" = yes && test "$with_gnu_ld" = no; then 1188 if test "$GCC" = yes && test "$with_gnu_ld" = no; then
@@ -1191,7 +1191,7 @@ index acbac2f364a..a53a9d52719 100755
1191 else 1191 else
1192 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' 1192 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
1193 fi 1193 fi
1194@@ -9435,10 +10013,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 1194@@ -9433,10 +10011,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
1195 archive_cmds='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' 1195 archive_cmds='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
1196 ;; 1196 ;;
1197 ia64*) 1197 ia64*)
@@ -1204,7 +1204,7 @@ index acbac2f364a..a53a9d52719 100755
1204 ;; 1204 ;;
1205 esac 1205 esac
1206 else 1206 else
1207@@ -9517,23 +10095,36 @@ fi 1207@@ -9515,23 +10093,36 @@ fi
1208 1208
1209 irix5* | irix6* | nonstopux*) 1209 irix5* | irix6* | nonstopux*)
1210 if test "$GCC" = yes; then 1210 if test "$GCC" = yes; then
@@ -1249,7 +1249,7 @@ index acbac2f364a..a53a9d52719 100755
1249 else 1249 else
1250 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' 1250 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'
1251 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' 1251 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'
1252@@ -9618,7 +10209,7 @@ rm -f core conftest.err conftest.$ac_objext \ 1252@@ -9616,7 +10207,7 @@ rm -f core conftest.err conftest.$ac_objext \
1253 osf4* | osf5*) # as osf3* with the addition of -msym flag 1253 osf4* | osf5*) # as osf3* with the addition of -msym flag
1254 if test "$GCC" = yes; then 1254 if test "$GCC" = yes; then
1255 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' 1255 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
@@ -1258,7 +1258,7 @@ index acbac2f364a..a53a9d52719 100755
1258 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' 1258 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
1259 else 1259 else
1260 allow_undefined_flag=' -expect_unresolved \*' 1260 allow_undefined_flag=' -expect_unresolved \*'
1261@@ -9637,9 +10228,9 @@ rm -f core conftest.err conftest.$ac_objext \ 1261@@ -9635,9 +10226,9 @@ rm -f core conftest.err conftest.$ac_objext \
1262 no_undefined_flag=' -z defs' 1262 no_undefined_flag=' -z defs'
1263 if test "$GCC" = yes; then 1263 if test "$GCC" = yes; then
1264 wlarc='${wl}' 1264 wlarc='${wl}'
@@ -1270,7 +1270,7 @@ index acbac2f364a..a53a9d52719 100755
1270 else 1270 else
1271 case `$CC -V 2>&1` in 1271 case `$CC -V 2>&1` in
1272 *"Compilers 5.0"*) 1272 *"Compilers 5.0"*)
1273@@ -10215,8 +10806,9 @@ cygwin* | mingw* | pw32* | cegcc*) 1273@@ -10213,8 +10804,9 @@ cygwin* | mingw* | pw32* | cegcc*)
1274 need_version=no 1274 need_version=no
1275 need_lib_prefix=no 1275 need_lib_prefix=no
1276 1276
@@ -1282,7 +1282,7 @@ index acbac2f364a..a53a9d52719 100755
1282 library_names_spec='$libname.dll.a' 1282 library_names_spec='$libname.dll.a'
1283 # DLL is installed to $(libdir)/../bin by postinstall_cmds 1283 # DLL is installed to $(libdir)/../bin by postinstall_cmds
1284 postinstall_cmds='base_file=`basename \${file}`~ 1284 postinstall_cmds='base_file=`basename \${file}`~
1285@@ -10249,13 +10841,71 @@ cygwin* | mingw* | pw32* | cegcc*) 1285@@ -10247,13 +10839,71 @@ cygwin* | mingw* | pw32* | cegcc*)
1286 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' 1286 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
1287 ;; 1287 ;;
1288 esac 1288 esac
@@ -1355,16 +1355,16 @@ index acbac2f364a..a53a9d52719 100755
1355 # FIXME: first we should search . and the directory the executable is in 1355 # FIXME: first we should search . and the directory the executable is in
1356 shlibpath_var=PATH 1356 shlibpath_var=PATH
1357 ;; 1357 ;;
1358@@ -11157,7 +11807,7 @@ else 1358@@ -11155,7 +11805,7 @@ else
1359 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 1359 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
1360 lt_status=$lt_dlunknown 1360 lt_status=$lt_dlunknown
1361 cat > conftest.$ac_ext <<_LT_EOF 1361 cat > conftest.$ac_ext <<_LT_EOF
1362-#line 11160 "configure" 1362-#line 11158 "configure"
1363+#line $LINENO "configure" 1363+#line $LINENO "configure"
1364 #include "confdefs.h" 1364 #include "confdefs.h"
1365 1365
1366 #if HAVE_DLFCN_H 1366 #if HAVE_DLFCN_H
1367@@ -11201,10 +11851,10 @@ else 1367@@ -11199,10 +11849,10 @@ else
1368 /* When -fvisbility=hidden is used, assume the code has been annotated 1368 /* When -fvisbility=hidden is used, assume the code has been annotated
1369 correspondingly for the symbols needed. */ 1369 correspondingly for the symbols needed. */
1370 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 1370 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
@@ -1377,16 +1377,16 @@ index acbac2f364a..a53a9d52719 100755
1377 int main () 1377 int main ()
1378 { 1378 {
1379 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 1379 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
1380@@ -11263,7 +11913,7 @@ else 1380@@ -11261,7 +11911,7 @@ else
1381 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 1381 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
1382 lt_status=$lt_dlunknown 1382 lt_status=$lt_dlunknown
1383 cat > conftest.$ac_ext <<_LT_EOF 1383 cat > conftest.$ac_ext <<_LT_EOF
1384-#line 11266 "configure" 1384-#line 11264 "configure"
1385+#line $LINENO "configure" 1385+#line $LINENO "configure"
1386 #include "confdefs.h" 1386 #include "confdefs.h"
1387 1387
1388 #if HAVE_DLFCN_H 1388 #if HAVE_DLFCN_H
1389@@ -11307,10 +11957,10 @@ else 1389@@ -11305,10 +11955,10 @@ else
1390 /* When -fvisbility=hidden is used, assume the code has been annotated 1390 /* When -fvisbility=hidden is used, assume the code has been annotated
1391 correspondingly for the symbols needed. */ 1391 correspondingly for the symbols needed. */
1392 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 1392 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
@@ -1399,7 +1399,7 @@ index acbac2f364a..a53a9d52719 100755
1399 int main () 1399 int main ()
1400 { 1400 {
1401 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 1401 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
1402@@ -15691,7 +16341,7 @@ SHARED_LDFLAGS= 1402@@ -15689,7 +16339,7 @@ SHARED_LDFLAGS=
1403 if test "$enable_shared" = "yes"; then 1403 if test "$enable_shared" = "yes"; then
1404 x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'` 1404 x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'`
1405 if test -n "$x"; then 1405 if test -n "$x"; then
@@ -1408,7 +1408,7 @@ index acbac2f364a..a53a9d52719 100755
1408 fi 1408 fi
1409 fi 1409 fi
1410 1410
1411@@ -18313,13 +18963,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' 1411@@ -18314,13 +18964,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
1412 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' 1412 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
1413 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' 1413 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
1414 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' 1414 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
@@ -1429,7 +1429,7 @@ index acbac2f364a..a53a9d52719 100755
1429 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' 1429 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
1430 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' 1430 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
1431 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' 1431 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
1432@@ -18334,14 +18991,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de 1432@@ -18335,14 +18992,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de
1433 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' 1433 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
1434 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' 1434 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
1435 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"`' 1435 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"`'
@@ -1448,7 +1448,7 @@ index acbac2f364a..a53a9d52719 100755
1448 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' 1448 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
1449 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' 1449 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
1450 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' 1450 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
1451@@ -18374,12 +19034,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q 1451@@ -18375,12 +19035,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q
1452 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' 1452 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
1453 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' 1453 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
1454 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' 1454 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
@@ -1462,7 +1462,7 @@ index acbac2f364a..a53a9d52719 100755
1462 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' 1462 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
1463 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' 1463 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
1464 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' 1464 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
1465@@ -18434,8 +19094,13 @@ reload_flag \ 1465@@ -18435,8 +19095,13 @@ reload_flag \
1466 OBJDUMP \ 1466 OBJDUMP \
1467 deplibs_check_method \ 1467 deplibs_check_method \
1468 file_magic_cmd \ 1468 file_magic_cmd \
@@ -1476,7 +1476,7 @@ index acbac2f364a..a53a9d52719 100755
1476 STRIP \ 1476 STRIP \
1477 RANLIB \ 1477 RANLIB \
1478 CC \ 1478 CC \
1479@@ -18445,12 +19110,14 @@ lt_cv_sys_global_symbol_pipe \ 1479@@ -18446,12 +19111,14 @@ lt_cv_sys_global_symbol_pipe \
1480 lt_cv_sys_global_symbol_to_cdecl \ 1480 lt_cv_sys_global_symbol_to_cdecl \
1481 lt_cv_sys_global_symbol_to_c_name_address \ 1481 lt_cv_sys_global_symbol_to_c_name_address \
1482 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ 1482 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
@@ -1492,7 +1492,7 @@ index acbac2f364a..a53a9d52719 100755
1492 DSYMUTIL \ 1492 DSYMUTIL \
1493 NMEDIT \ 1493 NMEDIT \
1494 LIPO \ 1494 LIPO \
1495@@ -18466,7 +19133,6 @@ no_undefined_flag \ 1495@@ -18467,7 +19134,6 @@ no_undefined_flag \
1496 hardcode_libdir_flag_spec \ 1496 hardcode_libdir_flag_spec \
1497 hardcode_libdir_flag_spec_ld \ 1497 hardcode_libdir_flag_spec_ld \
1498 hardcode_libdir_separator \ 1498 hardcode_libdir_separator \
@@ -1500,7 +1500,7 @@ index acbac2f364a..a53a9d52719 100755
1500 exclude_expsyms \ 1500 exclude_expsyms \
1501 include_expsyms \ 1501 include_expsyms \
1502 file_list_spec \ 1502 file_list_spec \
1503@@ -18502,6 +19168,7 @@ module_cmds \ 1503@@ -18503,6 +19169,7 @@ module_cmds \
1504 module_expsym_cmds \ 1504 module_expsym_cmds \
1505 export_symbols_cmds \ 1505 export_symbols_cmds \
1506 prelink_cmds \ 1506 prelink_cmds \
@@ -1508,7 +1508,7 @@ index acbac2f364a..a53a9d52719 100755
1508 postinstall_cmds \ 1508 postinstall_cmds \
1509 postuninstall_cmds \ 1509 postuninstall_cmds \
1510 finish_cmds \ 1510 finish_cmds \
1511@@ -19278,7 +19945,8 @@ $as_echo X"$file" | 1511@@ -19279,7 +19946,8 @@ $as_echo X"$file" |
1512 # NOTE: Changes made to this file will be lost: look at ltmain.sh. 1512 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
1513 # 1513 #
1514 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 1514 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
@@ -1518,7 +1518,7 @@ index acbac2f364a..a53a9d52719 100755
1518 # Written by Gordon Matzigkeit, 1996 1518 # Written by Gordon Matzigkeit, 1996
1519 # 1519 #
1520 # This file is part of GNU Libtool. 1520 # This file is part of GNU Libtool.
1521@@ -19381,19 +20049,42 @@ SP2NL=$lt_lt_SP2NL 1521@@ -19382,19 +20050,42 @@ SP2NL=$lt_lt_SP2NL
1522 # turn newlines into spaces. 1522 # turn newlines into spaces.
1523 NL2SP=$lt_lt_NL2SP 1523 NL2SP=$lt_lt_NL2SP
1524 1524
@@ -1562,7 +1562,7 @@ index acbac2f364a..a53a9d52719 100755
1562 # A symbol stripping program. 1562 # A symbol stripping program.
1563 STRIP=$lt_STRIP 1563 STRIP=$lt_STRIP
1564 1564
1565@@ -19423,6 +20114,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address 1565@@ -19424,6 +20115,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
1566 # Transform the output of nm in a C name address pair when lib prefix is needed. 1566 # Transform the output of nm in a C name address pair when lib prefix is needed.
1567 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix 1567 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
1568 1568
@@ -1575,7 +1575,7 @@ index acbac2f364a..a53a9d52719 100755
1575 # The name of the directory that contains temporary libtool files. 1575 # The name of the directory that contains temporary libtool files.
1576 objdir=$objdir 1576 objdir=$objdir
1577 1577
1578@@ -19432,6 +20129,9 @@ MAGIC_CMD=$MAGIC_CMD 1578@@ -19433,6 +20130,9 @@ MAGIC_CMD=$MAGIC_CMD
1579 # Must we lock files when doing compilation? 1579 # Must we lock files when doing compilation?
1580 need_locks=$lt_need_locks 1580 need_locks=$lt_need_locks
1581 1581
@@ -1585,7 +1585,7 @@ index acbac2f364a..a53a9d52719 100755
1585 # Tool to manipulate archived DWARF debug symbol files on Mac OS X. 1585 # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
1586 DSYMUTIL=$lt_DSYMUTIL 1586 DSYMUTIL=$lt_DSYMUTIL
1587 1587
1588@@ -19546,12 +20246,12 @@ with_gcc=$GCC 1588@@ -19547,12 +20247,12 @@ with_gcc=$GCC
1589 # Compiler flag to turn off builtin functions. 1589 # Compiler flag to turn off builtin functions.
1590 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag 1590 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
1591 1591
@@ -1601,7 +1601,7 @@ index acbac2f364a..a53a9d52719 100755
1601 # Compiler flag to prevent dynamic linking. 1601 # Compiler flag to prevent dynamic linking.
1602 link_static_flag=$lt_lt_prog_compiler_static 1602 link_static_flag=$lt_lt_prog_compiler_static
1603 1603
1604@@ -19638,9 +20338,6 @@ inherit_rpath=$inherit_rpath 1604@@ -19639,9 +20339,6 @@ inherit_rpath=$inherit_rpath
1605 # Whether libtool must link a program against all its dependency libraries. 1605 # Whether libtool must link a program against all its dependency libraries.
1606 link_all_deplibs=$link_all_deplibs 1606 link_all_deplibs=$link_all_deplibs
1607 1607
@@ -1611,7 +1611,7 @@ index acbac2f364a..a53a9d52719 100755
1611 # Set to "yes" if exported symbols are required. 1611 # Set to "yes" if exported symbols are required.
1612 always_export_symbols=$always_export_symbols 1612 always_export_symbols=$always_export_symbols
1613 1613
1614@@ -19656,6 +20353,9 @@ include_expsyms=$lt_include_expsyms 1614@@ -19657,6 +20354,9 @@ include_expsyms=$lt_include_expsyms
1615 # Commands necessary for linking programs (against libraries) with templates. 1615 # Commands necessary for linking programs (against libraries) with templates.
1616 prelink_cmds=$lt_prelink_cmds 1616 prelink_cmds=$lt_prelink_cmds
1617 1617
@@ -1621,7 +1621,7 @@ index acbac2f364a..a53a9d52719 100755
1621 # Specify filename containing input files. 1621 # Specify filename containing input files.
1622 file_list_spec=$lt_file_list_spec 1622 file_list_spec=$lt_file_list_spec
1623 1623
1624@@ -19688,210 +20388,169 @@ ltmain="$ac_aux_dir/ltmain.sh" 1624@@ -19689,210 +20389,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
1625 # if finds mixed CR/LF and LF-only lines. Since sed operates in 1625 # if finds mixed CR/LF and LF-only lines. Since sed operates in
1626 # text mode, it properly converts lines to CR/LF. This bash problem 1626 # text mode, it properly converts lines to CR/LF. This bash problem
1627 # is reportedly fixed, but why not run on old versions too? 1627 # is reportedly fixed, but why not run on old versions too?
@@ -1996,10 +1996,10 @@ index acbac2f364a..a53a9d52719 100755
1996 chmod +x "$ofile" 1996 chmod +x "$ofile"
1997 1997
1998diff --git a/bfd/configure.ac b/bfd/configure.ac 1998diff --git a/bfd/configure.ac b/bfd/configure.ac
1999index 7fcc5d4a947..f7191d3f30f 100644 1999index 90fad5417b3..1d57f289f18 100644
2000--- a/bfd/configure.ac 2000--- a/bfd/configure.ac
2001+++ b/bfd/configure.ac 2001+++ b/bfd/configure.ac
2002@@ -276,7 +276,7 @@ changequote(,)dnl 2002@@ -275,7 +275,7 @@ changequote(,)dnl
2003 x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'` 2003 x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'`
2004 changequote([,])dnl 2004 changequote([,])dnl
2005 if test -n "$x"; then 2005 if test -n "$x"; then
@@ -2009,7 +2009,7 @@ index 7fcc5d4a947..f7191d3f30f 100644
2009 fi 2009 fi
2010 2010
2011diff --git a/binutils/Makefile.in b/binutils/Makefile.in 2011diff --git a/binutils/Makefile.in b/binutils/Makefile.in
2012index 842a6d99b54..037cccde038 100644 2012index 8029bc29d57..5b2b4b81426 100644
2013--- a/binutils/Makefile.in 2013--- a/binutils/Makefile.in
2014+++ b/binutils/Makefile.in 2014+++ b/binutils/Makefile.in
2015@@ -495,6 +495,7 @@ DEBUGINFOD_LIBS = @DEBUGINFOD_LIBS@ 2015@@ -495,6 +495,7 @@ DEBUGINFOD_LIBS = @DEBUGINFOD_LIBS@
@@ -2037,7 +2037,7 @@ index 842a6d99b54..037cccde038 100644
2037 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ 2037 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
2038 am__include = @am__include@ 2038 am__include = @am__include@
2039diff --git a/binutils/configure b/binutils/configure 2039diff --git a/binutils/configure b/binutils/configure
2040index a1092735311..f3bdee98f3f 100755 2040index caa7c3679e9..5b5c7b38028 100755
2041--- a/binutils/configure 2041--- a/binutils/configure
2042+++ b/binutils/configure 2042+++ b/binutils/configure
2043@@ -704,8 +704,11 @@ OTOOL 2043@@ -704,8 +704,11 @@ OTOOL
@@ -2069,7 +2069,7 @@ index a1092735311..f3bdee98f3f 100755
2069 --with-debuginfod Enable debuginfo lookups with debuginfod 2069 --with-debuginfod Enable debuginfo lookups with debuginfod
2070 (auto/yes/no) 2070 (auto/yes/no)
2071 --with-gnu-ld assume the C compiler uses GNU ld default=no 2071 --with-gnu-ld assume the C compiler uses GNU ld default=no
2072@@ -4958,8 +4964,8 @@ esac 2072@@ -4956,8 +4962,8 @@ esac
2073 2073
2074 2074
2075 2075
@@ -2080,7 +2080,7 @@ index a1092735311..f3bdee98f3f 100755
2080 2080
2081 2081
2082 2082
2083@@ -4999,7 +5005,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO 2083@@ -4997,7 +5003,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
2084 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 2084 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
2085 $as_echo_n "checking how to print strings... " >&6; } 2085 $as_echo_n "checking how to print strings... " >&6; }
2086 # Test print first, because it will be a builtin if present. 2086 # Test print first, because it will be a builtin if present.
@@ -2089,7 +2089,7 @@ index a1092735311..f3bdee98f3f 100755
2089 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then 2089 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
2090 ECHO='print -r --' 2090 ECHO='print -r --'
2091 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then 2091 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
2092@@ -5692,8 +5698,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; 2092@@ -5690,8 +5696,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6;
2093 # Try some XSI features 2093 # Try some XSI features
2094 xsi_shell=no 2094 xsi_shell=no
2095 ( _lt_dummy="a/b/c" 2095 ( _lt_dummy="a/b/c"
@@ -2100,7 +2100,7 @@ index a1092735311..f3bdee98f3f 100755
2100 && eval 'test $(( 1 + 1 )) -eq 2 \ 2100 && eval 'test $(( 1 + 1 )) -eq 2 \
2101 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ 2101 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
2102 && xsi_shell=yes 2102 && xsi_shell=yes
2103@@ -5742,6 +5748,80 @@ esac 2103@@ -5740,6 +5746,80 @@ esac
2104 2104
2105 2105
2106 2106
@@ -2181,7 +2181,7 @@ index a1092735311..f3bdee98f3f 100755
2181 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 2181 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
2182 $as_echo_n "checking for $LD option to reload object files... " >&6; } 2182 $as_echo_n "checking for $LD option to reload object files... " >&6; }
2183 if ${lt_cv_ld_reload_flag+:} false; then : 2183 if ${lt_cv_ld_reload_flag+:} false; then :
2184@@ -5758,6 +5838,11 @@ case $reload_flag in 2184@@ -5756,6 +5836,11 @@ case $reload_flag in
2185 esac 2185 esac
2186 reload_cmds='$LD$reload_flag -o $output$reload_objs' 2186 reload_cmds='$LD$reload_flag -o $output$reload_objs'
2187 case $host_os in 2187 case $host_os in
@@ -2193,7 +2193,7 @@ index a1092735311..f3bdee98f3f 100755
2193 darwin*) 2193 darwin*)
2194 if test "$GCC" = yes; then 2194 if test "$GCC" = yes; then
2195 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' 2195 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
2196@@ -5926,7 +6011,8 @@ mingw* | pw32*) 2196@@ -5924,7 +6009,8 @@ mingw* | pw32*)
2197 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' 2197 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
2198 lt_cv_file_magic_cmd='func_win32_libid' 2198 lt_cv_file_magic_cmd='func_win32_libid'
2199 else 2199 else
@@ -2203,7 +2203,7 @@ index a1092735311..f3bdee98f3f 100755
2203 lt_cv_file_magic_cmd='$OBJDUMP -f' 2203 lt_cv_file_magic_cmd='$OBJDUMP -f'
2204 fi 2204 fi
2205 ;; 2205 ;;
2206@@ -6085,6 +6171,21 @@ esac 2206@@ -6083,6 +6169,21 @@ esac
2207 fi 2207 fi
2208 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 2208 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
2209 $as_echo "$lt_cv_deplibs_check_method" >&6; } 2209 $as_echo "$lt_cv_deplibs_check_method" >&6; }
@@ -2225,7 +2225,7 @@ index a1092735311..f3bdee98f3f 100755
2225 file_magic_cmd=$lt_cv_file_magic_cmd 2225 file_magic_cmd=$lt_cv_file_magic_cmd
2226 deplibs_check_method=$lt_cv_deplibs_check_method 2226 deplibs_check_method=$lt_cv_deplibs_check_method
2227 test -z "$deplibs_check_method" && deplibs_check_method=unknown 2227 test -z "$deplibs_check_method" && deplibs_check_method=unknown
2228@@ -6100,6 +6201,157 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown 2228@@ -6098,6 +6199,157 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
2229 2229
2230 2230
2231 2231
@@ -2383,7 +2383,7 @@ index a1092735311..f3bdee98f3f 100755
2383 plugin_option= 2383 plugin_option=
2384 plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll" 2384 plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll"
2385 for plugin in $plugin_names; do 2385 for plugin in $plugin_names; do
2386@@ -6114,8 +6366,10 @@ for plugin in $plugin_names; do 2386@@ -6112,8 +6364,10 @@ for plugin in $plugin_names; do
2387 done 2387 done
2388 2388
2389 if test -n "$ac_tool_prefix"; then 2389 if test -n "$ac_tool_prefix"; then
@@ -2396,7 +2396,7 @@ index a1092735311..f3bdee98f3f 100755
2396 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 2396 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
2397 $as_echo_n "checking for $ac_word... " >&6; } 2397 $as_echo_n "checking for $ac_word... " >&6; }
2398 if ${ac_cv_prog_AR+:} false; then : 2398 if ${ac_cv_prog_AR+:} false; then :
2399@@ -6131,7 +6385,7 @@ do 2399@@ -6129,7 +6383,7 @@ do
2400 test -z "$as_dir" && as_dir=. 2400 test -z "$as_dir" && as_dir=.
2401 for ac_exec_ext in '' $ac_executable_extensions; do 2401 for ac_exec_ext in '' $ac_executable_extensions; do
2402 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 2402 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
@@ -2405,7 +2405,7 @@ index a1092735311..f3bdee98f3f 100755
2405 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 2405 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
2406 break 2 2406 break 2
2407 fi 2407 fi
2408@@ -6151,11 +6405,15 @@ $as_echo "no" >&6; } 2408@@ -6149,11 +6403,15 @@ $as_echo "no" >&6; }
2409 fi 2409 fi
2410 2410
2411 2411
@@ -2424,7 +2424,7 @@ index a1092735311..f3bdee98f3f 100755
2424 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 2424 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
2425 $as_echo_n "checking for $ac_word... " >&6; } 2425 $as_echo_n "checking for $ac_word... " >&6; }
2426 if ${ac_cv_prog_ac_ct_AR+:} false; then : 2426 if ${ac_cv_prog_ac_ct_AR+:} false; then :
2427@@ -6171,7 +6429,7 @@ do 2427@@ -6169,7 +6427,7 @@ do
2428 test -z "$as_dir" && as_dir=. 2428 test -z "$as_dir" && as_dir=.
2429 for ac_exec_ext in '' $ac_executable_extensions; do 2429 for ac_exec_ext in '' $ac_executable_extensions; do
2430 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 2430 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
@@ -2433,7 +2433,7 @@ index a1092735311..f3bdee98f3f 100755
2433 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 2433 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
2434 break 2 2434 break 2
2435 fi 2435 fi
2436@@ -6190,6 +6448,10 @@ else 2436@@ -6188,6 +6446,10 @@ else
2437 $as_echo "no" >&6; } 2437 $as_echo "no" >&6; }
2438 fi 2438 fi
2439 2439
@@ -2444,7 +2444,7 @@ index a1092735311..f3bdee98f3f 100755
2444 if test "x$ac_ct_AR" = x; then 2444 if test "x$ac_ct_AR" = x; then
2445 AR="false" 2445 AR="false"
2446 else 2446 else
2447@@ -6201,25 +6463,19 @@ ac_tool_warned=yes ;; 2447@@ -6199,25 +6461,19 @@ ac_tool_warned=yes ;;
2448 esac 2448 esac
2449 AR=$ac_ct_AR 2449 AR=$ac_ct_AR
2450 fi 2450 fi
@@ -2479,7 +2479,7 @@ index a1092735311..f3bdee98f3f 100755
2479 2479
2480 2480
2481 2481
2482@@ -6231,6 +6487,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru 2482@@ -6229,6 +6485,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru
2483 2483
2484 2484
2485 2485
@@ -2544,7 +2544,7 @@ index a1092735311..f3bdee98f3f 100755
2544 if test -n "$ac_tool_prefix"; then 2544 if test -n "$ac_tool_prefix"; then
2545 # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. 2545 # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
2546 set dummy ${ac_tool_prefix}strip; ac_word=$2 2546 set dummy ${ac_tool_prefix}strip; ac_word=$2
2547@@ -6570,8 +6884,8 @@ esac 2547@@ -6568,8 +6882,8 @@ esac
2548 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" 2548 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
2549 2549
2550 # Transform an extracted symbol line into symbol name and symbol address 2550 # Transform an extracted symbol line into symbol name and symbol address
@@ -2555,7 +2555,7 @@ index a1092735311..f3bdee98f3f 100755
2555 2555
2556 # Handle CRLF in mingw tool chain 2556 # Handle CRLF in mingw tool chain
2557 opt_cr= 2557 opt_cr=
2558@@ -6607,6 +6921,7 @@ for ac_symprfx in "" "_"; do 2558@@ -6605,6 +6919,7 @@ for ac_symprfx in "" "_"; do
2559 else 2559 else
2560 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" 2560 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
2561 fi 2561 fi
@@ -2563,7 +2563,7 @@ index a1092735311..f3bdee98f3f 100755
2563 2563
2564 # Check to see that the pipe works correctly. 2564 # Check to see that the pipe works correctly.
2565 pipe_works=no 2565 pipe_works=no
2566@@ -6648,6 +6963,18 @@ _LT_EOF 2566@@ -6646,6 +6961,18 @@ _LT_EOF
2567 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then 2567 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
2568 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then 2568 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
2569 cat <<_LT_EOF > conftest.$ac_ext 2569 cat <<_LT_EOF > conftest.$ac_ext
@@ -2582,7 +2582,7 @@ index a1092735311..f3bdee98f3f 100755
2582 #ifdef __cplusplus 2582 #ifdef __cplusplus
2583 extern "C" { 2583 extern "C" {
2584 #endif 2584 #endif
2585@@ -6659,7 +6986,7 @@ _LT_EOF 2585@@ -6657,7 +6984,7 @@ _LT_EOF
2586 cat <<_LT_EOF >> conftest.$ac_ext 2586 cat <<_LT_EOF >> conftest.$ac_ext
2587 2587
2588 /* The mapping between symbol names and symbols. */ 2588 /* The mapping between symbol names and symbols. */
@@ -2591,7 +2591,7 @@ index a1092735311..f3bdee98f3f 100755
2591 const char *name; 2591 const char *name;
2592 void *address; 2592 void *address;
2593 } 2593 }
2594@@ -6685,8 +7012,8 @@ static const void *lt_preloaded_setup() { 2594@@ -6683,8 +7010,8 @@ static const void *lt_preloaded_setup() {
2595 _LT_EOF 2595 _LT_EOF
2596 # Now try linking the two files. 2596 # Now try linking the two files.
2597 mv conftest.$ac_objext conftstm.$ac_objext 2597 mv conftest.$ac_objext conftstm.$ac_objext
@@ -2602,7 +2602,7 @@ index a1092735311..f3bdee98f3f 100755
2602 LIBS="conftstm.$ac_objext" 2602 LIBS="conftstm.$ac_objext"
2603 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" 2603 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
2604 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 2604 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
2605@@ -6696,8 +7023,8 @@ _LT_EOF 2605@@ -6694,8 +7021,8 @@ _LT_EOF
2606 test $ac_status = 0; } && test -s conftest${ac_exeext}; then 2606 test $ac_status = 0; } && test -s conftest${ac_exeext}; then
2607 pipe_works=yes 2607 pipe_works=yes
2608 fi 2608 fi
@@ -2613,7 +2613,7 @@ index a1092735311..f3bdee98f3f 100755
2613 else 2613 else
2614 echo "cannot find nm_test_func in $nlist" >&5 2614 echo "cannot find nm_test_func in $nlist" >&5
2615 fi 2615 fi
2616@@ -6734,6 +7061,18 @@ else 2616@@ -6732,6 +7059,18 @@ else
2617 $as_echo "ok" >&6; } 2617 $as_echo "ok" >&6; }
2618 fi 2618 fi
2619 2619
@@ -2632,7 +2632,7 @@ index a1092735311..f3bdee98f3f 100755
2632 2632
2633 2633
2634 2634
2635@@ -6750,6 +7089,43 @@ fi 2635@@ -6748,6 +7087,43 @@ fi
2636 2636
2637 2637
2638 2638
@@ -2676,7 +2676,7 @@ index a1092735311..f3bdee98f3f 100755
2676 2676
2677 2677
2678 2678
2679@@ -6961,6 +7337,123 @@ esac 2679@@ -6959,6 +7335,123 @@ esac
2680 2680
2681 need_locks="$enable_libtool_lock" 2681 need_locks="$enable_libtool_lock"
2682 2682
@@ -2800,7 +2800,7 @@ index a1092735311..f3bdee98f3f 100755
2800 2800
2801 case $host_os in 2801 case $host_os in
2802 rhapsody* | darwin*) 2802 rhapsody* | darwin*)
2803@@ -7524,6 +8017,8 @@ _LT_EOF 2803@@ -7522,6 +8015,8 @@ _LT_EOF
2804 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 2804 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
2805 echo "$AR cru libconftest.a conftest.o" >&5 2805 echo "$AR cru libconftest.a conftest.o" >&5
2806 $AR cru libconftest.a conftest.o 2>&5 2806 $AR cru libconftest.a conftest.o 2>&5
@@ -2809,7 +2809,7 @@ index a1092735311..f3bdee98f3f 100755
2809 cat > conftest.c << _LT_EOF 2809 cat > conftest.c << _LT_EOF
2810 int main() { return 0;} 2810 int main() { return 0;}
2811 _LT_EOF 2811 _LT_EOF
2812@@ -8108,8 +8603,6 @@ fi 2812@@ -8106,8 +8601,6 @@ fi
2813 lt_prog_compiler_pic= 2813 lt_prog_compiler_pic=
2814 lt_prog_compiler_static= 2814 lt_prog_compiler_static=
2815 2815
@@ -2818,7 +2818,7 @@ index a1092735311..f3bdee98f3f 100755
2818 2818
2819 if test "$GCC" = yes; then 2819 if test "$GCC" = yes; then
2820 lt_prog_compiler_wl='-Wl,' 2820 lt_prog_compiler_wl='-Wl,'
2821@@ -8275,6 +8768,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 2821@@ -8273,6 +8766,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
2822 lt_prog_compiler_pic='--shared' 2822 lt_prog_compiler_pic='--shared'
2823 lt_prog_compiler_static='--static' 2823 lt_prog_compiler_static='--static'
2824 ;; 2824 ;;
@@ -2831,7 +2831,7 @@ index a1092735311..f3bdee98f3f 100755
2831 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) 2831 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
2832 # Portland Group compilers (*not* the Pentium gcc compiler, 2832 # Portland Group compilers (*not* the Pentium gcc compiler,
2833 # which looks to be a dead project) 2833 # which looks to be a dead project)
2834@@ -8337,7 +8836,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 2834@@ -8335,7 +8834,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
2835 lt_prog_compiler_pic='-KPIC' 2835 lt_prog_compiler_pic='-KPIC'
2836 lt_prog_compiler_static='-Bstatic' 2836 lt_prog_compiler_static='-Bstatic'
2837 case $cc_basename in 2837 case $cc_basename in
@@ -2840,7 +2840,7 @@ index a1092735311..f3bdee98f3f 100755
2840 lt_prog_compiler_wl='-Qoption ld ';; 2840 lt_prog_compiler_wl='-Qoption ld ';;
2841 *) 2841 *)
2842 lt_prog_compiler_wl='-Wl,';; 2842 lt_prog_compiler_wl='-Wl,';;
2843@@ -8394,13 +8893,17 @@ case $host_os in 2843@@ -8392,13 +8891,17 @@ case $host_os in
2844 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" 2844 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
2845 ;; 2845 ;;
2846 esac 2846 esac
@@ -2864,7 +2864,7 @@ index a1092735311..f3bdee98f3f 100755
2864 2864
2865 # 2865 #
2866 # Check to make sure the PIC flag actually works. 2866 # Check to make sure the PIC flag actually works.
2867@@ -8461,6 +8964,11 @@ fi 2867@@ -8459,6 +8962,11 @@ fi
2868 2868
2869 2869
2870 2870
@@ -2876,7 +2876,7 @@ index a1092735311..f3bdee98f3f 100755
2876 # 2876 #
2877 # Check to make sure the static flag actually works. 2877 # Check to make sure the static flag actually works.
2878 # 2878 #
2879@@ -8811,7 +9319,8 @@ _LT_EOF 2879@@ -8809,7 +9317,8 @@ _LT_EOF
2880 allow_undefined_flag=unsupported 2880 allow_undefined_flag=unsupported
2881 always_export_symbols=no 2881 always_export_symbols=no
2882 enable_shared_with_static_runtimes=yes 2882 enable_shared_with_static_runtimes=yes
@@ -2886,7 +2886,7 @@ index a1092735311..f3bdee98f3f 100755
2886 2886
2887 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then 2887 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
2888 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' 2888 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
2889@@ -8910,12 +9419,12 @@ _LT_EOF 2889@@ -8908,12 +9417,12 @@ _LT_EOF
2890 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' 2890 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
2891 hardcode_libdir_flag_spec= 2891 hardcode_libdir_flag_spec=
2892 hardcode_libdir_flag_spec_ld='-rpath $libdir' 2892 hardcode_libdir_flag_spec_ld='-rpath $libdir'
@@ -2901,7 +2901,7 @@ index a1092735311..f3bdee98f3f 100755
2901 fi 2901 fi
2902 ;; 2902 ;;
2903 esac 2903 esac
2904@@ -8929,8 +9438,8 @@ _LT_EOF 2904@@ -8927,8 +9436,8 @@ _LT_EOF
2905 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' 2905 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
2906 wlarc= 2906 wlarc=
2907 else 2907 else
@@ -2912,7 +2912,7 @@ index a1092735311..f3bdee98f3f 100755
2912 fi 2912 fi
2913 ;; 2913 ;;
2914 2914
2915@@ -8948,8 +9457,8 @@ _LT_EOF 2915@@ -8946,8 +9455,8 @@ _LT_EOF
2916 2916
2917 _LT_EOF 2917 _LT_EOF
2918 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 2918 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -2923,7 +2923,7 @@ index a1092735311..f3bdee98f3f 100755
2923 else 2923 else
2924 ld_shlibs=no 2924 ld_shlibs=no
2925 fi 2925 fi
2926@@ -8995,8 +9504,8 @@ _LT_EOF 2926@@ -8993,8 +9502,8 @@ _LT_EOF
2927 2927
2928 *) 2928 *)
2929 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 2929 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -2934,7 +2934,7 @@ index a1092735311..f3bdee98f3f 100755
2934 else 2934 else
2935 ld_shlibs=no 2935 ld_shlibs=no
2936 fi 2936 fi
2937@@ -9126,7 +9635,13 @@ _LT_EOF 2937@@ -9124,7 +9633,13 @@ _LT_EOF
2938 allow_undefined_flag='-berok' 2938 allow_undefined_flag='-berok'
2939 # Determine the default libpath from the value encoded in an 2939 # Determine the default libpath from the value encoded in an
2940 # empty executable. 2940 # empty executable.
@@ -2949,7 +2949,7 @@ index a1092735311..f3bdee98f3f 100755
2949 /* end confdefs.h. */ 2949 /* end confdefs.h. */
2950 2950
2951 int 2951 int
2952@@ -9139,22 +9654,29 @@ main () 2952@@ -9137,22 +9652,29 @@ main ()
2953 _ACEOF 2953 _ACEOF
2954 if ac_fn_c_try_link "$LINENO"; then : 2954 if ac_fn_c_try_link "$LINENO"; then :
2955 2955
@@ -2992,7 +2992,7 @@ index a1092735311..f3bdee98f3f 100755
2992 2992
2993 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 2993 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
2994 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" 2994 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"
2995@@ -9166,7 +9688,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 2995@@ -9164,7 +9686,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
2996 else 2996 else
2997 # Determine the default libpath from the value encoded in an 2997 # Determine the default libpath from the value encoded in an
2998 # empty executable. 2998 # empty executable.
@@ -3007,7 +3007,7 @@ index a1092735311..f3bdee98f3f 100755
3007 /* end confdefs.h. */ 3007 /* end confdefs.h. */
3008 3008
3009 int 3009 int
3010@@ -9179,22 +9707,29 @@ main () 3010@@ -9177,22 +9705,29 @@ main ()
3011 _ACEOF 3011 _ACEOF
3012 if ac_fn_c_try_link "$LINENO"; then : 3012 if ac_fn_c_try_link "$LINENO"; then :
3013 3013
@@ -3050,7 +3050,7 @@ index a1092735311..f3bdee98f3f 100755
3050 3050
3051 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 3051 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
3052 # Warning - without using the other run time loading flags, 3052 # Warning - without using the other run time loading flags,
3053@@ -9239,20 +9774,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 3053@@ -9237,20 +9772,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
3054 # Microsoft Visual C++. 3054 # Microsoft Visual C++.
3055 # hardcode_libdir_flag_spec is actually meaningless, as there is 3055 # hardcode_libdir_flag_spec is actually meaningless, as there is
3056 # no search path for DLLs. 3056 # no search path for DLLs.
@@ -3128,7 +3128,7 @@ index a1092735311..f3bdee98f3f 100755
3128 ;; 3128 ;;
3129 3129
3130 darwin* | rhapsody*) 3130 darwin* | rhapsody*)
3131@@ -9313,7 +9891,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 3131@@ -9311,7 +9889,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
3132 3132
3133 # FreeBSD 3 and greater uses gcc -shared to do shared libraries. 3133 # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
3134 freebsd* | dragonfly*) 3134 freebsd* | dragonfly*)
@@ -3137,7 +3137,7 @@ index a1092735311..f3bdee98f3f 100755
3137 hardcode_libdir_flag_spec='-R$libdir' 3137 hardcode_libdir_flag_spec='-R$libdir'
3138 hardcode_direct=yes 3138 hardcode_direct=yes
3139 hardcode_shlibpath_var=no 3139 hardcode_shlibpath_var=no
3140@@ -9321,7 +9899,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 3140@@ -9319,7 +9897,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
3141 3141
3142 hpux9*) 3142 hpux9*)
3143 if test "$GCC" = yes; then 3143 if test "$GCC" = yes; then
@@ -3146,7 +3146,7 @@ index a1092735311..f3bdee98f3f 100755
3146 else 3146 else
3147 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' 3147 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'
3148 fi 3148 fi
3149@@ -9337,7 +9915,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 3149@@ -9335,7 +9913,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
3150 3150
3151 hpux10*) 3151 hpux10*)
3152 if test "$GCC" = yes && test "$with_gnu_ld" = no; then 3152 if test "$GCC" = yes && test "$with_gnu_ld" = no; then
@@ -3155,7 +3155,7 @@ index a1092735311..f3bdee98f3f 100755
3155 else 3155 else
3156 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' 3156 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
3157 fi 3157 fi
3158@@ -9361,10 +9939,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 3158@@ -9359,10 +9937,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
3159 archive_cmds='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' 3159 archive_cmds='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
3160 ;; 3160 ;;
3161 ia64*) 3161 ia64*)
@@ -3168,7 +3168,7 @@ index a1092735311..f3bdee98f3f 100755
3168 ;; 3168 ;;
3169 esac 3169 esac
3170 else 3170 else
3171@@ -9443,23 +10021,36 @@ fi 3171@@ -9441,23 +10019,36 @@ fi
3172 3172
3173 irix5* | irix6* | nonstopux*) 3173 irix5* | irix6* | nonstopux*)
3174 if test "$GCC" = yes; then 3174 if test "$GCC" = yes; then
@@ -3213,7 +3213,7 @@ index a1092735311..f3bdee98f3f 100755
3213 else 3213 else
3214 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' 3214 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'
3215 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' 3215 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'
3216@@ -9544,7 +10135,7 @@ rm -f core conftest.err conftest.$ac_objext \ 3216@@ -9542,7 +10133,7 @@ rm -f core conftest.err conftest.$ac_objext \
3217 osf4* | osf5*) # as osf3* with the addition of -msym flag 3217 osf4* | osf5*) # as osf3* with the addition of -msym flag
3218 if test "$GCC" = yes; then 3218 if test "$GCC" = yes; then
3219 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' 3219 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
@@ -3222,7 +3222,7 @@ index a1092735311..f3bdee98f3f 100755
3222 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' 3222 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
3223 else 3223 else
3224 allow_undefined_flag=' -expect_unresolved \*' 3224 allow_undefined_flag=' -expect_unresolved \*'
3225@@ -9563,9 +10154,9 @@ rm -f core conftest.err conftest.$ac_objext \ 3225@@ -9561,9 +10152,9 @@ rm -f core conftest.err conftest.$ac_objext \
3226 no_undefined_flag=' -z defs' 3226 no_undefined_flag=' -z defs'
3227 if test "$GCC" = yes; then 3227 if test "$GCC" = yes; then
3228 wlarc='${wl}' 3228 wlarc='${wl}'
@@ -3234,7 +3234,7 @@ index a1092735311..f3bdee98f3f 100755
3234 else 3234 else
3235 case `$CC -V 2>&1` in 3235 case `$CC -V 2>&1` in
3236 *"Compilers 5.0"*) 3236 *"Compilers 5.0"*)
3237@@ -10141,8 +10732,9 @@ cygwin* | mingw* | pw32* | cegcc*) 3237@@ -10139,8 +10730,9 @@ cygwin* | mingw* | pw32* | cegcc*)
3238 need_version=no 3238 need_version=no
3239 need_lib_prefix=no 3239 need_lib_prefix=no
3240 3240
@@ -3246,7 +3246,7 @@ index a1092735311..f3bdee98f3f 100755
3246 library_names_spec='$libname.dll.a' 3246 library_names_spec='$libname.dll.a'
3247 # DLL is installed to $(libdir)/../bin by postinstall_cmds 3247 # DLL is installed to $(libdir)/../bin by postinstall_cmds
3248 postinstall_cmds='base_file=`basename \${file}`~ 3248 postinstall_cmds='base_file=`basename \${file}`~
3249@@ -10175,13 +10767,71 @@ cygwin* | mingw* | pw32* | cegcc*) 3249@@ -10173,13 +10765,71 @@ cygwin* | mingw* | pw32* | cegcc*)
3250 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' 3250 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
3251 ;; 3251 ;;
3252 esac 3252 esac
@@ -3319,16 +3319,16 @@ index a1092735311..f3bdee98f3f 100755
3319 # FIXME: first we should search . and the directory the executable is in 3319 # FIXME: first we should search . and the directory the executable is in
3320 shlibpath_var=PATH 3320 shlibpath_var=PATH
3321 ;; 3321 ;;
3322@@ -11083,7 +11733,7 @@ else 3322@@ -11081,7 +11731,7 @@ else
3323 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 3323 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
3324 lt_status=$lt_dlunknown 3324 lt_status=$lt_dlunknown
3325 cat > conftest.$ac_ext <<_LT_EOF 3325 cat > conftest.$ac_ext <<_LT_EOF
3326-#line 11086 "configure" 3326-#line 11084 "configure"
3327+#line $LINENO "configure" 3327+#line $LINENO "configure"
3328 #include "confdefs.h" 3328 #include "confdefs.h"
3329 3329
3330 #if HAVE_DLFCN_H 3330 #if HAVE_DLFCN_H
3331@@ -11127,10 +11777,10 @@ else 3331@@ -11125,10 +11775,10 @@ else
3332 /* When -fvisbility=hidden is used, assume the code has been annotated 3332 /* When -fvisbility=hidden is used, assume the code has been annotated
3333 correspondingly for the symbols needed. */ 3333 correspondingly for the symbols needed. */
3334 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 3334 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
@@ -3341,16 +3341,16 @@ index a1092735311..f3bdee98f3f 100755
3341 int main () 3341 int main ()
3342 { 3342 {
3343 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 3343 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
3344@@ -11189,7 +11839,7 @@ else 3344@@ -11187,7 +11837,7 @@ else
3345 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 3345 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
3346 lt_status=$lt_dlunknown 3346 lt_status=$lt_dlunknown
3347 cat > conftest.$ac_ext <<_LT_EOF 3347 cat > conftest.$ac_ext <<_LT_EOF
3348-#line 11192 "configure" 3348-#line 11190 "configure"
3349+#line $LINENO "configure" 3349+#line $LINENO "configure"
3350 #include "confdefs.h" 3350 #include "confdefs.h"
3351 3351
3352 #if HAVE_DLFCN_H 3352 #if HAVE_DLFCN_H
3353@@ -11233,10 +11883,10 @@ else 3353@@ -11231,10 +11881,10 @@ else
3354 /* When -fvisbility=hidden is used, assume the code has been annotated 3354 /* When -fvisbility=hidden is used, assume the code has been annotated
3355 correspondingly for the symbols needed. */ 3355 correspondingly for the symbols needed. */
3356 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 3356 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
@@ -3363,7 +3363,7 @@ index a1092735311..f3bdee98f3f 100755
3363 int main () 3363 int main ()
3364 { 3364 {
3365 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 3365 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
3366@@ -17390,13 +18040,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' 3366@@ -17383,13 +18033,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
3367 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' 3367 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
3368 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' 3368 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
3369 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' 3369 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
@@ -3384,7 +3384,7 @@ index a1092735311..f3bdee98f3f 100755
3384 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' 3384 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
3385 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' 3385 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
3386 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' 3386 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
3387@@ -17411,14 +18068,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de 3387@@ -17404,14 +18061,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de
3388 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' 3388 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
3389 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' 3389 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
3390 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"`' 3390 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"`'
@@ -3403,7 +3403,7 @@ index a1092735311..f3bdee98f3f 100755
3403 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' 3403 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
3404 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' 3404 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
3405 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' 3405 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
3406@@ -17451,12 +18111,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q 3406@@ -17444,12 +18104,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q
3407 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' 3407 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
3408 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' 3408 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
3409 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' 3409 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
@@ -3417,7 +3417,7 @@ index a1092735311..f3bdee98f3f 100755
3417 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' 3417 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
3418 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' 3418 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
3419 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' 3419 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
3420@@ -17511,8 +18171,13 @@ reload_flag \ 3420@@ -17504,8 +18164,13 @@ reload_flag \
3421 OBJDUMP \ 3421 OBJDUMP \
3422 deplibs_check_method \ 3422 deplibs_check_method \
3423 file_magic_cmd \ 3423 file_magic_cmd \
@@ -3431,7 +3431,7 @@ index a1092735311..f3bdee98f3f 100755
3431 STRIP \ 3431 STRIP \
3432 RANLIB \ 3432 RANLIB \
3433 CC \ 3433 CC \
3434@@ -17522,12 +18187,14 @@ lt_cv_sys_global_symbol_pipe \ 3434@@ -17515,12 +18180,14 @@ lt_cv_sys_global_symbol_pipe \
3435 lt_cv_sys_global_symbol_to_cdecl \ 3435 lt_cv_sys_global_symbol_to_cdecl \
3436 lt_cv_sys_global_symbol_to_c_name_address \ 3436 lt_cv_sys_global_symbol_to_c_name_address \
3437 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ 3437 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
@@ -3447,7 +3447,7 @@ index a1092735311..f3bdee98f3f 100755
3447 DSYMUTIL \ 3447 DSYMUTIL \
3448 NMEDIT \ 3448 NMEDIT \
3449 LIPO \ 3449 LIPO \
3450@@ -17543,7 +18210,6 @@ no_undefined_flag \ 3450@@ -17536,7 +18203,6 @@ no_undefined_flag \
3451 hardcode_libdir_flag_spec \ 3451 hardcode_libdir_flag_spec \
3452 hardcode_libdir_flag_spec_ld \ 3452 hardcode_libdir_flag_spec_ld \
3453 hardcode_libdir_separator \ 3453 hardcode_libdir_separator \
@@ -3455,7 +3455,7 @@ index a1092735311..f3bdee98f3f 100755
3455 exclude_expsyms \ 3455 exclude_expsyms \
3456 include_expsyms \ 3456 include_expsyms \
3457 file_list_spec \ 3457 file_list_spec \
3458@@ -17579,6 +18245,7 @@ module_cmds \ 3458@@ -17572,6 +18238,7 @@ module_cmds \
3459 module_expsym_cmds \ 3459 module_expsym_cmds \
3460 export_symbols_cmds \ 3460 export_symbols_cmds \
3461 prelink_cmds \ 3461 prelink_cmds \
@@ -3463,7 +3463,7 @@ index a1092735311..f3bdee98f3f 100755
3463 postinstall_cmds \ 3463 postinstall_cmds \
3464 postuninstall_cmds \ 3464 postuninstall_cmds \
3465 finish_cmds \ 3465 finish_cmds \
3466@@ -18352,7 +19019,8 @@ $as_echo X"$file" | 3466@@ -18345,7 +19012,8 @@ $as_echo X"$file" |
3467 # NOTE: Changes made to this file will be lost: look at ltmain.sh. 3467 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
3468 # 3468 #
3469 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 3469 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
@@ -3473,7 +3473,7 @@ index a1092735311..f3bdee98f3f 100755
3473 # Written by Gordon Matzigkeit, 1996 3473 # Written by Gordon Matzigkeit, 1996
3474 # 3474 #
3475 # This file is part of GNU Libtool. 3475 # This file is part of GNU Libtool.
3476@@ -18455,19 +19123,42 @@ SP2NL=$lt_lt_SP2NL 3476@@ -18448,19 +19116,42 @@ SP2NL=$lt_lt_SP2NL
3477 # turn newlines into spaces. 3477 # turn newlines into spaces.
3478 NL2SP=$lt_lt_NL2SP 3478 NL2SP=$lt_lt_NL2SP
3479 3479
@@ -3517,7 +3517,7 @@ index a1092735311..f3bdee98f3f 100755
3517 # A symbol stripping program. 3517 # A symbol stripping program.
3518 STRIP=$lt_STRIP 3518 STRIP=$lt_STRIP
3519 3519
3520@@ -18497,6 +19188,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address 3520@@ -18490,6 +19181,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
3521 # Transform the output of nm in a C name address pair when lib prefix is needed. 3521 # Transform the output of nm in a C name address pair when lib prefix is needed.
3522 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix 3522 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
3523 3523
@@ -3530,7 +3530,7 @@ index a1092735311..f3bdee98f3f 100755
3530 # The name of the directory that contains temporary libtool files. 3530 # The name of the directory that contains temporary libtool files.
3531 objdir=$objdir 3531 objdir=$objdir
3532 3532
3533@@ -18506,6 +19203,9 @@ MAGIC_CMD=$MAGIC_CMD 3533@@ -18499,6 +19196,9 @@ MAGIC_CMD=$MAGIC_CMD
3534 # Must we lock files when doing compilation? 3534 # Must we lock files when doing compilation?
3535 need_locks=$lt_need_locks 3535 need_locks=$lt_need_locks
3536 3536
@@ -3540,7 +3540,7 @@ index a1092735311..f3bdee98f3f 100755
3540 # Tool to manipulate archived DWARF debug symbol files on Mac OS X. 3540 # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
3541 DSYMUTIL=$lt_DSYMUTIL 3541 DSYMUTIL=$lt_DSYMUTIL
3542 3542
3543@@ -18620,12 +19320,12 @@ with_gcc=$GCC 3543@@ -18613,12 +19313,12 @@ with_gcc=$GCC
3544 # Compiler flag to turn off builtin functions. 3544 # Compiler flag to turn off builtin functions.
3545 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag 3545 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
3546 3546
@@ -3556,7 +3556,7 @@ index a1092735311..f3bdee98f3f 100755
3556 # Compiler flag to prevent dynamic linking. 3556 # Compiler flag to prevent dynamic linking.
3557 link_static_flag=$lt_lt_prog_compiler_static 3557 link_static_flag=$lt_lt_prog_compiler_static
3558 3558
3559@@ -18712,9 +19412,6 @@ inherit_rpath=$inherit_rpath 3559@@ -18705,9 +19405,6 @@ inherit_rpath=$inherit_rpath
3560 # Whether libtool must link a program against all its dependency libraries. 3560 # Whether libtool must link a program against all its dependency libraries.
3561 link_all_deplibs=$link_all_deplibs 3561 link_all_deplibs=$link_all_deplibs
3562 3562
@@ -3566,7 +3566,7 @@ index a1092735311..f3bdee98f3f 100755
3566 # Set to "yes" if exported symbols are required. 3566 # Set to "yes" if exported symbols are required.
3567 always_export_symbols=$always_export_symbols 3567 always_export_symbols=$always_export_symbols
3568 3568
3569@@ -18730,6 +19427,9 @@ include_expsyms=$lt_include_expsyms 3569@@ -18723,6 +19420,9 @@ include_expsyms=$lt_include_expsyms
3570 # Commands necessary for linking programs (against libraries) with templates. 3570 # Commands necessary for linking programs (against libraries) with templates.
3571 prelink_cmds=$lt_prelink_cmds 3571 prelink_cmds=$lt_prelink_cmds
3572 3572
@@ -3576,7 +3576,7 @@ index a1092735311..f3bdee98f3f 100755
3576 # Specify filename containing input files. 3576 # Specify filename containing input files.
3577 file_list_spec=$lt_file_list_spec 3577 file_list_spec=$lt_file_list_spec
3578 3578
3579@@ -18762,210 +19462,169 @@ ltmain="$ac_aux_dir/ltmain.sh" 3579@@ -18755,210 +19455,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
3580 # if finds mixed CR/LF and LF-only lines. Since sed operates in 3580 # if finds mixed CR/LF and LF-only lines. Since sed operates in
3581 # text mode, it properly converts lines to CR/LF. This bash problem 3581 # text mode, it properly converts lines to CR/LF. This bash problem
3582 # is reportedly fixed, but why not run on old versions too? 3582 # is reportedly fixed, but why not run on old versions too?
@@ -3951,7 +3951,7 @@ index a1092735311..f3bdee98f3f 100755
3951 chmod +x "$ofile" 3951 chmod +x "$ofile"
3952 3952
3953diff --git a/gas/Makefile.in b/gas/Makefile.in 3953diff --git a/gas/Makefile.in b/gas/Makefile.in
3954index bc25765cb5b..c481d96a05a 100644 3954index 1f24d4a5bbc..0147b491612 100644
3955--- a/gas/Makefile.in 3955--- a/gas/Makefile.in
3956+++ b/gas/Makefile.in 3956+++ b/gas/Makefile.in
3957@@ -384,6 +384,7 @@ CYGPATH_W = @CYGPATH_W@ 3957@@ -384,6 +384,7 @@ CYGPATH_W = @CYGPATH_W@
@@ -3979,7 +3979,7 @@ index bc25765cb5b..c481d96a05a 100644
3979 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ 3979 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
3980 am__include = @am__include@ 3980 am__include = @am__include@
3981diff --git a/gas/configure b/gas/configure 3981diff --git a/gas/configure b/gas/configure
3982index 5f8c8493589..998727b6108 100755 3982index 085c87d564c..14b1dc0f121 100755
3983--- a/gas/configure 3983--- a/gas/configure
3984+++ b/gas/configure 3984+++ b/gas/configure
3985@@ -692,8 +692,11 @@ OTOOL 3985@@ -692,8 +692,11 @@ OTOOL
@@ -4002,7 +4002,7 @@ index 5f8c8493589..998727b6108 100755
4002 enable_libtool_lock 4002 enable_libtool_lock
4003 enable_plugins 4003 enable_plugins
4004 enable_largefile 4004 enable_largefile
4005@@ -1517,6 +1521,8 @@ Optional Packages: 4005@@ -1519,6 +1523,8 @@ Optional Packages:
4006 --with-pic try to use only PIC/non-PIC objects [default=use 4006 --with-pic try to use only PIC/non-PIC objects [default=use
4007 both] 4007 both]
4008 --with-gnu-ld assume the C compiler uses GNU ld [default=no] 4008 --with-gnu-ld assume the C compiler uses GNU ld [default=no]
@@ -5302,7 +5302,7 @@ index 5f8c8493589..998727b6108 100755
5302 int main () 5302 int main ()
5303 { 5303 {
5304 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 5304 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
5305@@ -17080,13 +17730,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' 5305@@ -17049,13 +17699,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
5306 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' 5306 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
5307 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' 5307 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
5308 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' 5308 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
@@ -5323,7 +5323,7 @@ index 5f8c8493589..998727b6108 100755
5323 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' 5323 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
5324 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' 5324 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
5325 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' 5325 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
5326@@ -17101,14 +17758,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de 5326@@ -17070,14 +17727,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de
5327 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' 5327 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
5328 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' 5328 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
5329 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"`' 5329 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"`'
@@ -5342,7 +5342,7 @@ index 5f8c8493589..998727b6108 100755
5342 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' 5342 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
5343 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' 5343 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
5344 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' 5344 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
5345@@ -17141,12 +17801,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q 5345@@ -17110,12 +17770,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q
5346 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' 5346 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
5347 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' 5347 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
5348 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' 5348 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
@@ -5356,7 +5356,7 @@ index 5f8c8493589..998727b6108 100755
5356 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' 5356 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
5357 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' 5357 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
5358 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' 5358 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
5359@@ -17201,8 +17861,13 @@ reload_flag \ 5359@@ -17170,8 +17830,13 @@ reload_flag \
5360 OBJDUMP \ 5360 OBJDUMP \
5361 deplibs_check_method \ 5361 deplibs_check_method \
5362 file_magic_cmd \ 5362 file_magic_cmd \
@@ -5370,7 +5370,7 @@ index 5f8c8493589..998727b6108 100755
5370 STRIP \ 5370 STRIP \
5371 RANLIB \ 5371 RANLIB \
5372 CC \ 5372 CC \
5373@@ -17212,12 +17877,14 @@ lt_cv_sys_global_symbol_pipe \ 5373@@ -17181,12 +17846,14 @@ lt_cv_sys_global_symbol_pipe \
5374 lt_cv_sys_global_symbol_to_cdecl \ 5374 lt_cv_sys_global_symbol_to_cdecl \
5375 lt_cv_sys_global_symbol_to_c_name_address \ 5375 lt_cv_sys_global_symbol_to_c_name_address \
5376 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ 5376 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
@@ -5386,7 +5386,7 @@ index 5f8c8493589..998727b6108 100755
5386 DSYMUTIL \ 5386 DSYMUTIL \
5387 NMEDIT \ 5387 NMEDIT \
5388 LIPO \ 5388 LIPO \
5389@@ -17233,7 +17900,6 @@ no_undefined_flag \ 5389@@ -17202,7 +17869,6 @@ no_undefined_flag \
5390 hardcode_libdir_flag_spec \ 5390 hardcode_libdir_flag_spec \
5391 hardcode_libdir_flag_spec_ld \ 5391 hardcode_libdir_flag_spec_ld \
5392 hardcode_libdir_separator \ 5392 hardcode_libdir_separator \
@@ -5394,7 +5394,7 @@ index 5f8c8493589..998727b6108 100755
5394 exclude_expsyms \ 5394 exclude_expsyms \
5395 include_expsyms \ 5395 include_expsyms \
5396 file_list_spec \ 5396 file_list_spec \
5397@@ -17269,6 +17935,7 @@ module_cmds \ 5397@@ -17238,6 +17904,7 @@ module_cmds \
5398 module_expsym_cmds \ 5398 module_expsym_cmds \
5399 export_symbols_cmds \ 5399 export_symbols_cmds \
5400 prelink_cmds \ 5400 prelink_cmds \
@@ -5402,7 +5402,7 @@ index 5f8c8493589..998727b6108 100755
5402 postinstall_cmds \ 5402 postinstall_cmds \
5403 postuninstall_cmds \ 5403 postuninstall_cmds \
5404 finish_cmds \ 5404 finish_cmds \
5405@@ -18049,7 +18716,8 @@ $as_echo X"$file" | 5405@@ -18018,7 +18685,8 @@ $as_echo X"$file" |
5406 # NOTE: Changes made to this file will be lost: look at ltmain.sh. 5406 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
5407 # 5407 #
5408 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 5408 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
@@ -5412,7 +5412,7 @@ index 5f8c8493589..998727b6108 100755
5412 # Written by Gordon Matzigkeit, 1996 5412 # Written by Gordon Matzigkeit, 1996
5413 # 5413 #
5414 # This file is part of GNU Libtool. 5414 # This file is part of GNU Libtool.
5415@@ -18152,19 +18820,42 @@ SP2NL=$lt_lt_SP2NL 5415@@ -18121,19 +18789,42 @@ SP2NL=$lt_lt_SP2NL
5416 # turn newlines into spaces. 5416 # turn newlines into spaces.
5417 NL2SP=$lt_lt_NL2SP 5417 NL2SP=$lt_lt_NL2SP
5418 5418
@@ -5456,7 +5456,7 @@ index 5f8c8493589..998727b6108 100755
5456 # A symbol stripping program. 5456 # A symbol stripping program.
5457 STRIP=$lt_STRIP 5457 STRIP=$lt_STRIP
5458 5458
5459@@ -18194,6 +18885,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address 5459@@ -18163,6 +18854,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
5460 # Transform the output of nm in a C name address pair when lib prefix is needed. 5460 # Transform the output of nm in a C name address pair when lib prefix is needed.
5461 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix 5461 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
5462 5462
@@ -5469,7 +5469,7 @@ index 5f8c8493589..998727b6108 100755
5469 # The name of the directory that contains temporary libtool files. 5469 # The name of the directory that contains temporary libtool files.
5470 objdir=$objdir 5470 objdir=$objdir
5471 5471
5472@@ -18203,6 +18900,9 @@ MAGIC_CMD=$MAGIC_CMD 5472@@ -18172,6 +18869,9 @@ MAGIC_CMD=$MAGIC_CMD
5473 # Must we lock files when doing compilation? 5473 # Must we lock files when doing compilation?
5474 need_locks=$lt_need_locks 5474 need_locks=$lt_need_locks
5475 5475
@@ -5479,7 +5479,7 @@ index 5f8c8493589..998727b6108 100755
5479 # Tool to manipulate archived DWARF debug symbol files on Mac OS X. 5479 # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
5480 DSYMUTIL=$lt_DSYMUTIL 5480 DSYMUTIL=$lt_DSYMUTIL
5481 5481
5482@@ -18317,12 +19017,12 @@ with_gcc=$GCC 5482@@ -18286,12 +18986,12 @@ with_gcc=$GCC
5483 # Compiler flag to turn off builtin functions. 5483 # Compiler flag to turn off builtin functions.
5484 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag 5484 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
5485 5485
@@ -5495,7 +5495,7 @@ index 5f8c8493589..998727b6108 100755
5495 # Compiler flag to prevent dynamic linking. 5495 # Compiler flag to prevent dynamic linking.
5496 link_static_flag=$lt_lt_prog_compiler_static 5496 link_static_flag=$lt_lt_prog_compiler_static
5497 5497
5498@@ -18409,9 +19109,6 @@ inherit_rpath=$inherit_rpath 5498@@ -18378,9 +19078,6 @@ inherit_rpath=$inherit_rpath
5499 # Whether libtool must link a program against all its dependency libraries. 5499 # Whether libtool must link a program against all its dependency libraries.
5500 link_all_deplibs=$link_all_deplibs 5500 link_all_deplibs=$link_all_deplibs
5501 5501
@@ -5505,7 +5505,7 @@ index 5f8c8493589..998727b6108 100755
5505 # Set to "yes" if exported symbols are required. 5505 # Set to "yes" if exported symbols are required.
5506 always_export_symbols=$always_export_symbols 5506 always_export_symbols=$always_export_symbols
5507 5507
5508@@ -18427,6 +19124,9 @@ include_expsyms=$lt_include_expsyms 5508@@ -18396,6 +19093,9 @@ include_expsyms=$lt_include_expsyms
5509 # Commands necessary for linking programs (against libraries) with templates. 5509 # Commands necessary for linking programs (against libraries) with templates.
5510 prelink_cmds=$lt_prelink_cmds 5510 prelink_cmds=$lt_prelink_cmds
5511 5511
@@ -5515,7 +5515,7 @@ index 5f8c8493589..998727b6108 100755
5515 # Specify filename containing input files. 5515 # Specify filename containing input files.
5516 file_list_spec=$lt_file_list_spec 5516 file_list_spec=$lt_file_list_spec
5517 5517
5518@@ -18459,210 +19159,169 @@ ltmain="$ac_aux_dir/ltmain.sh" 5518@@ -18428,210 +19128,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
5519 # if finds mixed CR/LF and LF-only lines. Since sed operates in 5519 # if finds mixed CR/LF and LF-only lines. Since sed operates in
5520 # text mode, it properly converts lines to CR/LF. This bash problem 5520 # text mode, it properly converts lines to CR/LF. This bash problem
5521 # is reportedly fixed, but why not run on old versions too? 5521 # is reportedly fixed, but why not run on old versions too?
@@ -5890,7 +5890,7 @@ index 5f8c8493589..998727b6108 100755
5890 chmod +x "$ofile" 5890 chmod +x "$ofile"
5891 5891
5892diff --git a/gprof/Makefile.in b/gprof/Makefile.in 5892diff --git a/gprof/Makefile.in b/gprof/Makefile.in
5893index a7398231030..fc7a3d78db0 100644 5893index 93fb378149a..6744cb1ff8c 100644
5894--- a/gprof/Makefile.in 5894--- a/gprof/Makefile.in
5895+++ b/gprof/Makefile.in 5895+++ b/gprof/Makefile.in
5896@@ -327,6 +327,7 @@ CYGPATH_W = @CYGPATH_W@ 5896@@ -327,6 +327,7 @@ CYGPATH_W = @CYGPATH_W@
@@ -5918,7 +5918,7 @@ index a7398231030..fc7a3d78db0 100644
5918 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ 5918 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
5919 am__include = @am__include@ 5919 am__include = @am__include@
5920diff --git a/gprof/configure b/gprof/configure 5920diff --git a/gprof/configure b/gprof/configure
5921index 2d62b6fbb07..0cafee249eb 100755 5921index 47ed79d1df4..bfbf4c421f3 100755
5922--- a/gprof/configure 5922--- a/gprof/configure
5923+++ b/gprof/configure 5923+++ b/gprof/configure
5924@@ -669,8 +669,11 @@ OTOOL 5924@@ -669,8 +669,11 @@ OTOOL
@@ -5950,7 +5950,7 @@ index 2d62b6fbb07..0cafee249eb 100755
5950 5950
5951 Some influential environment variables: 5951 Some influential environment variables:
5952 CC C compiler command 5952 CC C compiler command
5953@@ -4530,8 +4536,8 @@ esac 5953@@ -4528,8 +4534,8 @@ esac
5954 5954
5955 5955
5956 5956
@@ -5961,7 +5961,7 @@ index 2d62b6fbb07..0cafee249eb 100755
5961 5961
5962 5962
5963 5963
5964@@ -4571,7 +4577,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO 5964@@ -4569,7 +4575,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
5965 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 5965 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
5966 $as_echo_n "checking how to print strings... " >&6; } 5966 $as_echo_n "checking how to print strings... " >&6; }
5967 # Test print first, because it will be a builtin if present. 5967 # Test print first, because it will be a builtin if present.
@@ -5970,7 +5970,7 @@ index 2d62b6fbb07..0cafee249eb 100755
5970 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then 5970 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
5971 ECHO='print -r --' 5971 ECHO='print -r --'
5972 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then 5972 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
5973@@ -5264,8 +5270,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; 5973@@ -5262,8 +5268,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6;
5974 # Try some XSI features 5974 # Try some XSI features
5975 xsi_shell=no 5975 xsi_shell=no
5976 ( _lt_dummy="a/b/c" 5976 ( _lt_dummy="a/b/c"
@@ -5981,7 +5981,7 @@ index 2d62b6fbb07..0cafee249eb 100755
5981 && eval 'test $(( 1 + 1 )) -eq 2 \ 5981 && eval 'test $(( 1 + 1 )) -eq 2 \
5982 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ 5982 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
5983 && xsi_shell=yes 5983 && xsi_shell=yes
5984@@ -5314,6 +5320,80 @@ esac 5984@@ -5312,6 +5318,80 @@ esac
5985 5985
5986 5986
5987 5987
@@ -6062,7 +6062,7 @@ index 2d62b6fbb07..0cafee249eb 100755
6062 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 6062 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
6063 $as_echo_n "checking for $LD option to reload object files... " >&6; } 6063 $as_echo_n "checking for $LD option to reload object files... " >&6; }
6064 if ${lt_cv_ld_reload_flag+:} false; then : 6064 if ${lt_cv_ld_reload_flag+:} false; then :
6065@@ -5330,6 +5410,11 @@ case $reload_flag in 6065@@ -5328,6 +5408,11 @@ case $reload_flag in
6066 esac 6066 esac
6067 reload_cmds='$LD$reload_flag -o $output$reload_objs' 6067 reload_cmds='$LD$reload_flag -o $output$reload_objs'
6068 case $host_os in 6068 case $host_os in
@@ -6074,7 +6074,7 @@ index 2d62b6fbb07..0cafee249eb 100755
6074 darwin*) 6074 darwin*)
6075 if test "$GCC" = yes; then 6075 if test "$GCC" = yes; then
6076 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' 6076 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
6077@@ -5498,7 +5583,8 @@ mingw* | pw32*) 6077@@ -5496,7 +5581,8 @@ mingw* | pw32*)
6078 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' 6078 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
6079 lt_cv_file_magic_cmd='func_win32_libid' 6079 lt_cv_file_magic_cmd='func_win32_libid'
6080 else 6080 else
@@ -6084,7 +6084,7 @@ index 2d62b6fbb07..0cafee249eb 100755
6084 lt_cv_file_magic_cmd='$OBJDUMP -f' 6084 lt_cv_file_magic_cmd='$OBJDUMP -f'
6085 fi 6085 fi
6086 ;; 6086 ;;
6087@@ -5657,6 +5743,21 @@ esac 6087@@ -5655,6 +5741,21 @@ esac
6088 fi 6088 fi
6089 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 6089 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
6090 $as_echo "$lt_cv_deplibs_check_method" >&6; } 6090 $as_echo "$lt_cv_deplibs_check_method" >&6; }
@@ -6106,7 +6106,7 @@ index 2d62b6fbb07..0cafee249eb 100755
6106 file_magic_cmd=$lt_cv_file_magic_cmd 6106 file_magic_cmd=$lt_cv_file_magic_cmd
6107 deplibs_check_method=$lt_cv_deplibs_check_method 6107 deplibs_check_method=$lt_cv_deplibs_check_method
6108 test -z "$deplibs_check_method" && deplibs_check_method=unknown 6108 test -z "$deplibs_check_method" && deplibs_check_method=unknown
6109@@ -5672,6 +5773,157 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown 6109@@ -5670,6 +5771,157 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
6110 6110
6111 6111
6112 6112
@@ -6264,7 +6264,7 @@ index 2d62b6fbb07..0cafee249eb 100755
6264 plugin_option= 6264 plugin_option=
6265 plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll" 6265 plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll"
6266 for plugin in $plugin_names; do 6266 for plugin in $plugin_names; do
6267@@ -5686,8 +5938,10 @@ for plugin in $plugin_names; do 6267@@ -5684,8 +5936,10 @@ for plugin in $plugin_names; do
6268 done 6268 done
6269 6269
6270 if test -n "$ac_tool_prefix"; then 6270 if test -n "$ac_tool_prefix"; then
@@ -6277,7 +6277,7 @@ index 2d62b6fbb07..0cafee249eb 100755
6277 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 6277 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
6278 $as_echo_n "checking for $ac_word... " >&6; } 6278 $as_echo_n "checking for $ac_word... " >&6; }
6279 if ${ac_cv_prog_AR+:} false; then : 6279 if ${ac_cv_prog_AR+:} false; then :
6280@@ -5703,7 +5957,7 @@ do 6280@@ -5701,7 +5955,7 @@ do
6281 test -z "$as_dir" && as_dir=. 6281 test -z "$as_dir" && as_dir=.
6282 for ac_exec_ext in '' $ac_executable_extensions; do 6282 for ac_exec_ext in '' $ac_executable_extensions; do
6283 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 6283 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
@@ -6286,7 +6286,7 @@ index 2d62b6fbb07..0cafee249eb 100755
6286 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 6286 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
6287 break 2 6287 break 2
6288 fi 6288 fi
6289@@ -5723,11 +5977,15 @@ $as_echo "no" >&6; } 6289@@ -5721,11 +5975,15 @@ $as_echo "no" >&6; }
6290 fi 6290 fi
6291 6291
6292 6292
@@ -6305,7 +6305,7 @@ index 2d62b6fbb07..0cafee249eb 100755
6305 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 6305 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
6306 $as_echo_n "checking for $ac_word... " >&6; } 6306 $as_echo_n "checking for $ac_word... " >&6; }
6307 if ${ac_cv_prog_ac_ct_AR+:} false; then : 6307 if ${ac_cv_prog_ac_ct_AR+:} false; then :
6308@@ -5743,7 +6001,7 @@ do 6308@@ -5741,7 +5999,7 @@ do
6309 test -z "$as_dir" && as_dir=. 6309 test -z "$as_dir" && as_dir=.
6310 for ac_exec_ext in '' $ac_executable_extensions; do 6310 for ac_exec_ext in '' $ac_executable_extensions; do
6311 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 6311 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
@@ -6314,7 +6314,7 @@ index 2d62b6fbb07..0cafee249eb 100755
6314 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 6314 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
6315 break 2 6315 break 2
6316 fi 6316 fi
6317@@ -5762,6 +6020,10 @@ else 6317@@ -5760,6 +6018,10 @@ else
6318 $as_echo "no" >&6; } 6318 $as_echo "no" >&6; }
6319 fi 6319 fi
6320 6320
@@ -6325,7 +6325,7 @@ index 2d62b6fbb07..0cafee249eb 100755
6325 if test "x$ac_ct_AR" = x; then 6325 if test "x$ac_ct_AR" = x; then
6326 AR="false" 6326 AR="false"
6327 else 6327 else
6328@@ -5773,25 +6035,19 @@ ac_tool_warned=yes ;; 6328@@ -5771,25 +6033,19 @@ ac_tool_warned=yes ;;
6329 esac 6329 esac
6330 AR=$ac_ct_AR 6330 AR=$ac_ct_AR
6331 fi 6331 fi
@@ -6360,7 +6360,7 @@ index 2d62b6fbb07..0cafee249eb 100755
6360 6360
6361 6361
6362 6362
6363@@ -5803,6 +6059,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru 6363@@ -5801,6 +6057,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru
6364 6364
6365 6365
6366 6366
@@ -6425,7 +6425,7 @@ index 2d62b6fbb07..0cafee249eb 100755
6425 if test -n "$ac_tool_prefix"; then 6425 if test -n "$ac_tool_prefix"; then
6426 # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. 6426 # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
6427 set dummy ${ac_tool_prefix}strip; ac_word=$2 6427 set dummy ${ac_tool_prefix}strip; ac_word=$2
6428@@ -6142,8 +6456,8 @@ esac 6428@@ -6140,8 +6454,8 @@ esac
6429 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" 6429 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
6430 6430
6431 # Transform an extracted symbol line into symbol name and symbol address 6431 # Transform an extracted symbol line into symbol name and symbol address
@@ -6436,7 +6436,7 @@ index 2d62b6fbb07..0cafee249eb 100755
6436 6436
6437 # Handle CRLF in mingw tool chain 6437 # Handle CRLF in mingw tool chain
6438 opt_cr= 6438 opt_cr=
6439@@ -6179,6 +6493,7 @@ for ac_symprfx in "" "_"; do 6439@@ -6177,6 +6491,7 @@ for ac_symprfx in "" "_"; do
6440 else 6440 else
6441 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" 6441 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
6442 fi 6442 fi
@@ -6444,7 +6444,7 @@ index 2d62b6fbb07..0cafee249eb 100755
6444 6444
6445 # Check to see that the pipe works correctly. 6445 # Check to see that the pipe works correctly.
6446 pipe_works=no 6446 pipe_works=no
6447@@ -6220,6 +6535,18 @@ _LT_EOF 6447@@ -6218,6 +6533,18 @@ _LT_EOF
6448 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then 6448 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
6449 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then 6449 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
6450 cat <<_LT_EOF > conftest.$ac_ext 6450 cat <<_LT_EOF > conftest.$ac_ext
@@ -6463,7 +6463,7 @@ index 2d62b6fbb07..0cafee249eb 100755
6463 #ifdef __cplusplus 6463 #ifdef __cplusplus
6464 extern "C" { 6464 extern "C" {
6465 #endif 6465 #endif
6466@@ -6231,7 +6558,7 @@ _LT_EOF 6466@@ -6229,7 +6556,7 @@ _LT_EOF
6467 cat <<_LT_EOF >> conftest.$ac_ext 6467 cat <<_LT_EOF >> conftest.$ac_ext
6468 6468
6469 /* The mapping between symbol names and symbols. */ 6469 /* The mapping between symbol names and symbols. */
@@ -6472,7 +6472,7 @@ index 2d62b6fbb07..0cafee249eb 100755
6472 const char *name; 6472 const char *name;
6473 void *address; 6473 void *address;
6474 } 6474 }
6475@@ -6257,8 +6584,8 @@ static const void *lt_preloaded_setup() { 6475@@ -6255,8 +6582,8 @@ static const void *lt_preloaded_setup() {
6476 _LT_EOF 6476 _LT_EOF
6477 # Now try linking the two files. 6477 # Now try linking the two files.
6478 mv conftest.$ac_objext conftstm.$ac_objext 6478 mv conftest.$ac_objext conftstm.$ac_objext
@@ -6483,7 +6483,7 @@ index 2d62b6fbb07..0cafee249eb 100755
6483 LIBS="conftstm.$ac_objext" 6483 LIBS="conftstm.$ac_objext"
6484 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" 6484 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
6485 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 6485 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
6486@@ -6268,8 +6595,8 @@ _LT_EOF 6486@@ -6266,8 +6593,8 @@ _LT_EOF
6487 test $ac_status = 0; } && test -s conftest${ac_exeext}; then 6487 test $ac_status = 0; } && test -s conftest${ac_exeext}; then
6488 pipe_works=yes 6488 pipe_works=yes
6489 fi 6489 fi
@@ -6494,7 +6494,7 @@ index 2d62b6fbb07..0cafee249eb 100755
6494 else 6494 else
6495 echo "cannot find nm_test_func in $nlist" >&5 6495 echo "cannot find nm_test_func in $nlist" >&5
6496 fi 6496 fi
6497@@ -6306,6 +6633,18 @@ else 6497@@ -6304,6 +6631,18 @@ else
6498 $as_echo "ok" >&6; } 6498 $as_echo "ok" >&6; }
6499 fi 6499 fi
6500 6500
@@ -6513,7 +6513,7 @@ index 2d62b6fbb07..0cafee249eb 100755
6513 6513
6514 6514
6515 6515
6516@@ -6322,6 +6661,43 @@ fi 6516@@ -6320,6 +6659,43 @@ fi
6517 6517
6518 6518
6519 6519
@@ -6557,7 +6557,7 @@ index 2d62b6fbb07..0cafee249eb 100755
6557 6557
6558 6558
6559 6559
6560@@ -6533,6 +6909,123 @@ esac 6560@@ -6531,6 +6907,123 @@ esac
6561 6561
6562 need_locks="$enable_libtool_lock" 6562 need_locks="$enable_libtool_lock"
6563 6563
@@ -6681,7 +6681,7 @@ index 2d62b6fbb07..0cafee249eb 100755
6681 6681
6682 case $host_os in 6682 case $host_os in
6683 rhapsody* | darwin*) 6683 rhapsody* | darwin*)
6684@@ -7096,6 +7589,8 @@ _LT_EOF 6684@@ -7094,6 +7587,8 @@ _LT_EOF
6685 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 6685 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
6686 echo "$AR cru libconftest.a conftest.o" >&5 6686 echo "$AR cru libconftest.a conftest.o" >&5
6687 $AR cru libconftest.a conftest.o 2>&5 6687 $AR cru libconftest.a conftest.o 2>&5
@@ -6690,7 +6690,7 @@ index 2d62b6fbb07..0cafee249eb 100755
6690 cat > conftest.c << _LT_EOF 6690 cat > conftest.c << _LT_EOF
6691 int main() { return 0;} 6691 int main() { return 0;}
6692 _LT_EOF 6692 _LT_EOF
6693@@ -7680,8 +8175,6 @@ fi 6693@@ -7678,8 +8173,6 @@ fi
6694 lt_prog_compiler_pic= 6694 lt_prog_compiler_pic=
6695 lt_prog_compiler_static= 6695 lt_prog_compiler_static=
6696 6696
@@ -6699,7 +6699,7 @@ index 2d62b6fbb07..0cafee249eb 100755
6699 6699
6700 if test "$GCC" = yes; then 6700 if test "$GCC" = yes; then
6701 lt_prog_compiler_wl='-Wl,' 6701 lt_prog_compiler_wl='-Wl,'
6702@@ -7847,6 +8340,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 6702@@ -7845,6 +8338,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
6703 lt_prog_compiler_pic='--shared' 6703 lt_prog_compiler_pic='--shared'
6704 lt_prog_compiler_static='--static' 6704 lt_prog_compiler_static='--static'
6705 ;; 6705 ;;
@@ -6712,7 +6712,7 @@ index 2d62b6fbb07..0cafee249eb 100755
6712 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) 6712 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
6713 # Portland Group compilers (*not* the Pentium gcc compiler, 6713 # Portland Group compilers (*not* the Pentium gcc compiler,
6714 # which looks to be a dead project) 6714 # which looks to be a dead project)
6715@@ -7909,7 +8408,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 6715@@ -7907,7 +8406,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
6716 lt_prog_compiler_pic='-KPIC' 6716 lt_prog_compiler_pic='-KPIC'
6717 lt_prog_compiler_static='-Bstatic' 6717 lt_prog_compiler_static='-Bstatic'
6718 case $cc_basename in 6718 case $cc_basename in
@@ -6721,7 +6721,7 @@ index 2d62b6fbb07..0cafee249eb 100755
6721 lt_prog_compiler_wl='-Qoption ld ';; 6721 lt_prog_compiler_wl='-Qoption ld ';;
6722 *) 6722 *)
6723 lt_prog_compiler_wl='-Wl,';; 6723 lt_prog_compiler_wl='-Wl,';;
6724@@ -7966,13 +8465,17 @@ case $host_os in 6724@@ -7964,13 +8463,17 @@ case $host_os in
6725 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" 6725 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
6726 ;; 6726 ;;
6727 esac 6727 esac
@@ -6745,7 +6745,7 @@ index 2d62b6fbb07..0cafee249eb 100755
6745 6745
6746 # 6746 #
6747 # Check to make sure the PIC flag actually works. 6747 # Check to make sure the PIC flag actually works.
6748@@ -8033,6 +8536,11 @@ fi 6748@@ -8031,6 +8534,11 @@ fi
6749 6749
6750 6750
6751 6751
@@ -6757,7 +6757,7 @@ index 2d62b6fbb07..0cafee249eb 100755
6757 # 6757 #
6758 # Check to make sure the static flag actually works. 6758 # Check to make sure the static flag actually works.
6759 # 6759 #
6760@@ -8383,7 +8891,8 @@ _LT_EOF 6760@@ -8381,7 +8889,8 @@ _LT_EOF
6761 allow_undefined_flag=unsupported 6761 allow_undefined_flag=unsupported
6762 always_export_symbols=no 6762 always_export_symbols=no
6763 enable_shared_with_static_runtimes=yes 6763 enable_shared_with_static_runtimes=yes
@@ -6767,7 +6767,7 @@ index 2d62b6fbb07..0cafee249eb 100755
6767 6767
6768 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then 6768 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
6769 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' 6769 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
6770@@ -8482,12 +8991,12 @@ _LT_EOF 6770@@ -8480,12 +8989,12 @@ _LT_EOF
6771 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' 6771 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
6772 hardcode_libdir_flag_spec= 6772 hardcode_libdir_flag_spec=
6773 hardcode_libdir_flag_spec_ld='-rpath $libdir' 6773 hardcode_libdir_flag_spec_ld='-rpath $libdir'
@@ -6782,7 +6782,7 @@ index 2d62b6fbb07..0cafee249eb 100755
6782 fi 6782 fi
6783 ;; 6783 ;;
6784 esac 6784 esac
6785@@ -8501,8 +9010,8 @@ _LT_EOF 6785@@ -8499,8 +9008,8 @@ _LT_EOF
6786 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' 6786 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
6787 wlarc= 6787 wlarc=
6788 else 6788 else
@@ -6793,7 +6793,7 @@ index 2d62b6fbb07..0cafee249eb 100755
6793 fi 6793 fi
6794 ;; 6794 ;;
6795 6795
6796@@ -8520,8 +9029,8 @@ _LT_EOF 6796@@ -8518,8 +9027,8 @@ _LT_EOF
6797 6797
6798 _LT_EOF 6798 _LT_EOF
6799 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 6799 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -6804,7 +6804,7 @@ index 2d62b6fbb07..0cafee249eb 100755
6804 else 6804 else
6805 ld_shlibs=no 6805 ld_shlibs=no
6806 fi 6806 fi
6807@@ -8567,8 +9076,8 @@ _LT_EOF 6807@@ -8565,8 +9074,8 @@ _LT_EOF
6808 6808
6809 *) 6809 *)
6810 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 6810 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -6815,7 +6815,7 @@ index 2d62b6fbb07..0cafee249eb 100755
6815 else 6815 else
6816 ld_shlibs=no 6816 ld_shlibs=no
6817 fi 6817 fi
6818@@ -8698,7 +9207,13 @@ _LT_EOF 6818@@ -8696,7 +9205,13 @@ _LT_EOF
6819 allow_undefined_flag='-berok' 6819 allow_undefined_flag='-berok'
6820 # Determine the default libpath from the value encoded in an 6820 # Determine the default libpath from the value encoded in an
6821 # empty executable. 6821 # empty executable.
@@ -6830,7 +6830,7 @@ index 2d62b6fbb07..0cafee249eb 100755
6830 /* end confdefs.h. */ 6830 /* end confdefs.h. */
6831 6831
6832 int 6832 int
6833@@ -8711,22 +9226,29 @@ main () 6833@@ -8709,22 +9224,29 @@ main ()
6834 _ACEOF 6834 _ACEOF
6835 if ac_fn_c_try_link "$LINENO"; then : 6835 if ac_fn_c_try_link "$LINENO"; then :
6836 6836
@@ -6873,7 +6873,7 @@ index 2d62b6fbb07..0cafee249eb 100755
6873 6873
6874 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 6874 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
6875 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" 6875 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"
6876@@ -8738,7 +9260,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 6876@@ -8736,7 +9258,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
6877 else 6877 else
6878 # Determine the default libpath from the value encoded in an 6878 # Determine the default libpath from the value encoded in an
6879 # empty executable. 6879 # empty executable.
@@ -6888,7 +6888,7 @@ index 2d62b6fbb07..0cafee249eb 100755
6888 /* end confdefs.h. */ 6888 /* end confdefs.h. */
6889 6889
6890 int 6890 int
6891@@ -8751,22 +9279,29 @@ main () 6891@@ -8749,22 +9277,29 @@ main ()
6892 _ACEOF 6892 _ACEOF
6893 if ac_fn_c_try_link "$LINENO"; then : 6893 if ac_fn_c_try_link "$LINENO"; then :
6894 6894
@@ -6931,7 +6931,7 @@ index 2d62b6fbb07..0cafee249eb 100755
6931 6931
6932 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 6932 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
6933 # Warning - without using the other run time loading flags, 6933 # Warning - without using the other run time loading flags,
6934@@ -8811,20 +9346,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 6934@@ -8809,20 +9344,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
6935 # Microsoft Visual C++. 6935 # Microsoft Visual C++.
6936 # hardcode_libdir_flag_spec is actually meaningless, as there is 6936 # hardcode_libdir_flag_spec is actually meaningless, as there is
6937 # no search path for DLLs. 6937 # no search path for DLLs.
@@ -7009,7 +7009,7 @@ index 2d62b6fbb07..0cafee249eb 100755
7009 ;; 7009 ;;
7010 7010
7011 darwin* | rhapsody*) 7011 darwin* | rhapsody*)
7012@@ -8885,7 +9463,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 7012@@ -8883,7 +9461,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
7013 7013
7014 # FreeBSD 3 and greater uses gcc -shared to do shared libraries. 7014 # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
7015 freebsd* | dragonfly*) 7015 freebsd* | dragonfly*)
@@ -7018,7 +7018,7 @@ index 2d62b6fbb07..0cafee249eb 100755
7018 hardcode_libdir_flag_spec='-R$libdir' 7018 hardcode_libdir_flag_spec='-R$libdir'
7019 hardcode_direct=yes 7019 hardcode_direct=yes
7020 hardcode_shlibpath_var=no 7020 hardcode_shlibpath_var=no
7021@@ -8893,7 +9471,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 7021@@ -8891,7 +9469,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
7022 7022
7023 hpux9*) 7023 hpux9*)
7024 if test "$GCC" = yes; then 7024 if test "$GCC" = yes; then
@@ -7027,7 +7027,7 @@ index 2d62b6fbb07..0cafee249eb 100755
7027 else 7027 else
7028 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' 7028 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'
7029 fi 7029 fi
7030@@ -8909,7 +9487,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 7030@@ -8907,7 +9485,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
7031 7031
7032 hpux10*) 7032 hpux10*)
7033 if test "$GCC" = yes && test "$with_gnu_ld" = no; then 7033 if test "$GCC" = yes && test "$with_gnu_ld" = no; then
@@ -7036,7 +7036,7 @@ index 2d62b6fbb07..0cafee249eb 100755
7036 else 7036 else
7037 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' 7037 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
7038 fi 7038 fi
7039@@ -8933,10 +9511,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 7039@@ -8931,10 +9509,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
7040 archive_cmds='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' 7040 archive_cmds='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
7041 ;; 7041 ;;
7042 ia64*) 7042 ia64*)
@@ -7049,7 +7049,7 @@ index 2d62b6fbb07..0cafee249eb 100755
7049 ;; 7049 ;;
7050 esac 7050 esac
7051 else 7051 else
7052@@ -9015,23 +9593,36 @@ fi 7052@@ -9013,23 +9591,36 @@ fi
7053 7053
7054 irix5* | irix6* | nonstopux*) 7054 irix5* | irix6* | nonstopux*)
7055 if test "$GCC" = yes; then 7055 if test "$GCC" = yes; then
@@ -7094,7 +7094,7 @@ index 2d62b6fbb07..0cafee249eb 100755
7094 else 7094 else
7095 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' 7095 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'
7096 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' 7096 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'
7097@@ -9116,7 +9707,7 @@ rm -f core conftest.err conftest.$ac_objext \ 7097@@ -9114,7 +9705,7 @@ rm -f core conftest.err conftest.$ac_objext \
7098 osf4* | osf5*) # as osf3* with the addition of -msym flag 7098 osf4* | osf5*) # as osf3* with the addition of -msym flag
7099 if test "$GCC" = yes; then 7099 if test "$GCC" = yes; then
7100 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' 7100 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
@@ -7103,7 +7103,7 @@ index 2d62b6fbb07..0cafee249eb 100755
7103 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' 7103 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
7104 else 7104 else
7105 allow_undefined_flag=' -expect_unresolved \*' 7105 allow_undefined_flag=' -expect_unresolved \*'
7106@@ -9135,9 +9726,9 @@ rm -f core conftest.err conftest.$ac_objext \ 7106@@ -9133,9 +9724,9 @@ rm -f core conftest.err conftest.$ac_objext \
7107 no_undefined_flag=' -z defs' 7107 no_undefined_flag=' -z defs'
7108 if test "$GCC" = yes; then 7108 if test "$GCC" = yes; then
7109 wlarc='${wl}' 7109 wlarc='${wl}'
@@ -7115,7 +7115,7 @@ index 2d62b6fbb07..0cafee249eb 100755
7115 else 7115 else
7116 case `$CC -V 2>&1` in 7116 case `$CC -V 2>&1` in
7117 *"Compilers 5.0"*) 7117 *"Compilers 5.0"*)
7118@@ -9713,8 +10304,9 @@ cygwin* | mingw* | pw32* | cegcc*) 7118@@ -9711,8 +10302,9 @@ cygwin* | mingw* | pw32* | cegcc*)
7119 need_version=no 7119 need_version=no
7120 need_lib_prefix=no 7120 need_lib_prefix=no
7121 7121
@@ -7127,7 +7127,7 @@ index 2d62b6fbb07..0cafee249eb 100755
7127 library_names_spec='$libname.dll.a' 7127 library_names_spec='$libname.dll.a'
7128 # DLL is installed to $(libdir)/../bin by postinstall_cmds 7128 # DLL is installed to $(libdir)/../bin by postinstall_cmds
7129 postinstall_cmds='base_file=`basename \${file}`~ 7129 postinstall_cmds='base_file=`basename \${file}`~
7130@@ -9747,13 +10339,71 @@ cygwin* | mingw* | pw32* | cegcc*) 7130@@ -9745,13 +10337,71 @@ cygwin* | mingw* | pw32* | cegcc*)
7131 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' 7131 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
7132 ;; 7132 ;;
7133 esac 7133 esac
@@ -7200,16 +7200,16 @@ index 2d62b6fbb07..0cafee249eb 100755
7200 # FIXME: first we should search . and the directory the executable is in 7200 # FIXME: first we should search . and the directory the executable is in
7201 shlibpath_var=PATH 7201 shlibpath_var=PATH
7202 ;; 7202 ;;
7203@@ -10655,7 +11305,7 @@ else 7203@@ -10653,7 +11303,7 @@ else
7204 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 7204 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
7205 lt_status=$lt_dlunknown 7205 lt_status=$lt_dlunknown
7206 cat > conftest.$ac_ext <<_LT_EOF 7206 cat > conftest.$ac_ext <<_LT_EOF
7207-#line 10658 "configure" 7207-#line 10656 "configure"
7208+#line $LINENO "configure" 7208+#line $LINENO "configure"
7209 #include "confdefs.h" 7209 #include "confdefs.h"
7210 7210
7211 #if HAVE_DLFCN_H 7211 #if HAVE_DLFCN_H
7212@@ -10699,10 +11349,10 @@ else 7212@@ -10697,10 +11347,10 @@ else
7213 /* When -fvisbility=hidden is used, assume the code has been annotated 7213 /* When -fvisbility=hidden is used, assume the code has been annotated
7214 correspondingly for the symbols needed. */ 7214 correspondingly for the symbols needed. */
7215 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 7215 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
@@ -7222,16 +7222,16 @@ index 2d62b6fbb07..0cafee249eb 100755
7222 int main () 7222 int main ()
7223 { 7223 {
7224 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 7224 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
7225@@ -10761,7 +11411,7 @@ else 7225@@ -10759,7 +11409,7 @@ else
7226 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 7226 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
7227 lt_status=$lt_dlunknown 7227 lt_status=$lt_dlunknown
7228 cat > conftest.$ac_ext <<_LT_EOF 7228 cat > conftest.$ac_ext <<_LT_EOF
7229-#line 10764 "configure" 7229-#line 10762 "configure"
7230+#line $LINENO "configure" 7230+#line $LINENO "configure"
7231 #include "confdefs.h" 7231 #include "confdefs.h"
7232 7232
7233 #if HAVE_DLFCN_H 7233 #if HAVE_DLFCN_H
7234@@ -10805,10 +11455,10 @@ else 7234@@ -10803,10 +11453,10 @@ else
7235 /* When -fvisbility=hidden is used, assume the code has been annotated 7235 /* When -fvisbility=hidden is used, assume the code has been annotated
7236 correspondingly for the symbols needed. */ 7236 correspondingly for the symbols needed. */
7237 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 7237 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
@@ -7244,7 +7244,7 @@ index 2d62b6fbb07..0cafee249eb 100755
7244 int main () 7244 int main ()
7245 { 7245 {
7246 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 7246 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
7247@@ -14728,13 +15378,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' 7247@@ -14726,13 +15376,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
7248 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' 7248 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
7249 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' 7249 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
7250 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' 7250 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
@@ -7265,7 +7265,7 @@ index 2d62b6fbb07..0cafee249eb 100755
7265 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' 7265 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
7266 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' 7266 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
7267 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' 7267 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
7268@@ -14749,14 +15406,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de 7268@@ -14747,14 +15404,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de
7269 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' 7269 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
7270 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' 7270 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
7271 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"`' 7271 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"`'
@@ -7284,7 +7284,7 @@ index 2d62b6fbb07..0cafee249eb 100755
7284 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' 7284 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
7285 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' 7285 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
7286 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' 7286 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
7287@@ -14789,12 +15449,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q 7287@@ -14787,12 +15447,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q
7288 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' 7288 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
7289 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' 7289 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
7290 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' 7290 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
@@ -7298,7 +7298,7 @@ index 2d62b6fbb07..0cafee249eb 100755
7298 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' 7298 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
7299 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' 7299 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
7300 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' 7300 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
7301@@ -14849,8 +15509,13 @@ reload_flag \ 7301@@ -14847,8 +15507,13 @@ reload_flag \
7302 OBJDUMP \ 7302 OBJDUMP \
7303 deplibs_check_method \ 7303 deplibs_check_method \
7304 file_magic_cmd \ 7304 file_magic_cmd \
@@ -7312,7 +7312,7 @@ index 2d62b6fbb07..0cafee249eb 100755
7312 STRIP \ 7312 STRIP \
7313 RANLIB \ 7313 RANLIB \
7314 CC \ 7314 CC \
7315@@ -14860,12 +15525,14 @@ lt_cv_sys_global_symbol_pipe \ 7315@@ -14858,12 +15523,14 @@ lt_cv_sys_global_symbol_pipe \
7316 lt_cv_sys_global_symbol_to_cdecl \ 7316 lt_cv_sys_global_symbol_to_cdecl \
7317 lt_cv_sys_global_symbol_to_c_name_address \ 7317 lt_cv_sys_global_symbol_to_c_name_address \
7318 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ 7318 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
@@ -7328,7 +7328,7 @@ index 2d62b6fbb07..0cafee249eb 100755
7328 DSYMUTIL \ 7328 DSYMUTIL \
7329 NMEDIT \ 7329 NMEDIT \
7330 LIPO \ 7330 LIPO \
7331@@ -14881,7 +15548,6 @@ no_undefined_flag \ 7331@@ -14879,7 +15546,6 @@ no_undefined_flag \
7332 hardcode_libdir_flag_spec \ 7332 hardcode_libdir_flag_spec \
7333 hardcode_libdir_flag_spec_ld \ 7333 hardcode_libdir_flag_spec_ld \
7334 hardcode_libdir_separator \ 7334 hardcode_libdir_separator \
@@ -7336,7 +7336,7 @@ index 2d62b6fbb07..0cafee249eb 100755
7336 exclude_expsyms \ 7336 exclude_expsyms \
7337 include_expsyms \ 7337 include_expsyms \
7338 file_list_spec \ 7338 file_list_spec \
7339@@ -14917,6 +15583,7 @@ module_cmds \ 7339@@ -14915,6 +15581,7 @@ module_cmds \
7340 module_expsym_cmds \ 7340 module_expsym_cmds \
7341 export_symbols_cmds \ 7341 export_symbols_cmds \
7342 prelink_cmds \ 7342 prelink_cmds \
@@ -7344,7 +7344,7 @@ index 2d62b6fbb07..0cafee249eb 100755
7344 postinstall_cmds \ 7344 postinstall_cmds \
7345 postuninstall_cmds \ 7345 postuninstall_cmds \
7346 finish_cmds \ 7346 finish_cmds \
7347@@ -15690,7 +16357,8 @@ $as_echo X"$file" | 7347@@ -15688,7 +16355,8 @@ $as_echo X"$file" |
7348 # NOTE: Changes made to this file will be lost: look at ltmain.sh. 7348 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
7349 # 7349 #
7350 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 7350 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
@@ -7354,7 +7354,7 @@ index 2d62b6fbb07..0cafee249eb 100755
7354 # Written by Gordon Matzigkeit, 1996 7354 # Written by Gordon Matzigkeit, 1996
7355 # 7355 #
7356 # This file is part of GNU Libtool. 7356 # This file is part of GNU Libtool.
7357@@ -15793,19 +16461,42 @@ SP2NL=$lt_lt_SP2NL 7357@@ -15791,19 +16459,42 @@ SP2NL=$lt_lt_SP2NL
7358 # turn newlines into spaces. 7358 # turn newlines into spaces.
7359 NL2SP=$lt_lt_NL2SP 7359 NL2SP=$lt_lt_NL2SP
7360 7360
@@ -7398,7 +7398,7 @@ index 2d62b6fbb07..0cafee249eb 100755
7398 # A symbol stripping program. 7398 # A symbol stripping program.
7399 STRIP=$lt_STRIP 7399 STRIP=$lt_STRIP
7400 7400
7401@@ -15835,6 +16526,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address 7401@@ -15833,6 +16524,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
7402 # Transform the output of nm in a C name address pair when lib prefix is needed. 7402 # Transform the output of nm in a C name address pair when lib prefix is needed.
7403 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix 7403 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
7404 7404
@@ -7411,7 +7411,7 @@ index 2d62b6fbb07..0cafee249eb 100755
7411 # The name of the directory that contains temporary libtool files. 7411 # The name of the directory that contains temporary libtool files.
7412 objdir=$objdir 7412 objdir=$objdir
7413 7413
7414@@ -15844,6 +16541,9 @@ MAGIC_CMD=$MAGIC_CMD 7414@@ -15842,6 +16539,9 @@ MAGIC_CMD=$MAGIC_CMD
7415 # Must we lock files when doing compilation? 7415 # Must we lock files when doing compilation?
7416 need_locks=$lt_need_locks 7416 need_locks=$lt_need_locks
7417 7417
@@ -7421,7 +7421,7 @@ index 2d62b6fbb07..0cafee249eb 100755
7421 # Tool to manipulate archived DWARF debug symbol files on Mac OS X. 7421 # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
7422 DSYMUTIL=$lt_DSYMUTIL 7422 DSYMUTIL=$lt_DSYMUTIL
7423 7423
7424@@ -15958,12 +16658,12 @@ with_gcc=$GCC 7424@@ -15956,12 +16656,12 @@ with_gcc=$GCC
7425 # Compiler flag to turn off builtin functions. 7425 # Compiler flag to turn off builtin functions.
7426 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag 7426 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
7427 7427
@@ -7437,7 +7437,7 @@ index 2d62b6fbb07..0cafee249eb 100755
7437 # Compiler flag to prevent dynamic linking. 7437 # Compiler flag to prevent dynamic linking.
7438 link_static_flag=$lt_lt_prog_compiler_static 7438 link_static_flag=$lt_lt_prog_compiler_static
7439 7439
7440@@ -16050,9 +16750,6 @@ inherit_rpath=$inherit_rpath 7440@@ -16048,9 +16748,6 @@ inherit_rpath=$inherit_rpath
7441 # Whether libtool must link a program against all its dependency libraries. 7441 # Whether libtool must link a program against all its dependency libraries.
7442 link_all_deplibs=$link_all_deplibs 7442 link_all_deplibs=$link_all_deplibs
7443 7443
@@ -7447,7 +7447,7 @@ index 2d62b6fbb07..0cafee249eb 100755
7447 # Set to "yes" if exported symbols are required. 7447 # Set to "yes" if exported symbols are required.
7448 always_export_symbols=$always_export_symbols 7448 always_export_symbols=$always_export_symbols
7449 7449
7450@@ -16068,6 +16765,9 @@ include_expsyms=$lt_include_expsyms 7450@@ -16066,6 +16763,9 @@ include_expsyms=$lt_include_expsyms
7451 # Commands necessary for linking programs (against libraries) with templates. 7451 # Commands necessary for linking programs (against libraries) with templates.
7452 prelink_cmds=$lt_prelink_cmds 7452 prelink_cmds=$lt_prelink_cmds
7453 7453
@@ -7457,7 +7457,7 @@ index 2d62b6fbb07..0cafee249eb 100755
7457 # Specify filename containing input files. 7457 # Specify filename containing input files.
7458 file_list_spec=$lt_file_list_spec 7458 file_list_spec=$lt_file_list_spec
7459 7459
7460@@ -16100,210 +16800,169 @@ ltmain="$ac_aux_dir/ltmain.sh" 7460@@ -16098,210 +16798,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
7461 # if finds mixed CR/LF and LF-only lines. Since sed operates in 7461 # if finds mixed CR/LF and LF-only lines. Since sed operates in
7462 # text mode, it properly converts lines to CR/LF. This bash problem 7462 # text mode, it properly converts lines to CR/LF. This bash problem
7463 # is reportedly fixed, but why not run on old versions too? 7463 # is reportedly fixed, but why not run on old versions too?
@@ -7832,10 +7832,10 @@ index 2d62b6fbb07..0cafee249eb 100755
7832 chmod +x "$ofile" 7832 chmod +x "$ofile"
7833 7833
7834diff --git a/gprofng/Makefile.in b/gprofng/Makefile.in 7834diff --git a/gprofng/Makefile.in b/gprofng/Makefile.in
7835index dbc868191b7..1ca6dd01f58 100644 7835index f770dac57c5..dbdfd96c5ff 100644
7836--- a/gprofng/Makefile.in 7836--- a/gprofng/Makefile.in
7837+++ b/gprofng/Makefile.in 7837+++ b/gprofng/Makefile.in
7838@@ -253,6 +253,7 @@ CXXFLAGS = @CXXFLAGS@ 7838@@ -254,6 +254,7 @@ CXXFLAGS = @CXXFLAGS@
7839 CYGPATH_W = @CYGPATH_W@ 7839 CYGPATH_W = @CYGPATH_W@
7840 DEFS = @DEFS@ 7840 DEFS = @DEFS@
7841 DEPDIR = @DEPDIR@ 7841 DEPDIR = @DEPDIR@
@@ -7843,7 +7843,7 @@ index dbc868191b7..1ca6dd01f58 100644
7843 DSYMUTIL = @DSYMUTIL@ 7843 DSYMUTIL = @DSYMUTIL@
7844 DUMPBIN = @DUMPBIN@ 7844 DUMPBIN = @DUMPBIN@
7845 ECHO_C = @ECHO_C@ 7845 ECHO_C = @ECHO_C@
7846@@ -289,6 +290,7 @@ LN_S = @LN_S@ 7846@@ -290,6 +291,7 @@ LN_S = @LN_S@
7847 LTLIBOBJS = @LTLIBOBJS@ 7847 LTLIBOBJS = @LTLIBOBJS@
7848 MAINT = @MAINT@ 7848 MAINT = @MAINT@
7849 MAKEINFO = @MAKEINFO@ 7849 MAKEINFO = @MAKEINFO@
@@ -7852,10 +7852,10 @@ index dbc868191b7..1ca6dd01f58 100644
7852 NM = @NM@ 7852 NM = @NM@
7853 NMEDIT = @NMEDIT@ 7853 NMEDIT = @NMEDIT@
7854diff --git a/gprofng/configure b/gprofng/configure 7854diff --git a/gprofng/configure b/gprofng/configure
7855index bdfa2281f2c..b6376eb3f77 100755 7855index 524dbe737ec..6aaed114536 100755
7856--- a/gprofng/configure 7856--- a/gprofng/configure
7857+++ b/gprofng/configure 7857+++ b/gprofng/configure
7858@@ -671,6 +671,8 @@ OTOOL 7858@@ -672,6 +672,8 @@ OTOOL
7859 LIPO 7859 LIPO
7860 NMEDIT 7860 NMEDIT
7861 DSYMUTIL 7861 DSYMUTIL
@@ -7864,7 +7864,7 @@ index bdfa2281f2c..b6376eb3f77 100755
7864 OBJDUMP 7864 OBJDUMP
7865 LN_S 7865 LN_S
7866 NM 7866 NM
7867@@ -801,6 +803,7 @@ enable_static 7867@@ -802,6 +804,7 @@ enable_static
7868 with_pic 7868 with_pic
7869 enable_fast_install 7869 enable_fast_install
7870 with_gnu_ld 7870 with_gnu_ld
@@ -7872,7 +7872,7 @@ index bdfa2281f2c..b6376eb3f77 100755
7872 enable_libtool_lock 7872 enable_libtool_lock
7873 enable_werror_always 7873 enable_werror_always
7874 enable_gprofng_tools 7874 enable_gprofng_tools
7875@@ -1464,6 +1467,8 @@ Optional Packages: 7875@@ -1465,6 +1468,8 @@ Optional Packages:
7876 --with-pic try to use only PIC/non-PIC objects [default=use 7876 --with-pic try to use only PIC/non-PIC objects [default=use
7877 both] 7877 both]
7878 --with-gnu-ld assume the C compiler uses GNU ld [default=no] 7878 --with-gnu-ld assume the C compiler uses GNU ld [default=no]
@@ -7881,7 +7881,7 @@ index bdfa2281f2c..b6376eb3f77 100755
7881 --with-jdk=PATH specify prefix directory for installed JDK. 7881 --with-jdk=PATH specify prefix directory for installed JDK.
7882 --with-system-zlib use installed libz 7882 --with-system-zlib use installed libz
7883 7883
7884@@ -6152,8 +6157,8 @@ esac 7884@@ -6153,8 +6158,8 @@ esac
7885 7885
7886 7886
7887 7887
@@ -7892,7 +7892,7 @@ index bdfa2281f2c..b6376eb3f77 100755
7892 7892
7893 7893
7894 7894
7895@@ -6193,7 +6198,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO 7895@@ -6194,7 +6199,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
7896 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 7896 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
7897 $as_echo_n "checking how to print strings... " >&6; } 7897 $as_echo_n "checking how to print strings... " >&6; }
7898 # Test print first, because it will be a builtin if present. 7898 # Test print first, because it will be a builtin if present.
@@ -7901,7 +7901,7 @@ index bdfa2281f2c..b6376eb3f77 100755
7901 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then 7901 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
7902 ECHO='print -r --' 7902 ECHO='print -r --'
7903 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then 7903 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
7904@@ -6886,8 +6891,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; 7904@@ -6887,8 +6892,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6;
7905 # Try some XSI features 7905 # Try some XSI features
7906 xsi_shell=no 7906 xsi_shell=no
7907 ( _lt_dummy="a/b/c" 7907 ( _lt_dummy="a/b/c"
@@ -7912,7 +7912,7 @@ index bdfa2281f2c..b6376eb3f77 100755
7912 && eval 'test $(( 1 + 1 )) -eq 2 \ 7912 && eval 'test $(( 1 + 1 )) -eq 2 \
7913 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ 7913 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
7914 && xsi_shell=yes 7914 && xsi_shell=yes
7915@@ -6936,6 +6941,80 @@ esac 7915@@ -6937,6 +6942,80 @@ esac
7916 7916
7917 7917
7918 7918
@@ -7993,7 +7993,7 @@ index bdfa2281f2c..b6376eb3f77 100755
7993 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 7993 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
7994 $as_echo_n "checking for $LD option to reload object files... " >&6; } 7994 $as_echo_n "checking for $LD option to reload object files... " >&6; }
7995 if ${lt_cv_ld_reload_flag+:} false; then : 7995 if ${lt_cv_ld_reload_flag+:} false; then :
7996@@ -6952,6 +7031,11 @@ case $reload_flag in 7996@@ -6953,6 +7032,11 @@ case $reload_flag in
7997 esac 7997 esac
7998 reload_cmds='$LD$reload_flag -o $output$reload_objs' 7998 reload_cmds='$LD$reload_flag -o $output$reload_objs'
7999 case $host_os in 7999 case $host_os in
@@ -8005,7 +8005,7 @@ index bdfa2281f2c..b6376eb3f77 100755
8005 darwin*) 8005 darwin*)
8006 if test "$GCC" = yes; then 8006 if test "$GCC" = yes; then
8007 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' 8007 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
8008@@ -7120,7 +7204,8 @@ mingw* | pw32*) 8008@@ -7121,7 +7205,8 @@ mingw* | pw32*)
8009 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' 8009 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
8010 lt_cv_file_magic_cmd='func_win32_libid' 8010 lt_cv_file_magic_cmd='func_win32_libid'
8011 else 8011 else
@@ -8015,7 +8015,7 @@ index bdfa2281f2c..b6376eb3f77 100755
8015 lt_cv_file_magic_cmd='$OBJDUMP -f' 8015 lt_cv_file_magic_cmd='$OBJDUMP -f'
8016 fi 8016 fi
8017 ;; 8017 ;;
8018@@ -7279,6 +7364,21 @@ esac 8018@@ -7280,6 +7365,21 @@ esac
8019 fi 8019 fi
8020 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 8020 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
8021 $as_echo "$lt_cv_deplibs_check_method" >&6; } 8021 $as_echo "$lt_cv_deplibs_check_method" >&6; }
@@ -8037,7 +8037,7 @@ index bdfa2281f2c..b6376eb3f77 100755
8037 file_magic_cmd=$lt_cv_file_magic_cmd 8037 file_magic_cmd=$lt_cv_file_magic_cmd
8038 deplibs_check_method=$lt_cv_deplibs_check_method 8038 deplibs_check_method=$lt_cv_deplibs_check_method
8039 test -z "$deplibs_check_method" && deplibs_check_method=unknown 8039 test -z "$deplibs_check_method" && deplibs_check_method=unknown
8040@@ -7294,6 +7394,157 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown 8040@@ -7295,6 +7395,157 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
8041 8041
8042 8042
8043 8043
@@ -8195,7 +8195,7 @@ index bdfa2281f2c..b6376eb3f77 100755
8195 plugin_option= 8195 plugin_option=
8196 plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll" 8196 plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll"
8197 for plugin in $plugin_names; do 8197 for plugin in $plugin_names; do
8198@@ -7308,8 +7559,10 @@ for plugin in $plugin_names; do 8198@@ -7309,8 +7560,10 @@ for plugin in $plugin_names; do
8199 done 8199 done
8200 8200
8201 if test -n "$ac_tool_prefix"; then 8201 if test -n "$ac_tool_prefix"; then
@@ -8208,7 +8208,7 @@ index bdfa2281f2c..b6376eb3f77 100755
8208 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 8208 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
8209 $as_echo_n "checking for $ac_word... " >&6; } 8209 $as_echo_n "checking for $ac_word... " >&6; }
8210 if ${ac_cv_prog_AR+:} false; then : 8210 if ${ac_cv_prog_AR+:} false; then :
8211@@ -7325,7 +7578,7 @@ do 8211@@ -7326,7 +7579,7 @@ do
8212 test -z "$as_dir" && as_dir=. 8212 test -z "$as_dir" && as_dir=.
8213 for ac_exec_ext in '' $ac_executable_extensions; do 8213 for ac_exec_ext in '' $ac_executable_extensions; do
8214 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 8214 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
@@ -8217,7 +8217,7 @@ index bdfa2281f2c..b6376eb3f77 100755
8217 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 8217 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
8218 break 2 8218 break 2
8219 fi 8219 fi
8220@@ -7345,11 +7598,15 @@ $as_echo "no" >&6; } 8220@@ -7346,11 +7599,15 @@ $as_echo "no" >&6; }
8221 fi 8221 fi
8222 8222
8223 8223
@@ -8236,7 +8236,7 @@ index bdfa2281f2c..b6376eb3f77 100755
8236 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 8236 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
8237 $as_echo_n "checking for $ac_word... " >&6; } 8237 $as_echo_n "checking for $ac_word... " >&6; }
8238 if ${ac_cv_prog_ac_ct_AR+:} false; then : 8238 if ${ac_cv_prog_ac_ct_AR+:} false; then :
8239@@ -7365,7 +7622,7 @@ do 8239@@ -7366,7 +7623,7 @@ do
8240 test -z "$as_dir" && as_dir=. 8240 test -z "$as_dir" && as_dir=.
8241 for ac_exec_ext in '' $ac_executable_extensions; do 8241 for ac_exec_ext in '' $ac_executable_extensions; do
8242 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 8242 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
@@ -8245,7 +8245,7 @@ index bdfa2281f2c..b6376eb3f77 100755
8245 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 8245 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
8246 break 2 8246 break 2
8247 fi 8247 fi
8248@@ -7384,6 +7641,10 @@ else 8248@@ -7385,6 +7642,10 @@ else
8249 $as_echo "no" >&6; } 8249 $as_echo "no" >&6; }
8250 fi 8250 fi
8251 8251
@@ -8256,7 +8256,7 @@ index bdfa2281f2c..b6376eb3f77 100755
8256 if test "x$ac_ct_AR" = x; then 8256 if test "x$ac_ct_AR" = x; then
8257 AR="false" 8257 AR="false"
8258 else 8258 else
8259@@ -7395,25 +7656,19 @@ ac_tool_warned=yes ;; 8259@@ -7396,25 +7657,19 @@ ac_tool_warned=yes ;;
8260 esac 8260 esac
8261 AR=$ac_ct_AR 8261 AR=$ac_ct_AR
8262 fi 8262 fi
@@ -8291,7 +8291,7 @@ index bdfa2281f2c..b6376eb3f77 100755
8291 8291
8292 8292
8293 8293
8294@@ -7425,6 +7680,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru 8294@@ -7426,6 +7681,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru
8295 8295
8296 8296
8297 8297
@@ -8356,7 +8356,7 @@ index bdfa2281f2c..b6376eb3f77 100755
8356 if test -n "$ac_tool_prefix"; then 8356 if test -n "$ac_tool_prefix"; then
8357 # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. 8357 # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
8358 set dummy ${ac_tool_prefix}strip; ac_word=$2 8358 set dummy ${ac_tool_prefix}strip; ac_word=$2
8359@@ -7764,8 +8077,8 @@ esac 8359@@ -7765,8 +8078,8 @@ esac
8360 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" 8360 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
8361 8361
8362 # Transform an extracted symbol line into symbol name and symbol address 8362 # Transform an extracted symbol line into symbol name and symbol address
@@ -8367,7 +8367,7 @@ index bdfa2281f2c..b6376eb3f77 100755
8367 8367
8368 # Handle CRLF in mingw tool chain 8368 # Handle CRLF in mingw tool chain
8369 opt_cr= 8369 opt_cr=
8370@@ -7801,6 +8114,7 @@ for ac_symprfx in "" "_"; do 8370@@ -7802,6 +8115,7 @@ for ac_symprfx in "" "_"; do
8371 else 8371 else
8372 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" 8372 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
8373 fi 8373 fi
@@ -8375,7 +8375,7 @@ index bdfa2281f2c..b6376eb3f77 100755
8375 8375
8376 # Check to see that the pipe works correctly. 8376 # Check to see that the pipe works correctly.
8377 pipe_works=no 8377 pipe_works=no
8378@@ -7842,6 +8156,18 @@ _LT_EOF 8378@@ -7843,6 +8157,18 @@ _LT_EOF
8379 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then 8379 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
8380 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then 8380 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
8381 cat <<_LT_EOF > conftest.$ac_ext 8381 cat <<_LT_EOF > conftest.$ac_ext
@@ -8394,7 +8394,7 @@ index bdfa2281f2c..b6376eb3f77 100755
8394 #ifdef __cplusplus 8394 #ifdef __cplusplus
8395 extern "C" { 8395 extern "C" {
8396 #endif 8396 #endif
8397@@ -7853,7 +8179,7 @@ _LT_EOF 8397@@ -7854,7 +8180,7 @@ _LT_EOF
8398 cat <<_LT_EOF >> conftest.$ac_ext 8398 cat <<_LT_EOF >> conftest.$ac_ext
8399 8399
8400 /* The mapping between symbol names and symbols. */ 8400 /* The mapping between symbol names and symbols. */
@@ -8403,7 +8403,7 @@ index bdfa2281f2c..b6376eb3f77 100755
8403 const char *name; 8403 const char *name;
8404 void *address; 8404 void *address;
8405 } 8405 }
8406@@ -7879,8 +8205,8 @@ static const void *lt_preloaded_setup() { 8406@@ -7880,8 +8206,8 @@ static const void *lt_preloaded_setup() {
8407 _LT_EOF 8407 _LT_EOF
8408 # Now try linking the two files. 8408 # Now try linking the two files.
8409 mv conftest.$ac_objext conftstm.$ac_objext 8409 mv conftest.$ac_objext conftstm.$ac_objext
@@ -8414,7 +8414,7 @@ index bdfa2281f2c..b6376eb3f77 100755
8414 LIBS="conftstm.$ac_objext" 8414 LIBS="conftstm.$ac_objext"
8415 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" 8415 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
8416 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 8416 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
8417@@ -7890,8 +8216,8 @@ _LT_EOF 8417@@ -7891,8 +8217,8 @@ _LT_EOF
8418 test $ac_status = 0; } && test -s conftest${ac_exeext}; then 8418 test $ac_status = 0; } && test -s conftest${ac_exeext}; then
8419 pipe_works=yes 8419 pipe_works=yes
8420 fi 8420 fi
@@ -8425,7 +8425,7 @@ index bdfa2281f2c..b6376eb3f77 100755
8425 else 8425 else
8426 echo "cannot find nm_test_func in $nlist" >&5 8426 echo "cannot find nm_test_func in $nlist" >&5
8427 fi 8427 fi
8428@@ -7928,6 +8254,14 @@ else 8428@@ -7929,6 +8255,14 @@ else
8429 $as_echo "ok" >&6; } 8429 $as_echo "ok" >&6; }
8430 fi 8430 fi
8431 8431
@@ -8440,7 +8440,7 @@ index bdfa2281f2c..b6376eb3f77 100755
8440 8440
8441 8441
8442 8442
8443@@ -7946,6 +8280,47 @@ fi 8443@@ -7947,6 +8281,47 @@ fi
8444 8444
8445 8445
8446 8446
@@ -8488,7 +8488,7 @@ index bdfa2281f2c..b6376eb3f77 100755
8488 8488
8489 8489
8490 8490
8491@@ -8155,6 +8530,123 @@ esac 8491@@ -8156,6 +8531,123 @@ esac
8492 8492
8493 need_locks="$enable_libtool_lock" 8493 need_locks="$enable_libtool_lock"
8494 8494
@@ -8612,7 +8612,7 @@ index bdfa2281f2c..b6376eb3f77 100755
8612 8612
8613 case $host_os in 8613 case $host_os in
8614 rhapsody* | darwin*) 8614 rhapsody* | darwin*)
8615@@ -8718,6 +9210,8 @@ _LT_EOF 8615@@ -8719,6 +9211,8 @@ _LT_EOF
8616 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 8616 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
8617 echo "$AR cru libconftest.a conftest.o" >&5 8617 echo "$AR cru libconftest.a conftest.o" >&5
8618 $AR cru libconftest.a conftest.o 2>&5 8618 $AR cru libconftest.a conftest.o 2>&5
@@ -8621,7 +8621,7 @@ index bdfa2281f2c..b6376eb3f77 100755
8621 cat > conftest.c << _LT_EOF 8621 cat > conftest.c << _LT_EOF
8622 int main() { return 0;} 8622 int main() { return 0;}
8623 _LT_EOF 8623 _LT_EOF
8624@@ -8788,6 +9282,16 @@ done 8624@@ -8789,6 +9283,16 @@ done
8625 8625
8626 8626
8627 8627
@@ -8638,7 +8638,7 @@ index bdfa2281f2c..b6376eb3f77 100755
8638 8638
8639 8639
8640 # Set options 8640 # Set options
8641@@ -9273,8 +9777,6 @@ fi 8641@@ -9274,8 +9778,6 @@ fi
8642 lt_prog_compiler_pic= 8642 lt_prog_compiler_pic=
8643 lt_prog_compiler_static= 8643 lt_prog_compiler_static=
8644 8644
@@ -8647,7 +8647,7 @@ index bdfa2281f2c..b6376eb3f77 100755
8647 8647
8648 if test "$GCC" = yes; then 8648 if test "$GCC" = yes; then
8649 lt_prog_compiler_wl='-Wl,' 8649 lt_prog_compiler_wl='-Wl,'
8650@@ -9440,6 +9942,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 8650@@ -9441,6 +9943,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
8651 lt_prog_compiler_pic='--shared' 8651 lt_prog_compiler_pic='--shared'
8652 lt_prog_compiler_static='--static' 8652 lt_prog_compiler_static='--static'
8653 ;; 8653 ;;
@@ -8660,7 +8660,7 @@ index bdfa2281f2c..b6376eb3f77 100755
8660 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) 8660 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
8661 # Portland Group compilers (*not* the Pentium gcc compiler, 8661 # Portland Group compilers (*not* the Pentium gcc compiler,
8662 # which looks to be a dead project) 8662 # which looks to be a dead project)
8663@@ -9502,7 +10010,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 8663@@ -9503,7 +10011,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
8664 lt_prog_compiler_pic='-KPIC' 8664 lt_prog_compiler_pic='-KPIC'
8665 lt_prog_compiler_static='-Bstatic' 8665 lt_prog_compiler_static='-Bstatic'
8666 case $cc_basename in 8666 case $cc_basename in
@@ -8669,7 +8669,7 @@ index bdfa2281f2c..b6376eb3f77 100755
8669 lt_prog_compiler_wl='-Qoption ld ';; 8669 lt_prog_compiler_wl='-Qoption ld ';;
8670 *) 8670 *)
8671 lt_prog_compiler_wl='-Wl,';; 8671 lt_prog_compiler_wl='-Wl,';;
8672@@ -9559,13 +10067,17 @@ case $host_os in 8672@@ -9560,13 +10068,17 @@ case $host_os in
8673 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" 8673 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
8674 ;; 8674 ;;
8675 esac 8675 esac
@@ -8693,7 +8693,7 @@ index bdfa2281f2c..b6376eb3f77 100755
8693 8693
8694 # 8694 #
8695 # Check to make sure the PIC flag actually works. 8695 # Check to make sure the PIC flag actually works.
8696@@ -9626,6 +10138,11 @@ fi 8696@@ -9627,6 +10139,11 @@ fi
8697 8697
8698 8698
8699 8699
@@ -8705,7 +8705,7 @@ index bdfa2281f2c..b6376eb3f77 100755
8705 # 8705 #
8706 # Check to make sure the static flag actually works. 8706 # Check to make sure the static flag actually works.
8707 # 8707 #
8708@@ -9976,7 +10493,8 @@ _LT_EOF 8708@@ -9977,7 +10494,8 @@ _LT_EOF
8709 allow_undefined_flag=unsupported 8709 allow_undefined_flag=unsupported
8710 always_export_symbols=no 8710 always_export_symbols=no
8711 enable_shared_with_static_runtimes=yes 8711 enable_shared_with_static_runtimes=yes
@@ -8715,7 +8715,7 @@ index bdfa2281f2c..b6376eb3f77 100755
8715 8715
8716 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then 8716 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
8717 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' 8717 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
8718@@ -10075,12 +10593,12 @@ _LT_EOF 8718@@ -10076,12 +10594,12 @@ _LT_EOF
8719 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' 8719 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
8720 hardcode_libdir_flag_spec= 8720 hardcode_libdir_flag_spec=
8721 hardcode_libdir_flag_spec_ld='-rpath $libdir' 8721 hardcode_libdir_flag_spec_ld='-rpath $libdir'
@@ -8730,7 +8730,7 @@ index bdfa2281f2c..b6376eb3f77 100755
8730 fi 8730 fi
8731 ;; 8731 ;;
8732 esac 8732 esac
8733@@ -10094,8 +10612,8 @@ _LT_EOF 8733@@ -10095,8 +10613,8 @@ _LT_EOF
8734 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' 8734 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
8735 wlarc= 8735 wlarc=
8736 else 8736 else
@@ -8741,7 +8741,7 @@ index bdfa2281f2c..b6376eb3f77 100755
8741 fi 8741 fi
8742 ;; 8742 ;;
8743 8743
8744@@ -10113,8 +10631,8 @@ _LT_EOF 8744@@ -10114,8 +10632,8 @@ _LT_EOF
8745 8745
8746 _LT_EOF 8746 _LT_EOF
8747 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 8747 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -8752,7 +8752,7 @@ index bdfa2281f2c..b6376eb3f77 100755
8752 else 8752 else
8753 ld_shlibs=no 8753 ld_shlibs=no
8754 fi 8754 fi
8755@@ -10160,8 +10678,8 @@ _LT_EOF 8755@@ -10161,8 +10679,8 @@ _LT_EOF
8756 8756
8757 *) 8757 *)
8758 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 8758 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -8763,7 +8763,7 @@ index bdfa2281f2c..b6376eb3f77 100755
8763 else 8763 else
8764 ld_shlibs=no 8764 ld_shlibs=no
8765 fi 8765 fi
8766@@ -10291,7 +10809,13 @@ _LT_EOF 8766@@ -10292,7 +10810,13 @@ _LT_EOF
8767 allow_undefined_flag='-berok' 8767 allow_undefined_flag='-berok'
8768 # Determine the default libpath from the value encoded in an 8768 # Determine the default libpath from the value encoded in an
8769 # empty executable. 8769 # empty executable.
@@ -8778,7 +8778,7 @@ index bdfa2281f2c..b6376eb3f77 100755
8778 /* end confdefs.h. */ 8778 /* end confdefs.h. */
8779 8779
8780 int 8780 int
8781@@ -10304,22 +10828,29 @@ main () 8781@@ -10305,22 +10829,29 @@ main ()
8782 _ACEOF 8782 _ACEOF
8783 if ac_fn_c_try_link "$LINENO"; then : 8783 if ac_fn_c_try_link "$LINENO"; then :
8784 8784
@@ -8821,7 +8821,7 @@ index bdfa2281f2c..b6376eb3f77 100755
8821 8821
8822 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 8822 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
8823 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" 8823 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"
8824@@ -10331,7 +10862,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 8824@@ -10332,7 +10863,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
8825 else 8825 else
8826 # Determine the default libpath from the value encoded in an 8826 # Determine the default libpath from the value encoded in an
8827 # empty executable. 8827 # empty executable.
@@ -8836,7 +8836,7 @@ index bdfa2281f2c..b6376eb3f77 100755
8836 /* end confdefs.h. */ 8836 /* end confdefs.h. */
8837 8837
8838 int 8838 int
8839@@ -10344,22 +10881,29 @@ main () 8839@@ -10345,22 +10882,29 @@ main ()
8840 _ACEOF 8840 _ACEOF
8841 if ac_fn_c_try_link "$LINENO"; then : 8841 if ac_fn_c_try_link "$LINENO"; then :
8842 8842
@@ -8879,7 +8879,7 @@ index bdfa2281f2c..b6376eb3f77 100755
8879 8879
8880 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 8880 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
8881 # Warning - without using the other run time loading flags, 8881 # Warning - without using the other run time loading flags,
8882@@ -10404,20 +10948,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 8882@@ -10405,20 +10949,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
8883 # Microsoft Visual C++. 8883 # Microsoft Visual C++.
8884 # hardcode_libdir_flag_spec is actually meaningless, as there is 8884 # hardcode_libdir_flag_spec is actually meaningless, as there is
8885 # no search path for DLLs. 8885 # no search path for DLLs.
@@ -8957,7 +8957,7 @@ index bdfa2281f2c..b6376eb3f77 100755
8957 ;; 8957 ;;
8958 8958
8959 darwin* | rhapsody*) 8959 darwin* | rhapsody*)
8960@@ -10478,7 +11065,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 8960@@ -10479,7 +11066,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
8961 8961
8962 # FreeBSD 3 and greater uses gcc -shared to do shared libraries. 8962 # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
8963 freebsd* | dragonfly*) 8963 freebsd* | dragonfly*)
@@ -8966,7 +8966,7 @@ index bdfa2281f2c..b6376eb3f77 100755
8966 hardcode_libdir_flag_spec='-R$libdir' 8966 hardcode_libdir_flag_spec='-R$libdir'
8967 hardcode_direct=yes 8967 hardcode_direct=yes
8968 hardcode_shlibpath_var=no 8968 hardcode_shlibpath_var=no
8969@@ -10486,7 +11073,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 8969@@ -10487,7 +11074,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
8970 8970
8971 hpux9*) 8971 hpux9*)
8972 if test "$GCC" = yes; then 8972 if test "$GCC" = yes; then
@@ -8975,7 +8975,7 @@ index bdfa2281f2c..b6376eb3f77 100755
8975 else 8975 else
8976 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' 8976 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'
8977 fi 8977 fi
8978@@ -10502,7 +11089,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 8978@@ -10503,7 +11090,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
8979 8979
8980 hpux10*) 8980 hpux10*)
8981 if test "$GCC" = yes && test "$with_gnu_ld" = no; then 8981 if test "$GCC" = yes && test "$with_gnu_ld" = no; then
@@ -8984,7 +8984,7 @@ index bdfa2281f2c..b6376eb3f77 100755
8984 else 8984 else
8985 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' 8985 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
8986 fi 8986 fi
8987@@ -10526,10 +11113,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 8987@@ -10527,10 +11114,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
8988 archive_cmds='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' 8988 archive_cmds='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
8989 ;; 8989 ;;
8990 ia64*) 8990 ia64*)
@@ -8997,7 +8997,7 @@ index bdfa2281f2c..b6376eb3f77 100755
8997 ;; 8997 ;;
8998 esac 8998 esac
8999 else 8999 else
9000@@ -10608,23 +11195,36 @@ fi 9000@@ -10609,23 +11196,36 @@ fi
9001 9001
9002 irix5* | irix6* | nonstopux*) 9002 irix5* | irix6* | nonstopux*)
9003 if test "$GCC" = yes; then 9003 if test "$GCC" = yes; then
@@ -9042,7 +9042,7 @@ index bdfa2281f2c..b6376eb3f77 100755
9042 else 9042 else
9043 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' 9043 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'
9044 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' 9044 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'
9045@@ -10709,7 +11309,7 @@ rm -f core conftest.err conftest.$ac_objext \ 9045@@ -10710,7 +11310,7 @@ rm -f core conftest.err conftest.$ac_objext \
9046 osf4* | osf5*) # as osf3* with the addition of -msym flag 9046 osf4* | osf5*) # as osf3* with the addition of -msym flag
9047 if test "$GCC" = yes; then 9047 if test "$GCC" = yes; then
9048 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' 9048 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
@@ -9051,7 +9051,7 @@ index bdfa2281f2c..b6376eb3f77 100755
9051 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' 9051 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
9052 else 9052 else
9053 allow_undefined_flag=' -expect_unresolved \*' 9053 allow_undefined_flag=' -expect_unresolved \*'
9054@@ -10728,9 +11328,9 @@ rm -f core conftest.err conftest.$ac_objext \ 9054@@ -10729,9 +11329,9 @@ rm -f core conftest.err conftest.$ac_objext \
9055 no_undefined_flag=' -z defs' 9055 no_undefined_flag=' -z defs'
9056 if test "$GCC" = yes; then 9056 if test "$GCC" = yes; then
9057 wlarc='${wl}' 9057 wlarc='${wl}'
@@ -9063,7 +9063,7 @@ index bdfa2281f2c..b6376eb3f77 100755
9063 else 9063 else
9064 case `$CC -V 2>&1` in 9064 case `$CC -V 2>&1` in
9065 *"Compilers 5.0"*) 9065 *"Compilers 5.0"*)
9066@@ -11306,8 +11906,9 @@ cygwin* | mingw* | pw32* | cegcc*) 9066@@ -11307,8 +11907,9 @@ cygwin* | mingw* | pw32* | cegcc*)
9067 need_version=no 9067 need_version=no
9068 need_lib_prefix=no 9068 need_lib_prefix=no
9069 9069
@@ -9075,7 +9075,7 @@ index bdfa2281f2c..b6376eb3f77 100755
9075 library_names_spec='$libname.dll.a' 9075 library_names_spec='$libname.dll.a'
9076 # DLL is installed to $(libdir)/../bin by postinstall_cmds 9076 # DLL is installed to $(libdir)/../bin by postinstall_cmds
9077 postinstall_cmds='base_file=`basename \${file}`~ 9077 postinstall_cmds='base_file=`basename \${file}`~
9078@@ -11340,13 +11941,71 @@ cygwin* | mingw* | pw32* | cegcc*) 9078@@ -11341,13 +11942,71 @@ cygwin* | mingw* | pw32* | cegcc*)
9079 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' 9079 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
9080 ;; 9080 ;;
9081 esac 9081 esac
@@ -9148,16 +9148,16 @@ index bdfa2281f2c..b6376eb3f77 100755
9148 # FIXME: first we should search . and the directory the executable is in 9148 # FIXME: first we should search . and the directory the executable is in
9149 shlibpath_var=PATH 9149 shlibpath_var=PATH
9150 ;; 9150 ;;
9151@@ -12248,7 +12907,7 @@ else 9151@@ -12249,7 +12908,7 @@ else
9152 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 9152 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
9153 lt_status=$lt_dlunknown 9153 lt_status=$lt_dlunknown
9154 cat > conftest.$ac_ext <<_LT_EOF 9154 cat > conftest.$ac_ext <<_LT_EOF
9155-#line 12251 "configure" 9155-#line 12252 "configure"
9156+#line $LINENO "configure" 9156+#line $LINENO "configure"
9157 #include "confdefs.h" 9157 #include "confdefs.h"
9158 9158
9159 #if HAVE_DLFCN_H 9159 #if HAVE_DLFCN_H
9160@@ -12292,10 +12951,10 @@ else 9160@@ -12293,10 +12952,10 @@ else
9161 /* When -fvisbility=hidden is used, assume the code has been annotated 9161 /* When -fvisbility=hidden is used, assume the code has been annotated
9162 correspondingly for the symbols needed. */ 9162 correspondingly for the symbols needed. */
9163 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 9163 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
@@ -9170,16 +9170,16 @@ index bdfa2281f2c..b6376eb3f77 100755
9170 int main () 9170 int main ()
9171 { 9171 {
9172 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 9172 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
9173@@ -12354,7 +13013,7 @@ else 9173@@ -12355,7 +13014,7 @@ else
9174 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 9174 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
9175 lt_status=$lt_dlunknown 9175 lt_status=$lt_dlunknown
9176 cat > conftest.$ac_ext <<_LT_EOF 9176 cat > conftest.$ac_ext <<_LT_EOF
9177-#line 12357 "configure" 9177-#line 12358 "configure"
9178+#line $LINENO "configure" 9178+#line $LINENO "configure"
9179 #include "confdefs.h" 9179 #include "confdefs.h"
9180 9180
9181 #if HAVE_DLFCN_H 9181 #if HAVE_DLFCN_H
9182@@ -12398,10 +13057,10 @@ else 9182@@ -12399,10 +13058,10 @@ else
9183 /* When -fvisbility=hidden is used, assume the code has been annotated 9183 /* When -fvisbility=hidden is used, assume the code has been annotated
9184 correspondingly for the symbols needed. */ 9184 correspondingly for the symbols needed. */
9185 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 9185 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
@@ -9192,7 +9192,7 @@ index bdfa2281f2c..b6376eb3f77 100755
9192 int main () 9192 int main ()
9193 { 9193 {
9194 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 9194 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
9195@@ -12793,6 +13452,7 @@ $RM -r conftest* 9195@@ -12794,6 +13453,7 @@ $RM -r conftest*
9196 9196
9197 # Allow CC to be a program name with arguments. 9197 # Allow CC to be a program name with arguments.
9198 lt_save_CC=$CC 9198 lt_save_CC=$CC
@@ -9200,7 +9200,7 @@ index bdfa2281f2c..b6376eb3f77 100755
9200 lt_save_LD=$LD 9200 lt_save_LD=$LD
9201 lt_save_GCC=$GCC 9201 lt_save_GCC=$GCC
9202 GCC=$GXX 9202 GCC=$GXX
9203@@ -12810,6 +13470,7 @@ $RM -r conftest* 9203@@ -12811,6 +13471,7 @@ $RM -r conftest*
9204 fi 9204 fi
9205 test -z "${LDCXX+set}" || LD=$LDCXX 9205 test -z "${LDCXX+set}" || LD=$LDCXX
9206 CC=${CXX-"c++"} 9206 CC=${CXX-"c++"}
@@ -9208,7 +9208,7 @@ index bdfa2281f2c..b6376eb3f77 100755
9208 compiler=$CC 9208 compiler=$CC
9209 compiler_CXX=$CC 9209 compiler_CXX=$CC
9210 for cc_temp in $compiler""; do 9210 for cc_temp in $compiler""; do
9211@@ -13092,7 +13753,13 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie 9211@@ -13093,7 +13754,13 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
9212 allow_undefined_flag_CXX='-berok' 9212 allow_undefined_flag_CXX='-berok'
9213 # Determine the default libpath from the value encoded in an empty 9213 # Determine the default libpath from the value encoded in an empty
9214 # executable. 9214 # executable.
@@ -9223,7 +9223,7 @@ index bdfa2281f2c..b6376eb3f77 100755
9223 /* end confdefs.h. */ 9223 /* end confdefs.h. */
9224 9224
9225 int 9225 int
9226@@ -13105,22 +13772,29 @@ main () 9226@@ -13106,22 +13773,29 @@ main ()
9227 _ACEOF 9227 _ACEOF
9228 if ac_fn_cxx_try_link "$LINENO"; then : 9228 if ac_fn_cxx_try_link "$LINENO"; then :
9229 9229
@@ -9266,7 +9266,7 @@ index bdfa2281f2c..b6376eb3f77 100755
9266 9266
9267 hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" 9267 hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
9268 9268
9269@@ -13133,7 +13807,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 9269@@ -13134,7 +13808,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
9270 else 9270 else
9271 # Determine the default libpath from the value encoded in an 9271 # Determine the default libpath from the value encoded in an
9272 # empty executable. 9272 # empty executable.
@@ -9281,7 +9281,7 @@ index bdfa2281f2c..b6376eb3f77 100755
9281 /* end confdefs.h. */ 9281 /* end confdefs.h. */
9282 9282
9283 int 9283 int
9284@@ -13146,22 +13826,29 @@ main () 9284@@ -13147,22 +13827,29 @@ main ()
9285 _ACEOF 9285 _ACEOF
9286 if ac_fn_cxx_try_link "$LINENO"; then : 9286 if ac_fn_cxx_try_link "$LINENO"; then :
9287 9287
@@ -9324,7 +9324,7 @@ index bdfa2281f2c..b6376eb3f77 100755
9324 9324
9325 hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" 9325 hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
9326 # Warning - without using the other run time loading flags, 9326 # Warning - without using the other run time loading flags,
9327@@ -13204,29 +13891,75 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 9327@@ -13205,29 +13892,75 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
9328 ;; 9328 ;;
9329 9329
9330 cygwin* | mingw* | pw32* | cegcc*) 9330 cygwin* | mingw* | pw32* | cegcc*)
@@ -9423,7 +9423,7 @@ index bdfa2281f2c..b6376eb3f77 100755
9423 darwin* | rhapsody*) 9423 darwin* | rhapsody*)
9424 9424
9425 9425
9426@@ -13332,7 +14065,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 9426@@ -13333,7 +14066,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
9427 ;; 9427 ;;
9428 *) 9428 *)
9429 if test "$GXX" = yes; then 9429 if test "$GXX" = yes; then
@@ -9432,7 +9432,7 @@ index bdfa2281f2c..b6376eb3f77 100755
9432 else 9432 else
9433 # FIXME: insert proper C++ library support 9433 # FIXME: insert proper C++ library support
9434 ld_shlibs_CXX=no 9434 ld_shlibs_CXX=no
9435@@ -13403,10 +14136,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 9435@@ -13404,10 +14137,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
9436 archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' 9436 archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
9437 ;; 9437 ;;
9438 ia64*) 9438 ia64*)
@@ -9445,7 +9445,7 @@ index bdfa2281f2c..b6376eb3f77 100755
9445 ;; 9445 ;;
9446 esac 9446 esac
9447 fi 9447 fi
9448@@ -13447,9 +14180,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 9448@@ -13448,9 +14181,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
9449 *) 9449 *)
9450 if test "$GXX" = yes; then 9450 if test "$GXX" = yes; then
9451 if test "$with_gnu_ld" = no; then 9451 if test "$with_gnu_ld" = no; then
@@ -9457,7 +9457,7 @@ index bdfa2281f2c..b6376eb3f77 100755
9457 fi 9457 fi
9458 fi 9458 fi
9459 link_all_deplibs_CXX=yes 9459 link_all_deplibs_CXX=yes
9460@@ -13727,7 +14460,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 9460@@ -13728,7 +14461,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
9461 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' 9461 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'
9462 ;; 9462 ;;
9463 *) 9463 *)
@@ -9466,7 +9466,7 @@ index bdfa2281f2c..b6376eb3f77 100755
9466 ;; 9466 ;;
9467 esac 9467 esac
9468 9468
9469@@ -13773,7 +14506,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 9469@@ -13774,7 +14507,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
9470 9470
9471 solaris*) 9471 solaris*)
9472 case $cc_basename in 9472 case $cc_basename in
@@ -9475,7 +9475,7 @@ index bdfa2281f2c..b6376eb3f77 100755
9475 # Sun C++ 4.2, 5.x and Centerline C++ 9475 # Sun C++ 4.2, 5.x and Centerline C++
9476 archive_cmds_need_lc_CXX=yes 9476 archive_cmds_need_lc_CXX=yes
9477 no_undefined_flag_CXX=' -zdefs' 9477 no_undefined_flag_CXX=' -zdefs'
9478@@ -13814,9 +14547,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 9478@@ -13815,9 +14548,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
9479 if test "$GXX" = yes && test "$with_gnu_ld" = no; then 9479 if test "$GXX" = yes && test "$with_gnu_ld" = no; then
9480 no_undefined_flag_CXX=' ${wl}-z ${wl}defs' 9480 no_undefined_flag_CXX=' ${wl}-z ${wl}defs'
9481 if $CC --version | $GREP -v '^2\.7' > /dev/null; then 9481 if $CC --version | $GREP -v '^2\.7' > /dev/null; then
@@ -9487,7 +9487,7 @@ index bdfa2281f2c..b6376eb3f77 100755
9487 9487
9488 # Commands to make compiler produce verbose output that lists 9488 # Commands to make compiler produce verbose output that lists
9489 # what "hidden" libraries, object files and flags are used when 9489 # what "hidden" libraries, object files and flags are used when
9490@@ -13952,6 +14685,13 @@ private: 9490@@ -13953,6 +14686,13 @@ private:
9491 }; 9491 };
9492 _LT_EOF 9492 _LT_EOF
9493 9493
@@ -9501,7 +9501,7 @@ index bdfa2281f2c..b6376eb3f77 100755
9501 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 9501 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
9502 (eval $ac_compile) 2>&5 9502 (eval $ac_compile) 2>&5
9503 ac_status=$? 9503 ac_status=$?
9504@@ -13965,7 +14705,7 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 9504@@ -13966,7 +14706,7 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
9505 pre_test_object_deps_done=no 9505 pre_test_object_deps_done=no
9506 9506
9507 for p in `eval "$output_verbose_link_cmd"`; do 9507 for p in `eval "$output_verbose_link_cmd"`; do
@@ -9510,7 +9510,7 @@ index bdfa2281f2c..b6376eb3f77 100755
9510 9510
9511 -L* | -R* | -l*) 9511 -L* | -R* | -l*)
9512 # Some compilers place space between "-{L,R}" and the path. 9512 # Some compilers place space between "-{L,R}" and the path.
9513@@ -13974,13 +14714,22 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 9513@@ -13975,13 +14715,22 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
9514 test $p = "-R"; then 9514 test $p = "-R"; then
9515 prev=$p 9515 prev=$p
9516 continue 9516 continue
@@ -9537,7 +9537,7 @@ index bdfa2281f2c..b6376eb3f77 100755
9537 # Internal compiler library paths should come after those 9537 # Internal compiler library paths should come after those
9538 # provided the user. The postdeps already come after the 9538 # provided the user. The postdeps already come after the
9539 # user supplied libs so there is no need to process them. 9539 # user supplied libs so there is no need to process them.
9540@@ -14000,8 +14749,10 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 9540@@ -14001,8 +14750,10 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
9541 postdeps_CXX="${postdeps_CXX} ${prev}${p}" 9541 postdeps_CXX="${postdeps_CXX} ${prev}${p}"
9542 fi 9542 fi
9543 fi 9543 fi
@@ -9548,7 +9548,7 @@ index bdfa2281f2c..b6376eb3f77 100755
9548 *.$objext) 9548 *.$objext)
9549 # This assumes that the test object file only shows up 9549 # This assumes that the test object file only shows up
9550 # once in the compiler output. 9550 # once in the compiler output.
9551@@ -14037,6 +14788,7 @@ else 9551@@ -14038,6 +14789,7 @@ else
9552 fi 9552 fi
9553 9553
9554 $RM -f confest.$objext 9554 $RM -f confest.$objext
@@ -9556,7 +9556,7 @@ index bdfa2281f2c..b6376eb3f77 100755
9556 9556
9557 # PORTME: override above test on systems where it is broken 9557 # PORTME: override above test on systems where it is broken
9558 case $host_os in 9558 case $host_os in
9559@@ -14072,7 +14824,7 @@ linux*) 9559@@ -14073,7 +14825,7 @@ linux*)
9560 9560
9561 solaris*) 9561 solaris*)
9562 case $cc_basename in 9562 case $cc_basename in
@@ -9565,7 +9565,7 @@ index bdfa2281f2c..b6376eb3f77 100755
9565 # The more standards-conforming stlport4 library is 9565 # The more standards-conforming stlport4 library is
9566 # incompatible with the Cstd library. Avoid specifying 9566 # incompatible with the Cstd library. Avoid specifying
9567 # it if it's in CXXFLAGS. Ignore libCrun as 9567 # it if it's in CXXFLAGS. Ignore libCrun as
9568@@ -14137,8 +14889,6 @@ fi 9568@@ -14138,8 +14890,6 @@ fi
9569 lt_prog_compiler_pic_CXX= 9569 lt_prog_compiler_pic_CXX=
9570 lt_prog_compiler_static_CXX= 9570 lt_prog_compiler_static_CXX=
9571 9571
@@ -9574,7 +9574,7 @@ index bdfa2281f2c..b6376eb3f77 100755
9574 9574
9575 # C++ specific cases for pic, static, wl, etc. 9575 # C++ specific cases for pic, static, wl, etc.
9576 if test "$GXX" = yes; then 9576 if test "$GXX" = yes; then
9577@@ -14243,6 +14993,11 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 9577@@ -14244,6 +14994,11 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
9578 ;; 9578 ;;
9579 esac 9579 esac
9580 ;; 9580 ;;
@@ -9586,7 +9586,7 @@ index bdfa2281f2c..b6376eb3f77 100755
9586 dgux*) 9586 dgux*)
9587 case $cc_basename in 9587 case $cc_basename in
9588 ec++*) 9588 ec++*)
9589@@ -14395,7 +15150,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 9589@@ -14396,7 +15151,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
9590 ;; 9590 ;;
9591 solaris*) 9591 solaris*)
9592 case $cc_basename in 9592 case $cc_basename in
@@ -9595,7 +9595,7 @@ index bdfa2281f2c..b6376eb3f77 100755
9595 # Sun C++ 4.2, 5.x and Centerline C++ 9595 # Sun C++ 4.2, 5.x and Centerline C++
9596 lt_prog_compiler_pic_CXX='-KPIC' 9596 lt_prog_compiler_pic_CXX='-KPIC'
9597 lt_prog_compiler_static_CXX='-Bstatic' 9597 lt_prog_compiler_static_CXX='-Bstatic'
9598@@ -14460,10 +15215,17 @@ case $host_os in 9598@@ -14461,10 +15216,17 @@ case $host_os in
9599 lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC" 9599 lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC"
9600 ;; 9600 ;;
9601 esac 9601 esac
@@ -9616,7 +9616,7 @@ index bdfa2281f2c..b6376eb3f77 100755
9616 9616
9617 # 9617 #
9618 # Check to make sure the PIC flag actually works. 9618 # Check to make sure the PIC flag actually works.
9619@@ -14521,6 +15283,8 @@ fi 9619@@ -14522,6 +15284,8 @@ fi
9620 9620
9621 9621
9622 9622
@@ -9625,7 +9625,7 @@ index bdfa2281f2c..b6376eb3f77 100755
9625 # 9625 #
9626 # Check to make sure the static flag actually works. 9626 # Check to make sure the static flag actually works.
9627 # 9627 #
9628@@ -14698,6 +15462,7 @@ fi 9628@@ -14699,6 +15463,7 @@ fi
9629 $as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } 9629 $as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
9630 9630
9631 export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' 9631 export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
@@ -9633,7 +9633,7 @@ index bdfa2281f2c..b6376eb3f77 100755
9633 case $host_os in 9633 case $host_os in
9634 aix[4-9]*) 9634 aix[4-9]*)
9635 # If we're using GNU nm, then we don't want the "-C" option. 9635 # If we're using GNU nm, then we don't want the "-C" option.
9636@@ -14712,15 +15477,20 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie 9636@@ -14713,15 +15478,20 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
9637 ;; 9637 ;;
9638 pw32*) 9638 pw32*)
9639 export_symbols_cmds_CXX="$ltdll_cmds" 9639 export_symbols_cmds_CXX="$ltdll_cmds"
@@ -9659,7 +9659,7 @@ index bdfa2281f2c..b6376eb3f77 100755
9659 9659
9660 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5 9660 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5
9661 $as_echo "$ld_shlibs_CXX" >&6; } 9661 $as_echo "$ld_shlibs_CXX" >&6; }
9662@@ -14983,8 +15753,9 @@ cygwin* | mingw* | pw32* | cegcc*) 9662@@ -14984,8 +15754,9 @@ cygwin* | mingw* | pw32* | cegcc*)
9663 need_version=no 9663 need_version=no
9664 need_lib_prefix=no 9664 need_lib_prefix=no
9665 9665
@@ -9671,7 +9671,7 @@ index bdfa2281f2c..b6376eb3f77 100755
9671 library_names_spec='$libname.dll.a' 9671 library_names_spec='$libname.dll.a'
9672 # DLL is installed to $(libdir)/../bin by postinstall_cmds 9672 # DLL is installed to $(libdir)/../bin by postinstall_cmds
9673 postinstall_cmds='base_file=`basename \${file}`~ 9673 postinstall_cmds='base_file=`basename \${file}`~
9674@@ -15016,13 +15787,71 @@ cygwin* | mingw* | pw32* | cegcc*) 9674@@ -15017,13 +15788,71 @@ cygwin* | mingw* | pw32* | cegcc*)
9675 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' 9675 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
9676 ;; 9676 ;;
9677 esac 9677 esac
@@ -9744,7 +9744,7 @@ index bdfa2281f2c..b6376eb3f77 100755
9744 # FIXME: first we should search . and the directory the executable is in 9744 # FIXME: first we should search . and the directory the executable is in
9745 shlibpath_var=PATH 9745 shlibpath_var=PATH
9746 ;; 9746 ;;
9747@@ -15586,6 +16415,7 @@ fi 9747@@ -15587,6 +16416,7 @@ fi
9748 fi # test -n "$compiler" 9748 fi # test -n "$compiler"
9749 9749
9750 CC=$lt_save_CC 9750 CC=$lt_save_CC
@@ -9752,7 +9752,7 @@ index bdfa2281f2c..b6376eb3f77 100755
9752 LDCXX=$LD 9752 LDCXX=$LD
9753 LD=$lt_save_LD 9753 LD=$lt_save_LD
9754 GCC=$lt_save_GCC 9754 GCC=$lt_save_GCC
9755@@ -17738,13 +18568,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' 9755@@ -17785,13 +18615,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
9756 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' 9756 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
9757 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' 9757 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
9758 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' 9758 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
@@ -9773,7 +9773,7 @@ index bdfa2281f2c..b6376eb3f77 100755
9773 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' 9773 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
9774 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' 9774 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
9775 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' 9775 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
9776@@ -17759,14 +18596,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de 9776@@ -17806,14 +18643,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de
9777 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' 9777 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
9778 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' 9778 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
9779 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"`' 9779 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"`'
@@ -9792,7 +9792,7 @@ index bdfa2281f2c..b6376eb3f77 100755
9792 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' 9792 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
9793 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' 9793 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
9794 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' 9794 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
9795@@ -17799,12 +18639,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q 9795@@ -17846,12 +18686,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q
9796 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' 9796 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
9797 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' 9797 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
9798 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' 9798 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
@@ -9806,7 +9806,7 @@ index bdfa2281f2c..b6376eb3f77 100755
9806 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' 9806 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
9807 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' 9807 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
9808 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' 9808 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
9809@@ -17843,8 +18683,8 @@ old_archive_cmds_CXX='`$ECHO "$old_archive_cmds_CXX" | $SED "$delay_single_quote 9809@@ -17890,8 +18730,8 @@ old_archive_cmds_CXX='`$ECHO "$old_archive_cmds_CXX" | $SED "$delay_single_quote
9810 compiler_CXX='`$ECHO "$compiler_CXX" | $SED "$delay_single_quote_subst"`' 9810 compiler_CXX='`$ECHO "$compiler_CXX" | $SED "$delay_single_quote_subst"`'
9811 GCC_CXX='`$ECHO "$GCC_CXX" | $SED "$delay_single_quote_subst"`' 9811 GCC_CXX='`$ECHO "$GCC_CXX" | $SED "$delay_single_quote_subst"`'
9812 lt_prog_compiler_no_builtin_flag_CXX='`$ECHO "$lt_prog_compiler_no_builtin_flag_CXX" | $SED "$delay_single_quote_subst"`' 9812 lt_prog_compiler_no_builtin_flag_CXX='`$ECHO "$lt_prog_compiler_no_builtin_flag_CXX" | $SED "$delay_single_quote_subst"`'
@@ -9816,7 +9816,7 @@ index bdfa2281f2c..b6376eb3f77 100755
9816 lt_prog_compiler_static_CXX='`$ECHO "$lt_prog_compiler_static_CXX" | $SED "$delay_single_quote_subst"`' 9816 lt_prog_compiler_static_CXX='`$ECHO "$lt_prog_compiler_static_CXX" | $SED "$delay_single_quote_subst"`'
9817 lt_cv_prog_compiler_c_o_CXX='`$ECHO "$lt_cv_prog_compiler_c_o_CXX" | $SED "$delay_single_quote_subst"`' 9817 lt_cv_prog_compiler_c_o_CXX='`$ECHO "$lt_cv_prog_compiler_c_o_CXX" | $SED "$delay_single_quote_subst"`'
9818 archive_cmds_need_lc_CXX='`$ECHO "$archive_cmds_need_lc_CXX" | $SED "$delay_single_quote_subst"`' 9818 archive_cmds_need_lc_CXX='`$ECHO "$archive_cmds_need_lc_CXX" | $SED "$delay_single_quote_subst"`'
9819@@ -17871,12 +18711,12 @@ hardcode_shlibpath_var_CXX='`$ECHO "$hardcode_shlibpath_var_CXX" | $SED "$delay_ 9819@@ -17918,12 +18758,12 @@ hardcode_shlibpath_var_CXX='`$ECHO "$hardcode_shlibpath_var_CXX" | $SED "$delay_
9820 hardcode_automatic_CXX='`$ECHO "$hardcode_automatic_CXX" | $SED "$delay_single_quote_subst"`' 9820 hardcode_automatic_CXX='`$ECHO "$hardcode_automatic_CXX" | $SED "$delay_single_quote_subst"`'
9821 inherit_rpath_CXX='`$ECHO "$inherit_rpath_CXX" | $SED "$delay_single_quote_subst"`' 9821 inherit_rpath_CXX='`$ECHO "$inherit_rpath_CXX" | $SED "$delay_single_quote_subst"`'
9822 link_all_deplibs_CXX='`$ECHO "$link_all_deplibs_CXX" | $SED "$delay_single_quote_subst"`' 9822 link_all_deplibs_CXX='`$ECHO "$link_all_deplibs_CXX" | $SED "$delay_single_quote_subst"`'
@@ -9830,7 +9830,7 @@ index bdfa2281f2c..b6376eb3f77 100755
9830 file_list_spec_CXX='`$ECHO "$file_list_spec_CXX" | $SED "$delay_single_quote_subst"`' 9830 file_list_spec_CXX='`$ECHO "$file_list_spec_CXX" | $SED "$delay_single_quote_subst"`'
9831 hardcode_action_CXX='`$ECHO "$hardcode_action_CXX" | $SED "$delay_single_quote_subst"`' 9831 hardcode_action_CXX='`$ECHO "$hardcode_action_CXX" | $SED "$delay_single_quote_subst"`'
9832 compiler_lib_search_dirs_CXX='`$ECHO "$compiler_lib_search_dirs_CXX" | $SED "$delay_single_quote_subst"`' 9832 compiler_lib_search_dirs_CXX='`$ECHO "$compiler_lib_search_dirs_CXX" | $SED "$delay_single_quote_subst"`'
9833@@ -17914,8 +18754,13 @@ reload_flag \ 9833@@ -17961,8 +18801,13 @@ reload_flag \
9834 OBJDUMP \ 9834 OBJDUMP \
9835 deplibs_check_method \ 9835 deplibs_check_method \
9836 file_magic_cmd \ 9836 file_magic_cmd \
@@ -9844,7 +9844,7 @@ index bdfa2281f2c..b6376eb3f77 100755
9844 STRIP \ 9844 STRIP \
9845 RANLIB \ 9845 RANLIB \
9846 CC \ 9846 CC \
9847@@ -17925,12 +18770,14 @@ lt_cv_sys_global_symbol_pipe \ 9847@@ -17972,12 +18817,14 @@ lt_cv_sys_global_symbol_pipe \
9848 lt_cv_sys_global_symbol_to_cdecl \ 9848 lt_cv_sys_global_symbol_to_cdecl \
9849 lt_cv_sys_global_symbol_to_c_name_address \ 9849 lt_cv_sys_global_symbol_to_c_name_address \
9850 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ 9850 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
@@ -9860,7 +9860,7 @@ index bdfa2281f2c..b6376eb3f77 100755
9860 DSYMUTIL \ 9860 DSYMUTIL \
9861 NMEDIT \ 9861 NMEDIT \
9862 LIPO \ 9862 LIPO \
9863@@ -17946,7 +18793,6 @@ no_undefined_flag \ 9863@@ -17993,7 +18840,6 @@ no_undefined_flag \
9864 hardcode_libdir_flag_spec \ 9864 hardcode_libdir_flag_spec \
9865 hardcode_libdir_flag_spec_ld \ 9865 hardcode_libdir_flag_spec_ld \
9866 hardcode_libdir_separator \ 9866 hardcode_libdir_separator \
@@ -9868,7 +9868,7 @@ index bdfa2281f2c..b6376eb3f77 100755
9868 exclude_expsyms \ 9868 exclude_expsyms \
9869 include_expsyms \ 9869 include_expsyms \
9870 file_list_spec \ 9870 file_list_spec \
9871@@ -17968,8 +18814,8 @@ LD_CXX \ 9871@@ -18015,8 +18861,8 @@ LD_CXX \
9872 reload_flag_CXX \ 9872 reload_flag_CXX \
9873 compiler_CXX \ 9873 compiler_CXX \
9874 lt_prog_compiler_no_builtin_flag_CXX \ 9874 lt_prog_compiler_no_builtin_flag_CXX \
@@ -9878,7 +9878,7 @@ index bdfa2281f2c..b6376eb3f77 100755
9878 lt_prog_compiler_static_CXX \ 9878 lt_prog_compiler_static_CXX \
9879 lt_cv_prog_compiler_c_o_CXX \ 9879 lt_cv_prog_compiler_c_o_CXX \
9880 export_dynamic_flag_spec_CXX \ 9880 export_dynamic_flag_spec_CXX \
9881@@ -17981,7 +18827,6 @@ no_undefined_flag_CXX \ 9881@@ -18028,7 +18874,6 @@ no_undefined_flag_CXX \
9882 hardcode_libdir_flag_spec_CXX \ 9882 hardcode_libdir_flag_spec_CXX \
9883 hardcode_libdir_flag_spec_ld_CXX \ 9883 hardcode_libdir_flag_spec_ld_CXX \
9884 hardcode_libdir_separator_CXX \ 9884 hardcode_libdir_separator_CXX \
@@ -9886,7 +9886,7 @@ index bdfa2281f2c..b6376eb3f77 100755
9886 exclude_expsyms_CXX \ 9886 exclude_expsyms_CXX \
9887 include_expsyms_CXX \ 9887 include_expsyms_CXX \
9888 file_list_spec_CXX \ 9888 file_list_spec_CXX \
9889@@ -18015,6 +18860,7 @@ module_cmds \ 9889@@ -18062,6 +18907,7 @@ module_cmds \
9890 module_expsym_cmds \ 9890 module_expsym_cmds \
9891 export_symbols_cmds \ 9891 export_symbols_cmds \
9892 prelink_cmds \ 9892 prelink_cmds \
@@ -9894,7 +9894,7 @@ index bdfa2281f2c..b6376eb3f77 100755
9894 postinstall_cmds \ 9894 postinstall_cmds \
9895 postuninstall_cmds \ 9895 postuninstall_cmds \
9896 finish_cmds \ 9896 finish_cmds \
9897@@ -18029,7 +18875,8 @@ archive_expsym_cmds_CXX \ 9897@@ -18076,7 +18922,8 @@ archive_expsym_cmds_CXX \
9898 module_cmds_CXX \ 9898 module_cmds_CXX \
9899 module_expsym_cmds_CXX \ 9899 module_expsym_cmds_CXX \
9900 export_symbols_cmds_CXX \ 9900 export_symbols_cmds_CXX \
@@ -9904,7 +9904,7 @@ index bdfa2281f2c..b6376eb3f77 100755
9904 case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in 9904 case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
9905 *[\\\\\\\`\\"\\\$]*) 9905 *[\\\\\\\`\\"\\\$]*)
9906 eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" 9906 eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
9907@@ -18786,7 +19633,8 @@ $as_echo X"$file" | 9907@@ -18833,7 +19680,8 @@ $as_echo X"$file" |
9908 # NOTE: Changes made to this file will be lost: look at ltmain.sh. 9908 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
9909 # 9909 #
9910 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 9910 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
@@ -9914,7 +9914,7 @@ index bdfa2281f2c..b6376eb3f77 100755
9914 # Written by Gordon Matzigkeit, 1996 9914 # Written by Gordon Matzigkeit, 1996
9915 # 9915 #
9916 # This file is part of GNU Libtool. 9916 # This file is part of GNU Libtool.
9917@@ -18889,19 +19737,42 @@ SP2NL=$lt_lt_SP2NL 9917@@ -18936,19 +19784,42 @@ SP2NL=$lt_lt_SP2NL
9918 # turn newlines into spaces. 9918 # turn newlines into spaces.
9919 NL2SP=$lt_lt_NL2SP 9919 NL2SP=$lt_lt_NL2SP
9920 9920
@@ -9958,7 +9958,7 @@ index bdfa2281f2c..b6376eb3f77 100755
9958 # A symbol stripping program. 9958 # A symbol stripping program.
9959 STRIP=$lt_STRIP 9959 STRIP=$lt_STRIP
9960 9960
9961@@ -18931,6 +19802,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address 9961@@ -18978,6 +19849,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
9962 # Transform the output of nm in a C name address pair when lib prefix is needed. 9962 # Transform the output of nm in a C name address pair when lib prefix is needed.
9963 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix 9963 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
9964 9964
@@ -9971,7 +9971,7 @@ index bdfa2281f2c..b6376eb3f77 100755
9971 # The name of the directory that contains temporary libtool files. 9971 # The name of the directory that contains temporary libtool files.
9972 objdir=$objdir 9972 objdir=$objdir
9973 9973
9974@@ -18940,6 +19817,9 @@ MAGIC_CMD=$MAGIC_CMD 9974@@ -18987,6 +19864,9 @@ MAGIC_CMD=$MAGIC_CMD
9975 # Must we lock files when doing compilation? 9975 # Must we lock files when doing compilation?
9976 need_locks=$lt_need_locks 9976 need_locks=$lt_need_locks
9977 9977
@@ -9981,7 +9981,7 @@ index bdfa2281f2c..b6376eb3f77 100755
9981 # Tool to manipulate archived DWARF debug symbol files on Mac OS X. 9981 # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
9982 DSYMUTIL=$lt_DSYMUTIL 9982 DSYMUTIL=$lt_DSYMUTIL
9983 9983
9984@@ -19054,12 +19934,12 @@ with_gcc=$GCC 9984@@ -19101,12 +19981,12 @@ with_gcc=$GCC
9985 # Compiler flag to turn off builtin functions. 9985 # Compiler flag to turn off builtin functions.
9986 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag 9986 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
9987 9987
@@ -9997,7 +9997,7 @@ index bdfa2281f2c..b6376eb3f77 100755
9997 # Compiler flag to prevent dynamic linking. 9997 # Compiler flag to prevent dynamic linking.
9998 link_static_flag=$lt_lt_prog_compiler_static 9998 link_static_flag=$lt_lt_prog_compiler_static
9999 9999
10000@@ -19146,9 +20026,6 @@ inherit_rpath=$inherit_rpath 10000@@ -19193,9 +20073,6 @@ inherit_rpath=$inherit_rpath
10001 # Whether libtool must link a program against all its dependency libraries. 10001 # Whether libtool must link a program against all its dependency libraries.
10002 link_all_deplibs=$link_all_deplibs 10002 link_all_deplibs=$link_all_deplibs
10003 10003
@@ -10007,7 +10007,7 @@ index bdfa2281f2c..b6376eb3f77 100755
10007 # Set to "yes" if exported symbols are required. 10007 # Set to "yes" if exported symbols are required.
10008 always_export_symbols=$always_export_symbols 10008 always_export_symbols=$always_export_symbols
10009 10009
10010@@ -19164,6 +20041,9 @@ include_expsyms=$lt_include_expsyms 10010@@ -19211,6 +20088,9 @@ include_expsyms=$lt_include_expsyms
10011 # Commands necessary for linking programs (against libraries) with templates. 10011 # Commands necessary for linking programs (against libraries) with templates.
10012 prelink_cmds=$lt_prelink_cmds 10012 prelink_cmds=$lt_prelink_cmds
10013 10013
@@ -10017,7 +10017,7 @@ index bdfa2281f2c..b6376eb3f77 100755
10017 # Specify filename containing input files. 10017 # Specify filename containing input files.
10018 file_list_spec=$lt_file_list_spec 10018 file_list_spec=$lt_file_list_spec
10019 10019
10020@@ -19210,210 +20090,169 @@ ltmain="$ac_aux_dir/ltmain.sh" 10020@@ -19257,210 +20137,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
10021 # if finds mixed CR/LF and LF-only lines. Since sed operates in 10021 # if finds mixed CR/LF and LF-only lines. Since sed operates in
10022 # text mode, it properly converts lines to CR/LF. This bash problem 10022 # text mode, it properly converts lines to CR/LF. This bash problem
10023 # is reportedly fixed, but why not run on old versions too? 10023 # is reportedly fixed, but why not run on old versions too?
@@ -10391,7 +10391,7 @@ index bdfa2281f2c..b6376eb3f77 100755
10391 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") 10391 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
10392 chmod +x "$ofile" 10392 chmod +x "$ofile"
10393 10393
10394@@ -19441,12 +20280,12 @@ with_gcc=$GCC_CXX 10394@@ -19488,12 +20327,12 @@ with_gcc=$GCC_CXX
10395 # Compiler flag to turn off builtin functions. 10395 # Compiler flag to turn off builtin functions.
10396 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX 10396 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX
10397 10397
@@ -10407,7 +10407,7 @@ index bdfa2281f2c..b6376eb3f77 100755
10407 # Compiler flag to prevent dynamic linking. 10407 # Compiler flag to prevent dynamic linking.
10408 link_static_flag=$lt_lt_prog_compiler_static_CXX 10408 link_static_flag=$lt_lt_prog_compiler_static_CXX
10409 10409
10410@@ -19533,9 +20372,6 @@ inherit_rpath=$inherit_rpath_CXX 10410@@ -19580,9 +20419,6 @@ inherit_rpath=$inherit_rpath_CXX
10411 # Whether libtool must link a program against all its dependency libraries. 10411 # Whether libtool must link a program against all its dependency libraries.
10412 link_all_deplibs=$link_all_deplibs_CXX 10412 link_all_deplibs=$link_all_deplibs_CXX
10413 10413
@@ -10417,7 +10417,7 @@ index bdfa2281f2c..b6376eb3f77 100755
10417 # Set to "yes" if exported symbols are required. 10417 # Set to "yes" if exported symbols are required.
10418 always_export_symbols=$always_export_symbols_CXX 10418 always_export_symbols=$always_export_symbols_CXX
10419 10419
10420@@ -19551,6 +20387,9 @@ include_expsyms=$lt_include_expsyms_CXX 10420@@ -19598,6 +20434,9 @@ include_expsyms=$lt_include_expsyms_CXX
10421 # Commands necessary for linking programs (against libraries) with templates. 10421 # Commands necessary for linking programs (against libraries) with templates.
10422 prelink_cmds=$lt_prelink_cmds_CXX 10422 prelink_cmds=$lt_prelink_cmds_CXX
10423 10423
@@ -10428,7 +10428,7 @@ index bdfa2281f2c..b6376eb3f77 100755
10428 file_list_spec=$lt_file_list_spec_CXX 10428 file_list_spec=$lt_file_list_spec_CXX
10429 10429
10430diff --git a/gprofng/doc/Makefile.in b/gprofng/doc/Makefile.in 10430diff --git a/gprofng/doc/Makefile.in b/gprofng/doc/Makefile.in
10431index 3306c51b31c..6ab3d9636c8 100644 10431index 162ae4b19c1..9e6017aa0ff 100644
10432--- a/gprofng/doc/Makefile.in 10432--- a/gprofng/doc/Makefile.in
10433+++ b/gprofng/doc/Makefile.in 10433+++ b/gprofng/doc/Makefile.in
10434@@ -238,6 +238,7 @@ CXXFLAGS = @CXXFLAGS@ 10434@@ -238,6 +238,7 @@ CXXFLAGS = @CXXFLAGS@
@@ -10448,10 +10448,10 @@ index 3306c51b31c..6ab3d9636c8 100644
10448 NM = @NM@ 10448 NM = @NM@
10449 NMEDIT = @NMEDIT@ 10449 NMEDIT = @NMEDIT@
10450diff --git a/gprofng/gp-display-html/Makefile.in b/gprofng/gp-display-html/Makefile.in 10450diff --git a/gprofng/gp-display-html/Makefile.in b/gprofng/gp-display-html/Makefile.in
10451index 61c00cd6e46..edce3cb94c5 100644 10451index 2b8580f40f9..a01e34702d7 100644
10452--- a/gprofng/gp-display-html/Makefile.in 10452--- a/gprofng/gp-display-html/Makefile.in
10453+++ b/gprofng/gp-display-html/Makefile.in 10453+++ b/gprofng/gp-display-html/Makefile.in
10454@@ -197,6 +197,7 @@ CXXFLAGS = @CXXFLAGS@ 10454@@ -198,6 +198,7 @@ CXXFLAGS = @CXXFLAGS@
10455 CYGPATH_W = @CYGPATH_W@ 10455 CYGPATH_W = @CYGPATH_W@
10456 DEFS = @DEFS@ 10456 DEFS = @DEFS@
10457 DEPDIR = @DEPDIR@ 10457 DEPDIR = @DEPDIR@
@@ -10459,7 +10459,7 @@ index 61c00cd6e46..edce3cb94c5 100644
10459 DSYMUTIL = @DSYMUTIL@ 10459 DSYMUTIL = @DSYMUTIL@
10460 DUMPBIN = @DUMPBIN@ 10460 DUMPBIN = @DUMPBIN@
10461 ECHO_C = @ECHO_C@ 10461 ECHO_C = @ECHO_C@
10462@@ -231,6 +232,7 @@ LN_S = @LN_S@ 10462@@ -232,6 +233,7 @@ LN_S = @LN_S@
10463 LTLIBOBJS = @LTLIBOBJS@ 10463 LTLIBOBJS = @LTLIBOBJS@
10464 MAINT = @MAINT@ 10464 MAINT = @MAINT@
10465 MAKEINFO = @MAKEINFO@ 10465 MAKEINFO = @MAKEINFO@
@@ -10468,7 +10468,7 @@ index 61c00cd6e46..edce3cb94c5 100644
10468 NM = @NM@ 10468 NM = @NM@
10469 NMEDIT = @NMEDIT@ 10469 NMEDIT = @NMEDIT@
10470diff --git a/gprofng/libcollector/Makefile.in b/gprofng/libcollector/Makefile.in 10470diff --git a/gprofng/libcollector/Makefile.in b/gprofng/libcollector/Makefile.in
10471index ce8755c80c9..91e29c29ab8 100644 10471index 4448745f17e..ff20f8f0715 100644
10472--- a/gprofng/libcollector/Makefile.in 10472--- a/gprofng/libcollector/Makefile.in
10473+++ b/gprofng/libcollector/Makefile.in 10473+++ b/gprofng/libcollector/Makefile.in
10474@@ -316,6 +316,7 @@ CXXFLAGS = @CXXFLAGS@ 10474@@ -316,6 +316,7 @@ CXXFLAGS = @CXXFLAGS@
@@ -10488,7 +10488,7 @@ index ce8755c80c9..91e29c29ab8 100644
10488 NM = @NM@ 10488 NM = @NM@
10489 NMEDIT = @NMEDIT@ 10489 NMEDIT = @NMEDIT@
10490diff --git a/gprofng/libcollector/configure b/gprofng/libcollector/configure 10490diff --git a/gprofng/libcollector/configure b/gprofng/libcollector/configure
10491index 8b0092433fe..a363ab1047c 100755 10491index b1ba1edb35b..5a20f484c38 100755
10492--- a/gprofng/libcollector/configure 10492--- a/gprofng/libcollector/configure
10493+++ b/gprofng/libcollector/configure 10493+++ b/gprofng/libcollector/configure
10494@@ -640,6 +640,8 @@ OTOOL 10494@@ -640,6 +640,8 @@ OTOOL
@@ -13064,10 +13064,10 @@ index 8b0092433fe..a363ab1047c 100755
13064 file_list_spec=$lt_file_list_spec_CXX 13064 file_list_spec=$lt_file_list_spec_CXX
13065 13065
13066diff --git a/gprofng/src/Makefile.in b/gprofng/src/Makefile.in 13066diff --git a/gprofng/src/Makefile.in b/gprofng/src/Makefile.in
13067index db763ef71b2..726dc69bf85 100644 13067index d0dec12e244..cf2745db706 100644
13068--- a/gprofng/src/Makefile.in 13068--- a/gprofng/src/Makefile.in
13069+++ b/gprofng/src/Makefile.in 13069+++ b/gprofng/src/Makefile.in
13070@@ -321,6 +321,7 @@ CXXFLAGS = @CXXFLAGS@ 13070@@ -322,6 +322,7 @@ CXXFLAGS = @CXXFLAGS@
13071 CYGPATH_W = @CYGPATH_W@ 13071 CYGPATH_W = @CYGPATH_W@
13072 DEFS = @DEFS@ 13072 DEFS = @DEFS@
13073 DEPDIR = @DEPDIR@ 13073 DEPDIR = @DEPDIR@
@@ -13075,7 +13075,7 @@ index db763ef71b2..726dc69bf85 100644
13075 DSYMUTIL = @DSYMUTIL@ 13075 DSYMUTIL = @DSYMUTIL@
13076 DUMPBIN = @DUMPBIN@ 13076 DUMPBIN = @DUMPBIN@
13077 ECHO_C = @ECHO_C@ 13077 ECHO_C = @ECHO_C@
13078@@ -355,6 +356,7 @@ LN_S = @LN_S@ 13078@@ -356,6 +357,7 @@ LN_S = @LN_S@
13079 LTLIBOBJS = @LTLIBOBJS@ 13079 LTLIBOBJS = @LTLIBOBJS@
13080 MAINT = @MAINT@ 13080 MAINT = @MAINT@
13081 MAKEINFO = @MAKEINFO@ 13081 MAKEINFO = @MAKEINFO@
@@ -13084,7 +13084,7 @@ index db763ef71b2..726dc69bf85 100644
13084 NM = @NM@ 13084 NM = @NM@
13085 NMEDIT = @NMEDIT@ 13085 NMEDIT = @NMEDIT@
13086diff --git a/ld/Makefile.in b/ld/Makefile.in 13086diff --git a/ld/Makefile.in b/ld/Makefile.in
13087index 15311048855..71b39ee9311 100644 13087index c3d08edbef1..7ee6acd3e03 100644
13088--- a/ld/Makefile.in 13088--- a/ld/Makefile.in
13089+++ b/ld/Makefile.in 13089+++ b/ld/Makefile.in
13090@@ -390,6 +390,7 @@ CYGPATH_W = @CYGPATH_W@ 13090@@ -390,6 +390,7 @@ CYGPATH_W = @CYGPATH_W@
@@ -13112,7 +13112,7 @@ index 15311048855..71b39ee9311 100644
13112 ac_ct_CXX = @ac_ct_CXX@ 13112 ac_ct_CXX = @ac_ct_CXX@
13113 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ 13113 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
13114diff --git a/ld/configure b/ld/configure 13114diff --git a/ld/configure b/ld/configure
13115index 98a76d6da7f..a4266996c44 100755 13115index d537ec391d2..de7b61bb612 100755
13116--- a/ld/configure 13116--- a/ld/configure
13117+++ b/ld/configure 13117+++ b/ld/configure
13118@@ -705,8 +705,11 @@ OTOOL 13118@@ -705,8 +705,11 @@ OTOOL
@@ -13135,7 +13135,7 @@ index 98a76d6da7f..a4266996c44 100755
13135 enable_libtool_lock 13135 enable_libtool_lock
13136 enable_plugins 13136 enable_plugins
13137 enable_largefile 13137 enable_largefile
13138@@ -1581,6 +1585,8 @@ Optional Packages: 13138@@ -1586,6 +1590,8 @@ Optional Packages:
13139 --with-pic try to use only PIC/non-PIC objects [default=use 13139 --with-pic try to use only PIC/non-PIC objects [default=use
13140 both] 13140 both]
13141 --with-gnu-ld assume the C compiler uses GNU ld [default=no] 13141 --with-gnu-ld assume the C compiler uses GNU ld [default=no]
@@ -13144,7 +13144,7 @@ index 98a76d6da7f..a4266996c44 100755
13144 --with-lib-path=dir1:dir2... set default LIB_PATH 13144 --with-lib-path=dir1:dir2... set default LIB_PATH
13145 --with-sysroot=DIR Search for usr/lib et al within DIR. 13145 --with-sysroot=DIR Search for usr/lib et al within DIR.
13146 --with-gnu-ld assume the C compiler uses GNU ld default=no 13146 --with-gnu-ld assume the C compiler uses GNU ld default=no
13147@@ -5560,8 +5566,8 @@ esac 13147@@ -5565,8 +5571,8 @@ esac
13148 13148
13149 13149
13150 13150
@@ -13155,7 +13155,7 @@ index 98a76d6da7f..a4266996c44 100755
13155 13155
13156 13156
13157 13157
13158@@ -5601,7 +5607,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO 13158@@ -5606,7 +5612,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
13159 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 13159 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
13160 $as_echo_n "checking how to print strings... " >&6; } 13160 $as_echo_n "checking how to print strings... " >&6; }
13161 # Test print first, because it will be a builtin if present. 13161 # Test print first, because it will be a builtin if present.
@@ -13164,7 +13164,7 @@ index 98a76d6da7f..a4266996c44 100755
13164 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then 13164 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
13165 ECHO='print -r --' 13165 ECHO='print -r --'
13166 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then 13166 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
13167@@ -6294,8 +6300,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; 13167@@ -6299,8 +6305,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6;
13168 # Try some XSI features 13168 # Try some XSI features
13169 xsi_shell=no 13169 xsi_shell=no
13170 ( _lt_dummy="a/b/c" 13170 ( _lt_dummy="a/b/c"
@@ -13175,7 +13175,7 @@ index 98a76d6da7f..a4266996c44 100755
13175 && eval 'test $(( 1 + 1 )) -eq 2 \ 13175 && eval 'test $(( 1 + 1 )) -eq 2 \
13176 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ 13176 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
13177 && xsi_shell=yes 13177 && xsi_shell=yes
13178@@ -6344,6 +6350,80 @@ esac 13178@@ -6349,6 +6355,80 @@ esac
13179 13179
13180 13180
13181 13181
@@ -13256,7 +13256,7 @@ index 98a76d6da7f..a4266996c44 100755
13256 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 13256 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
13257 $as_echo_n "checking for $LD option to reload object files... " >&6; } 13257 $as_echo_n "checking for $LD option to reload object files... " >&6; }
13258 if ${lt_cv_ld_reload_flag+:} false; then : 13258 if ${lt_cv_ld_reload_flag+:} false; then :
13259@@ -6360,6 +6440,11 @@ case $reload_flag in 13259@@ -6365,6 +6445,11 @@ case $reload_flag in
13260 esac 13260 esac
13261 reload_cmds='$LD$reload_flag -o $output$reload_objs' 13261 reload_cmds='$LD$reload_flag -o $output$reload_objs'
13262 case $host_os in 13262 case $host_os in
@@ -13268,7 +13268,7 @@ index 98a76d6da7f..a4266996c44 100755
13268 darwin*) 13268 darwin*)
13269 if test "$GCC" = yes; then 13269 if test "$GCC" = yes; then
13270 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' 13270 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
13271@@ -6528,7 +6613,8 @@ mingw* | pw32*) 13271@@ -6533,7 +6618,8 @@ mingw* | pw32*)
13272 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' 13272 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
13273 lt_cv_file_magic_cmd='func_win32_libid' 13273 lt_cv_file_magic_cmd='func_win32_libid'
13274 else 13274 else
@@ -13278,7 +13278,7 @@ index 98a76d6da7f..a4266996c44 100755
13278 lt_cv_file_magic_cmd='$OBJDUMP -f' 13278 lt_cv_file_magic_cmd='$OBJDUMP -f'
13279 fi 13279 fi
13280 ;; 13280 ;;
13281@@ -6687,6 +6773,21 @@ esac 13281@@ -6692,6 +6778,21 @@ esac
13282 fi 13282 fi
13283 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 13283 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
13284 $as_echo "$lt_cv_deplibs_check_method" >&6; } 13284 $as_echo "$lt_cv_deplibs_check_method" >&6; }
@@ -13300,7 +13300,7 @@ index 98a76d6da7f..a4266996c44 100755
13300 file_magic_cmd=$lt_cv_file_magic_cmd 13300 file_magic_cmd=$lt_cv_file_magic_cmd
13301 deplibs_check_method=$lt_cv_deplibs_check_method 13301 deplibs_check_method=$lt_cv_deplibs_check_method
13302 test -z "$deplibs_check_method" && deplibs_check_method=unknown 13302 test -z "$deplibs_check_method" && deplibs_check_method=unknown
13303@@ -6702,6 +6803,157 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown 13303@@ -6707,6 +6808,157 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
13304 13304
13305 13305
13306 13306
@@ -13458,7 +13458,7 @@ index 98a76d6da7f..a4266996c44 100755
13458 plugin_option= 13458 plugin_option=
13459 plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll" 13459 plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll"
13460 for plugin in $plugin_names; do 13460 for plugin in $plugin_names; do
13461@@ -6716,8 +6968,10 @@ for plugin in $plugin_names; do 13461@@ -6721,8 +6973,10 @@ for plugin in $plugin_names; do
13462 done 13462 done
13463 13463
13464 if test -n "$ac_tool_prefix"; then 13464 if test -n "$ac_tool_prefix"; then
@@ -13471,7 +13471,7 @@ index 98a76d6da7f..a4266996c44 100755
13471 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 13471 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
13472 $as_echo_n "checking for $ac_word... " >&6; } 13472 $as_echo_n "checking for $ac_word... " >&6; }
13473 if ${ac_cv_prog_AR+:} false; then : 13473 if ${ac_cv_prog_AR+:} false; then :
13474@@ -6733,7 +6987,7 @@ do 13474@@ -6738,7 +6992,7 @@ do
13475 test -z "$as_dir" && as_dir=. 13475 test -z "$as_dir" && as_dir=.
13476 for ac_exec_ext in '' $ac_executable_extensions; do 13476 for ac_exec_ext in '' $ac_executable_extensions; do
13477 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 13477 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
@@ -13480,7 +13480,7 @@ index 98a76d6da7f..a4266996c44 100755
13480 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 13480 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
13481 break 2 13481 break 2
13482 fi 13482 fi
13483@@ -6753,11 +7007,15 @@ $as_echo "no" >&6; } 13483@@ -6758,11 +7012,15 @@ $as_echo "no" >&6; }
13484 fi 13484 fi
13485 13485
13486 13486
@@ -13499,7 +13499,7 @@ index 98a76d6da7f..a4266996c44 100755
13499 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 13499 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
13500 $as_echo_n "checking for $ac_word... " >&6; } 13500 $as_echo_n "checking for $ac_word... " >&6; }
13501 if ${ac_cv_prog_ac_ct_AR+:} false; then : 13501 if ${ac_cv_prog_ac_ct_AR+:} false; then :
13502@@ -6773,7 +7031,7 @@ do 13502@@ -6778,7 +7036,7 @@ do
13503 test -z "$as_dir" && as_dir=. 13503 test -z "$as_dir" && as_dir=.
13504 for ac_exec_ext in '' $ac_executable_extensions; do 13504 for ac_exec_ext in '' $ac_executable_extensions; do
13505 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 13505 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
@@ -13508,7 +13508,7 @@ index 98a76d6da7f..a4266996c44 100755
13508 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 13508 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
13509 break 2 13509 break 2
13510 fi 13510 fi
13511@@ -6792,6 +7050,10 @@ else 13511@@ -6797,6 +7055,10 @@ else
13512 $as_echo "no" >&6; } 13512 $as_echo "no" >&6; }
13513 fi 13513 fi
13514 13514
@@ -13519,7 +13519,7 @@ index 98a76d6da7f..a4266996c44 100755
13519 if test "x$ac_ct_AR" = x; then 13519 if test "x$ac_ct_AR" = x; then
13520 AR="false" 13520 AR="false"
13521 else 13521 else
13522@@ -6803,29 +7065,81 @@ ac_tool_warned=yes ;; 13522@@ -6808,29 +7070,81 @@ ac_tool_warned=yes ;;
13523 esac 13523 esac
13524 AR=$ac_ct_AR 13524 AR=$ac_ct_AR
13525 fi 13525 fi
@@ -13616,7 +13616,7 @@ index 98a76d6da7f..a4266996c44 100755
13616 13616
13617 13617
13618 13618
13619@@ -7172,8 +7486,8 @@ esac 13619@@ -7177,8 +7491,8 @@ esac
13620 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" 13620 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
13621 13621
13622 # Transform an extracted symbol line into symbol name and symbol address 13622 # Transform an extracted symbol line into symbol name and symbol address
@@ -13627,7 +13627,7 @@ index 98a76d6da7f..a4266996c44 100755
13627 13627
13628 # Handle CRLF in mingw tool chain 13628 # Handle CRLF in mingw tool chain
13629 opt_cr= 13629 opt_cr=
13630@@ -7209,6 +7523,7 @@ for ac_symprfx in "" "_"; do 13630@@ -7214,6 +7528,7 @@ for ac_symprfx in "" "_"; do
13631 else 13631 else
13632 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" 13632 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
13633 fi 13633 fi
@@ -13635,7 +13635,7 @@ index 98a76d6da7f..a4266996c44 100755
13635 13635
13636 # Check to see that the pipe works correctly. 13636 # Check to see that the pipe works correctly.
13637 pipe_works=no 13637 pipe_works=no
13638@@ -7250,6 +7565,18 @@ _LT_EOF 13638@@ -7255,6 +7570,18 @@ _LT_EOF
13639 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then 13639 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
13640 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then 13640 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
13641 cat <<_LT_EOF > conftest.$ac_ext 13641 cat <<_LT_EOF > conftest.$ac_ext
@@ -13654,7 +13654,7 @@ index 98a76d6da7f..a4266996c44 100755
13654 #ifdef __cplusplus 13654 #ifdef __cplusplus
13655 extern "C" { 13655 extern "C" {
13656 #endif 13656 #endif
13657@@ -7261,7 +7588,7 @@ _LT_EOF 13657@@ -7266,7 +7593,7 @@ _LT_EOF
13658 cat <<_LT_EOF >> conftest.$ac_ext 13658 cat <<_LT_EOF >> conftest.$ac_ext
13659 13659
13660 /* The mapping between symbol names and symbols. */ 13660 /* The mapping between symbol names and symbols. */
@@ -13663,7 +13663,7 @@ index 98a76d6da7f..a4266996c44 100755
13663 const char *name; 13663 const char *name;
13664 void *address; 13664 void *address;
13665 } 13665 }
13666@@ -7287,8 +7614,8 @@ static const void *lt_preloaded_setup() { 13666@@ -7292,8 +7619,8 @@ static const void *lt_preloaded_setup() {
13667 _LT_EOF 13667 _LT_EOF
13668 # Now try linking the two files. 13668 # Now try linking the two files.
13669 mv conftest.$ac_objext conftstm.$ac_objext 13669 mv conftest.$ac_objext conftstm.$ac_objext
@@ -13674,7 +13674,7 @@ index 98a76d6da7f..a4266996c44 100755
13674 LIBS="conftstm.$ac_objext" 13674 LIBS="conftstm.$ac_objext"
13675 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" 13675 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
13676 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 13676 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
13677@@ -7298,8 +7625,8 @@ _LT_EOF 13677@@ -7303,8 +7630,8 @@ _LT_EOF
13678 test $ac_status = 0; } && test -s conftest${ac_exeext}; then 13678 test $ac_status = 0; } && test -s conftest${ac_exeext}; then
13679 pipe_works=yes 13679 pipe_works=yes
13680 fi 13680 fi
@@ -13685,7 +13685,7 @@ index 98a76d6da7f..a4266996c44 100755
13685 else 13685 else
13686 echo "cannot find nm_test_func in $nlist" >&5 13686 echo "cannot find nm_test_func in $nlist" >&5
13687 fi 13687 fi
13688@@ -7336,6 +7663,27 @@ else 13688@@ -7341,6 +7668,27 @@ else
13689 $as_echo "ok" >&6; } 13689 $as_echo "ok" >&6; }
13690 fi 13690 fi
13691 13691
@@ -13713,7 +13713,7 @@ index 98a76d6da7f..a4266996c44 100755
13713 13713
13714 13714
13715 13715
13716@@ -7348,10 +7696,38 @@ fi 13716@@ -7353,10 +7701,38 @@ fi
13717 13717
13718 13718
13719 13719
@@ -13752,7 +13752,7 @@ index 98a76d6da7f..a4266996c44 100755
13752 13752
13753 13753
13754 13754
13755@@ -7563,6 +7939,123 @@ esac 13755@@ -7568,6 +7944,123 @@ esac
13756 13756
13757 need_locks="$enable_libtool_lock" 13757 need_locks="$enable_libtool_lock"
13758 13758
@@ -13876,7 +13876,7 @@ index 98a76d6da7f..a4266996c44 100755
13876 13876
13877 case $host_os in 13877 case $host_os in
13878 rhapsody* | darwin*) 13878 rhapsody* | darwin*)
13879@@ -8126,6 +8619,8 @@ _LT_EOF 13879@@ -8131,6 +8624,8 @@ _LT_EOF
13880 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 13880 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
13881 echo "$AR cru libconftest.a conftest.o" >&5 13881 echo "$AR cru libconftest.a conftest.o" >&5
13882 $AR cru libconftest.a conftest.o 2>&5 13882 $AR cru libconftest.a conftest.o 2>&5
@@ -13885,7 +13885,7 @@ index 98a76d6da7f..a4266996c44 100755
13885 cat > conftest.c << _LT_EOF 13885 cat > conftest.c << _LT_EOF
13886 int main() { return 0;} 13886 int main() { return 0;}
13887 _LT_EOF 13887 _LT_EOF
13888@@ -8196,6 +8691,16 @@ done 13888@@ -8201,6 +8696,16 @@ done
13889 13889
13890 13890
13891 13891
@@ -13902,7 +13902,7 @@ index 98a76d6da7f..a4266996c44 100755
13902 13902
13903 13903
13904 # Set options 13904 # Set options
13905@@ -8711,8 +9216,6 @@ fi 13905@@ -8716,8 +9221,6 @@ fi
13906 lt_prog_compiler_pic= 13906 lt_prog_compiler_pic=
13907 lt_prog_compiler_static= 13907 lt_prog_compiler_static=
13908 13908
@@ -13911,7 +13911,7 @@ index 98a76d6da7f..a4266996c44 100755
13911 13911
13912 if test "$GCC" = yes; then 13912 if test "$GCC" = yes; then
13913 lt_prog_compiler_wl='-Wl,' 13913 lt_prog_compiler_wl='-Wl,'
13914@@ -8878,6 +9381,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 13914@@ -8883,6 +9386,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
13915 lt_prog_compiler_pic='--shared' 13915 lt_prog_compiler_pic='--shared'
13916 lt_prog_compiler_static='--static' 13916 lt_prog_compiler_static='--static'
13917 ;; 13917 ;;
@@ -13924,7 +13924,7 @@ index 98a76d6da7f..a4266996c44 100755
13924 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) 13924 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
13925 # Portland Group compilers (*not* the Pentium gcc compiler, 13925 # Portland Group compilers (*not* the Pentium gcc compiler,
13926 # which looks to be a dead project) 13926 # which looks to be a dead project)
13927@@ -8940,7 +9449,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 13927@@ -8945,7 +9454,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
13928 lt_prog_compiler_pic='-KPIC' 13928 lt_prog_compiler_pic='-KPIC'
13929 lt_prog_compiler_static='-Bstatic' 13929 lt_prog_compiler_static='-Bstatic'
13930 case $cc_basename in 13930 case $cc_basename in
@@ -13933,7 +13933,7 @@ index 98a76d6da7f..a4266996c44 100755
13933 lt_prog_compiler_wl='-Qoption ld ';; 13933 lt_prog_compiler_wl='-Qoption ld ';;
13934 *) 13934 *)
13935 lt_prog_compiler_wl='-Wl,';; 13935 lt_prog_compiler_wl='-Wl,';;
13936@@ -8997,13 +9506,17 @@ case $host_os in 13936@@ -9002,13 +9511,17 @@ case $host_os in
13937 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" 13937 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
13938 ;; 13938 ;;
13939 esac 13939 esac
@@ -13957,7 +13957,7 @@ index 98a76d6da7f..a4266996c44 100755
13957 13957
13958 # 13958 #
13959 # Check to make sure the PIC flag actually works. 13959 # Check to make sure the PIC flag actually works.
13960@@ -9064,6 +9577,11 @@ fi 13960@@ -9069,6 +9582,11 @@ fi
13961 13961
13962 13962
13963 13963
@@ -13969,7 +13969,7 @@ index 98a76d6da7f..a4266996c44 100755
13969 # 13969 #
13970 # Check to make sure the static flag actually works. 13970 # Check to make sure the static flag actually works.
13971 # 13971 #
13972@@ -9414,7 +9932,8 @@ _LT_EOF 13972@@ -9419,7 +9937,8 @@ _LT_EOF
13973 allow_undefined_flag=unsupported 13973 allow_undefined_flag=unsupported
13974 always_export_symbols=no 13974 always_export_symbols=no
13975 enable_shared_with_static_runtimes=yes 13975 enable_shared_with_static_runtimes=yes
@@ -13979,7 +13979,7 @@ index 98a76d6da7f..a4266996c44 100755
13979 13979
13980 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then 13980 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
13981 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' 13981 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
13982@@ -9513,12 +10032,12 @@ _LT_EOF 13982@@ -9518,12 +10037,12 @@ _LT_EOF
13983 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' 13983 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
13984 hardcode_libdir_flag_spec= 13984 hardcode_libdir_flag_spec=
13985 hardcode_libdir_flag_spec_ld='-rpath $libdir' 13985 hardcode_libdir_flag_spec_ld='-rpath $libdir'
@@ -13994,7 +13994,7 @@ index 98a76d6da7f..a4266996c44 100755
13994 fi 13994 fi
13995 ;; 13995 ;;
13996 esac 13996 esac
13997@@ -9532,8 +10051,8 @@ _LT_EOF 13997@@ -9537,8 +10056,8 @@ _LT_EOF
13998 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' 13998 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
13999 wlarc= 13999 wlarc=
14000 else 14000 else
@@ -14005,7 +14005,7 @@ index 98a76d6da7f..a4266996c44 100755
14005 fi 14005 fi
14006 ;; 14006 ;;
14007 14007
14008@@ -9551,8 +10070,8 @@ _LT_EOF 14008@@ -9556,8 +10075,8 @@ _LT_EOF
14009 14009
14010 _LT_EOF 14010 _LT_EOF
14011 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 14011 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -14016,7 +14016,7 @@ index 98a76d6da7f..a4266996c44 100755
14016 else 14016 else
14017 ld_shlibs=no 14017 ld_shlibs=no
14018 fi 14018 fi
14019@@ -9598,8 +10117,8 @@ _LT_EOF 14019@@ -9603,8 +10122,8 @@ _LT_EOF
14020 14020
14021 *) 14021 *)
14022 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 14022 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -14027,7 +14027,7 @@ index 98a76d6da7f..a4266996c44 100755
14027 else 14027 else
14028 ld_shlibs=no 14028 ld_shlibs=no
14029 fi 14029 fi
14030@@ -9729,7 +10248,13 @@ _LT_EOF 14030@@ -9734,7 +10253,13 @@ _LT_EOF
14031 allow_undefined_flag='-berok' 14031 allow_undefined_flag='-berok'
14032 # Determine the default libpath from the value encoded in an 14032 # Determine the default libpath from the value encoded in an
14033 # empty executable. 14033 # empty executable.
@@ -14042,7 +14042,7 @@ index 98a76d6da7f..a4266996c44 100755
14042 /* end confdefs.h. */ 14042 /* end confdefs.h. */
14043 14043
14044 int 14044 int
14045@@ -9742,22 +10267,29 @@ main () 14045@@ -9747,22 +10272,29 @@ main ()
14046 _ACEOF 14046 _ACEOF
14047 if ac_fn_c_try_link "$LINENO"; then : 14047 if ac_fn_c_try_link "$LINENO"; then :
14048 14048
@@ -14085,7 +14085,7 @@ index 98a76d6da7f..a4266996c44 100755
14085 14085
14086 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 14086 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
14087 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" 14087 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"
14088@@ -9769,7 +10301,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 14088@@ -9774,7 +10306,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
14089 else 14089 else
14090 # Determine the default libpath from the value encoded in an 14090 # Determine the default libpath from the value encoded in an
14091 # empty executable. 14091 # empty executable.
@@ -14100,7 +14100,7 @@ index 98a76d6da7f..a4266996c44 100755
14100 /* end confdefs.h. */ 14100 /* end confdefs.h. */
14101 14101
14102 int 14102 int
14103@@ -9782,22 +10320,29 @@ main () 14103@@ -9787,22 +10325,29 @@ main ()
14104 _ACEOF 14104 _ACEOF
14105 if ac_fn_c_try_link "$LINENO"; then : 14105 if ac_fn_c_try_link "$LINENO"; then :
14106 14106
@@ -14143,7 +14143,7 @@ index 98a76d6da7f..a4266996c44 100755
14143 14143
14144 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 14144 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
14145 # Warning - without using the other run time loading flags, 14145 # Warning - without using the other run time loading flags,
14146@@ -9842,20 +10387,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 14146@@ -9847,20 +10392,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
14147 # Microsoft Visual C++. 14147 # Microsoft Visual C++.
14148 # hardcode_libdir_flag_spec is actually meaningless, as there is 14148 # hardcode_libdir_flag_spec is actually meaningless, as there is
14149 # no search path for DLLs. 14149 # no search path for DLLs.
@@ -14221,7 +14221,7 @@ index 98a76d6da7f..a4266996c44 100755
14221 ;; 14221 ;;
14222 14222
14223 darwin* | rhapsody*) 14223 darwin* | rhapsody*)
14224@@ -9916,7 +10504,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 14224@@ -9921,7 +10509,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
14225 14225
14226 # FreeBSD 3 and greater uses gcc -shared to do shared libraries. 14226 # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
14227 freebsd* | dragonfly*) 14227 freebsd* | dragonfly*)
@@ -14230,7 +14230,7 @@ index 98a76d6da7f..a4266996c44 100755
14230 hardcode_libdir_flag_spec='-R$libdir' 14230 hardcode_libdir_flag_spec='-R$libdir'
14231 hardcode_direct=yes 14231 hardcode_direct=yes
14232 hardcode_shlibpath_var=no 14232 hardcode_shlibpath_var=no
14233@@ -9924,7 +10512,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 14233@@ -9929,7 +10517,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
14234 14234
14235 hpux9*) 14235 hpux9*)
14236 if test "$GCC" = yes; then 14236 if test "$GCC" = yes; then
@@ -14239,7 +14239,7 @@ index 98a76d6da7f..a4266996c44 100755
14239 else 14239 else
14240 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' 14240 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'
14241 fi 14241 fi
14242@@ -9940,7 +10528,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 14242@@ -9945,7 +10533,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
14243 14243
14244 hpux10*) 14244 hpux10*)
14245 if test "$GCC" = yes && test "$with_gnu_ld" = no; then 14245 if test "$GCC" = yes && test "$with_gnu_ld" = no; then
@@ -14248,7 +14248,7 @@ index 98a76d6da7f..a4266996c44 100755
14248 else 14248 else
14249 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' 14249 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
14250 fi 14250 fi
14251@@ -9964,10 +10552,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 14251@@ -9969,10 +10557,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
14252 archive_cmds='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' 14252 archive_cmds='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
14253 ;; 14253 ;;
14254 ia64*) 14254 ia64*)
@@ -14261,7 +14261,7 @@ index 98a76d6da7f..a4266996c44 100755
14261 ;; 14261 ;;
14262 esac 14262 esac
14263 else 14263 else
14264@@ -10046,23 +10634,36 @@ fi 14264@@ -10051,23 +10639,36 @@ fi
14265 14265
14266 irix5* | irix6* | nonstopux*) 14266 irix5* | irix6* | nonstopux*)
14267 if test "$GCC" = yes; then 14267 if test "$GCC" = yes; then
@@ -14306,7 +14306,7 @@ index 98a76d6da7f..a4266996c44 100755
14306 else 14306 else
14307 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' 14307 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'
14308 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' 14308 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'
14309@@ -10147,7 +10748,7 @@ rm -f core conftest.err conftest.$ac_objext \ 14309@@ -10152,7 +10753,7 @@ rm -f core conftest.err conftest.$ac_objext \
14310 osf4* | osf5*) # as osf3* with the addition of -msym flag 14310 osf4* | osf5*) # as osf3* with the addition of -msym flag
14311 if test "$GCC" = yes; then 14311 if test "$GCC" = yes; then
14312 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' 14312 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
@@ -14315,7 +14315,7 @@ index 98a76d6da7f..a4266996c44 100755
14315 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' 14315 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
14316 else 14316 else
14317 allow_undefined_flag=' -expect_unresolved \*' 14317 allow_undefined_flag=' -expect_unresolved \*'
14318@@ -10166,9 +10767,9 @@ rm -f core conftest.err conftest.$ac_objext \ 14318@@ -10171,9 +10772,9 @@ rm -f core conftest.err conftest.$ac_objext \
14319 no_undefined_flag=' -z defs' 14319 no_undefined_flag=' -z defs'
14320 if test "$GCC" = yes; then 14320 if test "$GCC" = yes; then
14321 wlarc='${wl}' 14321 wlarc='${wl}'
@@ -14327,7 +14327,7 @@ index 98a76d6da7f..a4266996c44 100755
14327 else 14327 else
14328 case `$CC -V 2>&1` in 14328 case `$CC -V 2>&1` in
14329 *"Compilers 5.0"*) 14329 *"Compilers 5.0"*)
14330@@ -10744,8 +11345,9 @@ cygwin* | mingw* | pw32* | cegcc*) 14330@@ -10749,8 +11350,9 @@ cygwin* | mingw* | pw32* | cegcc*)
14331 need_version=no 14331 need_version=no
14332 need_lib_prefix=no 14332 need_lib_prefix=no
14333 14333
@@ -14339,7 +14339,7 @@ index 98a76d6da7f..a4266996c44 100755
14339 library_names_spec='$libname.dll.a' 14339 library_names_spec='$libname.dll.a'
14340 # DLL is installed to $(libdir)/../bin by postinstall_cmds 14340 # DLL is installed to $(libdir)/../bin by postinstall_cmds
14341 postinstall_cmds='base_file=`basename \${file}`~ 14341 postinstall_cmds='base_file=`basename \${file}`~
14342@@ -10778,13 +11380,71 @@ cygwin* | mingw* | pw32* | cegcc*) 14342@@ -10783,13 +11385,71 @@ cygwin* | mingw* | pw32* | cegcc*)
14343 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' 14343 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
14344 ;; 14344 ;;
14345 esac 14345 esac
@@ -14412,16 +14412,16 @@ index 98a76d6da7f..a4266996c44 100755
14412 # FIXME: first we should search . and the directory the executable is in 14412 # FIXME: first we should search . and the directory the executable is in
14413 shlibpath_var=PATH 14413 shlibpath_var=PATH
14414 ;; 14414 ;;
14415@@ -11686,7 +12346,7 @@ else 14415@@ -11691,7 +12351,7 @@ else
14416 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 14416 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
14417 lt_status=$lt_dlunknown 14417 lt_status=$lt_dlunknown
14418 cat > conftest.$ac_ext <<_LT_EOF 14418 cat > conftest.$ac_ext <<_LT_EOF
14419-#line 11686 "configure" 14419-#line 11691 "configure"
14420+#line $LINENO "configure" 14420+#line $LINENO "configure"
14421 #include "confdefs.h" 14421 #include "confdefs.h"
14422 14422
14423 #if HAVE_DLFCN_H 14423 #if HAVE_DLFCN_H
14424@@ -11730,10 +12390,10 @@ else 14424@@ -11735,10 +12395,10 @@ else
14425 /* When -fvisbility=hidden is used, assume the code has been annotated 14425 /* When -fvisbility=hidden is used, assume the code has been annotated
14426 correspondingly for the symbols needed. */ 14426 correspondingly for the symbols needed. */
14427 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 14427 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
@@ -14434,16 +14434,16 @@ index 98a76d6da7f..a4266996c44 100755
14434 int main () 14434 int main ()
14435 { 14435 {
14436 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 14436 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
14437@@ -11792,7 +12452,7 @@ else 14437@@ -11797,7 +12457,7 @@ else
14438 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 14438 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
14439 lt_status=$lt_dlunknown 14439 lt_status=$lt_dlunknown
14440 cat > conftest.$ac_ext <<_LT_EOF 14440 cat > conftest.$ac_ext <<_LT_EOF
14441-#line 11792 "configure" 14441-#line 11797 "configure"
14442+#line $LINENO "configure" 14442+#line $LINENO "configure"
14443 #include "confdefs.h" 14443 #include "confdefs.h"
14444 14444
14445 #if HAVE_DLFCN_H 14445 #if HAVE_DLFCN_H
14446@@ -11836,10 +12496,10 @@ else 14446@@ -11841,10 +12501,10 @@ else
14447 /* When -fvisbility=hidden is used, assume the code has been annotated 14447 /* When -fvisbility=hidden is used, assume the code has been annotated
14448 correspondingly for the symbols needed. */ 14448 correspondingly for the symbols needed. */
14449 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 14449 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
@@ -14456,7 +14456,7 @@ index 98a76d6da7f..a4266996c44 100755
14456 int main () 14456 int main ()
14457 { 14457 {
14458 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 14458 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
14459@@ -12231,6 +12891,7 @@ $RM -r conftest* 14459@@ -12236,6 +12896,7 @@ $RM -r conftest*
14460 14460
14461 # Allow CC to be a program name with arguments. 14461 # Allow CC to be a program name with arguments.
14462 lt_save_CC=$CC 14462 lt_save_CC=$CC
@@ -14464,7 +14464,7 @@ index 98a76d6da7f..a4266996c44 100755
14464 lt_save_LD=$LD 14464 lt_save_LD=$LD
14465 lt_save_GCC=$GCC 14465 lt_save_GCC=$GCC
14466 GCC=$GXX 14466 GCC=$GXX
14467@@ -12248,6 +12909,7 @@ $RM -r conftest* 14467@@ -12253,6 +12914,7 @@ $RM -r conftest*
14468 fi 14468 fi
14469 test -z "${LDCXX+set}" || LD=$LDCXX 14469 test -z "${LDCXX+set}" || LD=$LDCXX
14470 CC=${CXX-"c++"} 14470 CC=${CXX-"c++"}
@@ -14472,7 +14472,7 @@ index 98a76d6da7f..a4266996c44 100755
14472 compiler=$CC 14472 compiler=$CC
14473 compiler_CXX=$CC 14473 compiler_CXX=$CC
14474 for cc_temp in $compiler""; do 14474 for cc_temp in $compiler""; do
14475@@ -12530,7 +13192,13 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie 14475@@ -12535,7 +13197,13 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
14476 allow_undefined_flag_CXX='-berok' 14476 allow_undefined_flag_CXX='-berok'
14477 # Determine the default libpath from the value encoded in an empty 14477 # Determine the default libpath from the value encoded in an empty
14478 # executable. 14478 # executable.
@@ -14487,7 +14487,7 @@ index 98a76d6da7f..a4266996c44 100755
14487 /* end confdefs.h. */ 14487 /* end confdefs.h. */
14488 14488
14489 int 14489 int
14490@@ -12543,22 +13211,29 @@ main () 14490@@ -12548,22 +13216,29 @@ main ()
14491 _ACEOF 14491 _ACEOF
14492 if ac_fn_cxx_try_link "$LINENO"; then : 14492 if ac_fn_cxx_try_link "$LINENO"; then :
14493 14493
@@ -14530,7 +14530,7 @@ index 98a76d6da7f..a4266996c44 100755
14530 14530
14531 hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" 14531 hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
14532 14532
14533@@ -12571,7 +13246,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 14533@@ -12576,7 +13251,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
14534 else 14534 else
14535 # Determine the default libpath from the value encoded in an 14535 # Determine the default libpath from the value encoded in an
14536 # empty executable. 14536 # empty executable.
@@ -14545,7 +14545,7 @@ index 98a76d6da7f..a4266996c44 100755
14545 /* end confdefs.h. */ 14545 /* end confdefs.h. */
14546 14546
14547 int 14547 int
14548@@ -12584,22 +13265,29 @@ main () 14548@@ -12589,22 +13270,29 @@ main ()
14549 _ACEOF 14549 _ACEOF
14550 if ac_fn_cxx_try_link "$LINENO"; then : 14550 if ac_fn_cxx_try_link "$LINENO"; then :
14551 14551
@@ -14588,7 +14588,7 @@ index 98a76d6da7f..a4266996c44 100755
14588 14588
14589 hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" 14589 hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
14590 # Warning - without using the other run time loading flags, 14590 # Warning - without using the other run time loading flags,
14591@@ -12642,29 +13330,75 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 14591@@ -12647,29 +13335,75 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
14592 ;; 14592 ;;
14593 14593
14594 cygwin* | mingw* | pw32* | cegcc*) 14594 cygwin* | mingw* | pw32* | cegcc*)
@@ -14687,7 +14687,7 @@ index 98a76d6da7f..a4266996c44 100755
14687 darwin* | rhapsody*) 14687 darwin* | rhapsody*)
14688 14688
14689 14689
14690@@ -12770,7 +13504,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 14690@@ -12775,7 +13509,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
14691 ;; 14691 ;;
14692 *) 14692 *)
14693 if test "$GXX" = yes; then 14693 if test "$GXX" = yes; then
@@ -14696,7 +14696,7 @@ index 98a76d6da7f..a4266996c44 100755
14696 else 14696 else
14697 # FIXME: insert proper C++ library support 14697 # FIXME: insert proper C++ library support
14698 ld_shlibs_CXX=no 14698 ld_shlibs_CXX=no
14699@@ -12841,10 +13575,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 14699@@ -12846,10 +13580,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
14700 archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' 14700 archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
14701 ;; 14701 ;;
14702 ia64*) 14702 ia64*)
@@ -14709,7 +14709,7 @@ index 98a76d6da7f..a4266996c44 100755
14709 ;; 14709 ;;
14710 esac 14710 esac
14711 fi 14711 fi
14712@@ -12885,9 +13619,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 14712@@ -12890,9 +13624,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
14713 *) 14713 *)
14714 if test "$GXX" = yes; then 14714 if test "$GXX" = yes; then
14715 if test "$with_gnu_ld" = no; then 14715 if test "$with_gnu_ld" = no; then
@@ -14721,7 +14721,7 @@ index 98a76d6da7f..a4266996c44 100755
14721 fi 14721 fi
14722 fi 14722 fi
14723 link_all_deplibs_CXX=yes 14723 link_all_deplibs_CXX=yes
14724@@ -13165,7 +13899,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 14724@@ -13170,7 +13904,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
14725 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' 14725 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'
14726 ;; 14726 ;;
14727 *) 14727 *)
@@ -14730,7 +14730,7 @@ index 98a76d6da7f..a4266996c44 100755
14730 ;; 14730 ;;
14731 esac 14731 esac
14732 14732
14733@@ -13211,7 +13945,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 14733@@ -13216,7 +13950,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
14734 14734
14735 solaris*) 14735 solaris*)
14736 case $cc_basename in 14736 case $cc_basename in
@@ -14739,7 +14739,7 @@ index 98a76d6da7f..a4266996c44 100755
14739 # Sun C++ 4.2, 5.x and Centerline C++ 14739 # Sun C++ 4.2, 5.x and Centerline C++
14740 archive_cmds_need_lc_CXX=yes 14740 archive_cmds_need_lc_CXX=yes
14741 no_undefined_flag_CXX=' -zdefs' 14741 no_undefined_flag_CXX=' -zdefs'
14742@@ -13252,9 +13986,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 14742@@ -13257,9 +13991,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
14743 if test "$GXX" = yes && test "$with_gnu_ld" = no; then 14743 if test "$GXX" = yes && test "$with_gnu_ld" = no; then
14744 no_undefined_flag_CXX=' ${wl}-z ${wl}defs' 14744 no_undefined_flag_CXX=' ${wl}-z ${wl}defs'
14745 if $CC --version | $GREP -v '^2\.7' > /dev/null; then 14745 if $CC --version | $GREP -v '^2\.7' > /dev/null; then
@@ -14751,7 +14751,7 @@ index 98a76d6da7f..a4266996c44 100755
14751 14751
14752 # Commands to make compiler produce verbose output that lists 14752 # Commands to make compiler produce verbose output that lists
14753 # what "hidden" libraries, object files and flags are used when 14753 # what "hidden" libraries, object files and flags are used when
14754@@ -13390,6 +14124,13 @@ private: 14754@@ -13395,6 +14129,13 @@ private:
14755 }; 14755 };
14756 _LT_EOF 14756 _LT_EOF
14757 14757
@@ -14765,7 +14765,7 @@ index 98a76d6da7f..a4266996c44 100755
14765 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 14765 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
14766 (eval $ac_compile) 2>&5 14766 (eval $ac_compile) 2>&5
14767 ac_status=$? 14767 ac_status=$?
14768@@ -13403,7 +14144,7 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 14768@@ -13408,7 +14149,7 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
14769 pre_test_object_deps_done=no 14769 pre_test_object_deps_done=no
14770 14770
14771 for p in `eval "$output_verbose_link_cmd"`; do 14771 for p in `eval "$output_verbose_link_cmd"`; do
@@ -14774,7 +14774,7 @@ index 98a76d6da7f..a4266996c44 100755
14774 14774
14775 -L* | -R* | -l*) 14775 -L* | -R* | -l*)
14776 # Some compilers place space between "-{L,R}" and the path. 14776 # Some compilers place space between "-{L,R}" and the path.
14777@@ -13412,13 +14153,22 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 14777@@ -13417,13 +14158,22 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
14778 test $p = "-R"; then 14778 test $p = "-R"; then
14779 prev=$p 14779 prev=$p
14780 continue 14780 continue
@@ -14801,7 +14801,7 @@ index 98a76d6da7f..a4266996c44 100755
14801 # Internal compiler library paths should come after those 14801 # Internal compiler library paths should come after those
14802 # provided the user. The postdeps already come after the 14802 # provided the user. The postdeps already come after the
14803 # user supplied libs so there is no need to process them. 14803 # user supplied libs so there is no need to process them.
14804@@ -13438,8 +14188,10 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 14804@@ -13443,8 +14193,10 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
14805 postdeps_CXX="${postdeps_CXX} ${prev}${p}" 14805 postdeps_CXX="${postdeps_CXX} ${prev}${p}"
14806 fi 14806 fi
14807 fi 14807 fi
@@ -14812,7 +14812,7 @@ index 98a76d6da7f..a4266996c44 100755
14812 *.$objext) 14812 *.$objext)
14813 # This assumes that the test object file only shows up 14813 # This assumes that the test object file only shows up
14814 # once in the compiler output. 14814 # once in the compiler output.
14815@@ -13475,6 +14227,7 @@ else 14815@@ -13480,6 +14232,7 @@ else
14816 fi 14816 fi
14817 14817
14818 $RM -f confest.$objext 14818 $RM -f confest.$objext
@@ -14820,7 +14820,7 @@ index 98a76d6da7f..a4266996c44 100755
14820 14820
14821 # PORTME: override above test on systems where it is broken 14821 # PORTME: override above test on systems where it is broken
14822 case $host_os in 14822 case $host_os in
14823@@ -13510,7 +14263,7 @@ linux*) 14823@@ -13515,7 +14268,7 @@ linux*)
14824 14824
14825 solaris*) 14825 solaris*)
14826 case $cc_basename in 14826 case $cc_basename in
@@ -14829,7 +14829,7 @@ index 98a76d6da7f..a4266996c44 100755
14829 # The more standards-conforming stlport4 library is 14829 # The more standards-conforming stlport4 library is
14830 # incompatible with the Cstd library. Avoid specifying 14830 # incompatible with the Cstd library. Avoid specifying
14831 # it if it's in CXXFLAGS. Ignore libCrun as 14831 # it if it's in CXXFLAGS. Ignore libCrun as
14832@@ -13575,8 +14328,6 @@ fi 14832@@ -13580,8 +14333,6 @@ fi
14833 lt_prog_compiler_pic_CXX= 14833 lt_prog_compiler_pic_CXX=
14834 lt_prog_compiler_static_CXX= 14834 lt_prog_compiler_static_CXX=
14835 14835
@@ -14838,7 +14838,7 @@ index 98a76d6da7f..a4266996c44 100755
14838 14838
14839 # C++ specific cases for pic, static, wl, etc. 14839 # C++ specific cases for pic, static, wl, etc.
14840 if test "$GXX" = yes; then 14840 if test "$GXX" = yes; then
14841@@ -13681,6 +14432,11 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 14841@@ -13686,6 +14437,11 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
14842 ;; 14842 ;;
14843 esac 14843 esac
14844 ;; 14844 ;;
@@ -14850,7 +14850,7 @@ index 98a76d6da7f..a4266996c44 100755
14850 dgux*) 14850 dgux*)
14851 case $cc_basename in 14851 case $cc_basename in
14852 ec++*) 14852 ec++*)
14853@@ -13833,7 +14589,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 14853@@ -13838,7 +14594,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
14854 ;; 14854 ;;
14855 solaris*) 14855 solaris*)
14856 case $cc_basename in 14856 case $cc_basename in
@@ -14859,7 +14859,7 @@ index 98a76d6da7f..a4266996c44 100755
14859 # Sun C++ 4.2, 5.x and Centerline C++ 14859 # Sun C++ 4.2, 5.x and Centerline C++
14860 lt_prog_compiler_pic_CXX='-KPIC' 14860 lt_prog_compiler_pic_CXX='-KPIC'
14861 lt_prog_compiler_static_CXX='-Bstatic' 14861 lt_prog_compiler_static_CXX='-Bstatic'
14862@@ -13898,10 +14654,17 @@ case $host_os in 14862@@ -13903,10 +14659,17 @@ case $host_os in
14863 lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC" 14863 lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC"
14864 ;; 14864 ;;
14865 esac 14865 esac
@@ -14880,7 +14880,7 @@ index 98a76d6da7f..a4266996c44 100755
14880 14880
14881 # 14881 #
14882 # Check to make sure the PIC flag actually works. 14882 # Check to make sure the PIC flag actually works.
14883@@ -13959,6 +14722,8 @@ fi 14883@@ -13964,6 +14727,8 @@ fi
14884 14884
14885 14885
14886 14886
@@ -14889,7 +14889,7 @@ index 98a76d6da7f..a4266996c44 100755
14889 # 14889 #
14890 # Check to make sure the static flag actually works. 14890 # Check to make sure the static flag actually works.
14891 # 14891 #
14892@@ -14136,6 +14901,7 @@ fi 14892@@ -14141,6 +14906,7 @@ fi
14893 $as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } 14893 $as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
14894 14894
14895 export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' 14895 export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
@@ -14897,7 +14897,7 @@ index 98a76d6da7f..a4266996c44 100755
14897 case $host_os in 14897 case $host_os in
14898 aix[4-9]*) 14898 aix[4-9]*)
14899 # If we're using GNU nm, then we don't want the "-C" option. 14899 # If we're using GNU nm, then we don't want the "-C" option.
14900@@ -14150,15 +14916,20 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie 14900@@ -14155,15 +14921,20 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
14901 ;; 14901 ;;
14902 pw32*) 14902 pw32*)
14903 export_symbols_cmds_CXX="$ltdll_cmds" 14903 export_symbols_cmds_CXX="$ltdll_cmds"
@@ -14923,7 +14923,7 @@ index 98a76d6da7f..a4266996c44 100755
14923 14923
14924 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5 14924 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5
14925 $as_echo "$ld_shlibs_CXX" >&6; } 14925 $as_echo "$ld_shlibs_CXX" >&6; }
14926@@ -14421,8 +15192,9 @@ cygwin* | mingw* | pw32* | cegcc*) 14926@@ -14426,8 +15197,9 @@ cygwin* | mingw* | pw32* | cegcc*)
14927 need_version=no 14927 need_version=no
14928 need_lib_prefix=no 14928 need_lib_prefix=no
14929 14929
@@ -14935,7 +14935,7 @@ index 98a76d6da7f..a4266996c44 100755
14935 library_names_spec='$libname.dll.a' 14935 library_names_spec='$libname.dll.a'
14936 # DLL is installed to $(libdir)/../bin by postinstall_cmds 14936 # DLL is installed to $(libdir)/../bin by postinstall_cmds
14937 postinstall_cmds='base_file=`basename \${file}`~ 14937 postinstall_cmds='base_file=`basename \${file}`~
14938@@ -14454,13 +15226,71 @@ cygwin* | mingw* | pw32* | cegcc*) 14938@@ -14459,13 +15231,71 @@ cygwin* | mingw* | pw32* | cegcc*)
14939 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' 14939 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
14940 ;; 14940 ;;
14941 esac 14941 esac
@@ -15008,7 +15008,7 @@ index 98a76d6da7f..a4266996c44 100755
15008 # FIXME: first we should search . and the directory the executable is in 15008 # FIXME: first we should search . and the directory the executable is in
15009 shlibpath_var=PATH 15009 shlibpath_var=PATH
15010 ;; 15010 ;;
15011@@ -15024,6 +15854,7 @@ fi 15011@@ -15029,6 +15859,7 @@ fi
15012 fi # test -n "$compiler" 15012 fi # test -n "$compiler"
15013 15013
15014 CC=$lt_save_CC 15014 CC=$lt_save_CC
@@ -15016,7 +15016,7 @@ index 98a76d6da7f..a4266996c44 100755
15016 LDCXX=$LD 15016 LDCXX=$LD
15017 LD=$lt_save_LD 15017 LD=$lt_save_LD
15018 GCC=$lt_save_GCC 15018 GCC=$lt_save_GCC
15019@@ -20310,13 +21141,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' 15019@@ -20389,13 +21220,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
15020 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' 15020 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
15021 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' 15021 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
15022 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' 15022 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
@@ -15037,7 +15037,7 @@ index 98a76d6da7f..a4266996c44 100755
15037 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' 15037 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
15038 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' 15038 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
15039 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' 15039 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
15040@@ -20331,14 +21169,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de 15040@@ -20410,14 +21248,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de
15041 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' 15041 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
15042 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' 15042 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
15043 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"`' 15043 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"`'
@@ -15056,7 +15056,7 @@ index 98a76d6da7f..a4266996c44 100755
15056 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' 15056 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
15057 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' 15057 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
15058 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' 15058 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
15059@@ -20371,12 +21212,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q 15059@@ -20450,12 +21291,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q
15060 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' 15060 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
15061 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' 15061 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
15062 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' 15062 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
@@ -15070,7 +15070,7 @@ index 98a76d6da7f..a4266996c44 100755
15070 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' 15070 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
15071 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' 15071 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
15072 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' 15072 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
15073@@ -20415,8 +21256,8 @@ old_archive_cmds_CXX='`$ECHO "$old_archive_cmds_CXX" | $SED "$delay_single_quote 15073@@ -20494,8 +21335,8 @@ old_archive_cmds_CXX='`$ECHO "$old_archive_cmds_CXX" | $SED "$delay_single_quote
15074 compiler_CXX='`$ECHO "$compiler_CXX" | $SED "$delay_single_quote_subst"`' 15074 compiler_CXX='`$ECHO "$compiler_CXX" | $SED "$delay_single_quote_subst"`'
15075 GCC_CXX='`$ECHO "$GCC_CXX" | $SED "$delay_single_quote_subst"`' 15075 GCC_CXX='`$ECHO "$GCC_CXX" | $SED "$delay_single_quote_subst"`'
15076 lt_prog_compiler_no_builtin_flag_CXX='`$ECHO "$lt_prog_compiler_no_builtin_flag_CXX" | $SED "$delay_single_quote_subst"`' 15076 lt_prog_compiler_no_builtin_flag_CXX='`$ECHO "$lt_prog_compiler_no_builtin_flag_CXX" | $SED "$delay_single_quote_subst"`'
@@ -15080,7 +15080,7 @@ index 98a76d6da7f..a4266996c44 100755
15080 lt_prog_compiler_static_CXX='`$ECHO "$lt_prog_compiler_static_CXX" | $SED "$delay_single_quote_subst"`' 15080 lt_prog_compiler_static_CXX='`$ECHO "$lt_prog_compiler_static_CXX" | $SED "$delay_single_quote_subst"`'
15081 lt_cv_prog_compiler_c_o_CXX='`$ECHO "$lt_cv_prog_compiler_c_o_CXX" | $SED "$delay_single_quote_subst"`' 15081 lt_cv_prog_compiler_c_o_CXX='`$ECHO "$lt_cv_prog_compiler_c_o_CXX" | $SED "$delay_single_quote_subst"`'
15082 archive_cmds_need_lc_CXX='`$ECHO "$archive_cmds_need_lc_CXX" | $SED "$delay_single_quote_subst"`' 15082 archive_cmds_need_lc_CXX='`$ECHO "$archive_cmds_need_lc_CXX" | $SED "$delay_single_quote_subst"`'
15083@@ -20443,12 +21284,12 @@ hardcode_shlibpath_var_CXX='`$ECHO "$hardcode_shlibpath_var_CXX" | $SED "$delay_ 15083@@ -20522,12 +21363,12 @@ hardcode_shlibpath_var_CXX='`$ECHO "$hardcode_shlibpath_var_CXX" | $SED "$delay_
15084 hardcode_automatic_CXX='`$ECHO "$hardcode_automatic_CXX" | $SED "$delay_single_quote_subst"`' 15084 hardcode_automatic_CXX='`$ECHO "$hardcode_automatic_CXX" | $SED "$delay_single_quote_subst"`'
15085 inherit_rpath_CXX='`$ECHO "$inherit_rpath_CXX" | $SED "$delay_single_quote_subst"`' 15085 inherit_rpath_CXX='`$ECHO "$inherit_rpath_CXX" | $SED "$delay_single_quote_subst"`'
15086 link_all_deplibs_CXX='`$ECHO "$link_all_deplibs_CXX" | $SED "$delay_single_quote_subst"`' 15086 link_all_deplibs_CXX='`$ECHO "$link_all_deplibs_CXX" | $SED "$delay_single_quote_subst"`'
@@ -15094,7 +15094,7 @@ index 98a76d6da7f..a4266996c44 100755
15094 file_list_spec_CXX='`$ECHO "$file_list_spec_CXX" | $SED "$delay_single_quote_subst"`' 15094 file_list_spec_CXX='`$ECHO "$file_list_spec_CXX" | $SED "$delay_single_quote_subst"`'
15095 hardcode_action_CXX='`$ECHO "$hardcode_action_CXX" | $SED "$delay_single_quote_subst"`' 15095 hardcode_action_CXX='`$ECHO "$hardcode_action_CXX" | $SED "$delay_single_quote_subst"`'
15096 compiler_lib_search_dirs_CXX='`$ECHO "$compiler_lib_search_dirs_CXX" | $SED "$delay_single_quote_subst"`' 15096 compiler_lib_search_dirs_CXX='`$ECHO "$compiler_lib_search_dirs_CXX" | $SED "$delay_single_quote_subst"`'
15097@@ -20486,8 +21327,13 @@ reload_flag \ 15097@@ -20565,8 +21406,13 @@ reload_flag \
15098 OBJDUMP \ 15098 OBJDUMP \
15099 deplibs_check_method \ 15099 deplibs_check_method \
15100 file_magic_cmd \ 15100 file_magic_cmd \
@@ -15108,7 +15108,7 @@ index 98a76d6da7f..a4266996c44 100755
15108 STRIP \ 15108 STRIP \
15109 RANLIB \ 15109 RANLIB \
15110 CC \ 15110 CC \
15111@@ -20497,12 +21343,14 @@ lt_cv_sys_global_symbol_pipe \ 15111@@ -20576,12 +21422,14 @@ lt_cv_sys_global_symbol_pipe \
15112 lt_cv_sys_global_symbol_to_cdecl \ 15112 lt_cv_sys_global_symbol_to_cdecl \
15113 lt_cv_sys_global_symbol_to_c_name_address \ 15113 lt_cv_sys_global_symbol_to_c_name_address \
15114 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ 15114 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
@@ -15124,7 +15124,7 @@ index 98a76d6da7f..a4266996c44 100755
15124 DSYMUTIL \ 15124 DSYMUTIL \
15125 NMEDIT \ 15125 NMEDIT \
15126 LIPO \ 15126 LIPO \
15127@@ -20518,7 +21366,6 @@ no_undefined_flag \ 15127@@ -20597,7 +21445,6 @@ no_undefined_flag \
15128 hardcode_libdir_flag_spec \ 15128 hardcode_libdir_flag_spec \
15129 hardcode_libdir_flag_spec_ld \ 15129 hardcode_libdir_flag_spec_ld \
15130 hardcode_libdir_separator \ 15130 hardcode_libdir_separator \
@@ -15132,7 +15132,7 @@ index 98a76d6da7f..a4266996c44 100755
15132 exclude_expsyms \ 15132 exclude_expsyms \
15133 include_expsyms \ 15133 include_expsyms \
15134 file_list_spec \ 15134 file_list_spec \
15135@@ -20540,8 +21387,8 @@ LD_CXX \ 15135@@ -20619,8 +21466,8 @@ LD_CXX \
15136 reload_flag_CXX \ 15136 reload_flag_CXX \
15137 compiler_CXX \ 15137 compiler_CXX \
15138 lt_prog_compiler_no_builtin_flag_CXX \ 15138 lt_prog_compiler_no_builtin_flag_CXX \
@@ -15142,7 +15142,7 @@ index 98a76d6da7f..a4266996c44 100755
15142 lt_prog_compiler_static_CXX \ 15142 lt_prog_compiler_static_CXX \
15143 lt_cv_prog_compiler_c_o_CXX \ 15143 lt_cv_prog_compiler_c_o_CXX \
15144 export_dynamic_flag_spec_CXX \ 15144 export_dynamic_flag_spec_CXX \
15145@@ -20553,7 +21400,6 @@ no_undefined_flag_CXX \ 15145@@ -20632,7 +21479,6 @@ no_undefined_flag_CXX \
15146 hardcode_libdir_flag_spec_CXX \ 15146 hardcode_libdir_flag_spec_CXX \
15147 hardcode_libdir_flag_spec_ld_CXX \ 15147 hardcode_libdir_flag_spec_ld_CXX \
15148 hardcode_libdir_separator_CXX \ 15148 hardcode_libdir_separator_CXX \
@@ -15150,7 +15150,7 @@ index 98a76d6da7f..a4266996c44 100755
15150 exclude_expsyms_CXX \ 15150 exclude_expsyms_CXX \
15151 include_expsyms_CXX \ 15151 include_expsyms_CXX \
15152 file_list_spec_CXX \ 15152 file_list_spec_CXX \
15153@@ -20587,6 +21433,7 @@ module_cmds \ 15153@@ -20666,6 +21512,7 @@ module_cmds \
15154 module_expsym_cmds \ 15154 module_expsym_cmds \
15155 export_symbols_cmds \ 15155 export_symbols_cmds \
15156 prelink_cmds \ 15156 prelink_cmds \
@@ -15158,7 +15158,7 @@ index 98a76d6da7f..a4266996c44 100755
15158 postinstall_cmds \ 15158 postinstall_cmds \
15159 postuninstall_cmds \ 15159 postuninstall_cmds \
15160 finish_cmds \ 15160 finish_cmds \
15161@@ -20601,7 +21448,8 @@ archive_expsym_cmds_CXX \ 15161@@ -20680,7 +21527,8 @@ archive_expsym_cmds_CXX \
15162 module_cmds_CXX \ 15162 module_cmds_CXX \
15163 module_expsym_cmds_CXX \ 15163 module_expsym_cmds_CXX \
15164 export_symbols_cmds_CXX \ 15164 export_symbols_cmds_CXX \
@@ -15168,7 +15168,7 @@ index 98a76d6da7f..a4266996c44 100755
15168 case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in 15168 case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
15169 *[\\\\\\\`\\"\\\$]*) 15169 *[\\\\\\\`\\"\\\$]*)
15170 eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" 15170 eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
15171@@ -21374,7 +22222,8 @@ $as_echo X"$file" | 15171@@ -21453,7 +22301,8 @@ $as_echo X"$file" |
15172 # NOTE: Changes made to this file will be lost: look at ltmain.sh. 15172 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
15173 # 15173 #
15174 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 15174 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
@@ -15178,7 +15178,7 @@ index 98a76d6da7f..a4266996c44 100755
15178 # Written by Gordon Matzigkeit, 1996 15178 # Written by Gordon Matzigkeit, 1996
15179 # 15179 #
15180 # This file is part of GNU Libtool. 15180 # This file is part of GNU Libtool.
15181@@ -21477,19 +22326,42 @@ SP2NL=$lt_lt_SP2NL 15181@@ -21556,19 +22405,42 @@ SP2NL=$lt_lt_SP2NL
15182 # turn newlines into spaces. 15182 # turn newlines into spaces.
15183 NL2SP=$lt_lt_NL2SP 15183 NL2SP=$lt_lt_NL2SP
15184 15184
@@ -15222,7 +15222,7 @@ index 98a76d6da7f..a4266996c44 100755
15222 # A symbol stripping program. 15222 # A symbol stripping program.
15223 STRIP=$lt_STRIP 15223 STRIP=$lt_STRIP
15224 15224
15225@@ -21519,6 +22391,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address 15225@@ -21598,6 +22470,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
15226 # Transform the output of nm in a C name address pair when lib prefix is needed. 15226 # Transform the output of nm in a C name address pair when lib prefix is needed.
15227 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix 15227 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
15228 15228
@@ -15235,7 +15235,7 @@ index 98a76d6da7f..a4266996c44 100755
15235 # The name of the directory that contains temporary libtool files. 15235 # The name of the directory that contains temporary libtool files.
15236 objdir=$objdir 15236 objdir=$objdir
15237 15237
15238@@ -21528,6 +22406,9 @@ MAGIC_CMD=$MAGIC_CMD 15238@@ -21607,6 +22485,9 @@ MAGIC_CMD=$MAGIC_CMD
15239 # Must we lock files when doing compilation? 15239 # Must we lock files when doing compilation?
15240 need_locks=$lt_need_locks 15240 need_locks=$lt_need_locks
15241 15241
@@ -15245,7 +15245,7 @@ index 98a76d6da7f..a4266996c44 100755
15245 # Tool to manipulate archived DWARF debug symbol files on Mac OS X. 15245 # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
15246 DSYMUTIL=$lt_DSYMUTIL 15246 DSYMUTIL=$lt_DSYMUTIL
15247 15247
15248@@ -21642,12 +22523,12 @@ with_gcc=$GCC 15248@@ -21721,12 +22602,12 @@ with_gcc=$GCC
15249 # Compiler flag to turn off builtin functions. 15249 # Compiler flag to turn off builtin functions.
15250 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag 15250 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
15251 15251
@@ -15261,7 +15261,7 @@ index 98a76d6da7f..a4266996c44 100755
15261 # Compiler flag to prevent dynamic linking. 15261 # Compiler flag to prevent dynamic linking.
15262 link_static_flag=$lt_lt_prog_compiler_static 15262 link_static_flag=$lt_lt_prog_compiler_static
15263 15263
15264@@ -21734,9 +22615,6 @@ inherit_rpath=$inherit_rpath 15264@@ -21813,9 +22694,6 @@ inherit_rpath=$inherit_rpath
15265 # Whether libtool must link a program against all its dependency libraries. 15265 # Whether libtool must link a program against all its dependency libraries.
15266 link_all_deplibs=$link_all_deplibs 15266 link_all_deplibs=$link_all_deplibs
15267 15267
@@ -15271,7 +15271,7 @@ index 98a76d6da7f..a4266996c44 100755
15271 # Set to "yes" if exported symbols are required. 15271 # Set to "yes" if exported symbols are required.
15272 always_export_symbols=$always_export_symbols 15272 always_export_symbols=$always_export_symbols
15273 15273
15274@@ -21752,6 +22630,9 @@ include_expsyms=$lt_include_expsyms 15274@@ -21831,6 +22709,9 @@ include_expsyms=$lt_include_expsyms
15275 # Commands necessary for linking programs (against libraries) with templates. 15275 # Commands necessary for linking programs (against libraries) with templates.
15276 prelink_cmds=$lt_prelink_cmds 15276 prelink_cmds=$lt_prelink_cmds
15277 15277
@@ -15281,7 +15281,7 @@ index 98a76d6da7f..a4266996c44 100755
15281 # Specify filename containing input files. 15281 # Specify filename containing input files.
15282 file_list_spec=$lt_file_list_spec 15282 file_list_spec=$lt_file_list_spec
15283 15283
15284@@ -21798,210 +22679,169 @@ ltmain="$ac_aux_dir/ltmain.sh" 15284@@ -21877,210 +22758,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
15285 # if finds mixed CR/LF and LF-only lines. Since sed operates in 15285 # if finds mixed CR/LF and LF-only lines. Since sed operates in
15286 # text mode, it properly converts lines to CR/LF. This bash problem 15286 # text mode, it properly converts lines to CR/LF. This bash problem
15287 # is reportedly fixed, but why not run on old versions too? 15287 # is reportedly fixed, but why not run on old versions too?
@@ -15655,7 +15655,7 @@ index 98a76d6da7f..a4266996c44 100755
15655 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") 15655 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
15656 chmod +x "$ofile" 15656 chmod +x "$ofile"
15657 15657
15658@@ -22029,12 +22869,12 @@ with_gcc=$GCC_CXX 15658@@ -22108,12 +22948,12 @@ with_gcc=$GCC_CXX
15659 # Compiler flag to turn off builtin functions. 15659 # Compiler flag to turn off builtin functions.
15660 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX 15660 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX
15661 15661
@@ -15671,7 +15671,7 @@ index 98a76d6da7f..a4266996c44 100755
15671 # Compiler flag to prevent dynamic linking. 15671 # Compiler flag to prevent dynamic linking.
15672 link_static_flag=$lt_lt_prog_compiler_static_CXX 15672 link_static_flag=$lt_lt_prog_compiler_static_CXX
15673 15673
15674@@ -22121,9 +22961,6 @@ inherit_rpath=$inherit_rpath_CXX 15674@@ -22200,9 +23040,6 @@ inherit_rpath=$inherit_rpath_CXX
15675 # Whether libtool must link a program against all its dependency libraries. 15675 # Whether libtool must link a program against all its dependency libraries.
15676 link_all_deplibs=$link_all_deplibs_CXX 15676 link_all_deplibs=$link_all_deplibs_CXX
15677 15677
@@ -15681,7 +15681,7 @@ index 98a76d6da7f..a4266996c44 100755
15681 # Set to "yes" if exported symbols are required. 15681 # Set to "yes" if exported symbols are required.
15682 always_export_symbols=$always_export_symbols_CXX 15682 always_export_symbols=$always_export_symbols_CXX
15683 15683
15684@@ -22139,6 +22976,9 @@ include_expsyms=$lt_include_expsyms_CXX 15684@@ -22218,6 +23055,9 @@ include_expsyms=$lt_include_expsyms_CXX
15685 # Commands necessary for linking programs (against libraries) with templates. 15685 # Commands necessary for linking programs (against libraries) with templates.
15686 prelink_cmds=$lt_prelink_cmds_CXX 15686 prelink_cmds=$lt_prelink_cmds_CXX
15687 15687
@@ -15692,7 +15692,7 @@ index 98a76d6da7f..a4266996c44 100755
15692 file_list_spec=$lt_file_list_spec_CXX 15692 file_list_spec=$lt_file_list_spec_CXX
15693 15693
15694diff --git a/libbacktrace/Makefile.in b/libbacktrace/Makefile.in 15694diff --git a/libbacktrace/Makefile.in b/libbacktrace/Makefile.in
15695index 0a61880ba67..500756cd023 100644 15695index 49852a21d37..d371dda2d34 100644
15696--- a/libbacktrace/Makefile.in 15696--- a/libbacktrace/Makefile.in
15697+++ b/libbacktrace/Makefile.in 15697+++ b/libbacktrace/Makefile.in
15698@@ -1,7 +1,7 @@ 15698@@ -1,7 +1,7 @@
@@ -15705,79 +15705,83 @@ index 0a61880ba67..500756cd023 100644
15705 15705
15706 # This Makefile.in is free software; the Free Software Foundation 15706 # This Makefile.in is free software; the Free Software Foundation
15707 # gives unlimited permission to copy and/or distribute it, 15707 # gives unlimited permission to copy and/or distribute it,
15708@@ -189,6 +189,35 @@ CONFIG_HEADER = config.h 15708@@ -190,37 +190,6 @@ CONFIG_HEADER = config.h
15709 CONFIG_CLEAN_FILES = backtrace-supported.h \ 15709 CONFIG_CLEAN_FILES = backtrace-supported.h \
15710 install-debuginfo-for-buildid.sh 15710 install-debuginfo-for-buildid.sh
15711 CONFIG_CLEAN_VPATH_FILES = 15711 CONFIG_CLEAN_VPATH_FILES =
15712+@NATIVE_TRUE@am__EXEEXT_1 = allocfail$(EXEEXT) 15712-LTLIBRARIES = $(noinst_LTLIBRARIES)
15713+@HAVE_ELF_TRUE@@HAVE_OBJCOPY_DEBUGLINK_TRUE@@NATIVE_TRUE@am__EXEEXT_2 = b2test$(EXEEXT) 15713-am__DEPENDENCIES_1 =
15714+@HAVE_DWZ_TRUE@@HAVE_ELF_TRUE@@HAVE_OBJCOPY_DEBUGLINK_TRUE@@NATIVE_TRUE@am__EXEEXT_3 = b3test$(EXEEXT) 15714-am_libbacktrace_la_OBJECTS = atomic.lo dwarf.lo fileline.lo posix.lo \
15715+@NATIVE_TRUE@am__EXEEXT_4 = test_elf_32$(EXEEXT) test_elf_64$(EXEEXT) \ 15715- print.lo sort.lo state.lo
15716+@NATIVE_TRUE@ test_macho$(EXEEXT) test_xcoff_32$(EXEEXT) \ 15716-libbacktrace_la_OBJECTS = $(am_libbacktrace_la_OBJECTS)
15717+@NATIVE_TRUE@ test_xcoff_64$(EXEEXT) test_pecoff$(EXEEXT) \ 15717-AM_V_lt = $(am__v_lt_@AM_V@)
15718+@NATIVE_TRUE@ test_unknown$(EXEEXT) unittest$(EXEEXT) \ 15718-am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
15719+@NATIVE_TRUE@ unittest_alloc$(EXEEXT) btest$(EXEEXT) 15719-am__v_lt_0 = --silent
15720+@HAVE_ELF_TRUE@@NATIVE_TRUE@am__EXEEXT_5 = btest_lto$(EXEEXT) 15720-am__v_lt_1 =
15721+@NATIVE_TRUE@am__EXEEXT_6 = btest_alloc$(EXEEXT) stest$(EXEEXT) \ 15721-am__objects_1 = atomic.lo dwarf.lo fileline.lo posix.lo print.lo \
15722+@NATIVE_TRUE@ stest_alloc$(EXEEXT) 15722- sort.lo state.lo
15723+@HAVE_ELF_TRUE@@NATIVE_TRUE@am__EXEEXT_7 = ztest$(EXEEXT) \ 15723-@NATIVE_TRUE@am_libbacktrace_alloc_la_OBJECTS = $(am__objects_1)
15724+@HAVE_ELF_TRUE@@NATIVE_TRUE@ ztest_alloc$(EXEEXT) 15724-libbacktrace_alloc_la_OBJECTS = $(am_libbacktrace_alloc_la_OBJECTS)
15725+@NATIVE_TRUE@am__EXEEXT_8 = edtest$(EXEEXT) edtest_alloc$(EXEEXT) 15725-@NATIVE_TRUE@am_libbacktrace_alloc_la_rpath =
15726+@HAVE_PTHREAD_TRUE@@NATIVE_TRUE@am__EXEEXT_9 = ttest$(EXEEXT) \ 15726-@HAVE_ELF_TRUE@@HAVE_OBJCOPY_DEBUGLINK_TRUE@@NATIVE_TRUE@libbacktrace_elf_for_test_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
15727+@HAVE_PTHREAD_TRUE@@NATIVE_TRUE@ ttest_alloc$(EXEEXT) 15727-@HAVE_ELF_TRUE@@HAVE_OBJCOPY_DEBUGLINK_TRUE@@NATIVE_TRUE@ elf_for_test.lo \
15728+@HAVE_COMPRESSED_DEBUG_TRUE@@NATIVE_TRUE@am__EXEEXT_10 = \ 15728-@HAVE_ELF_TRUE@@HAVE_OBJCOPY_DEBUGLINK_TRUE@@NATIVE_TRUE@ $(am__DEPENDENCIES_1) \
15729+@HAVE_COMPRESSED_DEBUG_TRUE@@NATIVE_TRUE@ ctestg$(EXEEXT) \ 15729-@HAVE_ELF_TRUE@@HAVE_OBJCOPY_DEBUGLINK_TRUE@@NATIVE_TRUE@ $(am__DEPENDENCIES_1)
15730+@HAVE_COMPRESSED_DEBUG_TRUE@@NATIVE_TRUE@ ctesta$(EXEEXT) \ 15730-@HAVE_ELF_TRUE@@HAVE_OBJCOPY_DEBUGLINK_TRUE@@NATIVE_TRUE@am_libbacktrace_elf_for_test_la_OBJECTS = $(am__objects_1)
15731+@HAVE_COMPRESSED_DEBUG_TRUE@@NATIVE_TRUE@ ctestg_alloc$(EXEEXT) \ 15731-libbacktrace_elf_for_test_la_OBJECTS = \
15732+@HAVE_COMPRESSED_DEBUG_TRUE@@NATIVE_TRUE@ ctesta_alloc$(EXEEXT) 15732- $(am_libbacktrace_elf_for_test_la_OBJECTS)
15733+@HAVE_DWARF5_TRUE@@NATIVE_TRUE@am__EXEEXT_11 = dwarf5$(EXEEXT) \ 15733-@HAVE_ELF_TRUE@@HAVE_OBJCOPY_DEBUGLINK_TRUE@@NATIVE_TRUE@am_libbacktrace_elf_for_test_la_rpath =
15734+@HAVE_DWARF5_TRUE@@NATIVE_TRUE@ dwarf5_alloc$(EXEEXT) 15734-@NATIVE_TRUE@am_libbacktrace_instrumented_alloc_la_OBJECTS = \
15735+@NATIVE_TRUE@am__EXEEXT_12 = mtest$(EXEEXT) 15735-@NATIVE_TRUE@ $(am__objects_1)
15736+@HAVE_ELF_TRUE@am__EXEEXT_13 = xztest$(EXEEXT) xztest_alloc$(EXEEXT) 15736-libbacktrace_instrumented_alloc_la_OBJECTS = \
15737+am__EXEEXT_14 = $(am__EXEEXT_4) $(am__EXEEXT_5) $(am__EXEEXT_6) \ 15737- $(am_libbacktrace_instrumented_alloc_la_OBJECTS)
15738+ $(am__EXEEXT_7) $(am__EXEEXT_8) $(am__EXEEXT_9) \ 15738-@NATIVE_TRUE@am_libbacktrace_instrumented_alloc_la_rpath =
15739+ $(am__EXEEXT_10) $(am__EXEEXT_11) $(am__EXEEXT_12) \ 15739-@NATIVE_TRUE@am_libbacktrace_noformat_la_OBJECTS = $(am__objects_1)
15740+ $(am__EXEEXT_13) 15740-libbacktrace_noformat_la_OBJECTS = \
15741 LTLIBRARIES = $(noinst_LTLIBRARIES) 15741- $(am_libbacktrace_noformat_la_OBJECTS)
15742 am__DEPENDENCIES_1 = 15742-@NATIVE_TRUE@am_libbacktrace_noformat_la_rpath =
15743 am_libbacktrace_la_OBJECTS = atomic.lo dwarf.lo fileline.lo posix.lo \ 15743 @NATIVE_TRUE@am__EXEEXT_1 = allocfail$(EXEEXT)
15744@@ -220,35 +249,6 @@ libbacktrace_instrumented_alloc_la_OBJECTS = \ 15744 @HAVE_BUILDID_TRUE@@HAVE_ELF_TRUE@@HAVE_OBJCOPY_DEBUGLINK_TRUE@@NATIVE_TRUE@am__EXEEXT_2 = b2test$(EXEEXT)
15745 libbacktrace_noformat_la_OBJECTS = \ 15745 @HAVE_BUILDID_TRUE@@HAVE_DWZ_TRUE@@HAVE_ELF_TRUE@@HAVE_OBJCOPY_DEBUGLINK_TRUE@@NATIVE_TRUE@am__EXEEXT_3 = b3test$(EXEEXT)
15746 $(am_libbacktrace_noformat_la_OBJECTS) 15746@@ -253,6 +222,37 @@ am__EXEEXT_16 = $(am__EXEEXT_4) $(am__EXEEXT_5) $(am__EXEEXT_6) \
15747 @NATIVE_TRUE@am_libbacktrace_noformat_la_rpath = 15747 $(am__EXEEXT_7) $(am__EXEEXT_8) $(am__EXEEXT_9) \
15748-@NATIVE_TRUE@am__EXEEXT_1 = allocfail$(EXEEXT) 15748 $(am__EXEEXT_10) $(am__EXEEXT_11) $(am__EXEEXT_12) \
15749-@HAVE_ELF_TRUE@@HAVE_OBJCOPY_DEBUGLINK_TRUE@@NATIVE_TRUE@am__EXEEXT_2 = b2test$(EXEEXT) 15749 $(am__EXEEXT_13) $(am__EXEEXT_14) $(am__EXEEXT_15)
15750-@HAVE_DWZ_TRUE@@HAVE_ELF_TRUE@@HAVE_OBJCOPY_DEBUGLINK_TRUE@@NATIVE_TRUE@am__EXEEXT_3 = b3test$(EXEEXT) 15750+LTLIBRARIES = $(noinst_LTLIBRARIES)
15751-@NATIVE_TRUE@am__EXEEXT_4 = test_elf_32$(EXEEXT) test_elf_64$(EXEEXT) \ 15751+am__DEPENDENCIES_1 =
15752-@NATIVE_TRUE@ test_macho$(EXEEXT) test_xcoff_32$(EXEEXT) \ 15752+am_libbacktrace_la_OBJECTS = atomic.lo dwarf.lo fileline.lo posix.lo \
15753-@NATIVE_TRUE@ test_xcoff_64$(EXEEXT) test_pecoff$(EXEEXT) \ 15753+ print.lo sort.lo state.lo
15754-@NATIVE_TRUE@ test_unknown$(EXEEXT) unittest$(EXEEXT) \ 15754+libbacktrace_la_OBJECTS = $(am_libbacktrace_la_OBJECTS)
15755-@NATIVE_TRUE@ unittest_alloc$(EXEEXT) btest$(EXEEXT) 15755+AM_V_lt = $(am__v_lt_@AM_V@)
15756-@HAVE_ELF_TRUE@@NATIVE_TRUE@am__EXEEXT_5 = btest_lto$(EXEEXT) 15756+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
15757-@NATIVE_TRUE@am__EXEEXT_6 = btest_alloc$(EXEEXT) stest$(EXEEXT) \ 15757+am__v_lt_0 = --silent
15758-@NATIVE_TRUE@ stest_alloc$(EXEEXT) 15758+am__v_lt_1 =
15759-@HAVE_ELF_TRUE@@NATIVE_TRUE@am__EXEEXT_7 = ztest$(EXEEXT) \ 15759+am__objects_1 = atomic.lo dwarf.lo fileline.lo posix.lo print.lo \
15760-@HAVE_ELF_TRUE@@NATIVE_TRUE@ ztest_alloc$(EXEEXT) 15760+ sort.lo state.lo
15761-@NATIVE_TRUE@am__EXEEXT_8 = edtest$(EXEEXT) edtest_alloc$(EXEEXT) 15761+@NATIVE_TRUE@am_libbacktrace_alloc_la_OBJECTS = $(am__objects_1)
15762-@HAVE_PTHREAD_TRUE@@NATIVE_TRUE@am__EXEEXT_9 = ttest$(EXEEXT) \ 15762+libbacktrace_alloc_la_OBJECTS = $(am_libbacktrace_alloc_la_OBJECTS)
15763-@HAVE_PTHREAD_TRUE@@NATIVE_TRUE@ ttest_alloc$(EXEEXT) 15763+@NATIVE_TRUE@am_libbacktrace_alloc_la_rpath =
15764-@HAVE_COMPRESSED_DEBUG_TRUE@@NATIVE_TRUE@am__EXEEXT_10 = \ 15764+@HAVE_ELF_TRUE@@HAVE_OBJCOPY_DEBUGLINK_TRUE@@NATIVE_TRUE@libbacktrace_elf_for_test_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
15765-@HAVE_COMPRESSED_DEBUG_TRUE@@NATIVE_TRUE@ ctestg$(EXEEXT) \ 15765+@HAVE_ELF_TRUE@@HAVE_OBJCOPY_DEBUGLINK_TRUE@@NATIVE_TRUE@ elf_for_test.lo \
15766-@HAVE_COMPRESSED_DEBUG_TRUE@@NATIVE_TRUE@ ctesta$(EXEEXT) \ 15766+@HAVE_ELF_TRUE@@HAVE_OBJCOPY_DEBUGLINK_TRUE@@NATIVE_TRUE@ $(am__DEPENDENCIES_1) \
15767-@HAVE_COMPRESSED_DEBUG_TRUE@@NATIVE_TRUE@ ctestg_alloc$(EXEEXT) \ 15767+@HAVE_ELF_TRUE@@HAVE_OBJCOPY_DEBUGLINK_TRUE@@NATIVE_TRUE@ $(am__DEPENDENCIES_1)
15768-@HAVE_COMPRESSED_DEBUG_TRUE@@NATIVE_TRUE@ ctesta_alloc$(EXEEXT) 15768+@HAVE_ELF_TRUE@@HAVE_OBJCOPY_DEBUGLINK_TRUE@@NATIVE_TRUE@am_libbacktrace_elf_for_test_la_OBJECTS = $(am__objects_1)
15769-@HAVE_DWARF5_TRUE@@NATIVE_TRUE@am__EXEEXT_11 = dwarf5$(EXEEXT) \ 15769+libbacktrace_elf_for_test_la_OBJECTS = \
15770-@HAVE_DWARF5_TRUE@@NATIVE_TRUE@ dwarf5_alloc$(EXEEXT) 15770+ $(am_libbacktrace_elf_for_test_la_OBJECTS)
15771-@NATIVE_TRUE@am__EXEEXT_12 = mtest$(EXEEXT) 15771+@HAVE_ELF_TRUE@@HAVE_OBJCOPY_DEBUGLINK_TRUE@@NATIVE_TRUE@am_libbacktrace_elf_for_test_la_rpath =
15772-@HAVE_ELF_TRUE@am__EXEEXT_13 = xztest$(EXEEXT) xztest_alloc$(EXEEXT) 15772+@NATIVE_TRUE@am_libbacktrace_instrumented_alloc_la_OBJECTS = \
15773-am__EXEEXT_14 = $(am__EXEEXT_4) $(am__EXEEXT_5) $(am__EXEEXT_6) \ 15773+@NATIVE_TRUE@ $(am__objects_1)
15774- $(am__EXEEXT_7) $(am__EXEEXT_8) $(am__EXEEXT_9) \ 15774+libbacktrace_instrumented_alloc_la_OBJECTS = \
15775- $(am__EXEEXT_10) $(am__EXEEXT_11) $(am__EXEEXT_12) \ 15775+ $(am_libbacktrace_instrumented_alloc_la_OBJECTS)
15776- $(am__EXEEXT_13) 15776+@NATIVE_TRUE@am_libbacktrace_instrumented_alloc_la_rpath =
15777+@NATIVE_TRUE@am_libbacktrace_noformat_la_OBJECTS = $(am__objects_1)
15778+libbacktrace_noformat_la_OBJECTS = \
15779+ $(am_libbacktrace_noformat_la_OBJECTS)
15780+@NATIVE_TRUE@am_libbacktrace_noformat_la_rpath =
15777 @NATIVE_TRUE@am_allocfail_OBJECTS = allocfail-allocfail.$(OBJEXT) \ 15781 @NATIVE_TRUE@am_allocfail_OBJECTS = allocfail-allocfail.$(OBJEXT) \
15778 @NATIVE_TRUE@ allocfail-testlib.$(OBJEXT) 15782 @NATIVE_TRUE@ allocfail-testlib.$(OBJEXT)
15779 allocfail_OBJECTS = $(am_allocfail_OBJECTS) 15783 allocfail_OBJECTS = $(am_allocfail_OBJECTS)
15780@@ -536,7 +536,7 @@ am__v_at_0 = @ 15784@@ -571,7 +571,7 @@ am__v_at_0 = @
15781 am__v_at_1 = 15785 am__v_at_1 =
15782 DEFAULT_INCLUDES = -I.@am__isrc@ 15786 DEFAULT_INCLUDES = -I.@am__isrc@
15783 depcomp = 15787 depcomp =
@@ -15786,7 +15790,7 @@ index 0a61880ba67..500756cd023 100644
15786 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ 15790 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
15787 $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) 15791 $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
15788 LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ 15792 LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
15789@@ -579,8 +579,8 @@ am__can_run_installinfo = \ 15793@@ -615,8 +615,8 @@ am__can_run_installinfo = \
15790 n|no|NO) false;; \ 15794 n|no|NO) false;; \
15791 *) (install-info --version) >/dev/null 2>&1;; \ 15795 *) (install-info --version) >/dev/null 2>&1;; \
15792 esac 15796 esac
@@ -15797,7 +15801,7 @@ index 0a61880ba67..500756cd023 100644
15797 # Read a list of newline-separated strings from the standard input, 15801 # Read a list of newline-separated strings from the standard input,
15798 # and print each of them once, without duplicates. Input order is 15802 # and print each of them once, without duplicates. Input order is
15799 # *not* preserved. 15803 # *not* preserved.
15800@@ -597,9 +597,6 @@ am__define_uniq_tagged_files = \ 15804@@ -633,9 +633,6 @@ am__define_uniq_tagged_files = \
15801 unique=`for i in $$list; do \ 15805 unique=`for i in $$list; do \
15802 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ 15806 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
15803 done | $(am__uniquify_input)` 15807 done | $(am__uniquify_input)`
@@ -15807,7 +15811,7 @@ index 0a61880ba67..500756cd023 100644
15807 AM_RECURSIVE_TARGETS = cscope check recheck 15811 AM_RECURSIVE_TARGETS = cscope check recheck
15808 am__tty_colors_dummy = \ 15812 am__tty_colors_dummy = \
15809 mgn= red= grn= lgn= blu= brg= std=; \ 15813 mgn= red= grn= lgn= blu= brg= std=; \
15810@@ -783,6 +780,7 @@ am__set_TESTS_bases = \ 15814@@ -819,6 +816,7 @@ am__set_TESTS_bases = \
15811 bases='$(TEST_LOGS)'; \ 15815 bases='$(TEST_LOGS)'; \
15812 bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \ 15816 bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \
15813 bases=`echo $$bases` 15817 bases=`echo $$bases`
@@ -15815,7 +15819,7 @@ index 0a61880ba67..500756cd023 100644
15815 RECHECK_LOGS = $(TEST_LOGS) 15819 RECHECK_LOGS = $(TEST_LOGS)
15816 TEST_SUITE_LOG = test-suite.log 15820 TEST_SUITE_LOG = test-suite.log
15817 TEST_EXTENSIONS = @EXEEXT@ .test 15821 TEST_EXTENSIONS = @EXEEXT@ .test
15818@@ -825,8 +823,11 @@ CLOCK_GETTIME_LINK = @CLOCK_GETTIME_LINK@ 15822@@ -861,8 +859,11 @@ CLOCK_GETTIME_LINK = @CLOCK_GETTIME_LINK@
15819 COMM = @COMM@ 15823 COMM = @COMM@
15820 CPP = @CPP@ 15824 CPP = @CPP@
15821 CPPFLAGS = @CPPFLAGS@ 15825 CPPFLAGS = @CPPFLAGS@
@@ -15827,7 +15831,7 @@ index 0a61880ba67..500756cd023 100644
15827 DSYMUTIL = @DSYMUTIL@ 15831 DSYMUTIL = @DSYMUTIL@
15828 DUMPBIN = @DUMPBIN@ 15832 DUMPBIN = @DUMPBIN@
15829 DWZ = @DWZ@ 15833 DWZ = @DWZ@
15830@@ -834,6 +835,7 @@ ECHO_C = @ECHO_C@ 15834@@ -870,6 +871,7 @@ ECHO_C = @ECHO_C@
15831 ECHO_N = @ECHO_N@ 15835 ECHO_N = @ECHO_N@
15832 ECHO_T = @ECHO_T@ 15836 ECHO_T = @ECHO_T@
15833 EGREP = @EGREP@ 15837 EGREP = @EGREP@
@@ -15835,7 +15839,7 @@ index 0a61880ba67..500756cd023 100644
15835 EXEEXT = @EXEEXT@ 15839 EXEEXT = @EXEEXT@
15836 EXTRA_FLAGS = @EXTRA_FLAGS@ 15840 EXTRA_FLAGS = @EXTRA_FLAGS@
15837 FGREP = @FGREP@ 15841 FGREP = @FGREP@
15838@@ -854,6 +856,7 @@ LN_S = @LN_S@ 15842@@ -890,6 +892,7 @@ LN_S = @LN_S@
15839 LTLIBOBJS = @LTLIBOBJS@ 15843 LTLIBOBJS = @LTLIBOBJS@
15840 MAINT = @MAINT@ 15844 MAINT = @MAINT@
15841 MAKEINFO = @MAKEINFO@ 15845 MAKEINFO = @MAKEINFO@
@@ -15843,7 +15847,7 @@ index 0a61880ba67..500756cd023 100644
15843 MKDIR_P = @MKDIR_P@ 15847 MKDIR_P = @MKDIR_P@
15844 NM = @NM@ 15848 NM = @NM@
15845 NMEDIT = @NMEDIT@ 15849 NMEDIT = @NMEDIT@
15846@@ -886,6 +889,7 @@ abs_builddir = @abs_builddir@ 15850@@ -922,6 +925,7 @@ abs_builddir = @abs_builddir@
15847 abs_srcdir = @abs_srcdir@ 15851 abs_srcdir = @abs_srcdir@
15848 abs_top_builddir = @abs_top_builddir@ 15852 abs_top_builddir = @abs_top_builddir@
15849 abs_top_srcdir = @abs_top_srcdir@ 15853 abs_top_srcdir = @abs_top_srcdir@
@@ -15851,7 +15855,7 @@ index 0a61880ba67..500756cd023 100644
15851 ac_ct_CC = @ac_ct_CC@ 15855 ac_ct_CC = @ac_ct_CC@
15852 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ 15856 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
15853 am__leading_dot = @am__leading_dot@ 15857 am__leading_dot = @am__leading_dot@
15854@@ -1178,8 +1182,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status 15858@@ -1267,8 +1271,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
15855 echo ' $(SHELL) ./config.status'; \ 15859 echo ' $(SHELL) ./config.status'; \
15856 $(SHELL) ./config.status;; \ 15860 $(SHELL) ./config.status;; \
15857 *) \ 15861 *) \
@@ -15862,7 +15866,7 @@ index 0a61880ba67..500756cd023 100644
15862 esac; 15866 esac;
15863 $(top_srcdir)/../multilib.am $(am__empty): 15867 $(top_srcdir)/../multilib.am $(am__empty):
15864 15868
15865@@ -1211,6 +1215,15 @@ backtrace-supported.h: $(top_builddir)/config.status $(srcdir)/backtrace-support 15869@@ -1300,6 +1304,15 @@ backtrace-supported.h: $(top_builddir)/config.status $(srcdir)/backtrace-support
15866 install-debuginfo-for-buildid.sh: $(top_builddir)/config.status $(srcdir)/install-debuginfo-for-buildid.sh.in 15870 install-debuginfo-for-buildid.sh: $(top_builddir)/config.status $(srcdir)/install-debuginfo-for-buildid.sh.in
15867 cd $(top_builddir) && $(SHELL) ./config.status $@ 15871 cd $(top_builddir) && $(SHELL) ./config.status $@
15868 15872
@@ -15878,7 +15882,7 @@ index 0a61880ba67..500756cd023 100644
15878 clean-checkLTLIBRARIES: 15882 clean-checkLTLIBRARIES:
15879 -test -z "$(check_LTLIBRARIES)" || rm -f $(check_LTLIBRARIES) 15883 -test -z "$(check_LTLIBRARIES)" || rm -f $(check_LTLIBRARIES)
15880 @list='$(check_LTLIBRARIES)'; \ 15884 @list='$(check_LTLIBRARIES)'; \
15881@@ -1248,15 +1261,6 @@ libbacktrace_instrumented_alloc.la: $(libbacktrace_instrumented_alloc_la_OBJECTS 15885@@ -1337,15 +1350,6 @@ libbacktrace_instrumented_alloc.la: $(libbacktrace_instrumented_alloc_la_OBJECTS
15882 libbacktrace_noformat.la: $(libbacktrace_noformat_la_OBJECTS) $(libbacktrace_noformat_la_DEPENDENCIES) $(EXTRA_libbacktrace_noformat_la_DEPENDENCIES) 15886 libbacktrace_noformat.la: $(libbacktrace_noformat_la_OBJECTS) $(libbacktrace_noformat_la_DEPENDENCIES) $(EXTRA_libbacktrace_noformat_la_DEPENDENCIES)
15883 $(AM_V_CCLD)$(LINK) $(am_libbacktrace_noformat_la_rpath) $(libbacktrace_noformat_la_OBJECTS) $(libbacktrace_noformat_la_LIBADD) $(LIBS) 15887 $(AM_V_CCLD)$(LINK) $(am_libbacktrace_noformat_la_rpath) $(libbacktrace_noformat_la_OBJECTS) $(libbacktrace_noformat_la_LIBADD) $(LIBS)
15884 15888
@@ -15894,7 +15898,7 @@ index 0a61880ba67..500756cd023 100644
15894 allocfail$(EXEEXT): $(allocfail_OBJECTS) $(allocfail_DEPENDENCIES) $(EXTRA_allocfail_DEPENDENCIES) 15898 allocfail$(EXEEXT): $(allocfail_OBJECTS) $(allocfail_DEPENDENCIES) $(EXTRA_allocfail_DEPENDENCIES)
15895 @rm -f allocfail$(EXEEXT) 15899 @rm -f allocfail$(EXEEXT)
15896 $(AM_V_CCLD)$(allocfail_LINK) $(allocfail_OBJECTS) $(allocfail_LDADD) $(LIBS) 15900 $(AM_V_CCLD)$(allocfail_LINK) $(allocfail_OBJECTS) $(allocfail_LDADD) $(LIBS)
15897@@ -1959,7 +1963,7 @@ $(TEST_SUITE_LOG): $(TEST_LOGS) 15901@@ -2096,7 +2100,7 @@ $(TEST_SUITE_LOG): $(TEST_LOGS)
15898 test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG); \ 15902 test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG); \
15899 fi; \ 15903 fi; \
15900 echo "$${col}$$br$${std}"; \ 15904 echo "$${col}$$br$${std}"; \
@@ -15903,7 +15907,7 @@ index 0a61880ba67..500756cd023 100644
15903 echo "$${col}$$br$${std}"; \ 15907 echo "$${col}$$br$${std}"; \
15904 create_testsuite_report --maybe-color; \ 15908 create_testsuite_report --maybe-color; \
15905 echo "$$col$$br$$std"; \ 15909 echo "$$col$$br$$std"; \
15906@@ -1972,7 +1976,7 @@ $(TEST_SUITE_LOG): $(TEST_LOGS) 15910@@ -2109,7 +2113,7 @@ $(TEST_SUITE_LOG): $(TEST_LOGS)
15907 fi; \ 15911 fi; \
15908 $$success || exit 1 15912 $$success || exit 1
15909 15913
@@ -15912,7 +15916,7 @@ index 0a61880ba67..500756cd023 100644
15912 @list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list 15916 @list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list
15913 @list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list 15917 @list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list
15914 @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) 15918 @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
15915@@ -1982,7 +1986,7 @@ check-TESTS: 15919@@ -2119,7 +2123,7 @@ check-TESTS:
15916 log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \ 15920 log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \
15917 $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \ 15921 $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \
15918 exit $$?; 15922 exit $$?;
@@ -15921,7 +15925,7 @@ index 0a61880ba67..500756cd023 100644
15921 @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) 15925 @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
15922 @set +e; $(am__set_TESTS_bases); \ 15926 @set +e; $(am__set_TESTS_bases); \
15923 bases=`for i in $$bases; do echo $$i; done \ 15927 bases=`for i in $$bases; do echo $$i; done \
15924@@ -2260,7 +2264,7 @@ xztest_alloc.log: xztest_alloc$(EXEEXT) 15928@@ -2439,7 +2443,7 @@ xztest_alloc.log: xztest_alloc$(EXEEXT)
15925 @am__EXEEXT_TRUE@ $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ 15929 @am__EXEEXT_TRUE@ $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \
15926 @am__EXEEXT_TRUE@ "$$tst" $(AM_TESTS_FD_REDIRECT) 15930 @am__EXEEXT_TRUE@ "$$tst" $(AM_TESTS_FD_REDIRECT)
15927 check-am: all-am 15931 check-am: all-am
@@ -16175,10 +16179,10 @@ index 528e6173930..d88a5ec84f2 100644
16175 # This file is free software; the Free Software Foundation 16179 # This file is free software; the Free Software Foundation
16176 # gives unlimited permission to copy and/or distribute it, 16180 # gives unlimited permission to copy and/or distribute it,
16177diff --git a/libbacktrace/configure b/libbacktrace/configure 16181diff --git a/libbacktrace/configure b/libbacktrace/configure
16178index e5ca8ad9379..b7c4c4be78d 100755 16182index 4ab612dc780..68f6b8566e9 100755
16179--- a/libbacktrace/configure 16183--- a/libbacktrace/configure
16180+++ b/libbacktrace/configure 16184+++ b/libbacktrace/configure
16181@@ -680,7 +680,10 @@ OTOOL 16185@@ -686,7 +686,10 @@ OTOOL
16182 LIPO 16186 LIPO
16183 NMEDIT 16187 NMEDIT
16184 DSYMUTIL 16188 DSYMUTIL
@@ -16189,7 +16193,7 @@ index e5ca8ad9379..b7c4c4be78d 100755
16189 OBJDUMP 16193 OBJDUMP
16190 LN_S 16194 LN_S
16191 NM 16195 NM
16192@@ -701,6 +704,9 @@ AM_BACKSLASH 16196@@ -707,6 +710,9 @@ AM_BACKSLASH
16193 AM_DEFAULT_VERBOSITY 16197 AM_DEFAULT_VERBOSITY
16194 AM_DEFAULT_V 16198 AM_DEFAULT_V
16195 AM_V 16199 AM_V
@@ -16199,7 +16203,7 @@ index e5ca8ad9379..b7c4c4be78d 100755
16199 am__untar 16203 am__untar
16200 am__tar 16204 am__tar
16201 AMTAR 16205 AMTAR
16202@@ -798,6 +804,7 @@ enable_static 16206@@ -804,6 +810,7 @@ enable_static
16203 with_pic 16207 with_pic
16204 enable_fast_install 16208 enable_fast_install
16205 with_gnu_ld 16209 with_gnu_ld
@@ -16207,7 +16211,7 @@ index e5ca8ad9379..b7c4c4be78d 100755
16207 enable_libtool_lock 16211 enable_libtool_lock
16208 enable_largefile 16212 enable_largefile
16209 enable_cet 16213 enable_cet
16210@@ -1458,6 +1465,8 @@ Optional Packages: 16214@@ -1466,6 +1473,8 @@ Optional Packages:
16211 --with-pic try to use only PIC/non-PIC objects [default=use 16215 --with-pic try to use only PIC/non-PIC objects [default=use
16212 both] 16216 both]
16213 --with-gnu-ld assume the C compiler uses GNU ld [default=no] 16217 --with-gnu-ld assume the C compiler uses GNU ld [default=no]
@@ -16216,7 +16220,7 @@ index e5ca8ad9379..b7c4c4be78d 100755
16216 --with-system-libunwind use installed libunwind 16220 --with-system-libunwind use installed libunwind
16217 16221
16218 Some influential environment variables: 16222 Some influential environment variables:
16219@@ -4047,7 +4056,7 @@ libtool_VERSION=1:0:0 16223@@ -4054,7 +4063,7 @@ libtool_VERSION=1:0:0
16220 # -Wall: Issue all automake warnings. 16224 # -Wall: Issue all automake warnings.
16221 # -Wno-portability: Don't warn about constructs supported by GNU make. 16225 # -Wno-portability: Don't warn about constructs supported by GNU make.
16222 # (because GCC requires GNU make anyhow). 16226 # (because GCC requires GNU make anyhow).
@@ -16225,7 +16229,7 @@ index e5ca8ad9379..b7c4c4be78d 100755
16225 16229
16226 # Find a good install program. We prefer a C program (faster), 16230 # Find a good install program. We prefer a C program (faster),
16227 # so one script is as good as another. But avoid the broken or 16231 # so one script is as good as another. But avoid the broken or
16228@@ -4220,12 +4229,7 @@ ac_script='s/[\\$]/&&/g;s/;s,x,x,$//' 16232@@ -4227,12 +4236,7 @@ ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'
16229 program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"` 16233 program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
16230 16234
16231 if test x"${MISSING+set}" != xset; then 16235 if test x"${MISSING+set}" != xset; then
@@ -16239,7 +16243,7 @@ index e5ca8ad9379..b7c4c4be78d 100755
16239 fi 16243 fi
16240 # Use eval to expand $SHELL 16244 # Use eval to expand $SHELL
16241 if eval "$MISSING --is-lightweight"; then 16245 if eval "$MISSING --is-lightweight"; then
16242@@ -4551,8 +4555,8 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} 16246@@ -4558,8 +4562,8 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
16243 16247
16244 # For better backward compatibility. To be removed once Automake 1.9.x 16248 # For better backward compatibility. To be removed once Automake 1.9.x
16245 # dies out for good. For more background, see: 16249 # dies out for good. For more background, see:
@@ -16250,7 +16254,7 @@ index e5ca8ad9379..b7c4c4be78d 100755
16250 mkdir_p='$(MKDIR_P)' 16254 mkdir_p='$(MKDIR_P)'
16251 16255
16252 # We need awk for the "check" target (and possibly the TAP driver). The 16256 # We need awk for the "check" target (and possibly the TAP driver). The
16253@@ -4571,6 +4575,20 @@ am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -' 16257@@ -4578,6 +4582,20 @@ am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'
16254 16258
16255 16259
16256 16260
@@ -16271,7 +16275,7 @@ index e5ca8ad9379..b7c4c4be78d 100755
16271 16275
16272 # POSIX will say in a future version that running "rm -f" with no argument 16276 # POSIX will say in a future version that running "rm -f" with no argument
16273 # is OK; and we want to be able to make that assumption in our Makefile 16277 # is OK; and we want to be able to make that assumption in our Makefile
16274@@ -4603,7 +4621,7 @@ END 16278@@ -4610,7 +4628,7 @@ END
16275 Aborting the configuration process, to ensure you take notice of the issue. 16279 Aborting the configuration process, to ensure you take notice of the issue.
16276 16280
16277 You can download and install GNU coreutils to get an 'rm' implementation 16281 You can download and install GNU coreutils to get an 'rm' implementation
@@ -16280,7 +16284,7 @@ index e5ca8ad9379..b7c4c4be78d 100755
16280 16284
16281 If you want to complete the configuration process using your problematic 16285 If you want to complete the configuration process using your problematic
16282 'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM 16286 'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
16283@@ -5446,8 +5464,8 @@ esac 16287@@ -5453,8 +5471,8 @@ esac
16284 16288
16285 16289
16286 16290
@@ -16291,7 +16295,7 @@ index e5ca8ad9379..b7c4c4be78d 100755
16291 16295
16292 16296
16293 16297
16294@@ -5487,7 +5505,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO 16298@@ -5494,7 +5512,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
16295 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 16299 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
16296 $as_echo_n "checking how to print strings... " >&6; } 16300 $as_echo_n "checking how to print strings... " >&6; }
16297 # Test print first, because it will be a builtin if present. 16301 # Test print first, because it will be a builtin if present.
@@ -16300,7 +16304,7 @@ index e5ca8ad9379..b7c4c4be78d 100755
16300 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then 16304 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
16301 ECHO='print -r --' 16305 ECHO='print -r --'
16302 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then 16306 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
16303@@ -6180,8 +6198,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; 16307@@ -6187,8 +6205,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6;
16304 # Try some XSI features 16308 # Try some XSI features
16305 xsi_shell=no 16309 xsi_shell=no
16306 ( _lt_dummy="a/b/c" 16310 ( _lt_dummy="a/b/c"
@@ -16311,7 +16315,7 @@ index e5ca8ad9379..b7c4c4be78d 100755
16311 && eval 'test $(( 1 + 1 )) -eq 2 \ 16315 && eval 'test $(( 1 + 1 )) -eq 2 \
16312 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ 16316 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
16313 && xsi_shell=yes 16317 && xsi_shell=yes
16314@@ -6230,6 +6248,80 @@ esac 16318@@ -6237,6 +6255,80 @@ esac
16315 16319
16316 16320
16317 16321
@@ -16392,7 +16396,7 @@ index e5ca8ad9379..b7c4c4be78d 100755
16392 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 16396 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
16393 $as_echo_n "checking for $LD option to reload object files... " >&6; } 16397 $as_echo_n "checking for $LD option to reload object files... " >&6; }
16394 if ${lt_cv_ld_reload_flag+:} false; then : 16398 if ${lt_cv_ld_reload_flag+:} false; then :
16395@@ -6246,6 +6338,11 @@ case $reload_flag in 16399@@ -6253,6 +6345,11 @@ case $reload_flag in
16396 esac 16400 esac
16397 reload_cmds='$LD$reload_flag -o $output$reload_objs' 16401 reload_cmds='$LD$reload_flag -o $output$reload_objs'
16398 case $host_os in 16402 case $host_os in
@@ -16404,7 +16408,7 @@ index e5ca8ad9379..b7c4c4be78d 100755
16404 darwin*) 16408 darwin*)
16405 if test "$GCC" = yes; then 16409 if test "$GCC" = yes; then
16406 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' 16410 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
16407@@ -6414,7 +6511,8 @@ mingw* | pw32*) 16411@@ -6421,7 +6518,8 @@ mingw* | pw32*)
16408 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' 16412 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
16409 lt_cv_file_magic_cmd='func_win32_libid' 16413 lt_cv_file_magic_cmd='func_win32_libid'
16410 else 16414 else
@@ -16414,7 +16418,7 @@ index e5ca8ad9379..b7c4c4be78d 100755
16414 lt_cv_file_magic_cmd='$OBJDUMP -f' 16418 lt_cv_file_magic_cmd='$OBJDUMP -f'
16415 fi 16419 fi
16416 ;; 16420 ;;
16417@@ -6573,6 +6671,21 @@ esac 16421@@ -6580,6 +6678,21 @@ esac
16418 fi 16422 fi
16419 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 16423 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
16420 $as_echo "$lt_cv_deplibs_check_method" >&6; } 16424 $as_echo "$lt_cv_deplibs_check_method" >&6; }
@@ -16436,7 +16440,7 @@ index e5ca8ad9379..b7c4c4be78d 100755
16436 file_magic_cmd=$lt_cv_file_magic_cmd 16440 file_magic_cmd=$lt_cv_file_magic_cmd
16437 deplibs_check_method=$lt_cv_deplibs_check_method 16441 deplibs_check_method=$lt_cv_deplibs_check_method
16438 test -z "$deplibs_check_method" && deplibs_check_method=unknown 16442 test -z "$deplibs_check_method" && deplibs_check_method=unknown
16439@@ -6588,6 +6701,157 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown 16443@@ -6595,6 +6708,157 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
16440 16444
16441 16445
16442 16446
@@ -16594,7 +16598,7 @@ index e5ca8ad9379..b7c4c4be78d 100755
16594 plugin_option= 16598 plugin_option=
16595 plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll" 16599 plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll"
16596 for plugin in $plugin_names; do 16600 for plugin in $plugin_names; do
16597@@ -6602,8 +6866,10 @@ for plugin in $plugin_names; do 16601@@ -6609,8 +6873,10 @@ for plugin in $plugin_names; do
16598 done 16602 done
16599 16603
16600 if test -n "$ac_tool_prefix"; then 16604 if test -n "$ac_tool_prefix"; then
@@ -16607,7 +16611,7 @@ index e5ca8ad9379..b7c4c4be78d 100755
16607 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 16611 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
16608 $as_echo_n "checking for $ac_word... " >&6; } 16612 $as_echo_n "checking for $ac_word... " >&6; }
16609 if ${ac_cv_prog_AR+:} false; then : 16613 if ${ac_cv_prog_AR+:} false; then :
16610@@ -6619,7 +6885,7 @@ do 16614@@ -6626,7 +6892,7 @@ do
16611 test -z "$as_dir" && as_dir=. 16615 test -z "$as_dir" && as_dir=.
16612 for ac_exec_ext in '' $ac_executable_extensions; do 16616 for ac_exec_ext in '' $ac_executable_extensions; do
16613 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 16617 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
@@ -16616,7 +16620,7 @@ index e5ca8ad9379..b7c4c4be78d 100755
16616 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 16620 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
16617 break 2 16621 break 2
16618 fi 16622 fi
16619@@ -6639,11 +6905,15 @@ $as_echo "no" >&6; } 16623@@ -6646,11 +6912,15 @@ $as_echo "no" >&6; }
16620 fi 16624 fi
16621 16625
16622 16626
@@ -16635,7 +16639,7 @@ index e5ca8ad9379..b7c4c4be78d 100755
16635 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 16639 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
16636 $as_echo_n "checking for $ac_word... " >&6; } 16640 $as_echo_n "checking for $ac_word... " >&6; }
16637 if ${ac_cv_prog_ac_ct_AR+:} false; then : 16641 if ${ac_cv_prog_ac_ct_AR+:} false; then :
16638@@ -6659,7 +6929,7 @@ do 16642@@ -6666,7 +6936,7 @@ do
16639 test -z "$as_dir" && as_dir=. 16643 test -z "$as_dir" && as_dir=.
16640 for ac_exec_ext in '' $ac_executable_extensions; do 16644 for ac_exec_ext in '' $ac_executable_extensions; do
16641 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 16645 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
@@ -16644,7 +16648,7 @@ index e5ca8ad9379..b7c4c4be78d 100755
16644 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 16648 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
16645 break 2 16649 break 2
16646 fi 16650 fi
16647@@ -6678,6 +6948,10 @@ else 16651@@ -6685,6 +6955,10 @@ else
16648 $as_echo "no" >&6; } 16652 $as_echo "no" >&6; }
16649 fi 16653 fi
16650 16654
@@ -16655,7 +16659,7 @@ index e5ca8ad9379..b7c4c4be78d 100755
16655 if test "x$ac_ct_AR" = x; then 16659 if test "x$ac_ct_AR" = x; then
16656 AR="false" 16660 AR="false"
16657 else 16661 else
16658@@ -6689,31 +6963,83 @@ ac_tool_warned=yes ;; 16662@@ -6696,31 +6970,83 @@ ac_tool_warned=yes ;;
16659 esac 16663 esac
16660 AR=$ac_ct_AR 16664 AR=$ac_ct_AR
16661 fi 16665 fi
@@ -16754,7 +16758,7 @@ index e5ca8ad9379..b7c4c4be78d 100755
16754 16758
16755 16759
16756 16760
16757@@ -7058,8 +7384,8 @@ esac 16761@@ -7065,8 +7391,8 @@ esac
16758 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" 16762 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
16759 16763
16760 # Transform an extracted symbol line into symbol name and symbol address 16764 # Transform an extracted symbol line into symbol name and symbol address
@@ -16765,7 +16769,7 @@ index e5ca8ad9379..b7c4c4be78d 100755
16765 16769
16766 # Handle CRLF in mingw tool chain 16770 # Handle CRLF in mingw tool chain
16767 opt_cr= 16771 opt_cr=
16768@@ -7095,6 +7421,7 @@ for ac_symprfx in "" "_"; do 16772@@ -7102,6 +7428,7 @@ for ac_symprfx in "" "_"; do
16769 else 16773 else
16770 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" 16774 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
16771 fi 16775 fi
@@ -16773,7 +16777,7 @@ index e5ca8ad9379..b7c4c4be78d 100755
16773 16777
16774 # Check to see that the pipe works correctly. 16778 # Check to see that the pipe works correctly.
16775 pipe_works=no 16779 pipe_works=no
16776@@ -7136,6 +7463,18 @@ _LT_EOF 16780@@ -7143,6 +7470,18 @@ _LT_EOF
16777 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then 16781 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
16778 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then 16782 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
16779 cat <<_LT_EOF > conftest.$ac_ext 16783 cat <<_LT_EOF > conftest.$ac_ext
@@ -16792,7 +16796,7 @@ index e5ca8ad9379..b7c4c4be78d 100755
16792 #ifdef __cplusplus 16796 #ifdef __cplusplus
16793 extern "C" { 16797 extern "C" {
16794 #endif 16798 #endif
16795@@ -7147,7 +7486,7 @@ _LT_EOF 16799@@ -7154,7 +7493,7 @@ _LT_EOF
16796 cat <<_LT_EOF >> conftest.$ac_ext 16800 cat <<_LT_EOF >> conftest.$ac_ext
16797 16801
16798 /* The mapping between symbol names and symbols. */ 16802 /* The mapping between symbol names and symbols. */
@@ -16801,7 +16805,7 @@ index e5ca8ad9379..b7c4c4be78d 100755
16801 const char *name; 16805 const char *name;
16802 void *address; 16806 void *address;
16803 } 16807 }
16804@@ -7173,8 +7512,8 @@ static const void *lt_preloaded_setup() { 16808@@ -7180,8 +7519,8 @@ static const void *lt_preloaded_setup() {
16805 _LT_EOF 16809 _LT_EOF
16806 # Now try linking the two files. 16810 # Now try linking the two files.
16807 mv conftest.$ac_objext conftstm.$ac_objext 16811 mv conftest.$ac_objext conftstm.$ac_objext
@@ -16812,7 +16816,7 @@ index e5ca8ad9379..b7c4c4be78d 100755
16812 LIBS="conftstm.$ac_objext" 16816 LIBS="conftstm.$ac_objext"
16813 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" 16817 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
16814 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 16818 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
16815@@ -7184,8 +7523,8 @@ _LT_EOF 16819@@ -7191,8 +7530,8 @@ _LT_EOF
16816 test $ac_status = 0; } && test -s conftest${ac_exeext}; then 16820 test $ac_status = 0; } && test -s conftest${ac_exeext}; then
16817 pipe_works=yes 16821 pipe_works=yes
16818 fi 16822 fi
@@ -16823,7 +16827,7 @@ index e5ca8ad9379..b7c4c4be78d 100755
16823 else 16827 else
16824 echo "cannot find nm_test_func in $nlist" >&5 16828 echo "cannot find nm_test_func in $nlist" >&5
16825 fi 16829 fi
16826@@ -7222,6 +7561,18 @@ else 16830@@ -7229,6 +7568,18 @@ else
16827 $as_echo "ok" >&6; } 16831 $as_echo "ok" >&6; }
16828 fi 16832 fi
16829 16833
@@ -16842,7 +16846,7 @@ index e5ca8ad9379..b7c4c4be78d 100755
16842 16846
16843 16847
16844 16848
16845@@ -7238,6 +7589,43 @@ fi 16849@@ -7245,6 +7596,43 @@ fi
16846 16850
16847 16851
16848 16852
@@ -16886,7 +16890,7 @@ index e5ca8ad9379..b7c4c4be78d 100755
16886 16890
16887 16891
16888 16892
16889@@ -7404,50 +7792,167 @@ _ACEOF 16893@@ -7411,50 +7799,167 @@ _ACEOF
16890 if ac_fn_c_try_link "$LINENO"; then : 16894 if ac_fn_c_try_link "$LINENO"; then :
16891 lt_cv_cc_needs_belf=yes 16895 lt_cv_cc_needs_belf=yes
16892 else 16896 else
@@ -17093,7 +17097,7 @@ index e5ca8ad9379..b7c4c4be78d 100755
17093 17097
17094 17098
17095 case $host_os in 17099 case $host_os in
17096@@ -8012,6 +8517,8 @@ _LT_EOF 17100@@ -8019,6 +8524,8 @@ _LT_EOF
17097 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 17101 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
17098 echo "$AR cru libconftest.a conftest.o" >&5 17102 echo "$AR cru libconftest.a conftest.o" >&5
17099 $AR cru libconftest.a conftest.o 2>&5 17103 $AR cru libconftest.a conftest.o 2>&5
@@ -17102,7 +17106,7 @@ index e5ca8ad9379..b7c4c4be78d 100755
17102 cat > conftest.c << _LT_EOF 17106 cat > conftest.c << _LT_EOF
17103 int main() { return 0;} 17107 int main() { return 0;}
17104 _LT_EOF 17108 _LT_EOF
17105@@ -8596,8 +9103,6 @@ fi 17109@@ -8603,8 +9110,6 @@ fi
17106 lt_prog_compiler_pic= 17110 lt_prog_compiler_pic=
17107 lt_prog_compiler_static= 17111 lt_prog_compiler_static=
17108 17112
@@ -17111,7 +17115,7 @@ index e5ca8ad9379..b7c4c4be78d 100755
17111 17115
17112 if test "$GCC" = yes; then 17116 if test "$GCC" = yes; then
17113 lt_prog_compiler_wl='-Wl,' 17117 lt_prog_compiler_wl='-Wl,'
17114@@ -8763,6 +9268,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 17118@@ -8770,6 +9275,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
17115 lt_prog_compiler_pic='--shared' 17119 lt_prog_compiler_pic='--shared'
17116 lt_prog_compiler_static='--static' 17120 lt_prog_compiler_static='--static'
17117 ;; 17121 ;;
@@ -17124,7 +17128,7 @@ index e5ca8ad9379..b7c4c4be78d 100755
17124 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) 17128 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
17125 # Portland Group compilers (*not* the Pentium gcc compiler, 17129 # Portland Group compilers (*not* the Pentium gcc compiler,
17126 # which looks to be a dead project) 17130 # which looks to be a dead project)
17127@@ -8825,7 +9336,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 17131@@ -8832,7 +9343,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
17128 lt_prog_compiler_pic='-KPIC' 17132 lt_prog_compiler_pic='-KPIC'
17129 lt_prog_compiler_static='-Bstatic' 17133 lt_prog_compiler_static='-Bstatic'
17130 case $cc_basename in 17134 case $cc_basename in
@@ -17133,7 +17137,7 @@ index e5ca8ad9379..b7c4c4be78d 100755
17133 lt_prog_compiler_wl='-Qoption ld ';; 17137 lt_prog_compiler_wl='-Qoption ld ';;
17134 *) 17138 *)
17135 lt_prog_compiler_wl='-Wl,';; 17139 lt_prog_compiler_wl='-Wl,';;
17136@@ -8882,13 +9393,17 @@ case $host_os in 17140@@ -8889,13 +9400,17 @@ case $host_os in
17137 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" 17141 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
17138 ;; 17142 ;;
17139 esac 17143 esac
@@ -17157,7 +17161,7 @@ index e5ca8ad9379..b7c4c4be78d 100755
17157 17161
17158 # 17162 #
17159 # Check to make sure the PIC flag actually works. 17163 # Check to make sure the PIC flag actually works.
17160@@ -8949,6 +9464,11 @@ fi 17164@@ -8956,6 +9471,11 @@ fi
17161 17165
17162 17166
17163 17167
@@ -17169,7 +17173,7 @@ index e5ca8ad9379..b7c4c4be78d 100755
17169 # 17173 #
17170 # Check to make sure the static flag actually works. 17174 # Check to make sure the static flag actually works.
17171 # 17175 #
17172@@ -9299,7 +9819,8 @@ _LT_EOF 17176@@ -9306,7 +9826,8 @@ _LT_EOF
17173 allow_undefined_flag=unsupported 17177 allow_undefined_flag=unsupported
17174 always_export_symbols=no 17178 always_export_symbols=no
17175 enable_shared_with_static_runtimes=yes 17179 enable_shared_with_static_runtimes=yes
@@ -17179,7 +17183,7 @@ index e5ca8ad9379..b7c4c4be78d 100755
17179 17183
17180 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then 17184 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
17181 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' 17185 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
17182@@ -9398,12 +9919,12 @@ _LT_EOF 17186@@ -9405,12 +9926,12 @@ _LT_EOF
17183 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' 17187 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
17184 hardcode_libdir_flag_spec= 17188 hardcode_libdir_flag_spec=
17185 hardcode_libdir_flag_spec_ld='-rpath $libdir' 17189 hardcode_libdir_flag_spec_ld='-rpath $libdir'
@@ -17194,7 +17198,7 @@ index e5ca8ad9379..b7c4c4be78d 100755
17194 fi 17198 fi
17195 ;; 17199 ;;
17196 esac 17200 esac
17197@@ -9417,8 +9938,8 @@ _LT_EOF 17201@@ -9424,8 +9945,8 @@ _LT_EOF
17198 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' 17202 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
17199 wlarc= 17203 wlarc=
17200 else 17204 else
@@ -17205,7 +17209,7 @@ index e5ca8ad9379..b7c4c4be78d 100755
17205 fi 17209 fi
17206 ;; 17210 ;;
17207 17211
17208@@ -9436,8 +9957,8 @@ _LT_EOF 17212@@ -9443,8 +9964,8 @@ _LT_EOF
17209 17213
17210 _LT_EOF 17214 _LT_EOF
17211 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 17215 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -17216,7 +17220,7 @@ index e5ca8ad9379..b7c4c4be78d 100755
17216 else 17220 else
17217 ld_shlibs=no 17221 ld_shlibs=no
17218 fi 17222 fi
17219@@ -9483,8 +10004,8 @@ _LT_EOF 17223@@ -9490,8 +10011,8 @@ _LT_EOF
17220 17224
17221 *) 17225 *)
17222 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 17226 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -17227,7 +17231,7 @@ index e5ca8ad9379..b7c4c4be78d 100755
17227 else 17231 else
17228 ld_shlibs=no 17232 ld_shlibs=no
17229 fi 17233 fi
17230@@ -9614,7 +10135,13 @@ _LT_EOF 17234@@ -9621,7 +10142,13 @@ _LT_EOF
17231 allow_undefined_flag='-berok' 17235 allow_undefined_flag='-berok'
17232 # Determine the default libpath from the value encoded in an 17236 # Determine the default libpath from the value encoded in an
17233 # empty executable. 17237 # empty executable.
@@ -17242,7 +17246,7 @@ index e5ca8ad9379..b7c4c4be78d 100755
17242 /* end confdefs.h. */ 17246 /* end confdefs.h. */
17243 17247
17244 int 17248 int
17245@@ -9627,22 +10154,29 @@ main () 17249@@ -9634,22 +10161,29 @@ main ()
17246 _ACEOF 17250 _ACEOF
17247 if ac_fn_c_try_link "$LINENO"; then : 17251 if ac_fn_c_try_link "$LINENO"; then :
17248 17252
@@ -17285,7 +17289,7 @@ index e5ca8ad9379..b7c4c4be78d 100755
17285 17289
17286 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 17290 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
17287 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" 17291 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"
17288@@ -9654,7 +10188,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 17292@@ -9661,7 +10195,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
17289 else 17293 else
17290 # Determine the default libpath from the value encoded in an 17294 # Determine the default libpath from the value encoded in an
17291 # empty executable. 17295 # empty executable.
@@ -17300,7 +17304,7 @@ index e5ca8ad9379..b7c4c4be78d 100755
17300 /* end confdefs.h. */ 17304 /* end confdefs.h. */
17301 17305
17302 int 17306 int
17303@@ -9667,22 +10207,29 @@ main () 17307@@ -9674,22 +10214,29 @@ main ()
17304 _ACEOF 17308 _ACEOF
17305 if ac_fn_c_try_link "$LINENO"; then : 17309 if ac_fn_c_try_link "$LINENO"; then :
17306 17310
@@ -17343,7 +17347,7 @@ index e5ca8ad9379..b7c4c4be78d 100755
17343 17347
17344 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 17348 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
17345 # Warning - without using the other run time loading flags, 17349 # Warning - without using the other run time loading flags,
17346@@ -9727,20 +10274,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 17350@@ -9734,20 +10281,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
17347 # Microsoft Visual C++. 17351 # Microsoft Visual C++.
17348 # hardcode_libdir_flag_spec is actually meaningless, as there is 17352 # hardcode_libdir_flag_spec is actually meaningless, as there is
17349 # no search path for DLLs. 17353 # no search path for DLLs.
@@ -17421,7 +17425,7 @@ index e5ca8ad9379..b7c4c4be78d 100755
17421 ;; 17425 ;;
17422 17426
17423 darwin* | rhapsody*) 17427 darwin* | rhapsody*)
17424@@ -9801,7 +10391,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 17428@@ -9808,7 +10398,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
17425 17429
17426 # FreeBSD 3 and greater uses gcc -shared to do shared libraries. 17430 # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
17427 freebsd* | dragonfly*) 17431 freebsd* | dragonfly*)
@@ -17430,7 +17434,7 @@ index e5ca8ad9379..b7c4c4be78d 100755
17430 hardcode_libdir_flag_spec='-R$libdir' 17434 hardcode_libdir_flag_spec='-R$libdir'
17431 hardcode_direct=yes 17435 hardcode_direct=yes
17432 hardcode_shlibpath_var=no 17436 hardcode_shlibpath_var=no
17433@@ -9809,7 +10399,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 17437@@ -9816,7 +10406,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
17434 17438
17435 hpux9*) 17439 hpux9*)
17436 if test "$GCC" = yes; then 17440 if test "$GCC" = yes; then
@@ -17439,7 +17443,7 @@ index e5ca8ad9379..b7c4c4be78d 100755
17439 else 17443 else
17440 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' 17444 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'
17441 fi 17445 fi
17442@@ -9825,7 +10415,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 17446@@ -9832,7 +10422,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
17443 17447
17444 hpux10*) 17448 hpux10*)
17445 if test "$GCC" = yes && test "$with_gnu_ld" = no; then 17449 if test "$GCC" = yes && test "$with_gnu_ld" = no; then
@@ -17448,7 +17452,7 @@ index e5ca8ad9379..b7c4c4be78d 100755
17448 else 17452 else
17449 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' 17453 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
17450 fi 17454 fi
17451@@ -9849,10 +10439,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 17455@@ -9856,10 +10446,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
17452 archive_cmds='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' 17456 archive_cmds='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
17453 ;; 17457 ;;
17454 ia64*) 17458 ia64*)
@@ -17461,7 +17465,7 @@ index e5ca8ad9379..b7c4c4be78d 100755
17461 ;; 17465 ;;
17462 esac 17466 esac
17463 else 17467 else
17464@@ -9931,23 +10521,36 @@ fi 17468@@ -9938,23 +10528,36 @@ fi
17465 17469
17466 irix5* | irix6* | nonstopux*) 17470 irix5* | irix6* | nonstopux*)
17467 if test "$GCC" = yes; then 17471 if test "$GCC" = yes; then
@@ -17506,7 +17510,7 @@ index e5ca8ad9379..b7c4c4be78d 100755
17506 else 17510 else
17507 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' 17511 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'
17508 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' 17512 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'
17509@@ -10032,7 +10635,7 @@ rm -f core conftest.err conftest.$ac_objext \ 17513@@ -10039,7 +10642,7 @@ rm -f core conftest.err conftest.$ac_objext \
17510 osf4* | osf5*) # as osf3* with the addition of -msym flag 17514 osf4* | osf5*) # as osf3* with the addition of -msym flag
17511 if test "$GCC" = yes; then 17515 if test "$GCC" = yes; then
17512 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' 17516 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
@@ -17515,7 +17519,7 @@ index e5ca8ad9379..b7c4c4be78d 100755
17515 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' 17519 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
17516 else 17520 else
17517 allow_undefined_flag=' -expect_unresolved \*' 17521 allow_undefined_flag=' -expect_unresolved \*'
17518@@ -10051,9 +10654,9 @@ rm -f core conftest.err conftest.$ac_objext \ 17522@@ -10058,9 +10661,9 @@ rm -f core conftest.err conftest.$ac_objext \
17519 no_undefined_flag=' -z defs' 17523 no_undefined_flag=' -z defs'
17520 if test "$GCC" = yes; then 17524 if test "$GCC" = yes; then
17521 wlarc='${wl}' 17525 wlarc='${wl}'
@@ -17527,7 +17531,7 @@ index e5ca8ad9379..b7c4c4be78d 100755
17527 else 17531 else
17528 case `$CC -V 2>&1` in 17532 case `$CC -V 2>&1` in
17529 *"Compilers 5.0"*) 17533 *"Compilers 5.0"*)
17530@@ -10629,8 +11232,9 @@ cygwin* | mingw* | pw32* | cegcc*) 17534@@ -10636,8 +11239,9 @@ cygwin* | mingw* | pw32* | cegcc*)
17531 need_version=no 17535 need_version=no
17532 need_lib_prefix=no 17536 need_lib_prefix=no
17533 17537
@@ -17539,7 +17543,7 @@ index e5ca8ad9379..b7c4c4be78d 100755
17539 library_names_spec='$libname.dll.a' 17543 library_names_spec='$libname.dll.a'
17540 # DLL is installed to $(libdir)/../bin by postinstall_cmds 17544 # DLL is installed to $(libdir)/../bin by postinstall_cmds
17541 postinstall_cmds='base_file=`basename \${file}`~ 17545 postinstall_cmds='base_file=`basename \${file}`~
17542@@ -10663,13 +11267,71 @@ cygwin* | mingw* | pw32* | cegcc*) 17546@@ -10670,13 +11274,71 @@ cygwin* | mingw* | pw32* | cegcc*)
17543 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' 17547 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
17544 ;; 17548 ;;
17545 esac 17549 esac
@@ -17612,16 +17616,16 @@ index e5ca8ad9379..b7c4c4be78d 100755
17612 # FIXME: first we should search . and the directory the executable is in 17616 # FIXME: first we should search . and the directory the executable is in
17613 shlibpath_var=PATH 17617 shlibpath_var=PATH
17614 ;; 17618 ;;
17615@@ -11571,7 +12233,7 @@ else 17619@@ -11578,7 +12240,7 @@ else
17616 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 17620 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
17617 lt_status=$lt_dlunknown 17621 lt_status=$lt_dlunknown
17618 cat > conftest.$ac_ext <<_LT_EOF 17622 cat > conftest.$ac_ext <<_LT_EOF
17619-#line 11574 "configure" 17623-#line 11581 "configure"
17620+#line $LINENO "configure" 17624+#line $LINENO "configure"
17621 #include "confdefs.h" 17625 #include "confdefs.h"
17622 17626
17623 #if HAVE_DLFCN_H 17627 #if HAVE_DLFCN_H
17624@@ -11615,10 +12277,10 @@ else 17628@@ -11622,10 +12284,10 @@ else
17625 /* When -fvisbility=hidden is used, assume the code has been annotated 17629 /* When -fvisbility=hidden is used, assume the code has been annotated
17626 correspondingly for the symbols needed. */ 17630 correspondingly for the symbols needed. */
17627 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 17631 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
@@ -17634,16 +17638,16 @@ index e5ca8ad9379..b7c4c4be78d 100755
17634 int main () 17638 int main ()
17635 { 17639 {
17636 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 17640 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
17637@@ -11677,7 +12339,7 @@ else 17641@@ -11684,7 +12346,7 @@ else
17638 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 17642 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
17639 lt_status=$lt_dlunknown 17643 lt_status=$lt_dlunknown
17640 cat > conftest.$ac_ext <<_LT_EOF 17644 cat > conftest.$ac_ext <<_LT_EOF
17641-#line 11680 "configure" 17645-#line 11687 "configure"
17642+#line $LINENO "configure" 17646+#line $LINENO "configure"
17643 #include "confdefs.h" 17647 #include "confdefs.h"
17644 17648
17645 #if HAVE_DLFCN_H 17649 #if HAVE_DLFCN_H
17646@@ -11721,10 +12383,10 @@ else 17650@@ -11728,10 +12390,10 @@ else
17647 /* When -fvisbility=hidden is used, assume the code has been annotated 17651 /* When -fvisbility=hidden is used, assume the code has been annotated
17648 correspondingly for the symbols needed. */ 17652 correspondingly for the symbols needed. */
17649 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 17653 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
@@ -17656,7 +17660,7 @@ index e5ca8ad9379..b7c4c4be78d 100755
17656 int main () 17660 int main ()
17657 { 17661 {
17658 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 17662 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
17659@@ -15010,13 +15672,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' 17663@@ -15191,13 +15853,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
17660 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' 17664 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
17661 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' 17665 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
17662 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' 17666 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
@@ -17677,7 +17681,7 @@ index e5ca8ad9379..b7c4c4be78d 100755
17677 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' 17681 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
17678 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' 17682 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
17679 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' 17683 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
17680@@ -15031,14 +15700,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de 17684@@ -15212,14 +15881,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de
17681 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' 17685 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
17682 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' 17686 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
17683 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"`' 17687 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"`'
@@ -17696,7 +17700,7 @@ index e5ca8ad9379..b7c4c4be78d 100755
17696 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' 17700 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
17697 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' 17701 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
17698 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' 17702 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
17699@@ -15071,12 +15743,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q 17703@@ -15252,12 +15924,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q
17700 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' 17704 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
17701 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' 17705 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
17702 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' 17706 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
@@ -17710,7 +17714,7 @@ index e5ca8ad9379..b7c4c4be78d 100755
17710 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' 17714 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
17711 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' 17715 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
17712 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' 17716 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
17713@@ -15131,8 +15803,13 @@ reload_flag \ 17717@@ -15312,8 +15984,13 @@ reload_flag \
17714 OBJDUMP \ 17718 OBJDUMP \
17715 deplibs_check_method \ 17719 deplibs_check_method \
17716 file_magic_cmd \ 17720 file_magic_cmd \
@@ -17724,7 +17728,7 @@ index e5ca8ad9379..b7c4c4be78d 100755
17724 STRIP \ 17728 STRIP \
17725 RANLIB \ 17729 RANLIB \
17726 CC \ 17730 CC \
17727@@ -15142,12 +15819,14 @@ lt_cv_sys_global_symbol_pipe \ 17731@@ -15323,12 +16000,14 @@ lt_cv_sys_global_symbol_pipe \
17728 lt_cv_sys_global_symbol_to_cdecl \ 17732 lt_cv_sys_global_symbol_to_cdecl \
17729 lt_cv_sys_global_symbol_to_c_name_address \ 17733 lt_cv_sys_global_symbol_to_c_name_address \
17730 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ 17734 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
@@ -17740,7 +17744,7 @@ index e5ca8ad9379..b7c4c4be78d 100755
17740 DSYMUTIL \ 17744 DSYMUTIL \
17741 NMEDIT \ 17745 NMEDIT \
17742 LIPO \ 17746 LIPO \
17743@@ -15163,7 +15842,6 @@ no_undefined_flag \ 17747@@ -15344,7 +16023,6 @@ no_undefined_flag \
17744 hardcode_libdir_flag_spec \ 17748 hardcode_libdir_flag_spec \
17745 hardcode_libdir_flag_spec_ld \ 17749 hardcode_libdir_flag_spec_ld \
17746 hardcode_libdir_separator \ 17750 hardcode_libdir_separator \
@@ -17748,7 +17752,7 @@ index e5ca8ad9379..b7c4c4be78d 100755
17748 exclude_expsyms \ 17752 exclude_expsyms \
17749 include_expsyms \ 17753 include_expsyms \
17750 file_list_spec \ 17754 file_list_spec \
17751@@ -15199,6 +15877,7 @@ module_cmds \ 17755@@ -15380,6 +16058,7 @@ module_cmds \
17752 module_expsym_cmds \ 17756 module_expsym_cmds \
17753 export_symbols_cmds \ 17757 export_symbols_cmds \
17754 prelink_cmds \ 17758 prelink_cmds \
@@ -17756,7 +17760,7 @@ index e5ca8ad9379..b7c4c4be78d 100755
17756 postinstall_cmds \ 17760 postinstall_cmds \
17757 postuninstall_cmds \ 17761 postuninstall_cmds \
17758 finish_cmds \ 17762 finish_cmds \
17759@@ -15897,7 +16576,8 @@ esac ;; 17763@@ -16078,7 +16757,8 @@ esac ;;
17760 # NOTE: Changes made to this file will be lost: look at ltmain.sh. 17764 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
17761 # 17765 #
17762 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 17766 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
@@ -17766,7 +17770,7 @@ index e5ca8ad9379..b7c4c4be78d 100755
17766 # Written by Gordon Matzigkeit, 1996 17770 # Written by Gordon Matzigkeit, 1996
17767 # 17771 #
17768 # This file is part of GNU Libtool. 17772 # This file is part of GNU Libtool.
17769@@ -16000,19 +16680,42 @@ SP2NL=$lt_lt_SP2NL 17773@@ -16181,19 +16861,42 @@ SP2NL=$lt_lt_SP2NL
17770 # turn newlines into spaces. 17774 # turn newlines into spaces.
17771 NL2SP=$lt_lt_NL2SP 17775 NL2SP=$lt_lt_NL2SP
17772 17776
@@ -17810,7 +17814,7 @@ index e5ca8ad9379..b7c4c4be78d 100755
17810 # A symbol stripping program. 17814 # A symbol stripping program.
17811 STRIP=$lt_STRIP 17815 STRIP=$lt_STRIP
17812 17816
17813@@ -16042,6 +16745,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address 17817@@ -16223,6 +16926,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
17814 # Transform the output of nm in a C name address pair when lib prefix is needed. 17818 # Transform the output of nm in a C name address pair when lib prefix is needed.
17815 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix 17819 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
17816 17820
@@ -17823,7 +17827,7 @@ index e5ca8ad9379..b7c4c4be78d 100755
17823 # The name of the directory that contains temporary libtool files. 17827 # The name of the directory that contains temporary libtool files.
17824 objdir=$objdir 17828 objdir=$objdir
17825 17829
17826@@ -16051,6 +16760,9 @@ MAGIC_CMD=$MAGIC_CMD 17830@@ -16232,6 +16941,9 @@ MAGIC_CMD=$MAGIC_CMD
17827 # Must we lock files when doing compilation? 17831 # Must we lock files when doing compilation?
17828 need_locks=$lt_need_locks 17832 need_locks=$lt_need_locks
17829 17833
@@ -17833,7 +17837,7 @@ index e5ca8ad9379..b7c4c4be78d 100755
17833 # Tool to manipulate archived DWARF debug symbol files on Mac OS X. 17837 # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
17834 DSYMUTIL=$lt_DSYMUTIL 17838 DSYMUTIL=$lt_DSYMUTIL
17835 17839
17836@@ -16165,12 +16877,12 @@ with_gcc=$GCC 17840@@ -16346,12 +17058,12 @@ with_gcc=$GCC
17837 # Compiler flag to turn off builtin functions. 17841 # Compiler flag to turn off builtin functions.
17838 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag 17842 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
17839 17843
@@ -17849,7 +17853,7 @@ index e5ca8ad9379..b7c4c4be78d 100755
17849 # Compiler flag to prevent dynamic linking. 17853 # Compiler flag to prevent dynamic linking.
17850 link_static_flag=$lt_lt_prog_compiler_static 17854 link_static_flag=$lt_lt_prog_compiler_static
17851 17855
17852@@ -16257,9 +16969,6 @@ inherit_rpath=$inherit_rpath 17856@@ -16438,9 +17150,6 @@ inherit_rpath=$inherit_rpath
17853 # Whether libtool must link a program against all its dependency libraries. 17857 # Whether libtool must link a program against all its dependency libraries.
17854 link_all_deplibs=$link_all_deplibs 17858 link_all_deplibs=$link_all_deplibs
17855 17859
@@ -17859,7 +17863,7 @@ index e5ca8ad9379..b7c4c4be78d 100755
17859 # Set to "yes" if exported symbols are required. 17863 # Set to "yes" if exported symbols are required.
17860 always_export_symbols=$always_export_symbols 17864 always_export_symbols=$always_export_symbols
17861 17865
17862@@ -16275,6 +16984,9 @@ include_expsyms=$lt_include_expsyms 17866@@ -16456,6 +17165,9 @@ include_expsyms=$lt_include_expsyms
17863 # Commands necessary for linking programs (against libraries) with templates. 17867 # Commands necessary for linking programs (against libraries) with templates.
17864 prelink_cmds=$lt_prelink_cmds 17868 prelink_cmds=$lt_prelink_cmds
17865 17869
@@ -17869,7 +17873,7 @@ index e5ca8ad9379..b7c4c4be78d 100755
17869 # Specify filename containing input files. 17873 # Specify filename containing input files.
17870 file_list_spec=$lt_file_list_spec 17874 file_list_spec=$lt_file_list_spec
17871 17875
17872@@ -16307,210 +17019,169 @@ ltmain="$ac_aux_dir/ltmain.sh" 17876@@ -16488,210 +17200,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
17873 # if finds mixed CR/LF and LF-only lines. Since sed operates in 17877 # if finds mixed CR/LF and LF-only lines. Since sed operates in
17874 # text mode, it properly converts lines to CR/LF. This bash problem 17878 # text mode, it properly converts lines to CR/LF. This bash problem
17875 # is reportedly fixed, but why not run on old versions too? 17879 # is reportedly fixed, but why not run on old versions too?
@@ -18244,7 +18248,7 @@ index e5ca8ad9379..b7c4c4be78d 100755
18244 chmod +x "$ofile" 18248 chmod +x "$ofile"
18245 18249
18246diff --git a/libctf/Makefile.in b/libctf/Makefile.in 18250diff --git a/libctf/Makefile.in b/libctf/Makefile.in
18247index 1cdf105a323..b69d6472e86 100644 18251index 5d9587766dc..146b7a71685 100644
18248--- a/libctf/Makefile.in 18252--- a/libctf/Makefile.in
18249+++ b/libctf/Makefile.in 18253+++ b/libctf/Makefile.in
18250@@ -442,6 +442,7 @@ CYGPATH_W = @CYGPATH_W@ 18254@@ -442,6 +442,7 @@ CYGPATH_W = @CYGPATH_W@
@@ -18264,7 +18268,7 @@ index 1cdf105a323..b69d6472e86 100644
18264 MKINSTALLDIRS = @MKINSTALLDIRS@ 18268 MKINSTALLDIRS = @MKINSTALLDIRS@
18265 MSGFMT = @MSGFMT@ 18269 MSGFMT = @MSGFMT@
18266diff --git a/libctf/configure b/libctf/configure 18270diff --git a/libctf/configure b/libctf/configure
18267index 3701bd8e796..9e36ae7c51c 100755 18271index 7466d56a18b..0325e438a47 100755
18268--- a/libctf/configure 18272--- a/libctf/configure
18269+++ b/libctf/configure 18273+++ b/libctf/configure
18270@@ -669,6 +669,8 @@ OTOOL 18274@@ -669,6 +669,8 @@ OTOOL
@@ -19543,7 +19547,16 @@ index 3701bd8e796..9e36ae7c51c 100755
19543 # FIXME: first we should search . and the directory the executable is in 19547 # FIXME: first we should search . and the directory the executable is in
19544 shlibpath_var=PATH 19548 shlibpath_var=PATH
19545 ;; 19549 ;;
19546@@ -13640,10 +14293,10 @@ else 19550@@ -13596,7 +14245,7 @@ else
19551 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
19552 lt_status=$lt_dlunknown
19553 cat > conftest.$ac_ext <<_LT_EOF
19554-#line 13599 "configure"
19555+#line $LINENO "configure"
19556 #include "confdefs.h"
19557
19558 #if HAVE_DLFCN_H
19559@@ -13640,10 +14289,10 @@ else
19547 /* When -fvisbility=hidden is used, assume the code has been annotated 19560 /* When -fvisbility=hidden is used, assume the code has been annotated
19548 correspondingly for the symbols needed. */ 19561 correspondingly for the symbols needed. */
19549 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 19562 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
@@ -19556,7 +19569,16 @@ index 3701bd8e796..9e36ae7c51c 100755
19556 int main () 19569 int main ()
19557 { 19570 {
19558 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 19571 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
19559@@ -13746,10 +14403,10 @@ else 19572@@ -13702,7 +14351,7 @@ else
19573 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
19574 lt_status=$lt_dlunknown
19575 cat > conftest.$ac_ext <<_LT_EOF
19576-#line 13705 "configure"
19577+#line $LINENO "configure"
19578 #include "confdefs.h"
19579
19580 #if HAVE_DLFCN_H
19581@@ -13746,10 +14395,10 @@ else
19560 /* When -fvisbility=hidden is used, assume the code has been annotated 19582 /* When -fvisbility=hidden is used, assume the code has been annotated
19561 correspondingly for the symbols needed. */ 19583 correspondingly for the symbols needed. */
19562 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 19584 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
@@ -19569,7 +19591,7 @@ index 3701bd8e796..9e36ae7c51c 100755
19569 int main () 19591 int main ()
19570 { 19592 {
19571 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 19593 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
19572@@ -17797,13 +18454,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' 19594@@ -17813,13 +18462,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
19573 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' 19595 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
19574 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' 19596 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
19575 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' 19597 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
@@ -19590,7 +19612,7 @@ index 3701bd8e796..9e36ae7c51c 100755
19590 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' 19612 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
19591 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' 19613 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
19592 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' 19614 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
19593@@ -17818,14 +18482,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de 19615@@ -17834,14 +18490,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de
19594 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' 19616 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
19595 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' 19617 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
19596 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"`' 19618 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"`'
@@ -19609,7 +19631,7 @@ index 3701bd8e796..9e36ae7c51c 100755
19609 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' 19631 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
19610 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' 19632 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
19611 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' 19633 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
19612@@ -17858,12 +18525,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q 19634@@ -17874,12 +18533,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q
19613 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' 19635 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
19614 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' 19636 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
19615 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' 19637 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
@@ -19623,7 +19645,7 @@ index 3701bd8e796..9e36ae7c51c 100755
19623 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' 19645 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
19624 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' 19646 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
19625 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' 19647 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
19626@@ -17918,8 +18585,13 @@ reload_flag \ 19648@@ -17934,8 +18593,13 @@ reload_flag \
19627 OBJDUMP \ 19649 OBJDUMP \
19628 deplibs_check_method \ 19650 deplibs_check_method \
19629 file_magic_cmd \ 19651 file_magic_cmd \
@@ -19637,7 +19659,7 @@ index 3701bd8e796..9e36ae7c51c 100755
19637 STRIP \ 19659 STRIP \
19638 RANLIB \ 19660 RANLIB \
19639 CC \ 19661 CC \
19640@@ -17929,12 +18601,14 @@ lt_cv_sys_global_symbol_pipe \ 19662@@ -17945,12 +18609,14 @@ lt_cv_sys_global_symbol_pipe \
19641 lt_cv_sys_global_symbol_to_cdecl \ 19663 lt_cv_sys_global_symbol_to_cdecl \
19642 lt_cv_sys_global_symbol_to_c_name_address \ 19664 lt_cv_sys_global_symbol_to_c_name_address \
19643 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ 19665 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
@@ -19653,7 +19675,7 @@ index 3701bd8e796..9e36ae7c51c 100755
19653 DSYMUTIL \ 19675 DSYMUTIL \
19654 NMEDIT \ 19676 NMEDIT \
19655 LIPO \ 19677 LIPO \
19656@@ -17950,7 +18624,6 @@ no_undefined_flag \ 19678@@ -17966,7 +18632,6 @@ no_undefined_flag \
19657 hardcode_libdir_flag_spec \ 19679 hardcode_libdir_flag_spec \
19658 hardcode_libdir_flag_spec_ld \ 19680 hardcode_libdir_flag_spec_ld \
19659 hardcode_libdir_separator \ 19681 hardcode_libdir_separator \
@@ -19661,7 +19683,7 @@ index 3701bd8e796..9e36ae7c51c 100755
19661 exclude_expsyms \ 19683 exclude_expsyms \
19662 include_expsyms \ 19684 include_expsyms \
19663 file_list_spec \ 19685 file_list_spec \
19664@@ -17986,6 +18659,7 @@ module_cmds \ 19686@@ -18002,6 +18667,7 @@ module_cmds \
19665 module_expsym_cmds \ 19687 module_expsym_cmds \
19666 export_symbols_cmds \ 19688 export_symbols_cmds \
19667 prelink_cmds \ 19689 prelink_cmds \
@@ -19669,7 +19691,7 @@ index 3701bd8e796..9e36ae7c51c 100755
19669 postinstall_cmds \ 19691 postinstall_cmds \
19670 postuninstall_cmds \ 19692 postuninstall_cmds \
19671 finish_cmds \ 19693 finish_cmds \
19672@@ -18845,7 +19519,8 @@ $as_echo X"$file" | 19694@@ -18861,7 +19527,8 @@ $as_echo X"$file" |
19673 # NOTE: Changes made to this file will be lost: look at ltmain.sh. 19695 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
19674 # 19696 #
19675 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 19697 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
@@ -19679,7 +19701,7 @@ index 3701bd8e796..9e36ae7c51c 100755
19679 # Written by Gordon Matzigkeit, 1996 19701 # Written by Gordon Matzigkeit, 1996
19680 # 19702 #
19681 # This file is part of GNU Libtool. 19703 # This file is part of GNU Libtool.
19682@@ -18948,19 +19623,42 @@ SP2NL=$lt_lt_SP2NL 19704@@ -18964,19 +19631,42 @@ SP2NL=$lt_lt_SP2NL
19683 # turn newlines into spaces. 19705 # turn newlines into spaces.
19684 NL2SP=$lt_lt_NL2SP 19706 NL2SP=$lt_lt_NL2SP
19685 19707
@@ -19723,7 +19745,7 @@ index 3701bd8e796..9e36ae7c51c 100755
19723 # A symbol stripping program. 19745 # A symbol stripping program.
19724 STRIP=$lt_STRIP 19746 STRIP=$lt_STRIP
19725 19747
19726@@ -18990,6 +19688,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address 19748@@ -19006,6 +19696,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
19727 # Transform the output of nm in a C name address pair when lib prefix is needed. 19749 # Transform the output of nm in a C name address pair when lib prefix is needed.
19728 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix 19750 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
19729 19751
@@ -19736,7 +19758,7 @@ index 3701bd8e796..9e36ae7c51c 100755
19736 # The name of the directory that contains temporary libtool files. 19758 # The name of the directory that contains temporary libtool files.
19737 objdir=$objdir 19759 objdir=$objdir
19738 19760
19739@@ -18999,6 +19703,9 @@ MAGIC_CMD=$MAGIC_CMD 19761@@ -19015,6 +19711,9 @@ MAGIC_CMD=$MAGIC_CMD
19740 # Must we lock files when doing compilation? 19762 # Must we lock files when doing compilation?
19741 need_locks=$lt_need_locks 19763 need_locks=$lt_need_locks
19742 19764
@@ -19746,7 +19768,7 @@ index 3701bd8e796..9e36ae7c51c 100755
19746 # Tool to manipulate archived DWARF debug symbol files on Mac OS X. 19768 # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
19747 DSYMUTIL=$lt_DSYMUTIL 19769 DSYMUTIL=$lt_DSYMUTIL
19748 19770
19749@@ -19113,12 +19820,12 @@ with_gcc=$GCC 19771@@ -19129,12 +19828,12 @@ with_gcc=$GCC
19750 # Compiler flag to turn off builtin functions. 19772 # Compiler flag to turn off builtin functions.
19751 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag 19773 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
19752 19774
@@ -19762,7 +19784,7 @@ index 3701bd8e796..9e36ae7c51c 100755
19762 # Compiler flag to prevent dynamic linking. 19784 # Compiler flag to prevent dynamic linking.
19763 link_static_flag=$lt_lt_prog_compiler_static 19785 link_static_flag=$lt_lt_prog_compiler_static
19764 19786
19765@@ -19205,9 +19912,6 @@ inherit_rpath=$inherit_rpath 19787@@ -19221,9 +19920,6 @@ inherit_rpath=$inherit_rpath
19766 # Whether libtool must link a program against all its dependency libraries. 19788 # Whether libtool must link a program against all its dependency libraries.
19767 link_all_deplibs=$link_all_deplibs 19789 link_all_deplibs=$link_all_deplibs
19768 19790
@@ -19772,7 +19794,7 @@ index 3701bd8e796..9e36ae7c51c 100755
19772 # Set to "yes" if exported symbols are required. 19794 # Set to "yes" if exported symbols are required.
19773 always_export_symbols=$always_export_symbols 19795 always_export_symbols=$always_export_symbols
19774 19796
19775@@ -19223,6 +19927,9 @@ include_expsyms=$lt_include_expsyms 19797@@ -19239,6 +19935,9 @@ include_expsyms=$lt_include_expsyms
19776 # Commands necessary for linking programs (against libraries) with templates. 19798 # Commands necessary for linking programs (against libraries) with templates.
19777 prelink_cmds=$lt_prelink_cmds 19799 prelink_cmds=$lt_prelink_cmds
19778 19800
@@ -19782,7 +19804,7 @@ index 3701bd8e796..9e36ae7c51c 100755
19782 # Specify filename containing input files. 19804 # Specify filename containing input files.
19783 file_list_spec=$lt_file_list_spec 19805 file_list_spec=$lt_file_list_spec
19784 19806
19785@@ -19255,210 +19962,169 @@ ltmain="$ac_aux_dir/ltmain.sh" 19807@@ -19271,210 +19970,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
19786 # if finds mixed CR/LF and LF-only lines. Since sed operates in 19808 # if finds mixed CR/LF and LF-only lines. Since sed operates in
19787 # text mode, it properly converts lines to CR/LF. This bash problem 19809 # text mode, it properly converts lines to CR/LF. This bash problem
19788 # is reportedly fixed, but why not run on old versions too? 19810 # is reportedly fixed, but why not run on old versions too?
@@ -20157,7 +20179,7 @@ index 3701bd8e796..9e36ae7c51c 100755
20157 chmod +x "$ofile" 20179 chmod +x "$ofile"
20158 20180
20159diff --git a/libsframe/Makefile.in b/libsframe/Makefile.in 20181diff --git a/libsframe/Makefile.in b/libsframe/Makefile.in
20160index 9e3d268902b..c22ed33460a 100644 20182index 13f4c26e2f1..e6e05b80d0e 100644
20161--- a/libsframe/Makefile.in 20183--- a/libsframe/Makefile.in
20162+++ b/libsframe/Makefile.in 20184+++ b/libsframe/Makefile.in
20163@@ -1,7 +1,7 @@ 20185@@ -1,7 +1,7 @@
@@ -20170,7 +20192,7 @@ index 9e3d268902b..c22ed33460a 100644
20170 20192
20171 # This Makefile.in is free software; the Free Software Foundation 20193 # This Makefile.in is free software; the Free Software Foundation
20172 # gives unlimited permission to copy and/or distribute it, 20194 # gives unlimited permission to copy and/or distribute it,
20173@@ -142,6 +142,13 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs 20195@@ -144,6 +144,13 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs
20174 CONFIG_HEADER = config.h 20196 CONFIG_HEADER = config.h
20175 CONFIG_CLEAN_FILES = 20197 CONFIG_CLEAN_FILES =
20176 CONFIG_CLEAN_VPATH_FILES = 20198 CONFIG_CLEAN_VPATH_FILES =
@@ -20184,7 +20206,7 @@ index 9e3d268902b..c22ed33460a 100644
20184 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; 20206 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
20185 am__vpath_adj = case $$p in \ 20207 am__vpath_adj = case $$p in \
20186 $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ 20208 $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
20187@@ -185,45 +192,44 @@ libsframe_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ 20209@@ -187,45 +194,44 @@ libsframe_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
20188 $(libsframe_la_LDFLAGS) $(LDFLAGS) -o $@ 20210 $(libsframe_la_LDFLAGS) $(LDFLAGS) -o $@
20189 @INSTALL_LIBBFD_FALSE@am_libsframe_la_rpath = 20211 @INSTALL_LIBBFD_FALSE@am_libsframe_la_rpath =
20190 @INSTALL_LIBBFD_TRUE@am_libsframe_la_rpath = -rpath $(libdir) 20212 @INSTALL_LIBBFD_TRUE@am_libsframe_la_rpath = -rpath $(libdir)
@@ -20243,7 +20265,7 @@ index 9e3d268902b..c22ed33460a 100644
20243 testsuite_libsframe_find_plt_findfre_1_OBJECTS = \ 20265 testsuite_libsframe_find_plt_findfre_1_OBJECTS = \
20244 $(am_testsuite_libsframe_find_plt_findfre_1_OBJECTS) 20266 $(am_testsuite_libsframe_find_plt_findfre_1_OBJECTS)
20245 testsuite_libsframe_find_plt_findfre_1_DEPENDENCIES = \ 20267 testsuite_libsframe_find_plt_findfre_1_DEPENDENCIES = \
20246@@ -242,7 +248,17 @@ am__v_at_0 = @ 20268@@ -244,7 +250,17 @@ am__v_at_0 = @
20247 am__v_at_1 = 20269 am__v_at_1 =
20248 DEFAULT_INCLUDES = -I.@am__isrc@ 20270 DEFAULT_INCLUDES = -I.@am__isrc@
20249 depcomp = $(SHELL) $(top_srcdir)/../depcomp 20271 depcomp = $(SHELL) $(top_srcdir)/../depcomp
@@ -20262,7 +20284,7 @@ index 9e3d268902b..c22ed33460a 100644
20262 am__mv = mv -f 20284 am__mv = mv -f
20263 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ 20285 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
20264 $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) 20286 $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
20265@@ -325,8 +341,8 @@ am__can_run_installinfo = \ 20287@@ -327,8 +343,8 @@ am__can_run_installinfo = \
20266 esac 20288 esac
20267 am__include_HEADERS_DIST = $(INCDIR)/sframe.h $(INCDIR)/sframe-api.h 20289 am__include_HEADERS_DIST = $(INCDIR)/sframe.h $(INCDIR)/sframe-api.h
20268 HEADERS = $(include_HEADERS) 20290 HEADERS = $(include_HEADERS)
@@ -20273,7 +20295,7 @@ index 9e3d268902b..c22ed33460a 100644
20273 # Read a list of newline-separated strings from the standard input, 20295 # Read a list of newline-separated strings from the standard input,
20274 # and print each of them once, without duplicates. Input order is 20296 # and print each of them once, without duplicates. Input order is
20275 # *not* preserved. 20297 # *not* preserved.
20276@@ -343,9 +359,6 @@ am__define_uniq_tagged_files = \ 20298@@ -345,9 +361,6 @@ am__define_uniq_tagged_files = \
20277 unique=`for i in $$list; do \ 20299 unique=`for i in $$list; do \
20278 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ 20300 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
20279 done | $(am__uniquify_input)` 20301 done | $(am__uniquify_input)`
@@ -20283,7 +20305,7 @@ index 9e3d268902b..c22ed33460a 100644
20283 AM_RECURSIVE_TARGETS = cscope 20305 AM_RECURSIVE_TARGETS = cscope
20284 DEJATOOL = $(PACKAGE) 20306 DEJATOOL = $(PACKAGE)
20285 RUNTESTDEFAULTFLAGS = --tool $$tool --srcdir $$srcdir 20307 RUNTESTDEFAULTFLAGS = --tool $$tool --srcdir $$srcdir
20286@@ -372,6 +385,8 @@ am__post_remove_distdir = $(am__remove_distdir) 20308@@ -374,6 +387,8 @@ am__post_remove_distdir = $(am__remove_distdir)
20287 DIST_ARCHIVES = $(distdir).tar.gz 20309 DIST_ARCHIVES = $(distdir).tar.gz
20288 GZIP_ENV = --best 20310 GZIP_ENV = --best
20289 DIST_TARGETS = dist-gzip 20311 DIST_TARGETS = dist-gzip
@@ -20292,7 +20314,7 @@ index 9e3d268902b..c22ed33460a 100644
20292 distuninstallcheck_listfiles = find . -type f -print 20314 distuninstallcheck_listfiles = find . -type f -print
20293 am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \ 20315 am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
20294 | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$' 20316 | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
20295@@ -390,15 +405,19 @@ CFLAGS = @CFLAGS@ 20317@@ -392,15 +407,19 @@ CFLAGS = @CFLAGS@
20296 COMPAT_DEJAGNU = @COMPAT_DEJAGNU@ 20318 COMPAT_DEJAGNU = @COMPAT_DEJAGNU@
20297 CPP = @CPP@ 20319 CPP = @CPP@
20298 CPPFLAGS = @CPPFLAGS@ 20320 CPPFLAGS = @CPPFLAGS@
@@ -20312,7 +20334,7 @@ index 9e3d268902b..c22ed33460a 100644
20312 EXEEXT = @EXEEXT@ 20334 EXEEXT = @EXEEXT@
20313 FGREP = @FGREP@ 20335 FGREP = @FGREP@
20314 GREP = @GREP@ 20336 GREP = @GREP@
20315@@ -417,6 +436,7 @@ LN_S = @LN_S@ 20337@@ -419,6 +438,7 @@ LN_S = @LN_S@
20316 LTLIBOBJS = @LTLIBOBJS@ 20338 LTLIBOBJS = @LTLIBOBJS@
20317 MAINT = @MAINT@ 20339 MAINT = @MAINT@
20318 MAKEINFO = @MAKEINFO@ 20340 MAKEINFO = @MAKEINFO@
@@ -20320,7 +20342,7 @@ index 9e3d268902b..c22ed33460a 100644
20320 MKDIR_P = @MKDIR_P@ 20342 MKDIR_P = @MKDIR_P@
20321 NM = @NM@ 20343 NM = @NM@
20322 NMEDIT = @NMEDIT@ 20344 NMEDIT = @NMEDIT@
20323@@ -589,8 +609,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status 20345@@ -595,8 +615,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
20324 echo ' $(SHELL) ./config.status'; \ 20346 echo ' $(SHELL) ./config.status'; \
20325 $(SHELL) ./config.status;; \ 20347 $(SHELL) ./config.status;; \
20326 *) \ 20348 *) \
@@ -20331,7 +20353,7 @@ index 9e3d268902b..c22ed33460a 100644
20331 esac; 20353 esac;
20332 $(srcdir)/doc/local.mk $(srcdir)/testsuite/local.mk $(srcdir)/testsuite/libsframe.decode/local.mk $(srcdir)/testsuite/libsframe.encode/local.mk $(srcdir)/testsuite/libsframe.find/local.mk $(am__empty): 20354 $(srcdir)/doc/local.mk $(srcdir)/testsuite/local.mk $(srcdir)/testsuite/libsframe.decode/local.mk $(srcdir)/testsuite/libsframe.encode/local.mk $(srcdir)/testsuite/libsframe.find/local.mk $(am__empty):
20333 20355
20334@@ -618,6 +638,15 @@ $(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) 20356@@ -624,6 +644,15 @@ $(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
20335 distclean-hdr: 20357 distclean-hdr:
20336 -rm -f config.h stamp-h1 20358 -rm -f config.h stamp-h1
20337 20359
@@ -20347,7 +20369,7 @@ index 9e3d268902b..c22ed33460a 100644
20347 install-libLTLIBRARIES: $(lib_LTLIBRARIES) 20369 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
20348 @$(NORMAL_INSTALL) 20370 @$(NORMAL_INSTALL)
20349 @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ 20371 @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
20350@@ -666,36 +695,27 @@ clean-noinstLTLIBRARIES: 20372@@ -672,36 +701,27 @@ clean-noinstLTLIBRARIES:
20351 20373
20352 libsframe.la: $(libsframe_la_OBJECTS) $(libsframe_la_DEPENDENCIES) $(EXTRA_libsframe_la_DEPENDENCIES) 20374 libsframe.la: $(libsframe_la_OBJECTS) $(libsframe_la_DEPENDENCIES) $(EXTRA_libsframe_la_DEPENDENCIES)
20353 $(AM_V_CCLD)$(libsframe_la_LINK) $(am_libsframe_la_rpath) $(libsframe_la_OBJECTS) $(libsframe_la_LIBADD) $(LIBS) 20375 $(AM_V_CCLD)$(libsframe_la_LINK) $(am_libsframe_la_rpath) $(libsframe_la_OBJECTS) $(libsframe_la_LIBADD) $(LIBS)
@@ -20387,7 +20409,7 @@ index 9e3d268902b..c22ed33460a 100644
20387 testsuite/libsframe.decode/$(am__dirstamp) \ 20409 testsuite/libsframe.decode/$(am__dirstamp) \
20388 testsuite/libsframe.decode/$(DEPDIR)/$(am__dirstamp) 20410 testsuite/libsframe.decode/$(DEPDIR)/$(am__dirstamp)
20389 20411
20390@@ -708,7 +728,7 @@ testsuite/libsframe.encode/$(am__dirstamp): 20412@@ -714,7 +734,7 @@ testsuite/libsframe.encode/$(am__dirstamp):
20391 testsuite/libsframe.encode/$(DEPDIR)/$(am__dirstamp): 20413 testsuite/libsframe.encode/$(DEPDIR)/$(am__dirstamp):
20392 @$(MKDIR_P) testsuite/libsframe.encode/$(DEPDIR) 20414 @$(MKDIR_P) testsuite/libsframe.encode/$(DEPDIR)
20393 @: > testsuite/libsframe.encode/$(DEPDIR)/$(am__dirstamp) 20415 @: > testsuite/libsframe.encode/$(DEPDIR)/$(am__dirstamp)
@@ -20396,7 +20418,7 @@ index 9e3d268902b..c22ed33460a 100644
20396 testsuite/libsframe.encode/$(am__dirstamp) \ 20418 testsuite/libsframe.encode/$(am__dirstamp) \
20397 testsuite/libsframe.encode/$(DEPDIR)/$(am__dirstamp) 20419 testsuite/libsframe.encode/$(DEPDIR)/$(am__dirstamp)
20398 20420
20399@@ -721,21 +741,21 @@ testsuite/libsframe.find/$(am__dirstamp): 20421@@ -727,21 +747,21 @@ testsuite/libsframe.find/$(am__dirstamp):
20400 testsuite/libsframe.find/$(DEPDIR)/$(am__dirstamp): 20422 testsuite/libsframe.find/$(DEPDIR)/$(am__dirstamp):
20401 @$(MKDIR_P) testsuite/libsframe.find/$(DEPDIR) 20423 @$(MKDIR_P) testsuite/libsframe.find/$(DEPDIR)
20402 @: > testsuite/libsframe.find/$(DEPDIR)/$(am__dirstamp) 20424 @: > testsuite/libsframe.find/$(DEPDIR)/$(am__dirstamp)
@@ -20421,7 +20443,7 @@ index 9e3d268902b..c22ed33460a 100644
20421 testsuite/libsframe.find/$(am__dirstamp) \ 20443 testsuite/libsframe.find/$(am__dirstamp) \
20422 testsuite/libsframe.find/$(DEPDIR)/$(am__dirstamp) 20444 testsuite/libsframe.find/$(DEPDIR)/$(am__dirstamp)
20423 20445
20424@@ -752,16 +772,22 @@ mostlyclean-compile: 20446@@ -758,16 +778,22 @@ mostlyclean-compile:
20425 distclean-compile: 20447 distclean-compile:
20426 -rm -f *.tab.c 20448 -rm -f *.tab.c
20427 20449
@@ -20454,7 +20476,7 @@ index 9e3d268902b..c22ed33460a 100644
20454 20476
20455 .c.o: 20477 .c.o:
20456 @am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ 20478 @am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
20457@@ -808,103 +834,103 @@ libsframe_la-sframe-error.lo: sframe-error.c 20479@@ -814,103 +840,103 @@ libsframe_la-sframe-error.lo: sframe-error.c
20458 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 20480 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
20459 @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsframe_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libsframe_la-sframe-error.lo `test -f 'sframe-error.c' || echo '$(srcdir)/'`sframe-error.c 20481 @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsframe_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libsframe_la-sframe-error.lo `test -f 'sframe-error.c' || echo '$(srcdir)/'`sframe-error.c
20460 20482
@@ -20628,7 +20650,7 @@ index 9e3d268902b..c22ed33460a 100644
20628 20650
20629 mostlyclean-libtool: 20651 mostlyclean-libtool:
20630 -rm -f *.lo 20652 -rm -f *.lo
20631@@ -1142,7 +1168,7 @@ site.exp: Makefile $(EXTRA_DEJAGNU_SITE_CONFIG) 20653@@ -1148,7 +1174,7 @@ site.exp: Makefile $(EXTRA_DEJAGNU_SITE_CONFIG)
20632 @echo '# Do not edit here. If you wish to override these values' >>site.tmp 20654 @echo '# Do not edit here. If you wish to override these values' >>site.tmp
20633 @echo '# edit the last section' >>site.tmp 20655 @echo '# edit the last section' >>site.tmp
20634 @echo 'set srcdir "$(srcdir)"' >>site.tmp 20656 @echo 'set srcdir "$(srcdir)"' >>site.tmp
@@ -20637,7 +20659,7 @@ index 9e3d268902b..c22ed33460a 100644
20637 @echo 'set build_alias "$(build_alias)"' >>site.tmp 20659 @echo 'set build_alias "$(build_alias)"' >>site.tmp
20638 @echo 'set build_triplet $(build_triplet)' >>site.tmp 20660 @echo 'set build_triplet $(build_triplet)' >>site.tmp
20639 @echo 'set host_alias "$(host_alias)"' >>site.tmp 20661 @echo 'set host_alias "$(host_alias)"' >>site.tmp
20640@@ -1166,8 +1192,10 @@ distclean-DEJAGNU: 20662@@ -1174,8 +1200,10 @@ distclean-DEJAGNU:
20641 -l='$(DEJATOOL)'; for tool in $$l; do \ 20663 -l='$(DEJATOOL)'; for tool in $$l; do \
20642 rm -f $$tool.sum $$tool.log; \ 20664 rm -f $$tool.sum $$tool.log; \
20643 done 20665 done
@@ -20649,7 +20671,7 @@ index 9e3d268902b..c22ed33460a 100644
20649 $(am__remove_distdir) 20671 $(am__remove_distdir)
20650 test -d "$(distdir)" || mkdir "$(distdir)" 20672 test -d "$(distdir)" || mkdir "$(distdir)"
20651 @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ 20673 @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
20652@@ -1225,6 +1253,10 @@ dist-xz: distdir 20674@@ -1233,6 +1261,10 @@ dist-xz: distdir
20653 tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz 20675 tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
20654 $(am__post_remove_distdir) 20676 $(am__post_remove_distdir)
20655 20677
@@ -20660,7 +20682,7 @@ index 9e3d268902b..c22ed33460a 100644
20660 dist-tarZ: distdir 20682 dist-tarZ: distdir
20661 @echo WARNING: "Support for distribution archives compressed with" \ 20683 @echo WARNING: "Support for distribution archives compressed with" \
20662 "legacy program 'compress' is deprecated." >&2 20684 "legacy program 'compress' is deprecated." >&2
20663@@ -1267,6 +1299,8 @@ distcheck: dist 20685@@ -1275,6 +1307,8 @@ distcheck: dist
20664 eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\ 20686 eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\
20665 *.zip*) \ 20687 *.zip*) \
20666 unzip $(distdir).zip ;;\ 20688 unzip $(distdir).zip ;;\
@@ -20669,7 +20691,7 @@ index 9e3d268902b..c22ed33460a 100644
20669 esac 20691 esac
20670 chmod -R a-w $(distdir) 20692 chmod -R a-w $(distdir)
20671 chmod u+w $(distdir) 20693 chmod u+w $(distdir)
20672@@ -1282,7 +1316,7 @@ distcheck: dist 20694@@ -1290,7 +1324,7 @@ distcheck: dist
20673 $(DISTCHECK_CONFIGURE_FLAGS) \ 20695 $(DISTCHECK_CONFIGURE_FLAGS) \
20674 --srcdir=../.. --prefix="$$dc_install_base" \ 20696 --srcdir=../.. --prefix="$$dc_install_base" \
20675 && $(MAKE) $(AM_MAKEFLAGS) \ 20697 && $(MAKE) $(AM_MAKEFLAGS) \
@@ -20678,7 +20700,7 @@ index 9e3d268902b..c22ed33460a 100644
20678 && $(MAKE) $(AM_MAKEFLAGS) check \ 20700 && $(MAKE) $(AM_MAKEFLAGS) check \
20679 && $(MAKE) $(AM_MAKEFLAGS) install \ 20701 && $(MAKE) $(AM_MAKEFLAGS) install \
20680 && $(MAKE) $(AM_MAKEFLAGS) installcheck \ 20702 && $(MAKE) $(AM_MAKEFLAGS) installcheck \
20681@@ -1338,6 +1372,8 @@ check-am: all-am 20703@@ -1346,6 +1380,8 @@ check-am: all-am
20682 $(MAKE) $(AM_MAKEFLAGS) check-DEJAGNU 20704 $(MAKE) $(AM_MAKEFLAGS) check-DEJAGNU
20683 check: check-am 20705 check: check-am
20684 all-am: Makefile $(INFO_DEPS) $(LTLIBRARIES) $(HEADERS) config.h 20706 all-am: Makefile $(INFO_DEPS) $(LTLIBRARIES) $(HEADERS) config.h
@@ -20687,7 +20709,7 @@ index 9e3d268902b..c22ed33460a 100644
20687 installdirs: 20709 installdirs:
20688 for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(infodir)" "$(DESTDIR)$(includedir)"; do \ 20710 for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(infodir)" "$(DESTDIR)$(includedir)"; do \
20689 test -z "$$dir" || $(MKDIR_P) "$$dir"; \ 20711 test -z "$$dir" || $(MKDIR_P) "$$dir"; \
20690@@ -1390,7 +1426,16 @@ clean-am: clean-aminfo clean-checkPROGRAMS clean-generic \ 20712@@ -1398,7 +1434,16 @@ clean-am: clean-aminfo clean-checkPROGRAMS clean-generic \
20691 20713
20692 distclean: distclean-am 20714 distclean: distclean-am
20693 -rm -f $(am__CONFIG_DISTCLEAN_FILES) 20715 -rm -f $(am__CONFIG_DISTCLEAN_FILES)
@@ -20705,7 +20727,7 @@ index 9e3d268902b..c22ed33460a 100644
20705 -rm -f Makefile 20727 -rm -f Makefile
20706 distclean-am: clean-am distclean-DEJAGNU distclean-compile \ 20728 distclean-am: clean-am distclean-DEJAGNU distclean-compile \
20707 distclean-generic distclean-hdr distclean-libtool \ 20729 distclean-generic distclean-hdr distclean-libtool \
20708@@ -1530,7 +1575,16 @@ installcheck-am: 20730@@ -1538,7 +1583,16 @@ installcheck-am:
20709 maintainer-clean: maintainer-clean-am 20731 maintainer-clean: maintainer-clean-am
20710 -rm -f $(am__CONFIG_DISTCLEAN_FILES) 20732 -rm -f $(am__CONFIG_DISTCLEAN_FILES)
20711 -rm -rf $(top_srcdir)/autom4te.cache 20733 -rm -rf $(top_srcdir)/autom4te.cache
@@ -20723,7 +20745,7 @@ index 9e3d268902b..c22ed33460a 100644
20723 -rm -f Makefile 20745 -rm -f Makefile
20724 maintainer-clean-am: distclean-am maintainer-clean-aminfo \ 20746 maintainer-clean-am: distclean-am maintainer-clean-aminfo \
20725 maintainer-clean-generic 20747 maintainer-clean-generic
20726@@ -1554,28 +1608,28 @@ uninstall-am: uninstall-dvi-am uninstall-html-am \ 20748@@ -1562,28 +1616,28 @@ uninstall-am: uninstall-dvi-am uninstall-html-am \
20727 20749
20728 .MAKE: all check-am install-am install-strip 20750 .MAKE: all check-am install-am install-strip
20729 20751
@@ -20773,7 +20795,7 @@ index 9e3d268902b..c22ed33460a 100644
20773 .PRECIOUS: Makefile 20795 .PRECIOUS: Makefile
20774 20796
20775diff --git a/libsframe/aclocal.m4 b/libsframe/aclocal.m4 20797diff --git a/libsframe/aclocal.m4 b/libsframe/aclocal.m4
20776index b0cdd6b184d..c83d4f62ece 100644 20798index 8804d9fb42b..f4974423bd6 100644
20777--- a/libsframe/aclocal.m4 20799--- a/libsframe/aclocal.m4
20778+++ b/libsframe/aclocal.m4 20800+++ b/libsframe/aclocal.m4
20779@@ -1,6 +1,6 @@ 20801@@ -1,6 +1,6 @@
@@ -21222,7 +21244,7 @@ index b0cdd6b184d..c83d4f62ece 100644
21222 # This file is free software; the Free Software Foundation 21244 # This file is free software; the Free Software Foundation
21223 # gives unlimited permission to copy and/or distribute it, 21245 # gives unlimited permission to copy and/or distribute it,
21224diff --git a/libsframe/configure b/libsframe/configure 21246diff --git a/libsframe/configure b/libsframe/configure
21225index 1d9e5e10695..a234c4815b1 100755 21247index 4727eff533a..ca3885ad105 100755
21226--- a/libsframe/configure 21248--- a/libsframe/configure
21227+++ b/libsframe/configure 21249+++ b/libsframe/configure
21228@@ -658,6 +658,8 @@ OTOOL 21250@@ -658,6 +658,8 @@ OTOOL
@@ -21234,7 +21256,7 @@ index 1d9e5e10695..a234c4815b1 100755
21234 OBJDUMP 21256 OBJDUMP
21235 LN_S 21257 LN_S
21236 NM 21258 NM
21237@@ -682,6 +684,9 @@ AM_BACKSLASH 21259@@ -674,6 +676,9 @@ AM_BACKSLASH
21238 AM_DEFAULT_VERBOSITY 21260 AM_DEFAULT_VERBOSITY
21239 AM_DEFAULT_V 21261 AM_DEFAULT_V
21240 AM_V 21262 AM_V
@@ -21244,7 +21266,7 @@ index 1d9e5e10695..a234c4815b1 100755
21244 am__fastdepCC_FALSE 21266 am__fastdepCC_FALSE
21245 am__fastdepCC_TRUE 21267 am__fastdepCC_TRUE
21246 CCDEPMODE 21268 CCDEPMODE
21247@@ -689,7 +694,6 @@ am__nodep 21269@@ -681,7 +686,6 @@ am__nodep
21248 AMDEPBACKSLASH 21270 AMDEPBACKSLASH
21249 AMDEP_FALSE 21271 AMDEP_FALSE
21250 AMDEP_TRUE 21272 AMDEP_TRUE
@@ -21252,7 +21274,7 @@ index 1d9e5e10695..a234c4815b1 100755
21252 am__include 21274 am__include
21253 DEPDIR 21275 DEPDIR
21254 am__untar 21276 am__untar
21255@@ -762,7 +766,8 @@ PACKAGE_VERSION 21277@@ -766,7 +770,8 @@ PACKAGE_VERSION
21256 PACKAGE_TARNAME 21278 PACKAGE_TARNAME
21257 PACKAGE_NAME 21279 PACKAGE_NAME
21258 PATH_SEPARATOR 21280 PATH_SEPARATOR
@@ -21262,7 +21284,7 @@ index 1d9e5e10695..a234c4815b1 100755
21262 ac_subst_files='' 21284 ac_subst_files=''
21263 ac_user_opts=' 21285 ac_user_opts='
21264 enable_option_checking 21286 enable_option_checking
21265@@ -773,6 +778,7 @@ enable_static 21287@@ -777,6 +782,7 @@ enable_static
21266 with_pic 21288 with_pic
21267 enable_fast_install 21289 enable_fast_install
21268 with_gnu_ld 21290 with_gnu_ld
@@ -21270,7 +21292,7 @@ index 1d9e5e10695..a234c4815b1 100755
21270 enable_libtool_lock 21292 enable_libtool_lock
21271 enable_largefile 21293 enable_largefile
21272 enable_maintainer_mode 21294 enable_maintainer_mode
21273@@ -1428,6 +1434,8 @@ Optional Packages: 21295@@ -1433,6 +1439,8 @@ Optional Packages:
21274 --with-pic try to use only PIC/non-PIC objects [default=use 21296 --with-pic try to use only PIC/non-PIC objects [default=use
21275 both] 21297 both]
21276 --with-gnu-ld assume the C compiler uses GNU ld [default=no] 21298 --with-gnu-ld assume the C compiler uses GNU ld [default=no]
@@ -21279,7 +21301,7 @@ index 1d9e5e10695..a234c4815b1 100755
21279 21301
21280 Some influential environment variables: 21302 Some influential environment variables:
21281 CC C compiler command 21303 CC C compiler command
21282@@ -3610,7 +3618,7 @@ $as_echo "$ac_cv_safe_to_define___extensions__" >&6; } 21304@@ -3727,7 +3735,7 @@ $as_echo "$ac_cv_safe_to_define___extensions__" >&6; }
21283 $as_echo "#define _TANDEM_SOURCE 1" >>confdefs.h 21305 $as_echo "#define _TANDEM_SOURCE 1" >>confdefs.h
21284 21306
21285 21307
@@ -21288,7 +21310,7 @@ index 1d9e5e10695..a234c4815b1 100755
21288 21310
21289 # Find a good install program. We prefer a C program (faster), 21311 # Find a good install program. We prefer a C program (faster),
21290 # so one script is as good as another. But avoid the broken or 21312 # so one script is as good as another. But avoid the broken or
21291@@ -3783,12 +3791,7 @@ ac_script='s/[\\$]/&&/g;s/;s,x,x,$//' 21313@@ -3900,12 +3908,7 @@ ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'
21292 program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"` 21314 program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
21293 21315
21294 if test x"${MISSING+set}" != xset; then 21316 if test x"${MISSING+set}" != xset; then
@@ -21302,7 +21324,7 @@ index 1d9e5e10695..a234c4815b1 100755
21302 fi 21324 fi
21303 # Use eval to expand $SHELL 21325 # Use eval to expand $SHELL
21304 if eval "$MISSING --is-lightweight"; then 21326 if eval "$MISSING --is-lightweight"; then
21305@@ -4036,45 +4039,45 @@ DEPDIR="${am__leading_dot}deps" 21327@@ -4153,45 +4156,45 @@ DEPDIR="${am__leading_dot}deps"
21306 21328
21307 ac_config_commands="$ac_config_commands depfiles" 21329 ac_config_commands="$ac_config_commands depfiles"
21308 21330
@@ -21381,7 +21403,7 @@ index 1d9e5e10695..a234c4815b1 100755
21381 21403
21382 # Check whether --enable-dependency-tracking was given. 21404 # Check whether --enable-dependency-tracking was given.
21383 if test "${enable_dependency_tracking+set}" = set; then : 21405 if test "${enable_dependency_tracking+set}" = set; then :
21384@@ -4186,8 +4189,8 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} 21406@@ -4303,8 +4306,8 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
21385 21407
21386 # For better backward compatibility. To be removed once Automake 1.9.x 21408 # For better backward compatibility. To be removed once Automake 1.9.x
21387 # dies out for good. For more background, see: 21409 # dies out for good. For more background, see:
@@ -21392,7 +21414,7 @@ index 1d9e5e10695..a234c4815b1 100755
21392 mkdir_p='$(MKDIR_P)' 21414 mkdir_p='$(MKDIR_P)'
21393 21415
21394 # We need awk for the "check" target (and possibly the TAP driver). The 21416 # We need awk for the "check" target (and possibly the TAP driver). The
21395@@ -4334,6 +4337,20 @@ else 21417@@ -4451,6 +4454,20 @@ else
21396 fi 21418 fi
21397 21419
21398 21420
@@ -21413,7 +21435,7 @@ index 1d9e5e10695..a234c4815b1 100755
21413 21435
21414 # POSIX will say in a future version that running "rm -f" with no argument 21436 # POSIX will say in a future version that running "rm -f" with no argument
21415 # is OK; and we want to be able to make that assumption in our Makefile 21437 # is OK; and we want to be able to make that assumption in our Makefile
21416@@ -4366,7 +4383,7 @@ END 21438@@ -4483,7 +4500,7 @@ END
21417 Aborting the configuration process, to ensure you take notice of the issue. 21439 Aborting the configuration process, to ensure you take notice of the issue.
21418 21440
21419 You can download and install GNU coreutils to get an 'rm' implementation 21441 You can download and install GNU coreutils to get an 'rm' implementation
@@ -21422,7 +21444,7 @@ index 1d9e5e10695..a234c4815b1 100755
21422 21444
21423 If you want to complete the configuration process using your problematic 21445 If you want to complete the configuration process using your problematic
21424 'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM 21446 'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
21425@@ -5351,8 +5368,8 @@ esac 21447@@ -5468,8 +5485,8 @@ esac
21426 21448
21427 21449
21428 21450
@@ -21433,7 +21455,7 @@ index 1d9e5e10695..a234c4815b1 100755
21433 21455
21434 21456
21435 21457
21436@@ -5463,7 +5480,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO 21458@@ -5509,7 +5526,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
21437 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 21459 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
21438 $as_echo_n "checking how to print strings... " >&6; } 21460 $as_echo_n "checking how to print strings... " >&6; }
21439 # Test print first, because it will be a builtin if present. 21461 # Test print first, because it will be a builtin if present.
@@ -21442,7 +21464,7 @@ index 1d9e5e10695..a234c4815b1 100755
21442 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then 21464 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
21443 ECHO='print -r --' 21465 ECHO='print -r --'
21444 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then 21466 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
21445@@ -6156,8 +6173,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; 21467@@ -6202,8 +6219,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6;
21446 # Try some XSI features 21468 # Try some XSI features
21447 xsi_shell=no 21469 xsi_shell=no
21448 ( _lt_dummy="a/b/c" 21470 ( _lt_dummy="a/b/c"
@@ -21453,7 +21475,7 @@ index 1d9e5e10695..a234c4815b1 100755
21453 && eval 'test $(( 1 + 1 )) -eq 2 \ 21475 && eval 'test $(( 1 + 1 )) -eq 2 \
21454 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ 21476 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
21455 && xsi_shell=yes 21477 && xsi_shell=yes
21456@@ -6206,6 +6223,80 @@ esac 21478@@ -6252,6 +6269,80 @@ esac
21457 21479
21458 21480
21459 21481
@@ -21534,7 +21556,7 @@ index 1d9e5e10695..a234c4815b1 100755
21534 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 21556 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
21535 $as_echo_n "checking for $LD option to reload object files... " >&6; } 21557 $as_echo_n "checking for $LD option to reload object files... " >&6; }
21536 if ${lt_cv_ld_reload_flag+:} false; then : 21558 if ${lt_cv_ld_reload_flag+:} false; then :
21537@@ -6222,6 +6313,11 @@ case $reload_flag in 21559@@ -6268,6 +6359,11 @@ case $reload_flag in
21538 esac 21560 esac
21539 reload_cmds='$LD$reload_flag -o $output$reload_objs' 21561 reload_cmds='$LD$reload_flag -o $output$reload_objs'
21540 case $host_os in 21562 case $host_os in
@@ -21546,7 +21568,7 @@ index 1d9e5e10695..a234c4815b1 100755
21546 darwin*) 21568 darwin*)
21547 if test "$GCC" = yes; then 21569 if test "$GCC" = yes; then
21548 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' 21570 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
21549@@ -6390,7 +6486,8 @@ mingw* | pw32*) 21571@@ -6436,7 +6532,8 @@ mingw* | pw32*)
21550 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' 21572 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
21551 lt_cv_file_magic_cmd='func_win32_libid' 21573 lt_cv_file_magic_cmd='func_win32_libid'
21552 else 21574 else
@@ -21556,7 +21578,7 @@ index 1d9e5e10695..a234c4815b1 100755
21556 lt_cv_file_magic_cmd='$OBJDUMP -f' 21578 lt_cv_file_magic_cmd='$OBJDUMP -f'
21557 fi 21579 fi
21558 ;; 21580 ;;
21559@@ -6549,6 +6646,21 @@ esac 21581@@ -6595,6 +6692,21 @@ esac
21560 fi 21582 fi
21561 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 21583 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
21562 $as_echo "$lt_cv_deplibs_check_method" >&6; } 21584 $as_echo "$lt_cv_deplibs_check_method" >&6; }
@@ -21578,7 +21600,7 @@ index 1d9e5e10695..a234c4815b1 100755
21578 file_magic_cmd=$lt_cv_file_magic_cmd 21600 file_magic_cmd=$lt_cv_file_magic_cmd
21579 deplibs_check_method=$lt_cv_deplibs_check_method 21601 deplibs_check_method=$lt_cv_deplibs_check_method
21580 test -z "$deplibs_check_method" && deplibs_check_method=unknown 21602 test -z "$deplibs_check_method" && deplibs_check_method=unknown
21581@@ -6564,6 +6676,157 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown 21603@@ -6610,6 +6722,157 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
21582 21604
21583 21605
21584 21606
@@ -21736,7 +21758,7 @@ index 1d9e5e10695..a234c4815b1 100755
21736 plugin_option= 21758 plugin_option=
21737 plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll" 21759 plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll"
21738 for plugin in $plugin_names; do 21760 for plugin in $plugin_names; do
21739@@ -6578,8 +6841,10 @@ for plugin in $plugin_names; do 21761@@ -6624,8 +6887,10 @@ for plugin in $plugin_names; do
21740 done 21762 done
21741 21763
21742 if test -n "$ac_tool_prefix"; then 21764 if test -n "$ac_tool_prefix"; then
@@ -21749,7 +21771,7 @@ index 1d9e5e10695..a234c4815b1 100755
21749 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 21771 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
21750 $as_echo_n "checking for $ac_word... " >&6; } 21772 $as_echo_n "checking for $ac_word... " >&6; }
21751 if ${ac_cv_prog_AR+:} false; then : 21773 if ${ac_cv_prog_AR+:} false; then :
21752@@ -6595,7 +6860,7 @@ do 21774@@ -6641,7 +6906,7 @@ do
21753 test -z "$as_dir" && as_dir=. 21775 test -z "$as_dir" && as_dir=.
21754 for ac_exec_ext in '' $ac_executable_extensions; do 21776 for ac_exec_ext in '' $ac_executable_extensions; do
21755 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 21777 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
@@ -21758,7 +21780,7 @@ index 1d9e5e10695..a234c4815b1 100755
21758 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 21780 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
21759 break 2 21781 break 2
21760 fi 21782 fi
21761@@ -6615,11 +6880,15 @@ $as_echo "no" >&6; } 21783@@ -6661,11 +6926,15 @@ $as_echo "no" >&6; }
21762 fi 21784 fi
21763 21785
21764 21786
@@ -21777,7 +21799,7 @@ index 1d9e5e10695..a234c4815b1 100755
21777 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 21799 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
21778 $as_echo_n "checking for $ac_word... " >&6; } 21800 $as_echo_n "checking for $ac_word... " >&6; }
21779 if ${ac_cv_prog_ac_ct_AR+:} false; then : 21801 if ${ac_cv_prog_ac_ct_AR+:} false; then :
21780@@ -6635,7 +6904,7 @@ do 21802@@ -6681,7 +6950,7 @@ do
21781 test -z "$as_dir" && as_dir=. 21803 test -z "$as_dir" && as_dir=.
21782 for ac_exec_ext in '' $ac_executable_extensions; do 21804 for ac_exec_ext in '' $ac_executable_extensions; do
21783 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 21805 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
@@ -21786,7 +21808,7 @@ index 1d9e5e10695..a234c4815b1 100755
21786 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 21808 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
21787 break 2 21809 break 2
21788 fi 21810 fi
21789@@ -6654,6 +6923,10 @@ else 21811@@ -6700,6 +6969,10 @@ else
21790 $as_echo "no" >&6; } 21812 $as_echo "no" >&6; }
21791 fi 21813 fi
21792 21814
@@ -21797,7 +21819,7 @@ index 1d9e5e10695..a234c4815b1 100755
21797 if test "x$ac_ct_AR" = x; then 21819 if test "x$ac_ct_AR" = x; then
21798 AR="false" 21820 AR="false"
21799 else 21821 else
21800@@ -6665,29 +6938,81 @@ ac_tool_warned=yes ;; 21822@@ -6711,29 +6984,81 @@ ac_tool_warned=yes ;;
21801 esac 21823 esac
21802 AR=$ac_ct_AR 21824 AR=$ac_ct_AR
21803 fi 21825 fi
@@ -21894,7 +21916,7 @@ index 1d9e5e10695..a234c4815b1 100755
21894 21916
21895 21917
21896 21918
21897@@ -7034,8 +7359,8 @@ esac 21919@@ -7080,8 +7405,8 @@ esac
21898 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" 21920 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
21899 21921
21900 # Transform an extracted symbol line into symbol name and symbol address 21922 # Transform an extracted symbol line into symbol name and symbol address
@@ -21905,7 +21927,7 @@ index 1d9e5e10695..a234c4815b1 100755
21905 21927
21906 # Handle CRLF in mingw tool chain 21928 # Handle CRLF in mingw tool chain
21907 opt_cr= 21929 opt_cr=
21908@@ -7071,6 +7396,7 @@ for ac_symprfx in "" "_"; do 21930@@ -7117,6 +7442,7 @@ for ac_symprfx in "" "_"; do
21909 else 21931 else
21910 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" 21932 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
21911 fi 21933 fi
@@ -21913,7 +21935,7 @@ index 1d9e5e10695..a234c4815b1 100755
21913 21935
21914 # Check to see that the pipe works correctly. 21936 # Check to see that the pipe works correctly.
21915 pipe_works=no 21937 pipe_works=no
21916@@ -7112,6 +7438,18 @@ _LT_EOF 21938@@ -7158,6 +7484,18 @@ _LT_EOF
21917 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then 21939 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
21918 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then 21940 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
21919 cat <<_LT_EOF > conftest.$ac_ext 21941 cat <<_LT_EOF > conftest.$ac_ext
@@ -21932,7 +21954,7 @@ index 1d9e5e10695..a234c4815b1 100755
21932 #ifdef __cplusplus 21954 #ifdef __cplusplus
21933 extern "C" { 21955 extern "C" {
21934 #endif 21956 #endif
21935@@ -7123,7 +7461,7 @@ _LT_EOF 21957@@ -7169,7 +7507,7 @@ _LT_EOF
21936 cat <<_LT_EOF >> conftest.$ac_ext 21958 cat <<_LT_EOF >> conftest.$ac_ext
21937 21959
21938 /* The mapping between symbol names and symbols. */ 21960 /* The mapping between symbol names and symbols. */
@@ -21941,7 +21963,7 @@ index 1d9e5e10695..a234c4815b1 100755
21941 const char *name; 21963 const char *name;
21942 void *address; 21964 void *address;
21943 } 21965 }
21944@@ -7149,8 +7487,8 @@ static const void *lt_preloaded_setup() { 21966@@ -7195,8 +7533,8 @@ static const void *lt_preloaded_setup() {
21945 _LT_EOF 21967 _LT_EOF
21946 # Now try linking the two files. 21968 # Now try linking the two files.
21947 mv conftest.$ac_objext conftstm.$ac_objext 21969 mv conftest.$ac_objext conftstm.$ac_objext
@@ -21952,7 +21974,7 @@ index 1d9e5e10695..a234c4815b1 100755
21952 LIBS="conftstm.$ac_objext" 21974 LIBS="conftstm.$ac_objext"
21953 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" 21975 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
21954 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 21976 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
21955@@ -7160,8 +7498,8 @@ _LT_EOF 21977@@ -7206,8 +7544,8 @@ _LT_EOF
21956 test $ac_status = 0; } && test -s conftest${ac_exeext}; then 21978 test $ac_status = 0; } && test -s conftest${ac_exeext}; then
21957 pipe_works=yes 21979 pipe_works=yes
21958 fi 21980 fi
@@ -21963,7 +21985,7 @@ index 1d9e5e10695..a234c4815b1 100755
21963 else 21985 else
21964 echo "cannot find nm_test_func in $nlist" >&5 21986 echo "cannot find nm_test_func in $nlist" >&5
21965 fi 21987 fi
21966@@ -7198,6 +7536,16 @@ else 21988@@ -7244,6 +7582,16 @@ else
21967 $as_echo "ok" >&6; } 21989 $as_echo "ok" >&6; }
21968 fi 21990 fi
21969 21991
@@ -21980,7 +22002,7 @@ index 1d9e5e10695..a234c4815b1 100755
21980 22002
21981 22003
21982 22004
21983@@ -7214,6 +7562,45 @@ fi 22005@@ -7260,6 +7608,45 @@ fi
21984 22006
21985 22007
21986 22008
@@ -22026,7 +22048,7 @@ index 1d9e5e10695..a234c4815b1 100755
22026 22048
22027 22049
22028 22050
22029@@ -7419,11 +7806,128 @@ sparc*-*solaris*) 22051@@ -7465,11 +7852,128 @@ sparc*-*solaris*)
22030 ;; 22052 ;;
22031 esac 22053 esac
22032 fi 22054 fi
@@ -22158,7 +22180,7 @@ index 1d9e5e10695..a234c4815b1 100755
22158 22180
22159 22181
22160 case $host_os in 22182 case $host_os in
22161@@ -7988,6 +8492,8 @@ _LT_EOF 22183@@ -8034,6 +8538,8 @@ _LT_EOF
22162 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 22184 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
22163 echo "$AR cru libconftest.a conftest.o" >&5 22185 echo "$AR cru libconftest.a conftest.o" >&5
22164 $AR cru libconftest.a conftest.o 2>&5 22186 $AR cru libconftest.a conftest.o 2>&5
@@ -22167,7 +22189,7 @@ index 1d9e5e10695..a234c4815b1 100755
22167 cat > conftest.c << _LT_EOF 22189 cat > conftest.c << _LT_EOF
22168 int main() { return 0;} 22190 int main() { return 0;}
22169 _LT_EOF 22191 _LT_EOF
22170@@ -8542,8 +9048,6 @@ fi 22192@@ -8588,8 +9094,6 @@ fi
22171 lt_prog_compiler_pic= 22193 lt_prog_compiler_pic=
22172 lt_prog_compiler_static= 22194 lt_prog_compiler_static=
22173 22195
@@ -22176,7 +22198,7 @@ index 1d9e5e10695..a234c4815b1 100755
22176 22198
22177 if test "$GCC" = yes; then 22199 if test "$GCC" = yes; then
22178 lt_prog_compiler_wl='-Wl,' 22200 lt_prog_compiler_wl='-Wl,'
22179@@ -8709,6 +9213,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 22201@@ -8755,6 +9259,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
22180 lt_prog_compiler_pic='--shared' 22202 lt_prog_compiler_pic='--shared'
22181 lt_prog_compiler_static='--static' 22203 lt_prog_compiler_static='--static'
22182 ;; 22204 ;;
@@ -22189,7 +22211,7 @@ index 1d9e5e10695..a234c4815b1 100755
22189 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) 22211 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
22190 # Portland Group compilers (*not* the Pentium gcc compiler, 22212 # Portland Group compilers (*not* the Pentium gcc compiler,
22191 # which looks to be a dead project) 22213 # which looks to be a dead project)
22192@@ -8771,7 +9281,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 22214@@ -8817,7 +9327,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
22193 lt_prog_compiler_pic='-KPIC' 22215 lt_prog_compiler_pic='-KPIC'
22194 lt_prog_compiler_static='-Bstatic' 22216 lt_prog_compiler_static='-Bstatic'
22195 case $cc_basename in 22217 case $cc_basename in
@@ -22198,7 +22220,7 @@ index 1d9e5e10695..a234c4815b1 100755
22198 lt_prog_compiler_wl='-Qoption ld ';; 22220 lt_prog_compiler_wl='-Qoption ld ';;
22199 *) 22221 *)
22200 lt_prog_compiler_wl='-Wl,';; 22222 lt_prog_compiler_wl='-Wl,';;
22201@@ -8828,13 +9338,17 @@ case $host_os in 22223@@ -8874,13 +9384,17 @@ case $host_os in
22202 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" 22224 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
22203 ;; 22225 ;;
22204 esac 22226 esac
@@ -22222,7 +22244,7 @@ index 1d9e5e10695..a234c4815b1 100755
22222 22244
22223 # 22245 #
22224 # Check to make sure the PIC flag actually works. 22246 # Check to make sure the PIC flag actually works.
22225@@ -8895,6 +9409,11 @@ fi 22247@@ -8941,6 +9455,11 @@ fi
22226 22248
22227 22249
22228 22250
@@ -22234,7 +22256,7 @@ index 1d9e5e10695..a234c4815b1 100755
22234 # 22256 #
22235 # Check to make sure the static flag actually works. 22257 # Check to make sure the static flag actually works.
22236 # 22258 #
22237@@ -9245,7 +9764,8 @@ _LT_EOF 22259@@ -9291,7 +9810,8 @@ _LT_EOF
22238 allow_undefined_flag=unsupported 22260 allow_undefined_flag=unsupported
22239 always_export_symbols=no 22261 always_export_symbols=no
22240 enable_shared_with_static_runtimes=yes 22262 enable_shared_with_static_runtimes=yes
@@ -22244,7 +22266,7 @@ index 1d9e5e10695..a234c4815b1 100755
22244 22266
22245 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then 22267 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
22246 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' 22268 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
22247@@ -9344,12 +9864,12 @@ _LT_EOF 22269@@ -9390,12 +9910,12 @@ _LT_EOF
22248 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' 22270 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
22249 hardcode_libdir_flag_spec= 22271 hardcode_libdir_flag_spec=
22250 hardcode_libdir_flag_spec_ld='-rpath $libdir' 22272 hardcode_libdir_flag_spec_ld='-rpath $libdir'
@@ -22259,7 +22281,7 @@ index 1d9e5e10695..a234c4815b1 100755
22259 fi 22281 fi
22260 ;; 22282 ;;
22261 esac 22283 esac
22262@@ -9363,8 +9883,8 @@ _LT_EOF 22284@@ -9409,8 +9929,8 @@ _LT_EOF
22263 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' 22285 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
22264 wlarc= 22286 wlarc=
22265 else 22287 else
@@ -22270,7 +22292,7 @@ index 1d9e5e10695..a234c4815b1 100755
22270 fi 22292 fi
22271 ;; 22293 ;;
22272 22294
22273@@ -9382,8 +9902,8 @@ _LT_EOF 22295@@ -9428,8 +9948,8 @@ _LT_EOF
22274 22296
22275 _LT_EOF 22297 _LT_EOF
22276 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 22298 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -22281,7 +22303,7 @@ index 1d9e5e10695..a234c4815b1 100755
22281 else 22303 else
22282 ld_shlibs=no 22304 ld_shlibs=no
22283 fi 22305 fi
22284@@ -9429,8 +9949,8 @@ _LT_EOF 22306@@ -9475,8 +9995,8 @@ _LT_EOF
22285 22307
22286 *) 22308 *)
22287 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 22309 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -22292,7 +22314,7 @@ index 1d9e5e10695..a234c4815b1 100755
22292 else 22314 else
22293 ld_shlibs=no 22315 ld_shlibs=no
22294 fi 22316 fi
22295@@ -9560,7 +10080,13 @@ _LT_EOF 22317@@ -9606,7 +10126,13 @@ _LT_EOF
22296 allow_undefined_flag='-berok' 22318 allow_undefined_flag='-berok'
22297 # Determine the default libpath from the value encoded in an 22319 # Determine the default libpath from the value encoded in an
22298 # empty executable. 22320 # empty executable.
@@ -22307,7 +22329,7 @@ index 1d9e5e10695..a234c4815b1 100755
22307 /* end confdefs.h. */ 22329 /* end confdefs.h. */
22308 22330
22309 int 22331 int
22310@@ -9573,22 +10099,29 @@ main () 22332@@ -9619,22 +10145,29 @@ main ()
22311 _ACEOF 22333 _ACEOF
22312 if ac_fn_c_try_link "$LINENO"; then : 22334 if ac_fn_c_try_link "$LINENO"; then :
22313 22335
@@ -22350,7 +22372,7 @@ index 1d9e5e10695..a234c4815b1 100755
22350 22372
22351 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 22373 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
22352 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" 22374 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"
22353@@ -9600,7 +10133,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 22375@@ -9646,7 +10179,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
22354 else 22376 else
22355 # Determine the default libpath from the value encoded in an 22377 # Determine the default libpath from the value encoded in an
22356 # empty executable. 22378 # empty executable.
@@ -22365,7 +22387,7 @@ index 1d9e5e10695..a234c4815b1 100755
22365 /* end confdefs.h. */ 22387 /* end confdefs.h. */
22366 22388
22367 int 22389 int
22368@@ -9613,22 +10152,29 @@ main () 22390@@ -9659,22 +10198,29 @@ main ()
22369 _ACEOF 22391 _ACEOF
22370 if ac_fn_c_try_link "$LINENO"; then : 22392 if ac_fn_c_try_link "$LINENO"; then :
22371 22393
@@ -22408,7 +22430,7 @@ index 1d9e5e10695..a234c4815b1 100755
22408 22430
22409 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 22431 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
22410 # Warning - without using the other run time loading flags, 22432 # Warning - without using the other run time loading flags,
22411@@ -9673,20 +10219,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 22433@@ -9719,20 +10265,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
22412 # Microsoft Visual C++. 22434 # Microsoft Visual C++.
22413 # hardcode_libdir_flag_spec is actually meaningless, as there is 22435 # hardcode_libdir_flag_spec is actually meaningless, as there is
22414 # no search path for DLLs. 22436 # no search path for DLLs.
@@ -22486,7 +22508,7 @@ index 1d9e5e10695..a234c4815b1 100755
22486 ;; 22508 ;;
22487 22509
22488 darwin* | rhapsody*) 22510 darwin* | rhapsody*)
22489@@ -9747,7 +10336,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 22511@@ -9793,7 +10382,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
22490 22512
22491 # FreeBSD 3 and greater uses gcc -shared to do shared libraries. 22513 # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
22492 freebsd* | dragonfly*) 22514 freebsd* | dragonfly*)
@@ -22495,7 +22517,7 @@ index 1d9e5e10695..a234c4815b1 100755
22495 hardcode_libdir_flag_spec='-R$libdir' 22517 hardcode_libdir_flag_spec='-R$libdir'
22496 hardcode_direct=yes 22518 hardcode_direct=yes
22497 hardcode_shlibpath_var=no 22519 hardcode_shlibpath_var=no
22498@@ -9755,7 +10344,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 22520@@ -9801,7 +10390,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
22499 22521
22500 hpux9*) 22522 hpux9*)
22501 if test "$GCC" = yes; then 22523 if test "$GCC" = yes; then
@@ -22504,7 +22526,7 @@ index 1d9e5e10695..a234c4815b1 100755
22504 else 22526 else
22505 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' 22527 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'
22506 fi 22528 fi
22507@@ -9771,7 +10360,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 22529@@ -9817,7 +10406,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
22508 22530
22509 hpux10*) 22531 hpux10*)
22510 if test "$GCC" = yes && test "$with_gnu_ld" = no; then 22532 if test "$GCC" = yes && test "$with_gnu_ld" = no; then
@@ -22513,7 +22535,7 @@ index 1d9e5e10695..a234c4815b1 100755
22513 else 22535 else
22514 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' 22536 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
22515 fi 22537 fi
22516@@ -9795,10 +10384,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 22538@@ -9841,10 +10430,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
22517 archive_cmds='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' 22539 archive_cmds='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
22518 ;; 22540 ;;
22519 ia64*) 22541 ia64*)
@@ -22526,7 +22548,7 @@ index 1d9e5e10695..a234c4815b1 100755
22526 ;; 22548 ;;
22527 esac 22549 esac
22528 else 22550 else
22529@@ -9877,23 +10466,36 @@ fi 22551@@ -9923,23 +10512,36 @@ fi
22530 22552
22531 irix5* | irix6* | nonstopux*) 22553 irix5* | irix6* | nonstopux*)
22532 if test "$GCC" = yes; then 22554 if test "$GCC" = yes; then
@@ -22571,7 +22593,7 @@ index 1d9e5e10695..a234c4815b1 100755
22571 else 22593 else
22572 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' 22594 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'
22573 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' 22595 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'
22574@@ -9978,7 +10580,7 @@ rm -f core conftest.err conftest.$ac_objext \ 22596@@ -10024,7 +10626,7 @@ rm -f core conftest.err conftest.$ac_objext \
22575 osf4* | osf5*) # as osf3* with the addition of -msym flag 22597 osf4* | osf5*) # as osf3* with the addition of -msym flag
22576 if test "$GCC" = yes; then 22598 if test "$GCC" = yes; then
22577 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' 22599 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
@@ -22580,7 +22602,7 @@ index 1d9e5e10695..a234c4815b1 100755
22580 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' 22602 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
22581 else 22603 else
22582 allow_undefined_flag=' -expect_unresolved \*' 22604 allow_undefined_flag=' -expect_unresolved \*'
22583@@ -9997,9 +10599,9 @@ rm -f core conftest.err conftest.$ac_objext \ 22605@@ -10043,9 +10645,9 @@ rm -f core conftest.err conftest.$ac_objext \
22584 no_undefined_flag=' -z defs' 22606 no_undefined_flag=' -z defs'
22585 if test "$GCC" = yes; then 22607 if test "$GCC" = yes; then
22586 wlarc='${wl}' 22608 wlarc='${wl}'
@@ -22592,7 +22614,7 @@ index 1d9e5e10695..a234c4815b1 100755
22592 else 22614 else
22593 case `$CC -V 2>&1` in 22615 case `$CC -V 2>&1` in
22594 *"Compilers 5.0"*) 22616 *"Compilers 5.0"*)
22595@@ -10575,8 +11177,9 @@ cygwin* | mingw* | pw32* | cegcc*) 22617@@ -10621,8 +11223,9 @@ cygwin* | mingw* | pw32* | cegcc*)
22596 need_version=no 22618 need_version=no
22597 need_lib_prefix=no 22619 need_lib_prefix=no
22598 22620
@@ -22604,7 +22626,7 @@ index 1d9e5e10695..a234c4815b1 100755
22604 library_names_spec='$libname.dll.a' 22626 library_names_spec='$libname.dll.a'
22605 # DLL is installed to $(libdir)/../bin by postinstall_cmds 22627 # DLL is installed to $(libdir)/../bin by postinstall_cmds
22606 postinstall_cmds='base_file=`basename \${file}`~ 22628 postinstall_cmds='base_file=`basename \${file}`~
22607@@ -10609,13 +11212,71 @@ cygwin* | mingw* | pw32* | cegcc*) 22629@@ -10655,13 +11258,71 @@ cygwin* | mingw* | pw32* | cegcc*)
22608 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' 22630 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
22609 ;; 22631 ;;
22610 esac 22632 esac
@@ -22677,16 +22699,16 @@ index 1d9e5e10695..a234c4815b1 100755
22677 # FIXME: first we should search . and the directory the executable is in 22699 # FIXME: first we should search . and the directory the executable is in
22678 shlibpath_var=PATH 22700 shlibpath_var=PATH
22679 ;; 22701 ;;
22680@@ -11517,7 +12178,7 @@ else 22702@@ -11563,7 +12224,7 @@ else
22681 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 22703 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
22682 lt_status=$lt_dlunknown 22704 lt_status=$lt_dlunknown
22683 cat > conftest.$ac_ext <<_LT_EOF 22705 cat > conftest.$ac_ext <<_LT_EOF
22684-#line 11520 "configure" 22706-#line 11566 "configure"
22685+#line $LINENO "configure" 22707+#line $LINENO "configure"
22686 #include "confdefs.h" 22708 #include "confdefs.h"
22687 22709
22688 #if HAVE_DLFCN_H 22710 #if HAVE_DLFCN_H
22689@@ -11561,10 +12222,10 @@ else 22711@@ -11607,10 +12268,10 @@ else
22690 /* When -fvisbility=hidden is used, assume the code has been annotated 22712 /* When -fvisbility=hidden is used, assume the code has been annotated
22691 correspondingly for the symbols needed. */ 22713 correspondingly for the symbols needed. */
22692 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 22714 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
@@ -22699,16 +22721,16 @@ index 1d9e5e10695..a234c4815b1 100755
22699 int main () 22721 int main ()
22700 { 22722 {
22701 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 22723 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
22702@@ -11623,7 +12284,7 @@ else 22724@@ -11669,7 +12330,7 @@ else
22703 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 22725 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
22704 lt_status=$lt_dlunknown 22726 lt_status=$lt_dlunknown
22705 cat > conftest.$ac_ext <<_LT_EOF 22727 cat > conftest.$ac_ext <<_LT_EOF
22706-#line 11626 "configure" 22728-#line 11672 "configure"
22707+#line $LINENO "configure" 22729+#line $LINENO "configure"
22708 #include "confdefs.h" 22730 #include "confdefs.h"
22709 22731
22710 #if HAVE_DLFCN_H 22732 #if HAVE_DLFCN_H
22711@@ -11667,10 +12328,10 @@ else 22733@@ -11713,10 +12374,10 @@ else
22712 /* When -fvisbility=hidden is used, assume the code has been annotated 22734 /* When -fvisbility=hidden is used, assume the code has been annotated
22713 correspondingly for the symbols needed. */ 22735 correspondingly for the symbols needed. */
22714 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 22736 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
@@ -22721,7 +22743,7 @@ index 1d9e5e10695..a234c4815b1 100755
22721 int main () 22743 int main ()
22722 { 22744 {
22723 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 22745 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
22724@@ -13490,7 +14151,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 22746@@ -13541,7 +14202,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
22725 # 22747 #
22726 # INIT-COMMANDS 22748 # INIT-COMMANDS
22727 # 22749 #
@@ -22730,7 +22752,7 @@ index 1d9e5e10695..a234c4815b1 100755
22730 22752
22731 22753
22732 # The HP-UX ksh and POSIX shell print the target directory to stdout 22754 # The HP-UX ksh and POSIX shell print the target directory to stdout
22733@@ -13528,13 +14189,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' 22755@@ -13579,13 +14240,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
22734 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' 22756 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
22735 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' 22757 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
22736 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' 22758 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
@@ -22751,7 +22773,7 @@ index 1d9e5e10695..a234c4815b1 100755
22751 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' 22773 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
22752 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' 22774 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
22753 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' 22775 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
22754@@ -13549,14 +14217,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de 22776@@ -13600,14 +14268,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de
22755 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' 22777 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
22756 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' 22778 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
22757 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"`' 22779 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"`'
@@ -22770,7 +22792,7 @@ index 1d9e5e10695..a234c4815b1 100755
22770 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' 22792 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
22771 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' 22793 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
22772 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' 22794 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
22773@@ -13589,12 +14260,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q 22795@@ -13640,12 +14311,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q
22774 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' 22796 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
22775 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' 22797 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
22776 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' 22798 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
@@ -22784,7 +22806,7 @@ index 1d9e5e10695..a234c4815b1 100755
22784 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' 22806 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
22785 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' 22807 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
22786 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' 22808 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
22787@@ -13649,8 +14320,13 @@ reload_flag \ 22809@@ -13700,8 +14371,13 @@ reload_flag \
22788 OBJDUMP \ 22810 OBJDUMP \
22789 deplibs_check_method \ 22811 deplibs_check_method \
22790 file_magic_cmd \ 22812 file_magic_cmd \
@@ -22798,7 +22820,7 @@ index 1d9e5e10695..a234c4815b1 100755
22798 STRIP \ 22820 STRIP \
22799 RANLIB \ 22821 RANLIB \
22800 CC \ 22822 CC \
22801@@ -13660,12 +14336,14 @@ lt_cv_sys_global_symbol_pipe \ 22823@@ -13711,12 +14387,14 @@ lt_cv_sys_global_symbol_pipe \
22802 lt_cv_sys_global_symbol_to_cdecl \ 22824 lt_cv_sys_global_symbol_to_cdecl \
22803 lt_cv_sys_global_symbol_to_c_name_address \ 22825 lt_cv_sys_global_symbol_to_c_name_address \
22804 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ 22826 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
@@ -22814,7 +22836,7 @@ index 1d9e5e10695..a234c4815b1 100755
22814 DSYMUTIL \ 22836 DSYMUTIL \
22815 NMEDIT \ 22837 NMEDIT \
22816 LIPO \ 22838 LIPO \
22817@@ -13681,7 +14359,6 @@ no_undefined_flag \ 22839@@ -13732,7 +14410,6 @@ no_undefined_flag \
22818 hardcode_libdir_flag_spec \ 22840 hardcode_libdir_flag_spec \
22819 hardcode_libdir_flag_spec_ld \ 22841 hardcode_libdir_flag_spec_ld \
22820 hardcode_libdir_separator \ 22842 hardcode_libdir_separator \
@@ -22822,7 +22844,7 @@ index 1d9e5e10695..a234c4815b1 100755
22822 exclude_expsyms \ 22844 exclude_expsyms \
22823 include_expsyms \ 22845 include_expsyms \
22824 file_list_spec \ 22846 file_list_spec \
22825@@ -13717,6 +14394,7 @@ module_cmds \ 22847@@ -13768,6 +14445,7 @@ module_cmds \
22826 module_expsym_cmds \ 22848 module_expsym_cmds \
22827 export_symbols_cmds \ 22849 export_symbols_cmds \
22828 prelink_cmds \ 22850 prelink_cmds \
@@ -22830,7 +22852,7 @@ index 1d9e5e10695..a234c4815b1 100755
22830 postinstall_cmds \ 22852 postinstall_cmds \
22831 postuninstall_cmds \ 22853 postuninstall_cmds \
22832 finish_cmds \ 22854 finish_cmds \
22833@@ -14363,29 +15041,35 @@ $as_echo "$as_me: executing $ac_file commands" >&6;} 22855@@ -14414,29 +15092,35 @@ $as_echo "$as_me: executing $ac_file commands" >&6;}
22834 # Older Autoconf quotes --file arguments for eval, but not when files 22856 # Older Autoconf quotes --file arguments for eval, but not when files
22835 # are listed without --file. Let's play safe and only enable the eval 22857 # are listed without --file. Let's play safe and only enable the eval
22836 # if we detect the quoting. 22858 # if we detect the quoting.
@@ -22885,7 +22907,7 @@ index 1d9e5e10695..a234c4815b1 100755
22885 sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ 22907 sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
22886 s//\1/ 22908 s//\1/
22887 q 22909 q
22888@@ -14403,53 +15087,50 @@ $as_echo X"$mf" | 22910@@ -14454,53 +15138,50 @@ $as_echo X"$mf" |
22889 q 22911 q
22890 } 22912 }
22891 s/.*/./; q'` 22913 s/.*/./; q'`
@@ -22972,7 +22994,7 @@ index 1d9e5e10695..a234c4815b1 100755
22972 } 22994 }
22973 ;; 22995 ;;
22974 "libtool":C) 22996 "libtool":C)
22975@@ -14473,7 +15154,8 @@ $as_echo X"$file" | 22997@@ -14524,7 +15205,8 @@ $as_echo X"$file" |
22976 # NOTE: Changes made to this file will be lost: look at ltmain.sh. 22998 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
22977 # 22999 #
22978 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 23000 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
@@ -22982,7 +23004,7 @@ index 1d9e5e10695..a234c4815b1 100755
22982 # Written by Gordon Matzigkeit, 1996 23004 # Written by Gordon Matzigkeit, 1996
22983 # 23005 #
22984 # This file is part of GNU Libtool. 23006 # This file is part of GNU Libtool.
22985@@ -14576,19 +15258,42 @@ SP2NL=$lt_lt_SP2NL 23007@@ -14627,19 +15309,42 @@ SP2NL=$lt_lt_SP2NL
22986 # turn newlines into spaces. 23008 # turn newlines into spaces.
22987 NL2SP=$lt_lt_NL2SP 23009 NL2SP=$lt_lt_NL2SP
22988 23010
@@ -23026,7 +23048,7 @@ index 1d9e5e10695..a234c4815b1 100755
23026 # A symbol stripping program. 23048 # A symbol stripping program.
23027 STRIP=$lt_STRIP 23049 STRIP=$lt_STRIP
23028 23050
23029@@ -14618,6 +15323,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address 23051@@ -14669,6 +15374,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
23030 # Transform the output of nm in a C name address pair when lib prefix is needed. 23052 # Transform the output of nm in a C name address pair when lib prefix is needed.
23031 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix 23053 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
23032 23054
@@ -23039,7 +23061,7 @@ index 1d9e5e10695..a234c4815b1 100755
23039 # The name of the directory that contains temporary libtool files. 23061 # The name of the directory that contains temporary libtool files.
23040 objdir=$objdir 23062 objdir=$objdir
23041 23063
23042@@ -14627,6 +15338,9 @@ MAGIC_CMD=$MAGIC_CMD 23064@@ -14678,6 +15389,9 @@ MAGIC_CMD=$MAGIC_CMD
23043 # Must we lock files when doing compilation? 23065 # Must we lock files when doing compilation?
23044 need_locks=$lt_need_locks 23066 need_locks=$lt_need_locks
23045 23067
@@ -23049,7 +23071,7 @@ index 1d9e5e10695..a234c4815b1 100755
23049 # Tool to manipulate archived DWARF debug symbol files on Mac OS X. 23071 # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
23050 DSYMUTIL=$lt_DSYMUTIL 23072 DSYMUTIL=$lt_DSYMUTIL
23051 23073
23052@@ -14741,12 +15455,12 @@ with_gcc=$GCC 23074@@ -14792,12 +15506,12 @@ with_gcc=$GCC
23053 # Compiler flag to turn off builtin functions. 23075 # Compiler flag to turn off builtin functions.
23054 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag 23076 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
23055 23077
@@ -23065,7 +23087,7 @@ index 1d9e5e10695..a234c4815b1 100755
23065 # Compiler flag to prevent dynamic linking. 23087 # Compiler flag to prevent dynamic linking.
23066 link_static_flag=$lt_lt_prog_compiler_static 23088 link_static_flag=$lt_lt_prog_compiler_static
23067 23089
23068@@ -14833,9 +15547,6 @@ inherit_rpath=$inherit_rpath 23090@@ -14884,9 +15598,6 @@ inherit_rpath=$inherit_rpath
23069 # Whether libtool must link a program against all its dependency libraries. 23091 # Whether libtool must link a program against all its dependency libraries.
23070 link_all_deplibs=$link_all_deplibs 23092 link_all_deplibs=$link_all_deplibs
23071 23093
@@ -23075,7 +23097,7 @@ index 1d9e5e10695..a234c4815b1 100755
23075 # Set to "yes" if exported symbols are required. 23097 # Set to "yes" if exported symbols are required.
23076 always_export_symbols=$always_export_symbols 23098 always_export_symbols=$always_export_symbols
23077 23099
23078@@ -14851,6 +15562,9 @@ include_expsyms=$lt_include_expsyms 23100@@ -14902,6 +15613,9 @@ include_expsyms=$lt_include_expsyms
23079 # Commands necessary for linking programs (against libraries) with templates. 23101 # Commands necessary for linking programs (against libraries) with templates.
23080 prelink_cmds=$lt_prelink_cmds 23102 prelink_cmds=$lt_prelink_cmds
23081 23103
@@ -23085,7 +23107,7 @@ index 1d9e5e10695..a234c4815b1 100755
23085 # Specify filename containing input files. 23107 # Specify filename containing input files.
23086 file_list_spec=$lt_file_list_spec 23108 file_list_spec=$lt_file_list_spec
23087 23109
23088@@ -14883,210 +15597,169 @@ ltmain="$ac_aux_dir/ltmain.sh" 23110@@ -14934,210 +15648,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
23089 # if finds mixed CR/LF and LF-only lines. Since sed operates in 23111 # if finds mixed CR/LF and LF-only lines. Since sed operates in
23090 # text mode, it properly converts lines to CR/LF. This bash problem 23112 # text mode, it properly converts lines to CR/LF. This bash problem
23091 # is reportedly fixed, but why not run on old versions too? 23113 # is reportedly fixed, but why not run on old versions too?
@@ -25230,7 +25252,7 @@ index e36fdd3c0e2..4acf9d67956 100644
25230+ [0], [convert $build files to toolchain format])dnl 25252+ [0], [convert $build files to toolchain format])dnl
25231+])# _LT_PATH_CONVERSION_FUNCTIONS 25253+])# _LT_PATH_CONVERSION_FUNCTIONS
25232diff --git a/ltmain.sh b/ltmain.sh 25254diff --git a/ltmain.sh b/ltmain.sh
25233index 70990740b6c..7f7104ffc82 100644 25255index 1a710177fb2..09693d7b99b 100644
25234--- a/ltmain.sh 25256--- a/ltmain.sh
25235+++ b/ltmain.sh 25257+++ b/ltmain.sh
25236@@ -1,10 +1,9 @@ 25258@@ -1,10 +1,9 @@
@@ -28440,39 +28462,19 @@ index 70990740b6c..7f7104ffc82 100644
28440 done 28462 done
28441 IFS="$save_ifs" 28463 IFS="$save_ifs"
28442 func_stripname ' ' '' "$arg" 28464 func_stripname ' ' '' "$arg"
28443@@ -4968,24 +5832,27 @@ func_mode_link () 28465@@ -4995,8 +5859,10 @@ func_mode_link ()
28444 arg="$func_quote_for_eval_result" 28466 # -f{file|debug|macro|profile}-prefix-map=* needed for lto linking
28445 ;; 28467 # -Wa,* Pass flags directly to the assembler
28446 28468 # -Werror, -Werror=* Report (specified) warnings as errors
28447- # -64, -mips[0-9] enable 64-bit mode on the SGI compiler
28448- # -r[0-9][0-9]* specifies the processor on the SGI compiler
28449- # -xarch=*, -xtarget=* enable 64-bit mode on the Sun compiler
28450- # +DA*, +DD* enable 64-bit mode on the HP compiler
28451- # -q* pass through compiler args for the IBM compiler
28452- # -m*, -t[45]*, -txscale* pass through architecture-specific
28453- # compiler args for GCC
28454- # -F/path gives path to uninstalled frameworks, gcc on darwin
28455- # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC
28456- # @file GCC response files
28457- # -tp=* Portland pgcc target processor selection
28458+ # Flags to be passed through unchanged, with rationale:
28459+ # -64, -mips[0-9] enable 64-bit mode for the SGI compiler
28460+ # -r[0-9][0-9]* specify processor for the SGI compiler
28461+ # -xarch=*, -xtarget=* enable 64-bit mode for the Sun compiler
28462+ # +DA*, +DD* enable 64-bit mode for the HP compiler
28463+ # -q* compiler args for the IBM compiler
28464+ # -m*, -t[45]*, -txscale* architecture-specific flags for GCC
28465+ # -F/path path to uninstalled frameworks, gcc on darwin
28466+ # -p, -pg, --coverage, -fprofile-* profiling flags for GCC
28467+ # @file GCC response files
28468+ # -tp=* Portland pgcc target processor selection
28469+ # --sysroot=* for sysroot support 28469+ # --sysroot=* for sysroot support
28470+ # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization 28470+ # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
28471 -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ 28471 -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
28472- -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*) 28472- -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*| \
28473+ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \ 28473+ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \
28474+ -O*|-flto*|-fwhopr*|-fuse-linker-plugin) 28474 -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*| \
28475 func_quote_for_eval "$arg" 28475 -stdlib=*|-rtlib=*|--unwindlib=*| \
28476 -specs=*|-fsanitize=*|-fno-sanitize*|-shared-libsan|-static-libsan| \
28477@@ -5007,7 +5873,7 @@ func_mode_link ()
28476 arg="$func_quote_for_eval_result" 28478 arg="$func_quote_for_eval_result"
28477 func_append compile_command " $arg" 28479 func_append compile_command " $arg"
28478 func_append finalize_command " $arg" 28480 func_append finalize_command " $arg"
@@ -28481,7 +28483,7 @@ index 70990740b6c..7f7104ffc82 100644
28481 continue 28483 continue
28482 ;; 28484 ;;
28483 28485
28484@@ -4997,7 +5864,7 @@ func_mode_link () 28486@@ -5019,7 +5885,7 @@ func_mode_link ()
28485 28487
28486 *.$objext) 28488 *.$objext)
28487 # A standard object. 28489 # A standard object.
@@ -28490,7 +28492,7 @@ index 70990740b6c..7f7104ffc82 100644
28490 ;; 28492 ;;
28491 28493
28492 *.lo) 28494 *.lo)
28493@@ -5028,7 +5895,7 @@ func_mode_link () 28495@@ -5050,7 +5916,7 @@ func_mode_link ()
28494 28496
28495 if test "$prev" = dlfiles; then 28497 if test "$prev" = dlfiles; then
28496 if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then 28498 if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
@@ -28499,7 +28501,7 @@ index 70990740b6c..7f7104ffc82 100644
28499 prev= 28501 prev=
28500 continue 28502 continue
28501 else 28503 else
28502@@ -5040,7 +5907,7 @@ func_mode_link () 28504@@ -5062,7 +5928,7 @@ func_mode_link ()
28503 # CHECK ME: I think I busted this. -Ossama 28505 # CHECK ME: I think I busted this. -Ossama
28504 if test "$prev" = dlprefiles; then 28506 if test "$prev" = dlprefiles; then
28505 # Preload the old-style object. 28507 # Preload the old-style object.
@@ -28508,7 +28510,7 @@ index 70990740b6c..7f7104ffc82 100644
28508 prev= 28510 prev=
28509 fi 28511 fi
28510 28512
28511@@ -5085,24 +5952,25 @@ func_mode_link () 28513@@ -5107,24 +5973,25 @@ func_mode_link ()
28512 28514
28513 *.$libext) 28515 *.$libext)
28514 # An archive. 28516 # An archive.
@@ -28539,7 +28541,7 @@ index 70990740b6c..7f7104ffc82 100644
28539 fi 28541 fi
28540 continue 28542 continue
28541 ;; 28543 ;;
28542@@ -5127,7 +5995,7 @@ func_mode_link () 28544@@ -5149,7 +6016,7 @@ func_mode_link ()
28543 func_fatal_help "the \`$prevarg' option requires an argument" 28545 func_fatal_help "the \`$prevarg' option requires an argument"
28544 28546
28545 if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then 28547 if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then
@@ -28548,7 +28550,7 @@ index 70990740b6c..7f7104ffc82 100644
28548 func_append compile_command " $arg" 28550 func_append compile_command " $arg"
28549 func_append finalize_command " $arg" 28551 func_append finalize_command " $arg"
28550 fi 28552 fi
28551@@ -5144,11 +6012,13 @@ func_mode_link () 28553@@ -5166,11 +6033,13 @@ func_mode_link ()
28552 else 28554 else
28553 shlib_search_path= 28555 shlib_search_path=
28554 fi 28556 fi
@@ -28564,7 +28566,7 @@ index 70990740b6c..7f7104ffc82 100644
28564 # Create the object directory. 28566 # Create the object directory.
28565 func_mkdir_p "$output_objdir" 28567 func_mkdir_p "$output_objdir"
28566 28568
28567@@ -5169,12 +6039,12 @@ func_mode_link () 28569@@ -5191,12 +6060,12 @@ func_mode_link ()
28568 # Find all interdependent deplibs by searching for libraries 28570 # Find all interdependent deplibs by searching for libraries
28569 # that are linked more than once (e.g. -la -lb -la) 28571 # that are linked more than once (e.g. -la -lb -la)
28570 for deplib in $deplibs; do 28572 for deplib in $deplibs; do
@@ -28580,7 +28582,7 @@ index 70990740b6c..7f7104ffc82 100644
28580 done 28582 done
28581 28583
28582 if test "$linkmode" = lib; then 28584 if test "$linkmode" = lib; then
28583@@ -5187,9 +6057,9 @@ func_mode_link () 28585@@ -5209,9 +6078,9 @@ func_mode_link ()
28584 if $opt_duplicate_compiler_generated_deps; then 28586 if $opt_duplicate_compiler_generated_deps; then
28585 for pre_post_dep in $predeps $postdeps; do 28587 for pre_post_dep in $predeps $postdeps; do
28586 case "$pre_post_deps " in 28588 case "$pre_post_deps " in
@@ -28592,7 +28594,7 @@ index 70990740b6c..7f7104ffc82 100644
28592 done 28594 done
28593 fi 28595 fi
28594 pre_post_deps= 28596 pre_post_deps=
28595@@ -5256,8 +6126,9 @@ func_mode_link () 28597@@ -5278,8 +6147,9 @@ func_mode_link ()
28596 for lib in $dlprefiles; do 28598 for lib in $dlprefiles; do
28597 # Ignore non-libtool-libs 28599 # Ignore non-libtool-libs
28598 dependency_libs= 28600 dependency_libs=
@@ -28603,7 +28605,7 @@ index 70990740b6c..7f7104ffc82 100644
28603 esac 28605 esac
28604 28606
28605 # Collect preopened libtool deplibs, except any this library 28607 # Collect preopened libtool deplibs, except any this library
28606@@ -5267,7 +6138,7 @@ func_mode_link () 28608@@ -5289,7 +6159,7 @@ func_mode_link ()
28607 deplib_base=$func_basename_result 28609 deplib_base=$func_basename_result
28608 case " $weak_libs " in 28610 case " $weak_libs " in
28609 *" $deplib_base "*) ;; 28611 *" $deplib_base "*) ;;
@@ -28612,7 +28614,7 @@ index 70990740b6c..7f7104ffc82 100644
28612 esac 28614 esac
28613 done 28615 done
28614 done 28616 done
28615@@ -5288,11 +6159,11 @@ func_mode_link () 28617@@ -5310,11 +6180,11 @@ func_mode_link ()
28616 compile_deplibs="$deplib $compile_deplibs" 28618 compile_deplibs="$deplib $compile_deplibs"
28617 finalize_deplibs="$deplib $finalize_deplibs" 28619 finalize_deplibs="$deplib $finalize_deplibs"
28618 else 28620 else
@@ -28626,7 +28628,7 @@ index 70990740b6c..7f7104ffc82 100644
28626 esac 28628 esac
28627 fi 28629 fi
28628 fi 28630 fi
28629@@ -5377,7 +6248,7 @@ func_mode_link () 28631@@ -5399,7 +6269,7 @@ func_mode_link ()
28630 if test "$linkmode" = lib ; then 28632 if test "$linkmode" = lib ; then
28631 case "$new_inherited_linker_flags " in 28633 case "$new_inherited_linker_flags " in
28632 *" $deplib "*) ;; 28634 *" $deplib "*) ;;
@@ -28635,7 +28637,7 @@ index 70990740b6c..7f7104ffc82 100644
28635 esac 28637 esac
28636 fi 28638 fi
28637 fi 28639 fi
28638@@ -5390,7 +6261,8 @@ func_mode_link () 28640@@ -5412,7 +6282,8 @@ func_mode_link ()
28639 test "$pass" = conv && continue 28641 test "$pass" = conv && continue
28640 newdependency_libs="$deplib $newdependency_libs" 28642 newdependency_libs="$deplib $newdependency_libs"
28641 func_stripname '-L' '' "$deplib" 28643 func_stripname '-L' '' "$deplib"
@@ -28645,7 +28647,7 @@ index 70990740b6c..7f7104ffc82 100644
28645 ;; 28647 ;;
28646 prog) 28648 prog)
28647 if test "$pass" = conv; then 28649 if test "$pass" = conv; then
28648@@ -5404,7 +6276,8 @@ func_mode_link () 28650@@ -5426,7 +6297,8 @@ func_mode_link ()
28649 finalize_deplibs="$deplib $finalize_deplibs" 28651 finalize_deplibs="$deplib $finalize_deplibs"
28650 fi 28652 fi
28651 func_stripname '-L' '' "$deplib" 28653 func_stripname '-L' '' "$deplib"
@@ -28655,7 +28657,7 @@ index 70990740b6c..7f7104ffc82 100644
28655 ;; 28657 ;;
28656 *) 28658 *)
28657 func_warning "\`-L' is ignored for archives/objects" 28659 func_warning "\`-L' is ignored for archives/objects"
28658@@ -5415,17 +6288,21 @@ func_mode_link () 28660@@ -5437,17 +6309,21 @@ func_mode_link ()
28659 -R*) 28661 -R*)
28660 if test "$pass" = link; then 28662 if test "$pass" = link; then
28661 func_stripname '-R' '' "$deplib" 28663 func_stripname '-R' '' "$deplib"
@@ -28680,7 +28682,7 @@ index 70990740b6c..7f7104ffc82 100644
28680 *.$libext) 28682 *.$libext)
28681 if test "$pass" = conv; then 28683 if test "$pass" = conv; then
28682 deplibs="$deplib $deplibs" 28684 deplibs="$deplib $deplibs"
28683@@ -5488,11 +6365,11 @@ func_mode_link () 28685@@ -5510,11 +6386,11 @@ func_mode_link ()
28684 if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then 28686 if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
28685 # If there is no dlopen support or we're linking statically, 28687 # If there is no dlopen support or we're linking statically,
28686 # we need to preload. 28688 # we need to preload.
@@ -28694,7 +28696,7 @@ index 70990740b6c..7f7104ffc82 100644
28694 fi 28696 fi
28695 fi 28697 fi
28696 continue 28698 continue
28697@@ -5538,7 +6415,7 @@ func_mode_link () 28699@@ -5560,7 +6436,7 @@ func_mode_link ()
28698 for tmp_inherited_linker_flag in $tmp_inherited_linker_flags; do 28700 for tmp_inherited_linker_flag in $tmp_inherited_linker_flags; do
28699 case " $new_inherited_linker_flags " in 28701 case " $new_inherited_linker_flags " in
28700 *" $tmp_inherited_linker_flag "*) ;; 28702 *" $tmp_inherited_linker_flag "*) ;;
@@ -28703,7 +28705,7 @@ index 70990740b6c..7f7104ffc82 100644
28703 esac 28705 esac
28704 done 28706 done
28705 fi 28707 fi
28706@@ -5546,8 +6423,8 @@ func_mode_link () 28708@@ -5568,8 +6444,8 @@ func_mode_link ()
28707 if test "$linkmode,$pass" = "lib,link" || 28709 if test "$linkmode,$pass" = "lib,link" ||
28708 test "$linkmode,$pass" = "prog,scan" || 28710 test "$linkmode,$pass" = "prog,scan" ||
28709 { test "$linkmode" != prog && test "$linkmode" != lib; }; then 28711 { test "$linkmode" != prog && test "$linkmode" != lib; }; then
@@ -28714,7 +28716,7 @@ index 70990740b6c..7f7104ffc82 100644
28714 fi 28716 fi
28715 28717
28716 if test "$pass" = conv; then 28718 if test "$pass" = conv; then
28717@@ -5558,20 +6435,20 @@ func_mode_link () 28719@@ -5580,20 +6456,20 @@ func_mode_link ()
28718 func_fatal_error "cannot find name of link library for \`$lib'" 28720 func_fatal_error "cannot find name of link library for \`$lib'"
28719 fi 28721 fi
28720 # It is a libtool convenience library, so add in its objects. 28722 # It is a libtool convenience library, so add in its objects.
@@ -28740,7 +28742,7 @@ index 70990740b6c..7f7104ffc82 100644
28740 done 28742 done
28741 continue 28743 continue
28742 fi # $pass = conv 28744 fi # $pass = conv
28743@@ -5579,9 +6456,15 @@ func_mode_link () 28745@@ -5601,9 +6477,15 @@ func_mode_link ()
28744 28746
28745 # Get the name of the library we link against. 28747 # Get the name of the library we link against.
28746 linklib= 28748 linklib=
@@ -28759,7 +28761,7 @@ index 70990740b6c..7f7104ffc82 100644
28759 if test -z "$linklib"; then 28761 if test -z "$linklib"; then
28760 func_fatal_error "cannot find name of link library for \`$lib'" 28762 func_fatal_error "cannot find name of link library for \`$lib'"
28761 fi 28763 fi
28762@@ -5598,9 +6481,9 @@ func_mode_link () 28764@@ -5620,9 +6502,9 @@ func_mode_link ()
28763 # statically, we need to preload. We also need to preload any 28765 # statically, we need to preload. We also need to preload any
28764 # dependent libraries so libltdl's deplib preloader doesn't 28766 # dependent libraries so libltdl's deplib preloader doesn't
28765 # bomb out in the load deplibs phase. 28767 # bomb out in the load deplibs phase.
@@ -28771,7 +28773,7 @@ index 70990740b6c..7f7104ffc82 100644
28771 fi 28773 fi
28772 continue 28774 continue
28773 fi # $pass = dlopen 28775 fi # $pass = dlopen
28774@@ -5622,14 +6505,14 @@ func_mode_link () 28776@@ -5644,14 +6526,14 @@ func_mode_link ()
28775 28777
28776 # Find the relevant object directory and library name. 28778 # Find the relevant object directory and library name.
28777 if test "X$installed" = Xyes; then 28779 if test "X$installed" = Xyes; then
@@ -28789,7 +28791,7 @@ index 70990740b6c..7f7104ffc82 100644
28789 fi 28791 fi
28790 test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes 28792 test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
28791 else 28793 else
28792@@ -5637,12 +6520,12 @@ func_mode_link () 28794@@ -5659,12 +6541,12 @@ func_mode_link ()
28793 dir="$ladir" 28795 dir="$ladir"
28794 absdir="$abs_ladir" 28796 absdir="$abs_ladir"
28795 # Remove this search path later 28797 # Remove this search path later
@@ -28804,7 +28806,7 @@ index 70990740b6c..7f7104ffc82 100644
28804 fi 28806 fi
28805 fi # $installed = yes 28807 fi # $installed = yes
28806 func_stripname 'lib' '.la' "$laname" 28808 func_stripname 'lib' '.la' "$laname"
28807@@ -5653,20 +6536,46 @@ func_mode_link () 28809@@ -5675,20 +6557,46 @@ func_mode_link ()
28808 if test -z "$libdir" && test "$linkmode" = prog; then 28810 if test -z "$libdir" && test "$linkmode" = prog; then
28809 func_fatal_error "only libraries may -dlpreopen a convenience library: \`$lib'" 28811 func_fatal_error "only libraries may -dlpreopen a convenience library: \`$lib'"
28810 fi 28812 fi
@@ -28865,7 +28867,7 @@ index 70990740b6c..7f7104ffc82 100644
28865 fi # $pass = dlpreopen 28867 fi # $pass = dlpreopen
28866 28868
28867 if test -z "$libdir"; then 28869 if test -z "$libdir"; then
28868@@ -5684,7 +6593,7 @@ func_mode_link () 28870@@ -5706,7 +6614,7 @@ func_mode_link ()
28869 28871
28870 28872
28871 if test "$linkmode" = prog && test "$pass" != link; then 28873 if test "$linkmode" = prog && test "$pass" != link; then
@@ -28874,7 +28876,7 @@ index 70990740b6c..7f7104ffc82 100644
28874 deplibs="$lib $deplibs" 28876 deplibs="$lib $deplibs"
28875 28877
28876 linkalldeplibs=no 28878 linkalldeplibs=no
28877@@ -5697,7 +6606,8 @@ func_mode_link () 28879@@ -5719,7 +6627,8 @@ func_mode_link ()
28878 for deplib in $dependency_libs; do 28880 for deplib in $dependency_libs; do
28879 case $deplib in 28881 case $deplib in
28880 -L*) func_stripname '-L' '' "$deplib" 28882 -L*) func_stripname '-L' '' "$deplib"
@@ -28884,7 +28886,7 @@ index 70990740b6c..7f7104ffc82 100644
28884 ;; 28886 ;;
28885 esac 28887 esac
28886 # Need to link against all dependency_libs? 28888 # Need to link against all dependency_libs?
28887@@ -5708,12 +6618,12 @@ func_mode_link () 28889@@ -5730,12 +6639,12 @@ func_mode_link ()
28888 # or/and link against static libraries 28890 # or/and link against static libraries
28889 newdependency_libs="$deplib $newdependency_libs" 28891 newdependency_libs="$deplib $newdependency_libs"
28890 fi 28892 fi
@@ -28900,7 +28902,7 @@ index 70990740b6c..7f7104ffc82 100644
28900 done # for deplib 28902 done # for deplib
28901 continue 28903 continue
28902 fi # $linkmode = prog... 28904 fi # $linkmode = prog...
28903@@ -5728,7 +6638,7 @@ func_mode_link () 28905@@ -5750,7 +6659,7 @@ func_mode_link ()
28904 # Make sure the rpath contains only unique directories. 28906 # Make sure the rpath contains only unique directories.
28905 case "$temp_rpath:" in 28907 case "$temp_rpath:" in
28906 *"$absdir:"*) ;; 28908 *"$absdir:"*) ;;
@@ -28909,7 +28911,7 @@ index 70990740b6c..7f7104ffc82 100644
28909 esac 28911 esac
28910 fi 28912 fi
28911 28913
28912@@ -5740,7 +6650,7 @@ func_mode_link () 28914@@ -5762,7 +6671,7 @@ func_mode_link ()
28913 *) 28915 *)
28914 case "$compile_rpath " in 28916 case "$compile_rpath " in
28915 *" $absdir "*) ;; 28917 *" $absdir "*) ;;
@@ -28918,7 +28920,7 @@ index 70990740b6c..7f7104ffc82 100644
28918 esac 28920 esac
28919 ;; 28921 ;;
28920 esac 28922 esac
28921@@ -5749,7 +6659,7 @@ func_mode_link () 28923@@ -5771,7 +6680,7 @@ func_mode_link ()
28922 *) 28924 *)
28923 case "$finalize_rpath " in 28925 case "$finalize_rpath " in
28924 *" $libdir "*) ;; 28926 *" $libdir "*) ;;
@@ -28927,7 +28929,7 @@ index 70990740b6c..7f7104ffc82 100644
28927 esac 28929 esac
28928 ;; 28930 ;;
28929 esac 28931 esac
28930@@ -5774,12 +6684,12 @@ func_mode_link () 28932@@ -5796,12 +6705,12 @@ func_mode_link ()
28931 case $host in 28933 case $host in
28932 *cygwin* | *mingw* | *cegcc*) 28934 *cygwin* | *mingw* | *cegcc*)
28933 # No point in relinking DLLs because paths are not encoded 28935 # No point in relinking DLLs because paths are not encoded
@@ -28942,7 +28944,7 @@ index 70990740b6c..7f7104ffc82 100644
28942 need_relink=yes 28944 need_relink=yes
28943 fi 28945 fi
28944 ;; 28946 ;;
28945@@ -5814,7 +6724,7 @@ func_mode_link () 28947@@ -5836,7 +6745,7 @@ func_mode_link ()
28946 *) 28948 *)
28947 case "$compile_rpath " in 28949 case "$compile_rpath " in
28948 *" $absdir "*) ;; 28950 *" $absdir "*) ;;
@@ -28951,7 +28953,7 @@ index 70990740b6c..7f7104ffc82 100644
28951 esac 28953 esac
28952 ;; 28954 ;;
28953 esac 28955 esac
28954@@ -5823,7 +6733,7 @@ func_mode_link () 28956@@ -5845,7 +6754,7 @@ func_mode_link ()
28955 *) 28957 *)
28956 case "$finalize_rpath " in 28958 case "$finalize_rpath " in
28957 *" $libdir "*) ;; 28959 *" $libdir "*) ;;
@@ -28960,7 +28962,7 @@ index 70990740b6c..7f7104ffc82 100644
28960 esac 28962 esac
28961 ;; 28963 ;;
28962 esac 28964 esac
28963@@ -5835,7 +6745,7 @@ func_mode_link () 28965@@ -5857,7 +6766,7 @@ func_mode_link ()
28964 shift 28966 shift
28965 realname="$1" 28967 realname="$1"
28966 shift 28968 shift
@@ -28969,7 +28971,7 @@ index 70990740b6c..7f7104ffc82 100644
28969 # use dlname if we got it. it's perfectly good, no? 28971 # use dlname if we got it. it's perfectly good, no?
28970 if test -n "$dlname"; then 28972 if test -n "$dlname"; then
28971 soname="$dlname" 28973 soname="$dlname"
28972@@ -5848,7 +6758,7 @@ func_mode_link () 28974@@ -5870,7 +6779,7 @@ func_mode_link ()
28973 versuffix="-$major" 28975 versuffix="-$major"
28974 ;; 28976 ;;
28975 esac 28977 esac
@@ -28978,7 +28980,7 @@ index 70990740b6c..7f7104ffc82 100644
28978 else 28980 else
28979 soname="$realname" 28981 soname="$realname"
28980 fi 28982 fi
28981@@ -5877,7 +6787,7 @@ func_mode_link () 28983@@ -5899,7 +6808,7 @@ func_mode_link ()
28982 linklib=$newlib 28984 linklib=$newlib
28983 fi # test -n "$old_archive_from_expsyms_cmds" 28985 fi # test -n "$old_archive_from_expsyms_cmds"
28984 28986
@@ -28987,7 +28989,7 @@ index 70990740b6c..7f7104ffc82 100644
28987 add_shlibpath= 28989 add_shlibpath=
28988 add_dir= 28990 add_dir=
28989 add= 28991 add=
28990@@ -5933,7 +6843,7 @@ func_mode_link () 28992@@ -5955,7 +6864,7 @@ func_mode_link ()
28991 if test -n "$inst_prefix_dir"; then 28993 if test -n "$inst_prefix_dir"; then
28992 case $libdir in 28994 case $libdir in
28993 [\\/]*) 28995 [\\/]*)
@@ -28996,7 +28998,7 @@ index 70990740b6c..7f7104ffc82 100644
28996 ;; 28998 ;;
28997 esac 28999 esac
28998 fi 29000 fi
28999@@ -5955,7 +6865,7 @@ func_mode_link () 29001@@ -5977,7 +6886,7 @@ func_mode_link ()
29000 if test -n "$add_shlibpath"; then 29002 if test -n "$add_shlibpath"; then
29001 case :$compile_shlibpath: in 29003 case :$compile_shlibpath: in
29002 *":$add_shlibpath:"*) ;; 29004 *":$add_shlibpath:"*) ;;
@@ -29005,7 +29007,7 @@ index 70990740b6c..7f7104ffc82 100644
29005 esac 29007 esac
29006 fi 29008 fi
29007 if test "$linkmode" = prog; then 29009 if test "$linkmode" = prog; then
29008@@ -5969,13 +6879,13 @@ func_mode_link () 29010@@ -5991,13 +6900,13 @@ func_mode_link ()
29009 test "$hardcode_shlibpath_var" = yes; then 29011 test "$hardcode_shlibpath_var" = yes; then
29010 case :$finalize_shlibpath: in 29012 case :$finalize_shlibpath: in
29011 *":$libdir:"*) ;; 29013 *":$libdir:"*) ;;
@@ -29021,7 +29023,7 @@ index 70990740b6c..7f7104ffc82 100644
29021 add_shlibpath= 29023 add_shlibpath=
29022 add_dir= 29024 add_dir=
29023 add= 29025 add=
29024@@ -5989,7 +6899,7 @@ func_mode_link () 29026@@ -6011,7 +6920,7 @@ func_mode_link ()
29025 elif test "$hardcode_shlibpath_var" = yes; then 29027 elif test "$hardcode_shlibpath_var" = yes; then
29026 case :$finalize_shlibpath: in 29028 case :$finalize_shlibpath: in
29027 *":$libdir:"*) ;; 29029 *":$libdir:"*) ;;
@@ -29030,7 +29032,7 @@ index 70990740b6c..7f7104ffc82 100644
29030 esac 29032 esac
29031 add="-l$name" 29033 add="-l$name"
29032 elif test "$hardcode_automatic" = yes; then 29034 elif test "$hardcode_automatic" = yes; then
29033@@ -6001,12 +6911,12 @@ func_mode_link () 29035@@ -6023,12 +6932,12 @@ func_mode_link ()
29034 fi 29036 fi
29035 else 29037 else
29036 # We cannot seem to hardcode it, guess we'll fake it. 29038 # We cannot seem to hardcode it, guess we'll fake it.
@@ -29045,7 +29047,7 @@ index 70990740b6c..7f7104ffc82 100644
29045 ;; 29047 ;;
29046 esac 29048 esac
29047 fi 29049 fi
29048@@ -6083,27 +6993,33 @@ func_mode_link () 29050@@ -6105,27 +7014,33 @@ func_mode_link ()
29049 temp_xrpath=$func_stripname_result 29051 temp_xrpath=$func_stripname_result
29050 case " $xrpath " in 29052 case " $xrpath " in
29051 *" $temp_xrpath "*) ;; 29053 *" $temp_xrpath "*) ;;
@@ -29085,7 +29087,7 @@ index 70990740b6c..7f7104ffc82 100644
29085 done 29087 done
29086 29088
29087 if test "$link_all_deplibs" != no; then 29089 if test "$link_all_deplibs" != no; then
29088@@ -6113,8 +7029,10 @@ func_mode_link () 29090@@ -6135,8 +7050,10 @@ func_mode_link ()
29089 case $deplib in 29091 case $deplib in
29090 -L*) path="$deplib" ;; 29092 -L*) path="$deplib" ;;
29091 *.la) 29093 *.la)
@@ -29097,7 +29099,7 @@ index 70990740b6c..7f7104ffc82 100644
29097 # We need an absolute path. 29099 # We need an absolute path.
29098 case $dir in 29100 case $dir in
29099 [\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;; 29101 [\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;;
29100@@ -6130,7 +7048,7 @@ func_mode_link () 29102@@ -6152,7 +7069,7 @@ func_mode_link ()
29101 case $host in 29103 case $host in
29102 *-*-darwin*) 29104 *-*-darwin*)
29103 depdepl= 29105 depdepl=
@@ -29106,7 +29108,7 @@ index 70990740b6c..7f7104ffc82 100644
29106 if test -n "$deplibrary_names" ; then 29108 if test -n "$deplibrary_names" ; then
29107 for tmp in $deplibrary_names ; do 29109 for tmp in $deplibrary_names ; do
29108 depdepl=$tmp 29110 depdepl=$tmp
29109@@ -6141,8 +7059,8 @@ func_mode_link () 29111@@ -6163,8 +7080,8 @@ func_mode_link ()
29110 if test -z "$darwin_install_name"; then 29112 if test -z "$darwin_install_name"; then
29111 darwin_install_name=`${OTOOL64} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'` 29113 darwin_install_name=`${OTOOL64} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'`
29112 fi 29114 fi
@@ -29117,7 +29119,7 @@ index 70990740b6c..7f7104ffc82 100644
29117 path= 29119 path=
29118 fi 29120 fi
29119 fi 29121 fi
29120@@ -6152,7 +7070,7 @@ func_mode_link () 29122@@ -6174,7 +7091,7 @@ func_mode_link ()
29121 ;; 29123 ;;
29122 esac 29124 esac
29123 else 29125 else
@@ -29126,7 +29128,7 @@ index 70990740b6c..7f7104ffc82 100644
29126 test -z "$libdir" && \ 29128 test -z "$libdir" && \
29127 func_fatal_error "\`$deplib' is not a valid libtool archive" 29129 func_fatal_error "\`$deplib' is not a valid libtool archive"
29128 test "$absdir" != "$libdir" && \ 29130 test "$absdir" != "$libdir" && \
29129@@ -6192,7 +7110,7 @@ func_mode_link () 29131@@ -6214,7 +7131,7 @@ func_mode_link ()
29130 for dir in $newlib_search_path; do 29132 for dir in $newlib_search_path; do
29131 case "$lib_search_path " in 29133 case "$lib_search_path " in
29132 *" $dir "*) ;; 29134 *" $dir "*) ;;
@@ -29135,7 +29137,7 @@ index 70990740b6c..7f7104ffc82 100644
29135 esac 29137 esac
29136 done 29138 done
29137 newlib_search_path= 29139 newlib_search_path=
29138@@ -6205,7 +7123,7 @@ func_mode_link () 29140@@ -6227,7 +7144,7 @@ func_mode_link ()
29139 fi 29141 fi
29140 for var in $vars dependency_libs; do 29142 for var in $vars dependency_libs; do
29141 # Add libraries to $var in reverse order 29143 # Add libraries to $var in reverse order
@@ -29144,7 +29146,7 @@ index 70990740b6c..7f7104ffc82 100644
29144 new_libs= 29146 new_libs=
29145 for deplib in $tmp_libs; do 29147 for deplib in $tmp_libs; do
29146 # FIXME: Pedantically, this is the right thing to do, so 29148 # FIXME: Pedantically, this is the right thing to do, so
29147@@ -6250,13 +7168,13 @@ func_mode_link () 29149@@ -6272,13 +7189,13 @@ func_mode_link ()
29148 -L*) 29150 -L*)
29149 case " $tmp_libs " in 29151 case " $tmp_libs " in
29150 *" $deplib "*) ;; 29152 *" $deplib "*) ;;
@@ -29161,7 +29163,7 @@ index 70990740b6c..7f7104ffc82 100644
29161 done # for var 29163 done # for var
29162 fi 29164 fi
29163 # Last step: remove runtime libs from dependency_libs 29165 # Last step: remove runtime libs from dependency_libs
29164@@ -6269,7 +7187,7 @@ func_mode_link () 29166@@ -6291,7 +7208,7 @@ func_mode_link ()
29165 ;; 29167 ;;
29166 esac 29168 esac
29167 if test -n "$i" ; then 29169 if test -n "$i" ; then
@@ -29170,7 +29172,7 @@ index 70990740b6c..7f7104ffc82 100644
29170 fi 29172 fi
29171 done 29173 done
29172 dependency_libs=$tmp_libs 29174 dependency_libs=$tmp_libs
29173@@ -6310,7 +7228,7 @@ func_mode_link () 29175@@ -6332,7 +7249,7 @@ func_mode_link ()
29174 # Now set the variables for building old libraries. 29176 # Now set the variables for building old libraries.
29175 build_libtool_libs=no 29177 build_libtool_libs=no
29176 oldlibs="$output" 29178 oldlibs="$output"
@@ -29179,7 +29181,7 @@ index 70990740b6c..7f7104ffc82 100644
29179 ;; 29181 ;;
29180 29182
29181 lib) 29183 lib)
29182@@ -6319,8 +7237,8 @@ func_mode_link () 29184@@ -6341,8 +7258,8 @@ func_mode_link ()
29183 lib*) 29185 lib*)
29184 func_stripname 'lib' '.la' "$outputname" 29186 func_stripname 'lib' '.la' "$outputname"
29185 name=$func_stripname_result 29187 name=$func_stripname_result
@@ -29190,7 +29192,7 @@ index 70990740b6c..7f7104ffc82 100644
29190 ;; 29192 ;;
29191 *) 29193 *)
29192 test "$module" = no && \ 29194 test "$module" = no && \
29193@@ -6330,8 +7248,8 @@ func_mode_link () 29195@@ -6352,8 +7269,8 @@ func_mode_link ()
29194 # Add the "lib" prefix for modules if required 29196 # Add the "lib" prefix for modules if required
29195 func_stripname '' '.la' "$outputname" 29197 func_stripname '' '.la' "$outputname"
29196 name=$func_stripname_result 29198 name=$func_stripname_result
@@ -29201,7 +29203,7 @@ index 70990740b6c..7f7104ffc82 100644
29201 else 29203 else
29202 func_stripname '' '.la' "$outputname" 29204 func_stripname '' '.la' "$outputname"
29203 libname=$func_stripname_result 29205 libname=$func_stripname_result
29204@@ -6346,7 +7264,7 @@ func_mode_link () 29206@@ -6368,7 +7285,7 @@ func_mode_link ()
29205 echo 29207 echo
29206 $ECHO "*** Warning: Linking the shared library $output against the non-libtool" 29208 $ECHO "*** Warning: Linking the shared library $output against the non-libtool"
29207 $ECHO "*** objects $objs is not portable!" 29209 $ECHO "*** objects $objs is not portable!"
@@ -29210,7 +29212,7 @@ index 70990740b6c..7f7104ffc82 100644
29210 fi 29212 fi
29211 fi 29213 fi
29212 29214
29213@@ -6544,7 +7462,7 @@ func_mode_link () 29215@@ -6566,7 +7483,7 @@ func_mode_link ()
29214 done 29216 done
29215 29217
29216 # Make executables depend on our current version. 29218 # Make executables depend on our current version.
@@ -29219,7 +29221,7 @@ index 70990740b6c..7f7104ffc82 100644
29219 ;; 29221 ;;
29220 29222
29221 qnx) 29223 qnx)
29222@@ -6612,10 +7530,10 @@ func_mode_link () 29224@@ -6634,10 +7551,10 @@ func_mode_link ()
29223 fi 29225 fi
29224 29226
29225 func_generate_dlsyms "$libname" "$libname" "yes" 29227 func_generate_dlsyms "$libname" "$libname" "yes"
@@ -29232,7 +29234,7 @@ index 70990740b6c..7f7104ffc82 100644
29232 # Remove our outputs, but don't remove object files since they 29234 # Remove our outputs, but don't remove object files since they
29233 # may have been created when compiling PIC objects. 29235 # may have been created when compiling PIC objects.
29234 removelist= 29236 removelist=
29235@@ -6631,7 +7549,7 @@ func_mode_link () 29237@@ -6653,7 +7570,7 @@ func_mode_link ()
29236 continue 29238 continue
29237 fi 29239 fi
29238 fi 29240 fi
@@ -29241,7 +29243,7 @@ index 70990740b6c..7f7104ffc82 100644
29241 ;; 29243 ;;
29242 *) ;; 29244 *) ;;
29243 esac 29245 esac
29244@@ -6642,7 +7560,7 @@ func_mode_link () 29246@@ -6664,7 +7581,7 @@ func_mode_link ()
29245 29247
29246 # Now set the variables for building old libraries. 29248 # Now set the variables for building old libraries.
29247 if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then 29249 if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then
@@ -29250,7 +29252,7 @@ index 70990740b6c..7f7104ffc82 100644
29250 29252
29251 # Transform .lo files to .o files. 29253 # Transform .lo files to .o files.
29252 oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; $lo2o" | $NL2SP` 29254 oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; $lo2o" | $NL2SP`
29253@@ -6659,10 +7577,11 @@ func_mode_link () 29255@@ -6681,10 +7598,11 @@ func_mode_link ()
29254 # If the user specified any rpath flags, then add them. 29256 # If the user specified any rpath flags, then add them.
29255 temp_xrpath= 29257 temp_xrpath=
29256 for libdir in $xrpath; do 29258 for libdir in $xrpath; do
@@ -29264,7 +29266,7 @@ index 70990740b6c..7f7104ffc82 100644
29264 esac 29266 esac
29265 done 29267 done
29266 if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then 29268 if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then
29267@@ -6676,7 +7595,7 @@ func_mode_link () 29269@@ -6698,7 +7616,7 @@ func_mode_link ()
29268 for lib in $old_dlfiles; do 29270 for lib in $old_dlfiles; do
29269 case " $dlprefiles $dlfiles " in 29271 case " $dlprefiles $dlfiles " in
29270 *" $lib "*) ;; 29272 *" $lib "*) ;;
@@ -29273,7 +29275,7 @@ index 70990740b6c..7f7104ffc82 100644
29273 esac 29275 esac
29274 done 29276 done
29275 29277
29276@@ -6686,7 +7605,7 @@ func_mode_link () 29278@@ -6708,7 +7626,7 @@ func_mode_link ()
29277 for lib in $old_dlprefiles; do 29279 for lib in $old_dlprefiles; do
29278 case "$dlprefiles " in 29280 case "$dlprefiles " in
29279 *" $lib "*) ;; 29281 *" $lib "*) ;;
@@ -29282,7 +29284,7 @@ index 70990740b6c..7f7104ffc82 100644
29282 esac 29284 esac
29283 done 29285 done
29284 29286
29285@@ -6698,7 +7617,7 @@ func_mode_link () 29287@@ -6720,7 +7638,7 @@ func_mode_link ()
29286 ;; 29288 ;;
29287 *-*-rhapsody* | *-*-darwin1.[012]) 29289 *-*-rhapsody* | *-*-darwin1.[012])
29288 # Rhapsody C library is in the System framework 29290 # Rhapsody C library is in the System framework
@@ -29291,7 +29293,7 @@ index 70990740b6c..7f7104ffc82 100644
29291 ;; 29293 ;;
29292 *-*-netbsd*) 29294 *-*-netbsd*)
29293 # Don't link with libc until the a.out ld.so is fixed. 29295 # Don't link with libc until the a.out ld.so is fixed.
29294@@ -6715,7 +7634,7 @@ func_mode_link () 29296@@ -6737,7 +7655,7 @@ func_mode_link ()
29295 *) 29297 *)
29296 # Add libc to deplibs on all other systems if necessary. 29298 # Add libc to deplibs on all other systems if necessary.
29297 if test "$build_libtool_need_lc" = "yes"; then 29299 if test "$build_libtool_need_lc" = "yes"; then
@@ -29300,7 +29302,7 @@ index 70990740b6c..7f7104ffc82 100644
29300 fi 29302 fi
29301 ;; 29303 ;;
29302 esac 29304 esac
29303@@ -6764,18 +7683,18 @@ EOF 29305@@ -6786,18 +7704,18 @@ EOF
29304 if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then 29306 if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
29305 case " $predeps $postdeps " in 29307 case " $predeps $postdeps " in
29306 *" $i "*) 29308 *" $i "*)
@@ -29323,7 +29325,7 @@ index 70990740b6c..7f7104ffc82 100644
29323 else 29325 else
29324 droppeddeps=yes 29326 droppeddeps=yes
29325 echo 29327 echo
29326@@ -6789,7 +7708,7 @@ EOF 29328@@ -6811,7 +7729,7 @@ EOF
29327 fi 29329 fi
29328 ;; 29330 ;;
29329 *) 29331 *)
@@ -29332,7 +29334,7 @@ index 70990740b6c..7f7104ffc82 100644
29332 ;; 29334 ;;
29333 esac 29335 esac
29334 done 29336 done
29335@@ -6807,18 +7726,18 @@ EOF 29337@@ -6829,18 +7747,18 @@ EOF
29336 if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then 29338 if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
29337 case " $predeps $postdeps " in 29339 case " $predeps $postdeps " in
29338 *" $i "*) 29340 *" $i "*)
@@ -29355,7 +29357,7 @@ index 70990740b6c..7f7104ffc82 100644
29355 else 29357 else
29356 droppeddeps=yes 29358 droppeddeps=yes
29357 echo 29359 echo
29358@@ -6840,7 +7759,7 @@ EOF 29360@@ -6862,7 +7780,7 @@ EOF
29359 fi 29361 fi
29360 ;; 29362 ;;
29361 *) 29363 *)
@@ -29364,7 +29366,7 @@ index 70990740b6c..7f7104ffc82 100644
29364 ;; 29366 ;;
29365 esac 29367 esac
29366 done 29368 done
29367@@ -6857,15 +7776,27 @@ EOF 29369@@ -6879,15 +7797,27 @@ EOF
29368 if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then 29370 if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
29369 case " $predeps $postdeps " in 29371 case " $predeps $postdeps " in
29370 *" $a_deplib "*) 29372 *" $a_deplib "*)
@@ -29395,7 +29397,7 @@ index 70990740b6c..7f7104ffc82 100644
29395 for potent_lib in $potential_libs; do 29397 for potent_lib in $potential_libs; do
29396 # Follow soft links. 29398 # Follow soft links.
29397 if ls -lLd "$potent_lib" 2>/dev/null | 29399 if ls -lLd "$potent_lib" 2>/dev/null |
29398@@ -6885,10 +7816,10 @@ EOF 29400@@ -6907,10 +7837,10 @@ EOF
29399 *) potlib=`$ECHO "$potlib" | $SED 's,[^/]*$,,'`"$potliblink";; 29401 *) potlib=`$ECHO "$potlib" | $SED 's,[^/]*$,,'`"$potliblink";;
29400 esac 29402 esac
29401 done 29403 done
@@ -29408,7 +29410,7 @@ index 70990740b6c..7f7104ffc82 100644
29408 a_deplib="" 29410 a_deplib=""
29409 break 2 29411 break 2
29410 fi 29412 fi
29411@@ -6913,7 +7844,7 @@ EOF 29413@@ -6935,7 +7865,7 @@ EOF
29412 ;; 29414 ;;
29413 *) 29415 *)
29414 # Add a -L argument. 29416 # Add a -L argument.
@@ -29417,7 +29419,7 @@ index 70990740b6c..7f7104ffc82 100644
29417 ;; 29419 ;;
29418 esac 29420 esac
29419 done # Gone through all deplibs. 29421 done # Gone through all deplibs.
29420@@ -6929,20 +7860,20 @@ EOF 29422@@ -6951,20 +7881,20 @@ EOF
29421 if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then 29423 if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
29422 case " $predeps $postdeps " in 29424 case " $predeps $postdeps " in
29423 *" $a_deplib "*) 29425 *" $a_deplib "*)
@@ -29441,7 +29443,7 @@ index 70990740b6c..7f7104ffc82 100644
29441 a_deplib="" 29443 a_deplib=""
29442 break 2 29444 break 2
29443 fi 29445 fi
29444@@ -6967,7 +7898,7 @@ EOF 29446@@ -6989,7 +7919,7 @@ EOF
29445 ;; 29447 ;;
29446 *) 29448 *)
29447 # Add a -L argument. 29449 # Add a -L argument.
@@ -29450,7 +29452,7 @@ index 70990740b6c..7f7104ffc82 100644
29450 ;; 29452 ;;
29451 esac 29453 esac
29452 done # Gone through all deplibs. 29454 done # Gone through all deplibs.
29453@@ -7071,7 +8002,7 @@ EOF 29455@@ -7093,7 +8023,7 @@ EOF
29454 *) 29456 *)
29455 case " $deplibs " in 29457 case " $deplibs " in
29456 *" -L$path/$objdir "*) 29458 *" -L$path/$objdir "*)
@@ -29459,7 +29461,7 @@ index 70990740b6c..7f7104ffc82 100644
29459 esac 29461 esac
29460 ;; 29462 ;;
29461 esac 29463 esac
29462@@ -7081,10 +8012,10 @@ EOF 29464@@ -7103,10 +8033,10 @@ EOF
29463 -L*) 29465 -L*)
29464 case " $new_libs " in 29466 case " $new_libs " in
29465 *" $deplib "*) ;; 29467 *" $deplib "*) ;;
@@ -29472,7 +29474,7 @@ index 70990740b6c..7f7104ffc82 100644
29472 esac 29474 esac
29473 done 29475 done
29474 deplibs="$new_libs" 29476 deplibs="$new_libs"
29475@@ -7101,10 +8032,12 @@ EOF 29477@@ -7123,10 +8053,12 @@ EOF
29476 hardcode_libdirs= 29478 hardcode_libdirs=
29477 dep_rpath= 29479 dep_rpath=
29478 rpath="$finalize_rpath" 29480 rpath="$finalize_rpath"
@@ -29486,7 +29488,7 @@ index 70990740b6c..7f7104ffc82 100644
29486 if test -z "$hardcode_libdirs"; then 29488 if test -z "$hardcode_libdirs"; then
29487 hardcode_libdirs="$libdir" 29489 hardcode_libdirs="$libdir"
29488 else 29490 else
29489@@ -7113,18 +8046,18 @@ EOF 29491@@ -7135,18 +8067,18 @@ EOF
29490 *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) 29492 *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
29491 ;; 29493 ;;
29492 *) 29494 *)
@@ -29509,7 +29511,7 @@ index 70990740b6c..7f7104ffc82 100644
29509 esac 29511 esac
29510 fi 29512 fi
29511 done 29513 done
29512@@ -7133,40 +8066,38 @@ EOF 29514@@ -7155,40 +8087,38 @@ EOF
29513 test -n "$hardcode_libdirs"; then 29515 test -n "$hardcode_libdirs"; then
29514 libdir="$hardcode_libdirs" 29516 libdir="$hardcode_libdirs"
29515 if test -n "$hardcode_libdir_flag_spec_ld"; then 29517 if test -n "$hardcode_libdir_flag_spec_ld"; then
@@ -29559,7 +29561,7 @@ index 70990740b6c..7f7104ffc82 100644
29559 else 29561 else
29560 soname="$realname" 29562 soname="$realname"
29561 fi 29563 fi
29562@@ -7178,7 +8109,7 @@ EOF 29564@@ -7200,7 +8130,7 @@ EOF
29563 linknames= 29565 linknames=
29564 for link 29566 for link
29565 do 29567 do
@@ -29568,7 +29570,7 @@ index 70990740b6c..7f7104ffc82 100644
29568 done 29570 done
29569 29571
29570 # Use standard objects if they are pic 29572 # Use standard objects if they are pic
29571@@ -7189,7 +8120,7 @@ EOF 29573@@ -7211,7 +8141,7 @@ EOF
29572 if test -n "$export_symbols" && test -n "$include_expsyms"; then 29574 if test -n "$export_symbols" && test -n "$include_expsyms"; then
29573 $opt_dry_run || cp "$export_symbols" "$output_objdir/$libname.uexp" 29575 $opt_dry_run || cp "$export_symbols" "$output_objdir/$libname.uexp"
29574 export_symbols="$output_objdir/$libname.uexp" 29576 export_symbols="$output_objdir/$libname.uexp"
@@ -29577,7 +29579,7 @@ index 70990740b6c..7f7104ffc82 100644
29577 fi 29579 fi
29578 29580
29579 orig_export_symbols= 29581 orig_export_symbols=
29580@@ -7220,13 +8151,45 @@ EOF 29582@@ -7242,13 +8172,45 @@ EOF
29581 $opt_dry_run || $RM $export_symbols 29583 $opt_dry_run || $RM $export_symbols
29582 cmds=$export_symbols_cmds 29584 cmds=$export_symbols_cmds
29583 save_ifs="$IFS"; IFS='~' 29585 save_ifs="$IFS"; IFS='~'
@@ -29628,7 +29630,7 @@ index 70990740b6c..7f7104ffc82 100644
29628 skipped_export=false 29630 skipped_export=false
29629 else 29631 else
29630 # The command line is too long to execute in one step. 29632 # The command line is too long to execute in one step.
29631@@ -7248,7 +8211,7 @@ EOF 29633@@ -7270,7 +8232,7 @@ EOF
29632 if test -n "$export_symbols" && test -n "$include_expsyms"; then 29634 if test -n "$export_symbols" && test -n "$include_expsyms"; then
29633 tmp_export_symbols="$export_symbols" 29635 tmp_export_symbols="$export_symbols"
29634 test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols" 29636 test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols"
@@ -29637,7 +29639,7 @@ index 70990740b6c..7f7104ffc82 100644
29637 fi 29639 fi
29638 29640
29639 if test "X$skipped_export" != "X:" && test -n "$orig_export_symbols"; then 29641 if test "X$skipped_export" != "X:" && test -n "$orig_export_symbols"; then
29640@@ -7260,7 +8223,7 @@ EOF 29642@@ -7282,7 +8244,7 @@ EOF
29641 # global variables. join(1) would be nice here, but unfortunately 29643 # global variables. join(1) would be nice here, but unfortunately
29642 # isn't a blessed tool. 29644 # isn't a blessed tool.
29643 $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter 29645 $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter
@@ -29646,7 +29648,7 @@ index 70990740b6c..7f7104ffc82 100644
29646 export_symbols=$output_objdir/$libname.def 29648 export_symbols=$output_objdir/$libname.def
29647 $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols 29649 $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
29648 fi 29650 fi
29649@@ -7270,7 +8233,7 @@ EOF 29651@@ -7292,7 +8254,7 @@ EOF
29650 case " $convenience " in 29652 case " $convenience " in
29651 *" $test_deplib "*) ;; 29653 *" $test_deplib "*) ;;
29652 *) 29654 *)
@@ -29655,7 +29657,7 @@ index 70990740b6c..7f7104ffc82 100644
29655 ;; 29657 ;;
29656 esac 29658 esac
29657 done 29659 done
29658@@ -7286,43 +8249,43 @@ EOF 29660@@ -7308,43 +8270,43 @@ EOF
29659 fi 29661 fi
29660 if test -n "$whole_archive_flag_spec"; then 29662 if test -n "$whole_archive_flag_spec"; then
29661 save_libobjs=$libobjs 29663 save_libobjs=$libobjs
@@ -29710,7 +29712,7 @@ index 70990740b6c..7f7104ffc82 100644
29710 cmds=$archive_cmds 29712 cmds=$archive_cmds
29711 fi 29713 fi
29712 fi 29714 fi
29713@@ -7366,10 +8329,13 @@ EOF 29715@@ -7388,10 +8350,13 @@ EOF
29714 echo 'INPUT (' > $output 29716 echo 'INPUT (' > $output
29715 for obj in $save_libobjs 29717 for obj in $save_libobjs
29716 do 29718 do
@@ -29726,7 +29728,7 @@ index 70990740b6c..7f7104ffc82 100644
29726 elif test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "X$file_list_spec" != X; then 29728 elif test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "X$file_list_spec" != X; then
29727 output=${output_objdir}/${output_la}.lnk 29729 output=${output_objdir}/${output_la}.lnk
29728 func_verbose "creating linker input file list: $output" 29730 func_verbose "creating linker input file list: $output"
29729@@ -7383,15 +8349,17 @@ EOF 29731@@ -7405,15 +8370,17 @@ EOF
29730 fi 29732 fi
29731 for obj 29733 for obj
29732 do 29734 do
@@ -29748,7 +29750,7 @@ index 70990740b6c..7f7104ffc82 100644
29748 func_len " $test_cmds" 29750 func_len " $test_cmds"
29749 len0=$func_len_result 29751 len0=$func_len_result
29750 len=$len0 29752 len=$len0
29751@@ -7411,12 +8379,12 @@ EOF 29753@@ -7433,12 +8400,12 @@ EOF
29752 if test "$k" -eq 1 ; then 29754 if test "$k" -eq 1 ; then
29753 # The first file doesn't have a previous command to add. 29755 # The first file doesn't have a previous command to add.
29754 reload_objs=$objlist 29756 reload_objs=$objlist
@@ -29763,7 +29765,7 @@ index 70990740b6c..7f7104ffc82 100644
29763 fi 29765 fi
29764 last_robj=$output_objdir/$output_la-${k}.$objext 29766 last_robj=$output_objdir/$output_la-${k}.$objext
29765 func_arith $k + 1 29767 func_arith $k + 1
29766@@ -7433,11 +8401,11 @@ EOF 29768@@ -7455,11 +8422,11 @@ EOF
29767 # files will link in the last one created. 29769 # files will link in the last one created.
29768 test -z "$concat_cmds" || concat_cmds=$concat_cmds~ 29770 test -z "$concat_cmds" || concat_cmds=$concat_cmds~
29769 reload_objs="$objlist $last_robj" 29771 reload_objs="$objlist $last_robj"
@@ -29778,7 +29780,7 @@ index 70990740b6c..7f7104ffc82 100644
29778 29780
29779 else 29781 else
29780 output= 29782 output=
29781@@ -7450,9 +8418,9 @@ EOF 29783@@ -7472,9 +8439,9 @@ EOF
29782 libobjs=$output 29784 libobjs=$output
29783 # Append the command to create the export file. 29785 # Append the command to create the export file.
29784 test -z "$concat_cmds" || concat_cmds=$concat_cmds~ 29786 test -z "$concat_cmds" || concat_cmds=$concat_cmds~
@@ -29790,7 +29792,7 @@ index 70990740b6c..7f7104ffc82 100644
29790 fi 29792 fi
29791 fi 29793 fi
29792 29794
29793@@ -7471,7 +8439,7 @@ EOF 29795@@ -7493,7 +8460,7 @@ EOF
29794 lt_exit=$? 29796 lt_exit=$?
29795 29797
29796 # Restore the uninstalled library and exit 29798 # Restore the uninstalled library and exit
@@ -29799,7 +29801,7 @@ index 70990740b6c..7f7104ffc82 100644
29799 ( cd "$output_objdir" && \ 29801 ( cd "$output_objdir" && \
29800 $RM "${realname}T" && \ 29802 $RM "${realname}T" && \
29801 $MV "${realname}U" "$realname" ) 29803 $MV "${realname}U" "$realname" )
29802@@ -7492,7 +8460,7 @@ EOF 29804@@ -7514,7 +8481,7 @@ EOF
29803 if test -n "$export_symbols" && test -n "$include_expsyms"; then 29805 if test -n "$export_symbols" && test -n "$include_expsyms"; then
29804 tmp_export_symbols="$export_symbols" 29806 tmp_export_symbols="$export_symbols"
29805 test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols" 29807 test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols"
@@ -29808,7 +29810,7 @@ index 70990740b6c..7f7104ffc82 100644
29808 fi 29810 fi
29809 29811
29810 if test -n "$orig_export_symbols"; then 29812 if test -n "$orig_export_symbols"; then
29811@@ -7504,7 +8472,7 @@ EOF 29813@@ -7526,7 +8493,7 @@ EOF
29812 # global variables. join(1) would be nice here, but unfortunately 29814 # global variables. join(1) would be nice here, but unfortunately
29813 # isn't a blessed tool. 29815 # isn't a blessed tool.
29814 $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter 29816 $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter
@@ -29817,7 +29819,7 @@ index 70990740b6c..7f7104ffc82 100644
29817 export_symbols=$output_objdir/$libname.def 29819 export_symbols=$output_objdir/$libname.def
29818 $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols 29820 $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
29819 fi 29821 fi
29820@@ -7515,7 +8483,7 @@ EOF 29822@@ -7537,7 +8504,7 @@ EOF
29821 output=$save_output 29823 output=$save_output
29822 29824
29823 if test -n "$convenience" && test -n "$whole_archive_flag_spec"; then 29825 if test -n "$convenience" && test -n "$whole_archive_flag_spec"; then
@@ -29826,7 +29828,7 @@ index 70990740b6c..7f7104ffc82 100644
29826 test "X$libobjs" = "X " && libobjs= 29828 test "X$libobjs" = "X " && libobjs=
29827 fi 29829 fi
29828 # Expand the library linking commands again to reset the 29830 # Expand the library linking commands again to reset the
29829@@ -7539,23 +8507,23 @@ EOF 29831@@ -7561,23 +8528,23 @@ EOF
29830 29832
29831 if test -n "$delfiles"; then 29833 if test -n "$delfiles"; then
29832 # Append the command to remove temporary files to $cmds. 29834 # Append the command to remove temporary files to $cmds.
@@ -29854,7 +29856,7 @@ index 70990740b6c..7f7104ffc82 100644
29854 $opt_silent || { 29856 $opt_silent || {
29855 func_quote_for_expand "$cmd" 29857 func_quote_for_expand "$cmd"
29856 eval "func_echo $func_quote_for_expand_result" 29858 eval "func_echo $func_quote_for_expand_result"
29857@@ -7564,7 +8532,7 @@ EOF 29859@@ -7586,7 +8553,7 @@ EOF
29858 lt_exit=$? 29860 lt_exit=$?
29859 29861
29860 # Restore the uninstalled library and exit 29862 # Restore the uninstalled library and exit
@@ -29863,7 +29865,7 @@ index 70990740b6c..7f7104ffc82 100644
29863 ( cd "$output_objdir" && \ 29865 ( cd "$output_objdir" && \
29864 $RM "${realname}T" && \ 29866 $RM "${realname}T" && \
29865 $MV "${realname}U" "$realname" ) 29867 $MV "${realname}U" "$realname" )
29866@@ -7576,8 +8544,8 @@ EOF 29868@@ -7598,8 +8565,8 @@ EOF
29867 IFS="$save_ifs" 29869 IFS="$save_ifs"
29868 29870
29869 # Restore the uninstalled library and exit 29871 # Restore the uninstalled library and exit
@@ -29874,7 +29876,7 @@ index 70990740b6c..7f7104ffc82 100644
29874 29876
29875 if test -n "$convenience"; then 29877 if test -n "$convenience"; then
29876 if test -z "$whole_archive_flag_spec"; then 29878 if test -z "$whole_archive_flag_spec"; then
29877@@ -7656,17 +8624,20 @@ EOF 29879@@ -7678,17 +8645,20 @@ EOF
29878 29880
29879 if test -n "$convenience"; then 29881 if test -n "$convenience"; then
29880 if test -n "$whole_archive_flag_spec"; then 29882 if test -n "$whole_archive_flag_spec"; then
@@ -29897,7 +29899,7 @@ index 70990740b6c..7f7104ffc82 100644
29897 # Create the old-style object. 29899 # Create the old-style object.
29898 reload_objs="$objs$old_deplibs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; /\.lib$/d; $lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test 29900 reload_objs="$objs$old_deplibs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; /\.lib$/d; $lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test
29899 29901
29900@@ -7690,7 +8661,7 @@ EOF 29902@@ -7712,7 +8682,7 @@ EOF
29901 # Create an invalid libtool object if no PIC, so that we don't 29903 # Create an invalid libtool object if no PIC, so that we don't
29902 # accidentally link it into a program. 29904 # accidentally link it into a program.
29903 # $show "echo timestamp > $libobj" 29905 # $show "echo timestamp > $libobj"
@@ -29906,7 +29908,7 @@ index 70990740b6c..7f7104ffc82 100644
29906 exit $EXIT_SUCCESS 29908 exit $EXIT_SUCCESS
29907 fi 29909 fi
29908 29910
29909@@ -7740,8 +8711,8 @@ EOF 29911@@ -7762,8 +8732,8 @@ EOF
29910 if test "$tagname" = CXX ; then 29912 if test "$tagname" = CXX ; then
29911 case ${MACOSX_DEPLOYMENT_TARGET-10.0} in 29913 case ${MACOSX_DEPLOYMENT_TARGET-10.0} in
29912 10.[0123]) 29914 10.[0123])
@@ -29917,7 +29919,7 @@ index 70990740b6c..7f7104ffc82 100644
29917 ;; 29919 ;;
29918 esac 29920 esac
29919 fi 29921 fi
29920@@ -7761,7 +8732,7 @@ EOF 29922@@ -7783,7 +8753,7 @@ EOF
29921 *) 29923 *)
29922 case " $compile_deplibs " in 29924 case " $compile_deplibs " in
29923 *" -L$path/$objdir "*) 29925 *" -L$path/$objdir "*)
@@ -29926,7 +29928,7 @@ index 70990740b6c..7f7104ffc82 100644
29926 esac 29928 esac
29927 ;; 29929 ;;
29928 esac 29930 esac
29929@@ -7771,17 +8742,17 @@ EOF 29931@@ -7793,17 +8763,17 @@ EOF
29930 -L*) 29932 -L*)
29931 case " $new_libs " in 29933 case " $new_libs " in
29932 *" $deplib "*) ;; 29934 *" $deplib "*) ;;
@@ -29948,7 +29950,7 @@ index 70990740b6c..7f7104ffc82 100644
29948 29950
29949 if test -n "$rpath$xrpath"; then 29951 if test -n "$rpath$xrpath"; then
29950 # If the user specified any rpath flags, then add them. 29952 # If the user specified any rpath flags, then add them.
29951@@ -7789,7 +8760,7 @@ EOF 29953@@ -7811,7 +8781,7 @@ EOF
29952 # This is the magic to use -rpath. 29954 # This is the magic to use -rpath.
29953 case "$finalize_rpath " in 29955 case "$finalize_rpath " in
29954 *" $libdir "*) ;; 29956 *" $libdir "*) ;;
@@ -29957,7 +29959,7 @@ index 70990740b6c..7f7104ffc82 100644
29957 esac 29959 esac
29958 done 29960 done
29959 fi 29961 fi
29960@@ -7808,18 +8779,18 @@ EOF 29962@@ -7830,18 +8800,18 @@ EOF
29961 *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) 29963 *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
29962 ;; 29964 ;;
29963 *) 29965 *)
@@ -29980,7 +29982,7 @@ index 70990740b6c..7f7104ffc82 100644
29980 esac 29982 esac
29981 fi 29983 fi
29982 case $host in 29984 case $host in
29983@@ -7828,12 +8799,12 @@ EOF 29985@@ -7850,12 +8820,12 @@ EOF
29984 case :$dllsearchpath: in 29986 case :$dllsearchpath: in
29985 *":$libdir:"*) ;; 29987 *":$libdir:"*) ;;
29986 ::) dllsearchpath=$libdir;; 29988 ::) dllsearchpath=$libdir;;
@@ -29995,7 +29997,7 @@ index 70990740b6c..7f7104ffc82 100644
29995 esac 29997 esac
29996 ;; 29998 ;;
29997 esac 29999 esac
29998@@ -7842,7 +8813,7 @@ EOF 30000@@ -7864,7 +8834,7 @@ EOF
29999 if test -n "$hardcode_libdir_separator" && 30001 if test -n "$hardcode_libdir_separator" &&
30000 test -n "$hardcode_libdirs"; then 30002 test -n "$hardcode_libdirs"; then
30001 libdir="$hardcode_libdirs" 30003 libdir="$hardcode_libdirs"
@@ -30004,7 +30006,7 @@ index 70990740b6c..7f7104ffc82 100644
30004 fi 30006 fi
30005 compile_rpath="$rpath" 30007 compile_rpath="$rpath"
30006 30008
30007@@ -7859,18 +8830,18 @@ EOF 30009@@ -7881,18 +8851,18 @@ EOF
30008 *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) 30010 *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
30009 ;; 30011 ;;
30010 *) 30012 *)
@@ -30027,7 +30029,7 @@ index 70990740b6c..7f7104ffc82 100644
30027 esac 30029 esac
30028 fi 30030 fi
30029 done 30031 done
30030@@ -7878,7 +8849,7 @@ EOF 30032@@ -7900,7 +8870,7 @@ EOF
30031 if test -n "$hardcode_libdir_separator" && 30033 if test -n "$hardcode_libdir_separator" &&
30032 test -n "$hardcode_libdirs"; then 30034 test -n "$hardcode_libdirs"; then
30033 libdir="$hardcode_libdirs" 30035 libdir="$hardcode_libdirs"
@@ -30036,7 +30038,7 @@ index 70990740b6c..7f7104ffc82 100644
30036 fi 30038 fi
30037 finalize_rpath="$rpath" 30039 finalize_rpath="$rpath"
30038 30040
30039@@ -7921,6 +8892,12 @@ EOF 30041@@ -7943,6 +8913,12 @@ EOF
30040 exit_status=0 30042 exit_status=0
30041 func_show_eval "$link_command" 'exit_status=$?' 30043 func_show_eval "$link_command" 'exit_status=$?'
30042 30044
@@ -30049,7 +30051,7 @@ index 70990740b6c..7f7104ffc82 100644
30049 # Delete the generated files. 30051 # Delete the generated files.
30050 if test -f "$output_objdir/${outputname}S.${objext}"; then 30052 if test -f "$output_objdir/${outputname}S.${objext}"; then
30051 func_show_eval '$RM "$output_objdir/${outputname}S.${objext}"' 30053 func_show_eval '$RM "$output_objdir/${outputname}S.${objext}"'
30052@@ -7943,7 +8920,7 @@ EOF 30054@@ -7965,7 +8941,7 @@ EOF
30053 # We should set the runpath_var. 30055 # We should set the runpath_var.
30054 rpath= 30056 rpath=
30055 for dir in $perm_rpath; do 30057 for dir in $perm_rpath; do
@@ -30058,7 +30060,7 @@ index 70990740b6c..7f7104ffc82 100644
30058 done 30060 done
30059 compile_var="$runpath_var=\"$rpath\$$runpath_var\" " 30061 compile_var="$runpath_var=\"$rpath\$$runpath_var\" "
30060 fi 30062 fi
30061@@ -7951,7 +8928,7 @@ EOF 30063@@ -7973,7 +8949,7 @@ EOF
30062 # We should set the runpath_var. 30064 # We should set the runpath_var.
30063 rpath= 30065 rpath=
30064 for dir in $finalize_perm_rpath; do 30066 for dir in $finalize_perm_rpath; do
@@ -30067,7 +30069,7 @@ index 70990740b6c..7f7104ffc82 100644
30067 done 30069 done
30068 finalize_var="$runpath_var=\"$rpath\$$runpath_var\" " 30070 finalize_var="$runpath_var=\"$rpath\$$runpath_var\" "
30069 fi 30071 fi
30070@@ -7966,6 +8943,13 @@ EOF 30072@@ -7988,6 +8964,13 @@ EOF
30071 $opt_dry_run || $RM $output 30073 $opt_dry_run || $RM $output
30072 # Link the executable and exit 30074 # Link the executable and exit
30073 func_show_eval "$link_command" 'exit $?' 30075 func_show_eval "$link_command" 'exit $?'
@@ -30081,7 +30083,7 @@ index 70990740b6c..7f7104ffc82 100644
30081 exit $EXIT_SUCCESS 30083 exit $EXIT_SUCCESS
30082 fi 30084 fi
30083 30085
30084@@ -7999,6 +8983,12 @@ EOF 30086@@ -8021,6 +9004,12 @@ EOF
30085 30087
30086 func_show_eval "$link_command" 'exit $?' 30088 func_show_eval "$link_command" 'exit $?'
30087 30089
@@ -30094,7 +30096,7 @@ index 70990740b6c..7f7104ffc82 100644
30094 # Now create the wrapper script. 30096 # Now create the wrapper script.
30095 func_verbose "creating $output" 30097 func_verbose "creating $output"
30096 30098
30097@@ -8096,7 +9086,7 @@ EOF 30099@@ -8118,7 +9107,7 @@ EOF
30098 else 30100 else
30099 oldobjs="$old_deplibs $non_pic_objects" 30101 oldobjs="$old_deplibs $non_pic_objects"
30100 if test "$preload" = yes && test -f "$symfileobj"; then 30102 if test "$preload" = yes && test -f "$symfileobj"; then
@@ -30103,7 +30105,7 @@ index 70990740b6c..7f7104ffc82 100644
30103 fi 30105 fi
30104 fi 30106 fi
30105 addlibs="$old_convenience" 30107 addlibs="$old_convenience"
30106@@ -8104,10 +9094,10 @@ EOF 30108@@ -8126,10 +9115,10 @@ EOF
30107 30109
30108 if test -n "$addlibs"; then 30110 if test -n "$addlibs"; then
30109 gentop="$output_objdir/${outputname}x" 30111 gentop="$output_objdir/${outputname}x"
@@ -30116,7 +30118,7 @@ index 70990740b6c..7f7104ffc82 100644
30116 fi 30118 fi
30117 30119
30118 # Do each command in the archive commands. 30120 # Do each command in the archive commands.
30119@@ -8118,10 +9108,10 @@ EOF 30121@@ -8140,10 +9129,10 @@ EOF
30120 # Add any objects from preloaded convenience libraries 30122 # Add any objects from preloaded convenience libraries
30121 if test -n "$dlprefiles"; then 30123 if test -n "$dlprefiles"; then
30122 gentop="$output_objdir/${outputname}x" 30124 gentop="$output_objdir/${outputname}x"
@@ -30129,7 +30131,7 @@ index 70990740b6c..7f7104ffc82 100644
30129 fi 30131 fi
30130 30132
30131 # POSIX demands no paths to be encoded in archives. We have 30133 # POSIX demands no paths to be encoded in archives. We have
30132@@ -8139,7 +9129,7 @@ EOF 30134@@ -8161,7 +9150,7 @@ EOF
30133 else 30135 else
30134 echo "copying selected object files to avoid basename conflicts..." 30136 echo "copying selected object files to avoid basename conflicts..."
30135 gentop="$output_objdir/${outputname}x" 30137 gentop="$output_objdir/${outputname}x"
@@ -30138,7 +30140,7 @@ index 70990740b6c..7f7104ffc82 100644
30138 func_mkdir_p "$gentop" 30140 func_mkdir_p "$gentop"
30139 save_oldobjs=$oldobjs 30141 save_oldobjs=$oldobjs
30140 oldobjs= 30142 oldobjs=
30141@@ -8163,18 +9153,28 @@ EOF 30143@@ -8185,18 +9174,28 @@ EOF
30142 esac 30144 esac
30143 done 30145 done
30144 func_show_eval "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj" 30146 func_show_eval "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj"
@@ -30170,7 +30172,7 @@ index 70990740b6c..7f7104ffc82 100644
30170 else 30172 else
30171 # the command line is too long to link in one step, link in parts 30173 # the command line is too long to link in one step, link in parts
30172 func_verbose "using piecewise archive linking..." 30174 func_verbose "using piecewise archive linking..."
30173@@ -8189,7 +9189,7 @@ EOF 30175@@ -8211,7 +9210,7 @@ EOF
30174 do 30176 do
30175 last_oldobj=$obj 30177 last_oldobj=$obj
30176 done 30178 done
@@ -30179,7 +30181,7 @@ index 70990740b6c..7f7104ffc82 100644
30179 func_len " $test_cmds" 30181 func_len " $test_cmds"
30180 len0=$func_len_result 30182 len0=$func_len_result
30181 len=$len0 30183 len=$len0
30182@@ -8208,7 +9208,7 @@ EOF 30184@@ -8230,7 +9229,7 @@ EOF
30183 RANLIB=$save_RANLIB 30185 RANLIB=$save_RANLIB
30184 fi 30186 fi
30185 test -z "$concat_cmds" || concat_cmds=$concat_cmds~ 30187 test -z "$concat_cmds" || concat_cmds=$concat_cmds~
@@ -30188,7 +30190,7 @@ index 70990740b6c..7f7104ffc82 100644
30188 objlist= 30190 objlist=
30189 len=$len0 30191 len=$len0
30190 fi 30192 fi
30191@@ -8216,9 +9216,9 @@ EOF 30193@@ -8238,9 +9237,9 @@ EOF
30192 RANLIB=$save_RANLIB 30194 RANLIB=$save_RANLIB
30193 oldobjs=$objlist 30195 oldobjs=$objlist
30194 if test "X$oldobjs" = "X" ; then 30196 if test "X$oldobjs" = "X" ; then
@@ -30200,7 +30202,7 @@ index 70990740b6c..7f7104ffc82 100644
30200 fi 30202 fi
30201 fi 30203 fi
30202 fi 30204 fi
30203@@ -8268,12 +9268,23 @@ EOF 30205@@ -8290,12 +9289,23 @@ EOF
30204 *.la) 30206 *.la)
30205 func_basename "$deplib" 30207 func_basename "$deplib"
30206 name="$func_basename_result" 30208 name="$func_basename_result"
@@ -30227,7 +30229,7 @@ index 70990740b6c..7f7104ffc82 100644
30227 esac 30229 esac
30228 done 30230 done
30229 dependency_libs="$newdependency_libs" 30231 dependency_libs="$newdependency_libs"
30230@@ -8284,12 +9295,14 @@ EOF 30232@@ -8306,12 +9316,14 @@ EOF
30231 *.la) 30233 *.la)
30232 func_basename "$lib" 30234 func_basename "$lib"
30233 name="$func_basename_result" 30235 name="$func_basename_result"
@@ -30245,7 +30247,7 @@ index 70990740b6c..7f7104ffc82 100644
30245 esac 30247 esac
30246 done 30248 done
30247 dlfiles="$newdlfiles" 30249 dlfiles="$newdlfiles"
30248@@ -8303,10 +9316,11 @@ EOF 30250@@ -8325,10 +9337,11 @@ EOF
30249 # the library: 30251 # the library:
30250 func_basename "$lib" 30252 func_basename "$lib"
30251 name="$func_basename_result" 30253 name="$func_basename_result"
@@ -30259,7 +30261,7 @@ index 70990740b6c..7f7104ffc82 100644
30259 ;; 30261 ;;
30260 esac 30262 esac
30261 done 30263 done
30262@@ -8318,7 +9332,7 @@ EOF 30264@@ -8340,7 +9353,7 @@ EOF
30263 [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; 30265 [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
30264 *) abs=`pwd`"/$lib" ;; 30266 *) abs=`pwd`"/$lib" ;;
30265 esac 30267 esac
@@ -30268,7 +30270,7 @@ index 70990740b6c..7f7104ffc82 100644
30268 done 30270 done
30269 dlfiles="$newdlfiles" 30271 dlfiles="$newdlfiles"
30270 newdlprefiles= 30272 newdlprefiles=
30271@@ -8327,7 +9341,7 @@ EOF 30273@@ -8349,7 +9362,7 @@ EOF
30272 [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; 30274 [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
30273 *) abs=`pwd`"/$lib" ;; 30275 *) abs=`pwd`"/$lib" ;;
30274 esac 30276 esac
@@ -30277,7 +30279,7 @@ index 70990740b6c..7f7104ffc82 100644
30277 done 30279 done
30278 dlprefiles="$newdlprefiles" 30280 dlprefiles="$newdlprefiles"
30279 fi 30281 fi
30280@@ -8412,7 +9426,7 @@ relink_command=\"$relink_command\"" 30282@@ -8434,7 +9447,7 @@ relink_command=\"$relink_command\""
30281 exit $EXIT_SUCCESS 30283 exit $EXIT_SUCCESS
30282 } 30284 }
30283 30285
@@ -30286,7 +30288,7 @@ index 70990740b6c..7f7104ffc82 100644
30286 func_mode_link ${1+"$@"} 30288 func_mode_link ${1+"$@"}
30287 30289
30288 30290
30289@@ -8432,9 +9446,9 @@ func_mode_uninstall () 30291@@ -8454,9 +9467,9 @@ func_mode_uninstall ()
30290 for arg 30292 for arg
30291 do 30293 do
30292 case $arg in 30294 case $arg in
@@ -30299,7 +30301,7 @@ index 70990740b6c..7f7104ffc82 100644
30299 esac 30301 esac
30300 done 30302 done
30301 30303
30302@@ -8443,24 +9457,23 @@ func_mode_uninstall () 30304@@ -8465,24 +9478,23 @@ func_mode_uninstall ()
30303 30305
30304 rmdirs= 30306 rmdirs=
30305 30307
@@ -30331,7 +30333,7 @@ index 70990740b6c..7f7104ffc82 100644
30331 esac 30333 esac
30332 fi 30334 fi
30333 30335
30334@@ -8486,18 +9499,17 @@ func_mode_uninstall () 30336@@ -8508,18 +9520,17 @@ func_mode_uninstall ()
30335 30337
30336 # Delete the libtool libraries and symlinks. 30338 # Delete the libtool libraries and symlinks.
30337 for n in $library_names; do 30339 for n in $library_names; do
@@ -30356,7 +30358,7 @@ index 70990740b6c..7f7104ffc82 100644
30356 ;; 30358 ;;
30357 uninstall) 30359 uninstall)
30358 if test -n "$library_names"; then 30360 if test -n "$library_names"; then
30359@@ -8525,19 +9537,19 @@ func_mode_uninstall () 30361@@ -8547,19 +9558,19 @@ func_mode_uninstall ()
30360 # Add PIC object to the list of files to remove. 30362 # Add PIC object to the list of files to remove.
30361 if test -n "$pic_object" && 30363 if test -n "$pic_object" &&
30362 test "$pic_object" != none; then 30364 test "$pic_object" != none; then
@@ -30379,7 +30381,7 @@ index 70990740b6c..7f7104ffc82 100644
30379 noexename=$name 30381 noexename=$name
30380 case $file in 30382 case $file in
30381 *.exe) 30383 *.exe)
30382@@ -8547,7 +9559,7 @@ func_mode_uninstall () 30384@@ -8569,7 +9580,7 @@ func_mode_uninstall ()
30383 noexename=$func_stripname_result 30385 noexename=$func_stripname_result
30384 # $file with .exe has already been added to rmfiles, 30386 # $file with .exe has already been added to rmfiles,
30385 # add $file without .exe 30387 # add $file without .exe
@@ -30388,7 +30390,7 @@ index 70990740b6c..7f7104ffc82 100644
30388 ;; 30390 ;;
30389 esac 30391 esac
30390 # Do a test to see if this is a libtool program. 30392 # Do a test to see if this is a libtool program.
30391@@ -8556,7 +9568,7 @@ func_mode_uninstall () 30393@@ -8578,7 +9589,7 @@ func_mode_uninstall ()
30392 func_ltwrapper_scriptname "$file" 30394 func_ltwrapper_scriptname "$file"
30393 relink_command= 30395 relink_command=
30394 func_source $func_ltwrapper_scriptname_result 30396 func_source $func_ltwrapper_scriptname_result
@@ -30397,7 +30399,7 @@ index 70990740b6c..7f7104ffc82 100644
30397 else 30399 else
30398 relink_command= 30400 relink_command=
30399 func_source $dir/$noexename 30401 func_source $dir/$noexename
30400@@ -8564,12 +9576,12 @@ func_mode_uninstall () 30402@@ -8586,12 +9597,12 @@ func_mode_uninstall ()
30401 30403
30402 # note $name still contains .exe if it was in $file originally 30404 # note $name still contains .exe if it was in $file originally
30403 # as does the version of $file that was added into $rmfiles 30405 # as does the version of $file that was added into $rmfiles
@@ -30413,7 +30415,7 @@ index 70990740b6c..7f7104ffc82 100644
30413 fi 30415 fi
30414 fi 30416 fi
30415 fi 30417 fi
30416@@ -8577,7 +9589,6 @@ func_mode_uninstall () 30418@@ -8599,7 +9610,6 @@ func_mode_uninstall ()
30417 esac 30419 esac
30418 func_show_eval "$RM $rmfiles" 'exit_status=1' 30420 func_show_eval "$RM $rmfiles" 'exit_status=1'
30419 done 30421 done
@@ -30421,7 +30423,7 @@ index 70990740b6c..7f7104ffc82 100644
30421 30423
30422 # Try to remove the ${objdir}s in the directories where we deleted files 30424 # Try to remove the ${objdir}s in the directories where we deleted files
30423 for dir in $rmdirs; do 30425 for dir in $rmdirs; do
30424@@ -8589,16 +9600,16 @@ func_mode_uninstall () 30426@@ -8611,16 +9621,16 @@ func_mode_uninstall ()
30425 exit $exit_status 30427 exit $exit_status
30426 } 30428 }
30427 30429
@@ -30496,7 +30498,7 @@ index bf92b5e0790..c573da90c5c 100644
30496 # These exist entirely to fool aclocal when bootstrapping libtool. 30498 # These exist entirely to fool aclocal when bootstrapping libtool.
30497 # 30499 #
30498diff --git a/opcodes/Makefile.in b/opcodes/Makefile.in 30500diff --git a/opcodes/Makefile.in b/opcodes/Makefile.in
30499index 245479140c9..bfed90449bf 100644 30501index 4399354e5a9..4b1625febf3 100644
30500--- a/opcodes/Makefile.in 30502--- a/opcodes/Makefile.in
30501+++ b/opcodes/Makefile.in 30503+++ b/opcodes/Makefile.in
30502@@ -298,6 +298,7 @@ CYGPATH_W = @CYGPATH_W@ 30504@@ -298,6 +298,7 @@ CYGPATH_W = @CYGPATH_W@
@@ -30524,7 +30526,7 @@ index 245479140c9..bfed90449bf 100644
30524 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ 30526 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
30525 am__include = @am__include@ 30527 am__include = @am__include@
30526diff --git a/opcodes/configure b/opcodes/configure 30528diff --git a/opcodes/configure b/opcodes/configure
30527index 1660c3266a3..a1b84ed81f9 100755 30529index b326512ce3c..03f2b1bd64b 100755
30528--- a/opcodes/configure 30530--- a/opcodes/configure
30529+++ b/opcodes/configure 30531+++ b/opcodes/configure
30530@@ -688,6 +688,9 @@ OTOOL 30532@@ -688,6 +688,9 @@ OTOOL
@@ -30554,7 +30556,7 @@ index 1660c3266a3..a1b84ed81f9 100755
30554 30556
30555 Some influential environment variables: 30557 Some influential environment variables:
30556 CC C compiler command 30558 CC C compiler command
30557@@ -4997,8 +5003,8 @@ esac 30559@@ -4995,8 +5001,8 @@ esac
30558 30560
30559 30561
30560 30562
@@ -30565,7 +30567,7 @@ index 1660c3266a3..a1b84ed81f9 100755
30565 30567
30566 30568
30567 30569
30568@@ -5038,7 +5044,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO 30570@@ -5036,7 +5042,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
30569 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 30571 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
30570 $as_echo_n "checking how to print strings... " >&6; } 30572 $as_echo_n "checking how to print strings... " >&6; }
30571 # Test print first, because it will be a builtin if present. 30573 # Test print first, because it will be a builtin if present.
@@ -30574,7 +30576,7 @@ index 1660c3266a3..a1b84ed81f9 100755
30574 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then 30576 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
30575 ECHO='print -r --' 30577 ECHO='print -r --'
30576 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then 30578 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
30577@@ -5731,8 +5737,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; 30579@@ -5729,8 +5735,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6;
30578 # Try some XSI features 30580 # Try some XSI features
30579 xsi_shell=no 30581 xsi_shell=no
30580 ( _lt_dummy="a/b/c" 30582 ( _lt_dummy="a/b/c"
@@ -30585,7 +30587,7 @@ index 1660c3266a3..a1b84ed81f9 100755
30585 && eval 'test $(( 1 + 1 )) -eq 2 \ 30587 && eval 'test $(( 1 + 1 )) -eq 2 \
30586 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ 30588 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
30587 && xsi_shell=yes 30589 && xsi_shell=yes
30588@@ -5781,6 +5787,80 @@ esac 30590@@ -5779,6 +5785,80 @@ esac
30589 30591
30590 30592
30591 30593
@@ -30666,7 +30668,7 @@ index 1660c3266a3..a1b84ed81f9 100755
30666 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 30668 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
30667 $as_echo_n "checking for $LD option to reload object files... " >&6; } 30669 $as_echo_n "checking for $LD option to reload object files... " >&6; }
30668 if ${lt_cv_ld_reload_flag+:} false; then : 30670 if ${lt_cv_ld_reload_flag+:} false; then :
30669@@ -5797,6 +5877,11 @@ case $reload_flag in 30671@@ -5795,6 +5875,11 @@ case $reload_flag in
30670 esac 30672 esac
30671 reload_cmds='$LD$reload_flag -o $output$reload_objs' 30673 reload_cmds='$LD$reload_flag -o $output$reload_objs'
30672 case $host_os in 30674 case $host_os in
@@ -30678,7 +30680,7 @@ index 1660c3266a3..a1b84ed81f9 100755
30678 darwin*) 30680 darwin*)
30679 if test "$GCC" = yes; then 30681 if test "$GCC" = yes; then
30680 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' 30682 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
30681@@ -5965,7 +6050,8 @@ mingw* | pw32*) 30683@@ -5963,7 +6048,8 @@ mingw* | pw32*)
30682 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' 30684 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
30683 lt_cv_file_magic_cmd='func_win32_libid' 30685 lt_cv_file_magic_cmd='func_win32_libid'
30684 else 30686 else
@@ -30688,7 +30690,7 @@ index 1660c3266a3..a1b84ed81f9 100755
30688 lt_cv_file_magic_cmd='$OBJDUMP -f' 30690 lt_cv_file_magic_cmd='$OBJDUMP -f'
30689 fi 30691 fi
30690 ;; 30692 ;;
30691@@ -6124,6 +6210,21 @@ esac 30693@@ -6122,6 +6208,21 @@ esac
30692 fi 30694 fi
30693 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 30695 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
30694 $as_echo "$lt_cv_deplibs_check_method" >&6; } 30696 $as_echo "$lt_cv_deplibs_check_method" >&6; }
@@ -30710,7 +30712,7 @@ index 1660c3266a3..a1b84ed81f9 100755
30710 file_magic_cmd=$lt_cv_file_magic_cmd 30712 file_magic_cmd=$lt_cv_file_magic_cmd
30711 deplibs_check_method=$lt_cv_deplibs_check_method 30713 deplibs_check_method=$lt_cv_deplibs_check_method
30712 test -z "$deplibs_check_method" && deplibs_check_method=unknown 30714 test -z "$deplibs_check_method" && deplibs_check_method=unknown
30713@@ -6139,6 +6240,157 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown 30715@@ -6137,6 +6238,157 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
30714 30716
30715 30717
30716 30718
@@ -30868,7 +30870,7 @@ index 1660c3266a3..a1b84ed81f9 100755
30868 plugin_option= 30870 plugin_option=
30869 plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll" 30871 plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll"
30870 for plugin in $plugin_names; do 30872 for plugin in $plugin_names; do
30871@@ -6153,8 +6405,10 @@ for plugin in $plugin_names; do 30873@@ -6151,8 +6403,10 @@ for plugin in $plugin_names; do
30872 done 30874 done
30873 30875
30874 if test -n "$ac_tool_prefix"; then 30876 if test -n "$ac_tool_prefix"; then
@@ -30881,7 +30883,7 @@ index 1660c3266a3..a1b84ed81f9 100755
30881 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 30883 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
30882 $as_echo_n "checking for $ac_word... " >&6; } 30884 $as_echo_n "checking for $ac_word... " >&6; }
30883 if ${ac_cv_prog_AR+:} false; then : 30885 if ${ac_cv_prog_AR+:} false; then :
30884@@ -6170,7 +6424,7 @@ do 30886@@ -6168,7 +6422,7 @@ do
30885 test -z "$as_dir" && as_dir=. 30887 test -z "$as_dir" && as_dir=.
30886 for ac_exec_ext in '' $ac_executable_extensions; do 30888 for ac_exec_ext in '' $ac_executable_extensions; do
30887 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 30889 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
@@ -30890,7 +30892,7 @@ index 1660c3266a3..a1b84ed81f9 100755
30890 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 30892 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
30891 break 2 30893 break 2
30892 fi 30894 fi
30893@@ -6190,11 +6444,15 @@ $as_echo "no" >&6; } 30895@@ -6188,11 +6442,15 @@ $as_echo "no" >&6; }
30894 fi 30896 fi
30895 30897
30896 30898
@@ -30909,7 +30911,7 @@ index 1660c3266a3..a1b84ed81f9 100755
30909 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 30911 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
30910 $as_echo_n "checking for $ac_word... " >&6; } 30912 $as_echo_n "checking for $ac_word... " >&6; }
30911 if ${ac_cv_prog_ac_ct_AR+:} false; then : 30913 if ${ac_cv_prog_ac_ct_AR+:} false; then :
30912@@ -6210,7 +6468,7 @@ do 30914@@ -6208,7 +6466,7 @@ do
30913 test -z "$as_dir" && as_dir=. 30915 test -z "$as_dir" && as_dir=.
30914 for ac_exec_ext in '' $ac_executable_extensions; do 30916 for ac_exec_ext in '' $ac_executable_extensions; do
30915 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 30917 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
@@ -30918,7 +30920,7 @@ index 1660c3266a3..a1b84ed81f9 100755
30918 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 30920 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
30919 break 2 30921 break 2
30920 fi 30922 fi
30921@@ -6229,6 +6487,10 @@ else 30923@@ -6227,6 +6485,10 @@ else
30922 $as_echo "no" >&6; } 30924 $as_echo "no" >&6; }
30923 fi 30925 fi
30924 30926
@@ -30929,7 +30931,7 @@ index 1660c3266a3..a1b84ed81f9 100755
30929 if test "x$ac_ct_AR" = x; then 30931 if test "x$ac_ct_AR" = x; then
30930 AR="false" 30932 AR="false"
30931 else 30933 else
30932@@ -6240,25 +6502,20 @@ ac_tool_warned=yes ;; 30934@@ -6238,25 +6500,20 @@ ac_tool_warned=yes ;;
30933 esac 30935 esac
30934 AR=$ac_ct_AR 30936 AR=$ac_ct_AR
30935 fi 30937 fi
@@ -30965,7 +30967,7 @@ index 1660c3266a3..a1b84ed81f9 100755
30965 30967
30966 30968
30967 30969
30968@@ -6269,6 +6526,63 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru 30970@@ -6267,6 +6524,63 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru
30969 30971
30970 30972
30971 30973
@@ -31029,7 +31031,7 @@ index 1660c3266a3..a1b84ed81f9 100755
31029 31031
31030 if test -n "$ac_tool_prefix"; then 31032 if test -n "$ac_tool_prefix"; then
31031 # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. 31033 # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
31032@@ -6609,8 +6923,8 @@ esac 31034@@ -6607,8 +6921,8 @@ esac
31033 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" 31035 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
31034 31036
31035 # Transform an extracted symbol line into symbol name and symbol address 31037 # Transform an extracted symbol line into symbol name and symbol address
@@ -31040,7 +31042,7 @@ index 1660c3266a3..a1b84ed81f9 100755
31040 31042
31041 # Handle CRLF in mingw tool chain 31043 # Handle CRLF in mingw tool chain
31042 opt_cr= 31044 opt_cr=
31043@@ -6646,6 +6960,7 @@ for ac_symprfx in "" "_"; do 31045@@ -6644,6 +6958,7 @@ for ac_symprfx in "" "_"; do
31044 else 31046 else
31045 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" 31047 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
31046 fi 31048 fi
@@ -31048,7 +31050,7 @@ index 1660c3266a3..a1b84ed81f9 100755
31048 31050
31049 # Check to see that the pipe works correctly. 31051 # Check to see that the pipe works correctly.
31050 pipe_works=no 31052 pipe_works=no
31051@@ -6687,6 +7002,18 @@ _LT_EOF 31053@@ -6685,6 +7000,18 @@ _LT_EOF
31052 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then 31054 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
31053 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then 31055 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
31054 cat <<_LT_EOF > conftest.$ac_ext 31056 cat <<_LT_EOF > conftest.$ac_ext
@@ -31067,7 +31069,7 @@ index 1660c3266a3..a1b84ed81f9 100755
31067 #ifdef __cplusplus 31069 #ifdef __cplusplus
31068 extern "C" { 31070 extern "C" {
31069 #endif 31071 #endif
31070@@ -6698,7 +7025,7 @@ _LT_EOF 31072@@ -6696,7 +7023,7 @@ _LT_EOF
31071 cat <<_LT_EOF >> conftest.$ac_ext 31073 cat <<_LT_EOF >> conftest.$ac_ext
31072 31074
31073 /* The mapping between symbol names and symbols. */ 31075 /* The mapping between symbol names and symbols. */
@@ -31076,7 +31078,7 @@ index 1660c3266a3..a1b84ed81f9 100755
31076 const char *name; 31078 const char *name;
31077 void *address; 31079 void *address;
31078 } 31080 }
31079@@ -6724,8 +7051,8 @@ static const void *lt_preloaded_setup() { 31081@@ -6722,8 +7049,8 @@ static const void *lt_preloaded_setup() {
31080 _LT_EOF 31082 _LT_EOF
31081 # Now try linking the two files. 31083 # Now try linking the two files.
31082 mv conftest.$ac_objext conftstm.$ac_objext 31084 mv conftest.$ac_objext conftstm.$ac_objext
@@ -31087,7 +31089,7 @@ index 1660c3266a3..a1b84ed81f9 100755
31087 LIBS="conftstm.$ac_objext" 31089 LIBS="conftstm.$ac_objext"
31088 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" 31090 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
31089 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 31091 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
31090@@ -6735,8 +7062,8 @@ _LT_EOF 31092@@ -6733,8 +7060,8 @@ _LT_EOF
31091 test $ac_status = 0; } && test -s conftest${ac_exeext}; then 31093 test $ac_status = 0; } && test -s conftest${ac_exeext}; then
31092 pipe_works=yes 31094 pipe_works=yes
31093 fi 31095 fi
@@ -31098,7 +31100,7 @@ index 1660c3266a3..a1b84ed81f9 100755
31098 else 31100 else
31099 echo "cannot find nm_test_func in $nlist" >&5 31101 echo "cannot find nm_test_func in $nlist" >&5
31100 fi 31102 fi
31101@@ -6773,6 +7100,14 @@ else 31103@@ -6771,6 +7098,14 @@ else
31102 $as_echo "ok" >&6; } 31104 $as_echo "ok" >&6; }
31103 fi 31105 fi
31104 31106
@@ -31113,7 +31115,7 @@ index 1660c3266a3..a1b84ed81f9 100755
31113 31115
31114 31116
31115 31117
31116@@ -6791,6 +7126,47 @@ fi 31118@@ -6789,6 +7124,47 @@ fi
31117 31119
31118 31120
31119 31121
@@ -31161,7 +31163,7 @@ index 1660c3266a3..a1b84ed81f9 100755
31161 31163
31162 31164
31163 31165
31164@@ -7000,6 +7376,123 @@ esac 31166@@ -6998,6 +7374,123 @@ esac
31165 31167
31166 need_locks="$enable_libtool_lock" 31168 need_locks="$enable_libtool_lock"
31167 31169
@@ -31285,7 +31287,7 @@ index 1660c3266a3..a1b84ed81f9 100755
31285 31287
31286 case $host_os in 31288 case $host_os in
31287 rhapsody* | darwin*) 31289 rhapsody* | darwin*)
31288@@ -7563,6 +8056,8 @@ _LT_EOF 31290@@ -7561,6 +8054,8 @@ _LT_EOF
31289 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 31291 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
31290 echo "$AR cru libconftest.a conftest.o" >&5 31292 echo "$AR cru libconftest.a conftest.o" >&5
31291 $AR cru libconftest.a conftest.o 2>&5 31293 $AR cru libconftest.a conftest.o 2>&5
@@ -31294,7 +31296,7 @@ index 1660c3266a3..a1b84ed81f9 100755
31294 cat > conftest.c << _LT_EOF 31296 cat > conftest.c << _LT_EOF
31295 int main() { return 0;} 31297 int main() { return 0;}
31296 _LT_EOF 31298 _LT_EOF
31297@@ -8117,8 +8612,6 @@ fi 31299@@ -8115,8 +8610,6 @@ fi
31298 lt_prog_compiler_pic= 31300 lt_prog_compiler_pic=
31299 lt_prog_compiler_static= 31301 lt_prog_compiler_static=
31300 31302
@@ -31303,7 +31305,7 @@ index 1660c3266a3..a1b84ed81f9 100755
31303 31305
31304 if test "$GCC" = yes; then 31306 if test "$GCC" = yes; then
31305 lt_prog_compiler_wl='-Wl,' 31307 lt_prog_compiler_wl='-Wl,'
31306@@ -8284,6 +8777,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 31308@@ -8282,6 +8775,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
31307 lt_prog_compiler_pic='--shared' 31309 lt_prog_compiler_pic='--shared'
31308 lt_prog_compiler_static='--static' 31310 lt_prog_compiler_static='--static'
31309 ;; 31311 ;;
@@ -31316,7 +31318,7 @@ index 1660c3266a3..a1b84ed81f9 100755
31316 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) 31318 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
31317 # Portland Group compilers (*not* the Pentium gcc compiler, 31319 # Portland Group compilers (*not* the Pentium gcc compiler,
31318 # which looks to be a dead project) 31320 # which looks to be a dead project)
31319@@ -8346,7 +8845,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 31321@@ -8344,7 +8843,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
31320 lt_prog_compiler_pic='-KPIC' 31322 lt_prog_compiler_pic='-KPIC'
31321 lt_prog_compiler_static='-Bstatic' 31323 lt_prog_compiler_static='-Bstatic'
31322 case $cc_basename in 31324 case $cc_basename in
@@ -31325,7 +31327,7 @@ index 1660c3266a3..a1b84ed81f9 100755
31325 lt_prog_compiler_wl='-Qoption ld ';; 31327 lt_prog_compiler_wl='-Qoption ld ';;
31326 *) 31328 *)
31327 lt_prog_compiler_wl='-Wl,';; 31329 lt_prog_compiler_wl='-Wl,';;
31328@@ -8403,13 +8902,17 @@ case $host_os in 31330@@ -8401,13 +8900,17 @@ case $host_os in
31329 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" 31331 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
31330 ;; 31332 ;;
31331 esac 31333 esac
@@ -31349,7 +31351,7 @@ index 1660c3266a3..a1b84ed81f9 100755
31349 31351
31350 # 31352 #
31351 # Check to make sure the PIC flag actually works. 31353 # Check to make sure the PIC flag actually works.
31352@@ -8470,6 +8973,11 @@ fi 31354@@ -8468,6 +8971,11 @@ fi
31353 31355
31354 31356
31355 31357
@@ -31361,7 +31363,7 @@ index 1660c3266a3..a1b84ed81f9 100755
31361 # 31363 #
31362 # Check to make sure the static flag actually works. 31364 # Check to make sure the static flag actually works.
31363 # 31365 #
31364@@ -8820,7 +9328,8 @@ _LT_EOF 31366@@ -8818,7 +9326,8 @@ _LT_EOF
31365 allow_undefined_flag=unsupported 31367 allow_undefined_flag=unsupported
31366 always_export_symbols=no 31368 always_export_symbols=no
31367 enable_shared_with_static_runtimes=yes 31369 enable_shared_with_static_runtimes=yes
@@ -31371,7 +31373,7 @@ index 1660c3266a3..a1b84ed81f9 100755
31371 31373
31372 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then 31374 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
31373 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' 31375 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
31374@@ -8919,12 +9428,12 @@ _LT_EOF 31376@@ -8917,12 +9426,12 @@ _LT_EOF
31375 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' 31377 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
31376 hardcode_libdir_flag_spec= 31378 hardcode_libdir_flag_spec=
31377 hardcode_libdir_flag_spec_ld='-rpath $libdir' 31379 hardcode_libdir_flag_spec_ld='-rpath $libdir'
@@ -31386,7 +31388,7 @@ index 1660c3266a3..a1b84ed81f9 100755
31386 fi 31388 fi
31387 ;; 31389 ;;
31388 esac 31390 esac
31389@@ -8938,8 +9447,8 @@ _LT_EOF 31391@@ -8936,8 +9445,8 @@ _LT_EOF
31390 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' 31392 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
31391 wlarc= 31393 wlarc=
31392 else 31394 else
@@ -31397,7 +31399,7 @@ index 1660c3266a3..a1b84ed81f9 100755
31397 fi 31399 fi
31398 ;; 31400 ;;
31399 31401
31400@@ -8957,8 +9466,8 @@ _LT_EOF 31402@@ -8955,8 +9464,8 @@ _LT_EOF
31401 31403
31402 _LT_EOF 31404 _LT_EOF
31403 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 31405 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -31408,7 +31410,7 @@ index 1660c3266a3..a1b84ed81f9 100755
31408 else 31410 else
31409 ld_shlibs=no 31411 ld_shlibs=no
31410 fi 31412 fi
31411@@ -9004,8 +9513,8 @@ _LT_EOF 31413@@ -9002,8 +9511,8 @@ _LT_EOF
31412 31414
31413 *) 31415 *)
31414 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 31416 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -31419,7 +31421,7 @@ index 1660c3266a3..a1b84ed81f9 100755
31419 else 31421 else
31420 ld_shlibs=no 31422 ld_shlibs=no
31421 fi 31423 fi
31422@@ -9135,7 +9644,13 @@ _LT_EOF 31424@@ -9133,7 +9642,13 @@ _LT_EOF
31423 allow_undefined_flag='-berok' 31425 allow_undefined_flag='-berok'
31424 # Determine the default libpath from the value encoded in an 31426 # Determine the default libpath from the value encoded in an
31425 # empty executable. 31427 # empty executable.
@@ -31434,7 +31436,7 @@ index 1660c3266a3..a1b84ed81f9 100755
31434 /* end confdefs.h. */ 31436 /* end confdefs.h. */
31435 31437
31436 int 31438 int
31437@@ -9148,22 +9663,29 @@ main () 31439@@ -9146,22 +9661,29 @@ main ()
31438 _ACEOF 31440 _ACEOF
31439 if ac_fn_c_try_link "$LINENO"; then : 31441 if ac_fn_c_try_link "$LINENO"; then :
31440 31442
@@ -31477,7 +31479,7 @@ index 1660c3266a3..a1b84ed81f9 100755
31477 31479
31478 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 31480 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
31479 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" 31481 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"
31480@@ -9175,7 +9697,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 31482@@ -9173,7 +9695,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
31481 else 31483 else
31482 # Determine the default libpath from the value encoded in an 31484 # Determine the default libpath from the value encoded in an
31483 # empty executable. 31485 # empty executable.
@@ -31492,7 +31494,7 @@ index 1660c3266a3..a1b84ed81f9 100755
31492 /* end confdefs.h. */ 31494 /* end confdefs.h. */
31493 31495
31494 int 31496 int
31495@@ -9188,22 +9716,29 @@ main () 31497@@ -9186,22 +9714,29 @@ main ()
31496 _ACEOF 31498 _ACEOF
31497 if ac_fn_c_try_link "$LINENO"; then : 31499 if ac_fn_c_try_link "$LINENO"; then :
31498 31500
@@ -31535,7 +31537,7 @@ index 1660c3266a3..a1b84ed81f9 100755
31535 31537
31536 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 31538 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
31537 # Warning - without using the other run time loading flags, 31539 # Warning - without using the other run time loading flags,
31538@@ -9248,20 +9783,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 31540@@ -9246,20 +9781,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
31539 # Microsoft Visual C++. 31541 # Microsoft Visual C++.
31540 # hardcode_libdir_flag_spec is actually meaningless, as there is 31542 # hardcode_libdir_flag_spec is actually meaningless, as there is
31541 # no search path for DLLs. 31543 # no search path for DLLs.
@@ -31613,7 +31615,7 @@ index 1660c3266a3..a1b84ed81f9 100755
31613 ;; 31615 ;;
31614 31616
31615 darwin* | rhapsody*) 31617 darwin* | rhapsody*)
31616@@ -9322,7 +9900,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 31618@@ -9320,7 +9898,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
31617 31619
31618 # FreeBSD 3 and greater uses gcc -shared to do shared libraries. 31620 # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
31619 freebsd* | dragonfly*) 31621 freebsd* | dragonfly*)
@@ -31622,7 +31624,7 @@ index 1660c3266a3..a1b84ed81f9 100755
31622 hardcode_libdir_flag_spec='-R$libdir' 31624 hardcode_libdir_flag_spec='-R$libdir'
31623 hardcode_direct=yes 31625 hardcode_direct=yes
31624 hardcode_shlibpath_var=no 31626 hardcode_shlibpath_var=no
31625@@ -9330,7 +9908,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 31627@@ -9328,7 +9906,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
31626 31628
31627 hpux9*) 31629 hpux9*)
31628 if test "$GCC" = yes; then 31630 if test "$GCC" = yes; then
@@ -31631,7 +31633,7 @@ index 1660c3266a3..a1b84ed81f9 100755
31631 else 31633 else
31632 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' 31634 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'
31633 fi 31635 fi
31634@@ -9346,7 +9924,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 31636@@ -9344,7 +9922,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
31635 31637
31636 hpux10*) 31638 hpux10*)
31637 if test "$GCC" = yes && test "$with_gnu_ld" = no; then 31639 if test "$GCC" = yes && test "$with_gnu_ld" = no; then
@@ -31640,7 +31642,7 @@ index 1660c3266a3..a1b84ed81f9 100755
31640 else 31642 else
31641 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' 31643 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
31642 fi 31644 fi
31643@@ -9370,10 +9948,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 31645@@ -9368,10 +9946,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
31644 archive_cmds='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' 31646 archive_cmds='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
31645 ;; 31647 ;;
31646 ia64*) 31648 ia64*)
@@ -31653,7 +31655,7 @@ index 1660c3266a3..a1b84ed81f9 100755
31653 ;; 31655 ;;
31654 esac 31656 esac
31655 else 31657 else
31656@@ -9452,23 +10030,36 @@ fi 31658@@ -9450,23 +10028,36 @@ fi
31657 31659
31658 irix5* | irix6* | nonstopux*) 31660 irix5* | irix6* | nonstopux*)
31659 if test "$GCC" = yes; then 31661 if test "$GCC" = yes; then
@@ -31698,7 +31700,7 @@ index 1660c3266a3..a1b84ed81f9 100755
31698 else 31700 else
31699 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' 31701 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'
31700 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' 31702 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'
31701@@ -9553,7 +10144,7 @@ rm -f core conftest.err conftest.$ac_objext \ 31703@@ -9551,7 +10142,7 @@ rm -f core conftest.err conftest.$ac_objext \
31702 osf4* | osf5*) # as osf3* with the addition of -msym flag 31704 osf4* | osf5*) # as osf3* with the addition of -msym flag
31703 if test "$GCC" = yes; then 31705 if test "$GCC" = yes; then
31704 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' 31706 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
@@ -31707,7 +31709,7 @@ index 1660c3266a3..a1b84ed81f9 100755
31707 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' 31709 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
31708 else 31710 else
31709 allow_undefined_flag=' -expect_unresolved \*' 31711 allow_undefined_flag=' -expect_unresolved \*'
31710@@ -9572,9 +10163,9 @@ rm -f core conftest.err conftest.$ac_objext \ 31712@@ -9570,9 +10161,9 @@ rm -f core conftest.err conftest.$ac_objext \
31711 no_undefined_flag=' -z defs' 31713 no_undefined_flag=' -z defs'
31712 if test "$GCC" = yes; then 31714 if test "$GCC" = yes; then
31713 wlarc='${wl}' 31715 wlarc='${wl}'
@@ -31719,7 +31721,7 @@ index 1660c3266a3..a1b84ed81f9 100755
31719 else 31721 else
31720 case `$CC -V 2>&1` in 31722 case `$CC -V 2>&1` in
31721 *"Compilers 5.0"*) 31723 *"Compilers 5.0"*)
31722@@ -10150,8 +10741,9 @@ cygwin* | mingw* | pw32* | cegcc*) 31724@@ -10148,8 +10739,9 @@ cygwin* | mingw* | pw32* | cegcc*)
31723 need_version=no 31725 need_version=no
31724 need_lib_prefix=no 31726 need_lib_prefix=no
31725 31727
@@ -31731,7 +31733,7 @@ index 1660c3266a3..a1b84ed81f9 100755
31731 library_names_spec='$libname.dll.a' 31733 library_names_spec='$libname.dll.a'
31732 # DLL is installed to $(libdir)/../bin by postinstall_cmds 31734 # DLL is installed to $(libdir)/../bin by postinstall_cmds
31733 postinstall_cmds='base_file=`basename \${file}`~ 31735 postinstall_cmds='base_file=`basename \${file}`~
31734@@ -10184,13 +10776,71 @@ cygwin* | mingw* | pw32* | cegcc*) 31736@@ -10182,13 +10774,71 @@ cygwin* | mingw* | pw32* | cegcc*)
31735 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' 31737 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
31736 ;; 31738 ;;
31737 esac 31739 esac
@@ -31804,16 +31806,16 @@ index 1660c3266a3..a1b84ed81f9 100755
31804 # FIXME: first we should search . and the directory the executable is in 31806 # FIXME: first we should search . and the directory the executable is in
31805 shlibpath_var=PATH 31807 shlibpath_var=PATH
31806 ;; 31808 ;;
31807@@ -11092,7 +11742,7 @@ else 31809@@ -11090,7 +11740,7 @@ else
31808 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 31810 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
31809 lt_status=$lt_dlunknown 31811 lt_status=$lt_dlunknown
31810 cat > conftest.$ac_ext <<_LT_EOF 31812 cat > conftest.$ac_ext <<_LT_EOF
31811-#line 11095 "configure" 31813-#line 11093 "configure"
31812+#line $LINENO "configure" 31814+#line $LINENO "configure"
31813 #include "confdefs.h" 31815 #include "confdefs.h"
31814 31816
31815 #if HAVE_DLFCN_H 31817 #if HAVE_DLFCN_H
31816@@ -11136,10 +11786,10 @@ else 31818@@ -11134,10 +11784,10 @@ else
31817 /* When -fvisbility=hidden is used, assume the code has been annotated 31819 /* When -fvisbility=hidden is used, assume the code has been annotated
31818 correspondingly for the symbols needed. */ 31820 correspondingly for the symbols needed. */
31819 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 31821 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
@@ -31826,16 +31828,16 @@ index 1660c3266a3..a1b84ed81f9 100755
31826 int main () 31828 int main ()
31827 { 31829 {
31828 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 31830 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
31829@@ -11198,7 +11848,7 @@ else 31831@@ -11196,7 +11846,7 @@ else
31830 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 31832 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
31831 lt_status=$lt_dlunknown 31833 lt_status=$lt_dlunknown
31832 cat > conftest.$ac_ext <<_LT_EOF 31834 cat > conftest.$ac_ext <<_LT_EOF
31833-#line 11201 "configure" 31835-#line 11199 "configure"
31834+#line $LINENO "configure" 31836+#line $LINENO "configure"
31835 #include "confdefs.h" 31837 #include "confdefs.h"
31836 31838
31837 #if HAVE_DLFCN_H 31839 #if HAVE_DLFCN_H
31838@@ -11242,10 +11892,10 @@ else 31840@@ -11240,10 +11890,10 @@ else
31839 /* When -fvisbility=hidden is used, assume the code has been annotated 31841 /* When -fvisbility=hidden is used, assume the code has been annotated
31840 correspondingly for the symbols needed. */ 31842 correspondingly for the symbols needed. */
31841 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 31843 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
@@ -31848,7 +31850,7 @@ index 1660c3266a3..a1b84ed81f9 100755
31848 int main () 31850 int main ()
31849 { 31851 {
31850 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 31852 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
31851@@ -15351,13 +16001,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' 31853@@ -15348,13 +15998,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
31852 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' 31854 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
31853 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' 31855 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
31854 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' 31856 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
@@ -31869,7 +31871,7 @@ index 1660c3266a3..a1b84ed81f9 100755
31869 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' 31871 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
31870 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' 31872 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
31871 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' 31873 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
31872@@ -15372,14 +16029,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de 31874@@ -15369,14 +16026,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de
31873 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' 31875 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
31874 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' 31876 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
31875 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"`' 31877 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"`'
@@ -31888,7 +31890,7 @@ index 1660c3266a3..a1b84ed81f9 100755
31888 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' 31890 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
31889 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' 31891 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
31890 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' 31892 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
31891@@ -15412,12 +16072,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q 31893@@ -15409,12 +16069,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q
31892 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' 31894 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
31893 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' 31895 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
31894 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' 31896 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
@@ -31902,7 +31904,7 @@ index 1660c3266a3..a1b84ed81f9 100755
31902 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' 31904 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
31903 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' 31905 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
31904 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' 31906 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
31905@@ -15472,8 +16132,13 @@ reload_flag \ 31907@@ -15469,8 +16129,13 @@ reload_flag \
31906 OBJDUMP \ 31908 OBJDUMP \
31907 deplibs_check_method \ 31909 deplibs_check_method \
31908 file_magic_cmd \ 31910 file_magic_cmd \
@@ -31916,7 +31918,7 @@ index 1660c3266a3..a1b84ed81f9 100755
31916 STRIP \ 31918 STRIP \
31917 RANLIB \ 31919 RANLIB \
31918 CC \ 31920 CC \
31919@@ -15483,12 +16148,14 @@ lt_cv_sys_global_symbol_pipe \ 31921@@ -15480,12 +16145,14 @@ lt_cv_sys_global_symbol_pipe \
31920 lt_cv_sys_global_symbol_to_cdecl \ 31922 lt_cv_sys_global_symbol_to_cdecl \
31921 lt_cv_sys_global_symbol_to_c_name_address \ 31923 lt_cv_sys_global_symbol_to_c_name_address \
31922 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ 31924 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
@@ -31932,7 +31934,7 @@ index 1660c3266a3..a1b84ed81f9 100755
31932 DSYMUTIL \ 31934 DSYMUTIL \
31933 NMEDIT \ 31935 NMEDIT \
31934 LIPO \ 31936 LIPO \
31935@@ -15504,7 +16171,6 @@ no_undefined_flag \ 31937@@ -15501,7 +16168,6 @@ no_undefined_flag \
31936 hardcode_libdir_flag_spec \ 31938 hardcode_libdir_flag_spec \
31937 hardcode_libdir_flag_spec_ld \ 31939 hardcode_libdir_flag_spec_ld \
31938 hardcode_libdir_separator \ 31940 hardcode_libdir_separator \
@@ -31940,7 +31942,7 @@ index 1660c3266a3..a1b84ed81f9 100755
31940 exclude_expsyms \ 31942 exclude_expsyms \
31941 include_expsyms \ 31943 include_expsyms \
31942 file_list_spec \ 31944 file_list_spec \
31943@@ -15540,6 +16206,7 @@ module_cmds \ 31945@@ -15537,6 +16203,7 @@ module_cmds \
31944 module_expsym_cmds \ 31946 module_expsym_cmds \
31945 export_symbols_cmds \ 31947 export_symbols_cmds \
31946 prelink_cmds \ 31948 prelink_cmds \
@@ -31948,7 +31950,7 @@ index 1660c3266a3..a1b84ed81f9 100755
31948 postinstall_cmds \ 31950 postinstall_cmds \
31949 postuninstall_cmds \ 31951 postuninstall_cmds \
31950 finish_cmds \ 31952 finish_cmds \
31951@@ -16313,7 +16980,8 @@ $as_echo X"$file" | 31953@@ -16310,7 +16977,8 @@ $as_echo X"$file" |
31952 # NOTE: Changes made to this file will be lost: look at ltmain.sh. 31954 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
31953 # 31955 #
31954 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 31956 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
@@ -31958,7 +31960,7 @@ index 1660c3266a3..a1b84ed81f9 100755
31958 # Written by Gordon Matzigkeit, 1996 31960 # Written by Gordon Matzigkeit, 1996
31959 # 31961 #
31960 # This file is part of GNU Libtool. 31962 # This file is part of GNU Libtool.
31961@@ -16416,19 +17084,42 @@ SP2NL=$lt_lt_SP2NL 31963@@ -16413,19 +17081,42 @@ SP2NL=$lt_lt_SP2NL
31962 # turn newlines into spaces. 31964 # turn newlines into spaces.
31963 NL2SP=$lt_lt_NL2SP 31965 NL2SP=$lt_lt_NL2SP
31964 31966
@@ -32002,7 +32004,7 @@ index 1660c3266a3..a1b84ed81f9 100755
32002 # A symbol stripping program. 32004 # A symbol stripping program.
32003 STRIP=$lt_STRIP 32005 STRIP=$lt_STRIP
32004 32006
32005@@ -16458,6 +17149,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address 32007@@ -16455,6 +17146,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
32006 # Transform the output of nm in a C name address pair when lib prefix is needed. 32008 # Transform the output of nm in a C name address pair when lib prefix is needed.
32007 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix 32009 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
32008 32010
@@ -32015,7 +32017,7 @@ index 1660c3266a3..a1b84ed81f9 100755
32015 # The name of the directory that contains temporary libtool files. 32017 # The name of the directory that contains temporary libtool files.
32016 objdir=$objdir 32018 objdir=$objdir
32017 32019
32018@@ -16467,6 +17164,9 @@ MAGIC_CMD=$MAGIC_CMD 32020@@ -16464,6 +17161,9 @@ MAGIC_CMD=$MAGIC_CMD
32019 # Must we lock files when doing compilation? 32021 # Must we lock files when doing compilation?
32020 need_locks=$lt_need_locks 32022 need_locks=$lt_need_locks
32021 32023
@@ -32025,7 +32027,7 @@ index 1660c3266a3..a1b84ed81f9 100755
32025 # Tool to manipulate archived DWARF debug symbol files on Mac OS X. 32027 # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
32026 DSYMUTIL=$lt_DSYMUTIL 32028 DSYMUTIL=$lt_DSYMUTIL
32027 32029
32028@@ -16581,12 +17281,12 @@ with_gcc=$GCC 32030@@ -16578,12 +17278,12 @@ with_gcc=$GCC
32029 # Compiler flag to turn off builtin functions. 32031 # Compiler flag to turn off builtin functions.
32030 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag 32032 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
32031 32033
@@ -32041,7 +32043,7 @@ index 1660c3266a3..a1b84ed81f9 100755
32041 # Compiler flag to prevent dynamic linking. 32043 # Compiler flag to prevent dynamic linking.
32042 link_static_flag=$lt_lt_prog_compiler_static 32044 link_static_flag=$lt_lt_prog_compiler_static
32043 32045
32044@@ -16673,9 +17373,6 @@ inherit_rpath=$inherit_rpath 32046@@ -16670,9 +17370,6 @@ inherit_rpath=$inherit_rpath
32045 # Whether libtool must link a program against all its dependency libraries. 32047 # Whether libtool must link a program against all its dependency libraries.
32046 link_all_deplibs=$link_all_deplibs 32048 link_all_deplibs=$link_all_deplibs
32047 32049
@@ -32051,7 +32053,7 @@ index 1660c3266a3..a1b84ed81f9 100755
32051 # Set to "yes" if exported symbols are required. 32053 # Set to "yes" if exported symbols are required.
32052 always_export_symbols=$always_export_symbols 32054 always_export_symbols=$always_export_symbols
32053 32055
32054@@ -16691,6 +17388,9 @@ include_expsyms=$lt_include_expsyms 32056@@ -16688,6 +17385,9 @@ include_expsyms=$lt_include_expsyms
32055 # Commands necessary for linking programs (against libraries) with templates. 32057 # Commands necessary for linking programs (against libraries) with templates.
32056 prelink_cmds=$lt_prelink_cmds 32058 prelink_cmds=$lt_prelink_cmds
32057 32059
@@ -32061,7 +32063,7 @@ index 1660c3266a3..a1b84ed81f9 100755
32061 # Specify filename containing input files. 32063 # Specify filename containing input files.
32062 file_list_spec=$lt_file_list_spec 32064 file_list_spec=$lt_file_list_spec
32063 32065
32064@@ -16723,210 +17423,169 @@ ltmain="$ac_aux_dir/ltmain.sh" 32066@@ -16720,210 +17420,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
32065 # if finds mixed CR/LF and LF-only lines. Since sed operates in 32067 # if finds mixed CR/LF and LF-only lines. Since sed operates in
32066 # text mode, it properly converts lines to CR/LF. This bash problem 32068 # text mode, it properly converts lines to CR/LF. This bash problem
32067 # is reportedly fixed, but why not run on old versions too? 32069 # is reportedly fixed, but why not run on old versions too?
@@ -32436,7 +32438,7 @@ index 1660c3266a3..a1b84ed81f9 100755
32436 chmod +x "$ofile" 32438 chmod +x "$ofile"
32437 32439
32438diff --git a/zlib/Makefile.in b/zlib/Makefile.in 32440diff --git a/zlib/Makefile.in b/zlib/Makefile.in
32439index dd8a21deba1..28628282c56 100644 32441index 951260ac4c5..9398823cc09 100644
32440--- a/zlib/Makefile.in 32442--- a/zlib/Makefile.in
32441+++ b/zlib/Makefile.in 32443+++ b/zlib/Makefile.in
32442@@ -281,6 +281,7 @@ CPPFLAGS = @CPPFLAGS@ 32444@@ -281,6 +281,7 @@ CPPFLAGS = @CPPFLAGS@
@@ -32464,7 +32466,7 @@ index dd8a21deba1..28628282c56 100644
32464 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ 32466 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
32465 am__include = @am__include@ 32467 am__include = @am__include@
32466diff --git a/zlib/configure b/zlib/configure 32468diff --git a/zlib/configure b/zlib/configure
32467index 2d551360683..e01d0a70438 100755 32469index cae55c5ca49..24193ee5db7 100755
32468--- a/zlib/configure 32470--- a/zlib/configure
32469+++ b/zlib/configure 32471+++ b/zlib/configure
32470@@ -648,8 +648,11 @@ OTOOL 32472@@ -648,8 +648,11 @@ OTOOL
@@ -32496,7 +32498,7 @@ index 2d551360683..e01d0a70438 100755
32496 32498
32497 Some influential environment variables: 32499 Some influential environment variables:
32498 CC C compiler command 32500 CC C compiler command
32499@@ -4190,8 +4196,8 @@ esac 32501@@ -4189,8 +4195,8 @@ esac
32500 32502
32501 32503
32502 32504
@@ -32507,7 +32509,7 @@ index 2d551360683..e01d0a70438 100755
32507 32509
32508 32510
32509 32511
32510@@ -4231,7 +4237,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO 32512@@ -4230,7 +4236,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
32511 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 32513 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
32512 $as_echo_n "checking how to print strings... " >&6; } 32514 $as_echo_n "checking how to print strings... " >&6; }
32513 # Test print first, because it will be a builtin if present. 32515 # Test print first, because it will be a builtin if present.
@@ -32516,7 +32518,7 @@ index 2d551360683..e01d0a70438 100755
32516 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then 32518 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
32517 ECHO='print -r --' 32519 ECHO='print -r --'
32518 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then 32520 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
32519@@ -5054,8 +5060,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; 32521@@ -5053,8 +5059,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6;
32520 # Try some XSI features 32522 # Try some XSI features
32521 xsi_shell=no 32523 xsi_shell=no
32522 ( _lt_dummy="a/b/c" 32524 ( _lt_dummy="a/b/c"
@@ -32527,7 +32529,7 @@ index 2d551360683..e01d0a70438 100755
32527 && eval 'test $(( 1 + 1 )) -eq 2 \ 32529 && eval 'test $(( 1 + 1 )) -eq 2 \
32528 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ 32530 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
32529 && xsi_shell=yes 32531 && xsi_shell=yes
32530@@ -5104,6 +5110,80 @@ esac 32532@@ -5103,6 +5109,80 @@ esac
32531 32533
32532 32534
32533 32535
@@ -32608,7 +32610,7 @@ index 2d551360683..e01d0a70438 100755
32608 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 32610 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
32609 $as_echo_n "checking for $LD option to reload object files... " >&6; } 32611 $as_echo_n "checking for $LD option to reload object files... " >&6; }
32610 if ${lt_cv_ld_reload_flag+:} false; then : 32612 if ${lt_cv_ld_reload_flag+:} false; then :
32611@@ -5120,6 +5200,11 @@ case $reload_flag in 32613@@ -5119,6 +5199,11 @@ case $reload_flag in
32612 esac 32614 esac
32613 reload_cmds='$LD$reload_flag -o $output$reload_objs' 32615 reload_cmds='$LD$reload_flag -o $output$reload_objs'
32614 case $host_os in 32616 case $host_os in
@@ -32620,7 +32622,7 @@ index 2d551360683..e01d0a70438 100755
32620 darwin*) 32622 darwin*)
32621 if test "$GCC" = yes; then 32623 if test "$GCC" = yes; then
32622 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' 32624 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
32623@@ -5288,7 +5373,8 @@ mingw* | pw32*) 32625@@ -5287,7 +5372,8 @@ mingw* | pw32*)
32624 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' 32626 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
32625 lt_cv_file_magic_cmd='func_win32_libid' 32627 lt_cv_file_magic_cmd='func_win32_libid'
32626 else 32628 else
@@ -32630,7 +32632,7 @@ index 2d551360683..e01d0a70438 100755
32630 lt_cv_file_magic_cmd='$OBJDUMP -f' 32632 lt_cv_file_magic_cmd='$OBJDUMP -f'
32631 fi 32633 fi
32632 ;; 32634 ;;
32633@@ -5447,6 +5533,21 @@ esac 32635@@ -5446,6 +5532,21 @@ esac
32634 fi 32636 fi
32635 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 32637 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
32636 $as_echo "$lt_cv_deplibs_check_method" >&6; } 32638 $as_echo "$lt_cv_deplibs_check_method" >&6; }
@@ -32652,7 +32654,7 @@ index 2d551360683..e01d0a70438 100755
32652 file_magic_cmd=$lt_cv_file_magic_cmd 32654 file_magic_cmd=$lt_cv_file_magic_cmd
32653 deplibs_check_method=$lt_cv_deplibs_check_method 32655 deplibs_check_method=$lt_cv_deplibs_check_method
32654 test -z "$deplibs_check_method" && deplibs_check_method=unknown 32656 test -z "$deplibs_check_method" && deplibs_check_method=unknown
32655@@ -5462,6 +5563,158 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown 32657@@ -5461,6 +5562,158 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
32656 32658
32657 32659
32658 32660
@@ -32811,7 +32813,7 @@ index 2d551360683..e01d0a70438 100755
32811 plugin_option= 32813 plugin_option=
32812 plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll" 32814 plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll"
32813 for plugin in $plugin_names; do 32815 for plugin in $plugin_names; do
32814@@ -5476,8 +5729,10 @@ for plugin in $plugin_names; do 32816@@ -5475,8 +5728,10 @@ for plugin in $plugin_names; do
32815 done 32817 done
32816 32818
32817 if test -n "$ac_tool_prefix"; then 32819 if test -n "$ac_tool_prefix"; then
@@ -32824,7 +32826,7 @@ index 2d551360683..e01d0a70438 100755
32824 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 32826 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
32825 $as_echo_n "checking for $ac_word... " >&6; } 32827 $as_echo_n "checking for $ac_word... " >&6; }
32826 if ${ac_cv_prog_AR+:} false; then : 32828 if ${ac_cv_prog_AR+:} false; then :
32827@@ -5493,7 +5748,7 @@ do 32829@@ -5492,7 +5747,7 @@ do
32828 test -z "$as_dir" && as_dir=. 32830 test -z "$as_dir" && as_dir=.
32829 for ac_exec_ext in '' $ac_executable_extensions; do 32831 for ac_exec_ext in '' $ac_executable_extensions; do
32830 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 32832 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
@@ -32833,7 +32835,7 @@ index 2d551360683..e01d0a70438 100755
32833 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 32835 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
32834 break 2 32836 break 2
32835 fi 32837 fi
32836@@ -5513,11 +5768,15 @@ $as_echo "no" >&6; } 32838@@ -5512,11 +5767,15 @@ $as_echo "no" >&6; }
32837 fi 32839 fi
32838 32840
32839 32841
@@ -32852,7 +32854,7 @@ index 2d551360683..e01d0a70438 100755
32852 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 32854 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
32853 $as_echo_n "checking for $ac_word... " >&6; } 32855 $as_echo_n "checking for $ac_word... " >&6; }
32854 if ${ac_cv_prog_ac_ct_AR+:} false; then : 32856 if ${ac_cv_prog_ac_ct_AR+:} false; then :
32855@@ -5533,7 +5792,7 @@ do 32857@@ -5532,7 +5791,7 @@ do
32856 test -z "$as_dir" && as_dir=. 32858 test -z "$as_dir" && as_dir=.
32857 for ac_exec_ext in '' $ac_executable_extensions; do 32859 for ac_exec_ext in '' $ac_executable_extensions; do
32858 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 32860 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
@@ -32861,7 +32863,7 @@ index 2d551360683..e01d0a70438 100755
32861 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 32863 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
32862 break 2 32864 break 2
32863 fi 32865 fi
32864@@ -5552,6 +5811,10 @@ else 32866@@ -5551,6 +5810,10 @@ else
32865 $as_echo "no" >&6; } 32867 $as_echo "no" >&6; }
32866 fi 32868 fi
32867 32869
@@ -32872,7 +32874,7 @@ index 2d551360683..e01d0a70438 100755
32872 if test "x$ac_ct_AR" = x; then 32874 if test "x$ac_ct_AR" = x; then
32873 AR="false" 32875 AR="false"
32874 else 32876 else
32875@@ -5563,25 +5826,19 @@ ac_tool_warned=yes ;; 32877@@ -5562,25 +5825,19 @@ ac_tool_warned=yes ;;
32876 esac 32878 esac
32877 AR=$ac_ct_AR 32879 AR=$ac_ct_AR
32878 fi 32880 fi
@@ -32907,7 +32909,7 @@ index 2d551360683..e01d0a70438 100755
32907 32909
32908 32910
32909 32911
32910@@ -5593,6 +5850,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru 32912@@ -5592,6 +5849,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru
32911 32913
32912 32914
32913 32915
@@ -32972,7 +32974,7 @@ index 2d551360683..e01d0a70438 100755
32972 if test -n "$ac_tool_prefix"; then 32974 if test -n "$ac_tool_prefix"; then
32973 # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. 32975 # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
32974 set dummy ${ac_tool_prefix}strip; ac_word=$2 32976 set dummy ${ac_tool_prefix}strip; ac_word=$2
32975@@ -5932,8 +6247,8 @@ esac 32977@@ -5931,8 +6246,8 @@ esac
32976 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" 32978 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
32977 32979
32978 # Transform an extracted symbol line into symbol name and symbol address 32980 # Transform an extracted symbol line into symbol name and symbol address
@@ -32983,7 +32985,7 @@ index 2d551360683..e01d0a70438 100755
32983 32985
32984 # Handle CRLF in mingw tool chain 32986 # Handle CRLF in mingw tool chain
32985 opt_cr= 32987 opt_cr=
32986@@ -5969,6 +6284,7 @@ for ac_symprfx in "" "_"; do 32988@@ -5968,6 +6283,7 @@ for ac_symprfx in "" "_"; do
32987 else 32989 else
32988 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" 32990 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
32989 fi 32991 fi
@@ -32991,7 +32993,7 @@ index 2d551360683..e01d0a70438 100755
32991 32993
32992 # Check to see that the pipe works correctly. 32994 # Check to see that the pipe works correctly.
32993 pipe_works=no 32995 pipe_works=no
32994@@ -6010,6 +6326,18 @@ _LT_EOF 32996@@ -6009,6 +6325,18 @@ _LT_EOF
32995 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then 32997 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
32996 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then 32998 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
32997 cat <<_LT_EOF > conftest.$ac_ext 32999 cat <<_LT_EOF > conftest.$ac_ext
@@ -33010,7 +33012,7 @@ index 2d551360683..e01d0a70438 100755
33010 #ifdef __cplusplus 33012 #ifdef __cplusplus
33011 extern "C" { 33013 extern "C" {
33012 #endif 33014 #endif
33013@@ -6021,7 +6349,7 @@ _LT_EOF 33015@@ -6020,7 +6348,7 @@ _LT_EOF
33014 cat <<_LT_EOF >> conftest.$ac_ext 33016 cat <<_LT_EOF >> conftest.$ac_ext
33015 33017
33016 /* The mapping between symbol names and symbols. */ 33018 /* The mapping between symbol names and symbols. */
@@ -33019,7 +33021,7 @@ index 2d551360683..e01d0a70438 100755
33019 const char *name; 33021 const char *name;
33020 void *address; 33022 void *address;
33021 } 33023 }
33022@@ -6047,8 +6375,8 @@ static const void *lt_preloaded_setup() { 33024@@ -6046,8 +6374,8 @@ static const void *lt_preloaded_setup() {
33023 _LT_EOF 33025 _LT_EOF
33024 # Now try linking the two files. 33026 # Now try linking the two files.
33025 mv conftest.$ac_objext conftstm.$ac_objext 33027 mv conftest.$ac_objext conftstm.$ac_objext
@@ -33030,7 +33032,7 @@ index 2d551360683..e01d0a70438 100755
33030 LIBS="conftstm.$ac_objext" 33032 LIBS="conftstm.$ac_objext"
33031 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" 33033 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
33032 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 33034 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
33033@@ -6058,8 +6386,8 @@ _LT_EOF 33035@@ -6057,8 +6385,8 @@ _LT_EOF
33034 test $ac_status = 0; } && test -s conftest${ac_exeext}; then 33036 test $ac_status = 0; } && test -s conftest${ac_exeext}; then
33035 pipe_works=yes 33037 pipe_works=yes
33036 fi 33038 fi
@@ -33041,7 +33043,7 @@ index 2d551360683..e01d0a70438 100755
33041 else 33043 else
33042 echo "cannot find nm_test_func in $nlist" >&5 33044 echo "cannot find nm_test_func in $nlist" >&5
33043 fi 33045 fi
33044@@ -6096,6 +6424,17 @@ else 33046@@ -6095,6 +6423,17 @@ else
33045 $as_echo "ok" >&6; } 33047 $as_echo "ok" >&6; }
33046 fi 33048 fi
33047 33049
@@ -33059,7 +33061,7 @@ index 2d551360683..e01d0a70438 100755
33059 33061
33060 33062
33061 33063
33062@@ -6113,6 +6452,43 @@ fi 33064@@ -6112,6 +6451,43 @@ fi
33063 33065
33064 33066
33065 33067
@@ -33103,7 +33105,7 @@ index 2d551360683..e01d0a70438 100755
33103 33105
33104 33106
33105 33107
33106@@ -6327,6 +6703,123 @@ esac 33108@@ -6326,6 +6702,123 @@ esac
33107 33109
33108 need_locks="$enable_libtool_lock" 33110 need_locks="$enable_libtool_lock"
33109 33111
@@ -33227,7 +33229,7 @@ index 2d551360683..e01d0a70438 100755
33227 33229
33228 case $host_os in 33230 case $host_os in
33229 rhapsody* | darwin*) 33231 rhapsody* | darwin*)
33230@@ -6893,6 +7386,8 @@ _LT_EOF 33232@@ -6892,6 +7385,8 @@ _LT_EOF
33231 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 33233 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
33232 echo "$AR cru libconftest.a conftest.o" >&5 33234 echo "$AR cru libconftest.a conftest.o" >&5
33233 $AR cru libconftest.a conftest.o 2>&5 33235 $AR cru libconftest.a conftest.o 2>&5
@@ -33236,7 +33238,7 @@ index 2d551360683..e01d0a70438 100755
33236 cat > conftest.c << _LT_EOF 33238 cat > conftest.c << _LT_EOF
33237 int main() { return 0;} 33239 int main() { return 0;}
33238 _LT_EOF 33240 _LT_EOF
33239@@ -7744,8 +8239,6 @@ fi 33241@@ -7743,8 +8238,6 @@ fi
33240 lt_prog_compiler_pic= 33242 lt_prog_compiler_pic=
33241 lt_prog_compiler_static= 33243 lt_prog_compiler_static=
33242 33244
@@ -33245,7 +33247,7 @@ index 2d551360683..e01d0a70438 100755
33245 33247
33246 if test "$GCC" = yes; then 33248 if test "$GCC" = yes; then
33247 lt_prog_compiler_wl='-Wl,' 33249 lt_prog_compiler_wl='-Wl,'
33248@@ -7911,6 +8404,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 33250@@ -7910,6 +8403,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
33249 lt_prog_compiler_pic='--shared' 33251 lt_prog_compiler_pic='--shared'
33250 lt_prog_compiler_static='--static' 33252 lt_prog_compiler_static='--static'
33251 ;; 33253 ;;
@@ -33258,7 +33260,7 @@ index 2d551360683..e01d0a70438 100755
33258 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) 33260 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
33259 # Portland Group compilers (*not* the Pentium gcc compiler, 33261 # Portland Group compilers (*not* the Pentium gcc compiler,
33260 # which looks to be a dead project) 33262 # which looks to be a dead project)
33261@@ -7973,7 +8472,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 33263@@ -7972,7 +8471,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
33262 lt_prog_compiler_pic='-KPIC' 33264 lt_prog_compiler_pic='-KPIC'
33263 lt_prog_compiler_static='-Bstatic' 33265 lt_prog_compiler_static='-Bstatic'
33264 case $cc_basename in 33266 case $cc_basename in
@@ -33267,7 +33269,7 @@ index 2d551360683..e01d0a70438 100755
33267 lt_prog_compiler_wl='-Qoption ld ';; 33269 lt_prog_compiler_wl='-Qoption ld ';;
33268 *) 33270 *)
33269 lt_prog_compiler_wl='-Wl,';; 33271 lt_prog_compiler_wl='-Wl,';;
33270@@ -8030,13 +8529,17 @@ case $host_os in 33272@@ -8029,13 +8528,17 @@ case $host_os in
33271 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" 33273 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
33272 ;; 33274 ;;
33273 esac 33275 esac
@@ -33291,7 +33293,7 @@ index 2d551360683..e01d0a70438 100755
33291 33293
33292 # 33294 #
33293 # Check to make sure the PIC flag actually works. 33295 # Check to make sure the PIC flag actually works.
33294@@ -8097,6 +8600,11 @@ fi 33296@@ -8096,6 +8599,11 @@ fi
33295 33297
33296 33298
33297 33299
@@ -33303,7 +33305,7 @@ index 2d551360683..e01d0a70438 100755
33303 # 33305 #
33304 # Check to make sure the static flag actually works. 33306 # Check to make sure the static flag actually works.
33305 # 33307 #
33306@@ -8447,7 +8955,8 @@ _LT_EOF 33308@@ -8446,7 +8954,8 @@ _LT_EOF
33307 allow_undefined_flag=unsupported 33309 allow_undefined_flag=unsupported
33308 always_export_symbols=no 33310 always_export_symbols=no
33309 enable_shared_with_static_runtimes=yes 33311 enable_shared_with_static_runtimes=yes
@@ -33313,7 +33315,7 @@ index 2d551360683..e01d0a70438 100755
33313 33315
33314 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then 33316 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
33315 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' 33317 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
33316@@ -8546,12 +9055,12 @@ _LT_EOF 33318@@ -8545,12 +9054,12 @@ _LT_EOF
33317 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' 33319 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
33318 hardcode_libdir_flag_spec= 33320 hardcode_libdir_flag_spec=
33319 hardcode_libdir_flag_spec_ld='-rpath $libdir' 33321 hardcode_libdir_flag_spec_ld='-rpath $libdir'
@@ -33328,7 +33330,7 @@ index 2d551360683..e01d0a70438 100755
33328 fi 33330 fi
33329 ;; 33331 ;;
33330 esac 33332 esac
33331@@ -8565,8 +9074,8 @@ _LT_EOF 33333@@ -8564,8 +9073,8 @@ _LT_EOF
33332 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' 33334 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
33333 wlarc= 33335 wlarc=
33334 else 33336 else
@@ -33339,7 +33341,7 @@ index 2d551360683..e01d0a70438 100755
33339 fi 33341 fi
33340 ;; 33342 ;;
33341 33343
33342@@ -8584,8 +9093,8 @@ _LT_EOF 33344@@ -8583,8 +9092,8 @@ _LT_EOF
33343 33345
33344 _LT_EOF 33346 _LT_EOF
33345 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 33347 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -33350,7 +33352,7 @@ index 2d551360683..e01d0a70438 100755
33350 else 33352 else
33351 ld_shlibs=no 33353 ld_shlibs=no
33352 fi 33354 fi
33353@@ -8631,8 +9140,8 @@ _LT_EOF 33355@@ -8630,8 +9139,8 @@ _LT_EOF
33354 33356
33355 *) 33357 *)
33356 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 33358 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -33361,7 +33363,7 @@ index 2d551360683..e01d0a70438 100755
33361 else 33363 else
33362 ld_shlibs=no 33364 ld_shlibs=no
33363 fi 33365 fi
33364@@ -8762,7 +9271,13 @@ _LT_EOF 33366@@ -8761,7 +9270,13 @@ _LT_EOF
33365 allow_undefined_flag='-berok' 33367 allow_undefined_flag='-berok'
33366 # Determine the default libpath from the value encoded in an 33368 # Determine the default libpath from the value encoded in an
33367 # empty executable. 33369 # empty executable.
@@ -33376,7 +33378,7 @@ index 2d551360683..e01d0a70438 100755
33376 as_fn_error $? "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5 33378 as_fn_error $? "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5
33377 fi 33379 fi
33378 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 33380 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
33379@@ -8778,22 +9293,29 @@ main () 33381@@ -8777,22 +9292,29 @@ main ()
33380 _ACEOF 33382 _ACEOF
33381 if ac_fn_c_try_link "$LINENO"; then : 33383 if ac_fn_c_try_link "$LINENO"; then :
33382 33384
@@ -33419,7 +33421,7 @@ index 2d551360683..e01d0a70438 100755
33419 33421
33420 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 33422 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
33421 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" 33423 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"
33422@@ -8805,7 +9327,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 33424@@ -8804,7 +9326,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
33423 else 33425 else
33424 # Determine the default libpath from the value encoded in an 33426 # Determine the default libpath from the value encoded in an
33425 # empty executable. 33427 # empty executable.
@@ -33434,7 +33436,7 @@ index 2d551360683..e01d0a70438 100755
33434 as_fn_error $? "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5 33436 as_fn_error $? "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5
33435 fi 33437 fi
33436 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 33438 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
33437@@ -8821,22 +9349,29 @@ main () 33439@@ -8820,22 +9348,29 @@ main ()
33438 _ACEOF 33440 _ACEOF
33439 if ac_fn_c_try_link "$LINENO"; then : 33441 if ac_fn_c_try_link "$LINENO"; then :
33440 33442
@@ -33477,7 +33479,7 @@ index 2d551360683..e01d0a70438 100755
33477 33479
33478 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 33480 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
33479 # Warning - without using the other run time loading flags, 33481 # Warning - without using the other run time loading flags,
33480@@ -8881,20 +9416,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 33482@@ -8880,20 +9415,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
33481 # Microsoft Visual C++. 33483 # Microsoft Visual C++.
33482 # hardcode_libdir_flag_spec is actually meaningless, as there is 33484 # hardcode_libdir_flag_spec is actually meaningless, as there is
33483 # no search path for DLLs. 33485 # no search path for DLLs.
@@ -33555,7 +33557,7 @@ index 2d551360683..e01d0a70438 100755
33555 ;; 33557 ;;
33556 33558
33557 darwin* | rhapsody*) 33559 darwin* | rhapsody*)
33558@@ -8955,7 +9533,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 33560@@ -8954,7 +9532,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
33559 33561
33560 # FreeBSD 3 and greater uses gcc -shared to do shared libraries. 33562 # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
33561 freebsd* | dragonfly*) 33563 freebsd* | dragonfly*)
@@ -33564,7 +33566,7 @@ index 2d551360683..e01d0a70438 100755
33564 hardcode_libdir_flag_spec='-R$libdir' 33566 hardcode_libdir_flag_spec='-R$libdir'
33565 hardcode_direct=yes 33567 hardcode_direct=yes
33566 hardcode_shlibpath_var=no 33568 hardcode_shlibpath_var=no
33567@@ -8963,7 +9541,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 33569@@ -8962,7 +9540,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
33568 33570
33569 hpux9*) 33571 hpux9*)
33570 if test "$GCC" = yes; then 33572 if test "$GCC" = yes; then
@@ -33573,7 +33575,7 @@ index 2d551360683..e01d0a70438 100755
33573 else 33575 else
33574 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' 33576 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'
33575 fi 33577 fi
33576@@ -8979,7 +9557,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 33578@@ -8978,7 +9556,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
33577 33579
33578 hpux10*) 33580 hpux10*)
33579 if test "$GCC" = yes && test "$with_gnu_ld" = no; then 33581 if test "$GCC" = yes && test "$with_gnu_ld" = no; then
@@ -33582,7 +33584,7 @@ index 2d551360683..e01d0a70438 100755
33582 else 33584 else
33583 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' 33585 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
33584 fi 33586 fi
33585@@ -9003,10 +9581,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 33587@@ -9002,10 +9580,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
33586 archive_cmds='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' 33588 archive_cmds='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
33587 ;; 33589 ;;
33588 ia64*) 33590 ia64*)
@@ -33595,7 +33597,7 @@ index 2d551360683..e01d0a70438 100755
33595 ;; 33597 ;;
33596 esac 33598 esac
33597 else 33599 else
33598@@ -9085,26 +9663,39 @@ fi 33600@@ -9084,26 +9662,39 @@ fi
33599 33601
33600 irix5* | irix6* | nonstopux*) 33602 irix5* | irix6* | nonstopux*)
33601 if test "$GCC" = yes; then 33603 if test "$GCC" = yes; then
@@ -33643,7 +33645,7 @@ index 2d551360683..e01d0a70438 100755
33643 else 33645 else
33644 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' 33646 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'
33645 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' 33647 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'
33646@@ -9189,7 +9780,7 @@ rm -f core conftest.err conftest.$ac_objext \ 33648@@ -9188,7 +9779,7 @@ rm -f core conftest.err conftest.$ac_objext \
33647 osf4* | osf5*) # as osf3* with the addition of -msym flag 33649 osf4* | osf5*) # as osf3* with the addition of -msym flag
33648 if test "$GCC" = yes; then 33650 if test "$GCC" = yes; then
33649 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' 33651 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
@@ -33652,7 +33654,7 @@ index 2d551360683..e01d0a70438 100755
33652 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' 33654 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
33653 else 33655 else
33654 allow_undefined_flag=' -expect_unresolved \*' 33656 allow_undefined_flag=' -expect_unresolved \*'
33655@@ -9208,9 +9799,9 @@ rm -f core conftest.err conftest.$ac_objext \ 33657@@ -9207,9 +9798,9 @@ rm -f core conftest.err conftest.$ac_objext \
33656 no_undefined_flag=' -z defs' 33658 no_undefined_flag=' -z defs'
33657 if test "$GCC" = yes; then 33659 if test "$GCC" = yes; then
33658 wlarc='${wl}' 33660 wlarc='${wl}'
@@ -33664,7 +33666,7 @@ index 2d551360683..e01d0a70438 100755
33664 else 33666 else
33665 case `$CC -V 2>&1` in 33667 case `$CC -V 2>&1` in
33666 *"Compilers 5.0"*) 33668 *"Compilers 5.0"*)
33667@@ -9786,8 +10377,9 @@ cygwin* | mingw* | pw32* | cegcc*) 33669@@ -9785,8 +10376,9 @@ cygwin* | mingw* | pw32* | cegcc*)
33668 need_version=no 33670 need_version=no
33669 need_lib_prefix=no 33671 need_lib_prefix=no
33670 33672
@@ -33676,7 +33678,7 @@ index 2d551360683..e01d0a70438 100755
33676 library_names_spec='$libname.dll.a' 33678 library_names_spec='$libname.dll.a'
33677 # DLL is installed to $(libdir)/../bin by postinstall_cmds 33679 # DLL is installed to $(libdir)/../bin by postinstall_cmds
33678 postinstall_cmds='base_file=`basename \${file}`~ 33680 postinstall_cmds='base_file=`basename \${file}`~
33679@@ -9820,13 +10412,71 @@ cygwin* | mingw* | pw32* | cegcc*) 33681@@ -9819,13 +10411,71 @@ cygwin* | mingw* | pw32* | cegcc*)
33680 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' 33682 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
33681 ;; 33683 ;;
33682 esac 33684 esac
@@ -33749,16 +33751,16 @@ index 2d551360683..e01d0a70438 100755
33749 # FIXME: first we should search . and the directory the executable is in 33751 # FIXME: first we should search . and the directory the executable is in
33750 shlibpath_var=PATH 33752 shlibpath_var=PATH
33751 ;; 33753 ;;
33752@@ -10746,7 +11396,7 @@ else 33754@@ -10745,7 +11395,7 @@ else
33753 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 33755 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
33754 lt_status=$lt_dlunknown 33756 lt_status=$lt_dlunknown
33755 cat > conftest.$ac_ext <<_LT_EOF 33757 cat > conftest.$ac_ext <<_LT_EOF
33756-#line 10749 "configure" 33758-#line 10748 "configure"
33757+#line $LINENO "configure" 33759+#line $LINENO "configure"
33758 #include "confdefs.h" 33760 #include "confdefs.h"
33759 33761
33760 #if HAVE_DLFCN_H 33762 #if HAVE_DLFCN_H
33761@@ -10790,10 +11440,10 @@ else 33763@@ -10789,10 +11439,10 @@ else
33762 /* When -fvisbility=hidden is used, assume the code has been annotated 33764 /* When -fvisbility=hidden is used, assume the code has been annotated
33763 correspondingly for the symbols needed. */ 33765 correspondingly for the symbols needed. */
33764 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 33766 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
@@ -33771,16 +33773,16 @@ index 2d551360683..e01d0a70438 100755
33771 int main () 33773 int main ()
33772 { 33774 {
33773 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 33775 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
33774@@ -10852,7 +11502,7 @@ else 33776@@ -10851,7 +11501,7 @@ else
33775 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 33777 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
33776 lt_status=$lt_dlunknown 33778 lt_status=$lt_dlunknown
33777 cat > conftest.$ac_ext <<_LT_EOF 33779 cat > conftest.$ac_ext <<_LT_EOF
33778-#line 10855 "configure" 33780-#line 10854 "configure"
33779+#line $LINENO "configure" 33781+#line $LINENO "configure"
33780 #include "confdefs.h" 33782 #include "confdefs.h"
33781 33783
33782 #if HAVE_DLFCN_H 33784 #if HAVE_DLFCN_H
33783@@ -10896,10 +11546,10 @@ else 33785@@ -10895,10 +11545,10 @@ else
33784 /* When -fvisbility=hidden is used, assume the code has been annotated 33786 /* When -fvisbility=hidden is used, assume the code has been annotated
33785 correspondingly for the symbols needed. */ 33787 correspondingly for the symbols needed. */
33786 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 33788 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
@@ -33793,7 +33795,7 @@ index 2d551360683..e01d0a70438 100755
33793 int main () 33795 int main ()
33794 { 33796 {
33795 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 33797 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
33796@@ -12385,13 +13035,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' 33798@@ -12377,13 +13027,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
33797 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' 33799 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
33798 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' 33800 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
33799 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' 33801 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
@@ -33814,7 +33816,7 @@ index 2d551360683..e01d0a70438 100755
33814 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' 33816 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
33815 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' 33817 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
33816 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' 33818 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
33817@@ -12406,14 +13063,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de 33819@@ -12398,14 +13055,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de
33818 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' 33820 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
33819 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' 33821 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
33820 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"`' 33822 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"`'
@@ -33833,7 +33835,7 @@ index 2d551360683..e01d0a70438 100755
33833 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' 33835 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
33834 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' 33836 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
33835 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' 33837 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
33836@@ -12446,12 +13106,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q 33838@@ -12438,12 +13098,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q
33837 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' 33839 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
33838 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' 33840 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
33839 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' 33841 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
@@ -33847,7 +33849,7 @@ index 2d551360683..e01d0a70438 100755
33847 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' 33849 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
33848 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' 33850 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
33849 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' 33851 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
33850@@ -12506,8 +13166,13 @@ reload_flag \ 33852@@ -12498,8 +13158,13 @@ reload_flag \
33851 OBJDUMP \ 33853 OBJDUMP \
33852 deplibs_check_method \ 33854 deplibs_check_method \
33853 file_magic_cmd \ 33855 file_magic_cmd \
@@ -33861,7 +33863,7 @@ index 2d551360683..e01d0a70438 100755
33861 STRIP \ 33863 STRIP \
33862 RANLIB \ 33864 RANLIB \
33863 CC \ 33865 CC \
33864@@ -12517,12 +13182,14 @@ lt_cv_sys_global_symbol_pipe \ 33866@@ -12509,12 +13174,14 @@ lt_cv_sys_global_symbol_pipe \
33865 lt_cv_sys_global_symbol_to_cdecl \ 33867 lt_cv_sys_global_symbol_to_cdecl \
33866 lt_cv_sys_global_symbol_to_c_name_address \ 33868 lt_cv_sys_global_symbol_to_c_name_address \
33867 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ 33869 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
@@ -33877,7 +33879,7 @@ index 2d551360683..e01d0a70438 100755
33877 DSYMUTIL \ 33879 DSYMUTIL \
33878 NMEDIT \ 33880 NMEDIT \
33879 LIPO \ 33881 LIPO \
33880@@ -12538,7 +13205,6 @@ no_undefined_flag \ 33882@@ -12530,7 +13197,6 @@ no_undefined_flag \
33881 hardcode_libdir_flag_spec \ 33883 hardcode_libdir_flag_spec \
33882 hardcode_libdir_flag_spec_ld \ 33884 hardcode_libdir_flag_spec_ld \
33883 hardcode_libdir_separator \ 33885 hardcode_libdir_separator \
@@ -33885,7 +33887,7 @@ index 2d551360683..e01d0a70438 100755
33885 exclude_expsyms \ 33887 exclude_expsyms \
33886 include_expsyms \ 33888 include_expsyms \
33887 file_list_spec \ 33889 file_list_spec \
33888@@ -12574,6 +13240,7 @@ module_cmds \ 33890@@ -12566,6 +13232,7 @@ module_cmds \
33889 module_expsym_cmds \ 33891 module_expsym_cmds \
33890 export_symbols_cmds \ 33892 export_symbols_cmds \
33891 prelink_cmds \ 33893 prelink_cmds \
@@ -33893,7 +33895,7 @@ index 2d551360683..e01d0a70438 100755
33893 postinstall_cmds \ 33895 postinstall_cmds \
33894 postuninstall_cmds \ 33896 postuninstall_cmds \
33895 finish_cmds \ 33897 finish_cmds \
33896@@ -13172,7 +13839,8 @@ $as_echo X"$file" | 33898@@ -13164,7 +13831,8 @@ $as_echo X"$file" |
33897 # NOTE: Changes made to this file will be lost: look at ltmain.sh. 33899 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
33898 # 33900 #
33899 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 33901 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
@@ -33903,7 +33905,7 @@ index 2d551360683..e01d0a70438 100755
33903 # Written by Gordon Matzigkeit, 1996 33905 # Written by Gordon Matzigkeit, 1996
33904 # 33906 #
33905 # This file is part of GNU Libtool. 33907 # This file is part of GNU Libtool.
33906@@ -13275,19 +13943,42 @@ SP2NL=$lt_lt_SP2NL 33908@@ -13267,19 +13935,42 @@ SP2NL=$lt_lt_SP2NL
33907 # turn newlines into spaces. 33909 # turn newlines into spaces.
33908 NL2SP=$lt_lt_NL2SP 33910 NL2SP=$lt_lt_NL2SP
33909 33911
@@ -33947,7 +33949,7 @@ index 2d551360683..e01d0a70438 100755
33947 # A symbol stripping program. 33949 # A symbol stripping program.
33948 STRIP=$lt_STRIP 33950 STRIP=$lt_STRIP
33949 33951
33950@@ -13317,6 +14008,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address 33952@@ -13309,6 +14000,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
33951 # Transform the output of nm in a C name address pair when lib prefix is needed. 33953 # Transform the output of nm in a C name address pair when lib prefix is needed.
33952 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix 33954 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
33953 33955
@@ -33960,7 +33962,7 @@ index 2d551360683..e01d0a70438 100755
33960 # The name of the directory that contains temporary libtool files. 33962 # The name of the directory that contains temporary libtool files.
33961 objdir=$objdir 33963 objdir=$objdir
33962 33964
33963@@ -13326,6 +14023,9 @@ MAGIC_CMD=$MAGIC_CMD 33965@@ -13318,6 +14015,9 @@ MAGIC_CMD=$MAGIC_CMD
33964 # Must we lock files when doing compilation? 33966 # Must we lock files when doing compilation?
33965 need_locks=$lt_need_locks 33967 need_locks=$lt_need_locks
33966 33968
@@ -33970,7 +33972,7 @@ index 2d551360683..e01d0a70438 100755
33970 # Tool to manipulate archived DWARF debug symbol files on Mac OS X. 33972 # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
33971 DSYMUTIL=$lt_DSYMUTIL 33973 DSYMUTIL=$lt_DSYMUTIL
33972 33974
33973@@ -13440,12 +14140,12 @@ with_gcc=$GCC 33975@@ -13432,12 +14132,12 @@ with_gcc=$GCC
33974 # Compiler flag to turn off builtin functions. 33976 # Compiler flag to turn off builtin functions.
33975 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag 33977 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
33976 33978
@@ -33986,7 +33988,7 @@ index 2d551360683..e01d0a70438 100755
33986 # Compiler flag to prevent dynamic linking. 33988 # Compiler flag to prevent dynamic linking.
33987 link_static_flag=$lt_lt_prog_compiler_static 33989 link_static_flag=$lt_lt_prog_compiler_static
33988 33990
33989@@ -13532,9 +14232,6 @@ inherit_rpath=$inherit_rpath 33991@@ -13524,9 +14224,6 @@ inherit_rpath=$inherit_rpath
33990 # Whether libtool must link a program against all its dependency libraries. 33992 # Whether libtool must link a program against all its dependency libraries.
33991 link_all_deplibs=$link_all_deplibs 33993 link_all_deplibs=$link_all_deplibs
33992 33994
@@ -33996,7 +33998,7 @@ index 2d551360683..e01d0a70438 100755
33996 # Set to "yes" if exported symbols are required. 33998 # Set to "yes" if exported symbols are required.
33997 always_export_symbols=$always_export_symbols 33999 always_export_symbols=$always_export_symbols
33998 34000
33999@@ -13550,6 +14247,9 @@ include_expsyms=$lt_include_expsyms 34001@@ -13542,6 +14239,9 @@ include_expsyms=$lt_include_expsyms
34000 # Commands necessary for linking programs (against libraries) with templates. 34002 # Commands necessary for linking programs (against libraries) with templates.
34001 prelink_cmds=$lt_prelink_cmds 34003 prelink_cmds=$lt_prelink_cmds
34002 34004
@@ -34006,7 +34008,7 @@ index 2d551360683..e01d0a70438 100755
34006 # Specify filename containing input files. 34008 # Specify filename containing input files.
34007 file_list_spec=$lt_file_list_spec 34009 file_list_spec=$lt_file_list_spec
34008 34010
34009@@ -13582,210 +14282,169 @@ ltmain="$ac_aux_dir/ltmain.sh" 34011@@ -13574,210 +14274,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
34010 # if finds mixed CR/LF and LF-only lines. Since sed operates in 34012 # if finds mixed CR/LF and LF-only lines. Since sed operates in
34011 # text mode, it properly converts lines to CR/LF. This bash problem 34013 # text mode, it properly converts lines to CR/LF. This bash problem
34012 # is reportedly fixed, but why not run on old versions too? 34014 # is reportedly fixed, but why not run on old versions too?
diff --git a/meta/recipes-devtools/binutils/binutils/0009-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch b/meta/recipes-devtools/binutils/binutils/0009-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch
index 50201fb6b6..18f1e90aad 100644
--- a/meta/recipes-devtools/binutils/binutils/0009-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch
+++ b/meta/recipes-devtools/binutils/binutils/0009-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch
@@ -1,4 +1,4 @@
1From c9e810840d95554046b7132e3e2c98bf99cb2d89 Mon Sep 17 00:00:00 2001 1From 1967fbe2cbbb039e3b54666b55f6456325c58e91 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 2 Mar 2015 01:42:38 +0000 3Date: Mon, 2 Mar 2015 01:42:38 +0000
4Subject: [PATCH] Fix rpath in libtool when sysroot is enabled 4Subject: [PATCH] Fix rpath in libtool when sysroot is enabled
@@ -19,10 +19,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
19 1 file changed, 8 insertions(+), 2 deletions(-) 19 1 file changed, 8 insertions(+), 2 deletions(-)
20 20
21diff --git a/ltmain.sh b/ltmain.sh 21diff --git a/ltmain.sh b/ltmain.sh
22index 7f7104ffc82..f59eb4aa631 100644 22index 09693d7b99b..39f0a5bde46 100644
23--- a/ltmain.sh 23--- a/ltmain.sh
24+++ b/ltmain.sh 24+++ b/ltmain.sh
25@@ -8035,9 +8035,11 @@ EOF 25@@ -8056,9 +8056,11 @@ EOF
26 test "$opt_mode" != relink && rpath="$compile_rpath$rpath" 26 test "$opt_mode" != relink && rpath="$compile_rpath$rpath"
27 for libdir in $rpath; do 27 for libdir in $rpath; do
28 if test -n "$hardcode_libdir_flag_spec"; then 28 if test -n "$hardcode_libdir_flag_spec"; then
@@ -36,7 +36,7 @@ index 7f7104ffc82..f59eb4aa631 100644
36 if test -z "$hardcode_libdirs"; then 36 if test -z "$hardcode_libdirs"; then
37 hardcode_libdirs="$libdir" 37 hardcode_libdirs="$libdir"
38 else 38 else
39@@ -8770,6 +8772,10 @@ EOF 39@@ -8791,6 +8793,10 @@ EOF
40 hardcode_libdirs= 40 hardcode_libdirs=
41 for libdir in $compile_rpath $finalize_rpath; do 41 for libdir in $compile_rpath $finalize_rpath; do
42 if test -n "$hardcode_libdir_flag_spec"; then 42 if test -n "$hardcode_libdir_flag_spec"; then
diff --git a/meta/recipes-devtools/binutils/binutils/0010-sync-with-OE-libtool-changes.patch b/meta/recipes-devtools/binutils/binutils/0010-sync-with-OE-libtool-changes.patch
index 57d9ac5f27..fb1463c4e2 100644
--- a/meta/recipes-devtools/binutils/binutils/0010-sync-with-OE-libtool-changes.patch
+++ b/meta/recipes-devtools/binutils/binutils/0010-sync-with-OE-libtool-changes.patch
@@ -1,4 +1,4 @@
1From befc176c209bbb4c32b57c2068e813c88b1ab6b1 Mon Sep 17 00:00:00 2001 1From 6b37e476ee9f7feac837063cd0ca8e634fb76f90 Mon Sep 17 00:00:00 2001
2From: Ross Burton <ross.burton@intel.com> 2From: Ross Burton <ross.burton@intel.com>
3Date: Mon, 6 Mar 2017 23:33:27 -0800 3Date: Mon, 6 Mar 2017 23:33:27 -0800
4Subject: [PATCH] sync with OE libtool changes 4Subject: [PATCH] sync with OE libtool changes
@@ -26,10 +26,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
26 1 file changed, 28 insertions(+), 6 deletions(-) 26 1 file changed, 28 insertions(+), 6 deletions(-)
27 27
28diff --git a/ltmain.sh b/ltmain.sh 28diff --git a/ltmain.sh b/ltmain.sh
29index f59eb4aa631..ce97db42ce7 100644 29index 39f0a5bde46..890719f2de0 100644
30--- a/ltmain.sh 30--- a/ltmain.sh
31+++ b/ltmain.sh 31+++ b/ltmain.sh
32@@ -8053,8 +8053,16 @@ EOF 32@@ -8074,8 +8074,16 @@ EOF
33 esac 33 esac
34 fi 34 fi
35 else 35 else
@@ -48,7 +48,7 @@ index f59eb4aa631..ce97db42ce7 100644
48 fi 48 fi
49 elif test -n "$runpath_var"; then 49 elif test -n "$runpath_var"; then
50 case "$perm_rpath " in 50 case "$perm_rpath " in
51@@ -8790,8 +8798,16 @@ EOF 51@@ -8811,8 +8819,16 @@ EOF
52 esac 52 esac
53 fi 53 fi
54 else 54 else
@@ -67,7 +67,7 @@ index f59eb4aa631..ce97db42ce7 100644
67 fi 67 fi
68 elif test -n "$runpath_var"; then 68 elif test -n "$runpath_var"; then
69 case "$perm_rpath " in 69 case "$perm_rpath " in
70@@ -8841,8 +8857,14 @@ EOF 70@@ -8862,8 +8878,14 @@ EOF
71 esac 71 esac
72 fi 72 fi
73 else 73 else
diff --git a/meta/recipes-devtools/binutils/binutils/0011-Check-for-clang-before-checking-gcc-version.patch b/meta/recipes-devtools/binutils/binutils/0011-Check-for-clang-before-checking-gcc-version.patch
index c47f41f5ca..ddba0c33b6 100644
--- a/meta/recipes-devtools/binutils/binutils/0011-Check-for-clang-before-checking-gcc-version.patch
+++ b/meta/recipes-devtools/binutils/binutils/0011-Check-for-clang-before-checking-gcc-version.patch
@@ -1,4 +1,4 @@
1From cad852e0ed46a1c26607f9e7d17cc5974b05e38a Mon Sep 17 00:00:00 2001 1From 8942cfa25f5822d88f990c3a939c0a4f7832a0e2 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Wed, 15 Apr 2020 14:17:20 -0700 3Date: Wed, 15 Apr 2020 14:17:20 -0700
4Subject: [PATCH] Check for clang before checking gcc version 4Subject: [PATCH] Check for clang before checking gcc version
@@ -18,10 +18,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
18 2 files changed, 2 insertions(+), 2 deletions(-) 18 2 files changed, 2 insertions(+), 2 deletions(-)
19 19
20diff --git a/configure b/configure 20diff --git a/configure b/configure
21index 670684d83d1..f9ba1c0a4f7 100755 21index bbfb5979546..fef4bd65124 100755
22--- a/configure 22--- a/configure
23+++ b/configure 23+++ b/configure
24@@ -5432,7 +5432,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu 24@@ -5446,7 +5446,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
25 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 25 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
26 /* end confdefs.h. */ 26 /* end confdefs.h. */
27 27
@@ -31,10 +31,10 @@ index 670684d83d1..f9ba1c0a4f7 100755
31 #endif 31 #endif
32 int main() {} 32 int main() {}
33diff --git a/configure.ac b/configure.ac 33diff --git a/configure.ac b/configure.ac
34index 88b4800e298..6cd4530db56 100644 34index f9694cdf901..54a3a968307 100644
35--- a/configure.ac 35--- a/configure.ac
36+++ b/configure.ac 36+++ b/configure.ac
37@@ -1410,7 +1410,7 @@ if test "$GCC" = yes; then 37@@ -1419,7 +1419,7 @@ if test "$GCC" = yes; then
38 AC_MSG_CHECKING([whether g++ accepts -static-libstdc++ -static-libgcc]) 38 AC_MSG_CHECKING([whether g++ accepts -static-libstdc++ -static-libgcc])
39 AC_LANG_PUSH(C++) 39 AC_LANG_PUSH(C++)
40 AC_LINK_IFELSE([AC_LANG_SOURCE([ 40 AC_LINK_IFELSE([AC_LANG_SOURCE([
diff --git a/meta/recipes-devtools/binutils/binutils/0012-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch b/meta/recipes-devtools/binutils/binutils/0012-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch
index 985911aab1..9abd85538f 100644
--- a/meta/recipes-devtools/binutils/binutils/0012-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch
+++ b/meta/recipes-devtools/binutils/binutils/0012-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch
@@ -1,4 +1,4 @@
1From 47e53916e3112391d8bff2b2257dcec0a2426d66 Mon Sep 17 00:00:00 2001 1From fecc7af84b2735fad82da304fce37f373d2c0f53 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Thu, 10 Mar 2022 21:21:33 -0800 3Date: Thu, 10 Mar 2022 21:21:33 -0800
4Subject: [PATCH] Only generate an RPATH entry if LD_RUN_PATH is not empty 4Subject: [PATCH] Only generate an RPATH entry if LD_RUN_PATH is not empty
@@ -14,10 +14,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
14 1 file changed, 5 insertions(+) 14 1 file changed, 5 insertions(+)
15 15
16diff --git a/ld/ldelf.c b/ld/ldelf.c 16diff --git a/ld/ldelf.c b/ld/ldelf.c
17index 187b359af86..ad792f02d63 100644 17index f6f3ac11a76..77442fdc964 100644
18--- a/ld/ldelf.c 18--- a/ld/ldelf.c
19+++ b/ld/ldelf.c 19+++ b/ld/ldelf.c
20@@ -1130,6 +1130,9 @@ ldelf_handle_dt_needed (struct elf_link_hash_table *htab, 20@@ -1134,6 +1134,9 @@ ldelf_handle_dt_needed (struct elf_link_hash_table *htab,
21 && command_line.rpath == NULL) 21 && command_line.rpath == NULL)
22 { 22 {
23 path = (const char *) getenv ("LD_RUN_PATH"); 23 path = (const char *) getenv ("LD_RUN_PATH");
@@ -27,7 +27,7 @@ index 187b359af86..ad792f02d63 100644
27 if (path 27 if (path
28 && ldelf_search_needed (path, &n, force, 28 && ldelf_search_needed (path, &n, force,
29 is_linux, elfsize)) 29 is_linux, elfsize))
30@@ -1805,6 +1808,8 @@ ldelf_before_allocation (char *audit, char *depaudit, 30@@ -1811,6 +1814,8 @@ ldelf_before_allocation (char *audit, char *depaudit,
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");
diff --git a/meta/recipes-devtools/binutils/binutils/0013-Define-alignof-using-_Alignof-when-using-C11-or-newe.patch b/meta/recipes-devtools/binutils/binutils/0013-Define-alignof-using-_Alignof-when-using-C11-or-newe.patch
index 0cb2f46a07..b075d9c58b 100644
--- a/meta/recipes-devtools/binutils/binutils/0013-Define-alignof-using-_Alignof-when-using-C11-or-newe.patch
+++ b/meta/recipes-devtools/binutils/binutils/0013-Define-alignof-using-_Alignof-when-using-C11-or-newe.patch
@@ -1,4 +1,4 @@
1From d479020609329cdc7fa3675bc3daf072401fefae Mon Sep 17 00:00:00 2001 1From ea68b64a00dd236c6e062a9403bf8a4b2234aaa5 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Sun, 15 Jan 2023 00:16:25 -0800 3Date: Sun, 15 Jan 2023 00:16:25 -0800
4Subject: [PATCH] Define alignof using _Alignof when using C11 or newer 4Subject: [PATCH] Define alignof using _Alignof when using C11 or newer
@@ -25,7 +25,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
25 1 file changed, 10 insertions(+) 25 1 file changed, 10 insertions(+)
26 26
27diff --git a/libiberty/sha1.c b/libiberty/sha1.c 27diff --git a/libiberty/sha1.c b/libiberty/sha1.c
28index 49e8e0b6c2b..72de5cc8ad6 100644 28index 27ceccc027b..a81332972d1 100644
29--- a/libiberty/sha1.c 29--- a/libiberty/sha1.c
30+++ b/libiberty/sha1.c 30+++ b/libiberty/sha1.c
31@@ -234,7 +234,17 @@ sha1_process_bytes (const void *buffer, size_t len, struct sha1_ctx *ctx) 31@@ -234,7 +234,17 @@ sha1_process_bytes (const void *buffer, size_t len, struct sha1_ctx *ctx)
diff --git a/meta/recipes-devtools/binutils/binutils/0014-Remove-duplicate-pe-dll.o-entry-deom-targ_extra_ofil.patch b/meta/recipes-devtools/binutils/binutils/0014-Remove-duplicate-pe-dll.o-entry-deom-targ_extra_ofil.patch
index 8aef2cc710..411994b342 100644
--- a/meta/recipes-devtools/binutils/binutils/0014-Remove-duplicate-pe-dll.o-entry-deom-targ_extra_ofil.patch
+++ b/meta/recipes-devtools/binutils/binutils/0014-Remove-duplicate-pe-dll.o-entry-deom-targ_extra_ofil.patch
@@ -1,4 +1,4 @@
1From ddd941856582a82171626cbe609325b11e223704 Mon Sep 17 00:00:00 2001 1From f40157cc203a8c8348fb9a39d9fd830d6b4b23f7 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Wed, 18 Jan 2023 19:35:07 -0800 3Date: Wed, 18 Jan 2023 19:35:07 -0800
4Subject: [PATCH] Remove duplicate pe-dll.o entry deom targ_extra_ofiles 4Subject: [PATCH] Remove duplicate pe-dll.o entry deom targ_extra_ofiles
@@ -18,10 +18,10 @@ Cc: Zac Walker <zac.walker@linaro.org>
18 1 file changed, 1 insertion(+), 1 deletion(-) 18 1 file changed, 1 insertion(+), 1 deletion(-)
19 19
20diff --git a/ld/configure.tgt b/ld/configure.tgt 20diff --git a/ld/configure.tgt b/ld/configure.tgt
21index f937f78b876..830613744c2 100644 21index ea01ccf9a1b..923d6009f9a 100644
22--- a/ld/configure.tgt 22--- a/ld/configure.tgt
23+++ b/ld/configure.tgt 23+++ b/ld/configure.tgt
24@@ -1067,7 +1067,7 @@ x86_64-*-cygwin) targ_emul=i386pep ; 24@@ -1063,7 +1063,7 @@ x86_64-*-cygwin) targ_emul=i386pep ;
25 ;; 25 ;;
26 x86_64-*-mingw*) targ_emul=i386pep ; 26 x86_64-*-mingw*) targ_emul=i386pep ;
27 targ_extra_emuls=i386pe 27 targ_extra_emuls=i386pe
diff --git a/meta/recipes-devtools/binutils/binutils/0015-CVE-2025-1178.patch b/meta/recipes-devtools/binutils/binutils/0015-CVE-2025-1178.patch
new file mode 100644
index 0000000000..c39f43fba4
--- /dev/null
+++ b/meta/recipes-devtools/binutils/binutils/0015-CVE-2025-1178.patch
@@ -0,0 +1,33 @@
1From 75086e9de1707281172cc77f178e7949a4414ed0 Mon Sep 17 00:00:00 2001
2From: Nick Clifton <nickc@redhat.com>
3Date: Wed, 5 Feb 2025 13:26:51 +0000
4Subject: [PATCH] Prevent an abort in the bfd linker when attempting to
5 generate dynamic relocs for a corrupt input file.
6
7PR 32638
8
9Upstream-Status: Backport [https://sourceware.org/git/?p=binutils-gdb.git;a=patch;h=75086e9de1707281172cc77f178e7949a4414ed0]
10CVE: CVE-2025-1178
11
12Signed-off-by: Deepesh Varatharajan <Deepesh.Varatharajan@windriver.com>
13
14diff --git a/bfd/elf64-x86-64.c b/bfd/elf64-x86-64.c
15index cb32732e..a08e9c97 100644
16--- a/bfd/elf64-x86-64.c
17+++ b/bfd/elf64-x86-64.c
18@@ -5031,6 +5031,15 @@ elf_x86_64_finish_dynamic_symbol (bfd *output_bfd,
19
20 if (generate_dynamic_reloc)
21 {
22+ /* If the relgot section has not been created, then
23+ generate an error instead of a reloc. cf PR 32638. */
24+ if (relgot == NULL || relgot->size == 0)
25+ {
26+ info->callbacks->einfo (_("%F%pB: Unable to generate dynamic relocs because a suitable section does not exist\n"),
27+ output_bfd);
28+ return false;
29+ }
30+
31 if (relative_reloc_name != NULL
32 && htab->params->report_relative_reloc)
33 _bfd_x86_elf_link_report_relative_reloc
diff --git a/meta/recipes-devtools/binutils/binutils/0015-gprofng-change-use-of-bignum-to-bigint.patch b/meta/recipes-devtools/binutils/binutils/0015-gprofng-change-use-of-bignum-to-bigint.patch
deleted file mode 100644
index 0d3d289eba..0000000000
--- a/meta/recipes-devtools/binutils/binutils/0015-gprofng-change-use-of-bignum-to-bigint.patch
+++ /dev/null
@@ -1,17 +0,0 @@
1Upstream-Status: Backport [https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=3243d790ee32aa8eda69226d81b1e79dbd1dcd87]
2
3Signed-off-by: Harish Sadineni <Harish.Sadineni@windriver.com>
4
5diff --git a/gprofng/gp-display-html/gp-display-html.in b/gprofng/gp-display-html/gp-display-html.in
6index 6f37ca282e7..306c99a0ec3 100644
7--- a/gprofng/gp-display-html/gp-display-html.in
8+++ b/gprofng/gp-display-html/gp-display-html.in
9@@ -25,7 +25,7 @@ use warnings;
10 # Disable before release
11 # use Perl::Critic;
12
13-use bignum;
14+use bigint;
15 use List::Util qw (max);
16 use Cwd qw (abs_path cwd);
17 use File::Basename;
diff --git a/meta/recipes-devtools/binutils/binutils/0016-CVE-2025-1181-1.patch b/meta/recipes-devtools/binutils/binutils/0016-CVE-2025-1181-1.patch
new file mode 100644
index 0000000000..d3709c7a4f
--- /dev/null
+++ b/meta/recipes-devtools/binutils/binutils/0016-CVE-2025-1181-1.patch
@@ -0,0 +1,141 @@
1From: Nick Clifton <nickc@redhat.com>
2Date: Wed, 5 Feb 2025 14:31:10 +0000
3
4Prevent illegal memory access when checking relocs in a corrupt ELF binary.
5
6PR 32641
7
8Upstream-Status: Backport [https://sourceware.org/git/?p=binutils-gdb.git;a=commitdiff;h=18cc11a2771d9e40180485da9a4fb660c03efac3]
9CVE: CVE-2025-1181
10
11Signed-off-by: Deepesh Varatharajan <Deepesh.Varatharajan@windriver.com>
12
13diff --git a/bfd/elf-bfd.h b/bfd/elf-bfd.h
14index 785a37dd7fd..d2bf8e5cbae 100644
15--- a/bfd/elf-bfd.h
16+++ b/bfd/elf-bfd.h
17@@ -3150,6 +3150,9 @@ extern bool _bfd_elf_link_mmap_section_contents
18 extern void _bfd_elf_link_munmap_section_contents
19 (asection *);
20
21+extern struct elf_link_hash_entry * _bfd_elf_get_link_hash_entry
22+ (struct elf_link_hash_entry **, unsigned int, Elf_Internal_Shdr *);
23+
24 /* Large common section. */
25 extern asection _bfd_elf_large_com_section;
26
27diff --git a/bfd/elf64-x86-64.c b/bfd/elf64-x86-64.c
28index 32db254ba6c..2d82c6583c3 100644
29--- a/bfd/elf64-x86-64.c
30+++ b/bfd/elf64-x86-64.c
31@@ -1744,7 +1744,7 @@ elf_x86_64_convert_load_reloc (bfd *abfd,
32 bool to_reloc_pc32;
33 bool abs_symbol;
34 bool local_ref;
35- asection *tsec;
36+ asection *tsec = NULL;
37 bfd_signed_vma raddend;
38 unsigned int opcode;
39 unsigned int modrm;
40@@ -1910,6 +1910,9 @@ elf_x86_64_convert_load_reloc (bfd *abfd,
41 return true;
42 }
43
44+ if (tsec == NULL)
45+ return false;
46+
47 /* Don't convert GOTPCREL relocation against large section. */
48 if (elf_section_data (tsec) != NULL
49 && (elf_section_flags (tsec) & SHF_X86_64_LARGE) != 0)
50@@ -2206,10 +2209,7 @@ elf_x86_64_scan_relocs (bfd *abfd, struct bfd_link_info *info,
51 else
52 {
53 isym = NULL;
54- h = sym_hashes[r_symndx - symtab_hdr->sh_info];
55- while (h->root.type == bfd_link_hash_indirect
56- || h->root.type == bfd_link_hash_warning)
57- h = (struct elf_link_hash_entry *) h->root.u.i.link;
58+ h = _bfd_elf_get_link_hash_entry (sym_hashes, r_symndx, symtab_hdr);
59 }
60
61 /* Check invalid x32 relocations. */
62diff --git a/bfd/elflink.c b/bfd/elflink.c
63index 1f1263007c0..eafbd133ff5 100644
64--- a/bfd/elflink.c
65+++ b/bfd/elflink.c
66@@ -96,6 +96,27 @@ _bfd_elf_link_keep_memory (struct bfd_link_info *info)
67 return true;
68 }
69
70+struct elf_link_hash_entry *
71+_bfd_elf_get_link_hash_entry (struct elf_link_hash_entry ** sym_hashes,
72+ unsigned int symndx,
73+ Elf_Internal_Shdr * symtab_hdr)
74+{
75+ if (symndx < symtab_hdr->sh_info)
76+ return NULL;
77+
78+ struct elf_link_hash_entry *h = sym_hashes[symndx - symtab_hdr->sh_info];
79+
80+ /* The hash might be empty. See PR 32641 for an example of this. */
81+ if (h == NULL)
82+ return NULL;
83+
84+ while (h->root.type == bfd_link_hash_indirect
85+ || h->root.type == bfd_link_hash_warning)
86+ h = (struct elf_link_hash_entry *) h->root.u.i.link;
87+
88+ return h;
89+}
90+
91 static struct elf_link_hash_entry *
92 get_ext_sym_hash (struct elf_reloc_cookie *cookie, unsigned long r_symndx)
93 {
94@@ -108,6 +129,9 @@ get_ext_sym_hash (struct elf_reloc_cookie *cookie, unsigned long r_symndx)
95 {
96 h = cookie->sym_hashes[r_symndx - cookie->extsymoff];
97
98+ if (h == NULL)
99+ return NULL;
100+
101 while (h->root.type == bfd_link_hash_indirect
102 || h->root.type == bfd_link_hash_warning)
103 h = (struct elf_link_hash_entry *) h->root.u.i.link;
104diff --git a/bfd/elfxx-x86.c b/bfd/elfxx-x86.c
105index 8e5a005fd36..832a5495eb1 100644
106--- a/bfd/elfxx-x86.c
107+++ b/bfd/elfxx-x86.c
108@@ -973,15 +973,7 @@ _bfd_x86_elf_check_relocs (bfd *abfd,
109 goto error_return;
110 }
111
112- if (r_symndx < symtab_hdr->sh_info)
113- h = NULL;
114- else
115- {
116- h = sym_hashes[r_symndx - symtab_hdr->sh_info];
117- while (h->root.type == bfd_link_hash_indirect
118- || h->root.type == bfd_link_hash_warning)
119- h = (struct elf_link_hash_entry *) h->root.u.i.link;
120- }
121+ h = _bfd_elf_get_link_hash_entry (sym_hashes, r_symndx, symtab_hdr);
122
123 if (X86_NEED_DYNAMIC_RELOC_TYPE_P (is_x86_64, r_type)
124 && NEED_DYNAMIC_RELOCATION_P (is_x86_64, info, true, h, sec,
125@@ -1209,10 +1201,12 @@ _bfd_x86_elf_link_relax_section (bfd *abfd ATTRIBUTE_UNUSED,
126 else
127 {
128 /* Get H and SEC for GENERATE_DYNAMIC_RELOCATION_P below. */
129- h = sym_hashes[r_symndx - symtab_hdr->sh_info];
130- while (h->root.type == bfd_link_hash_indirect
131- || h->root.type == bfd_link_hash_warning)
132- h = (struct elf_link_hash_entry *) h->root.u.i.link;
133+ h = _bfd_elf_get_link_hash_entry (sym_hashes, r_symndx, symtab_hdr);
134+ if (h == NULL)
135+ {
136+ /* FIXMEL: Issue an error message ? */
137+ continue;
138+ }
139
140 if (h->root.type == bfd_link_hash_defined
141 || h->root.type == bfd_link_hash_defweak)
diff --git a/meta/recipes-devtools/binutils/binutils/0017-CVE-2025-1181-2.patch b/meta/recipes-devtools/binutils/binutils/0017-CVE-2025-1181-2.patch
new file mode 100644
index 0000000000..5af743582f
--- /dev/null
+++ b/meta/recipes-devtools/binutils/binutils/0017-CVE-2025-1181-2.patch
@@ -0,0 +1,337 @@
1From: Nick Clifton <nickc@redhat.com>
2Date: Wed, 5 Feb 2025 15:43:04 +0000
3
4Add even more checks for corrupt input when processing
5relocations for ELF files.
6
7PR 32643
8
9Upstream-Status: Backport [https://sourceware.org/git/?p=binutils-gdb.git;a=commitdiff;h=931494c9a89558acb36a03a340c01726545eef24]
10CVE: CVE-2025-1181
11
12Signed-off-by: Deepesh Varatharajan <Deepesh.Varatharajan@windriver.com>
13
14diff --git a/bfd/elflink.c b/bfd/elflink.c
15index fd423d61..91cd7c28 100644
16--- a/bfd/elflink.c
17+++ b/bfd/elflink.c
18@@ -96,15 +96,17 @@
19 return true;
20 }
21
22-struct elf_link_hash_entry *
23-_bfd_elf_get_link_hash_entry (struct elf_link_hash_entry ** sym_hashes,
24- unsigned int symndx,
25- Elf_Internal_Shdr * symtab_hdr)
26+static struct elf_link_hash_entry *
27+get_link_hash_entry (struct elf_link_hash_entry ** sym_hashes,
28+ unsigned int symndx,
29+ unsigned int ext_sym_start)
30 {
31- if (symndx < symtab_hdr->sh_info)
32+ if (sym_hashes == NULL
33+ /* Guard against corrupt input. See PR 32636 for an example. */
34+ || symndx < ext_sym_start)
35 return NULL;
36
37- struct elf_link_hash_entry *h = sym_hashes[symndx - symtab_hdr->sh_info];
38+ struct elf_link_hash_entry *h = sym_hashes[symndx - ext_sym_start];
39
40 /* The hash might be empty. See PR 32641 for an example of this. */
41 if (h == NULL)
42@@ -117,27 +119,28 @@
43 return h;
44 }
45
46-static struct elf_link_hash_entry *
47-get_ext_sym_hash (struct elf_reloc_cookie *cookie, unsigned long r_symndx)
48+struct elf_link_hash_entry *
49+_bfd_elf_get_link_hash_entry (struct elf_link_hash_entry ** sym_hashes,
50+ unsigned int symndx,
51+ Elf_Internal_Shdr * symtab_hdr)
52 {
53- struct elf_link_hash_entry *h = NULL;
54-
55- if ((r_symndx >= cookie->locsymcount
56- || ELF_ST_BIND (cookie->locsyms[r_symndx].st_info) != STB_LOCAL)
57- /* Guard against corrupt input. See PR 32636 for an example. */
58- && r_symndx >= cookie->extsymoff)
59- {
60- h = cookie->sym_hashes[r_symndx - cookie->extsymoff];
61+ if (symtab_hdr == NULL)
62+ return NULL;
63
64- if (h == NULL)
65- return NULL;
66+ return get_link_hash_entry (sym_hashes, symndx, symtab_hdr->sh_info);
67+}
68
69- while (h->root.type == bfd_link_hash_indirect
70- || h->root.type == bfd_link_hash_warning)
71- h = (struct elf_link_hash_entry *) h->root.u.i.link;
72- }
73+static struct elf_link_hash_entry *
74+get_ext_sym_hash_from_cookie (struct elf_reloc_cookie *cookie, unsigned long r_symndx)
75+{
76+ if (cookie == NULL || cookie->sym_hashes == NULL)
77+ return NULL;
78+
79+ if (r_symndx >= cookie->locsymcount
80+ || ELF_ST_BIND (cookie->locsyms[r_symndx].st_info) != STB_LOCAL)
81+ return get_link_hash_entry (cookie->sym_hashes, r_symndx, cookie->extsymoff);
82
83- return h;
84+ return NULL;
85 }
86
87 asection *
88@@ -147,7 +150,7 @@
89 {
90 struct elf_link_hash_entry *h;
91
92- h = get_ext_sym_hash (cookie, r_symndx);
93+ h = get_ext_sym_hash_from_cookie (cookie, r_symndx);
94
95 if (h != NULL)
96 {
97@@ -9105,7 +9108,6 @@
98 size_t symidx,
99 bfd_vma val)
100 {
101- struct elf_link_hash_entry **sym_hashes;
102 struct elf_link_hash_entry *h;
103 size_t extsymoff = locsymcount;
104
105@@ -9128,12 +9130,12 @@
106
107 /* It is a global symbol: set its link type
108 to "defined" and give it a value. */
109-
110- sym_hashes = elf_sym_hashes (bfd_with_globals);
111- h = sym_hashes [symidx - extsymoff];
112- while (h->root.type == bfd_link_hash_indirect
113- || h->root.type == bfd_link_hash_warning)
114- h = (struct elf_link_hash_entry *) h->root.u.i.link;
115+ h = get_link_hash_entry (elf_sym_hashes (bfd_with_globals), symidx, extsymoff);
116+ if (h == NULL)
117+ {
118+ /* FIXMEL What should we do ? */
119+ return;
120+ }
121 h->root.type = bfd_link_hash_defined;
122 h->root.u.def.value = val;
123 h->root.u.def.section = bfd_abs_section_ptr;
124@@ -11611,10 +11613,19 @@
125 || (elf_bad_symtab (input_bfd)
126 && flinfo->sections[symndx] == NULL))
127 {
128- struct elf_link_hash_entry *h = sym_hashes[symndx - extsymoff];
129- while (h->root.type == bfd_link_hash_indirect
130- || h->root.type == bfd_link_hash_warning)
131- h = (struct elf_link_hash_entry *) h->root.u.i.link;
132+ struct elf_link_hash_entry *h;
133+
134+ h = get_link_hash_entry (sym_hashes, symndx, extsymoff);
135+ if (h == NULL)
136+ {
137+ _bfd_error_handler
138+ /* xgettext:c-format */
139+ (_("error: %pB: unable to create group section symbol"),
140+ input_bfd);
141+ bfd_set_error (bfd_error_bad_value);
142+ return false;
143+ }
144+
145 /* Arrange for symbol to be output. */
146 h->indx = -2;
147 elf_section_data (osec)->this_hdr.sh_info = -2;
148@@ -11749,7 +11760,7 @@
149 || (elf_bad_symtab (input_bfd)
150 && flinfo->sections[r_symndx] == NULL))
151 {
152- h = sym_hashes[r_symndx - extsymoff];
153+ h = get_link_hash_entry (sym_hashes, r_symndx, extsymoff);
154
155 /* Badly formatted input files can contain relocs that
156 reference non-existant symbols. Check here so that
157@@ -11758,17 +11769,13 @@
158 {
159 _bfd_error_handler
160 /* xgettext:c-format */
161- (_("error: %pB contains a reloc (%#" PRIx64 ") for section %pA "
162+ (_("error: %pB contains a reloc (%#" PRIx64 ") for section '%pA' "
163 "that references a non-existent global symbol"),
164 input_bfd, (uint64_t) rel->r_info, o);
165 bfd_set_error (bfd_error_bad_value);
166 return false;
167 }
168
169- while (h->root.type == bfd_link_hash_indirect
170- || h->root.type == bfd_link_hash_warning)
171- h = (struct elf_link_hash_entry *) h->root.u.i.link;
172-
173 s_type = h->type;
174
175 /* If a plugin symbol is referenced from a non-IR file,
176@@ -11984,7 +11991,6 @@
177 && flinfo->sections[r_symndx] == NULL))
178 {
179 struct elf_link_hash_entry *rh;
180- unsigned long indx;
181
182 /* This is a reloc against a global symbol. We
183 have not yet output all the local symbols, so
184@@ -11993,15 +11999,16 @@
185 reloc to point to the global hash table entry
186 for this symbol. The symbol index is then
187 set at the end of bfd_elf_final_link. */
188- indx = r_symndx - extsymoff;
189- rh = elf_sym_hashes (input_bfd)[indx];
190- while (rh->root.type == bfd_link_hash_indirect
191- || rh->root.type == bfd_link_hash_warning)
192- rh = (struct elf_link_hash_entry *) rh->root.u.i.link;
193-
194- /* Setting the index to -2 tells
195- elf_link_output_extsym that this symbol is
196- used by a reloc. */
197+ rh = get_link_hash_entry (elf_sym_hashes (input_bfd),
198+ r_symndx, extsymoff);
199+ if (rh == NULL)
200+ {
201+ /* FIXME: Generate an error ? */
202+ continue;
203+ }
204+
205+ /* Setting the index to -2 tells elf_link_output_extsym
206+ that this symbol is used by a reloc. */
207 BFD_ASSERT (rh->indx < 0);
208 rh->indx = -2;
209 *rel_hash = rh;
210@@ -13965,25 +13972,21 @@
211 struct elf_link_hash_entry *h,
212 Elf_Internal_Sym *sym)
213 {
214- if (h != NULL)
215+ if (h == NULL)
216+ return bfd_section_from_elf_index (sec->owner, sym->st_shndx);
217+
218+ switch (h->root.type)
219 {
220- switch (h->root.type)
221- {
222- case bfd_link_hash_defined:
223- case bfd_link_hash_defweak:
224- return h->root.u.def.section;
225+ case bfd_link_hash_defined:
226+ case bfd_link_hash_defweak:
227+ return h->root.u.def.section;
228
229- case bfd_link_hash_common:
230- return h->root.u.c.p->section;
231+ case bfd_link_hash_common:
232+ return h->root.u.c.p->section;
233
234- default:
235- break;
236- }
237+ default:
238+ return NULL;
239 }
240- else
241- return bfd_section_from_elf_index (sec->owner, sym->st_shndx);
242-
243- return NULL;
244 }
245
246 /* Return the debug definition section. */
247@@ -14032,46 +14035,49 @@
248 if (r_symndx == STN_UNDEF)
249 return NULL;
250
251- h = get_ext_sym_hash (cookie, r_symndx);
252+ h = get_ext_sym_hash_from_cookie (cookie, r_symndx);
253+ if (h == NULL)
254+ {
255+ /* A corrup tinput file can lead to a situation where the index
256+ does not reference either a local or an external symbol. */
257+ if (r_symndx >= cookie->locsymcount)
258+ return NULL;
259
260- if (h != NULL)
261+ return (*gc_mark_hook) (sec, info, cookie->rel, NULL,
262+ &cookie->locsyms[r_symndx]);
263+ }
264+
265+ bool was_marked = h->mark;
266+
267+ h->mark = 1;
268+ /* Keep all aliases of the symbol too. If an object symbol
269+ needs to be copied into .dynbss then all of its aliases
270+ should be present as dynamic symbols, not just the one used
271+ on the copy relocation. */
272+ hw = h;
273+ while (hw->is_weakalias)
274 {
275- bool was_marked;
276+ hw = hw->u.alias;
277+ hw->mark = 1;
278+ }
279
280- was_marked = h->mark;
281- h->mark = 1;
282- /* Keep all aliases of the symbol too. If an object symbol
283- needs to be copied into .dynbss then all of its aliases
284- should be present as dynamic symbols, not just the one used
285- on the copy relocation. */
286- hw = h;
287- while (hw->is_weakalias)
288- {
289- hw = hw->u.alias;
290- hw->mark = 1;
291- }
292+ if (!was_marked && h->start_stop && !h->root.ldscript_def)
293+ {
294+ if (info->start_stop_gc)
295+ return NULL;
296
297- if (!was_marked && h->start_stop && !h->root.ldscript_def)
298+ /* To work around a glibc bug, mark XXX input sections
299+ when there is a reference to __start_XXX or __stop_XXX
300+ symbols. */
301+ else if (start_stop != NULL)
302 {
303- if (info->start_stop_gc)
304- return NULL;
305-
306- /* To work around a glibc bug, mark XXX input sections
307- when there is a reference to __start_XXX or __stop_XXX
308- symbols. */
309- else if (start_stop != NULL)
310- {
311- asection *s = h->u2.start_stop_section;
312- *start_stop = true;
313- return s;
314- }
315+ asection *s = h->u2.start_stop_section;
316+ *start_stop = true;
317+ return s;
318 }
319-
320- return (*gc_mark_hook) (sec, info, cookie->rel, h, NULL);
321 }
322
323- return (*gc_mark_hook) (sec, info, cookie->rel, NULL,
324- &cookie->locsyms[r_symndx]);
325+ return (*gc_mark_hook) (sec, info, cookie->rel, h, NULL);
326 }
327
328 /* COOKIE->rel describes a relocation against section SEC, which is
329@@ -15094,7 +15100,7 @@
330
331 struct elf_link_hash_entry *h;
332
333- h = get_ext_sym_hash (rcookie, r_symndx);
334+ h = get_ext_sym_hash_from_cookie (rcookie, r_symndx);
335
336 if (h != NULL)
337 {
diff --git a/meta/recipes-devtools/binutils/binutils/0018-CVE-2025-5245.patch b/meta/recipes-devtools/binutils/binutils/0018-CVE-2025-5245.patch
new file mode 100644
index 0000000000..d4b7d55966
--- /dev/null
+++ b/meta/recipes-devtools/binutils/binutils/0018-CVE-2025-5245.patch
@@ -0,0 +1,38 @@
1From: Alan Modra <amodra@gmail.com>
2Date: Tue, 1 Apr 2025 22:36:54 +1030
3
4PR32829, SEGV on objdump function debug_type_samep
5u.kenum is always non-NULL, see debug_make_enum_type.
6
7Upstream-Status: Backport [https://sourceware.org/git/?p=binutils-gdb.git;a=commitdiff;h=6c3458a8b7ee7d39f070c7b2350851cb2110c65a]
8CVE: CVE-2025-5245
9
10Signed-off-by: Deepesh Varatharajan <Deepesh.Varatharajan@windriver.com>
11
12diff --git a/binutils/debug.c b/binutils/debug.c
13index dcc8ccde..465b18e7 100644
14--- a/binutils/debug.c
15+++ b/binutils/debug.c
16@@ -2554,9 +2554,6 @@ debug_write_type (struct debug_handle *info,
17 case DEBUG_KIND_UNION_CLASS:
18 return debug_write_class_type (info, fns, fhandle, type, tag);
19 case DEBUG_KIND_ENUM:
20- if (type->u.kenum == NULL)
21- return (*fns->enum_type) (fhandle, tag, (const char **) NULL,
22- (bfd_signed_vma *) NULL);
23 return (*fns->enum_type) (fhandle, tag, type->u.kenum->names,
24 type->u.kenum->values);
25 case DEBUG_KIND_POINTER:
26@@ -3097,9 +3094,9 @@ debug_type_samep (struct debug_handle *info, struct debug_type_s *t1,
27 break;
28
29 case DEBUG_KIND_ENUM:
30- if (t1->u.kenum == NULL)
31- ret = t2->u.kenum == NULL;
32- else if (t2->u.kenum == NULL)
33+ if (t1->u.kenum->names == NULL)
34+ ret = t2->u.kenum->names == NULL;
35+ else if (t2->u.kenum->names == NULL)
36 ret = false;
37 else
38 {
diff --git a/meta/recipes-devtools/binutils/binutils/0019-CVE-2025-3198.patch b/meta/recipes-devtools/binutils/binutils/0019-CVE-2025-3198.patch
new file mode 100644
index 0000000000..49d7c94b9f
--- /dev/null
+++ b/meta/recipes-devtools/binutils/binutils/0019-CVE-2025-3198.patch
@@ -0,0 +1,28 @@
1From ba6ad3a18cb26b79e0e3b84c39f707535bbc344d Mon Sep 17 00:00:00 2001
2From: Alan Modra <amodra@gmail.com>
3Date: Wed, 19 Feb 2025 07:58:54 +1030
4Subject: [PATCH] PR32716, objdump -i memory leak
5
6 PR binutils/32716
7 * bucomm.c (display_info): Free arg.info.
8
9Upstream-Status: Backport [https://sourceware.org/git/?p=binutils-gdb.git;a=patch;h=ba6ad3a18cb26b79e0e3b84c39f707535bbc344d]
10CVE: CVE-2025-3198
11
12Signed-off-by: Harish Sadineni <Harish.Sadineni@windriver.com>
13---
14 binutils/bucomm.c | 1 +
15 1 file changed, 1 insertion(+)
16
17diff --git a/binutils/bucomm.c b/binutils/bucomm.c
18index ccf54099154..d4554737db1 100644
19--- a/binutils/bucomm.c
20+++ b/binutils/bucomm.c
21@@ -435,6 +435,7 @@ display_info (void)
22 if (!arg.error)
23 display_target_tables (&arg);
24
25+ free (arg.info);
26 return arg.error;
27 }
28
diff --git a/meta/recipes-devtools/binutils/binutils/0019-CVE-2025-5244.patch b/meta/recipes-devtools/binutils/binutils/0019-CVE-2025-5244.patch
new file mode 100644
index 0000000000..e8855a4b4b
--- /dev/null
+++ b/meta/recipes-devtools/binutils/binutils/0019-CVE-2025-5244.patch
@@ -0,0 +1,25 @@
1From: Alan Modra <amodra@gmail.com>
2Date: Thu, 10 Apr 2025 19:41:49 +0930
3
4Upstream-Status: Backport [https://sourceware.org/git/?p=binutils-gdb.git;a=patch;h=d1458933830456e54223d9fc61f0d9b3a19256f5]
5CVE: CVE-2025-5244
6
7PR32858 ld segfault on fuzzed object
8We missed one place where it is necessary to check for empty groups.
9
10Signed-off-by: Deepesh Varatharajan <Deepesh.Varatharajan@windriver.com>
11
12diff --git a/bfd/elflink.c b/bfd/elflink.c
13index a76e8e38da7..549b7b7dd92 100644
14--- a/bfd/elflink.c
15+++ b/bfd/elflink.c
16@@ -14408,7 +14408,8 @@ elf_gc_sweep (bfd *abfd, struct bfd_link_info *info)
17 if (o->flags & SEC_GROUP)
18 {
19 asection *first = elf_next_in_group (o);
20- o->gc_mark = first->gc_mark;
21+ if (first != NULL)
22+ o->gc_mark = first->gc_mark;
23 }
24
25 if (o->gc_mark)
diff --git a/meta/recipes-devtools/binutils/binutils/CVE-2025-1180.patch b/meta/recipes-devtools/binutils/binutils/CVE-2025-1180.patch
new file mode 100644
index 0000000000..073361cf19
--- /dev/null
+++ b/meta/recipes-devtools/binutils/binutils/CVE-2025-1180.patch
@@ -0,0 +1,165 @@
1From 509c5afcd71afd36cd6496f8c84733b11bd5e9e5 Mon Sep 17 00:00:00 2001
2From: Nick Clifton <nickc@redhat.com>
3Date: Thu, 22 May 2025 01:56:17 -0700
4Subject: [PATCH] Backport fix for PR 32642(CVE-2025-1180)
5
6Backporting the fix from PR 32636 to fix PR 32642 (ld SEGV (illegal read access)
7in _bfd_elf_write_section_eh_frame (bfd/elf-eh-frame.c:2234:29) with
8 --gc-sections --gc-keep-exported option)
9
10https://nvd.nist.gov/vuln/detail/CVE-2025-1180 is associated with
11PR32642 which will get fixed with commit from PR 32636.
12
13(cherry picked from commit: f9978defb6fab0bd8583942d97c112b0932ac814)
14Upstream-Status: Submitted [https://sourceware.org/pipermail/binutils/2025-May/141351.html]
15CVE: CVE-2025-1180
16
17Signed-off-by: Harish Sadineni <Harish.Sadineni@windriver.com>
18---
19 bfd/elflink.c | 88 +++++++++++++++++++++++++--------------------------
20 1 file changed, 44 insertions(+), 44 deletions(-)
21
22diff --git a/bfd/elflink.c b/bfd/elflink.c
23index 6346d7e2b4b..d765b688801 100644
24--- a/bfd/elflink.c
25+++ b/bfd/elflink.c
26@@ -96,22 +96,37 @@ _bfd_elf_link_keep_memory (struct bfd_link_info *info)
27 return true;
28 }
29
30-asection *
31-_bfd_elf_section_for_symbol (struct elf_reloc_cookie *cookie,
32- unsigned long r_symndx,
33- bool discard)
34+static struct elf_link_hash_entry *
35+get_ext_sym_hash (struct elf_reloc_cookie *cookie, unsigned long r_symndx)
36 {
37- if (r_symndx >= cookie->locsymcount
38- || ELF_ST_BIND (cookie->locsyms[r_symndx].st_info) != STB_LOCAL)
39- {
40- struct elf_link_hash_entry *h;
41+ struct elf_link_hash_entry *h = NULL;
42
43+ if ((r_symndx >= cookie->locsymcount
44+ || ELF_ST_BIND (cookie->locsyms[r_symndx].st_info) != STB_LOCAL)
45+ /* Guard against corrupt input. See PR 32636 for an example. */
46+ && r_symndx >= cookie->extsymoff)
47+ {
48 h = cookie->sym_hashes[r_symndx - cookie->extsymoff];
49
50 while (h->root.type == bfd_link_hash_indirect
51 || h->root.type == bfd_link_hash_warning)
52 h = (struct elf_link_hash_entry *) h->root.u.i.link;
53+ }
54+
55+ return h;
56+}
57
58+asection *
59+_bfd_elf_section_for_symbol (struct elf_reloc_cookie *cookie,
60+ unsigned long r_symndx,
61+ bool discard)
62+{
63+ struct elf_link_hash_entry *h;
64+
65+ h = get_ext_sym_hash (cookie, r_symndx);
66+
67+ if (h != NULL)
68+ {
69 if ((h->root.type == bfd_link_hash_defined
70 || h->root.type == bfd_link_hash_defweak)
71 && discarded_section (h->root.u.def.section))
72@@ -119,21 +134,20 @@ _bfd_elf_section_for_symbol (struct elf_reloc_cookie *cookie,
73 else
74 return NULL;
75 }
76- else
77- {
78- /* It's not a relocation against a global symbol,
79- but it could be a relocation against a local
80- symbol for a discarded section. */
81- asection *isec;
82- Elf_Internal_Sym *isym;
83
84- /* Need to: get the symbol; get the section. */
85- isym = &cookie->locsyms[r_symndx];
86- isec = bfd_section_from_elf_index (cookie->abfd, isym->st_shndx);
87- if (isec != NULL
88- && discard ? discarded_section (isec) : 1)
89- return isec;
90- }
91+ /* It's not a relocation against a global symbol,
92+ but it could be a relocation against a local
93+ symbol for a discarded section. */
94+ asection *isec;
95+ Elf_Internal_Sym *isym;
96+
97+ /* Need to: get the symbol; get the section. */
98+ isym = &cookie->locsyms[r_symndx];
99+ isec = bfd_section_from_elf_index (cookie->abfd, isym->st_shndx);
100+ if (isec != NULL
101+ && discard ? discarded_section (isec) : 1)
102+ return isec;
103+
104 return NULL;
105 }
106
107@@ -13994,22 +14008,12 @@ _bfd_elf_gc_mark_rsec (struct bfd_link_info *info, asection *sec,
108 if (r_symndx == STN_UNDEF)
109 return NULL;
110
111- if (r_symndx >= cookie->locsymcount
112- || ELF_ST_BIND (cookie->locsyms[r_symndx].st_info) != STB_LOCAL)
113+ h = get_ext_sym_hash (cookie, r_symndx);
114+
115+ if (h != NULL)
116 {
117 bool was_marked;
118
119- h = cookie->sym_hashes[r_symndx - cookie->extsymoff];
120- if (h == NULL)
121- {
122- info->callbacks->fatal (_("%F%P: corrupt input: %pB\n"),
123- sec->owner);
124- return NULL;
125- }
126- while (h->root.type == bfd_link_hash_indirect
127- || h->root.type == bfd_link_hash_warning)
128- h = (struct elf_link_hash_entry *) h->root.u.i.link;
129-
130 was_marked = h->mark;
131 h->mark = 1;
132 /* Keep all aliases of the symbol too. If an object symbol
133@@ -15064,17 +15068,12 @@ bfd_elf_reloc_symbol_deleted_p (bfd_vma offset, void *cookie)
134 if (r_symndx == STN_UNDEF)
135 return true;
136
137- if (r_symndx >= rcookie->locsymcount
138- || ELF_ST_BIND (rcookie->locsyms[r_symndx].st_info) != STB_LOCAL)
139- {
140- struct elf_link_hash_entry *h;
141-
142- h = rcookie->sym_hashes[r_symndx - rcookie->extsymoff];
143+ struct elf_link_hash_entry *h;
144
145- while (h->root.type == bfd_link_hash_indirect
146- || h->root.type == bfd_link_hash_warning)
147- h = (struct elf_link_hash_entry *) h->root.u.i.link;
148+ h = get_ext_sym_hash (rcookie, r_symndx);
149
150+ if (h != NULL)
151+ {
152 if ((h->root.type == bfd_link_hash_defined
153 || h->root.type == bfd_link_hash_defweak)
154 && (h->root.u.def.section->owner != rcookie->abfd
155@@ -15098,6 +15097,7 @@ bfd_elf_reloc_symbol_deleted_p (bfd_vma offset, void *cookie)
156 || discarded_section (isec)))
157 return true;
158 }
159+
160 return false;
161 }
162 return false;
163--
1642.49.0
165
diff --git a/meta/recipes-devtools/binutils/binutils/CVE-2025-1182.patch b/meta/recipes-devtools/binutils/binutils/CVE-2025-1182.patch
new file mode 100644
index 0000000000..4a3b6f072b
--- /dev/null
+++ b/meta/recipes-devtools/binutils/binutils/CVE-2025-1182.patch
@@ -0,0 +1,36 @@
1From 92bcd04fcd97f261ff40e9248e00a1dbebf3a536 Mon Sep 17 00:00:00 2001
2From: Nick Clifton <nickc@redhat.com>
3Date: Tue, 27 May 2025 03:37:50 -0700
4Subject: [PATCH] Backport fix for PR 32644(CVE-2025-1182)
5
6Fix another illegal memory access triggered by corrupt ELF input files.
7
8PR 32644
9
10(cherry picked from commit:b425859021d17adf62f06fb904797cf8642986ad)
11Upstream-Status: Submitted [https://sourceware.org/pipermail/binutils/2025-May/141415.html]
12CVE: CVE-2025-1182
13
14Signed-off-by: Harish Sadineni <Harish.Sadineni@windriver.com>
15---
16 bfd/elflink.c | 4 ++++
17 1 file changed, 4 insertions(+)
18
19diff --git a/bfd/elflink.c b/bfd/elflink.c
20index 6346d7e2b4b..a0b237b2224 100644
21--- a/bfd/elflink.c
22+++ b/bfd/elflink.c
23@@ -15084,6 +15084,10 @@ bfd_elf_reloc_symbol_deleted_p (bfd_vma offset, void *cookie)
24 }
25 else
26 {
27+ if (r_symndx >= rcookie->locsymcount)
28+ /* This can happen with corrupt input. */
29+ return false;
30+
31 /* It's not a relocation against a global symbol,
32 but it could be a relocation against a local
33 symbol for a discarded section. */
34--
352.49.0
36
diff --git a/meta/recipes-devtools/binutils/binutils_2.42.bb b/meta/recipes-devtools/binutils/binutils_2.44.bb
index 2cce40f1ef..79bcac2025 100644
--- a/meta/recipes-devtools/binutils/binutils_2.42.bb
+++ b/meta/recipes-devtools/binutils/binutils_2.44.bb
@@ -5,6 +5,7 @@ require binutils-${PV}.inc
5DEPENDS += "zlib perl-native" 5DEPENDS += "zlib perl-native"
6 6
7EXTRA_OECONF += "--with-sysroot=/ \ 7EXTRA_OECONF += "--with-sysroot=/ \
8 --with-libtool-sysroot=${STAGING_DIR_HOST} \
8 --enable-install-libbfd \ 9 --enable-install-libbfd \
9 --enable-install-libiberty \ 10 --enable-install-libiberty \
10 --enable-shared \ 11 --enable-shared \
@@ -66,11 +67,15 @@ PARALLEL_MAKEINST:class-nativesdk = ""
66PACKAGE_BEFORE_PN += "libbfd libopcodes gprofng" 67PACKAGE_BEFORE_PN += "libbfd libopcodes gprofng"
67FILES:libbfd = "${libdir}/libbfd-*.so.* ${libdir}/libbfd-*.so" 68FILES:libbfd = "${libdir}/libbfd-*.so.* ${libdir}/libbfd-*.so"
68FILES:libopcodes = "${libdir}/libopcodes-*.so.* ${libdir}/libopcodes-*.so" 69FILES:libopcodes = "${libdir}/libopcodes-*.so.* ${libdir}/libopcodes-*.so"
69FILES:gprofng = "${sysconfdir}/gprofng.rc ${libdir}/gprofng/libgp-*.so ${libdir}/gprofng/libgprofng.so.* ${bindir}/gp-* ${bindir}/gprofng" 70FILES:gprofng = "${sysconfdir}/gprofng.rc ${libdir}/gprofng/libgp-*.so ${libdir}/gprofng/libgprofng.so.* ${bindir}/gprofng-* ${bindir}/gprofng"
70FILES:${PN}-dev += "${libdir}/libgprofng.so ${libdir}/libsframe.so" 71FILES:${PN}-dev += "${libdir}/libgprofng.so ${libdir}/libsframe.so"
71SRC_URI:append:class-nativesdk = " file://0003-binutils-nativesdk-Search-for-alternative-ld.so.conf.patch " 72SRC_URI:append:class-nativesdk = " file://0003-binutils-nativesdk-Search-for-alternative-ld.so.conf.patch "
72 73
73USE_ALTERNATIVES_FOR:class-nativesdk = "" 74USE_ALTERNATIVES_FOR:class-nativesdk = ""
74FILES:${PN}:append:class-nativesdk = " ${bindir}" 75FILES:${PN}:append:class-nativesdk = " ${bindir}"
76RDEPENDS:gprofng:class-nativesdk = " nativesdk-perl-module-bignum \
77 nativesdk-perl-module-bigint \
78 nativesdk-perl-module-math-bigint \
79"
75 80
76BBCLASSEXTEND = "native nativesdk" 81BBCLASSEXTEND = "native nativesdk"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-07-03 15:47:07 +0000