summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/binutils
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2022-08-17 00:04:34 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2022-08-21 22:51:41 +0100
commit75720e6af143e4342143031ce229f39a38452e2f (patch)
tree3c28ec81b1a9c9c8794b9d9aa08d5197387bac8d /meta/recipes-devtools/binutils
parentc8570ddf2ef92a3f063004af3fb327918bbe83a5 (diff)
downloadpoky-75720e6af143e4342143031ce229f39a38452e2f.tar.gz
binutils: Upgrade to 2.39 release
Details of changes [1] [1] https://sourceware.org/pipermail/binutils/2022-August/122246.html (From OE-Core rev: a2458d4011e77868d6384b377a7a4cc1096c4ac3) (From OE-Core rev: 4fa90ce4f13eb8a854836462b1865fd08f5a68b2) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/binutils')
-rw-r--r--meta/recipes-devtools/binutils/binutils-2.39.inc (renamed from meta/recipes-devtools/binutils/binutils-2.38.inc)26
-rw-r--r--meta/recipes-devtools/binutils/binutils-cross-canadian_2.39.bb (renamed from meta/recipes-devtools/binutils/binutils-cross-canadian_2.38.bb)0
-rw-r--r--meta/recipes-devtools/binutils/binutils-cross-testsuite_2.39.bb (renamed from meta/recipes-devtools/binutils/binutils-cross-testsuite_2.38.bb)0
-rw-r--r--meta/recipes-devtools/binutils/binutils-cross_2.39.bb (renamed from meta/recipes-devtools/binutils/binutils-cross_2.38.bb)0
-rw-r--r--meta/recipes-devtools/binutils/binutils-crosssdk_2.39.bb (renamed from meta/recipes-devtools/binutils/binutils-crosssdk_2.38.bb)0
-rw-r--r--meta/recipes-devtools/binutils/binutils/0001-binutils-crosssdk-Generate-relocatable-SDKs.patch2
-rw-r--r--meta/recipes-devtools/binutils/binutils/0002-binutils-cross-Do-not-generate-linker-script-directo.patch2
-rw-r--r--meta/recipes-devtools/binutils/binutils/0003-binutils-nativesdk-Search-for-alternative-ld.so.conf.patch16
-rw-r--r--meta/recipes-devtools/binutils/binutils/0004-Point-scripts-location-to-libdir.patch10
-rw-r--r--meta/recipes-devtools/binutils/binutils/0005-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch (renamed from meta/recipes-devtools/binutils/binutils/0006-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch)2
-rw-r--r--meta/recipes-devtools/binutils/binutils/0006-warn-for-uses-of-system-directories-when-cross-linki.patch (renamed from meta/recipes-devtools/binutils/binutils/0007-warn-for-uses-of-system-directories-when-cross-linki.patch)42
-rw-r--r--meta/recipes-devtools/binutils/binutils/0007-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch (renamed from meta/recipes-devtools/binutils/binutils/0008-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch)8
-rw-r--r--meta/recipes-devtools/binutils/binutils/0008-Use-libtool-2.4.patch (renamed from meta/recipes-devtools/binutils/binutils/0009-Use-libtool-2.4.patch)8611
-rw-r--r--meta/recipes-devtools/binutils/binutils/0009-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch (renamed from meta/recipes-devtools/binutils/binutils/0010-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch)2
-rw-r--r--meta/recipes-devtools/binutils/binutils/0010-sync-with-OE-libtool-changes.patch (renamed from meta/recipes-devtools/binutils/binutils/0011-sync-with-OE-libtool-changes.patch)2
-rw-r--r--meta/recipes-devtools/binutils/binutils/0011-Check-for-clang-before-checking-gcc-version.patch (renamed from meta/recipes-devtools/binutils/binutils/0012-Check-for-clang-before-checking-gcc-version.patch)10
-rw-r--r--meta/recipes-devtools/binutils/binutils/0012-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch (renamed from meta/recipes-devtools/binutils/binutils/0005-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch)17
-rw-r--r--meta/recipes-devtools/binutils/binutils/0013-Avoid-as-info-race-condition.patch75
-rw-r--r--meta/recipes-devtools/binutils/binutils/0014-CVE-2019-1010204.patch49
-rw-r--r--meta/recipes-devtools/binutils/binutils_2.39.bb (renamed from meta/recipes-devtools/binutils/binutils_2.38.bb)0
20 files changed, 7594 insertions, 1280 deletions
diff --git a/meta/recipes-devtools/binutils/binutils-2.38.inc b/meta/recipes-devtools/binutils/binutils-2.39.inc
index 742ca86379..0976131ddb 100644
--- a/meta/recipes-devtools/binutils/binutils-2.38.inc
+++ b/meta/recipes-devtools/binutils/binutils-2.39.inc
@@ -12,26 +12,24 @@ LIC_FILES_CHKSUM="\
12 12
13# When upgrading to 2.39, please make sure there is no trailing .0, so 13# When upgrading to 2.39, please make sure there is no trailing .0, so
14# that upstream version check can work correctly. 14# that upstream version check can work correctly.
15PV = "2.38" 15PV = "2.39"
16CVE_VERSION = "2.38" 16CVE_VERSION = "2.39"
17SRCBRANCH ?= "binutils-2_38-branch" 17SRCBRANCH ?= "binutils-2_39-branch"
18 18
19UPSTREAM_CHECK_GITTAGREGEX = "binutils-(?P<pver>\d+_(\d_?)*)" 19UPSTREAM_CHECK_GITTAGREGEX = "binutils-(?P<pver>\d+_(\d_?)*)"
20 20
21SRCREV ?= "eed56ee299b9ef8754bb4e53f2e9cf2a7c28c04d" 21SRCREV ?= "a58f83e8b85fa3c1564de530d68a14fc620c0027"
22BINUTILS_GIT_URI ?= "git://sourceware.org/git/binutils-gdb.git;branch=${SRCBRANCH};protocol=git" 22BINUTILS_GIT_URI ?= "git://sourceware.org/git/binutils-gdb.git;branch=${SRCBRANCH};protocol=git"
23SRC_URI = "\ 23SRC_URI = "\
24 ${BINUTILS_GIT_URI} \ 24 ${BINUTILS_GIT_URI} \
25 file://0004-Point-scripts-location-to-libdir.patch \ 25 file://0004-Point-scripts-location-to-libdir.patch \
26 file://0005-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch \ 26 file://0005-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch \
27 file://0006-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch \ 27 file://0006-warn-for-uses-of-system-directories-when-cross-linki.patch \
28 file://0007-warn-for-uses-of-system-directories-when-cross-linki.patch \ 28 file://0007-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch \
29 file://0008-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch \ 29 file://0008-Use-libtool-2.4.patch \
30 file://0009-Use-libtool-2.4.patch \ 30 file://0009-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch \
31 file://0010-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch \ 31 file://0010-sync-with-OE-libtool-changes.patch \
32 file://0011-sync-with-OE-libtool-changes.patch \ 32 file://0011-Check-for-clang-before-checking-gcc-version.patch \
33 file://0012-Check-for-clang-before-checking-gcc-version.patch \ 33 file://0012-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch \
34 file://0013-Avoid-as-info-race-condition.patch \
35 file://0014-CVE-2019-1010204.patch \
36" 34"
37S = "${WORKDIR}/git" 35S = "${WORKDIR}/git"
diff --git a/meta/recipes-devtools/binutils/binutils-cross-canadian_2.38.bb b/meta/recipes-devtools/binutils/binutils-cross-canadian_2.39.bb
index 5dbaa03017..5dbaa03017 100644
--- a/meta/recipes-devtools/binutils/binutils-cross-canadian_2.38.bb
+++ b/meta/recipes-devtools/binutils/binutils-cross-canadian_2.39.bb
diff --git a/meta/recipes-devtools/binutils/binutils-cross-testsuite_2.38.bb b/meta/recipes-devtools/binutils/binutils-cross-testsuite_2.39.bb
index ca99e91130..ca99e91130 100644
--- a/meta/recipes-devtools/binutils/binutils-cross-testsuite_2.38.bb
+++ b/meta/recipes-devtools/binutils/binutils-cross-testsuite_2.39.bb
diff --git a/meta/recipes-devtools/binutils/binutils-cross_2.38.bb b/meta/recipes-devtools/binutils/binutils-cross_2.39.bb
index fbd1f7d25a..fbd1f7d25a 100644
--- a/meta/recipes-devtools/binutils/binutils-cross_2.38.bb
+++ b/meta/recipes-devtools/binutils/binutils-cross_2.39.bb
diff --git a/meta/recipes-devtools/binutils/binutils-crosssdk_2.38.bb b/meta/recipes-devtools/binutils/binutils-crosssdk_2.39.bb
index 5bd036fd46..5bd036fd46 100644
--- a/meta/recipes-devtools/binutils/binutils-crosssdk_2.38.bb
+++ b/meta/recipes-devtools/binutils/binutils-crosssdk_2.39.bb
diff --git a/meta/recipes-devtools/binutils/binutils/0001-binutils-crosssdk-Generate-relocatable-SDKs.patch b/meta/recipes-devtools/binutils/binutils/0001-binutils-crosssdk-Generate-relocatable-SDKs.patch
index 719928be79..9a7ee494c8 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 07bb7fbdacaf9cd6a1a252ffbc98f4e05e305d50 Mon Sep 17 00:00:00 2001 1From a0ac147aec127c66c9e38292faa50bb56d3c2a19 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
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 a3f7d62898..cab9c0ed89 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 f820ab7ea7e94d4df548be3388163ff2efb2ea96 Mon Sep 17 00:00:00 2001 1From fd7065bfd20364679e3c3f329b19059bbc51ab02 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
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 59a97c13c7..4fe5520010 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 b2ccd25828b40310caeb094c0413e3a30a4dc0a5 Mon Sep 17 00:00:00 2001 1From 67735b3647f98ce0f010ff8b4f9b5c5da576cb17 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 b55a873d927..61db131fb0d 100644 32index d31021c13e2..29782385ca4 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@
@@ -41,12 +41,12 @@ index b55a873d927..61db131fb0d 100644
41+ -DSYSCONFDIR="\"$(sysconfdir)\"" 41+ -DSYSCONFDIR="\"$(sysconfdir)\""
42 WARN_CFLAGS = @WARN_CFLAGS@ 42 WARN_CFLAGS = @WARN_CFLAGS@
43 NO_WERROR = @NO_WERROR@ 43 NO_WERROR = @NO_WERROR@
44 AM_CFLAGS = $(WARN_CFLAGS) $(ELF_CLFAGS) 44 AM_CFLAGS = $(WARN_CFLAGS) $(ELF_CLFAGS) $(JANSSON_CFLAGS)
45diff --git a/ld/Makefile.in b/ld/Makefile.in 45diff --git a/ld/Makefile.in b/ld/Makefile.in
46index 61e93eeaf1e..860eb21a785 100644 46index ee0c98f65b0..04ee68a2c67 100644
47--- a/ld/Makefile.in 47--- a/ld/Makefile.in
48+++ b/ld/Makefile.in 48+++ b/ld/Makefile.in
49@@ -556,7 +556,8 @@ ZLIB = @zlibdir@ -lz 49@@ -562,7 +562,8 @@ ZLIB = @zlibdir@ -lz
50 ZLIBINC = @zlibinc@ 50 ZLIBINC = @zlibinc@
51 ELF_CLFAGS = -DELF_LIST_OPTIONS=@elf_list_options@ \ 51 ELF_CLFAGS = -DELF_LIST_OPTIONS=@elf_list_options@ \
52 -DELF_SHLIB_LIST_OPTIONS=@elf_shlib_list_options@ \ 52 -DELF_SHLIB_LIST_OPTIONS=@elf_shlib_list_options@ \
@@ -54,13 +54,13 @@ index 61e93eeaf1e..860eb21a785 100644
54+ -DELF_PLT_UNWIND_LIST_OPTIONS=@elf_plt_unwind_list_options@ \ 54+ -DELF_PLT_UNWIND_LIST_OPTIONS=@elf_plt_unwind_list_options@ \
55+ -DSYSCONFDIR="\"$(sysconfdir)\"" 55+ -DSYSCONFDIR="\"$(sysconfdir)\""
56 56
57 AM_CFLAGS = $(WARN_CFLAGS) $(ELF_CLFAGS) 57 AM_CFLAGS = $(WARN_CFLAGS) $(ELF_CLFAGS) $(JANSSON_CFLAGS)
58 58
59diff --git a/ld/ldelf.c b/ld/ldelf.c 59diff --git a/ld/ldelf.c b/ld/ldelf.c
60index 121c25d948f..34cbc60e5e9 100644 60index bfa0d54753a..0d61a3209ec 100644
61--- a/ld/ldelf.c 61--- a/ld/ldelf.c
62+++ b/ld/ldelf.c 62+++ b/ld/ldelf.c
63@@ -930,7 +930,7 @@ ldelf_check_ld_so_conf (const struct bfd_link_needed_list *l, int force, 63@@ -936,7 +936,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;
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 8f323eb0c5..5b0f2ee308 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 7a7b777cdfded080aab1021fa6bcdb20345f5cfd Mon Sep 17 00:00:00 2001 1From 2158e5bd4c6ea4db89e33d46ef25428e37bfc3a6 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 2 Mar 2015 01:09:58 +0000 3Date: Mon, 2 Mar 2015 01:09:58 +0000
4Subject: [PATCH] Point scripts location to libdir 4Subject: [PATCH] Point scripts location to libdir
@@ -12,10 +12,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
12 2 files changed, 2 insertions(+), 2 deletions(-) 12 2 files changed, 2 insertions(+), 2 deletions(-)
13 13
14diff --git a/ld/Makefile.am b/ld/Makefile.am 14diff --git a/ld/Makefile.am b/ld/Makefile.am
15index 61db131fb0d..5b5ee64d121 100644 15index 29782385ca4..062e6b6814b 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_CLFAGS) 18@@ -51,7 +51,7 @@ AM_CFLAGS = $(WARN_CFLAGS) $(ELF_CLFAGS) $(JANSSON_CFLAGS)
19 # We put the scripts in the directory $(scriptdir)/ldscripts. 19 # We put the scripts in the directory $(scriptdir)/ldscripts.
20 # We can't put the scripts in $(datadir) because the SEARCH_DIR 20 # We can't put the scripts in $(datadir) because the SEARCH_DIR
21 # directives need to be different for native and cross linkers. 21 # directives need to be different for native and cross linkers.
@@ -25,10 +25,10 @@ index 61db131fb0d..5b5ee64d121 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 860eb21a785..d719747919c 100644 28index 04ee68a2c67..782d4017a60 100644
29--- a/ld/Makefile.in 29--- a/ld/Makefile.in
30+++ b/ld/Makefile.in 30+++ b/ld/Makefile.in
31@@ -564,7 +564,7 @@ AM_CFLAGS = $(WARN_CFLAGS) $(ELF_CLFAGS) 31@@ -570,7 +570,7 @@ AM_CFLAGS = $(WARN_CFLAGS) $(ELF_CLFAGS) $(JANSSON_CFLAGS)
32 # We put the scripts in the directory $(scriptdir)/ldscripts. 32 # We put the scripts in the directory $(scriptdir)/ldscripts.
33 # We can't put the scripts in $(datadir) because the SEARCH_DIR 33 # We can't put the scripts in $(datadir) because the SEARCH_DIR
34 # directives need to be different for native and cross linkers. 34 # directives need to be different for native and cross linkers.
diff --git a/meta/recipes-devtools/binutils/binutils/0006-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 507d0b1b2d..2495079508 100644
--- a/meta/recipes-devtools/binutils/binutils/0006-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 fc9e8b99969bb32a4b009eab763bade6c554ef73 Mon Sep 17 00:00:00 2001 1From e74d765a1a95253c9247228bd7ccbcabecdd8f7e 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
diff --git a/meta/recipes-devtools/binutils/binutils/0007-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 547bfcac68..00fb5aad1b 100644
--- a/meta/recipes-devtools/binutils/binutils/0007-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 9fb1bafb20371d82b674778d2a8b5c9444fed417 Mon Sep 17 00:00:00 2001 1From 2c43b1357db6b09d1645704afd3f45be6de0cf4d 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, 88 insertions(+), 2 deletions(-) 63 9 files changed, 88 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 26d55a00d47..ffad464783c 100644 66index d4c1fc420b5..1aece0b2c29 100644
67--- a/ld/config.in 67--- a/ld/config.in
68+++ b/ld/config.in 68+++ b/ld/config.in
69@@ -43,6 +43,9 @@ 69@@ -55,6 +55,9 @@
70 language is requested. */ 70 language is requested. */
71 #undef ENABLE_NLS 71 #undef ENABLE_NLS
72 72
@@ -77,10 +77,10 @@ index 26d55a00d47..ffad464783c 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 26150d62898..1f9ec8ec580 100755 80index e58fb7f3a35..d0a467ac101 100755
81--- a/ld/configure 81--- a/ld/configure
82+++ b/ld/configure 82+++ b/ld/configure
83@@ -831,6 +831,7 @@ with_lib_path 83@@ -836,6 +836,7 @@ with_lib_path
84 enable_targets 84 enable_targets
85 enable_64_bit_bfd 85 enable_64_bit_bfd
86 with_sysroot 86 with_sysroot
@@ -88,7 +88,7 @@ index 26150d62898..1f9ec8ec580 100755
88 enable_gold 88 enable_gold
89 enable_got 89 enable_got
90 enable_compressed_debug_sections 90 enable_compressed_debug_sections
91@@ -1500,6 +1501,8 @@ Optional Features: 91@@ -1514,6 +1515,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 26150d62898..1f9ec8ec580 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@@ -15312,6 +15315,19 @@ fi 100@@ -15349,6 +15352,19 @@ fi
101 101
102 102
103 103
@@ -118,7 +118,7 @@ index 26150d62898..1f9ec8ec580 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 7f4cff079b7..57d1abff870 100644 121index 4331d6b1302..e2976bc2926 100644
122--- a/ld/configure.ac 122--- a/ld/configure.ac
123+++ b/ld/configure.ac 123+++ b/ld/configure.ac
124@@ -102,6 +102,16 @@ AC_SUBST(use_sysroot) 124@@ -102,6 +102,16 @@ AC_SUBST(use_sysroot)
@@ -158,13 +158,13 @@ index f3086bf30de..db5064243c7 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 fc75e9b3625..dca697d626e 100644 161index eabbec8faa9..c4680e4947e 100644
162--- a/ld/ld.texi 162--- a/ld/ld.texi
163+++ b/ld/ld.texi 163+++ b/ld/ld.texi
164@@ -2892,6 +2892,18 @@ string identifying the original linked file does not change. 164@@ -2947,6 +2947,18 @@ creation of the metadata note, if one had been enabled by an earlier
165 165 occurrence of the --package-metdata option.
166 Passing @code{none} for @var{style} disables the setting from any 166 If the linker has been built with libjansson, then the JSON string
167 @code{--build-id} options earlier on the command line. 167 will be validated.
168+ 168+
169+@kindex --no-poison-system-directories 169+@kindex --no-poison-system-directories
170+@item --no-poison-system-directories 170+@item --no-poison-system-directories
@@ -209,13 +209,13 @@ index 731ae5f7aed..dd8f03fd960 100644
209 209
210 /* Try to open a BFD for a lang_input_statement. */ 210 /* Try to open a BFD for a lang_input_statement. */
211diff --git a/ld/ldlex.h b/ld/ldlex.h 211diff --git a/ld/ldlex.h b/ld/ldlex.h
212index bc58fea73cc..a1595589197 100644 212index 57ade1f754b..64007ff8684 100644
213--- a/ld/ldlex.h 213--- a/ld/ldlex.h
214+++ b/ld/ldlex.h 214+++ b/ld/ldlex.h
215@@ -164,6 +164,8 @@ enum option_values 215@@ -168,6 +168,8 @@ enum option_values
216 OPTION_CTF_VARIABLES, 216 OPTION_NO_WARN_EXECSTACK,
217 OPTION_NO_CTF_VARIABLES, 217 OPTION_WARN_RWX_SEGMENTS,
218 OPTION_CTF_SHARE_TYPES, 218 OPTION_NO_WARN_RWX_SEGMENTS,
219+ OPTION_NO_POISON_SYSTEM_DIRECTORIES, 219+ OPTION_NO_POISON_SYSTEM_DIRECTORIES,
220+ OPTION_ERROR_POISON_SYSTEM_DIRECTORIES, 220+ OPTION_ERROR_POISON_SYSTEM_DIRECTORIES,
221 }; 221 };
@@ -253,10 +253,10 @@ index 1ae90a77749..f40750fd816 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 5acc47ed5a0..d03c6136ccf 100644 256index 9225f71b3ce..92fb66f1fa2 100644
257--- a/ld/lexsup.c 257--- a/ld/lexsup.c
258+++ b/ld/lexsup.c 258+++ b/ld/lexsup.c
259@@ -600,6 +600,14 @@ static const struct ld_option ld_options[] = 259@@ -608,6 +608,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 5acc47ed5a0..d03c6136ccf 100644
271 }; 271 };
272 272
273 #define OPTION_COUNT ARRAY_SIZE (ld_options) 273 #define OPTION_COUNT ARRAY_SIZE (ld_options)
274@@ -1702,6 +1710,14 @@ parse_args (unsigned argc, char **argv) 274@@ -1722,6 +1730,14 @@ parse_args (unsigned argc, char **argv)
275 config.print_map_discarded = true; 275 config.print_map_discarded = true;
276 break; 276 break;
277 277
diff --git a/meta/recipes-devtools/binutils/binutils/0008-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 648bdc13d2..4ae1580102 100644
--- a/meta/recipes-devtools/binutils/binutils/0008-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 00ae1ee97ad3ad0624798b28c6bab94a19b3ef39 Mon Sep 17 00:00:00 2001 1From 883b6c0930410f8553b3bce0dd98131bc1694fa6 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,10 +14,10 @@ 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 a424dd924de..406d5b60917 100644 17index 7637d3e349e..8e074e13208 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@@ -6378,8 +6378,6 @@ const struct powerpc_opcode powerpc_opcodes[] = { 20@@ -6947,8 +6947,6 @@ const struct powerpc_opcode powerpc_opcodes[] = {
21 {"waitasec", X(31,30), XRTRARB_MASK, POWER8, POWER9, {0}}, 21 {"waitasec", X(31,30), XRTRARB_MASK, POWER8, POWER9, {0}},
22 {"waitrsv", XWCPL(31,30,1,0),0xffffffff, POWER10, EXT, {0}}, 22 {"waitrsv", XWCPL(31,30,1,0),0xffffffff, POWER10, EXT, {0}},
23 {"pause_short", XWCPL(31,30,2,0),0xffffffff, POWER10, EXT, {0}}, 23 {"pause_short", XWCPL(31,30,2,0),0xffffffff, POWER10, EXT, {0}},
@@ -26,7 +26,7 @@ index a424dd924de..406d5b60917 100644
26 26
27 {"lwepx", X(31,31), X_MASK, E500MC|PPCA2, 0, {RT, RA0, RB}}, 27 {"lwepx", X(31,31), X_MASK, E500MC|PPCA2, 0, {RT, RA0, RB}},
28 28
29@@ -6433,7 +6431,7 @@ const struct powerpc_opcode powerpc_opcodes[] = { 29@@ -7002,7 +7000,7 @@ const struct powerpc_opcode powerpc_opcodes[] = {
30 30
31 {"waitrsv", X(31,62)|(1<<21), 0xffffffff, E500MC|PPCA2, EXT, {0}}, 31 {"waitrsv", X(31,62)|(1<<21), 0xffffffff, E500MC|PPCA2, EXT, {0}},
32 {"waitimpl", X(31,62)|(2<<21), 0xffffffff, E500MC|PPCA2, EXT, {0}}, 32 {"waitimpl", X(31,62)|(2<<21), 0xffffffff, E500MC|PPCA2, EXT, {0}},
diff --git a/meta/recipes-devtools/binutils/binutils/0009-Use-libtool-2.4.patch b/meta/recipes-devtools/binutils/binutils/0008-Use-libtool-2.4.patch
index 9f0209e274..21e2c4fd70 100644
--- a/meta/recipes-devtools/binutils/binutils/0009-Use-libtool-2.4.patch
+++ b/meta/recipes-devtools/binutils/binutils/0008-Use-libtool-2.4.patch
@@ -1,4 +1,4 @@
1From 9a0dea4d2f1f0f2c71f519e6195ef9cfacd9fda9 Mon Sep 17 00:00:00 2001 1From 0f45262ef0d656c576adbb0b0f42b8f417895008 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
@@ -9,28 +9,75 @@ Upstream-Status: Pending
9 9
10Signed-off-by: Khem Raj <raj.khem@gmail.com> 10Signed-off-by: Khem Raj <raj.khem@gmail.com>
11--- 11---
12 bfd/configure | 1333 +++++++++++++----- 12 bfd/Makefile.in | 3 +
13 bfd/configure.ac | 2 +- 13 bfd/configure | 1333 +++++++++---
14 binutils/configure | 1331 +++++++++++++----- 14 bfd/configure.ac | 2 +-
15 gas/configure | 1331 +++++++++++++----- 15 binutils/Makefile.in | 3 +
16 gprof/configure | 1331 +++++++++++++----- 16 binutils/configure | 1331 +++++++++---
17 ld/configure | 1704 +++++++++++++++++------ 17 gas/Makefile.in | 3 +
18 libbacktrace/configure | 1534 +++++++++++++++------ 18 gas/configure | 1331 +++++++++---
19 libctf/configure | 1330 +++++++++++++----- 19 gdbsupport/Makefile.in | 1 +
20 libtool.m4 | 1093 ++++++++++----- 20 gprof/Makefile.in | 3 +
21 ltmain.sh | 2925 +++++++++++++++++++++++++++------------- 21 gprof/configure | 1331 +++++++++---
22 ltoptions.m4 | 2 +- 22 gprofng/Makefile.in | 2 +
23 ltversion.m4 | 12 +- 23 gprofng/configure | 1701 ++++++++++++----
24 lt~obsolete.m4 | 2 +- 24 gprofng/doc/Makefile.in | 2 +
25 opcodes/configure | 1331 +++++++++++++----- 25 gprofng/gp-display-html/Makefile.in | 2 +
26 zlib/configure | 1331 +++++++++++++----- 26 gprofng/libcollector/Makefile.in | 2 +
27 15 files changed, 12067 insertions(+), 4525 deletions(-) 27 gprofng/libcollector/configure | 1703 ++++++++++++----
28 gprofng/src/Makefile.in | 2 +
29 ld/Makefile.in | 3 +
30 ld/configure | 1704 ++++++++++++----
31 libbacktrace/Makefile.in | 3 +
32 libbacktrace/configure | 1331 +++++++++---
33 libctf/Makefile.in | 2 +
34 libctf/configure | 1330 +++++++++---
35 libtool.m4 | 1093 ++++++----
36 ltmain.sh | 2925 ++++++++++++++++++---------
37 ltoptions.m4 | 2 +-
38 ltversion.m4 | 12 +-
39 lt~obsolete.m4 | 2 +-
40 opcodes/Makefile.in | 3 +
41 opcodes/configure | 1331 +++++++++---
42 sim/Makefile.in | 3 +
43 zlib/Makefile.in | 204 +-
44 zlib/aclocal.m4 | 218 +-
45 zlib/configure | 1554 +++++++++-----
46 34 files changed, 14804 insertions(+), 5671 deletions(-)
28 47
48diff --git a/bfd/Makefile.in b/bfd/Makefile.in
49index a26f74d7199..6edacdfeb0e 100644
50--- a/bfd/Makefile.in
51+++ b/bfd/Makefile.in
52@@ -346,6 +346,7 @@ DATADIRNAME = @DATADIRNAME@
53 DEBUGDIR = @DEBUGDIR@
54 DEFS = @DEFS@
55 DEPDIR = @DEPDIR@
56+DLLTOOL = @DLLTOOL@
57 DSYMUTIL = @DSYMUTIL@
58 DUMPBIN = @DUMPBIN@
59 ECHO_C = @ECHO_C@
60@@ -380,6 +381,7 @@ LN_S = @LN_S@
61 LTLIBOBJS = @LTLIBOBJS@
62 MAINT = @MAINT@
63 MAKEINFO = @MAKEINFO@
64+MANIFEST_TOOL = @MANIFEST_TOOL@
65 MKDIR_P = @MKDIR_P@
66 MKINSTALLDIRS = @MKINSTALLDIRS@
67 MSGFMT = @MSGFMT@
68@@ -421,6 +423,7 @@ abs_builddir = @abs_builddir@
69 abs_srcdir = @abs_srcdir@
70 abs_top_builddir = @abs_top_builddir@
71 abs_top_srcdir = @abs_top_srcdir@
72+ac_ct_AR = @ac_ct_AR@
73 ac_ct_CC = @ac_ct_CC@
74 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
75 all_backends = @all_backends@
29diff --git a/bfd/configure b/bfd/configure 76diff --git a/bfd/configure b/bfd/configure
30index b23c9eebfd7..fb25d046cd2 100755 77index 4f591b750d8..d90db11744b 100755
31--- a/bfd/configure 78--- a/bfd/configure
32+++ b/bfd/configure 79+++ b/bfd/configure
33@@ -707,6 +707,9 @@ OTOOL 80@@ -702,6 +702,9 @@ OTOOL
34 LIPO 81 LIPO
35 NMEDIT 82 NMEDIT
36 DSYMUTIL 83 DSYMUTIL
@@ -40,7 +87,7 @@ index b23c9eebfd7..fb25d046cd2 100755
40 OBJDUMP 87 OBJDUMP
41 LN_S 88 LN_S
42 NM 89 NM
43@@ -825,6 +828,7 @@ enable_static 90@@ -820,6 +823,7 @@ enable_static
44 with_pic 91 with_pic
45 enable_fast_install 92 enable_fast_install
46 with_gnu_ld 93 with_gnu_ld
@@ -48,7 +95,7 @@ index b23c9eebfd7..fb25d046cd2 100755
48 enable_libtool_lock 95 enable_libtool_lock
49 enable_plugins 96 enable_plugins
50 enable_largefile 97 enable_largefile
51@@ -1509,6 +1513,8 @@ Optional Packages: 98@@ -1504,6 +1508,8 @@ Optional Packages:
52 --with-pic try to use only PIC/non-PIC objects [default=use 99 --with-pic try to use only PIC/non-PIC objects [default=use
53 both] 100 both]
54 --with-gnu-ld assume the C compiler uses GNU ld [default=no] 101 --with-gnu-ld assume the C compiler uses GNU ld [default=no]
@@ -57,7 +104,7 @@ index b23c9eebfd7..fb25d046cd2 100755
57 --with-mmap try using mmap for BFD input files if available 104 --with-mmap try using mmap for BFD input files if available
58 --with-separate-debug-dir=DIR 105 --with-separate-debug-dir=DIR
59 Look for global separate debug info in DIR 106 Look for global separate debug info in DIR
60@@ -5029,8 +5035,8 @@ esac 107@@ -5024,8 +5030,8 @@ esac
61 108
62 109
63 110
@@ -68,7 +115,7 @@ index b23c9eebfd7..fb25d046cd2 100755
68 115
69 116
70 117
71@@ -5070,7 +5076,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO 118@@ -5065,7 +5071,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
72 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 119 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
73 $as_echo_n "checking how to print strings... " >&6; } 120 $as_echo_n "checking how to print strings... " >&6; }
74 # Test print first, because it will be a builtin if present. 121 # Test print first, because it will be a builtin if present.
@@ -77,7 +124,7 @@ index b23c9eebfd7..fb25d046cd2 100755
77 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then 124 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
78 ECHO='print -r --' 125 ECHO='print -r --'
79 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then 126 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
80@@ -5757,8 +5763,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; 127@@ -5758,8 +5764,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6;
81 # Try some XSI features 128 # Try some XSI features
82 xsi_shell=no 129 xsi_shell=no
83 ( _lt_dummy="a/b/c" 130 ( _lt_dummy="a/b/c"
@@ -88,7 +135,7 @@ index b23c9eebfd7..fb25d046cd2 100755
88 && eval 'test $(( 1 + 1 )) -eq 2 \ 135 && eval 'test $(( 1 + 1 )) -eq 2 \
89 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ 136 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
90 && xsi_shell=yes 137 && xsi_shell=yes
91@@ -5807,6 +5813,80 @@ esac 138@@ -5808,6 +5814,80 @@ esac
92 139
93 140
94 141
@@ -169,7 +216,7 @@ index b23c9eebfd7..fb25d046cd2 100755
169 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 216 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
170 $as_echo_n "checking for $LD option to reload object files... " >&6; } 217 $as_echo_n "checking for $LD option to reload object files... " >&6; }
171 if ${lt_cv_ld_reload_flag+:} false; then : 218 if ${lt_cv_ld_reload_flag+:} false; then :
172@@ -5823,6 +5903,11 @@ case $reload_flag in 219@@ -5824,6 +5904,11 @@ case $reload_flag in
173 esac 220 esac
174 reload_cmds='$LD$reload_flag -o $output$reload_objs' 221 reload_cmds='$LD$reload_flag -o $output$reload_objs'
175 case $host_os in 222 case $host_os in
@@ -181,7 +228,7 @@ index b23c9eebfd7..fb25d046cd2 100755
181 darwin*) 228 darwin*)
182 if test "$GCC" = yes; then 229 if test "$GCC" = yes; then
183 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' 230 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
184@@ -5991,7 +6076,8 @@ mingw* | pw32*) 231@@ -5992,7 +6077,8 @@ mingw* | pw32*)
185 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' 232 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
186 lt_cv_file_magic_cmd='func_win32_libid' 233 lt_cv_file_magic_cmd='func_win32_libid'
187 else 234 else
@@ -191,7 +238,7 @@ index b23c9eebfd7..fb25d046cd2 100755
191 lt_cv_file_magic_cmd='$OBJDUMP -f' 238 lt_cv_file_magic_cmd='$OBJDUMP -f'
192 fi 239 fi
193 ;; 240 ;;
194@@ -6145,6 +6231,21 @@ esac 241@@ -6146,6 +6232,21 @@ esac
195 fi 242 fi
196 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 243 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
197 $as_echo "$lt_cv_deplibs_check_method" >&6; } 244 $as_echo "$lt_cv_deplibs_check_method" >&6; }
@@ -213,7 +260,7 @@ index b23c9eebfd7..fb25d046cd2 100755
213 file_magic_cmd=$lt_cv_file_magic_cmd 260 file_magic_cmd=$lt_cv_file_magic_cmd
214 deplibs_check_method=$lt_cv_deplibs_check_method 261 deplibs_check_method=$lt_cv_deplibs_check_method
215 test -z "$deplibs_check_method" && deplibs_check_method=unknown 262 test -z "$deplibs_check_method" && deplibs_check_method=unknown
216@@ -6160,6 +6261,157 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown 263@@ -6161,6 +6262,157 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
217 264
218 265
219 266
@@ -371,7 +418,7 @@ index b23c9eebfd7..fb25d046cd2 100755
371 plugin_option= 418 plugin_option=
372 plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll" 419 plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll"
373 for plugin in $plugin_names; do 420 for plugin in $plugin_names; do
374@@ -6174,8 +6426,10 @@ for plugin in $plugin_names; do 421@@ -6175,8 +6427,10 @@ for plugin in $plugin_names; do
375 done 422 done
376 423
377 if test -n "$ac_tool_prefix"; then 424 if test -n "$ac_tool_prefix"; then
@@ -384,7 +431,7 @@ index b23c9eebfd7..fb25d046cd2 100755
384 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 431 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
385 $as_echo_n "checking for $ac_word... " >&6; } 432 $as_echo_n "checking for $ac_word... " >&6; }
386 if ${ac_cv_prog_AR+:} false; then : 433 if ${ac_cv_prog_AR+:} false; then :
387@@ -6191,7 +6445,7 @@ do 434@@ -6192,7 +6446,7 @@ do
388 test -z "$as_dir" && as_dir=. 435 test -z "$as_dir" && as_dir=.
389 for ac_exec_ext in '' $ac_executable_extensions; do 436 for ac_exec_ext in '' $ac_executable_extensions; do
390 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 437 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
@@ -393,7 +440,7 @@ index b23c9eebfd7..fb25d046cd2 100755
393 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 440 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
394 break 2 441 break 2
395 fi 442 fi
396@@ -6211,11 +6465,15 @@ $as_echo "no" >&6; } 443@@ -6212,11 +6466,15 @@ $as_echo "no" >&6; }
397 fi 444 fi
398 445
399 446
@@ -412,7 +459,7 @@ index b23c9eebfd7..fb25d046cd2 100755
412 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 459 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
413 $as_echo_n "checking for $ac_word... " >&6; } 460 $as_echo_n "checking for $ac_word... " >&6; }
414 if ${ac_cv_prog_ac_ct_AR+:} false; then : 461 if ${ac_cv_prog_ac_ct_AR+:} false; then :
415@@ -6231,7 +6489,7 @@ do 462@@ -6232,7 +6490,7 @@ do
416 test -z "$as_dir" && as_dir=. 463 test -z "$as_dir" && as_dir=.
417 for ac_exec_ext in '' $ac_executable_extensions; do 464 for ac_exec_ext in '' $ac_executable_extensions; do
418 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 465 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
@@ -421,7 +468,7 @@ index b23c9eebfd7..fb25d046cd2 100755
421 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 468 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
422 break 2 469 break 2
423 fi 470 fi
424@@ -6250,6 +6508,10 @@ else 471@@ -6251,6 +6509,10 @@ else
425 $as_echo "no" >&6; } 472 $as_echo "no" >&6; }
426 fi 473 fi
427 474
@@ -432,7 +479,7 @@ index b23c9eebfd7..fb25d046cd2 100755
432 if test "x$ac_ct_AR" = x; then 479 if test "x$ac_ct_AR" = x; then
433 AR="false" 480 AR="false"
434 else 481 else
435@@ -6261,25 +6523,20 @@ ac_tool_warned=yes ;; 482@@ -6262,25 +6524,20 @@ ac_tool_warned=yes ;;
436 esac 483 esac
437 AR=$ac_ct_AR 484 AR=$ac_ct_AR
438 fi 485 fi
@@ -468,7 +515,7 @@ index b23c9eebfd7..fb25d046cd2 100755
468 515
469 516
470 517
471@@ -6290,6 +6547,63 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru 518@@ -6291,6 +6548,63 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru
472 519
473 520
474 521
@@ -532,7 +579,7 @@ index b23c9eebfd7..fb25d046cd2 100755
532 579
533 if test -n "$ac_tool_prefix"; then 580 if test -n "$ac_tool_prefix"; then
534 # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. 581 # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
535@@ -6630,8 +6944,8 @@ esac 582@@ -6631,8 +6945,8 @@ esac
536 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" 583 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
537 584
538 # Transform an extracted symbol line into symbol name and symbol address 585 # Transform an extracted symbol line into symbol name and symbol address
@@ -543,7 +590,7 @@ index b23c9eebfd7..fb25d046cd2 100755
543 590
544 # Handle CRLF in mingw tool chain 591 # Handle CRLF in mingw tool chain
545 opt_cr= 592 opt_cr=
546@@ -6667,6 +6981,7 @@ for ac_symprfx in "" "_"; do 593@@ -6668,6 +6982,7 @@ for ac_symprfx in "" "_"; do
547 else 594 else
548 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" 595 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
549 fi 596 fi
@@ -551,7 +598,7 @@ index b23c9eebfd7..fb25d046cd2 100755
551 598
552 # Check to see that the pipe works correctly. 599 # Check to see that the pipe works correctly.
553 pipe_works=no 600 pipe_works=no
554@@ -6708,6 +7023,18 @@ _LT_EOF 601@@ -6709,6 +7024,18 @@ _LT_EOF
555 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then 602 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
556 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then 603 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
557 cat <<_LT_EOF > conftest.$ac_ext 604 cat <<_LT_EOF > conftest.$ac_ext
@@ -570,7 +617,7 @@ index b23c9eebfd7..fb25d046cd2 100755
570 #ifdef __cplusplus 617 #ifdef __cplusplus
571 extern "C" { 618 extern "C" {
572 #endif 619 #endif
573@@ -6719,7 +7046,7 @@ _LT_EOF 620@@ -6720,7 +7047,7 @@ _LT_EOF
574 cat <<_LT_EOF >> conftest.$ac_ext 621 cat <<_LT_EOF >> conftest.$ac_ext
575 622
576 /* The mapping between symbol names and symbols. */ 623 /* The mapping between symbol names and symbols. */
@@ -579,7 +626,7 @@ index b23c9eebfd7..fb25d046cd2 100755
579 const char *name; 626 const char *name;
580 void *address; 627 void *address;
581 } 628 }
582@@ -6745,8 +7072,8 @@ static const void *lt_preloaded_setup() { 629@@ -6746,8 +7073,8 @@ static const void *lt_preloaded_setup() {
583 _LT_EOF 630 _LT_EOF
584 # Now try linking the two files. 631 # Now try linking the two files.
585 mv conftest.$ac_objext conftstm.$ac_objext 632 mv conftest.$ac_objext conftstm.$ac_objext
@@ -590,7 +637,7 @@ index b23c9eebfd7..fb25d046cd2 100755
590 LIBS="conftstm.$ac_objext" 637 LIBS="conftstm.$ac_objext"
591 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" 638 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
592 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 639 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
593@@ -6756,8 +7083,8 @@ _LT_EOF 640@@ -6757,8 +7084,8 @@ _LT_EOF
594 test $ac_status = 0; } && test -s conftest${ac_exeext}; then 641 test $ac_status = 0; } && test -s conftest${ac_exeext}; then
595 pipe_works=yes 642 pipe_works=yes
596 fi 643 fi
@@ -601,7 +648,7 @@ index b23c9eebfd7..fb25d046cd2 100755
601 else 648 else
602 echo "cannot find nm_test_func in $nlist" >&5 649 echo "cannot find nm_test_func in $nlist" >&5
603 fi 650 fi
604@@ -6794,6 +7121,14 @@ else 651@@ -6795,6 +7122,14 @@ else
605 $as_echo "ok" >&6; } 652 $as_echo "ok" >&6; }
606 fi 653 fi
607 654
@@ -616,7 +663,7 @@ index b23c9eebfd7..fb25d046cd2 100755
616 663
617 664
618 665
619@@ -6812,6 +7147,47 @@ fi 666@@ -6813,6 +7148,47 @@ fi
620 667
621 668
622 669
@@ -664,7 +711,7 @@ index b23c9eebfd7..fb25d046cd2 100755
664 711
665 712
666 713
667@@ -7021,6 +7397,123 @@ esac 714@@ -7022,6 +7398,123 @@ esac
668 715
669 need_locks="$enable_libtool_lock" 716 need_locks="$enable_libtool_lock"
670 717
@@ -788,7 +835,7 @@ index b23c9eebfd7..fb25d046cd2 100755
788 835
789 case $host_os in 836 case $host_os in
790 rhapsody* | darwin*) 837 rhapsody* | darwin*)
791@@ -7584,6 +8077,8 @@ _LT_EOF 838@@ -7585,6 +8078,8 @@ _LT_EOF
792 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 839 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
793 echo "$AR cru libconftest.a conftest.o" >&5 840 echo "$AR cru libconftest.a conftest.o" >&5
794 $AR cru libconftest.a conftest.o 2>&5 841 $AR cru libconftest.a conftest.o 2>&5
@@ -797,7 +844,7 @@ index b23c9eebfd7..fb25d046cd2 100755
797 cat > conftest.c << _LT_EOF 844 cat > conftest.c << _LT_EOF
798 int main() { return 0;} 845 int main() { return 0;}
799 _LT_EOF 846 _LT_EOF
800@@ -8135,8 +8630,6 @@ fi 847@@ -8136,8 +8631,6 @@ fi
801 lt_prog_compiler_pic= 848 lt_prog_compiler_pic=
802 lt_prog_compiler_static= 849 lt_prog_compiler_static=
803 850
@@ -806,7 +853,7 @@ index b23c9eebfd7..fb25d046cd2 100755
806 853
807 if test "$GCC" = yes; then 854 if test "$GCC" = yes; then
808 lt_prog_compiler_wl='-Wl,' 855 lt_prog_compiler_wl='-Wl,'
809@@ -8302,6 +8795,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 856@@ -8303,6 +8796,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
810 lt_prog_compiler_pic='--shared' 857 lt_prog_compiler_pic='--shared'
811 lt_prog_compiler_static='--static' 858 lt_prog_compiler_static='--static'
812 ;; 859 ;;
@@ -819,7 +866,7 @@ index b23c9eebfd7..fb25d046cd2 100755
819 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) 866 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
820 # Portland Group compilers (*not* the Pentium gcc compiler, 867 # Portland Group compilers (*not* the Pentium gcc compiler,
821 # which looks to be a dead project) 868 # which looks to be a dead project)
822@@ -8364,7 +8863,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 869@@ -8365,7 +8864,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
823 lt_prog_compiler_pic='-KPIC' 870 lt_prog_compiler_pic='-KPIC'
824 lt_prog_compiler_static='-Bstatic' 871 lt_prog_compiler_static='-Bstatic'
825 case $cc_basename in 872 case $cc_basename in
@@ -828,7 +875,7 @@ index b23c9eebfd7..fb25d046cd2 100755
828 lt_prog_compiler_wl='-Qoption ld ';; 875 lt_prog_compiler_wl='-Qoption ld ';;
829 *) 876 *)
830 lt_prog_compiler_wl='-Wl,';; 877 lt_prog_compiler_wl='-Wl,';;
831@@ -8421,13 +8920,17 @@ case $host_os in 878@@ -8422,13 +8921,17 @@ case $host_os in
832 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" 879 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
833 ;; 880 ;;
834 esac 881 esac
@@ -852,7 +899,7 @@ index b23c9eebfd7..fb25d046cd2 100755
852 899
853 # 900 #
854 # Check to make sure the PIC flag actually works. 901 # Check to make sure the PIC flag actually works.
855@@ -8488,6 +8991,11 @@ fi 902@@ -8489,6 +8992,11 @@ fi
856 903
857 904
858 905
@@ -864,7 +911,7 @@ index b23c9eebfd7..fb25d046cd2 100755
864 # 911 #
865 # Check to make sure the static flag actually works. 912 # Check to make sure the static flag actually works.
866 # 913 #
867@@ -8838,7 +9346,8 @@ _LT_EOF 914@@ -8839,7 +9347,8 @@ _LT_EOF
868 allow_undefined_flag=unsupported 915 allow_undefined_flag=unsupported
869 always_export_symbols=no 916 always_export_symbols=no
870 enable_shared_with_static_runtimes=yes 917 enable_shared_with_static_runtimes=yes
@@ -874,7 +921,7 @@ index b23c9eebfd7..fb25d046cd2 100755
874 921
875 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then 922 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
876 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' 923 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
877@@ -8937,12 +9446,12 @@ _LT_EOF 924@@ -8938,12 +9447,12 @@ _LT_EOF
878 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' 925 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
879 hardcode_libdir_flag_spec= 926 hardcode_libdir_flag_spec=
880 hardcode_libdir_flag_spec_ld='-rpath $libdir' 927 hardcode_libdir_flag_spec_ld='-rpath $libdir'
@@ -889,7 +936,7 @@ index b23c9eebfd7..fb25d046cd2 100755
889 fi 936 fi
890 ;; 937 ;;
891 esac 938 esac
892@@ -8956,8 +9465,8 @@ _LT_EOF 939@@ -8957,8 +9466,8 @@ _LT_EOF
893 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' 940 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
894 wlarc= 941 wlarc=
895 else 942 else
@@ -900,7 +947,7 @@ index b23c9eebfd7..fb25d046cd2 100755
900 fi 947 fi
901 ;; 948 ;;
902 949
903@@ -8975,8 +9484,8 @@ _LT_EOF 950@@ -8976,8 +9485,8 @@ _LT_EOF
904 951
905 _LT_EOF 952 _LT_EOF
906 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 953 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -911,7 +958,7 @@ index b23c9eebfd7..fb25d046cd2 100755
911 else 958 else
912 ld_shlibs=no 959 ld_shlibs=no
913 fi 960 fi
914@@ -9022,8 +9531,8 @@ _LT_EOF 961@@ -9023,8 +9532,8 @@ _LT_EOF
915 962
916 *) 963 *)
917 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 964 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -922,7 +969,7 @@ index b23c9eebfd7..fb25d046cd2 100755
922 else 969 else
923 ld_shlibs=no 970 ld_shlibs=no
924 fi 971 fi
925@@ -9153,7 +9662,13 @@ _LT_EOF 972@@ -9154,7 +9663,13 @@ _LT_EOF
926 allow_undefined_flag='-berok' 973 allow_undefined_flag='-berok'
927 # Determine the default libpath from the value encoded in an 974 # Determine the default libpath from the value encoded in an
928 # empty executable. 975 # empty executable.
@@ -937,7 +984,7 @@ index b23c9eebfd7..fb25d046cd2 100755
937 /* end confdefs.h. */ 984 /* end confdefs.h. */
938 985
939 int 986 int
940@@ -9166,22 +9681,29 @@ main () 987@@ -9167,22 +9682,29 @@ main ()
941 _ACEOF 988 _ACEOF
942 if ac_fn_c_try_link "$LINENO"; then : 989 if ac_fn_c_try_link "$LINENO"; then :
943 990
@@ -980,7 +1027,7 @@ index b23c9eebfd7..fb25d046cd2 100755
980 1027
981 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 1028 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
982 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" 1029 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"
983@@ -9193,7 +9715,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 1030@@ -9194,7 +9716,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
984 else 1031 else
985 # Determine the default libpath from the value encoded in an 1032 # Determine the default libpath from the value encoded in an
986 # empty executable. 1033 # empty executable.
@@ -995,7 +1042,7 @@ index b23c9eebfd7..fb25d046cd2 100755
995 /* end confdefs.h. */ 1042 /* end confdefs.h. */
996 1043
997 int 1044 int
998@@ -9206,22 +9734,29 @@ main () 1045@@ -9207,22 +9735,29 @@ main ()
999 _ACEOF 1046 _ACEOF
1000 if ac_fn_c_try_link "$LINENO"; then : 1047 if ac_fn_c_try_link "$LINENO"; then :
1001 1048
@@ -1038,7 +1085,7 @@ index b23c9eebfd7..fb25d046cd2 100755
1038 1085
1039 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 1086 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
1040 # Warning - without using the other run time loading flags, 1087 # Warning - without using the other run time loading flags,
1041@@ -9266,20 +9801,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 1088@@ -9267,20 +9802,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
1042 # Microsoft Visual C++. 1089 # Microsoft Visual C++.
1043 # hardcode_libdir_flag_spec is actually meaningless, as there is 1090 # hardcode_libdir_flag_spec is actually meaningless, as there is
1044 # no search path for DLLs. 1091 # no search path for DLLs.
@@ -1116,7 +1163,7 @@ index b23c9eebfd7..fb25d046cd2 100755
1116 ;; 1163 ;;
1117 1164
1118 darwin* | rhapsody*) 1165 darwin* | rhapsody*)
1119@@ -9340,7 +9918,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 1166@@ -9341,7 +9919,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
1120 1167
1121 # FreeBSD 3 and greater uses gcc -shared to do shared libraries. 1168 # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
1122 freebsd* | dragonfly*) 1169 freebsd* | dragonfly*)
@@ -1125,7 +1172,7 @@ index b23c9eebfd7..fb25d046cd2 100755
1125 hardcode_libdir_flag_spec='-R$libdir' 1172 hardcode_libdir_flag_spec='-R$libdir'
1126 hardcode_direct=yes 1173 hardcode_direct=yes
1127 hardcode_shlibpath_var=no 1174 hardcode_shlibpath_var=no
1128@@ -9348,7 +9926,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 1175@@ -9349,7 +9927,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
1129 1176
1130 hpux9*) 1177 hpux9*)
1131 if test "$GCC" = yes; then 1178 if test "$GCC" = yes; then
@@ -1134,7 +1181,7 @@ index b23c9eebfd7..fb25d046cd2 100755
1134 else 1181 else
1135 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' 1182 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'
1136 fi 1183 fi
1137@@ -9364,7 +9942,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 1184@@ -9365,7 +9943,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
1138 1185
1139 hpux10*) 1186 hpux10*)
1140 if test "$GCC" = yes && test "$with_gnu_ld" = no; then 1187 if test "$GCC" = yes && test "$with_gnu_ld" = no; then
@@ -1143,7 +1190,7 @@ index b23c9eebfd7..fb25d046cd2 100755
1143 else 1190 else
1144 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' 1191 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
1145 fi 1192 fi
1146@@ -9388,10 +9966,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 1193@@ -9389,10 +9967,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
1147 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' 1194 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
1148 ;; 1195 ;;
1149 ia64*) 1196 ia64*)
@@ -1156,7 +1203,7 @@ index b23c9eebfd7..fb25d046cd2 100755
1156 ;; 1203 ;;
1157 esac 1204 esac
1158 else 1205 else
1159@@ -9470,23 +10048,36 @@ fi 1206@@ -9471,23 +10049,36 @@ fi
1160 1207
1161 irix5* | irix6* | nonstopux*) 1208 irix5* | irix6* | nonstopux*)
1162 if test "$GCC" = yes; then 1209 if test "$GCC" = yes; then
@@ -1201,7 +1248,7 @@ index b23c9eebfd7..fb25d046cd2 100755
1201 else 1248 else
1202 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' 1249 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'
1203 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' 1250 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'
1204@@ -9571,7 +10162,7 @@ rm -f core conftest.err conftest.$ac_objext \ 1251@@ -9572,7 +10163,7 @@ rm -f core conftest.err conftest.$ac_objext \
1205 osf4* | osf5*) # as osf3* with the addition of -msym flag 1252 osf4* | osf5*) # as osf3* with the addition of -msym flag
1206 if test "$GCC" = yes; then 1253 if test "$GCC" = yes; then
1207 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' 1254 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
@@ -1210,7 +1257,7 @@ index b23c9eebfd7..fb25d046cd2 100755
1210 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' 1257 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
1211 else 1258 else
1212 allow_undefined_flag=' -expect_unresolved \*' 1259 allow_undefined_flag=' -expect_unresolved \*'
1213@@ -9590,9 +10181,9 @@ rm -f core conftest.err conftest.$ac_objext \ 1260@@ -9591,9 +10182,9 @@ rm -f core conftest.err conftest.$ac_objext \
1214 no_undefined_flag=' -z defs' 1261 no_undefined_flag=' -z defs'
1215 if test "$GCC" = yes; then 1262 if test "$GCC" = yes; then
1216 wlarc='${wl}' 1263 wlarc='${wl}'
@@ -1222,7 +1269,7 @@ index b23c9eebfd7..fb25d046cd2 100755
1222 else 1269 else
1223 case `$CC -V 2>&1` in 1270 case `$CC -V 2>&1` in
1224 *"Compilers 5.0"*) 1271 *"Compilers 5.0"*)
1225@@ -10168,8 +10759,9 @@ cygwin* | mingw* | pw32* | cegcc*) 1272@@ -10169,8 +10760,9 @@ cygwin* | mingw* | pw32* | cegcc*)
1226 need_version=no 1273 need_version=no
1227 need_lib_prefix=no 1274 need_lib_prefix=no
1228 1275
@@ -1234,7 +1281,7 @@ index b23c9eebfd7..fb25d046cd2 100755
1234 library_names_spec='$libname.dll.a' 1281 library_names_spec='$libname.dll.a'
1235 # DLL is installed to $(libdir)/../bin by postinstall_cmds 1282 # DLL is installed to $(libdir)/../bin by postinstall_cmds
1236 postinstall_cmds='base_file=`basename \${file}`~ 1283 postinstall_cmds='base_file=`basename \${file}`~
1237@@ -10202,13 +10794,71 @@ cygwin* | mingw* | pw32* | cegcc*) 1284@@ -10203,13 +10795,71 @@ cygwin* | mingw* | pw32* | cegcc*)
1238 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' 1285 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
1239 ;; 1286 ;;
1240 esac 1287 esac
@@ -1307,16 +1354,16 @@ index b23c9eebfd7..fb25d046cd2 100755
1307 # FIXME: first we should search . and the directory the executable is in 1354 # FIXME: first we should search . and the directory the executable is in
1308 shlibpath_var=PATH 1355 shlibpath_var=PATH
1309 ;; 1356 ;;
1310@@ -11086,7 +11736,7 @@ else 1357@@ -11087,7 +11737,7 @@ else
1311 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 1358 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
1312 lt_status=$lt_dlunknown 1359 lt_status=$lt_dlunknown
1313 cat > conftest.$ac_ext <<_LT_EOF 1360 cat > conftest.$ac_ext <<_LT_EOF
1314-#line 11089 "configure" 1361-#line 11090 "configure"
1315+#line $LINENO "configure" 1362+#line $LINENO "configure"
1316 #include "confdefs.h" 1363 #include "confdefs.h"
1317 1364
1318 #if HAVE_DLFCN_H 1365 #if HAVE_DLFCN_H
1319@@ -11130,10 +11780,10 @@ else 1366@@ -11131,10 +11781,10 @@ else
1320 /* When -fvisbility=hidden is used, assume the code has been annotated 1367 /* When -fvisbility=hidden is used, assume the code has been annotated
1321 correspondingly for the symbols needed. */ 1368 correspondingly for the symbols needed. */
1322 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 1369 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
@@ -1329,16 +1376,16 @@ index b23c9eebfd7..fb25d046cd2 100755
1329 int main () 1376 int main ()
1330 { 1377 {
1331 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 1378 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
1332@@ -11192,7 +11842,7 @@ else 1379@@ -11193,7 +11843,7 @@ else
1333 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 1380 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
1334 lt_status=$lt_dlunknown 1381 lt_status=$lt_dlunknown
1335 cat > conftest.$ac_ext <<_LT_EOF 1382 cat > conftest.$ac_ext <<_LT_EOF
1336-#line 11195 "configure" 1383-#line 11196 "configure"
1337+#line $LINENO "configure" 1384+#line $LINENO "configure"
1338 #include "confdefs.h" 1385 #include "confdefs.h"
1339 1386
1340 #if HAVE_DLFCN_H 1387 #if HAVE_DLFCN_H
1341@@ -11236,10 +11886,10 @@ else 1388@@ -11237,10 +11887,10 @@ else
1342 /* When -fvisbility=hidden is used, assume the code has been annotated 1389 /* When -fvisbility=hidden is used, assume the code has been annotated
1343 correspondingly for the symbols needed. */ 1390 correspondingly for the symbols needed. */
1344 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 1391 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
@@ -1351,7 +1398,7 @@ index b23c9eebfd7..fb25d046cd2 100755
1351 int main () 1398 int main ()
1352 { 1399 {
1353 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 1400 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
1354@@ -13224,7 +13874,7 @@ SHARED_LDFLAGS= 1401@@ -13225,7 +13875,7 @@ SHARED_LDFLAGS=
1355 if test "$enable_shared" = "yes"; then 1402 if test "$enable_shared" = "yes"; then
1356 x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'` 1403 x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'`
1357 if test -n "$x"; then 1404 if test -n "$x"; then
@@ -1360,7 +1407,7 @@ index b23c9eebfd7..fb25d046cd2 100755
1360 fi 1407 fi
1361 fi 1408 fi
1362 1409
1363@@ -15879,13 +16529,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' 1410@@ -15869,13 +16519,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
1364 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' 1411 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
1365 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' 1412 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
1366 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' 1413 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
@@ -1381,7 +1428,7 @@ index b23c9eebfd7..fb25d046cd2 100755
1381 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' 1428 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
1382 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' 1429 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
1383 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' 1430 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
1384@@ -15900,14 +16557,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de 1431@@ -15890,14 +16547,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de
1385 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' 1432 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
1386 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' 1433 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
1387 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"`' 1434 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"`'
@@ -1400,7 +1447,7 @@ index b23c9eebfd7..fb25d046cd2 100755
1400 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' 1447 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
1401 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' 1448 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
1402 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' 1449 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
1403@@ -15940,12 +16600,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q 1450@@ -15930,12 +16590,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q
1404 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' 1451 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
1405 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' 1452 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
1406 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' 1453 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
@@ -1414,7 +1461,7 @@ index b23c9eebfd7..fb25d046cd2 100755
1414 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' 1461 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
1415 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' 1462 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
1416 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' 1463 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
1417@@ -16000,8 +16660,13 @@ reload_flag \ 1464@@ -15990,8 +16650,13 @@ reload_flag \
1418 OBJDUMP \ 1465 OBJDUMP \
1419 deplibs_check_method \ 1466 deplibs_check_method \
1420 file_magic_cmd \ 1467 file_magic_cmd \
@@ -1428,7 +1475,7 @@ index b23c9eebfd7..fb25d046cd2 100755
1428 STRIP \ 1475 STRIP \
1429 RANLIB \ 1476 RANLIB \
1430 CC \ 1477 CC \
1431@@ -16011,12 +16676,14 @@ lt_cv_sys_global_symbol_pipe \ 1478@@ -16001,12 +16666,14 @@ lt_cv_sys_global_symbol_pipe \
1432 lt_cv_sys_global_symbol_to_cdecl \ 1479 lt_cv_sys_global_symbol_to_cdecl \
1433 lt_cv_sys_global_symbol_to_c_name_address \ 1480 lt_cv_sys_global_symbol_to_c_name_address \
1434 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ 1481 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
@@ -1444,7 +1491,7 @@ index b23c9eebfd7..fb25d046cd2 100755
1444 DSYMUTIL \ 1491 DSYMUTIL \
1445 NMEDIT \ 1492 NMEDIT \
1446 LIPO \ 1493 LIPO \
1447@@ -16032,7 +16699,6 @@ no_undefined_flag \ 1494@@ -16022,7 +16689,6 @@ no_undefined_flag \
1448 hardcode_libdir_flag_spec \ 1495 hardcode_libdir_flag_spec \
1449 hardcode_libdir_flag_spec_ld \ 1496 hardcode_libdir_flag_spec_ld \
1450 hardcode_libdir_separator \ 1497 hardcode_libdir_separator \
@@ -1452,7 +1499,7 @@ index b23c9eebfd7..fb25d046cd2 100755
1452 exclude_expsyms \ 1499 exclude_expsyms \
1453 include_expsyms \ 1500 include_expsyms \
1454 file_list_spec \ 1501 file_list_spec \
1455@@ -16068,6 +16734,7 @@ module_cmds \ 1502@@ -16058,6 +16724,7 @@ module_cmds \
1456 module_expsym_cmds \ 1503 module_expsym_cmds \
1457 export_symbols_cmds \ 1504 export_symbols_cmds \
1458 prelink_cmds \ 1505 prelink_cmds \
@@ -1460,7 +1507,7 @@ index b23c9eebfd7..fb25d046cd2 100755
1460 postinstall_cmds \ 1507 postinstall_cmds \
1461 postuninstall_cmds \ 1508 postuninstall_cmds \
1462 finish_cmds \ 1509 finish_cmds \
1463@@ -16837,7 +17504,8 @@ $as_echo X"$file" | 1510@@ -16826,7 +17493,8 @@ $as_echo X"$file" |
1464 # NOTE: Changes made to this file will be lost: look at ltmain.sh. 1511 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
1465 # 1512 #
1466 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 1513 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
@@ -1470,7 +1517,7 @@ index b23c9eebfd7..fb25d046cd2 100755
1470 # Written by Gordon Matzigkeit, 1996 1517 # Written by Gordon Matzigkeit, 1996
1471 # 1518 #
1472 # This file is part of GNU Libtool. 1519 # This file is part of GNU Libtool.
1473@@ -16940,19 +17608,42 @@ SP2NL=$lt_lt_SP2NL 1520@@ -16929,19 +17597,42 @@ SP2NL=$lt_lt_SP2NL
1474 # turn newlines into spaces. 1521 # turn newlines into spaces.
1475 NL2SP=$lt_lt_NL2SP 1522 NL2SP=$lt_lt_NL2SP
1476 1523
@@ -1514,7 +1561,7 @@ index b23c9eebfd7..fb25d046cd2 100755
1514 # A symbol stripping program. 1561 # A symbol stripping program.
1515 STRIP=$lt_STRIP 1562 STRIP=$lt_STRIP
1516 1563
1517@@ -16982,6 +17673,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address 1564@@ -16971,6 +17662,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
1518 # Transform the output of nm in a C name address pair when lib prefix is needed. 1565 # Transform the output of nm in a C name address pair when lib prefix is needed.
1519 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix 1566 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
1520 1567
@@ -1527,7 +1574,7 @@ index b23c9eebfd7..fb25d046cd2 100755
1527 # The name of the directory that contains temporary libtool files. 1574 # The name of the directory that contains temporary libtool files.
1528 objdir=$objdir 1575 objdir=$objdir
1529 1576
1530@@ -16991,6 +17688,9 @@ MAGIC_CMD=$MAGIC_CMD 1577@@ -16980,6 +17677,9 @@ MAGIC_CMD=$MAGIC_CMD
1531 # Must we lock files when doing compilation? 1578 # Must we lock files when doing compilation?
1532 need_locks=$lt_need_locks 1579 need_locks=$lt_need_locks
1533 1580
@@ -1537,7 +1584,7 @@ index b23c9eebfd7..fb25d046cd2 100755
1537 # Tool to manipulate archived DWARF debug symbol files on Mac OS X. 1584 # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
1538 DSYMUTIL=$lt_DSYMUTIL 1585 DSYMUTIL=$lt_DSYMUTIL
1539 1586
1540@@ -17105,12 +17805,12 @@ with_gcc=$GCC 1587@@ -17094,12 +17794,12 @@ with_gcc=$GCC
1541 # Compiler flag to turn off builtin functions. 1588 # Compiler flag to turn off builtin functions.
1542 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag 1589 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
1543 1590
@@ -1553,7 +1600,7 @@ index b23c9eebfd7..fb25d046cd2 100755
1553 # Compiler flag to prevent dynamic linking. 1600 # Compiler flag to prevent dynamic linking.
1554 link_static_flag=$lt_lt_prog_compiler_static 1601 link_static_flag=$lt_lt_prog_compiler_static
1555 1602
1556@@ -17197,9 +17897,6 @@ inherit_rpath=$inherit_rpath 1603@@ -17186,9 +17886,6 @@ inherit_rpath=$inherit_rpath
1557 # Whether libtool must link a program against all its dependency libraries. 1604 # Whether libtool must link a program against all its dependency libraries.
1558 link_all_deplibs=$link_all_deplibs 1605 link_all_deplibs=$link_all_deplibs
1559 1606
@@ -1563,7 +1610,7 @@ index b23c9eebfd7..fb25d046cd2 100755
1563 # Set to "yes" if exported symbols are required. 1610 # Set to "yes" if exported symbols are required.
1564 always_export_symbols=$always_export_symbols 1611 always_export_symbols=$always_export_symbols
1565 1612
1566@@ -17215,6 +17912,9 @@ include_expsyms=$lt_include_expsyms 1613@@ -17204,6 +17901,9 @@ include_expsyms=$lt_include_expsyms
1567 # Commands necessary for linking programs (against libraries) with templates. 1614 # Commands necessary for linking programs (against libraries) with templates.
1568 prelink_cmds=$lt_prelink_cmds 1615 prelink_cmds=$lt_prelink_cmds
1569 1616
@@ -1573,7 +1620,7 @@ index b23c9eebfd7..fb25d046cd2 100755
1573 # Specify filename containing input files. 1620 # Specify filename containing input files.
1574 file_list_spec=$lt_file_list_spec 1621 file_list_spec=$lt_file_list_spec
1575 1622
1576@@ -17247,210 +17947,169 @@ ltmain="$ac_aux_dir/ltmain.sh" 1623@@ -17236,210 +17936,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
1577 # if finds mixed CR/LF and LF-only lines. Since sed operates in 1624 # if finds mixed CR/LF and LF-only lines. Since sed operates in
1578 # text mode, it properly converts lines to CR/LF. This bash problem 1625 # text mode, it properly converts lines to CR/LF. This bash problem
1579 # is reportedly fixed, but why not run on old versions too? 1626 # is reportedly fixed, but why not run on old versions too?
@@ -1948,10 +1995,10 @@ index b23c9eebfd7..fb25d046cd2 100755
1948 chmod +x "$ofile" 1995 chmod +x "$ofile"
1949 1996
1950diff --git a/bfd/configure.ac b/bfd/configure.ac 1997diff --git a/bfd/configure.ac b/bfd/configure.ac
1951index a9078965c40..22b5b7ea567 100644 1998index 6146efb5ae3..73e5e03d016 100644
1952--- a/bfd/configure.ac 1999--- a/bfd/configure.ac
1953+++ b/bfd/configure.ac 2000+++ b/bfd/configure.ac
1954@@ -303,7 +303,7 @@ changequote(,)dnl 2001@@ -282,7 +282,7 @@ changequote(,)dnl
1955 x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'` 2002 x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'`
1956 changequote([,])dnl 2003 changequote([,])dnl
1957 if test -n "$x"; then 2004 if test -n "$x"; then
@@ -1960,11 +2007,39 @@ index a9078965c40..22b5b7ea567 100644
1960 fi 2007 fi
1961 fi 2008 fi
1962 2009
2010diff --git a/binutils/Makefile.in b/binutils/Makefile.in
2011index 78d32b350e3..ad4f2de7358 100644
2012--- a/binutils/Makefile.in
2013+++ b/binutils/Makefile.in
2014@@ -492,6 +492,7 @@ DEBUGINFOD_LIBS = @DEBUGINFOD_LIBS@
2015 DEFS = @DEFS@
2016 DEMANGLER_NAME = @DEMANGLER_NAME@
2017 DEPDIR = @DEPDIR@
2018+DLLTOOL = @DLLTOOL@
2019 DLLTOOL_DEFS = @DLLTOOL_DEFS@
2020 DSYMUTIL = @DSYMUTIL@
2021 DUMPBIN = @DUMPBIN@
2022@@ -533,6 +534,7 @@ LTLIBICONV = @LTLIBICONV@
2023 LTLIBOBJS = @LTLIBOBJS@
2024 MAINT = @MAINT@
2025 MAKEINFO = @MAKEINFO@
2026+MANIFEST_TOOL = @MANIFEST_TOOL@
2027 MKDIR_P = @MKDIR_P@
2028 MKINSTALLDIRS = @MKINSTALLDIRS@
2029 MSGFMT = @MSGFMT@
2030@@ -579,6 +581,7 @@ abs_builddir = @abs_builddir@
2031 abs_srcdir = @abs_srcdir@
2032 abs_top_builddir = @abs_top_builddir@
2033 abs_top_srcdir = @abs_top_srcdir@
2034+ac_ct_AR = @ac_ct_AR@
2035 ac_ct_CC = @ac_ct_CC@
2036 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
2037 am__include = @am__include@
1963diff --git a/binutils/configure b/binutils/configure 2038diff --git a/binutils/configure b/binutils/configure
1964index 8cde216cb1f..15f3f4eb874 100755 2039index 149815542f9..43952bde405 100755
1965--- a/binutils/configure 2040--- a/binutils/configure
1966+++ b/binutils/configure 2041+++ b/binutils/configure
1967@@ -696,8 +696,11 @@ OTOOL 2042@@ -698,8 +698,11 @@ OTOOL
1968 LIPO 2043 LIPO
1969 NMEDIT 2044 NMEDIT
1970 DSYMUTIL 2045 DSYMUTIL
@@ -1976,7 +2051,7 @@ index 8cde216cb1f..15f3f4eb874 100755
1976 OBJDUMP 2051 OBJDUMP
1977 LN_S 2052 LN_S
1978 NM 2053 NM
1979@@ -814,6 +817,7 @@ enable_static 2054@@ -816,6 +819,7 @@ enable_static
1980 with_pic 2055 with_pic
1981 enable_fast_install 2056 enable_fast_install
1982 with_gnu_ld 2057 with_gnu_ld
@@ -1984,7 +2059,7 @@ index 8cde216cb1f..15f3f4eb874 100755
1984 enable_libtool_lock 2059 enable_libtool_lock
1985 enable_plugins 2060 enable_plugins
1986 enable_largefile 2061 enable_largefile
1987@@ -1509,6 +1513,8 @@ Optional Packages: 2062@@ -1514,6 +1518,8 @@ Optional Packages:
1988 --with-pic try to use only PIC/non-PIC objects [default=use 2063 --with-pic try to use only PIC/non-PIC objects [default=use
1989 both] 2064 both]
1990 --with-gnu-ld assume the C compiler uses GNU ld [default=no] 2065 --with-gnu-ld assume the C compiler uses GNU ld [default=no]
@@ -1993,7 +2068,7 @@ index 8cde216cb1f..15f3f4eb874 100755
1993 --with-debuginfod Enable debuginfo lookups with debuginfod 2068 --with-debuginfod Enable debuginfo lookups with debuginfod
1994 (auto/yes/no) 2069 (auto/yes/no)
1995 --with-system-zlib use installed libz 2070 --with-system-zlib use installed libz
1996@@ -4883,8 +4889,8 @@ esac 2071@@ -4893,8 +4899,8 @@ esac
1997 2072
1998 2073
1999 2074
@@ -2004,7 +2079,7 @@ index 8cde216cb1f..15f3f4eb874 100755
2004 2079
2005 2080
2006 2081
2007@@ -4924,7 +4930,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO 2082@@ -4934,7 +4940,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
2008 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 2083 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
2009 $as_echo_n "checking how to print strings... " >&6; } 2084 $as_echo_n "checking how to print strings... " >&6; }
2010 # Test print first, because it will be a builtin if present. 2085 # Test print first, because it will be a builtin if present.
@@ -2013,7 +2088,7 @@ index 8cde216cb1f..15f3f4eb874 100755
2013 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then 2088 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
2014 ECHO='print -r --' 2089 ECHO='print -r --'
2015 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then 2090 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
2016@@ -5611,8 +5617,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; 2091@@ -5627,8 +5633,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6;
2017 # Try some XSI features 2092 # Try some XSI features
2018 xsi_shell=no 2093 xsi_shell=no
2019 ( _lt_dummy="a/b/c" 2094 ( _lt_dummy="a/b/c"
@@ -2024,7 +2099,7 @@ index 8cde216cb1f..15f3f4eb874 100755
2024 && eval 'test $(( 1 + 1 )) -eq 2 \ 2099 && eval 'test $(( 1 + 1 )) -eq 2 \
2025 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ 2100 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
2026 && xsi_shell=yes 2101 && xsi_shell=yes
2027@@ -5661,6 +5667,80 @@ esac 2102@@ -5677,6 +5683,80 @@ esac
2028 2103
2029 2104
2030 2105
@@ -2105,7 +2180,7 @@ index 8cde216cb1f..15f3f4eb874 100755
2105 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 2180 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
2106 $as_echo_n "checking for $LD option to reload object files... " >&6; } 2181 $as_echo_n "checking for $LD option to reload object files... " >&6; }
2107 if ${lt_cv_ld_reload_flag+:} false; then : 2182 if ${lt_cv_ld_reload_flag+:} false; then :
2108@@ -5677,6 +5757,11 @@ case $reload_flag in 2183@@ -5693,6 +5773,11 @@ case $reload_flag in
2109 esac 2184 esac
2110 reload_cmds='$LD$reload_flag -o $output$reload_objs' 2185 reload_cmds='$LD$reload_flag -o $output$reload_objs'
2111 case $host_os in 2186 case $host_os in
@@ -2117,7 +2192,7 @@ index 8cde216cb1f..15f3f4eb874 100755
2117 darwin*) 2192 darwin*)
2118 if test "$GCC" = yes; then 2193 if test "$GCC" = yes; then
2119 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' 2194 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
2120@@ -5845,7 +5930,8 @@ mingw* | pw32*) 2195@@ -5861,7 +5946,8 @@ mingw* | pw32*)
2121 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' 2196 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
2122 lt_cv_file_magic_cmd='func_win32_libid' 2197 lt_cv_file_magic_cmd='func_win32_libid'
2123 else 2198 else
@@ -2127,7 +2202,7 @@ index 8cde216cb1f..15f3f4eb874 100755
2127 lt_cv_file_magic_cmd='$OBJDUMP -f' 2202 lt_cv_file_magic_cmd='$OBJDUMP -f'
2128 fi 2203 fi
2129 ;; 2204 ;;
2130@@ -5999,6 +6085,21 @@ esac 2205@@ -6015,6 +6101,21 @@ esac
2131 fi 2206 fi
2132 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 2207 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
2133 $as_echo "$lt_cv_deplibs_check_method" >&6; } 2208 $as_echo "$lt_cv_deplibs_check_method" >&6; }
@@ -2149,7 +2224,7 @@ index 8cde216cb1f..15f3f4eb874 100755
2149 file_magic_cmd=$lt_cv_file_magic_cmd 2224 file_magic_cmd=$lt_cv_file_magic_cmd
2150 deplibs_check_method=$lt_cv_deplibs_check_method 2225 deplibs_check_method=$lt_cv_deplibs_check_method
2151 test -z "$deplibs_check_method" && deplibs_check_method=unknown 2226 test -z "$deplibs_check_method" && deplibs_check_method=unknown
2152@@ -6014,6 +6115,157 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown 2227@@ -6030,6 +6131,157 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
2153 2228
2154 2229
2155 2230
@@ -2307,7 +2382,7 @@ index 8cde216cb1f..15f3f4eb874 100755
2307 plugin_option= 2382 plugin_option=
2308 plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll" 2383 plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll"
2309 for plugin in $plugin_names; do 2384 for plugin in $plugin_names; do
2310@@ -6028,8 +6280,10 @@ for plugin in $plugin_names; do 2385@@ -6044,8 +6296,10 @@ for plugin in $plugin_names; do
2311 done 2386 done
2312 2387
2313 if test -n "$ac_tool_prefix"; then 2388 if test -n "$ac_tool_prefix"; then
@@ -2320,7 +2395,7 @@ index 8cde216cb1f..15f3f4eb874 100755
2320 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 2395 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
2321 $as_echo_n "checking for $ac_word... " >&6; } 2396 $as_echo_n "checking for $ac_word... " >&6; }
2322 if ${ac_cv_prog_AR+:} false; then : 2397 if ${ac_cv_prog_AR+:} false; then :
2323@@ -6045,7 +6299,7 @@ do 2398@@ -6061,7 +6315,7 @@ do
2324 test -z "$as_dir" && as_dir=. 2399 test -z "$as_dir" && as_dir=.
2325 for ac_exec_ext in '' $ac_executable_extensions; do 2400 for ac_exec_ext in '' $ac_executable_extensions; do
2326 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 2401 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
@@ -2329,7 +2404,7 @@ index 8cde216cb1f..15f3f4eb874 100755
2329 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 2404 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
2330 break 2 2405 break 2
2331 fi 2406 fi
2332@@ -6065,11 +6319,15 @@ $as_echo "no" >&6; } 2407@@ -6081,11 +6335,15 @@ $as_echo "no" >&6; }
2333 fi 2408 fi
2334 2409
2335 2410
@@ -2348,7 +2423,7 @@ index 8cde216cb1f..15f3f4eb874 100755
2348 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 2423 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
2349 $as_echo_n "checking for $ac_word... " >&6; } 2424 $as_echo_n "checking for $ac_word... " >&6; }
2350 if ${ac_cv_prog_ac_ct_AR+:} false; then : 2425 if ${ac_cv_prog_ac_ct_AR+:} false; then :
2351@@ -6085,7 +6343,7 @@ do 2426@@ -6101,7 +6359,7 @@ do
2352 test -z "$as_dir" && as_dir=. 2427 test -z "$as_dir" && as_dir=.
2353 for ac_exec_ext in '' $ac_executable_extensions; do 2428 for ac_exec_ext in '' $ac_executable_extensions; do
2354 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 2429 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
@@ -2357,7 +2432,7 @@ index 8cde216cb1f..15f3f4eb874 100755
2357 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 2432 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
2358 break 2 2433 break 2
2359 fi 2434 fi
2360@@ -6104,6 +6362,10 @@ else 2435@@ -6120,6 +6378,10 @@ else
2361 $as_echo "no" >&6; } 2436 $as_echo "no" >&6; }
2362 fi 2437 fi
2363 2438
@@ -2368,7 +2443,7 @@ index 8cde216cb1f..15f3f4eb874 100755
2368 if test "x$ac_ct_AR" = x; then 2443 if test "x$ac_ct_AR" = x; then
2369 AR="false" 2444 AR="false"
2370 else 2445 else
2371@@ -6115,29 +6377,81 @@ ac_tool_warned=yes ;; 2446@@ -6131,29 +6393,81 @@ ac_tool_warned=yes ;;
2372 esac 2447 esac
2373 AR=$ac_ct_AR 2448 AR=$ac_ct_AR
2374 fi 2449 fi
@@ -2465,7 +2540,7 @@ index 8cde216cb1f..15f3f4eb874 100755
2465 2540
2466 2541
2467 2542
2468@@ -6484,8 +6798,8 @@ esac 2543@@ -6500,8 +6814,8 @@ esac
2469 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" 2544 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
2470 2545
2471 # Transform an extracted symbol line into symbol name and symbol address 2546 # Transform an extracted symbol line into symbol name and symbol address
@@ -2476,7 +2551,7 @@ index 8cde216cb1f..15f3f4eb874 100755
2476 2551
2477 # Handle CRLF in mingw tool chain 2552 # Handle CRLF in mingw tool chain
2478 opt_cr= 2553 opt_cr=
2479@@ -6521,6 +6835,7 @@ for ac_symprfx in "" "_"; do 2554@@ -6537,6 +6851,7 @@ for ac_symprfx in "" "_"; do
2480 else 2555 else
2481 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" 2556 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
2482 fi 2557 fi
@@ -2484,7 +2559,7 @@ index 8cde216cb1f..15f3f4eb874 100755
2484 2559
2485 # Check to see that the pipe works correctly. 2560 # Check to see that the pipe works correctly.
2486 pipe_works=no 2561 pipe_works=no
2487@@ -6562,6 +6877,18 @@ _LT_EOF 2562@@ -6578,6 +6893,18 @@ _LT_EOF
2488 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then 2563 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
2489 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then 2564 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
2490 cat <<_LT_EOF > conftest.$ac_ext 2565 cat <<_LT_EOF > conftest.$ac_ext
@@ -2503,7 +2578,7 @@ index 8cde216cb1f..15f3f4eb874 100755
2503 #ifdef __cplusplus 2578 #ifdef __cplusplus
2504 extern "C" { 2579 extern "C" {
2505 #endif 2580 #endif
2506@@ -6573,7 +6900,7 @@ _LT_EOF 2581@@ -6589,7 +6916,7 @@ _LT_EOF
2507 cat <<_LT_EOF >> conftest.$ac_ext 2582 cat <<_LT_EOF >> conftest.$ac_ext
2508 2583
2509 /* The mapping between symbol names and symbols. */ 2584 /* The mapping between symbol names and symbols. */
@@ -2512,7 +2587,7 @@ index 8cde216cb1f..15f3f4eb874 100755
2512 const char *name; 2587 const char *name;
2513 void *address; 2588 void *address;
2514 } 2589 }
2515@@ -6599,8 +6926,8 @@ static const void *lt_preloaded_setup() { 2590@@ -6615,8 +6942,8 @@ static const void *lt_preloaded_setup() {
2516 _LT_EOF 2591 _LT_EOF
2517 # Now try linking the two files. 2592 # Now try linking the two files.
2518 mv conftest.$ac_objext conftstm.$ac_objext 2593 mv conftest.$ac_objext conftstm.$ac_objext
@@ -2523,7 +2598,7 @@ index 8cde216cb1f..15f3f4eb874 100755
2523 LIBS="conftstm.$ac_objext" 2598 LIBS="conftstm.$ac_objext"
2524 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" 2599 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
2525 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 2600 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
2526@@ -6610,8 +6937,8 @@ _LT_EOF 2601@@ -6626,8 +6953,8 @@ _LT_EOF
2527 test $ac_status = 0; } && test -s conftest${ac_exeext}; then 2602 test $ac_status = 0; } && test -s conftest${ac_exeext}; then
2528 pipe_works=yes 2603 pipe_works=yes
2529 fi 2604 fi
@@ -2534,7 +2609,7 @@ index 8cde216cb1f..15f3f4eb874 100755
2534 else 2609 else
2535 echo "cannot find nm_test_func in $nlist" >&5 2610 echo "cannot find nm_test_func in $nlist" >&5
2536 fi 2611 fi
2537@@ -6648,6 +6975,19 @@ else 2612@@ -6664,6 +6991,19 @@ else
2538 $as_echo "ok" >&6; } 2613 $as_echo "ok" >&6; }
2539 fi 2614 fi
2540 2615
@@ -2554,7 +2629,7 @@ index 8cde216cb1f..15f3f4eb874 100755
2554 2629
2555 2630
2556 2631
2557@@ -6664,6 +7004,42 @@ fi 2632@@ -6680,6 +7020,42 @@ fi
2558 2633
2559 2634
2560 2635
@@ -2597,7 +2672,7 @@ index 8cde216cb1f..15f3f4eb874 100755
2597 2672
2598 2673
2599 2674
2600@@ -6875,6 +7251,123 @@ esac 2675@@ -6891,6 +7267,123 @@ esac
2601 2676
2602 need_locks="$enable_libtool_lock" 2677 need_locks="$enable_libtool_lock"
2603 2678
@@ -2721,7 +2796,7 @@ index 8cde216cb1f..15f3f4eb874 100755
2721 2796
2722 case $host_os in 2797 case $host_os in
2723 rhapsody* | darwin*) 2798 rhapsody* | darwin*)
2724@@ -7438,6 +7931,8 @@ _LT_EOF 2799@@ -7454,6 +7947,8 @@ _LT_EOF
2725 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 2800 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
2726 echo "$AR cru libconftest.a conftest.o" >&5 2801 echo "$AR cru libconftest.a conftest.o" >&5
2727 $AR cru libconftest.a conftest.o 2>&5 2802 $AR cru libconftest.a conftest.o 2>&5
@@ -2730,7 +2805,7 @@ index 8cde216cb1f..15f3f4eb874 100755
2730 cat > conftest.c << _LT_EOF 2805 cat > conftest.c << _LT_EOF
2731 int main() { return 0;} 2806 int main() { return 0;}
2732 _LT_EOF 2807 _LT_EOF
2733@@ -8020,8 +8515,6 @@ fi 2808@@ -8036,8 +8531,6 @@ fi
2734 lt_prog_compiler_pic= 2809 lt_prog_compiler_pic=
2735 lt_prog_compiler_static= 2810 lt_prog_compiler_static=
2736 2811
@@ -2739,7 +2814,7 @@ index 8cde216cb1f..15f3f4eb874 100755
2739 2814
2740 if test "$GCC" = yes; then 2815 if test "$GCC" = yes; then
2741 lt_prog_compiler_wl='-Wl,' 2816 lt_prog_compiler_wl='-Wl,'
2742@@ -8187,6 +8680,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 2817@@ -8203,6 +8696,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
2743 lt_prog_compiler_pic='--shared' 2818 lt_prog_compiler_pic='--shared'
2744 lt_prog_compiler_static='--static' 2819 lt_prog_compiler_static='--static'
2745 ;; 2820 ;;
@@ -2752,7 +2827,7 @@ index 8cde216cb1f..15f3f4eb874 100755
2752 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) 2827 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
2753 # Portland Group compilers (*not* the Pentium gcc compiler, 2828 # Portland Group compilers (*not* the Pentium gcc compiler,
2754 # which looks to be a dead project) 2829 # which looks to be a dead project)
2755@@ -8249,7 +8748,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 2830@@ -8265,7 +8764,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
2756 lt_prog_compiler_pic='-KPIC' 2831 lt_prog_compiler_pic='-KPIC'
2757 lt_prog_compiler_static='-Bstatic' 2832 lt_prog_compiler_static='-Bstatic'
2758 case $cc_basename in 2833 case $cc_basename in
@@ -2761,7 +2836,7 @@ index 8cde216cb1f..15f3f4eb874 100755
2761 lt_prog_compiler_wl='-Qoption ld ';; 2836 lt_prog_compiler_wl='-Qoption ld ';;
2762 *) 2837 *)
2763 lt_prog_compiler_wl='-Wl,';; 2838 lt_prog_compiler_wl='-Wl,';;
2764@@ -8306,13 +8805,17 @@ case $host_os in 2839@@ -8322,13 +8821,17 @@ case $host_os in
2765 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" 2840 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
2766 ;; 2841 ;;
2767 esac 2842 esac
@@ -2785,7 +2860,7 @@ index 8cde216cb1f..15f3f4eb874 100755
2785 2860
2786 # 2861 #
2787 # Check to make sure the PIC flag actually works. 2862 # Check to make sure the PIC flag actually works.
2788@@ -8373,6 +8876,11 @@ fi 2863@@ -8389,6 +8892,11 @@ fi
2789 2864
2790 2865
2791 2866
@@ -2797,7 +2872,7 @@ index 8cde216cb1f..15f3f4eb874 100755
2797 # 2872 #
2798 # Check to make sure the static flag actually works. 2873 # Check to make sure the static flag actually works.
2799 # 2874 #
2800@@ -8723,7 +9231,8 @@ _LT_EOF 2875@@ -8739,7 +9247,8 @@ _LT_EOF
2801 allow_undefined_flag=unsupported 2876 allow_undefined_flag=unsupported
2802 always_export_symbols=no 2877 always_export_symbols=no
2803 enable_shared_with_static_runtimes=yes 2878 enable_shared_with_static_runtimes=yes
@@ -2807,7 +2882,7 @@ index 8cde216cb1f..15f3f4eb874 100755
2807 2882
2808 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then 2883 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
2809 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' 2884 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
2810@@ -8822,12 +9331,12 @@ _LT_EOF 2885@@ -8838,12 +9347,12 @@ _LT_EOF
2811 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' 2886 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
2812 hardcode_libdir_flag_spec= 2887 hardcode_libdir_flag_spec=
2813 hardcode_libdir_flag_spec_ld='-rpath $libdir' 2888 hardcode_libdir_flag_spec_ld='-rpath $libdir'
@@ -2822,7 +2897,7 @@ index 8cde216cb1f..15f3f4eb874 100755
2822 fi 2897 fi
2823 ;; 2898 ;;
2824 esac 2899 esac
2825@@ -8841,8 +9350,8 @@ _LT_EOF 2900@@ -8857,8 +9366,8 @@ _LT_EOF
2826 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' 2901 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
2827 wlarc= 2902 wlarc=
2828 else 2903 else
@@ -2833,7 +2908,7 @@ index 8cde216cb1f..15f3f4eb874 100755
2833 fi 2908 fi
2834 ;; 2909 ;;
2835 2910
2836@@ -8860,8 +9369,8 @@ _LT_EOF 2911@@ -8876,8 +9385,8 @@ _LT_EOF
2837 2912
2838 _LT_EOF 2913 _LT_EOF
2839 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 2914 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -2844,7 +2919,7 @@ index 8cde216cb1f..15f3f4eb874 100755
2844 else 2919 else
2845 ld_shlibs=no 2920 ld_shlibs=no
2846 fi 2921 fi
2847@@ -8907,8 +9416,8 @@ _LT_EOF 2922@@ -8923,8 +9432,8 @@ _LT_EOF
2848 2923
2849 *) 2924 *)
2850 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 2925 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -2855,7 +2930,7 @@ index 8cde216cb1f..15f3f4eb874 100755
2855 else 2930 else
2856 ld_shlibs=no 2931 ld_shlibs=no
2857 fi 2932 fi
2858@@ -9038,7 +9547,13 @@ _LT_EOF 2933@@ -9054,7 +9563,13 @@ _LT_EOF
2859 allow_undefined_flag='-berok' 2934 allow_undefined_flag='-berok'
2860 # Determine the default libpath from the value encoded in an 2935 # Determine the default libpath from the value encoded in an
2861 # empty executable. 2936 # empty executable.
@@ -2870,7 +2945,7 @@ index 8cde216cb1f..15f3f4eb874 100755
2870 /* end confdefs.h. */ 2945 /* end confdefs.h. */
2871 2946
2872 int 2947 int
2873@@ -9051,22 +9566,29 @@ main () 2948@@ -9067,22 +9582,29 @@ main ()
2874 _ACEOF 2949 _ACEOF
2875 if ac_fn_c_try_link "$LINENO"; then : 2950 if ac_fn_c_try_link "$LINENO"; then :
2876 2951
@@ -2913,7 +2988,7 @@ index 8cde216cb1f..15f3f4eb874 100755
2913 2988
2914 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 2989 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
2915 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" 2990 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"
2916@@ -9078,7 +9600,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 2991@@ -9094,7 +9616,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
2917 else 2992 else
2918 # Determine the default libpath from the value encoded in an 2993 # Determine the default libpath from the value encoded in an
2919 # empty executable. 2994 # empty executable.
@@ -2928,7 +3003,7 @@ index 8cde216cb1f..15f3f4eb874 100755
2928 /* end confdefs.h. */ 3003 /* end confdefs.h. */
2929 3004
2930 int 3005 int
2931@@ -9091,22 +9619,29 @@ main () 3006@@ -9107,22 +9635,29 @@ main ()
2932 _ACEOF 3007 _ACEOF
2933 if ac_fn_c_try_link "$LINENO"; then : 3008 if ac_fn_c_try_link "$LINENO"; then :
2934 3009
@@ -2971,7 +3046,7 @@ index 8cde216cb1f..15f3f4eb874 100755
2971 3046
2972 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 3047 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
2973 # Warning - without using the other run time loading flags, 3048 # Warning - without using the other run time loading flags,
2974@@ -9151,20 +9686,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 3049@@ -9167,20 +9702,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
2975 # Microsoft Visual C++. 3050 # Microsoft Visual C++.
2976 # hardcode_libdir_flag_spec is actually meaningless, as there is 3051 # hardcode_libdir_flag_spec is actually meaningless, as there is
2977 # no search path for DLLs. 3052 # no search path for DLLs.
@@ -3049,7 +3124,7 @@ index 8cde216cb1f..15f3f4eb874 100755
3049 ;; 3124 ;;
3050 3125
3051 darwin* | rhapsody*) 3126 darwin* | rhapsody*)
3052@@ -9225,7 +9803,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 3127@@ -9241,7 +9819,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
3053 3128
3054 # FreeBSD 3 and greater uses gcc -shared to do shared libraries. 3129 # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
3055 freebsd* | dragonfly*) 3130 freebsd* | dragonfly*)
@@ -3058,7 +3133,7 @@ index 8cde216cb1f..15f3f4eb874 100755
3058 hardcode_libdir_flag_spec='-R$libdir' 3133 hardcode_libdir_flag_spec='-R$libdir'
3059 hardcode_direct=yes 3134 hardcode_direct=yes
3060 hardcode_shlibpath_var=no 3135 hardcode_shlibpath_var=no
3061@@ -9233,7 +9811,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 3136@@ -9249,7 +9827,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
3062 3137
3063 hpux9*) 3138 hpux9*)
3064 if test "$GCC" = yes; then 3139 if test "$GCC" = yes; then
@@ -3067,7 +3142,7 @@ index 8cde216cb1f..15f3f4eb874 100755
3067 else 3142 else
3068 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' 3143 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'
3069 fi 3144 fi
3070@@ -9249,7 +9827,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 3145@@ -9265,7 +9843,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
3071 3146
3072 hpux10*) 3147 hpux10*)
3073 if test "$GCC" = yes && test "$with_gnu_ld" = no; then 3148 if test "$GCC" = yes && test "$with_gnu_ld" = no; then
@@ -3076,7 +3151,7 @@ index 8cde216cb1f..15f3f4eb874 100755
3076 else 3151 else
3077 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' 3152 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
3078 fi 3153 fi
3079@@ -9273,10 +9851,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 3154@@ -9289,10 +9867,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
3080 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' 3155 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
3081 ;; 3156 ;;
3082 ia64*) 3157 ia64*)
@@ -3089,7 +3164,7 @@ index 8cde216cb1f..15f3f4eb874 100755
3089 ;; 3164 ;;
3090 esac 3165 esac
3091 else 3166 else
3092@@ -9355,23 +9933,36 @@ fi 3167@@ -9371,23 +9949,36 @@ fi
3093 3168
3094 irix5* | irix6* | nonstopux*) 3169 irix5* | irix6* | nonstopux*)
3095 if test "$GCC" = yes; then 3170 if test "$GCC" = yes; then
@@ -3134,7 +3209,7 @@ index 8cde216cb1f..15f3f4eb874 100755
3134 else 3209 else
3135 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' 3210 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'
3136 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' 3211 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'
3137@@ -9456,7 +10047,7 @@ rm -f core conftest.err conftest.$ac_objext \ 3212@@ -9472,7 +10063,7 @@ rm -f core conftest.err conftest.$ac_objext \
3138 osf4* | osf5*) # as osf3* with the addition of -msym flag 3213 osf4* | osf5*) # as osf3* with the addition of -msym flag
3139 if test "$GCC" = yes; then 3214 if test "$GCC" = yes; then
3140 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' 3215 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
@@ -3143,7 +3218,7 @@ index 8cde216cb1f..15f3f4eb874 100755
3143 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' 3218 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
3144 else 3219 else
3145 allow_undefined_flag=' -expect_unresolved \*' 3220 allow_undefined_flag=' -expect_unresolved \*'
3146@@ -9475,9 +10066,9 @@ rm -f core conftest.err conftest.$ac_objext \ 3221@@ -9491,9 +10082,9 @@ rm -f core conftest.err conftest.$ac_objext \
3147 no_undefined_flag=' -z defs' 3222 no_undefined_flag=' -z defs'
3148 if test "$GCC" = yes; then 3223 if test "$GCC" = yes; then
3149 wlarc='${wl}' 3224 wlarc='${wl}'
@@ -3155,7 +3230,7 @@ index 8cde216cb1f..15f3f4eb874 100755
3155 else 3230 else
3156 case `$CC -V 2>&1` in 3231 case `$CC -V 2>&1` in
3157 *"Compilers 5.0"*) 3232 *"Compilers 5.0"*)
3158@@ -10053,8 +10644,9 @@ cygwin* | mingw* | pw32* | cegcc*) 3233@@ -10069,8 +10660,9 @@ cygwin* | mingw* | pw32* | cegcc*)
3159 need_version=no 3234 need_version=no
3160 need_lib_prefix=no 3235 need_lib_prefix=no
3161 3236
@@ -3167,7 +3242,7 @@ index 8cde216cb1f..15f3f4eb874 100755
3167 library_names_spec='$libname.dll.a' 3242 library_names_spec='$libname.dll.a'
3168 # DLL is installed to $(libdir)/../bin by postinstall_cmds 3243 # DLL is installed to $(libdir)/../bin by postinstall_cmds
3169 postinstall_cmds='base_file=`basename \${file}`~ 3244 postinstall_cmds='base_file=`basename \${file}`~
3170@@ -10087,13 +10679,71 @@ cygwin* | mingw* | pw32* | cegcc*) 3245@@ -10103,13 +10695,71 @@ cygwin* | mingw* | pw32* | cegcc*)
3171 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' 3246 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
3172 ;; 3247 ;;
3173 esac 3248 esac
@@ -3240,16 +3315,16 @@ index 8cde216cb1f..15f3f4eb874 100755
3240 # FIXME: first we should search . and the directory the executable is in 3315 # FIXME: first we should search . and the directory the executable is in
3241 shlibpath_var=PATH 3316 shlibpath_var=PATH
3242 ;; 3317 ;;
3243@@ -10971,7 +11621,7 @@ else 3318@@ -10987,7 +11637,7 @@ else
3244 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 3319 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
3245 lt_status=$lt_dlunknown 3320 lt_status=$lt_dlunknown
3246 cat > conftest.$ac_ext <<_LT_EOF 3321 cat > conftest.$ac_ext <<_LT_EOF
3247-#line 10974 "configure" 3322-#line 10990 "configure"
3248+#line $LINENO "configure" 3323+#line $LINENO "configure"
3249 #include "confdefs.h" 3324 #include "confdefs.h"
3250 3325
3251 #if HAVE_DLFCN_H 3326 #if HAVE_DLFCN_H
3252@@ -11015,10 +11665,10 @@ else 3327@@ -11031,10 +11681,10 @@ else
3253 /* When -fvisbility=hidden is used, assume the code has been annotated 3328 /* When -fvisbility=hidden is used, assume the code has been annotated
3254 correspondingly for the symbols needed. */ 3329 correspondingly for the symbols needed. */
3255 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 3330 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
@@ -3262,16 +3337,16 @@ index 8cde216cb1f..15f3f4eb874 100755
3262 int main () 3337 int main ()
3263 { 3338 {
3264 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 3339 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
3265@@ -11077,7 +11727,7 @@ else 3340@@ -11093,7 +11743,7 @@ else
3266 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 3341 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
3267 lt_status=$lt_dlunknown 3342 lt_status=$lt_dlunknown
3268 cat > conftest.$ac_ext <<_LT_EOF 3343 cat > conftest.$ac_ext <<_LT_EOF
3269-#line 11080 "configure" 3344-#line 11096 "configure"
3270+#line $LINENO "configure" 3345+#line $LINENO "configure"
3271 #include "confdefs.h" 3346 #include "confdefs.h"
3272 3347
3273 #if HAVE_DLFCN_H 3348 #if HAVE_DLFCN_H
3274@@ -11121,10 +11771,10 @@ else 3349@@ -11137,10 +11787,10 @@ else
3275 /* When -fvisbility=hidden is used, assume the code has been annotated 3350 /* When -fvisbility=hidden is used, assume the code has been annotated
3276 correspondingly for the symbols needed. */ 3351 correspondingly for the symbols needed. */
3277 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 3352 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
@@ -3284,7 +3359,7 @@ index 8cde216cb1f..15f3f4eb874 100755
3284 int main () 3359 int main ()
3285 { 3360 {
3286 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 3361 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
3287@@ -15505,13 +16155,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' 3362@@ -15642,13 +16292,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
3288 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' 3363 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
3289 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' 3364 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
3290 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' 3365 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
@@ -3305,7 +3380,7 @@ index 8cde216cb1f..15f3f4eb874 100755
3305 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' 3380 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
3306 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' 3381 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
3307 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' 3382 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
3308@@ -15526,14 +16183,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de 3383@@ -15663,14 +16320,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de
3309 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' 3384 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
3310 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' 3385 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
3311 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`' 3386 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"`'
@@ -3324,7 +3399,7 @@ index 8cde216cb1f..15f3f4eb874 100755
3324 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' 3399 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
3325 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' 3400 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
3326 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' 3401 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
3327@@ -15566,12 +16226,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q 3402@@ -15703,12 +16363,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q
3328 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' 3403 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
3329 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' 3404 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
3330 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' 3405 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
@@ -3338,7 +3413,7 @@ index 8cde216cb1f..15f3f4eb874 100755
3338 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' 3413 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
3339 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' 3414 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
3340 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' 3415 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
3341@@ -15626,8 +16286,13 @@ reload_flag \ 3416@@ -15763,8 +16423,13 @@ reload_flag \
3342 OBJDUMP \ 3417 OBJDUMP \
3343 deplibs_check_method \ 3418 deplibs_check_method \
3344 file_magic_cmd \ 3419 file_magic_cmd \
@@ -3352,7 +3427,7 @@ index 8cde216cb1f..15f3f4eb874 100755
3352 STRIP \ 3427 STRIP \
3353 RANLIB \ 3428 RANLIB \
3354 CC \ 3429 CC \
3355@@ -15637,12 +16302,14 @@ lt_cv_sys_global_symbol_pipe \ 3430@@ -15774,12 +16439,14 @@ lt_cv_sys_global_symbol_pipe \
3356 lt_cv_sys_global_symbol_to_cdecl \ 3431 lt_cv_sys_global_symbol_to_cdecl \
3357 lt_cv_sys_global_symbol_to_c_name_address \ 3432 lt_cv_sys_global_symbol_to_c_name_address \
3358 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ 3433 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
@@ -3368,7 +3443,7 @@ index 8cde216cb1f..15f3f4eb874 100755
3368 DSYMUTIL \ 3443 DSYMUTIL \
3369 NMEDIT \ 3444 NMEDIT \
3370 LIPO \ 3445 LIPO \
3371@@ -15658,7 +16325,6 @@ no_undefined_flag \ 3446@@ -15795,7 +16462,6 @@ no_undefined_flag \
3372 hardcode_libdir_flag_spec \ 3447 hardcode_libdir_flag_spec \
3373 hardcode_libdir_flag_spec_ld \ 3448 hardcode_libdir_flag_spec_ld \
3374 hardcode_libdir_separator \ 3449 hardcode_libdir_separator \
@@ -3376,7 +3451,7 @@ index 8cde216cb1f..15f3f4eb874 100755
3376 exclude_expsyms \ 3451 exclude_expsyms \
3377 include_expsyms \ 3452 include_expsyms \
3378 file_list_spec \ 3453 file_list_spec \
3379@@ -15694,6 +16360,7 @@ module_cmds \ 3454@@ -15831,6 +16497,7 @@ module_cmds \
3380 module_expsym_cmds \ 3455 module_expsym_cmds \
3381 export_symbols_cmds \ 3456 export_symbols_cmds \
3382 prelink_cmds \ 3457 prelink_cmds \
@@ -3384,7 +3459,7 @@ index 8cde216cb1f..15f3f4eb874 100755
3384 postinstall_cmds \ 3459 postinstall_cmds \
3385 postuninstall_cmds \ 3460 postuninstall_cmds \
3386 finish_cmds \ 3461 finish_cmds \
3387@@ -16459,7 +17126,8 @@ $as_echo X"$file" | 3462@@ -16596,7 +17263,8 @@ $as_echo X"$file" |
3388 # NOTE: Changes made to this file will be lost: look at ltmain.sh. 3463 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
3389 # 3464 #
3390 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 3465 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
@@ -3394,7 +3469,7 @@ index 8cde216cb1f..15f3f4eb874 100755
3394 # Written by Gordon Matzigkeit, 1996 3469 # Written by Gordon Matzigkeit, 1996
3395 # 3470 #
3396 # This file is part of GNU Libtool. 3471 # This file is part of GNU Libtool.
3397@@ -16562,19 +17230,42 @@ SP2NL=$lt_lt_SP2NL 3472@@ -16699,19 +17367,42 @@ SP2NL=$lt_lt_SP2NL
3398 # turn newlines into spaces. 3473 # turn newlines into spaces.
3399 NL2SP=$lt_lt_NL2SP 3474 NL2SP=$lt_lt_NL2SP
3400 3475
@@ -3438,7 +3513,7 @@ index 8cde216cb1f..15f3f4eb874 100755
3438 # A symbol stripping program. 3513 # A symbol stripping program.
3439 STRIP=$lt_STRIP 3514 STRIP=$lt_STRIP
3440 3515
3441@@ -16604,6 +17295,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address 3516@@ -16741,6 +17432,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
3442 # Transform the output of nm in a C name address pair when lib prefix is needed. 3517 # Transform the output of nm in a C name address pair when lib prefix is needed.
3443 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix 3518 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
3444 3519
@@ -3451,7 +3526,7 @@ index 8cde216cb1f..15f3f4eb874 100755
3451 # The name of the directory that contains temporary libtool files. 3526 # The name of the directory that contains temporary libtool files.
3452 objdir=$objdir 3527 objdir=$objdir
3453 3528
3454@@ -16613,6 +17310,9 @@ MAGIC_CMD=$MAGIC_CMD 3529@@ -16750,6 +17447,9 @@ MAGIC_CMD=$MAGIC_CMD
3455 # Must we lock files when doing compilation? 3530 # Must we lock files when doing compilation?
3456 need_locks=$lt_need_locks 3531 need_locks=$lt_need_locks
3457 3532
@@ -3461,7 +3536,7 @@ index 8cde216cb1f..15f3f4eb874 100755
3461 # Tool to manipulate archived DWARF debug symbol files on Mac OS X. 3536 # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
3462 DSYMUTIL=$lt_DSYMUTIL 3537 DSYMUTIL=$lt_DSYMUTIL
3463 3538
3464@@ -16727,12 +17427,12 @@ with_gcc=$GCC 3539@@ -16864,12 +17564,12 @@ with_gcc=$GCC
3465 # Compiler flag to turn off builtin functions. 3540 # Compiler flag to turn off builtin functions.
3466 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag 3541 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
3467 3542
@@ -3477,7 +3552,7 @@ index 8cde216cb1f..15f3f4eb874 100755
3477 # Compiler flag to prevent dynamic linking. 3552 # Compiler flag to prevent dynamic linking.
3478 link_static_flag=$lt_lt_prog_compiler_static 3553 link_static_flag=$lt_lt_prog_compiler_static
3479 3554
3480@@ -16819,9 +17519,6 @@ inherit_rpath=$inherit_rpath 3555@@ -16956,9 +17656,6 @@ inherit_rpath=$inherit_rpath
3481 # Whether libtool must link a program against all its dependency libraries. 3556 # Whether libtool must link a program against all its dependency libraries.
3482 link_all_deplibs=$link_all_deplibs 3557 link_all_deplibs=$link_all_deplibs
3483 3558
@@ -3487,7 +3562,7 @@ index 8cde216cb1f..15f3f4eb874 100755
3487 # Set to "yes" if exported symbols are required. 3562 # Set to "yes" if exported symbols are required.
3488 always_export_symbols=$always_export_symbols 3563 always_export_symbols=$always_export_symbols
3489 3564
3490@@ -16837,6 +17534,9 @@ include_expsyms=$lt_include_expsyms 3565@@ -16974,6 +17671,9 @@ include_expsyms=$lt_include_expsyms
3491 # Commands necessary for linking programs (against libraries) with templates. 3566 # Commands necessary for linking programs (against libraries) with templates.
3492 prelink_cmds=$lt_prelink_cmds 3567 prelink_cmds=$lt_prelink_cmds
3493 3568
@@ -3497,7 +3572,7 @@ index 8cde216cb1f..15f3f4eb874 100755
3497 # Specify filename containing input files. 3572 # Specify filename containing input files.
3498 file_list_spec=$lt_file_list_spec 3573 file_list_spec=$lt_file_list_spec
3499 3574
3500@@ -16869,210 +17569,169 @@ ltmain="$ac_aux_dir/ltmain.sh" 3575@@ -17006,210 +17706,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
3501 # if finds mixed CR/LF and LF-only lines. Since sed operates in 3576 # if finds mixed CR/LF and LF-only lines. Since sed operates in
3502 # text mode, it properly converts lines to CR/LF. This bash problem 3577 # text mode, it properly converts lines to CR/LF. This bash problem
3503 # is reportedly fixed, but why not run on old versions too? 3578 # is reportedly fixed, but why not run on old versions too?
@@ -3871,8 +3946,36 @@ index 8cde216cb1f..15f3f4eb874 100755
3871 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") 3946 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
3872 chmod +x "$ofile" 3947 chmod +x "$ofile"
3873 3948
3949diff --git a/gas/Makefile.in b/gas/Makefile.in
3950index c57d78f82c4..da370b21855 100644
3951--- a/gas/Makefile.in
3952+++ b/gas/Makefile.in
3953@@ -373,6 +373,7 @@ CYGPATH_W = @CYGPATH_W@
3954 DATADIRNAME = @DATADIRNAME@
3955 DEFS = @DEFS@
3956 DEPDIR = @DEPDIR@
3957+DLLTOOL = @DLLTOOL@
3958 DSYMUTIL = @DSYMUTIL@
3959 DUMPBIN = @DUMPBIN@
3960 ECHO_C = @ECHO_C@
3961@@ -409,6 +410,7 @@ LN_S = @LN_S@
3962 LTLIBOBJS = @LTLIBOBJS@
3963 MAINT = @MAINT@
3964 MAKEINFO = @MAKEINFO@
3965+MANIFEST_TOOL = @MANIFEST_TOOL@
3966 MKDIR_P = @MKDIR_P@
3967 MKINSTALLDIRS = @MKINSTALLDIRS@
3968 MSGFMT = @MSGFMT@
3969@@ -447,6 +449,7 @@ abs_builddir = @abs_builddir@
3970 abs_srcdir = @abs_srcdir@
3971 abs_top_builddir = @abs_top_builddir@
3972 abs_top_srcdir = @abs_top_srcdir@
3973+ac_ct_AR = @ac_ct_AR@
3974 ac_ct_CC = @ac_ct_CC@
3975 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
3976 am__include = @am__include@
3874diff --git a/gas/configure b/gas/configure 3977diff --git a/gas/configure b/gas/configure
3875index dc6a6682aa4..10364bd81da 100755 3978index 12c16faefd9..11b5127bf3a 100755
3876--- a/gas/configure 3979--- a/gas/configure
3877+++ b/gas/configure 3980+++ b/gas/configure
3878@@ -681,8 +681,11 @@ OTOOL 3981@@ -681,8 +681,11 @@ OTOOL
@@ -3924,7 +4027,7 @@ index dc6a6682aa4..10364bd81da 100755
3924 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then 4027 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
3925 ECHO='print -r --' 4028 ECHO='print -r --'
3926 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then 4029 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
3927@@ -5336,8 +5342,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; 4030@@ -5342,8 +5348,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6;
3928 # Try some XSI features 4031 # Try some XSI features
3929 xsi_shell=no 4032 xsi_shell=no
3930 ( _lt_dummy="a/b/c" 4033 ( _lt_dummy="a/b/c"
@@ -3935,7 +4038,7 @@ index dc6a6682aa4..10364bd81da 100755
3935 && eval 'test $(( 1 + 1 )) -eq 2 \ 4038 && eval 'test $(( 1 + 1 )) -eq 2 \
3936 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ 4039 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
3937 && xsi_shell=yes 4040 && xsi_shell=yes
3938@@ -5386,6 +5392,80 @@ esac 4041@@ -5392,6 +5398,80 @@ esac
3939 4042
3940 4043
3941 4044
@@ -4016,7 +4119,7 @@ index dc6a6682aa4..10364bd81da 100755
4016 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 4119 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
4017 $as_echo_n "checking for $LD option to reload object files... " >&6; } 4120 $as_echo_n "checking for $LD option to reload object files... " >&6; }
4018 if ${lt_cv_ld_reload_flag+:} false; then : 4121 if ${lt_cv_ld_reload_flag+:} false; then :
4019@@ -5402,6 +5482,11 @@ case $reload_flag in 4122@@ -5408,6 +5488,11 @@ case $reload_flag in
4020 esac 4123 esac
4021 reload_cmds='$LD$reload_flag -o $output$reload_objs' 4124 reload_cmds='$LD$reload_flag -o $output$reload_objs'
4022 case $host_os in 4125 case $host_os in
@@ -4028,7 +4131,7 @@ index dc6a6682aa4..10364bd81da 100755
4028 darwin*) 4131 darwin*)
4029 if test "$GCC" = yes; then 4132 if test "$GCC" = yes; then
4030 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' 4133 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
4031@@ -5570,7 +5655,8 @@ mingw* | pw32*) 4134@@ -5576,7 +5661,8 @@ mingw* | pw32*)
4032 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' 4135 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
4033 lt_cv_file_magic_cmd='func_win32_libid' 4136 lt_cv_file_magic_cmd='func_win32_libid'
4034 else 4137 else
@@ -4038,7 +4141,7 @@ index dc6a6682aa4..10364bd81da 100755
4038 lt_cv_file_magic_cmd='$OBJDUMP -f' 4141 lt_cv_file_magic_cmd='$OBJDUMP -f'
4039 fi 4142 fi
4040 ;; 4143 ;;
4041@@ -5724,6 +5810,21 @@ esac 4144@@ -5730,6 +5816,21 @@ esac
4042 fi 4145 fi
4043 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 4146 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
4044 $as_echo "$lt_cv_deplibs_check_method" >&6; } 4147 $as_echo "$lt_cv_deplibs_check_method" >&6; }
@@ -4060,7 +4163,7 @@ index dc6a6682aa4..10364bd81da 100755
4060 file_magic_cmd=$lt_cv_file_magic_cmd 4163 file_magic_cmd=$lt_cv_file_magic_cmd
4061 deplibs_check_method=$lt_cv_deplibs_check_method 4164 deplibs_check_method=$lt_cv_deplibs_check_method
4062 test -z "$deplibs_check_method" && deplibs_check_method=unknown 4165 test -z "$deplibs_check_method" && deplibs_check_method=unknown
4063@@ -5739,6 +5840,157 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown 4166@@ -5745,6 +5846,157 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
4064 4167
4065 4168
4066 4169
@@ -4218,7 +4321,7 @@ index dc6a6682aa4..10364bd81da 100755
4218 plugin_option= 4321 plugin_option=
4219 plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll" 4322 plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll"
4220 for plugin in $plugin_names; do 4323 for plugin in $plugin_names; do
4221@@ -5753,8 +6005,10 @@ for plugin in $plugin_names; do 4324@@ -5759,8 +6011,10 @@ for plugin in $plugin_names; do
4222 done 4325 done
4223 4326
4224 if test -n "$ac_tool_prefix"; then 4327 if test -n "$ac_tool_prefix"; then
@@ -4231,7 +4334,7 @@ index dc6a6682aa4..10364bd81da 100755
4231 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 4334 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
4232 $as_echo_n "checking for $ac_word... " >&6; } 4335 $as_echo_n "checking for $ac_word... " >&6; }
4233 if ${ac_cv_prog_AR+:} false; then : 4336 if ${ac_cv_prog_AR+:} false; then :
4234@@ -5770,7 +6024,7 @@ do 4337@@ -5776,7 +6030,7 @@ do
4235 test -z "$as_dir" && as_dir=. 4338 test -z "$as_dir" && as_dir=.
4236 for ac_exec_ext in '' $ac_executable_extensions; do 4339 for ac_exec_ext in '' $ac_executable_extensions; do
4237 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 4340 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
@@ -4240,7 +4343,7 @@ index dc6a6682aa4..10364bd81da 100755
4240 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 4343 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
4241 break 2 4344 break 2
4242 fi 4345 fi
4243@@ -5790,11 +6044,15 @@ $as_echo "no" >&6; } 4346@@ -5796,11 +6050,15 @@ $as_echo "no" >&6; }
4244 fi 4347 fi
4245 4348
4246 4349
@@ -4259,7 +4362,7 @@ index dc6a6682aa4..10364bd81da 100755
4259 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 4362 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
4260 $as_echo_n "checking for $ac_word... " >&6; } 4363 $as_echo_n "checking for $ac_word... " >&6; }
4261 if ${ac_cv_prog_ac_ct_AR+:} false; then : 4364 if ${ac_cv_prog_ac_ct_AR+:} false; then :
4262@@ -5810,7 +6068,7 @@ do 4365@@ -5816,7 +6074,7 @@ do
4263 test -z "$as_dir" && as_dir=. 4366 test -z "$as_dir" && as_dir=.
4264 for ac_exec_ext in '' $ac_executable_extensions; do 4367 for ac_exec_ext in '' $ac_executable_extensions; do
4265 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 4368 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
@@ -4268,7 +4371,7 @@ index dc6a6682aa4..10364bd81da 100755
4268 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 4371 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
4269 break 2 4372 break 2
4270 fi 4373 fi
4271@@ -5829,6 +6087,10 @@ else 4374@@ -5835,6 +6093,10 @@ else
4272 $as_echo "no" >&6; } 4375 $as_echo "no" >&6; }
4273 fi 4376 fi
4274 4377
@@ -4279,7 +4382,7 @@ index dc6a6682aa4..10364bd81da 100755
4279 if test "x$ac_ct_AR" = x; then 4382 if test "x$ac_ct_AR" = x; then
4280 AR="false" 4383 AR="false"
4281 else 4384 else
4282@@ -5840,29 +6102,81 @@ ac_tool_warned=yes ;; 4385@@ -5846,29 +6108,81 @@ ac_tool_warned=yes ;;
4283 esac 4386 esac
4284 AR=$ac_ct_AR 4387 AR=$ac_ct_AR
4285 fi 4388 fi
@@ -4376,7 +4479,7 @@ index dc6a6682aa4..10364bd81da 100755
4376 4479
4377 4480
4378 4481
4379@@ -6209,8 +6523,8 @@ esac 4482@@ -6215,8 +6529,8 @@ esac
4380 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" 4483 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
4381 4484
4382 # Transform an extracted symbol line into symbol name and symbol address 4485 # Transform an extracted symbol line into symbol name and symbol address
@@ -4387,7 +4490,7 @@ index dc6a6682aa4..10364bd81da 100755
4387 4490
4388 # Handle CRLF in mingw tool chain 4491 # Handle CRLF in mingw tool chain
4389 opt_cr= 4492 opt_cr=
4390@@ -6246,6 +6560,7 @@ for ac_symprfx in "" "_"; do 4493@@ -6252,6 +6566,7 @@ for ac_symprfx in "" "_"; do
4391 else 4494 else
4392 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" 4495 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
4393 fi 4496 fi
@@ -4395,7 +4498,7 @@ index dc6a6682aa4..10364bd81da 100755
4395 4498
4396 # Check to see that the pipe works correctly. 4499 # Check to see that the pipe works correctly.
4397 pipe_works=no 4500 pipe_works=no
4398@@ -6287,6 +6602,18 @@ _LT_EOF 4501@@ -6293,6 +6608,18 @@ _LT_EOF
4399 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then 4502 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
4400 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then 4503 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
4401 cat <<_LT_EOF > conftest.$ac_ext 4504 cat <<_LT_EOF > conftest.$ac_ext
@@ -4414,7 +4517,7 @@ index dc6a6682aa4..10364bd81da 100755
4414 #ifdef __cplusplus 4517 #ifdef __cplusplus
4415 extern "C" { 4518 extern "C" {
4416 #endif 4519 #endif
4417@@ -6298,7 +6625,7 @@ _LT_EOF 4520@@ -6304,7 +6631,7 @@ _LT_EOF
4418 cat <<_LT_EOF >> conftest.$ac_ext 4521 cat <<_LT_EOF >> conftest.$ac_ext
4419 4522
4420 /* The mapping between symbol names and symbols. */ 4523 /* The mapping between symbol names and symbols. */
@@ -4423,7 +4526,7 @@ index dc6a6682aa4..10364bd81da 100755
4423 const char *name; 4526 const char *name;
4424 void *address; 4527 void *address;
4425 } 4528 }
4426@@ -6324,8 +6651,8 @@ static const void *lt_preloaded_setup() { 4529@@ -6330,8 +6657,8 @@ static const void *lt_preloaded_setup() {
4427 _LT_EOF 4530 _LT_EOF
4428 # Now try linking the two files. 4531 # Now try linking the two files.
4429 mv conftest.$ac_objext conftstm.$ac_objext 4532 mv conftest.$ac_objext conftstm.$ac_objext
@@ -4434,7 +4537,7 @@ index dc6a6682aa4..10364bd81da 100755
4434 LIBS="conftstm.$ac_objext" 4537 LIBS="conftstm.$ac_objext"
4435 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" 4538 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
4436 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 4539 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
4437@@ -6335,8 +6662,8 @@ _LT_EOF 4540@@ -6341,8 +6668,8 @@ _LT_EOF
4438 test $ac_status = 0; } && test -s conftest${ac_exeext}; then 4541 test $ac_status = 0; } && test -s conftest${ac_exeext}; then
4439 pipe_works=yes 4542 pipe_works=yes
4440 fi 4543 fi
@@ -4445,7 +4548,7 @@ index dc6a6682aa4..10364bd81da 100755
4445 else 4548 else
4446 echo "cannot find nm_test_func in $nlist" >&5 4549 echo "cannot find nm_test_func in $nlist" >&5
4447 fi 4550 fi
4448@@ -6373,6 +6700,19 @@ else 4551@@ -6379,6 +6706,19 @@ else
4449 $as_echo "ok" >&6; } 4552 $as_echo "ok" >&6; }
4450 fi 4553 fi
4451 4554
@@ -4465,7 +4568,7 @@ index dc6a6682aa4..10364bd81da 100755
4465 4568
4466 4569
4467 4570
4468@@ -6389,6 +6729,42 @@ fi 4571@@ -6395,6 +6735,42 @@ fi
4469 4572
4470 4573
4471 4574
@@ -4508,7 +4611,7 @@ index dc6a6682aa4..10364bd81da 100755
4508 4611
4509 4612
4510 4613
4511@@ -6600,6 +6976,123 @@ esac 4614@@ -6606,6 +6982,123 @@ esac
4512 4615
4513 need_locks="$enable_libtool_lock" 4616 need_locks="$enable_libtool_lock"
4514 4617
@@ -4632,7 +4735,7 @@ index dc6a6682aa4..10364bd81da 100755
4632 4735
4633 case $host_os in 4736 case $host_os in
4634 rhapsody* | darwin*) 4737 rhapsody* | darwin*)
4635@@ -7163,6 +7656,8 @@ _LT_EOF 4738@@ -7169,6 +7662,8 @@ _LT_EOF
4636 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 4739 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
4637 echo "$AR cru libconftest.a conftest.o" >&5 4740 echo "$AR cru libconftest.a conftest.o" >&5
4638 $AR cru libconftest.a conftest.o 2>&5 4741 $AR cru libconftest.a conftest.o 2>&5
@@ -4641,7 +4744,7 @@ index dc6a6682aa4..10364bd81da 100755
4641 cat > conftest.c << _LT_EOF 4744 cat > conftest.c << _LT_EOF
4642 int main() { return 0;} 4745 int main() { return 0;}
4643 _LT_EOF 4746 _LT_EOF
4644@@ -7745,8 +8240,6 @@ fi 4747@@ -7751,8 +8246,6 @@ fi
4645 lt_prog_compiler_pic= 4748 lt_prog_compiler_pic=
4646 lt_prog_compiler_static= 4749 lt_prog_compiler_static=
4647 4750
@@ -4650,7 +4753,7 @@ index dc6a6682aa4..10364bd81da 100755
4650 4753
4651 if test "$GCC" = yes; then 4754 if test "$GCC" = yes; then
4652 lt_prog_compiler_wl='-Wl,' 4755 lt_prog_compiler_wl='-Wl,'
4653@@ -7912,6 +8405,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 4756@@ -7918,6 +8411,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
4654 lt_prog_compiler_pic='--shared' 4757 lt_prog_compiler_pic='--shared'
4655 lt_prog_compiler_static='--static' 4758 lt_prog_compiler_static='--static'
4656 ;; 4759 ;;
@@ -4663,7 +4766,7 @@ index dc6a6682aa4..10364bd81da 100755
4663 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) 4766 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
4664 # Portland Group compilers (*not* the Pentium gcc compiler, 4767 # Portland Group compilers (*not* the Pentium gcc compiler,
4665 # which looks to be a dead project) 4768 # which looks to be a dead project)
4666@@ -7974,7 +8473,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 4769@@ -7980,7 +8479,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
4667 lt_prog_compiler_pic='-KPIC' 4770 lt_prog_compiler_pic='-KPIC'
4668 lt_prog_compiler_static='-Bstatic' 4771 lt_prog_compiler_static='-Bstatic'
4669 case $cc_basename in 4772 case $cc_basename in
@@ -4672,7 +4775,7 @@ index dc6a6682aa4..10364bd81da 100755
4672 lt_prog_compiler_wl='-Qoption ld ';; 4775 lt_prog_compiler_wl='-Qoption ld ';;
4673 *) 4776 *)
4674 lt_prog_compiler_wl='-Wl,';; 4777 lt_prog_compiler_wl='-Wl,';;
4675@@ -8031,13 +8530,17 @@ case $host_os in 4778@@ -8037,13 +8536,17 @@ case $host_os in
4676 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" 4779 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
4677 ;; 4780 ;;
4678 esac 4781 esac
@@ -4696,7 +4799,7 @@ index dc6a6682aa4..10364bd81da 100755
4696 4799
4697 # 4800 #
4698 # Check to make sure the PIC flag actually works. 4801 # Check to make sure the PIC flag actually works.
4699@@ -8098,6 +8601,11 @@ fi 4802@@ -8104,6 +8607,11 @@ fi
4700 4803
4701 4804
4702 4805
@@ -4708,7 +4811,7 @@ index dc6a6682aa4..10364bd81da 100755
4708 # 4811 #
4709 # Check to make sure the static flag actually works. 4812 # Check to make sure the static flag actually works.
4710 # 4813 #
4711@@ -8448,7 +8956,8 @@ _LT_EOF 4814@@ -8454,7 +8962,8 @@ _LT_EOF
4712 allow_undefined_flag=unsupported 4815 allow_undefined_flag=unsupported
4713 always_export_symbols=no 4816 always_export_symbols=no
4714 enable_shared_with_static_runtimes=yes 4817 enable_shared_with_static_runtimes=yes
@@ -4718,7 +4821,7 @@ index dc6a6682aa4..10364bd81da 100755
4718 4821
4719 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then 4822 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
4720 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' 4823 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
4721@@ -8547,12 +9056,12 @@ _LT_EOF 4824@@ -8553,12 +9062,12 @@ _LT_EOF
4722 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' 4825 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
4723 hardcode_libdir_flag_spec= 4826 hardcode_libdir_flag_spec=
4724 hardcode_libdir_flag_spec_ld='-rpath $libdir' 4827 hardcode_libdir_flag_spec_ld='-rpath $libdir'
@@ -4733,7 +4836,7 @@ index dc6a6682aa4..10364bd81da 100755
4733 fi 4836 fi
4734 ;; 4837 ;;
4735 esac 4838 esac
4736@@ -8566,8 +9075,8 @@ _LT_EOF 4839@@ -8572,8 +9081,8 @@ _LT_EOF
4737 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' 4840 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
4738 wlarc= 4841 wlarc=
4739 else 4842 else
@@ -4744,7 +4847,7 @@ index dc6a6682aa4..10364bd81da 100755
4744 fi 4847 fi
4745 ;; 4848 ;;
4746 4849
4747@@ -8585,8 +9094,8 @@ _LT_EOF 4850@@ -8591,8 +9100,8 @@ _LT_EOF
4748 4851
4749 _LT_EOF 4852 _LT_EOF
4750 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 4853 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -4755,7 +4858,7 @@ index dc6a6682aa4..10364bd81da 100755
4755 else 4858 else
4756 ld_shlibs=no 4859 ld_shlibs=no
4757 fi 4860 fi
4758@@ -8632,8 +9141,8 @@ _LT_EOF 4861@@ -8638,8 +9147,8 @@ _LT_EOF
4759 4862
4760 *) 4863 *)
4761 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 4864 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -4766,7 +4869,7 @@ index dc6a6682aa4..10364bd81da 100755
4766 else 4869 else
4767 ld_shlibs=no 4870 ld_shlibs=no
4768 fi 4871 fi
4769@@ -8763,7 +9272,13 @@ _LT_EOF 4872@@ -8769,7 +9278,13 @@ _LT_EOF
4770 allow_undefined_flag='-berok' 4873 allow_undefined_flag='-berok'
4771 # Determine the default libpath from the value encoded in an 4874 # Determine the default libpath from the value encoded in an
4772 # empty executable. 4875 # empty executable.
@@ -4781,7 +4884,7 @@ index dc6a6682aa4..10364bd81da 100755
4781 /* end confdefs.h. */ 4884 /* end confdefs.h. */
4782 4885
4783 int 4886 int
4784@@ -8776,22 +9291,29 @@ main () 4887@@ -8782,22 +9297,29 @@ main ()
4785 _ACEOF 4888 _ACEOF
4786 if ac_fn_c_try_link "$LINENO"; then : 4889 if ac_fn_c_try_link "$LINENO"; then :
4787 4890
@@ -4824,7 +4927,7 @@ index dc6a6682aa4..10364bd81da 100755
4824 4927
4825 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 4928 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
4826 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" 4929 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"
4827@@ -8803,7 +9325,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 4930@@ -8809,7 +9331,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
4828 else 4931 else
4829 # Determine the default libpath from the value encoded in an 4932 # Determine the default libpath from the value encoded in an
4830 # empty executable. 4933 # empty executable.
@@ -4839,7 +4942,7 @@ index dc6a6682aa4..10364bd81da 100755
4839 /* end confdefs.h. */ 4942 /* end confdefs.h. */
4840 4943
4841 int 4944 int
4842@@ -8816,22 +9344,29 @@ main () 4945@@ -8822,22 +9350,29 @@ main ()
4843 _ACEOF 4946 _ACEOF
4844 if ac_fn_c_try_link "$LINENO"; then : 4947 if ac_fn_c_try_link "$LINENO"; then :
4845 4948
@@ -4882,7 +4985,7 @@ index dc6a6682aa4..10364bd81da 100755
4882 4985
4883 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 4986 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
4884 # Warning - without using the other run time loading flags, 4987 # Warning - without using the other run time loading flags,
4885@@ -8876,20 +9411,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 4988@@ -8882,20 +9417,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
4886 # Microsoft Visual C++. 4989 # Microsoft Visual C++.
4887 # hardcode_libdir_flag_spec is actually meaningless, as there is 4990 # hardcode_libdir_flag_spec is actually meaningless, as there is
4888 # no search path for DLLs. 4991 # no search path for DLLs.
@@ -4960,7 +5063,7 @@ index dc6a6682aa4..10364bd81da 100755
4960 ;; 5063 ;;
4961 5064
4962 darwin* | rhapsody*) 5065 darwin* | rhapsody*)
4963@@ -8950,7 +9528,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 5066@@ -8956,7 +9534,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
4964 5067
4965 # FreeBSD 3 and greater uses gcc -shared to do shared libraries. 5068 # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
4966 freebsd* | dragonfly*) 5069 freebsd* | dragonfly*)
@@ -4969,7 +5072,7 @@ index dc6a6682aa4..10364bd81da 100755
4969 hardcode_libdir_flag_spec='-R$libdir' 5072 hardcode_libdir_flag_spec='-R$libdir'
4970 hardcode_direct=yes 5073 hardcode_direct=yes
4971 hardcode_shlibpath_var=no 5074 hardcode_shlibpath_var=no
4972@@ -8958,7 +9536,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 5075@@ -8964,7 +9542,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
4973 5076
4974 hpux9*) 5077 hpux9*)
4975 if test "$GCC" = yes; then 5078 if test "$GCC" = yes; then
@@ -4978,7 +5081,7 @@ index dc6a6682aa4..10364bd81da 100755
4978 else 5081 else
4979 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' 5082 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'
4980 fi 5083 fi
4981@@ -8974,7 +9552,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 5084@@ -8980,7 +9558,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
4982 5085
4983 hpux10*) 5086 hpux10*)
4984 if test "$GCC" = yes && test "$with_gnu_ld" = no; then 5087 if test "$GCC" = yes && test "$with_gnu_ld" = no; then
@@ -4987,7 +5090,7 @@ index dc6a6682aa4..10364bd81da 100755
4987 else 5090 else
4988 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' 5091 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
4989 fi 5092 fi
4990@@ -8998,10 +9576,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 5093@@ -9004,10 +9582,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
4991 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' 5094 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
4992 ;; 5095 ;;
4993 ia64*) 5096 ia64*)
@@ -5000,7 +5103,7 @@ index dc6a6682aa4..10364bd81da 100755
5000 ;; 5103 ;;
5001 esac 5104 esac
5002 else 5105 else
5003@@ -9080,23 +9658,36 @@ fi 5106@@ -9086,23 +9664,36 @@ fi
5004 5107
5005 irix5* | irix6* | nonstopux*) 5108 irix5* | irix6* | nonstopux*)
5006 if test "$GCC" = yes; then 5109 if test "$GCC" = yes; then
@@ -5045,7 +5148,7 @@ index dc6a6682aa4..10364bd81da 100755
5045 else 5148 else
5046 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' 5149 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'
5047 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' 5150 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'
5048@@ -9181,7 +9772,7 @@ rm -f core conftest.err conftest.$ac_objext \ 5151@@ -9187,7 +9778,7 @@ rm -f core conftest.err conftest.$ac_objext \
5049 osf4* | osf5*) # as osf3* with the addition of -msym flag 5152 osf4* | osf5*) # as osf3* with the addition of -msym flag
5050 if test "$GCC" = yes; then 5153 if test "$GCC" = yes; then
5051 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' 5154 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
@@ -5054,7 +5157,7 @@ index dc6a6682aa4..10364bd81da 100755
5054 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' 5157 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
5055 else 5158 else
5056 allow_undefined_flag=' -expect_unresolved \*' 5159 allow_undefined_flag=' -expect_unresolved \*'
5057@@ -9200,9 +9791,9 @@ rm -f core conftest.err conftest.$ac_objext \ 5160@@ -9206,9 +9797,9 @@ rm -f core conftest.err conftest.$ac_objext \
5058 no_undefined_flag=' -z defs' 5161 no_undefined_flag=' -z defs'
5059 if test "$GCC" = yes; then 5162 if test "$GCC" = yes; then
5060 wlarc='${wl}' 5163 wlarc='${wl}'
@@ -5066,7 +5169,7 @@ index dc6a6682aa4..10364bd81da 100755
5066 else 5169 else
5067 case `$CC -V 2>&1` in 5170 case `$CC -V 2>&1` in
5068 *"Compilers 5.0"*) 5171 *"Compilers 5.0"*)
5069@@ -9778,8 +10369,9 @@ cygwin* | mingw* | pw32* | cegcc*) 5172@@ -9784,8 +10375,9 @@ cygwin* | mingw* | pw32* | cegcc*)
5070 need_version=no 5173 need_version=no
5071 need_lib_prefix=no 5174 need_lib_prefix=no
5072 5175
@@ -5078,7 +5181,7 @@ index dc6a6682aa4..10364bd81da 100755
5078 library_names_spec='$libname.dll.a' 5181 library_names_spec='$libname.dll.a'
5079 # DLL is installed to $(libdir)/../bin by postinstall_cmds 5182 # DLL is installed to $(libdir)/../bin by postinstall_cmds
5080 postinstall_cmds='base_file=`basename \${file}`~ 5183 postinstall_cmds='base_file=`basename \${file}`~
5081@@ -9812,13 +10404,71 @@ cygwin* | mingw* | pw32* | cegcc*) 5184@@ -9818,13 +10410,71 @@ cygwin* | mingw* | pw32* | cegcc*)
5082 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' 5185 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
5083 ;; 5186 ;;
5084 esac 5187 esac
@@ -5151,16 +5254,16 @@ index dc6a6682aa4..10364bd81da 100755
5151 # FIXME: first we should search . and the directory the executable is in 5254 # FIXME: first we should search . and the directory the executable is in
5152 shlibpath_var=PATH 5255 shlibpath_var=PATH
5153 ;; 5256 ;;
5154@@ -10696,7 +11346,7 @@ else 5257@@ -10702,7 +11352,7 @@ else
5155 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 5258 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
5156 lt_status=$lt_dlunknown 5259 lt_status=$lt_dlunknown
5157 cat > conftest.$ac_ext <<_LT_EOF 5260 cat > conftest.$ac_ext <<_LT_EOF
5158-#line 10699 "configure" 5261-#line 10705 "configure"
5159+#line $LINENO "configure" 5262+#line $LINENO "configure"
5160 #include "confdefs.h" 5263 #include "confdefs.h"
5161 5264
5162 #if HAVE_DLFCN_H 5265 #if HAVE_DLFCN_H
5163@@ -10740,10 +11390,10 @@ else 5266@@ -10746,10 +11396,10 @@ else
5164 /* When -fvisbility=hidden is used, assume the code has been annotated 5267 /* When -fvisbility=hidden is used, assume the code has been annotated
5165 correspondingly for the symbols needed. */ 5268 correspondingly for the symbols needed. */
5166 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 5269 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
@@ -5173,16 +5276,16 @@ index dc6a6682aa4..10364bd81da 100755
5173 int main () 5276 int main ()
5174 { 5277 {
5175 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 5278 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
5176@@ -10802,7 +11452,7 @@ else 5279@@ -10808,7 +11458,7 @@ else
5177 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 5280 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
5178 lt_status=$lt_dlunknown 5281 lt_status=$lt_dlunknown
5179 cat > conftest.$ac_ext <<_LT_EOF 5282 cat > conftest.$ac_ext <<_LT_EOF
5180-#line 10805 "configure" 5283-#line 10811 "configure"
5181+#line $LINENO "configure" 5284+#line $LINENO "configure"
5182 #include "confdefs.h" 5285 #include "confdefs.h"
5183 5286
5184 #if HAVE_DLFCN_H 5287 #if HAVE_DLFCN_H
5185@@ -10846,10 +11496,10 @@ else 5288@@ -10852,10 +11502,10 @@ else
5186 /* When -fvisbility=hidden is used, assume the code has been annotated 5289 /* When -fvisbility=hidden is used, assume the code has been annotated
5187 correspondingly for the symbols needed. */ 5290 correspondingly for the symbols needed. */
5188 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 5291 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
@@ -5195,7 +5298,7 @@ index dc6a6682aa4..10364bd81da 100755
5195 int main () 5298 int main ()
5196 { 5299 {
5197 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 5300 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
5198@@ -14832,13 +15482,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' 5301@@ -14834,13 +15484,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
5199 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' 5302 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
5200 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' 5303 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
5201 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' 5304 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
@@ -5216,7 +5319,7 @@ index dc6a6682aa4..10364bd81da 100755
5216 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' 5319 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
5217 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' 5320 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
5218 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' 5321 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
5219@@ -14853,14 +15510,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de 5322@@ -14855,14 +15512,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de
5220 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' 5323 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
5221 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' 5324 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
5222 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"`' 5325 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"`'
@@ -5235,7 +5338,7 @@ index dc6a6682aa4..10364bd81da 100755
5235 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' 5338 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
5236 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' 5339 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
5237 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' 5340 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
5238@@ -14893,12 +15553,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q 5341@@ -14895,12 +15555,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q
5239 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' 5342 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
5240 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' 5343 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
5241 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' 5344 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
@@ -5249,7 +5352,7 @@ index dc6a6682aa4..10364bd81da 100755
5249 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' 5352 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
5250 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' 5353 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
5251 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' 5354 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
5252@@ -14953,8 +15613,13 @@ reload_flag \ 5355@@ -14955,8 +15615,13 @@ reload_flag \
5253 OBJDUMP \ 5356 OBJDUMP \
5254 deplibs_check_method \ 5357 deplibs_check_method \
5255 file_magic_cmd \ 5358 file_magic_cmd \
@@ -5263,7 +5366,7 @@ index dc6a6682aa4..10364bd81da 100755
5263 STRIP \ 5366 STRIP \
5264 RANLIB \ 5367 RANLIB \
5265 CC \ 5368 CC \
5266@@ -14964,12 +15629,14 @@ lt_cv_sys_global_symbol_pipe \ 5369@@ -14966,12 +15631,14 @@ lt_cv_sys_global_symbol_pipe \
5267 lt_cv_sys_global_symbol_to_cdecl \ 5370 lt_cv_sys_global_symbol_to_cdecl \
5268 lt_cv_sys_global_symbol_to_c_name_address \ 5371 lt_cv_sys_global_symbol_to_c_name_address \
5269 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ 5372 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
@@ -5279,7 +5382,7 @@ index dc6a6682aa4..10364bd81da 100755
5279 DSYMUTIL \ 5382 DSYMUTIL \
5280 NMEDIT \ 5383 NMEDIT \
5281 LIPO \ 5384 LIPO \
5282@@ -14985,7 +15652,6 @@ no_undefined_flag \ 5385@@ -14987,7 +15654,6 @@ no_undefined_flag \
5283 hardcode_libdir_flag_spec \ 5386 hardcode_libdir_flag_spec \
5284 hardcode_libdir_flag_spec_ld \ 5387 hardcode_libdir_flag_spec_ld \
5285 hardcode_libdir_separator \ 5388 hardcode_libdir_separator \
@@ -5287,7 +5390,7 @@ index dc6a6682aa4..10364bd81da 100755
5287 exclude_expsyms \ 5390 exclude_expsyms \
5288 include_expsyms \ 5391 include_expsyms \
5289 file_list_spec \ 5392 file_list_spec \
5290@@ -15021,6 +15687,7 @@ module_cmds \ 5393@@ -15023,6 +15689,7 @@ module_cmds \
5291 module_expsym_cmds \ 5394 module_expsym_cmds \
5292 export_symbols_cmds \ 5395 export_symbols_cmds \
5293 prelink_cmds \ 5396 prelink_cmds \
@@ -5295,7 +5398,7 @@ index dc6a6682aa4..10364bd81da 100755
5295 postinstall_cmds \ 5398 postinstall_cmds \
5296 postuninstall_cmds \ 5399 postuninstall_cmds \
5297 finish_cmds \ 5400 finish_cmds \
5298@@ -15793,7 +16460,8 @@ $as_echo X"$file" | 5401@@ -15795,7 +16462,8 @@ $as_echo X"$file" |
5299 # NOTE: Changes made to this file will be lost: look at ltmain.sh. 5402 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
5300 # 5403 #
5301 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 5404 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
@@ -5305,7 +5408,7 @@ index dc6a6682aa4..10364bd81da 100755
5305 # Written by Gordon Matzigkeit, 1996 5408 # Written by Gordon Matzigkeit, 1996
5306 # 5409 #
5307 # This file is part of GNU Libtool. 5410 # This file is part of GNU Libtool.
5308@@ -15896,19 +16564,42 @@ SP2NL=$lt_lt_SP2NL 5411@@ -15898,19 +16566,42 @@ SP2NL=$lt_lt_SP2NL
5309 # turn newlines into spaces. 5412 # turn newlines into spaces.
5310 NL2SP=$lt_lt_NL2SP 5413 NL2SP=$lt_lt_NL2SP
5311 5414
@@ -5349,7 +5452,7 @@ index dc6a6682aa4..10364bd81da 100755
5349 # A symbol stripping program. 5452 # A symbol stripping program.
5350 STRIP=$lt_STRIP 5453 STRIP=$lt_STRIP
5351 5454
5352@@ -15938,6 +16629,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address 5455@@ -15940,6 +16631,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
5353 # Transform the output of nm in a C name address pair when lib prefix is needed. 5456 # Transform the output of nm in a C name address pair when lib prefix is needed.
5354 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix 5457 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
5355 5458
@@ -5362,7 +5465,7 @@ index dc6a6682aa4..10364bd81da 100755
5362 # The name of the directory that contains temporary libtool files. 5465 # The name of the directory that contains temporary libtool files.
5363 objdir=$objdir 5466 objdir=$objdir
5364 5467
5365@@ -15947,6 +16644,9 @@ MAGIC_CMD=$MAGIC_CMD 5468@@ -15949,6 +16646,9 @@ MAGIC_CMD=$MAGIC_CMD
5366 # Must we lock files when doing compilation? 5469 # Must we lock files when doing compilation?
5367 need_locks=$lt_need_locks 5470 need_locks=$lt_need_locks
5368 5471
@@ -5372,7 +5475,7 @@ index dc6a6682aa4..10364bd81da 100755
5372 # Tool to manipulate archived DWARF debug symbol files on Mac OS X. 5475 # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
5373 DSYMUTIL=$lt_DSYMUTIL 5476 DSYMUTIL=$lt_DSYMUTIL
5374 5477
5375@@ -16061,12 +16761,12 @@ with_gcc=$GCC 5478@@ -16063,12 +16763,12 @@ with_gcc=$GCC
5376 # Compiler flag to turn off builtin functions. 5479 # Compiler flag to turn off builtin functions.
5377 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag 5480 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
5378 5481
@@ -5388,7 +5491,7 @@ index dc6a6682aa4..10364bd81da 100755
5388 # Compiler flag to prevent dynamic linking. 5491 # Compiler flag to prevent dynamic linking.
5389 link_static_flag=$lt_lt_prog_compiler_static 5492 link_static_flag=$lt_lt_prog_compiler_static
5390 5493
5391@@ -16153,9 +16853,6 @@ inherit_rpath=$inherit_rpath 5494@@ -16155,9 +16855,6 @@ inherit_rpath=$inherit_rpath
5392 # Whether libtool must link a program against all its dependency libraries. 5495 # Whether libtool must link a program against all its dependency libraries.
5393 link_all_deplibs=$link_all_deplibs 5496 link_all_deplibs=$link_all_deplibs
5394 5497
@@ -5398,7 +5501,7 @@ index dc6a6682aa4..10364bd81da 100755
5398 # Set to "yes" if exported symbols are required. 5501 # Set to "yes" if exported symbols are required.
5399 always_export_symbols=$always_export_symbols 5502 always_export_symbols=$always_export_symbols
5400 5503
5401@@ -16171,6 +16868,9 @@ include_expsyms=$lt_include_expsyms 5504@@ -16173,6 +16870,9 @@ include_expsyms=$lt_include_expsyms
5402 # Commands necessary for linking programs (against libraries) with templates. 5505 # Commands necessary for linking programs (against libraries) with templates.
5403 prelink_cmds=$lt_prelink_cmds 5506 prelink_cmds=$lt_prelink_cmds
5404 5507
@@ -5408,7 +5511,7 @@ index dc6a6682aa4..10364bd81da 100755
5408 # Specify filename containing input files. 5511 # Specify filename containing input files.
5409 file_list_spec=$lt_file_list_spec 5512 file_list_spec=$lt_file_list_spec
5410 5513
5411@@ -16203,210 +16903,169 @@ ltmain="$ac_aux_dir/ltmain.sh" 5514@@ -16205,210 +16905,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
5412 # if finds mixed CR/LF and LF-only lines. Since sed operates in 5515 # if finds mixed CR/LF and LF-only lines. Since sed operates in
5413 # text mode, it properly converts lines to CR/LF. This bash problem 5516 # text mode, it properly converts lines to CR/LF. This bash problem
5414 # is reportedly fixed, but why not run on old versions too? 5517 # is reportedly fixed, but why not run on old versions too?
@@ -5782,8 +5885,48 @@ index dc6a6682aa4..10364bd81da 100755
5782 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") 5885 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
5783 chmod +x "$ofile" 5886 chmod +x "$ofile"
5784 5887
5888diff --git a/gdbsupport/Makefile.in b/gdbsupport/Makefile.in
5889index bdceff3b56a..6aadae41031 100644
5890--- a/gdbsupport/Makefile.in
5891+++ b/gdbsupport/Makefile.in
5892@@ -233,6 +233,7 @@ CATOBJEXT = @CATOBJEXT@
5893 CC = @CC@
5894 CCDEPMODE = @CCDEPMODE@
5895 CFLAGS = @CFLAGS@
5896+CONFIG_STATUS_DEPENDENCIES = @CONFIG_STATUS_DEPENDENCIES@
5897 CPP = @CPP@
5898 CPPFLAGS = @CPPFLAGS@
5899 CXX = @CXX@
5900diff --git a/gprof/Makefile.in b/gprof/Makefile.in
5901index 5ef5ece74a9..9d7ce8b62b2 100644
5902--- a/gprof/Makefile.in
5903+++ b/gprof/Makefile.in
5904@@ -321,6 +321,7 @@ CYGPATH_W = @CYGPATH_W@
5905 DATADIRNAME = @DATADIRNAME@
5906 DEFS = @DEFS@
5907 DEPDIR = @DEPDIR@
5908+DLLTOOL = @DLLTOOL@
5909 DSYMUTIL = @DSYMUTIL@
5910 DUMPBIN = @DUMPBIN@
5911 ECHO_C = @ECHO_C@
5912@@ -352,6 +353,7 @@ LN_S = @LN_S@
5913 LTLIBOBJS = @LTLIBOBJS@
5914 MAINT = @MAINT@
5915 MAKEINFO = @MAKEINFO@
5916+MANIFEST_TOOL = @MANIFEST_TOOL@
5917 MKDIR_P = @MKDIR_P@
5918 MKINSTALLDIRS = @MKINSTALLDIRS@
5919 MSGFMT = @MSGFMT@
5920@@ -387,6 +389,7 @@ abs_builddir = @abs_builddir@
5921 abs_srcdir = @abs_srcdir@
5922 abs_top_builddir = @abs_top_builddir@
5923 abs_top_srcdir = @abs_top_srcdir@
5924+ac_ct_AR = @ac_ct_AR@
5925 ac_ct_CC = @ac_ct_CC@
5926 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
5927 am__include = @am__include@
5785diff --git a/gprof/configure b/gprof/configure 5928diff --git a/gprof/configure b/gprof/configure
5786index a7f788f0411..e7703613024 100755 5929index 5a59f1c1d0e..2506887d3b0 100755
5787--- a/gprof/configure 5930--- a/gprof/configure
5788+++ b/gprof/configure 5931+++ b/gprof/configure
5789@@ -663,8 +663,11 @@ OTOOL 5932@@ -663,8 +663,11 @@ OTOOL
@@ -5835,7 +5978,7 @@ index a7f788f0411..e7703613024 100755
5835 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then 5978 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
5836 ECHO='print -r --' 5979 ECHO='print -r --'
5837 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then 5980 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
5838@@ -5238,8 +5244,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; 5981@@ -5244,8 +5250,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6;
5839 # Try some XSI features 5982 # Try some XSI features
5840 xsi_shell=no 5983 xsi_shell=no
5841 ( _lt_dummy="a/b/c" 5984 ( _lt_dummy="a/b/c"
@@ -5846,7 +5989,7 @@ index a7f788f0411..e7703613024 100755
5846 && eval 'test $(( 1 + 1 )) -eq 2 \ 5989 && eval 'test $(( 1 + 1 )) -eq 2 \
5847 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ 5990 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
5848 && xsi_shell=yes 5991 && xsi_shell=yes
5849@@ -5288,6 +5294,80 @@ esac 5992@@ -5294,6 +5300,80 @@ esac
5850 5993
5851 5994
5852 5995
@@ -5927,7 +6070,7 @@ index a7f788f0411..e7703613024 100755
5927 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 6070 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
5928 $as_echo_n "checking for $LD option to reload object files... " >&6; } 6071 $as_echo_n "checking for $LD option to reload object files... " >&6; }
5929 if ${lt_cv_ld_reload_flag+:} false; then : 6072 if ${lt_cv_ld_reload_flag+:} false; then :
5930@@ -5304,6 +5384,11 @@ case $reload_flag in 6073@@ -5310,6 +5390,11 @@ case $reload_flag in
5931 esac 6074 esac
5932 reload_cmds='$LD$reload_flag -o $output$reload_objs' 6075 reload_cmds='$LD$reload_flag -o $output$reload_objs'
5933 case $host_os in 6076 case $host_os in
@@ -5939,7 +6082,7 @@ index a7f788f0411..e7703613024 100755
5939 darwin*) 6082 darwin*)
5940 if test "$GCC" = yes; then 6083 if test "$GCC" = yes; then
5941 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' 6084 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
5942@@ -5472,7 +5557,8 @@ mingw* | pw32*) 6085@@ -5478,7 +5563,8 @@ mingw* | pw32*)
5943 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' 6086 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
5944 lt_cv_file_magic_cmd='func_win32_libid' 6087 lt_cv_file_magic_cmd='func_win32_libid'
5945 else 6088 else
@@ -5949,7 +6092,7 @@ index a7f788f0411..e7703613024 100755
5949 lt_cv_file_magic_cmd='$OBJDUMP -f' 6092 lt_cv_file_magic_cmd='$OBJDUMP -f'
5950 fi 6093 fi
5951 ;; 6094 ;;
5952@@ -5626,6 +5712,21 @@ esac 6095@@ -5632,6 +5718,21 @@ esac
5953 fi 6096 fi
5954 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 6097 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
5955 $as_echo "$lt_cv_deplibs_check_method" >&6; } 6098 $as_echo "$lt_cv_deplibs_check_method" >&6; }
@@ -5971,7 +6114,7 @@ index a7f788f0411..e7703613024 100755
5971 file_magic_cmd=$lt_cv_file_magic_cmd 6114 file_magic_cmd=$lt_cv_file_magic_cmd
5972 deplibs_check_method=$lt_cv_deplibs_check_method 6115 deplibs_check_method=$lt_cv_deplibs_check_method
5973 test -z "$deplibs_check_method" && deplibs_check_method=unknown 6116 test -z "$deplibs_check_method" && deplibs_check_method=unknown
5974@@ -5641,6 +5742,157 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown 6117@@ -5647,6 +5748,157 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
5975 6118
5976 6119
5977 6120
@@ -6129,7 +6272,7 @@ index a7f788f0411..e7703613024 100755
6129 plugin_option= 6272 plugin_option=
6130 plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll" 6273 plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll"
6131 for plugin in $plugin_names; do 6274 for plugin in $plugin_names; do
6132@@ -5655,8 +5907,10 @@ for plugin in $plugin_names; do 6275@@ -5661,8 +5913,10 @@ for plugin in $plugin_names; do
6133 done 6276 done
6134 6277
6135 if test -n "$ac_tool_prefix"; then 6278 if test -n "$ac_tool_prefix"; then
@@ -6142,7 +6285,7 @@ index a7f788f0411..e7703613024 100755
6142 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 6285 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
6143 $as_echo_n "checking for $ac_word... " >&6; } 6286 $as_echo_n "checking for $ac_word... " >&6; }
6144 if ${ac_cv_prog_AR+:} false; then : 6287 if ${ac_cv_prog_AR+:} false; then :
6145@@ -5672,7 +5926,7 @@ do 6288@@ -5678,7 +5932,7 @@ do
6146 test -z "$as_dir" && as_dir=. 6289 test -z "$as_dir" && as_dir=.
6147 for ac_exec_ext in '' $ac_executable_extensions; do 6290 for ac_exec_ext in '' $ac_executable_extensions; do
6148 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 6291 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
@@ -6151,7 +6294,7 @@ index a7f788f0411..e7703613024 100755
6151 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 6294 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
6152 break 2 6295 break 2
6153 fi 6296 fi
6154@@ -5692,11 +5946,15 @@ $as_echo "no" >&6; } 6297@@ -5698,11 +5952,15 @@ $as_echo "no" >&6; }
6155 fi 6298 fi
6156 6299
6157 6300
@@ -6170,7 +6313,7 @@ index a7f788f0411..e7703613024 100755
6170 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 6313 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
6171 $as_echo_n "checking for $ac_word... " >&6; } 6314 $as_echo_n "checking for $ac_word... " >&6; }
6172 if ${ac_cv_prog_ac_ct_AR+:} false; then : 6315 if ${ac_cv_prog_ac_ct_AR+:} false; then :
6173@@ -5712,7 +5970,7 @@ do 6316@@ -5718,7 +5976,7 @@ do
6174 test -z "$as_dir" && as_dir=. 6317 test -z "$as_dir" && as_dir=.
6175 for ac_exec_ext in '' $ac_executable_extensions; do 6318 for ac_exec_ext in '' $ac_executable_extensions; do
6176 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 6319 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
@@ -6179,7 +6322,7 @@ index a7f788f0411..e7703613024 100755
6179 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 6322 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
6180 break 2 6323 break 2
6181 fi 6324 fi
6182@@ -5731,6 +5989,10 @@ else 6325@@ -5737,6 +5995,10 @@ else
6183 $as_echo "no" >&6; } 6326 $as_echo "no" >&6; }
6184 fi 6327 fi
6185 6328
@@ -6190,7 +6333,7 @@ index a7f788f0411..e7703613024 100755
6190 if test "x$ac_ct_AR" = x; then 6333 if test "x$ac_ct_AR" = x; then
6191 AR="false" 6334 AR="false"
6192 else 6335 else
6193@@ -5742,25 +6004,19 @@ ac_tool_warned=yes ;; 6336@@ -5748,25 +6010,19 @@ ac_tool_warned=yes ;;
6194 esac 6337 esac
6195 AR=$ac_ct_AR 6338 AR=$ac_ct_AR
6196 fi 6339 fi
@@ -6225,7 +6368,7 @@ index a7f788f0411..e7703613024 100755
6225 6368
6226 6369
6227 6370
6228@@ -5772,6 +6028,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru 6371@@ -5778,6 +6034,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru
6229 6372
6230 6373
6231 6374
@@ -6290,7 +6433,7 @@ index a7f788f0411..e7703613024 100755
6290 if test -n "$ac_tool_prefix"; then 6433 if test -n "$ac_tool_prefix"; then
6291 # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. 6434 # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
6292 set dummy ${ac_tool_prefix}strip; ac_word=$2 6435 set dummy ${ac_tool_prefix}strip; ac_word=$2
6293@@ -6111,8 +6425,8 @@ esac 6436@@ -6117,8 +6431,8 @@ esac
6294 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" 6437 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
6295 6438
6296 # Transform an extracted symbol line into symbol name and symbol address 6439 # Transform an extracted symbol line into symbol name and symbol address
@@ -6301,7 +6444,7 @@ index a7f788f0411..e7703613024 100755
6301 6444
6302 # Handle CRLF in mingw tool chain 6445 # Handle CRLF in mingw tool chain
6303 opt_cr= 6446 opt_cr=
6304@@ -6148,6 +6462,7 @@ for ac_symprfx in "" "_"; do 6447@@ -6154,6 +6468,7 @@ for ac_symprfx in "" "_"; do
6305 else 6448 else
6306 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" 6449 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
6307 fi 6450 fi
@@ -6309,7 +6452,7 @@ index a7f788f0411..e7703613024 100755
6309 6452
6310 # Check to see that the pipe works correctly. 6453 # Check to see that the pipe works correctly.
6311 pipe_works=no 6454 pipe_works=no
6312@@ -6189,6 +6504,18 @@ _LT_EOF 6455@@ -6195,6 +6510,18 @@ _LT_EOF
6313 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then 6456 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
6314 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then 6457 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
6315 cat <<_LT_EOF > conftest.$ac_ext 6458 cat <<_LT_EOF > conftest.$ac_ext
@@ -6328,7 +6471,7 @@ index a7f788f0411..e7703613024 100755
6328 #ifdef __cplusplus 6471 #ifdef __cplusplus
6329 extern "C" { 6472 extern "C" {
6330 #endif 6473 #endif
6331@@ -6200,7 +6527,7 @@ _LT_EOF 6474@@ -6206,7 +6533,7 @@ _LT_EOF
6332 cat <<_LT_EOF >> conftest.$ac_ext 6475 cat <<_LT_EOF >> conftest.$ac_ext
6333 6476
6334 /* The mapping between symbol names and symbols. */ 6477 /* The mapping between symbol names and symbols. */
@@ -6337,7 +6480,7 @@ index a7f788f0411..e7703613024 100755
6337 const char *name; 6480 const char *name;
6338 void *address; 6481 void *address;
6339 } 6482 }
6340@@ -6226,8 +6553,8 @@ static const void *lt_preloaded_setup() { 6483@@ -6232,8 +6559,8 @@ static const void *lt_preloaded_setup() {
6341 _LT_EOF 6484 _LT_EOF
6342 # Now try linking the two files. 6485 # Now try linking the two files.
6343 mv conftest.$ac_objext conftstm.$ac_objext 6486 mv conftest.$ac_objext conftstm.$ac_objext
@@ -6348,7 +6491,7 @@ index a7f788f0411..e7703613024 100755
6348 LIBS="conftstm.$ac_objext" 6491 LIBS="conftstm.$ac_objext"
6349 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" 6492 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
6350 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 6493 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
6351@@ -6237,8 +6564,8 @@ _LT_EOF 6494@@ -6243,8 +6570,8 @@ _LT_EOF
6352 test $ac_status = 0; } && test -s conftest${ac_exeext}; then 6495 test $ac_status = 0; } && test -s conftest${ac_exeext}; then
6353 pipe_works=yes 6496 pipe_works=yes
6354 fi 6497 fi
@@ -6359,7 +6502,7 @@ index a7f788f0411..e7703613024 100755
6359 else 6502 else
6360 echo "cannot find nm_test_func in $nlist" >&5 6503 echo "cannot find nm_test_func in $nlist" >&5
6361 fi 6504 fi
6362@@ -6275,6 +6602,18 @@ else 6505@@ -6281,6 +6608,18 @@ else
6363 $as_echo "ok" >&6; } 6506 $as_echo "ok" >&6; }
6364 fi 6507 fi
6365 6508
@@ -6378,7 +6521,7 @@ index a7f788f0411..e7703613024 100755
6378 6521
6379 6522
6380 6523
6381@@ -6291,6 +6630,43 @@ fi 6524@@ -6297,6 +6636,43 @@ fi
6382 6525
6383 6526
6384 6527
@@ -6422,7 +6565,1935 @@ index a7f788f0411..e7703613024 100755
6422 6565
6423 6566
6424 6567
6425@@ -6502,6 +6878,123 @@ esac 6568@@ -6508,6 +6884,123 @@ esac
6569
6570 need_locks="$enable_libtool_lock"
6571
6572+if test -n "$ac_tool_prefix"; then
6573+ # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args.
6574+set dummy ${ac_tool_prefix}mt; ac_word=$2
6575+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
6576+$as_echo_n "checking for $ac_word... " >&6; }
6577+if ${ac_cv_prog_MANIFEST_TOOL+:} false; then :
6578+ $as_echo_n "(cached) " >&6
6579+else
6580+ if test -n "$MANIFEST_TOOL"; then
6581+ ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test.
6582+else
6583+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
6584+for as_dir in $PATH
6585+do
6586+ IFS=$as_save_IFS
6587+ test -z "$as_dir" && as_dir=.
6588+ for ac_exec_ext in '' $ac_executable_extensions; do
6589+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
6590+ ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
6591+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
6592+ break 2
6593+ fi
6594+done
6595+ done
6596+IFS=$as_save_IFS
6597+
6598+fi
6599+fi
6600+MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL
6601+if test -n "$MANIFEST_TOOL"; then
6602+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5
6603+$as_echo "$MANIFEST_TOOL" >&6; }
6604+else
6605+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
6606+$as_echo "no" >&6; }
6607+fi
6608+
6609+
6610+fi
6611+if test -z "$ac_cv_prog_MANIFEST_TOOL"; then
6612+ ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL
6613+ # Extract the first word of "mt", so it can be a program name with args.
6614+set dummy mt; ac_word=$2
6615+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
6616+$as_echo_n "checking for $ac_word... " >&6; }
6617+if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then :
6618+ $as_echo_n "(cached) " >&6
6619+else
6620+ if test -n "$ac_ct_MANIFEST_TOOL"; then
6621+ ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test.
6622+else
6623+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
6624+for as_dir in $PATH
6625+do
6626+ IFS=$as_save_IFS
6627+ test -z "$as_dir" && as_dir=.
6628+ for ac_exec_ext in '' $ac_executable_extensions; do
6629+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
6630+ ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
6631+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
6632+ break 2
6633+ fi
6634+done
6635+ done
6636+IFS=$as_save_IFS
6637+
6638+fi
6639+fi
6640+ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL
6641+if test -n "$ac_ct_MANIFEST_TOOL"; then
6642+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5
6643+$as_echo "$ac_ct_MANIFEST_TOOL" >&6; }
6644+else
6645+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
6646+$as_echo "no" >&6; }
6647+fi
6648+
6649+ if test "x$ac_ct_MANIFEST_TOOL" = x; then
6650+ MANIFEST_TOOL=":"
6651+ else
6652+ case $cross_compiling:$ac_tool_warned in
6653+yes:)
6654+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
6655+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
6656+ac_tool_warned=yes ;;
6657+esac
6658+ MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL
6659+ fi
6660+else
6661+ MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL"
6662+fi
6663+
6664+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
6665+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5
6666+$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; }
6667+if ${lt_cv_path_mainfest_tool+:} false; then :
6668+ $as_echo_n "(cached) " >&6
6669+else
6670+ lt_cv_path_mainfest_tool=no
6671+ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5
6672+ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
6673+ cat conftest.err >&5
6674+ if $GREP 'Manifest Tool' conftest.out > /dev/null; then
6675+ lt_cv_path_mainfest_tool=yes
6676+ fi
6677+ rm -f conftest*
6678+fi
6679+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5
6680+$as_echo "$lt_cv_path_mainfest_tool" >&6; }
6681+if test "x$lt_cv_path_mainfest_tool" != xyes; then
6682+ MANIFEST_TOOL=:
6683+fi
6684+
6685+
6686+
6687+
6688+
6689
6690 case $host_os in
6691 rhapsody* | darwin*)
6692@@ -7071,6 +7564,8 @@ _LT_EOF
6693 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
6694 echo "$AR cru libconftest.a conftest.o" >&5
6695 $AR cru libconftest.a conftest.o 2>&5
6696+ echo "$RANLIB libconftest.a" >&5
6697+ $RANLIB libconftest.a 2>&5
6698 cat > conftest.c << _LT_EOF
6699 int main() { return 0;}
6700 _LT_EOF
6701@@ -7653,8 +8148,6 @@ fi
6702 lt_prog_compiler_pic=
6703 lt_prog_compiler_static=
6704
6705-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
6706-$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
6707
6708 if test "$GCC" = yes; then
6709 lt_prog_compiler_wl='-Wl,'
6710@@ -7820,6 +8313,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
6711 lt_prog_compiler_pic='--shared'
6712 lt_prog_compiler_static='--static'
6713 ;;
6714+ nagfor*)
6715+ # NAG Fortran compiler
6716+ lt_prog_compiler_wl='-Wl,-Wl,,'
6717+ lt_prog_compiler_pic='-PIC'
6718+ lt_prog_compiler_static='-Bstatic'
6719+ ;;
6720 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
6721 # Portland Group compilers (*not* the Pentium gcc compiler,
6722 # which looks to be a dead project)
6723@@ -7882,7 +8381,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
6724 lt_prog_compiler_pic='-KPIC'
6725 lt_prog_compiler_static='-Bstatic'
6726 case $cc_basename in
6727- f77* | f90* | f95*)
6728+ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
6729 lt_prog_compiler_wl='-Qoption ld ';;
6730 *)
6731 lt_prog_compiler_wl='-Wl,';;
6732@@ -7939,13 +8438,17 @@ case $host_os in
6733 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
6734 ;;
6735 esac
6736-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5
6737-$as_echo "$lt_prog_compiler_pic" >&6; }
6738-
6739-
6740-
6741-
6742
6743+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
6744+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
6745+if ${lt_cv_prog_compiler_pic+:} false; then :
6746+ $as_echo_n "(cached) " >&6
6747+else
6748+ lt_cv_prog_compiler_pic=$lt_prog_compiler_pic
6749+fi
6750+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
6751+$as_echo "$lt_cv_prog_compiler_pic" >&6; }
6752+lt_prog_compiler_pic=$lt_cv_prog_compiler_pic
6753
6754 #
6755 # Check to make sure the PIC flag actually works.
6756@@ -8006,6 +8509,11 @@ fi
6757
6758
6759
6760+
6761+
6762+
6763+
6764+
6765 #
6766 # Check to make sure the static flag actually works.
6767 #
6768@@ -8356,7 +8864,8 @@ _LT_EOF
6769 allow_undefined_flag=unsupported
6770 always_export_symbols=no
6771 enable_shared_with_static_runtimes=yes
6772- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
6773+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols'
6774+ exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
6775
6776 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
6777 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
6778@@ -8455,12 +8964,12 @@ _LT_EOF
6779 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
6780 hardcode_libdir_flag_spec=
6781 hardcode_libdir_flag_spec_ld='-rpath $libdir'
6782- archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
6783+ archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
6784 if test "x$supports_anon_versioning" = xyes; then
6785 archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
6786 cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
6787 echo "local: *; };" >> $output_objdir/$libname.ver~
6788- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
6789+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
6790 fi
6791 ;;
6792 esac
6793@@ -8474,8 +8983,8 @@ _LT_EOF
6794 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
6795 wlarc=
6796 else
6797- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
6798- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
6799+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
6800+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
6801 fi
6802 ;;
6803
6804@@ -8493,8 +9002,8 @@ _LT_EOF
6805
6806 _LT_EOF
6807 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
6808- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
6809- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
6810+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
6811+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
6812 else
6813 ld_shlibs=no
6814 fi
6815@@ -8540,8 +9049,8 @@ _LT_EOF
6816
6817 *)
6818 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
6819- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
6820- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
6821+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
6822+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
6823 else
6824 ld_shlibs=no
6825 fi
6826@@ -8671,7 +9180,13 @@ _LT_EOF
6827 allow_undefined_flag='-berok'
6828 # Determine the default libpath from the value encoded in an
6829 # empty executable.
6830- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
6831+ if test "${lt_cv_aix_libpath+set}" = set; then
6832+ aix_libpath=$lt_cv_aix_libpath
6833+else
6834+ if ${lt_cv_aix_libpath_+:} false; then :
6835+ $as_echo_n "(cached) " >&6
6836+else
6837+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
6838 /* end confdefs.h. */
6839
6840 int
6841@@ -8684,22 +9199,29 @@ main ()
6842 _ACEOF
6843 if ac_fn_c_try_link "$LINENO"; then :
6844
6845-lt_aix_libpath_sed='
6846- /Import File Strings/,/^$/ {
6847- /^0/ {
6848- s/^0 *\(.*\)$/\1/
6849- p
6850- }
6851- }'
6852-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
6853-# Check for a 64-bit object if we didn't find anything.
6854-if test -z "$aix_libpath"; then
6855- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
6856-fi
6857+ lt_aix_libpath_sed='
6858+ /Import File Strings/,/^$/ {
6859+ /^0/ {
6860+ s/^0 *\([^ ]*\) *$/\1/
6861+ p
6862+ }
6863+ }'
6864+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
6865+ # Check for a 64-bit object if we didn't find anything.
6866+ if test -z "$lt_cv_aix_libpath_"; then
6867+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
6868+ fi
6869 fi
6870 rm -f core conftest.err conftest.$ac_objext \
6871 conftest$ac_exeext conftest.$ac_ext
6872-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
6873+ if test -z "$lt_cv_aix_libpath_"; then
6874+ lt_cv_aix_libpath_="/usr/lib:/lib"
6875+ fi
6876+
6877+fi
6878+
6879+ aix_libpath=$lt_cv_aix_libpath_
6880+fi
6881
6882 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
6883 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"
6884@@ -8711,7 +9233,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
6885 else
6886 # Determine the default libpath from the value encoded in an
6887 # empty executable.
6888- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
6889+ if test "${lt_cv_aix_libpath+set}" = set; then
6890+ aix_libpath=$lt_cv_aix_libpath
6891+else
6892+ if ${lt_cv_aix_libpath_+:} false; then :
6893+ $as_echo_n "(cached) " >&6
6894+else
6895+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
6896 /* end confdefs.h. */
6897
6898 int
6899@@ -8724,22 +9252,29 @@ main ()
6900 _ACEOF
6901 if ac_fn_c_try_link "$LINENO"; then :
6902
6903-lt_aix_libpath_sed='
6904- /Import File Strings/,/^$/ {
6905- /^0/ {
6906- s/^0 *\(.*\)$/\1/
6907- p
6908- }
6909- }'
6910-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
6911-# Check for a 64-bit object if we didn't find anything.
6912-if test -z "$aix_libpath"; then
6913- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
6914-fi
6915+ lt_aix_libpath_sed='
6916+ /Import File Strings/,/^$/ {
6917+ /^0/ {
6918+ s/^0 *\([^ ]*\) *$/\1/
6919+ p
6920+ }
6921+ }'
6922+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
6923+ # Check for a 64-bit object if we didn't find anything.
6924+ if test -z "$lt_cv_aix_libpath_"; then
6925+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
6926+ fi
6927 fi
6928 rm -f core conftest.err conftest.$ac_objext \
6929 conftest$ac_exeext conftest.$ac_ext
6930-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
6931+ if test -z "$lt_cv_aix_libpath_"; then
6932+ lt_cv_aix_libpath_="/usr/lib:/lib"
6933+ fi
6934+
6935+fi
6936+
6937+ aix_libpath=$lt_cv_aix_libpath_
6938+fi
6939
6940 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
6941 # Warning - without using the other run time loading flags,
6942@@ -8784,20 +9319,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
6943 # Microsoft Visual C++.
6944 # hardcode_libdir_flag_spec is actually meaningless, as there is
6945 # no search path for DLLs.
6946- hardcode_libdir_flag_spec=' '
6947- allow_undefined_flag=unsupported
6948- # Tell ltmain to make .lib files, not .a files.
6949- libext=lib
6950- # Tell ltmain to make .dll files, not .so files.
6951- shrext_cmds=".dll"
6952- # FIXME: Setting linknames here is a bad hack.
6953- archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
6954- # The linker will automatically build a .lib file if we build a DLL.
6955- old_archive_from_new_cmds='true'
6956- # FIXME: Should let the user specify the lib program.
6957- old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
6958- fix_srcfile_path='`cygpath -w "$srcfile"`'
6959- enable_shared_with_static_runtimes=yes
6960+ case $cc_basename in
6961+ cl*)
6962+ # Native MSVC
6963+ hardcode_libdir_flag_spec=' '
6964+ allow_undefined_flag=unsupported
6965+ always_export_symbols=yes
6966+ file_list_spec='@'
6967+ # Tell ltmain to make .lib files, not .a files.
6968+ libext=lib
6969+ # Tell ltmain to make .dll files, not .so files.
6970+ shrext_cmds=".dll"
6971+ # FIXME: Setting linknames here is a bad hack.
6972+ archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
6973+ archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
6974+ sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
6975+ else
6976+ sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
6977+ fi~
6978+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
6979+ linknames='
6980+ # The linker will not automatically build a static lib if we build a DLL.
6981+ # _LT_TAGVAR(old_archive_from_new_cmds, )='true'
6982+ enable_shared_with_static_runtimes=yes
6983+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
6984+ # Don't use ranlib
6985+ old_postinstall_cmds='chmod 644 $oldlib'
6986+ postlink_cmds='lt_outputfile="@OUTPUT@"~
6987+ lt_tool_outputfile="@TOOL_OUTPUT@"~
6988+ case $lt_outputfile in
6989+ *.exe|*.EXE) ;;
6990+ *)
6991+ lt_outputfile="$lt_outputfile.exe"
6992+ lt_tool_outputfile="$lt_tool_outputfile.exe"
6993+ ;;
6994+ esac~
6995+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
6996+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
6997+ $RM "$lt_outputfile.manifest";
6998+ fi'
6999+ ;;
7000+ *)
7001+ # Assume MSVC wrapper
7002+ hardcode_libdir_flag_spec=' '
7003+ allow_undefined_flag=unsupported
7004+ # Tell ltmain to make .lib files, not .a files.
7005+ libext=lib
7006+ # Tell ltmain to make .dll files, not .so files.
7007+ shrext_cmds=".dll"
7008+ # FIXME: Setting linknames here is a bad hack.
7009+ archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
7010+ # The linker will automatically build a .lib file if we build a DLL.
7011+ old_archive_from_new_cmds='true'
7012+ # FIXME: Should let the user specify the lib program.
7013+ old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
7014+ enable_shared_with_static_runtimes=yes
7015+ ;;
7016+ esac
7017 ;;
7018
7019 darwin* | rhapsody*)
7020@@ -8858,7 +9436,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
7021
7022 # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
7023 freebsd* | dragonfly*)
7024- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
7025+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
7026 hardcode_libdir_flag_spec='-R$libdir'
7027 hardcode_direct=yes
7028 hardcode_shlibpath_var=no
7029@@ -8866,7 +9444,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
7030
7031 hpux9*)
7032 if test "$GCC" = yes; then
7033- archive_cmds='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
7034+ archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
7035 else
7036 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'
7037 fi
7038@@ -8882,7 +9460,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
7039
7040 hpux10*)
7041 if test "$GCC" = yes && test "$with_gnu_ld" = no; then
7042- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
7043+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
7044 else
7045 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
7046 fi
7047@@ -8906,10 +9484,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
7048 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
7049 ;;
7050 ia64*)
7051- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
7052+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
7053 ;;
7054 *)
7055- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
7056+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
7057 ;;
7058 esac
7059 else
7060@@ -8988,23 +9566,36 @@ fi
7061
7062 irix5* | irix6* | nonstopux*)
7063 if test "$GCC" = yes; then
7064- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
7065+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
7066 # Try to use the -exported_symbol ld option, if it does not
7067 # work, assume that -exports_file does not work either and
7068 # implicitly export all symbols.
7069- save_LDFLAGS="$LDFLAGS"
7070- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
7071- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
7072+ # This should be the same for all languages, so no per-tag cache variable.
7073+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5
7074+$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; }
7075+if ${lt_cv_irix_exported_symbol+:} false; then :
7076+ $as_echo_n "(cached) " >&6
7077+else
7078+ save_LDFLAGS="$LDFLAGS"
7079+ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
7080+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
7081 /* end confdefs.h. */
7082-int foo(void) {}
7083+int foo (void) { return 0; }
7084 _ACEOF
7085 if ac_fn_c_try_link "$LINENO"; then :
7086- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
7087-
7088+ lt_cv_irix_exported_symbol=yes
7089+else
7090+ lt_cv_irix_exported_symbol=no
7091 fi
7092 rm -f core conftest.err conftest.$ac_objext \
7093 conftest$ac_exeext conftest.$ac_ext
7094- LDFLAGS="$save_LDFLAGS"
7095+ LDFLAGS="$save_LDFLAGS"
7096+fi
7097+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5
7098+$as_echo "$lt_cv_irix_exported_symbol" >&6; }
7099+ if test "$lt_cv_irix_exported_symbol" = yes; then
7100+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
7101+ fi
7102 else
7103 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'
7104 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'
7105@@ -9089,7 +9680,7 @@ rm -f core conftest.err conftest.$ac_objext \
7106 osf4* | osf5*) # as osf3* with the addition of -msym flag
7107 if test "$GCC" = yes; then
7108 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
7109- archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
7110+ archive_cmds='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
7111 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
7112 else
7113 allow_undefined_flag=' -expect_unresolved \*'
7114@@ -9108,9 +9699,9 @@ rm -f core conftest.err conftest.$ac_objext \
7115 no_undefined_flag=' -z defs'
7116 if test "$GCC" = yes; then
7117 wlarc='${wl}'
7118- archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
7119+ archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
7120 archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
7121- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
7122+ $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
7123 else
7124 case `$CC -V 2>&1` in
7125 *"Compilers 5.0"*)
7126@@ -9686,8 +10277,9 @@ cygwin* | mingw* | pw32* | cegcc*)
7127 need_version=no
7128 need_lib_prefix=no
7129
7130- case $GCC,$host_os in
7131- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
7132+ case $GCC,$cc_basename in
7133+ yes,*)
7134+ # gcc
7135 library_names_spec='$libname.dll.a'
7136 # DLL is installed to $(libdir)/../bin by postinstall_cmds
7137 postinstall_cmds='base_file=`basename \${file}`~
7138@@ -9720,13 +10312,71 @@ cygwin* | mingw* | pw32* | cegcc*)
7139 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
7140 ;;
7141 esac
7142+ dynamic_linker='Win32 ld.exe'
7143+ ;;
7144+
7145+ *,cl*)
7146+ # Native MSVC
7147+ libname_spec='$name'
7148+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
7149+ library_names_spec='${libname}.dll.lib'
7150+
7151+ case $build_os in
7152+ mingw*)
7153+ sys_lib_search_path_spec=
7154+ lt_save_ifs=$IFS
7155+ IFS=';'
7156+ for lt_path in $LIB
7157+ do
7158+ IFS=$lt_save_ifs
7159+ # Let DOS variable expansion print the short 8.3 style file name.
7160+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
7161+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
7162+ done
7163+ IFS=$lt_save_ifs
7164+ # Convert to MSYS style.
7165+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
7166+ ;;
7167+ cygwin*)
7168+ # Convert to unix form, then to dos form, then back to unix form
7169+ # but this time dos style (no spaces!) so that the unix form looks
7170+ # like /cygdrive/c/PROGRA~1:/cygdr...
7171+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
7172+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
7173+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
7174+ ;;
7175+ *)
7176+ sys_lib_search_path_spec="$LIB"
7177+ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
7178+ # It is most probably a Windows format PATH.
7179+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
7180+ else
7181+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
7182+ fi
7183+ # FIXME: find the short name or the path components, as spaces are
7184+ # common. (e.g. "Program Files" -> "PROGRA~1")
7185+ ;;
7186+ esac
7187+
7188+ # DLL is installed to $(libdir)/../bin by postinstall_cmds
7189+ postinstall_cmds='base_file=`basename \${file}`~
7190+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
7191+ dldir=$destdir/`dirname \$dlpath`~
7192+ test -d \$dldir || mkdir -p \$dldir~
7193+ $install_prog $dir/$dlname \$dldir/$dlname'
7194+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
7195+ dlpath=$dir/\$dldll~
7196+ $RM \$dlpath'
7197+ shlibpath_overrides_runpath=yes
7198+ dynamic_linker='Win32 link.exe'
7199 ;;
7200
7201 *)
7202+ # Assume MSVC wrapper
7203 library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
7204+ dynamic_linker='Win32 ld.exe'
7205 ;;
7206 esac
7207- dynamic_linker='Win32 ld.exe'
7208 # FIXME: first we should search . and the directory the executable is in
7209 shlibpath_var=PATH
7210 ;;
7211@@ -10604,7 +11254,7 @@ else
7212 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
7213 lt_status=$lt_dlunknown
7214 cat > conftest.$ac_ext <<_LT_EOF
7215-#line 10607 "configure"
7216+#line $LINENO "configure"
7217 #include "confdefs.h"
7218
7219 #if HAVE_DLFCN_H
7220@@ -10648,10 +11298,10 @@ else
7221 /* When -fvisbility=hidden is used, assume the code has been annotated
7222 correspondingly for the symbols needed. */
7223 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
7224-void fnord () __attribute__((visibility("default")));
7225+int fnord () __attribute__((visibility("default")));
7226 #endif
7227
7228-void fnord () { int i=42; }
7229+int fnord () { return 42; }
7230 int main ()
7231 {
7232 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
7233@@ -10710,7 +11360,7 @@ else
7234 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
7235 lt_status=$lt_dlunknown
7236 cat > conftest.$ac_ext <<_LT_EOF
7237-#line 10713 "configure"
7238+#line $LINENO "configure"
7239 #include "confdefs.h"
7240
7241 #if HAVE_DLFCN_H
7242@@ -10754,10 +11404,10 @@ else
7243 /* When -fvisbility=hidden is used, assume the code has been annotated
7244 correspondingly for the symbols needed. */
7245 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
7246-void fnord () __attribute__((visibility("default")));
7247+int fnord () __attribute__((visibility("default")));
7248 #endif
7249
7250-void fnord () { int i=42; }
7251+int fnord () { return 42; }
7252 int main ()
7253 {
7254 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
7255@@ -12777,13 +13427,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
7256 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
7257 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
7258 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
7259+lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`'
7260+lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`'
7261 reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
7262 reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
7263 OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
7264 deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`'
7265 file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`'
7266+file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`'
7267+want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`'
7268+DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`'
7269+sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`'
7270 AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`'
7271 AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`'
7272+archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`'
7273 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
7274 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
7275 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
7276@@ -12798,14 +13455,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de
7277 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
7278 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
7279 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"`'
7280+nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`'
7281+lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`'
7282 objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`'
7283 MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`'
7284 lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`'
7285-lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
7286 lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`'
7287+lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
7288 lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`'
7289 lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`'
7290 need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`'
7291+MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`'
7292 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
7293 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
7294 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
7295@@ -12838,12 +13498,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q
7296 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
7297 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
7298 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
7299-fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`'
7300 always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`'
7301 export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`'
7302 exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`'
7303 include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`'
7304 prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`'
7305+postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`'
7306 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
7307 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
7308 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
7309@@ -12898,8 +13558,13 @@ reload_flag \
7310 OBJDUMP \
7311 deplibs_check_method \
7312 file_magic_cmd \
7313+file_magic_glob \
7314+want_nocaseglob \
7315+DLLTOOL \
7316+sharedlib_from_linklib_cmd \
7317 AR \
7318 AR_FLAGS \
7319+archiver_list_spec \
7320 STRIP \
7321 RANLIB \
7322 CC \
7323@@ -12909,12 +13574,14 @@ lt_cv_sys_global_symbol_pipe \
7324 lt_cv_sys_global_symbol_to_cdecl \
7325 lt_cv_sys_global_symbol_to_c_name_address \
7326 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
7327+nm_file_list_spec \
7328 lt_prog_compiler_no_builtin_flag \
7329-lt_prog_compiler_wl \
7330 lt_prog_compiler_pic \
7331+lt_prog_compiler_wl \
7332 lt_prog_compiler_static \
7333 lt_cv_prog_compiler_c_o \
7334 need_locks \
7335+MANIFEST_TOOL \
7336 DSYMUTIL \
7337 NMEDIT \
7338 LIPO \
7339@@ -12930,7 +13597,6 @@ no_undefined_flag \
7340 hardcode_libdir_flag_spec \
7341 hardcode_libdir_flag_spec_ld \
7342 hardcode_libdir_separator \
7343-fix_srcfile_path \
7344 exclude_expsyms \
7345 include_expsyms \
7346 file_list_spec \
7347@@ -12966,6 +13632,7 @@ module_cmds \
7348 module_expsym_cmds \
7349 export_symbols_cmds \
7350 prelink_cmds \
7351+postlink_cmds \
7352 postinstall_cmds \
7353 postuninstall_cmds \
7354 finish_cmds \
7355@@ -13731,7 +14398,8 @@ $as_echo X"$file" |
7356 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
7357 #
7358 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
7359-# 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
7360+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
7361+# Inc.
7362 # Written by Gordon Matzigkeit, 1996
7363 #
7364 # This file is part of GNU Libtool.
7365@@ -13834,19 +14502,42 @@ SP2NL=$lt_lt_SP2NL
7366 # turn newlines into spaces.
7367 NL2SP=$lt_lt_NL2SP
7368
7369+# convert \$build file names to \$host format.
7370+to_host_file_cmd=$lt_cv_to_host_file_cmd
7371+
7372+# convert \$build files to toolchain format.
7373+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
7374+
7375 # An object symbol dumper.
7376 OBJDUMP=$lt_OBJDUMP
7377
7378 # Method to check whether dependent libraries are shared objects.
7379 deplibs_check_method=$lt_deplibs_check_method
7380
7381-# Command to use when deplibs_check_method == "file_magic".
7382+# Command to use when deplibs_check_method = "file_magic".
7383 file_magic_cmd=$lt_file_magic_cmd
7384
7385+# How to find potential files when deplibs_check_method = "file_magic".
7386+file_magic_glob=$lt_file_magic_glob
7387+
7388+# Find potential files using nocaseglob when deplibs_check_method = "file_magic".
7389+want_nocaseglob=$lt_want_nocaseglob
7390+
7391+# DLL creation program.
7392+DLLTOOL=$lt_DLLTOOL
7393+
7394+# Command to associate shared and link libraries.
7395+sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd
7396+
7397 # The archiver.
7398 AR=$lt_AR
7399+
7400+# Flags to create an archive.
7401 AR_FLAGS=$lt_AR_FLAGS
7402
7403+# How to feed a file listing to the archiver.
7404+archiver_list_spec=$lt_archiver_list_spec
7405+
7406 # A symbol stripping program.
7407 STRIP=$lt_STRIP
7408
7409@@ -13876,6 +14567,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
7410 # Transform the output of nm in a C name address pair when lib prefix is needed.
7411 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
7412
7413+# Specify filename containing input files for \$NM.
7414+nm_file_list_spec=$lt_nm_file_list_spec
7415+
7416+# The root where to search for dependent libraries,and in which our libraries should be installed.
7417+lt_sysroot=$lt_sysroot
7418+
7419 # The name of the directory that contains temporary libtool files.
7420 objdir=$objdir
7421
7422@@ -13885,6 +14582,9 @@ MAGIC_CMD=$MAGIC_CMD
7423 # Must we lock files when doing compilation?
7424 need_locks=$lt_need_locks
7425
7426+# Manifest tool.
7427+MANIFEST_TOOL=$lt_MANIFEST_TOOL
7428+
7429 # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
7430 DSYMUTIL=$lt_DSYMUTIL
7431
7432@@ -13999,12 +14699,12 @@ with_gcc=$GCC
7433 # Compiler flag to turn off builtin functions.
7434 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
7435
7436-# How to pass a linker flag through the compiler.
7437-wl=$lt_lt_prog_compiler_wl
7438-
7439 # Additional compiler flags for building library objects.
7440 pic_flag=$lt_lt_prog_compiler_pic
7441
7442+# How to pass a linker flag through the compiler.
7443+wl=$lt_lt_prog_compiler_wl
7444+
7445 # Compiler flag to prevent dynamic linking.
7446 link_static_flag=$lt_lt_prog_compiler_static
7447
7448@@ -14091,9 +14791,6 @@ inherit_rpath=$inherit_rpath
7449 # Whether libtool must link a program against all its dependency libraries.
7450 link_all_deplibs=$link_all_deplibs
7451
7452-# Fix the shell variable \$srcfile for the compiler.
7453-fix_srcfile_path=$lt_fix_srcfile_path
7454-
7455 # Set to "yes" if exported symbols are required.
7456 always_export_symbols=$always_export_symbols
7457
7458@@ -14109,6 +14806,9 @@ include_expsyms=$lt_include_expsyms
7459 # Commands necessary for linking programs (against libraries) with templates.
7460 prelink_cmds=$lt_prelink_cmds
7461
7462+# Commands necessary for finishing linking programs.
7463+postlink_cmds=$lt_postlink_cmds
7464+
7465 # Specify filename containing input files.
7466 file_list_spec=$lt_file_list_spec
7467
7468@@ -14141,210 +14841,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
7469 # if finds mixed CR/LF and LF-only lines. Since sed operates in
7470 # text mode, it properly converts lines to CR/LF. This bash problem
7471 # is reportedly fixed, but why not run on old versions too?
7472- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
7473- || (rm -f "$cfgfile"; exit 1)
7474-
7475- case $xsi_shell in
7476- yes)
7477- cat << \_LT_EOF >> "$cfgfile"
7478-
7479-# func_dirname file append nondir_replacement
7480-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
7481-# otherwise set result to NONDIR_REPLACEMENT.
7482-func_dirname ()
7483-{
7484- case ${1} in
7485- */*) func_dirname_result="${1%/*}${2}" ;;
7486- * ) func_dirname_result="${3}" ;;
7487- esac
7488-}
7489-
7490-# func_basename file
7491-func_basename ()
7492-{
7493- func_basename_result="${1##*/}"
7494-}
7495-
7496-# func_dirname_and_basename file append nondir_replacement
7497-# perform func_basename and func_dirname in a single function
7498-# call:
7499-# dirname: Compute the dirname of FILE. If nonempty,
7500-# add APPEND to the result, otherwise set result
7501-# to NONDIR_REPLACEMENT.
7502-# value returned in "$func_dirname_result"
7503-# basename: Compute filename of FILE.
7504-# value retuned in "$func_basename_result"
7505-# Implementation must be kept synchronized with func_dirname
7506-# and func_basename. For efficiency, we do not delegate to
7507-# those functions but instead duplicate the functionality here.
7508-func_dirname_and_basename ()
7509-{
7510- case ${1} in
7511- */*) func_dirname_result="${1%/*}${2}" ;;
7512- * ) func_dirname_result="${3}" ;;
7513- esac
7514- func_basename_result="${1##*/}"
7515-}
7516-
7517-# func_stripname prefix suffix name
7518-# strip PREFIX and SUFFIX off of NAME.
7519-# PREFIX and SUFFIX must not contain globbing or regex special
7520-# characters, hashes, percent signs, but SUFFIX may contain a leading
7521-# dot (in which case that matches only a dot).
7522-func_stripname ()
7523-{
7524- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
7525- # positional parameters, so assign one to ordinary parameter first.
7526- func_stripname_result=${3}
7527- func_stripname_result=${func_stripname_result#"${1}"}
7528- func_stripname_result=${func_stripname_result%"${2}"}
7529-}
7530-
7531-# func_opt_split
7532-func_opt_split ()
7533-{
7534- func_opt_split_opt=${1%%=*}
7535- func_opt_split_arg=${1#*=}
7536-}
7537-
7538-# func_lo2o object
7539-func_lo2o ()
7540-{
7541- case ${1} in
7542- *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
7543- *) func_lo2o_result=${1} ;;
7544- esac
7545-}
7546-
7547-# func_xform libobj-or-source
7548-func_xform ()
7549-{
7550- func_xform_result=${1%.*}.lo
7551-}
7552-
7553-# func_arith arithmetic-term...
7554-func_arith ()
7555-{
7556- func_arith_result=$(( $* ))
7557-}
7558-
7559-# func_len string
7560-# STRING may not start with a hyphen.
7561-func_len ()
7562-{
7563- func_len_result=${#1}
7564-}
7565-
7566-_LT_EOF
7567- ;;
7568- *) # Bourne compatible functions.
7569- cat << \_LT_EOF >> "$cfgfile"
7570-
7571-# func_dirname file append nondir_replacement
7572-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
7573-# otherwise set result to NONDIR_REPLACEMENT.
7574-func_dirname ()
7575-{
7576- # Extract subdirectory from the argument.
7577- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
7578- if test "X$func_dirname_result" = "X${1}"; then
7579- func_dirname_result="${3}"
7580- else
7581- func_dirname_result="$func_dirname_result${2}"
7582- fi
7583-}
7584-
7585-# func_basename file
7586-func_basename ()
7587-{
7588- func_basename_result=`$ECHO "${1}" | $SED "$basename"`
7589-}
7590-
7591-
7592-# func_stripname prefix suffix name
7593-# strip PREFIX and SUFFIX off of NAME.
7594-# PREFIX and SUFFIX must not contain globbing or regex special
7595-# characters, hashes, percent signs, but SUFFIX may contain a leading
7596-# dot (in which case that matches only a dot).
7597-# func_strip_suffix prefix name
7598-func_stripname ()
7599-{
7600- case ${2} in
7601- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
7602- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
7603- esac
7604-}
7605-
7606-# sed scripts:
7607-my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q'
7608-my_sed_long_arg='1s/^-[^=]*=//'
7609-
7610-# func_opt_split
7611-func_opt_split ()
7612-{
7613- func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"`
7614- func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"`
7615-}
7616-
7617-# func_lo2o object
7618-func_lo2o ()
7619-{
7620- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
7621-}
7622-
7623-# func_xform libobj-or-source
7624-func_xform ()
7625-{
7626- func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`
7627-}
7628-
7629-# func_arith arithmetic-term...
7630-func_arith ()
7631-{
7632- func_arith_result=`expr "$@"`
7633-}
7634-
7635-# func_len string
7636-# STRING may not start with a hyphen.
7637-func_len ()
7638-{
7639- func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len`
7640-}
7641-
7642-_LT_EOF
7643-esac
7644-
7645-case $lt_shell_append in
7646- yes)
7647- cat << \_LT_EOF >> "$cfgfile"
7648-
7649-# func_append var value
7650-# Append VALUE to the end of shell variable VAR.
7651-func_append ()
7652-{
7653- eval "$1+=\$2"
7654-}
7655-_LT_EOF
7656- ;;
7657- *)
7658- cat << \_LT_EOF >> "$cfgfile"
7659-
7660-# func_append var value
7661-# Append VALUE to the end of shell variable VAR.
7662-func_append ()
7663-{
7664- eval "$1=\$$1\$2"
7665-}
7666-
7667-_LT_EOF
7668- ;;
7669- esac
7670-
7671-
7672- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
7673- || (rm -f "$cfgfile"; exit 1)
7674-
7675- mv -f "$cfgfile" "$ofile" ||
7676+ sed '$q' "$ltmain" >> "$cfgfile" \
7677+ || (rm -f "$cfgfile"; exit 1)
7678+
7679+ if test x"$xsi_shell" = xyes; then
7680+ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\
7681+func_dirname ()\
7682+{\
7683+\ case ${1} in\
7684+\ */*) func_dirname_result="${1%/*}${2}" ;;\
7685+\ * ) func_dirname_result="${3}" ;;\
7686+\ esac\
7687+} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \
7688+ && mv -f "$cfgfile.tmp" "$cfgfile" \
7689+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
7690+test 0 -eq $? || _lt_function_replace_fail=:
7691+
7692+
7693+ sed -e '/^func_basename ()$/,/^} # func_basename /c\
7694+func_basename ()\
7695+{\
7696+\ func_basename_result="${1##*/}"\
7697+} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \
7698+ && mv -f "$cfgfile.tmp" "$cfgfile" \
7699+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
7700+test 0 -eq $? || _lt_function_replace_fail=:
7701+
7702+
7703+ sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\
7704+func_dirname_and_basename ()\
7705+{\
7706+\ case ${1} in\
7707+\ */*) func_dirname_result="${1%/*}${2}" ;;\
7708+\ * ) func_dirname_result="${3}" ;;\
7709+\ esac\
7710+\ func_basename_result="${1##*/}"\
7711+} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \
7712+ && mv -f "$cfgfile.tmp" "$cfgfile" \
7713+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
7714+test 0 -eq $? || _lt_function_replace_fail=:
7715+
7716+
7717+ sed -e '/^func_stripname ()$/,/^} # func_stripname /c\
7718+func_stripname ()\
7719+{\
7720+\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\
7721+\ # positional parameters, so assign one to ordinary parameter first.\
7722+\ func_stripname_result=${3}\
7723+\ func_stripname_result=${func_stripname_result#"${1}"}\
7724+\ func_stripname_result=${func_stripname_result%"${2}"}\
7725+} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \
7726+ && mv -f "$cfgfile.tmp" "$cfgfile" \
7727+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
7728+test 0 -eq $? || _lt_function_replace_fail=:
7729+
7730+
7731+ sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\
7732+func_split_long_opt ()\
7733+{\
7734+\ func_split_long_opt_name=${1%%=*}\
7735+\ func_split_long_opt_arg=${1#*=}\
7736+} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \
7737+ && mv -f "$cfgfile.tmp" "$cfgfile" \
7738+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
7739+test 0 -eq $? || _lt_function_replace_fail=:
7740+
7741+
7742+ sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\
7743+func_split_short_opt ()\
7744+{\
7745+\ func_split_short_opt_arg=${1#??}\
7746+\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\
7747+} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \
7748+ && mv -f "$cfgfile.tmp" "$cfgfile" \
7749+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
7750+test 0 -eq $? || _lt_function_replace_fail=:
7751+
7752+
7753+ sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\
7754+func_lo2o ()\
7755+{\
7756+\ case ${1} in\
7757+\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\
7758+\ *) func_lo2o_result=${1} ;;\
7759+\ esac\
7760+} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \
7761+ && mv -f "$cfgfile.tmp" "$cfgfile" \
7762+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
7763+test 0 -eq $? || _lt_function_replace_fail=:
7764+
7765+
7766+ sed -e '/^func_xform ()$/,/^} # func_xform /c\
7767+func_xform ()\
7768+{\
7769+ func_xform_result=${1%.*}.lo\
7770+} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \
7771+ && mv -f "$cfgfile.tmp" "$cfgfile" \
7772+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
7773+test 0 -eq $? || _lt_function_replace_fail=:
7774+
7775+
7776+ sed -e '/^func_arith ()$/,/^} # func_arith /c\
7777+func_arith ()\
7778+{\
7779+ func_arith_result=$(( $* ))\
7780+} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \
7781+ && mv -f "$cfgfile.tmp" "$cfgfile" \
7782+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
7783+test 0 -eq $? || _lt_function_replace_fail=:
7784+
7785+
7786+ sed -e '/^func_len ()$/,/^} # func_len /c\
7787+func_len ()\
7788+{\
7789+ func_len_result=${#1}\
7790+} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \
7791+ && mv -f "$cfgfile.tmp" "$cfgfile" \
7792+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
7793+test 0 -eq $? || _lt_function_replace_fail=:
7794+
7795+fi
7796+
7797+if test x"$lt_shell_append" = xyes; then
7798+ sed -e '/^func_append ()$/,/^} # func_append /c\
7799+func_append ()\
7800+{\
7801+ eval "${1}+=\\${2}"\
7802+} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \
7803+ && mv -f "$cfgfile.tmp" "$cfgfile" \
7804+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
7805+test 0 -eq $? || _lt_function_replace_fail=:
7806+
7807+
7808+ sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\
7809+func_append_quoted ()\
7810+{\
7811+\ func_quote_for_eval "${2}"\
7812+\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\
7813+} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \
7814+ && mv -f "$cfgfile.tmp" "$cfgfile" \
7815+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
7816+test 0 -eq $? || _lt_function_replace_fail=:
7817+
7818+
7819+ # Save a `func_append' function call where possible by direct use of '+='
7820+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
7821+ && mv -f "$cfgfile.tmp" "$cfgfile" \
7822+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
7823+ test 0 -eq $? || _lt_function_replace_fail=:
7824+else
7825+ # Save a `func_append' function call even when '+=' is not available
7826+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
7827+ && mv -f "$cfgfile.tmp" "$cfgfile" \
7828+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
7829+ test 0 -eq $? || _lt_function_replace_fail=:
7830+fi
7831+
7832+if test x"$_lt_function_replace_fail" = x":"; then
7833+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5
7834+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;}
7835+fi
7836+
7837+
7838+ mv -f "$cfgfile" "$ofile" ||
7839 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
7840 chmod +x "$ofile"
7841
7842diff --git a/gprofng/Makefile.in b/gprofng/Makefile.in
7843index fd5279b4df1..6e74c7b302a 100644
7844--- a/gprofng/Makefile.in
7845+++ b/gprofng/Makefile.in
7846@@ -253,6 +253,7 @@ CXXFLAGS = @CXXFLAGS@
7847 CYGPATH_W = @CYGPATH_W@
7848 DEFS = @DEFS@
7849 DEPDIR = @DEPDIR@
7850+DLLTOOL = @DLLTOOL@
7851 DSYMUTIL = @DSYMUTIL@
7852 DUMPBIN = @DUMPBIN@
7853 ECHO_C = @ECHO_C@
7854@@ -290,6 +291,7 @@ LN_S = @LN_S@
7855 LTLIBOBJS = @LTLIBOBJS@
7856 MAINT = @MAINT@
7857 MAKEINFO = @MAKEINFO@
7858+MANIFEST_TOOL = @MANIFEST_TOOL@
7859 MKDIR_P = @MKDIR_P@
7860 NM = @NM@
7861 NMEDIT = @NMEDIT@
7862diff --git a/gprofng/configure b/gprofng/configure
7863index ac14d126ac0..f8d7685a72e 100755
7864--- a/gprofng/configure
7865+++ b/gprofng/configure
7866@@ -672,6 +672,8 @@ OTOOL
7867 LIPO
7868 NMEDIT
7869 DSYMUTIL
7870+MANIFEST_TOOL
7871+DLLTOOL
7872 OBJDUMP
7873 LN_S
7874 NM
7875@@ -802,6 +804,7 @@ enable_static
7876 with_pic
7877 enable_fast_install
7878 with_gnu_ld
7879+with_libtool_sysroot
7880 enable_libtool_lock
7881 enable_werror_always
7882 enable_gprofng_tools
7883@@ -1465,6 +1468,8 @@ Optional Packages:
7884 --with-pic try to use only PIC/non-PIC objects [default=use
7885 both]
7886 --with-gnu-ld assume the C compiler uses GNU ld [default=no]
7887+ --with-libtool-sysroot=DIR Search for dependent libraries within DIR
7888+ (or the compiler's sysroot if not specified).
7889 --with-jdk=PATH specify prefix directory for installed JDK.
7890 --with-system-zlib use installed libz
7891
7892@@ -6156,8 +6161,8 @@ esac
7893
7894
7895
7896-macro_version='2.2.7a'
7897-macro_revision='1.3134'
7898+macro_version='2.4'
7899+macro_revision='1.3293'
7900
7901
7902
7903@@ -6197,7 +6202,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
7904 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
7905 $as_echo_n "checking how to print strings... " >&6; }
7906 # Test print first, because it will be a builtin if present.
7907-if test "X`print -r -- -n 2>/dev/null`" = X-n && \
7908+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
7909 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
7910 ECHO='print -r --'
7911 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
7912@@ -6890,8 +6895,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6;
7913 # Try some XSI features
7914 xsi_shell=no
7915 ( _lt_dummy="a/b/c"
7916- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
7917- = c,a/b,, \
7918+ test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
7919+ = c,a/b,b/c, \
7920 && eval 'test $(( 1 + 1 )) -eq 2 \
7921 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
7922 && xsi_shell=yes
7923@@ -6940,6 +6945,80 @@ esac
7924
7925
7926
7927+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5
7928+$as_echo_n "checking how to convert $build file names to $host format... " >&6; }
7929+if ${lt_cv_to_host_file_cmd+:} false; then :
7930+ $as_echo_n "(cached) " >&6
7931+else
7932+ case $host in
7933+ *-*-mingw* )
7934+ case $build in
7935+ *-*-mingw* ) # actually msys
7936+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
7937+ ;;
7938+ *-*-cygwin* )
7939+ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
7940+ ;;
7941+ * ) # otherwise, assume *nix
7942+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
7943+ ;;
7944+ esac
7945+ ;;
7946+ *-*-cygwin* )
7947+ case $build in
7948+ *-*-mingw* ) # actually msys
7949+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
7950+ ;;
7951+ *-*-cygwin* )
7952+ lt_cv_to_host_file_cmd=func_convert_file_noop
7953+ ;;
7954+ * ) # otherwise, assume *nix
7955+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
7956+ ;;
7957+ esac
7958+ ;;
7959+ * ) # unhandled hosts (and "normal" native builds)
7960+ lt_cv_to_host_file_cmd=func_convert_file_noop
7961+ ;;
7962+esac
7963+
7964+fi
7965+
7966+to_host_file_cmd=$lt_cv_to_host_file_cmd
7967+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5
7968+$as_echo "$lt_cv_to_host_file_cmd" >&6; }
7969+
7970+
7971+
7972+
7973+
7974+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5
7975+$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; }
7976+if ${lt_cv_to_tool_file_cmd+:} false; then :
7977+ $as_echo_n "(cached) " >&6
7978+else
7979+ #assume ordinary cross tools, or native build.
7980+lt_cv_to_tool_file_cmd=func_convert_file_noop
7981+case $host in
7982+ *-*-mingw* )
7983+ case $build in
7984+ *-*-mingw* ) # actually msys
7985+ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
7986+ ;;
7987+ esac
7988+ ;;
7989+esac
7990+
7991+fi
7992+
7993+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
7994+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5
7995+$as_echo "$lt_cv_to_tool_file_cmd" >&6; }
7996+
7997+
7998+
7999+
8000+
8001 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
8002 $as_echo_n "checking for $LD option to reload object files... " >&6; }
8003 if ${lt_cv_ld_reload_flag+:} false; then :
8004@@ -6956,6 +7035,11 @@ case $reload_flag in
8005 esac
8006 reload_cmds='$LD$reload_flag -o $output$reload_objs'
8007 case $host_os in
8008+ cygwin* | mingw* | pw32* | cegcc*)
8009+ if test "$GCC" != yes; then
8010+ reload_cmds=false
8011+ fi
8012+ ;;
8013 darwin*)
8014 if test "$GCC" = yes; then
8015 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
8016@@ -7124,7 +7208,8 @@ mingw* | pw32*)
8017 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
8018 lt_cv_file_magic_cmd='func_win32_libid'
8019 else
8020- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
8021+ # Keep this pattern in sync with the one in func_win32_libid.
8022+ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
8023 lt_cv_file_magic_cmd='$OBJDUMP -f'
8024 fi
8025 ;;
8026@@ -7278,6 +7363,21 @@ esac
8027 fi
8028 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
8029 $as_echo "$lt_cv_deplibs_check_method" >&6; }
8030+
8031+file_magic_glob=
8032+want_nocaseglob=no
8033+if test "$build" = "$host"; then
8034+ case $host_os in
8035+ mingw* | pw32*)
8036+ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
8037+ want_nocaseglob=yes
8038+ else
8039+ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"`
8040+ fi
8041+ ;;
8042+ esac
8043+fi
8044+
8045 file_magic_cmd=$lt_cv_file_magic_cmd
8046 deplibs_check_method=$lt_cv_deplibs_check_method
8047 test -z "$deplibs_check_method" && deplibs_check_method=unknown
8048@@ -7293,6 +7393,157 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
8049
8050
8051
8052+
8053+
8054+
8055+
8056+
8057+
8058+
8059+
8060+
8061+
8062+if test -n "$ac_tool_prefix"; then
8063+ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
8064+set dummy ${ac_tool_prefix}dlltool; ac_word=$2
8065+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
8066+$as_echo_n "checking for $ac_word... " >&6; }
8067+if ${ac_cv_prog_DLLTOOL+:} false; then :
8068+ $as_echo_n "(cached) " >&6
8069+else
8070+ if test -n "$DLLTOOL"; then
8071+ ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
8072+else
8073+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
8074+for as_dir in $PATH
8075+do
8076+ IFS=$as_save_IFS
8077+ test -z "$as_dir" && as_dir=.
8078+ for ac_exec_ext in '' $ac_executable_extensions; do
8079+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
8080+ ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
8081+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
8082+ break 2
8083+ fi
8084+done
8085+ done
8086+IFS=$as_save_IFS
8087+
8088+fi
8089+fi
8090+DLLTOOL=$ac_cv_prog_DLLTOOL
8091+if test -n "$DLLTOOL"; then
8092+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
8093+$as_echo "$DLLTOOL" >&6; }
8094+else
8095+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
8096+$as_echo "no" >&6; }
8097+fi
8098+
8099+
8100+fi
8101+if test -z "$ac_cv_prog_DLLTOOL"; then
8102+ ac_ct_DLLTOOL=$DLLTOOL
8103+ # Extract the first word of "dlltool", so it can be a program name with args.
8104+set dummy dlltool; ac_word=$2
8105+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
8106+$as_echo_n "checking for $ac_word... " >&6; }
8107+if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then :
8108+ $as_echo_n "(cached) " >&6
8109+else
8110+ if test -n "$ac_ct_DLLTOOL"; then
8111+ ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
8112+else
8113+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
8114+for as_dir in $PATH
8115+do
8116+ IFS=$as_save_IFS
8117+ test -z "$as_dir" && as_dir=.
8118+ for ac_exec_ext in '' $ac_executable_extensions; do
8119+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
8120+ ac_cv_prog_ac_ct_DLLTOOL="dlltool"
8121+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
8122+ break 2
8123+ fi
8124+done
8125+ done
8126+IFS=$as_save_IFS
8127+
8128+fi
8129+fi
8130+ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
8131+if test -n "$ac_ct_DLLTOOL"; then
8132+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
8133+$as_echo "$ac_ct_DLLTOOL" >&6; }
8134+else
8135+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
8136+$as_echo "no" >&6; }
8137+fi
8138+
8139+ if test "x$ac_ct_DLLTOOL" = x; then
8140+ DLLTOOL="false"
8141+ else
8142+ case $cross_compiling:$ac_tool_warned in
8143+yes:)
8144+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
8145+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
8146+ac_tool_warned=yes ;;
8147+esac
8148+ DLLTOOL=$ac_ct_DLLTOOL
8149+ fi
8150+else
8151+ DLLTOOL="$ac_cv_prog_DLLTOOL"
8152+fi
8153+
8154+test -z "$DLLTOOL" && DLLTOOL=dlltool
8155+
8156+
8157+
8158+
8159+
8160+
8161+
8162+
8163+
8164+
8165+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5
8166+$as_echo_n "checking how to associate runtime and link libraries... " >&6; }
8167+if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then :
8168+ $as_echo_n "(cached) " >&6
8169+else
8170+ lt_cv_sharedlib_from_linklib_cmd='unknown'
8171+
8172+case $host_os in
8173+cygwin* | mingw* | pw32* | cegcc*)
8174+ # two different shell functions defined in ltmain.sh
8175+ # decide which to use based on capabilities of $DLLTOOL
8176+ case `$DLLTOOL --help 2>&1` in
8177+ *--identify-strict*)
8178+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
8179+ ;;
8180+ *)
8181+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
8182+ ;;
8183+ esac
8184+ ;;
8185+*)
8186+ # fallback: assume linklib IS sharedlib
8187+ lt_cv_sharedlib_from_linklib_cmd="$ECHO"
8188+ ;;
8189+esac
8190+
8191+fi
8192+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5
8193+$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; }
8194+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
8195+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
8196+
8197+
8198+
8199+
8200+
8201+
8202+
8203 plugin_option=
8204 plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll"
8205 for plugin in $plugin_names; do
8206@@ -7307,8 +7558,10 @@ for plugin in $plugin_names; do
8207 done
8208
8209 if test -n "$ac_tool_prefix"; then
8210- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
8211-set dummy ${ac_tool_prefix}ar; ac_word=$2
8212+ for ac_prog in ar
8213+ do
8214+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
8215+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
8216 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
8217 $as_echo_n "checking for $ac_word... " >&6; }
8218 if ${ac_cv_prog_AR+:} false; then :
8219@@ -7324,7 +7577,7 @@ do
8220 test -z "$as_dir" && as_dir=.
8221 for ac_exec_ext in '' $ac_executable_extensions; do
8222 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
8223- ac_cv_prog_AR="${ac_tool_prefix}ar"
8224+ ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
8225 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
8226 break 2
8227 fi
8228@@ -7344,11 +7597,15 @@ $as_echo "no" >&6; }
8229 fi
8230
8231
8232+ test -n "$AR" && break
8233+ done
8234 fi
8235-if test -z "$ac_cv_prog_AR"; then
8236+if test -z "$AR"; then
8237 ac_ct_AR=$AR
8238- # Extract the first word of "ar", so it can be a program name with args.
8239-set dummy ar; ac_word=$2
8240+ for ac_prog in ar
8241+do
8242+ # Extract the first word of "$ac_prog", so it can be a program name with args.
8243+set dummy $ac_prog; ac_word=$2
8244 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
8245 $as_echo_n "checking for $ac_word... " >&6; }
8246 if ${ac_cv_prog_ac_ct_AR+:} false; then :
8247@@ -7364,7 +7621,7 @@ do
8248 test -z "$as_dir" && as_dir=.
8249 for ac_exec_ext in '' $ac_executable_extensions; do
8250 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
8251- ac_cv_prog_ac_ct_AR="ar"
8252+ ac_cv_prog_ac_ct_AR="$ac_prog"
8253 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
8254 break 2
8255 fi
8256@@ -7383,6 +7640,10 @@ else
8257 $as_echo "no" >&6; }
8258 fi
8259
8260+
8261+ test -n "$ac_ct_AR" && break
8262+done
8263+
8264 if test "x$ac_ct_AR" = x; then
8265 AR="false"
8266 else
8267@@ -7394,29 +7655,81 @@ ac_tool_warned=yes ;;
8268 esac
8269 AR=$ac_ct_AR
8270 fi
8271-else
8272- AR="$ac_cv_prog_AR"
8273 fi
8274
8275-test -z "$AR" && AR=ar
8276-if test -n "$plugin_option"; then
8277- if $AR --help 2>&1 | grep -q "\--plugin"; then
8278- touch conftest.c
8279- $AR $plugin_option rc conftest.a conftest.c
8280- if test "$?" != 0; then
8281- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5
8282+ touch conftest.c
8283+ $AR $plugin_option rc conftest.a conftest.c
8284+ if test "$?" != 0; then
8285+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5
8286 $as_echo "$as_me: WARNING: Failed: $AR $plugin_option rc" >&2;}
8287- else
8288- AR="$AR $plugin_option"
8289- fi
8290- rm -f conftest.*
8291+ else
8292+ AR="$AR $plugin_option"
8293 fi
8294-fi
8295-test -z "$AR_FLAGS" && AR_FLAGS=cru
8296+ rm -f conftest.*
8297+: ${AR=ar}
8298+: ${AR_FLAGS=cru}
8299+
8300+
8301+
8302+
8303+
8304+
8305+
8306
8307
8308
8309
8310+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
8311+$as_echo_n "checking for archiver @FILE support... " >&6; }
8312+if ${lt_cv_ar_at_file+:} false; then :
8313+ $as_echo_n "(cached) " >&6
8314+else
8315+ lt_cv_ar_at_file=no
8316+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
8317+/* end confdefs.h. */
8318+
8319+int
8320+main ()
8321+{
8322+
8323+ ;
8324+ return 0;
8325+}
8326+_ACEOF
8327+if ac_fn_c_try_compile "$LINENO"; then :
8328+ echo conftest.$ac_objext > conftest.lst
8329+ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5'
8330+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
8331+ (eval $lt_ar_try) 2>&5
8332+ ac_status=$?
8333+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
8334+ test $ac_status = 0; }
8335+ if test "$ac_status" -eq 0; then
8336+ # Ensure the archiver fails upon bogus file names.
8337+ rm -f conftest.$ac_objext libconftest.a
8338+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
8339+ (eval $lt_ar_try) 2>&5
8340+ ac_status=$?
8341+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
8342+ test $ac_status = 0; }
8343+ if test "$ac_status" -ne 0; then
8344+ lt_cv_ar_at_file=@
8345+ fi
8346+ fi
8347+ rm -f conftest.* libconftest.a
8348+
8349+fi
8350+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
8351+
8352+fi
8353+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
8354+$as_echo "$lt_cv_ar_at_file" >&6; }
8355+
8356+if test "x$lt_cv_ar_at_file" = xno; then
8357+ archiver_list_spec=
8358+else
8359+ archiver_list_spec=$lt_cv_ar_at_file
8360+fi
8361
8362
8363
8364@@ -7763,8 +8076,8 @@ esac
8365 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
8366
8367 # Transform an extracted symbol line into symbol name and symbol address
8368-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
8369-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'"
8370+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
8371+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'"
8372
8373 # Handle CRLF in mingw tool chain
8374 opt_cr=
8375@@ -7800,6 +8113,7 @@ for ac_symprfx in "" "_"; do
8376 else
8377 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
8378 fi
8379+ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
8380
8381 # Check to see that the pipe works correctly.
8382 pipe_works=no
8383@@ -7841,6 +8155,18 @@ _LT_EOF
8384 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
8385 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
8386 cat <<_LT_EOF > conftest.$ac_ext
8387+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */
8388+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
8389+/* DATA imports from DLLs on WIN32 con't be const, because runtime
8390+ relocations are performed -- see ld's documentation on pseudo-relocs. */
8391+# define LT_DLSYM_CONST
8392+#elif defined(__osf__)
8393+/* This system does not cope well with relocations in const data. */
8394+# define LT_DLSYM_CONST
8395+#else
8396+# define LT_DLSYM_CONST const
8397+#endif
8398+
8399 #ifdef __cplusplus
8400 extern "C" {
8401 #endif
8402@@ -7852,7 +8178,7 @@ _LT_EOF
8403 cat <<_LT_EOF >> conftest.$ac_ext
8404
8405 /* The mapping between symbol names and symbols. */
8406-const struct {
8407+LT_DLSYM_CONST struct {
8408 const char *name;
8409 void *address;
8410 }
8411@@ -7878,8 +8204,8 @@ static const void *lt_preloaded_setup() {
8412 _LT_EOF
8413 # Now try linking the two files.
8414 mv conftest.$ac_objext conftstm.$ac_objext
8415- lt_save_LIBS="$LIBS"
8416- lt_save_CFLAGS="$CFLAGS"
8417+ lt_globsym_save_LIBS=$LIBS
8418+ lt_globsym_save_CFLAGS=$CFLAGS
8419 LIBS="conftstm.$ac_objext"
8420 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
8421 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
8422@@ -7889,8 +8215,8 @@ _LT_EOF
8423 test $ac_status = 0; } && test -s conftest${ac_exeext}; then
8424 pipe_works=yes
8425 fi
8426- LIBS="$lt_save_LIBS"
8427- CFLAGS="$lt_save_CFLAGS"
8428+ LIBS=$lt_globsym_save_LIBS
8429+ CFLAGS=$lt_globsym_save_CFLAGS
8430 else
8431 echo "cannot find nm_test_func in $nlist" >&5
8432 fi
8433@@ -7927,6 +8253,13 @@ else
8434 $as_echo "ok" >&6; }
8435 fi
8436
8437+# Response file support.
8438+if test "$lt_cv_nm_interface" = "MS dumpbin"; then
8439+ nm_file_list_spec='@'
8440+elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then
8441+ nm_file_list_spec='@'
8442+fi
8443+
8444
8445
8446
8447@@ -7946,6 +8279,48 @@ fi
8448
8449
8450
8451+
8452+
8453+
8454+
8455+
8456+
8457+
8458+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
8459+$as_echo_n "checking for sysroot... " >&6; }
8460+
8461+# Check whether --with-libtool-sysroot was given.
8462+if test "${with_libtool_sysroot+set}" = set; then :
8463+ withval=$with_libtool_sysroot;
8464+else
8465+ with_libtool_sysroot=no
8466+fi
8467+
8468+
8469+lt_sysroot=
8470+case ${with_libtool_sysroot} in #(
8471+ yes)
8472+ if test "$GCC" = yes; then
8473+ lt_sysroot=`$CC --print-sysroot 2>/dev/null`
8474+ fi
8475+ ;; #(
8476+ /*)
8477+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"`
8478+ ;; #(
8479+ no|'')
8480+ ;; #(
8481+ *)
8482+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5
8483+$as_echo "${with_libtool_sysroot}" >&6; }
8484+ as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5
8485+ ;;
8486+esac
8487+
8488+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
8489+$as_echo "${lt_sysroot:-no}" >&6; }
8490+
8491+
8492+
8493
8494
8495 # Check whether --enable-libtool-lock was given.
8496@@ -8154,6 +8529,123 @@ esac
6426 8497
6427 need_locks="$enable_libtool_lock" 8498 need_locks="$enable_libtool_lock"
6428 8499
@@ -6546,7 +8617,7 @@ index a7f788f0411..e7703613024 100755
6546 8617
6547 case $host_os in 8618 case $host_os in
6548 rhapsody* | darwin*) 8619 rhapsody* | darwin*)
6549@@ -7065,6 +7558,8 @@ _LT_EOF 8620@@ -8717,6 +9209,8 @@ _LT_EOF
6550 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 8621 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
6551 echo "$AR cru libconftest.a conftest.o" >&5 8622 echo "$AR cru libconftest.a conftest.o" >&5
6552 $AR cru libconftest.a conftest.o 2>&5 8623 $AR cru libconftest.a conftest.o 2>&5
@@ -6555,7 +8626,24 @@ index a7f788f0411..e7703613024 100755
6555 cat > conftest.c << _LT_EOF 8626 cat > conftest.c << _LT_EOF
6556 int main() { return 0;} 8627 int main() { return 0;}
6557 _LT_EOF 8628 _LT_EOF
6558@@ -7647,8 +8142,6 @@ fi 8629@@ -8785,6 +9279,16 @@ done
8630
8631
8632
8633+func_stripname_cnf ()
8634+{
8635+ case ${2} in
8636+ .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
8637+ *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
8638+ esac
8639+} # func_stripname_cnf
8640+
8641+
8642+
8643
8644
8645 # Set options
8646@@ -9270,8 +9774,6 @@ fi
6559 lt_prog_compiler_pic= 8647 lt_prog_compiler_pic=
6560 lt_prog_compiler_static= 8648 lt_prog_compiler_static=
6561 8649
@@ -6564,7 +8652,7 @@ index a7f788f0411..e7703613024 100755
6564 8652
6565 if test "$GCC" = yes; then 8653 if test "$GCC" = yes; then
6566 lt_prog_compiler_wl='-Wl,' 8654 lt_prog_compiler_wl='-Wl,'
6567@@ -7814,6 +8307,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 8655@@ -9437,6 +9939,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
6568 lt_prog_compiler_pic='--shared' 8656 lt_prog_compiler_pic='--shared'
6569 lt_prog_compiler_static='--static' 8657 lt_prog_compiler_static='--static'
6570 ;; 8658 ;;
@@ -6577,7 +8665,7 @@ index a7f788f0411..e7703613024 100755
6577 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) 8665 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
6578 # Portland Group compilers (*not* the Pentium gcc compiler, 8666 # Portland Group compilers (*not* the Pentium gcc compiler,
6579 # which looks to be a dead project) 8667 # which looks to be a dead project)
6580@@ -7876,7 +8375,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 8668@@ -9499,7 +10007,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
6581 lt_prog_compiler_pic='-KPIC' 8669 lt_prog_compiler_pic='-KPIC'
6582 lt_prog_compiler_static='-Bstatic' 8670 lt_prog_compiler_static='-Bstatic'
6583 case $cc_basename in 8671 case $cc_basename in
@@ -6586,7 +8674,7 @@ index a7f788f0411..e7703613024 100755
6586 lt_prog_compiler_wl='-Qoption ld ';; 8674 lt_prog_compiler_wl='-Qoption ld ';;
6587 *) 8675 *)
6588 lt_prog_compiler_wl='-Wl,';; 8676 lt_prog_compiler_wl='-Wl,';;
6589@@ -7933,13 +8432,17 @@ case $host_os in 8677@@ -9556,13 +10064,17 @@ case $host_os in
6590 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" 8678 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
6591 ;; 8679 ;;
6592 esac 8680 esac
@@ -6610,7 +8698,7 @@ index a7f788f0411..e7703613024 100755
6610 8698
6611 # 8699 #
6612 # Check to make sure the PIC flag actually works. 8700 # Check to make sure the PIC flag actually works.
6613@@ -8000,6 +8503,11 @@ fi 8701@@ -9623,6 +10135,11 @@ fi
6614 8702
6615 8703
6616 8704
@@ -6622,7 +8710,7 @@ index a7f788f0411..e7703613024 100755
6622 # 8710 #
6623 # Check to make sure the static flag actually works. 8711 # Check to make sure the static flag actually works.
6624 # 8712 #
6625@@ -8350,7 +8858,8 @@ _LT_EOF 8713@@ -9973,7 +10490,8 @@ _LT_EOF
6626 allow_undefined_flag=unsupported 8714 allow_undefined_flag=unsupported
6627 always_export_symbols=no 8715 always_export_symbols=no
6628 enable_shared_with_static_runtimes=yes 8716 enable_shared_with_static_runtimes=yes
@@ -6632,7 +8720,7 @@ index a7f788f0411..e7703613024 100755
6632 8720
6633 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then 8721 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
6634 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' 8722 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
6635@@ -8449,12 +8958,12 @@ _LT_EOF 8723@@ -10072,12 +10590,12 @@ _LT_EOF
6636 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' 8724 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
6637 hardcode_libdir_flag_spec= 8725 hardcode_libdir_flag_spec=
6638 hardcode_libdir_flag_spec_ld='-rpath $libdir' 8726 hardcode_libdir_flag_spec_ld='-rpath $libdir'
@@ -6647,7 +8735,7 @@ index a7f788f0411..e7703613024 100755
6647 fi 8735 fi
6648 ;; 8736 ;;
6649 esac 8737 esac
6650@@ -8468,8 +8977,8 @@ _LT_EOF 8738@@ -10091,8 +10609,8 @@ _LT_EOF
6651 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' 8739 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
6652 wlarc= 8740 wlarc=
6653 else 8741 else
@@ -6658,7 +8746,7 @@ index a7f788f0411..e7703613024 100755
6658 fi 8746 fi
6659 ;; 8747 ;;
6660 8748
6661@@ -8487,8 +8996,8 @@ _LT_EOF 8749@@ -10110,8 +10628,8 @@ _LT_EOF
6662 8750
6663 _LT_EOF 8751 _LT_EOF
6664 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 8752 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -6669,7 +8757,7 @@ index a7f788f0411..e7703613024 100755
6669 else 8757 else
6670 ld_shlibs=no 8758 ld_shlibs=no
6671 fi 8759 fi
6672@@ -8534,8 +9043,8 @@ _LT_EOF 8760@@ -10157,8 +10675,8 @@ _LT_EOF
6673 8761
6674 *) 8762 *)
6675 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 8763 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -6680,7 +8768,7 @@ index a7f788f0411..e7703613024 100755
6680 else 8768 else
6681 ld_shlibs=no 8769 ld_shlibs=no
6682 fi 8770 fi
6683@@ -8665,7 +9174,13 @@ _LT_EOF 8771@@ -10288,7 +10806,13 @@ _LT_EOF
6684 allow_undefined_flag='-berok' 8772 allow_undefined_flag='-berok'
6685 # Determine the default libpath from the value encoded in an 8773 # Determine the default libpath from the value encoded in an
6686 # empty executable. 8774 # empty executable.
@@ -6695,7 +8783,7 @@ index a7f788f0411..e7703613024 100755
6695 /* end confdefs.h. */ 8783 /* end confdefs.h. */
6696 8784
6697 int 8785 int
6698@@ -8678,22 +9193,29 @@ main () 8786@@ -10301,22 +10825,29 @@ main ()
6699 _ACEOF 8787 _ACEOF
6700 if ac_fn_c_try_link "$LINENO"; then : 8788 if ac_fn_c_try_link "$LINENO"; then :
6701 8789
@@ -6738,7 +8826,7 @@ index a7f788f0411..e7703613024 100755
6738 8826
6739 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 8827 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
6740 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" 8828 archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
6741@@ -8705,7 +9227,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 8829@@ -10328,7 +10859,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
6742 else 8830 else
6743 # Determine the default libpath from the value encoded in an 8831 # Determine the default libpath from the value encoded in an
6744 # empty executable. 8832 # empty executable.
@@ -6753,7 +8841,7 @@ index a7f788f0411..e7703613024 100755
6753 /* end confdefs.h. */ 8841 /* end confdefs.h. */
6754 8842
6755 int 8843 int
6756@@ -8718,22 +9246,29 @@ main () 8844@@ -10341,22 +10878,29 @@ main ()
6757 _ACEOF 8845 _ACEOF
6758 if ac_fn_c_try_link "$LINENO"; then : 8846 if ac_fn_c_try_link "$LINENO"; then :
6759 8847
@@ -6796,7 +8884,7 @@ index a7f788f0411..e7703613024 100755
6796 8884
6797 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 8885 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
6798 # Warning - without using the other run time loading flags, 8886 # Warning - without using the other run time loading flags,
6799@@ -8778,20 +9313,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 8887@@ -10401,20 +10945,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
6800 # Microsoft Visual C++. 8888 # Microsoft Visual C++.
6801 # hardcode_libdir_flag_spec is actually meaningless, as there is 8889 # hardcode_libdir_flag_spec is actually meaningless, as there is
6802 # no search path for DLLs. 8890 # no search path for DLLs.
@@ -6874,7 +8962,2667 @@ index a7f788f0411..e7703613024 100755
6874 ;; 8962 ;;
6875 8963
6876 darwin* | rhapsody*) 8964 darwin* | rhapsody*)
6877@@ -8852,7 +9430,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 8965@@ -10475,7 +11062,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
8966
8967 # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
8968 freebsd* | dragonfly*)
8969- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
8970+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
8971 hardcode_libdir_flag_spec='-R$libdir'
8972 hardcode_direct=yes
8973 hardcode_shlibpath_var=no
8974@@ -10483,7 +11070,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
8975
8976 hpux9*)
8977 if test "$GCC" = yes; then
8978- archive_cmds='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
8979+ archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
8980 else
8981 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'
8982 fi
8983@@ -10499,7 +11086,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
8984
8985 hpux10*)
8986 if test "$GCC" = yes && test "$with_gnu_ld" = no; then
8987- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
8988+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
8989 else
8990 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
8991 fi
8992@@ -10523,10 +11110,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
8993 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
8994 ;;
8995 ia64*)
8996- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
8997+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
8998 ;;
8999 *)
9000- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
9001+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
9002 ;;
9003 esac
9004 else
9005@@ -10605,23 +11192,36 @@ fi
9006
9007 irix5* | irix6* | nonstopux*)
9008 if test "$GCC" = yes; then
9009- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
9010+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
9011 # Try to use the -exported_symbol ld option, if it does not
9012 # work, assume that -exports_file does not work either and
9013 # implicitly export all symbols.
9014- save_LDFLAGS="$LDFLAGS"
9015- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
9016- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
9017+ # This should be the same for all languages, so no per-tag cache variable.
9018+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5
9019+$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; }
9020+if ${lt_cv_irix_exported_symbol+:} false; then :
9021+ $as_echo_n "(cached) " >&6
9022+else
9023+ save_LDFLAGS="$LDFLAGS"
9024+ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
9025+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
9026 /* end confdefs.h. */
9027-int foo(void) {}
9028+int foo (void) { return 0; }
9029 _ACEOF
9030 if ac_fn_c_try_link "$LINENO"; then :
9031- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
9032-
9033+ lt_cv_irix_exported_symbol=yes
9034+else
9035+ lt_cv_irix_exported_symbol=no
9036 fi
9037 rm -f core conftest.err conftest.$ac_objext \
9038 conftest$ac_exeext conftest.$ac_ext
9039- LDFLAGS="$save_LDFLAGS"
9040+ LDFLAGS="$save_LDFLAGS"
9041+fi
9042+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5
9043+$as_echo "$lt_cv_irix_exported_symbol" >&6; }
9044+ if test "$lt_cv_irix_exported_symbol" = yes; then
9045+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
9046+ fi
9047 else
9048 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'
9049 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'
9050@@ -10706,7 +11306,7 @@ rm -f core conftest.err conftest.$ac_objext \
9051 osf4* | osf5*) # as osf3* with the addition of -msym flag
9052 if test "$GCC" = yes; then
9053 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
9054- archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
9055+ archive_cmds='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
9056 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
9057 else
9058 allow_undefined_flag=' -expect_unresolved \*'
9059@@ -10725,9 +11325,9 @@ rm -f core conftest.err conftest.$ac_objext \
9060 no_undefined_flag=' -z defs'
9061 if test "$GCC" = yes; then
9062 wlarc='${wl}'
9063- archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
9064+ archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
9065 archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
9066- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
9067+ $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
9068 else
9069 case `$CC -V 2>&1` in
9070 *"Compilers 5.0"*)
9071@@ -11303,8 +11903,9 @@ cygwin* | mingw* | pw32* | cegcc*)
9072 need_version=no
9073 need_lib_prefix=no
9074
9075- case $GCC,$host_os in
9076- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
9077+ case $GCC,$cc_basename in
9078+ yes,*)
9079+ # gcc
9080 library_names_spec='$libname.dll.a'
9081 # DLL is installed to $(libdir)/../bin by postinstall_cmds
9082 postinstall_cmds='base_file=`basename \${file}`~
9083@@ -11337,13 +11938,71 @@ cygwin* | mingw* | pw32* | cegcc*)
9084 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
9085 ;;
9086 esac
9087+ dynamic_linker='Win32 ld.exe'
9088+ ;;
9089+
9090+ *,cl*)
9091+ # Native MSVC
9092+ libname_spec='$name'
9093+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
9094+ library_names_spec='${libname}.dll.lib'
9095+
9096+ case $build_os in
9097+ mingw*)
9098+ sys_lib_search_path_spec=
9099+ lt_save_ifs=$IFS
9100+ IFS=';'
9101+ for lt_path in $LIB
9102+ do
9103+ IFS=$lt_save_ifs
9104+ # Let DOS variable expansion print the short 8.3 style file name.
9105+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
9106+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
9107+ done
9108+ IFS=$lt_save_ifs
9109+ # Convert to MSYS style.
9110+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
9111+ ;;
9112+ cygwin*)
9113+ # Convert to unix form, then to dos form, then back to unix form
9114+ # but this time dos style (no spaces!) so that the unix form looks
9115+ # like /cygdrive/c/PROGRA~1:/cygdr...
9116+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
9117+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
9118+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
9119+ ;;
9120+ *)
9121+ sys_lib_search_path_spec="$LIB"
9122+ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
9123+ # It is most probably a Windows format PATH.
9124+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
9125+ else
9126+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
9127+ fi
9128+ # FIXME: find the short name or the path components, as spaces are
9129+ # common. (e.g. "Program Files" -> "PROGRA~1")
9130+ ;;
9131+ esac
9132+
9133+ # DLL is installed to $(libdir)/../bin by postinstall_cmds
9134+ postinstall_cmds='base_file=`basename \${file}`~
9135+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
9136+ dldir=$destdir/`dirname \$dlpath`~
9137+ test -d \$dldir || mkdir -p \$dldir~
9138+ $install_prog $dir/$dlname \$dldir/$dlname'
9139+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
9140+ dlpath=$dir/\$dldll~
9141+ $RM \$dlpath'
9142+ shlibpath_overrides_runpath=yes
9143+ dynamic_linker='Win32 link.exe'
9144 ;;
9145
9146 *)
9147+ # Assume MSVC wrapper
9148 library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
9149+ dynamic_linker='Win32 ld.exe'
9150 ;;
9151 esac
9152- dynamic_linker='Win32 ld.exe'
9153 # FIXME: first we should search . and the directory the executable is in
9154 shlibpath_var=PATH
9155 ;;
9156@@ -12221,7 +12880,7 @@ else
9157 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
9158 lt_status=$lt_dlunknown
9159 cat > conftest.$ac_ext <<_LT_EOF
9160-#line 12224 "configure"
9161+#line $LINENO "configure"
9162 #include "confdefs.h"
9163
9164 #if HAVE_DLFCN_H
9165@@ -12265,10 +12924,10 @@ else
9166 /* When -fvisbility=hidden is used, assume the code has been annotated
9167 correspondingly for the symbols needed. */
9168 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
9169-void fnord () __attribute__((visibility("default")));
9170+int fnord () __attribute__((visibility("default")));
9171 #endif
9172
9173-void fnord () { int i=42; }
9174+int fnord () { return 42; }
9175 int main ()
9176 {
9177 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
9178@@ -12327,7 +12986,7 @@ else
9179 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
9180 lt_status=$lt_dlunknown
9181 cat > conftest.$ac_ext <<_LT_EOF
9182-#line 12330 "configure"
9183+#line $LINENO "configure"
9184 #include "confdefs.h"
9185
9186 #if HAVE_DLFCN_H
9187@@ -12371,10 +13030,10 @@ else
9188 /* When -fvisbility=hidden is used, assume the code has been annotated
9189 correspondingly for the symbols needed. */
9190 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
9191-void fnord () __attribute__((visibility("default")));
9192+int fnord () __attribute__((visibility("default")));
9193 #endif
9194
9195-void fnord () { int i=42; }
9196+int fnord () { return 42; }
9197 int main ()
9198 {
9199 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
9200@@ -12766,6 +13425,7 @@ $RM -r conftest*
9201
9202 # Allow CC to be a program name with arguments.
9203 lt_save_CC=$CC
9204+ lt_save_CFLAGS=$CFLAGS
9205 lt_save_LD=$LD
9206 lt_save_GCC=$GCC
9207 GCC=$GXX
9208@@ -12783,6 +13443,7 @@ $RM -r conftest*
9209 fi
9210 test -z "${LDCXX+set}" || LD=$LDCXX
9211 CC=${CXX-"c++"}
9212+ CFLAGS=$CXXFLAGS
9213 compiler=$CC
9214 compiler_CXX=$CC
9215 for cc_temp in $compiler""; do
9216@@ -13065,7 +13726,13 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
9217 allow_undefined_flag_CXX='-berok'
9218 # Determine the default libpath from the value encoded in an empty
9219 # executable.
9220- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
9221+ if test "${lt_cv_aix_libpath+set}" = set; then
9222+ aix_libpath=$lt_cv_aix_libpath
9223+else
9224+ if ${lt_cv_aix_libpath__CXX+:} false; then :
9225+ $as_echo_n "(cached) " >&6
9226+else
9227+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
9228 /* end confdefs.h. */
9229
9230 int
9231@@ -13078,22 +13745,29 @@ main ()
9232 _ACEOF
9233 if ac_fn_cxx_try_link "$LINENO"; then :
9234
9235-lt_aix_libpath_sed='
9236- /Import File Strings/,/^$/ {
9237- /^0/ {
9238- s/^0 *\(.*\)$/\1/
9239- p
9240- }
9241- }'
9242-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
9243-# Check for a 64-bit object if we didn't find anything.
9244-if test -z "$aix_libpath"; then
9245- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
9246-fi
9247+ lt_aix_libpath_sed='
9248+ /Import File Strings/,/^$/ {
9249+ /^0/ {
9250+ s/^0 *\([^ ]*\) *$/\1/
9251+ p
9252+ }
9253+ }'
9254+ lt_cv_aix_libpath__CXX=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
9255+ # Check for a 64-bit object if we didn't find anything.
9256+ if test -z "$lt_cv_aix_libpath__CXX"; then
9257+ lt_cv_aix_libpath__CXX=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
9258+ fi
9259 fi
9260 rm -f core conftest.err conftest.$ac_objext \
9261 conftest$ac_exeext conftest.$ac_ext
9262-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
9263+ if test -z "$lt_cv_aix_libpath__CXX"; then
9264+ lt_cv_aix_libpath__CXX="/usr/lib:/lib"
9265+ fi
9266+
9267+fi
9268+
9269+ aix_libpath=$lt_cv_aix_libpath__CXX
9270+fi
9271
9272 hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
9273
9274@@ -13106,7 +13780,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
9275 else
9276 # Determine the default libpath from the value encoded in an
9277 # empty executable.
9278- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
9279+ if test "${lt_cv_aix_libpath+set}" = set; then
9280+ aix_libpath=$lt_cv_aix_libpath
9281+else
9282+ if ${lt_cv_aix_libpath__CXX+:} false; then :
9283+ $as_echo_n "(cached) " >&6
9284+else
9285+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
9286 /* end confdefs.h. */
9287
9288 int
9289@@ -13119,22 +13799,29 @@ main ()
9290 _ACEOF
9291 if ac_fn_cxx_try_link "$LINENO"; then :
9292
9293-lt_aix_libpath_sed='
9294- /Import File Strings/,/^$/ {
9295- /^0/ {
9296- s/^0 *\(.*\)$/\1/
9297- p
9298- }
9299- }'
9300-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
9301-# Check for a 64-bit object if we didn't find anything.
9302-if test -z "$aix_libpath"; then
9303- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
9304-fi
9305+ lt_aix_libpath_sed='
9306+ /Import File Strings/,/^$/ {
9307+ /^0/ {
9308+ s/^0 *\([^ ]*\) *$/\1/
9309+ p
9310+ }
9311+ }'
9312+ lt_cv_aix_libpath__CXX=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
9313+ # Check for a 64-bit object if we didn't find anything.
9314+ if test -z "$lt_cv_aix_libpath__CXX"; then
9315+ lt_cv_aix_libpath__CXX=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
9316+ fi
9317 fi
9318 rm -f core conftest.err conftest.$ac_objext \
9319 conftest$ac_exeext conftest.$ac_ext
9320-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
9321+ if test -z "$lt_cv_aix_libpath__CXX"; then
9322+ lt_cv_aix_libpath__CXX="/usr/lib:/lib"
9323+ fi
9324+
9325+fi
9326+
9327+ aix_libpath=$lt_cv_aix_libpath__CXX
9328+fi
9329
9330 hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
9331 # Warning - without using the other run time loading flags,
9332@@ -13177,29 +13864,75 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
9333 ;;
9334
9335 cygwin* | mingw* | pw32* | cegcc*)
9336- # _LT_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless,
9337- # as there is no search path for DLLs.
9338- hardcode_libdir_flag_spec_CXX='-L$libdir'
9339- export_dynamic_flag_spec_CXX='${wl}--export-all-symbols'
9340- allow_undefined_flag_CXX=unsupported
9341- always_export_symbols_CXX=no
9342- enable_shared_with_static_runtimes_CXX=yes
9343-
9344- if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
9345- archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
9346- # If the export-symbols file already is a .def file (1st line
9347- # is EXPORTS), use it as is; otherwise, prepend...
9348- archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
9349- cp $export_symbols $output_objdir/$soname.def;
9350- else
9351- echo EXPORTS > $output_objdir/$soname.def;
9352- cat $export_symbols >> $output_objdir/$soname.def;
9353- fi~
9354- $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
9355- else
9356- ld_shlibs_CXX=no
9357- fi
9358- ;;
9359+ case $GXX,$cc_basename in
9360+ ,cl* | no,cl*)
9361+ # Native MSVC
9362+ # hardcode_libdir_flag_spec is actually meaningless, as there is
9363+ # no search path for DLLs.
9364+ hardcode_libdir_flag_spec_CXX=' '
9365+ allow_undefined_flag_CXX=unsupported
9366+ always_export_symbols_CXX=yes
9367+ file_list_spec_CXX='@'
9368+ # Tell ltmain to make .lib files, not .a files.
9369+ libext=lib
9370+ # Tell ltmain to make .dll files, not .so files.
9371+ shrext_cmds=".dll"
9372+ # FIXME: Setting linknames here is a bad hack.
9373+ archive_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
9374+ archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
9375+ $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
9376+ else
9377+ $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
9378+ fi~
9379+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
9380+ linknames='
9381+ # The linker will not automatically build a static lib if we build a DLL.
9382+ # _LT_TAGVAR(old_archive_from_new_cmds, CXX)='true'
9383+ enable_shared_with_static_runtimes_CXX=yes
9384+ # Don't use ranlib
9385+ old_postinstall_cmds_CXX='chmod 644 $oldlib'
9386+ postlink_cmds_CXX='lt_outputfile="@OUTPUT@"~
9387+ lt_tool_outputfile="@TOOL_OUTPUT@"~
9388+ case $lt_outputfile in
9389+ *.exe|*.EXE) ;;
9390+ *)
9391+ lt_outputfile="$lt_outputfile.exe"
9392+ lt_tool_outputfile="$lt_tool_outputfile.exe"
9393+ ;;
9394+ esac~
9395+ func_to_tool_file "$lt_outputfile"~
9396+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
9397+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
9398+ $RM "$lt_outputfile.manifest";
9399+ fi'
9400+ ;;
9401+ *)
9402+ # g++
9403+ # _LT_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless,
9404+ # as there is no search path for DLLs.
9405+ hardcode_libdir_flag_spec_CXX='-L$libdir'
9406+ export_dynamic_flag_spec_CXX='${wl}--export-all-symbols'
9407+ allow_undefined_flag_CXX=unsupported
9408+ always_export_symbols_CXX=no
9409+ enable_shared_with_static_runtimes_CXX=yes
9410+
9411+ if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
9412+ archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
9413+ # If the export-symbols file already is a .def file (1st line
9414+ # is EXPORTS), use it as is; otherwise, prepend...
9415+ archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
9416+ cp $export_symbols $output_objdir/$soname.def;
9417+ else
9418+ echo EXPORTS > $output_objdir/$soname.def;
9419+ cat $export_symbols >> $output_objdir/$soname.def;
9420+ fi~
9421+ $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
9422+ else
9423+ ld_shlibs_CXX=no
9424+ fi
9425+ ;;
9426+ esac
9427+ ;;
9428 darwin* | rhapsody*)
9429
9430
9431@@ -13305,7 +14038,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
9432 ;;
9433 *)
9434 if test "$GXX" = yes; then
9435- archive_cmds_CXX='$RM $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
9436+ archive_cmds_CXX='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
9437 else
9438 # FIXME: insert proper C++ library support
9439 ld_shlibs_CXX=no
9440@@ -13376,10 +14109,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
9441 archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
9442 ;;
9443 ia64*)
9444- archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
9445+ archive_cmds_CXX='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
9446 ;;
9447 *)
9448- archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
9449+ archive_cmds_CXX='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
9450 ;;
9451 esac
9452 fi
9453@@ -13420,9 +14153,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
9454 *)
9455 if test "$GXX" = yes; then
9456 if test "$with_gnu_ld" = no; then
9457- archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
9458+ archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
9459 else
9460- archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib'
9461+ archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib'
9462 fi
9463 fi
9464 link_all_deplibs_CXX=yes
9465@@ -13492,20 +14225,20 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
9466 prelink_cmds_CXX='tpldir=Template.dir~
9467 rm -rf $tpldir~
9468 $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
9469- compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"'
9470+ compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"'
9471 old_archive_cmds_CXX='tpldir=Template.dir~
9472 rm -rf $tpldir~
9473 $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
9474- $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~
9475+ $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~
9476 $RANLIB $oldlib'
9477 archive_cmds_CXX='tpldir=Template.dir~
9478 rm -rf $tpldir~
9479 $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
9480- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
9481+ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
9482 archive_expsym_cmds_CXX='tpldir=Template.dir~
9483 rm -rf $tpldir~
9484 $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
9485- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
9486+ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
9487 ;;
9488 *) # Version 6 and above use weak symbols
9489 archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
9490@@ -13700,7 +14433,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
9491 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'
9492 ;;
9493 *)
9494- archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
9495+ archive_cmds_CXX='$CC -shared $pic_flag -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
9496 ;;
9497 esac
9498
9499@@ -13746,7 +14479,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
9500
9501 solaris*)
9502 case $cc_basename in
9503- CC*)
9504+ CC* | sunCC*)
9505 # Sun C++ 4.2, 5.x and Centerline C++
9506 archive_cmds_need_lc_CXX=yes
9507 no_undefined_flag_CXX=' -zdefs'
9508@@ -13787,9 +14520,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
9509 if test "$GXX" = yes && test "$with_gnu_ld" = no; then
9510 no_undefined_flag_CXX=' ${wl}-z ${wl}defs'
9511 if $CC --version | $GREP -v '^2\.7' > /dev/null; then
9512- archive_cmds_CXX='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
9513+ archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
9514 archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
9515- $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
9516+ $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
9517
9518 # Commands to make compiler produce verbose output that lists
9519 # what "hidden" libraries, object files and flags are used when
9520@@ -13924,6 +14657,13 @@ private:
9521 };
9522 _LT_EOF
9523
9524+
9525+_lt_libdeps_save_CFLAGS=$CFLAGS
9526+case "$CC $CFLAGS " in #(
9527+*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;;
9528+*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;;
9529+esac
9530+
9531 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
9532 (eval $ac_compile) 2>&5
9533 ac_status=$?
9534@@ -13937,7 +14677,7 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
9535 pre_test_object_deps_done=no
9536
9537 for p in `eval "$output_verbose_link_cmd"`; do
9538- case $p in
9539+ case ${prev}${p} in
9540
9541 -L* | -R* | -l*)
9542 # Some compilers place space between "-{L,R}" and the path.
9543@@ -13946,13 +14686,22 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
9544 test $p = "-R"; then
9545 prev=$p
9546 continue
9547- else
9548- prev=
9549 fi
9550
9551+ # Expand the sysroot to ease extracting the directories later.
9552+ if test -z "$prev"; then
9553+ case $p in
9554+ -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;;
9555+ -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;;
9556+ -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;;
9557+ esac
9558+ fi
9559+ case $p in
9560+ =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;;
9561+ esac
9562 if test "$pre_test_object_deps_done" = no; then
9563- case $p in
9564- -L* | -R*)
9565+ case ${prev} in
9566+ -L | -R)
9567 # Internal compiler library paths should come after those
9568 # provided the user. The postdeps already come after the
9569 # user supplied libs so there is no need to process them.
9570@@ -13972,8 +14721,10 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
9571 postdeps_CXX="${postdeps_CXX} ${prev}${p}"
9572 fi
9573 fi
9574+ prev=
9575 ;;
9576
9577+ *.lto.$objext) ;; # Ignore GCC LTO objects
9578 *.$objext)
9579 # This assumes that the test object file only shows up
9580 # once in the compiler output.
9581@@ -14009,6 +14760,7 @@ else
9582 fi
9583
9584 $RM -f confest.$objext
9585+CFLAGS=$_lt_libdeps_save_CFLAGS
9586
9587 # PORTME: override above test on systems where it is broken
9588 case $host_os in
9589@@ -14044,7 +14796,7 @@ linux*)
9590
9591 solaris*)
9592 case $cc_basename in
9593- CC*)
9594+ CC* | sunCC*)
9595 # The more standards-conforming stlport4 library is
9596 # incompatible with the Cstd library. Avoid specifying
9597 # it if it's in CXXFLAGS. Ignore libCrun as
9598@@ -14109,8 +14861,6 @@ fi
9599 lt_prog_compiler_pic_CXX=
9600 lt_prog_compiler_static_CXX=
9601
9602-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
9603-$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
9604
9605 # C++ specific cases for pic, static, wl, etc.
9606 if test "$GXX" = yes; then
9607@@ -14215,6 +14965,11 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
9608 ;;
9609 esac
9610 ;;
9611+ mingw* | cygwin* | os2* | pw32* | cegcc*)
9612+ # This hack is so that the source file can tell whether it is being
9613+ # built for inclusion in a dll (and should export symbols for example).
9614+ lt_prog_compiler_pic_CXX='-DDLL_EXPORT'
9615+ ;;
9616 dgux*)
9617 case $cc_basename in
9618 ec++*)
9619@@ -14367,7 +15122,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
9620 ;;
9621 solaris*)
9622 case $cc_basename in
9623- CC*)
9624+ CC* | sunCC*)
9625 # Sun C++ 4.2, 5.x and Centerline C++
9626 lt_prog_compiler_pic_CXX='-KPIC'
9627 lt_prog_compiler_static_CXX='-Bstatic'
9628@@ -14432,10 +15187,17 @@ case $host_os in
9629 lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC"
9630 ;;
9631 esac
9632-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic_CXX" >&5
9633-$as_echo "$lt_prog_compiler_pic_CXX" >&6; }
9634-
9635
9636+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
9637+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
9638+if ${lt_cv_prog_compiler_pic_CXX+:} false; then :
9639+ $as_echo_n "(cached) " >&6
9640+else
9641+ lt_cv_prog_compiler_pic_CXX=$lt_prog_compiler_pic_CXX
9642+fi
9643+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_CXX" >&5
9644+$as_echo "$lt_cv_prog_compiler_pic_CXX" >&6; }
9645+lt_prog_compiler_pic_CXX=$lt_cv_prog_compiler_pic_CXX
9646
9647 #
9648 # Check to make sure the PIC flag actually works.
9649@@ -14493,6 +15255,8 @@ fi
9650
9651
9652
9653+
9654+
9655 #
9656 # Check to make sure the static flag actually works.
9657 #
9658@@ -14670,6 +15434,7 @@ fi
9659 $as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
9660
9661 export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
9662+ exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
9663 case $host_os in
9664 aix[4-9]*)
9665 # If we're using GNU nm, then we don't want the "-C" option.
9666@@ -14684,15 +15449,20 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
9667 ;;
9668 pw32*)
9669 export_symbols_cmds_CXX="$ltdll_cmds"
9670- ;;
9671+ ;;
9672 cygwin* | mingw* | cegcc*)
9673- export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;/^.*[ ]__nm__/s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols'
9674- ;;
9675+ case $cc_basename in
9676+ cl*) ;;
9677+ *)
9678+ export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols'
9679+ exclude_expsyms_CXX='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
9680+ ;;
9681+ esac
9682+ ;;
9683 *)
9684 export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
9685- ;;
9686+ ;;
9687 esac
9688- exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
9689
9690 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5
9691 $as_echo "$ld_shlibs_CXX" >&6; }
9692@@ -14955,8 +15725,9 @@ cygwin* | mingw* | pw32* | cegcc*)
9693 need_version=no
9694 need_lib_prefix=no
9695
9696- case $GCC,$host_os in
9697- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
9698+ case $GCC,$cc_basename in
9699+ yes,*)
9700+ # gcc
9701 library_names_spec='$libname.dll.a'
9702 # DLL is installed to $(libdir)/../bin by postinstall_cmds
9703 postinstall_cmds='base_file=`basename \${file}`~
9704@@ -14988,13 +15759,71 @@ cygwin* | mingw* | pw32* | cegcc*)
9705 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
9706 ;;
9707 esac
9708+ dynamic_linker='Win32 ld.exe'
9709+ ;;
9710+
9711+ *,cl*)
9712+ # Native MSVC
9713+ libname_spec='$name'
9714+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
9715+ library_names_spec='${libname}.dll.lib'
9716+
9717+ case $build_os in
9718+ mingw*)
9719+ sys_lib_search_path_spec=
9720+ lt_save_ifs=$IFS
9721+ IFS=';'
9722+ for lt_path in $LIB
9723+ do
9724+ IFS=$lt_save_ifs
9725+ # Let DOS variable expansion print the short 8.3 style file name.
9726+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
9727+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
9728+ done
9729+ IFS=$lt_save_ifs
9730+ # Convert to MSYS style.
9731+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
9732+ ;;
9733+ cygwin*)
9734+ # Convert to unix form, then to dos form, then back to unix form
9735+ # but this time dos style (no spaces!) so that the unix form looks
9736+ # like /cygdrive/c/PROGRA~1:/cygdr...
9737+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
9738+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
9739+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
9740+ ;;
9741+ *)
9742+ sys_lib_search_path_spec="$LIB"
9743+ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
9744+ # It is most probably a Windows format PATH.
9745+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
9746+ else
9747+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
9748+ fi
9749+ # FIXME: find the short name or the path components, as spaces are
9750+ # common. (e.g. "Program Files" -> "PROGRA~1")
9751+ ;;
9752+ esac
9753+
9754+ # DLL is installed to $(libdir)/../bin by postinstall_cmds
9755+ postinstall_cmds='base_file=`basename \${file}`~
9756+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
9757+ dldir=$destdir/`dirname \$dlpath`~
9758+ test -d \$dldir || mkdir -p \$dldir~
9759+ $install_prog $dir/$dlname \$dldir/$dlname'
9760+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
9761+ dlpath=$dir/\$dldll~
9762+ $RM \$dlpath'
9763+ shlibpath_overrides_runpath=yes
9764+ dynamic_linker='Win32 link.exe'
9765 ;;
9766
9767 *)
9768+ # Assume MSVC wrapper
9769 library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
9770+ dynamic_linker='Win32 ld.exe'
9771 ;;
9772 esac
9773- dynamic_linker='Win32 ld.exe'
9774 # FIXME: first we should search . and the directory the executable is in
9775 shlibpath_var=PATH
9776 ;;
9777@@ -15534,6 +16363,7 @@ fi
9778 fi # test -n "$compiler"
9779
9780 CC=$lt_save_CC
9781+ CFLAGS=$lt_save_CFLAGS
9782 LDCXX=$LD
9783 LD=$lt_save_LD
9784 GCC=$lt_save_GCC
9785@@ -17663,13 +18493,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
9786 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
9787 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
9788 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
9789+lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`'
9790+lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`'
9791 reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
9792 reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
9793 OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
9794 deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`'
9795 file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`'
9796+file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`'
9797+want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`'
9798+DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`'
9799+sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`'
9800 AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`'
9801 AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`'
9802+archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`'
9803 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
9804 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
9805 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
9806@@ -17684,14 +18521,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de
9807 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
9808 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
9809 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"`'
9810+nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`'
9811+lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`'
9812 objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`'
9813 MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`'
9814 lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`'
9815-lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
9816 lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`'
9817+lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
9818 lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`'
9819 lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`'
9820 need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`'
9821+MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`'
9822 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
9823 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
9824 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
9825@@ -17724,12 +18564,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q
9826 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
9827 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
9828 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
9829-fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`'
9830 always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`'
9831 export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`'
9832 exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`'
9833 include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`'
9834 prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`'
9835+postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`'
9836 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
9837 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
9838 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
9839@@ -17768,8 +18608,8 @@ old_archive_cmds_CXX='`$ECHO "$old_archive_cmds_CXX" | $SED "$delay_single_quote
9840 compiler_CXX='`$ECHO "$compiler_CXX" | $SED "$delay_single_quote_subst"`'
9841 GCC_CXX='`$ECHO "$GCC_CXX" | $SED "$delay_single_quote_subst"`'
9842 lt_prog_compiler_no_builtin_flag_CXX='`$ECHO "$lt_prog_compiler_no_builtin_flag_CXX" | $SED "$delay_single_quote_subst"`'
9843-lt_prog_compiler_wl_CXX='`$ECHO "$lt_prog_compiler_wl_CXX" | $SED "$delay_single_quote_subst"`'
9844 lt_prog_compiler_pic_CXX='`$ECHO "$lt_prog_compiler_pic_CXX" | $SED "$delay_single_quote_subst"`'
9845+lt_prog_compiler_wl_CXX='`$ECHO "$lt_prog_compiler_wl_CXX" | $SED "$delay_single_quote_subst"`'
9846 lt_prog_compiler_static_CXX='`$ECHO "$lt_prog_compiler_static_CXX" | $SED "$delay_single_quote_subst"`'
9847 lt_cv_prog_compiler_c_o_CXX='`$ECHO "$lt_cv_prog_compiler_c_o_CXX" | $SED "$delay_single_quote_subst"`'
9848 archive_cmds_need_lc_CXX='`$ECHO "$archive_cmds_need_lc_CXX" | $SED "$delay_single_quote_subst"`'
9849@@ -17796,12 +18636,12 @@ hardcode_shlibpath_var_CXX='`$ECHO "$hardcode_shlibpath_var_CXX" | $SED "$delay_
9850 hardcode_automatic_CXX='`$ECHO "$hardcode_automatic_CXX" | $SED "$delay_single_quote_subst"`'
9851 inherit_rpath_CXX='`$ECHO "$inherit_rpath_CXX" | $SED "$delay_single_quote_subst"`'
9852 link_all_deplibs_CXX='`$ECHO "$link_all_deplibs_CXX" | $SED "$delay_single_quote_subst"`'
9853-fix_srcfile_path_CXX='`$ECHO "$fix_srcfile_path_CXX" | $SED "$delay_single_quote_subst"`'
9854 always_export_symbols_CXX='`$ECHO "$always_export_symbols_CXX" | $SED "$delay_single_quote_subst"`'
9855 export_symbols_cmds_CXX='`$ECHO "$export_symbols_cmds_CXX" | $SED "$delay_single_quote_subst"`'
9856 exclude_expsyms_CXX='`$ECHO "$exclude_expsyms_CXX" | $SED "$delay_single_quote_subst"`'
9857 include_expsyms_CXX='`$ECHO "$include_expsyms_CXX" | $SED "$delay_single_quote_subst"`'
9858 prelink_cmds_CXX='`$ECHO "$prelink_cmds_CXX" | $SED "$delay_single_quote_subst"`'
9859+postlink_cmds_CXX='`$ECHO "$postlink_cmds_CXX" | $SED "$delay_single_quote_subst"`'
9860 file_list_spec_CXX='`$ECHO "$file_list_spec_CXX" | $SED "$delay_single_quote_subst"`'
9861 hardcode_action_CXX='`$ECHO "$hardcode_action_CXX" | $SED "$delay_single_quote_subst"`'
9862 compiler_lib_search_dirs_CXX='`$ECHO "$compiler_lib_search_dirs_CXX" | $SED "$delay_single_quote_subst"`'
9863@@ -17839,8 +18679,13 @@ reload_flag \
9864 OBJDUMP \
9865 deplibs_check_method \
9866 file_magic_cmd \
9867+file_magic_glob \
9868+want_nocaseglob \
9869+DLLTOOL \
9870+sharedlib_from_linklib_cmd \
9871 AR \
9872 AR_FLAGS \
9873+archiver_list_spec \
9874 STRIP \
9875 RANLIB \
9876 CC \
9877@@ -17850,12 +18695,14 @@ lt_cv_sys_global_symbol_pipe \
9878 lt_cv_sys_global_symbol_to_cdecl \
9879 lt_cv_sys_global_symbol_to_c_name_address \
9880 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
9881+nm_file_list_spec \
9882 lt_prog_compiler_no_builtin_flag \
9883-lt_prog_compiler_wl \
9884 lt_prog_compiler_pic \
9885+lt_prog_compiler_wl \
9886 lt_prog_compiler_static \
9887 lt_cv_prog_compiler_c_o \
9888 need_locks \
9889+MANIFEST_TOOL \
9890 DSYMUTIL \
9891 NMEDIT \
9892 LIPO \
9893@@ -17871,7 +18718,6 @@ no_undefined_flag \
9894 hardcode_libdir_flag_spec \
9895 hardcode_libdir_flag_spec_ld \
9896 hardcode_libdir_separator \
9897-fix_srcfile_path \
9898 exclude_expsyms \
9899 include_expsyms \
9900 file_list_spec \
9901@@ -17893,8 +18739,8 @@ LD_CXX \
9902 reload_flag_CXX \
9903 compiler_CXX \
9904 lt_prog_compiler_no_builtin_flag_CXX \
9905-lt_prog_compiler_wl_CXX \
9906 lt_prog_compiler_pic_CXX \
9907+lt_prog_compiler_wl_CXX \
9908 lt_prog_compiler_static_CXX \
9909 lt_cv_prog_compiler_c_o_CXX \
9910 export_dynamic_flag_spec_CXX \
9911@@ -17906,7 +18752,6 @@ no_undefined_flag_CXX \
9912 hardcode_libdir_flag_spec_CXX \
9913 hardcode_libdir_flag_spec_ld_CXX \
9914 hardcode_libdir_separator_CXX \
9915-fix_srcfile_path_CXX \
9916 exclude_expsyms_CXX \
9917 include_expsyms_CXX \
9918 file_list_spec_CXX \
9919@@ -17940,6 +18785,7 @@ module_cmds \
9920 module_expsym_cmds \
9921 export_symbols_cmds \
9922 prelink_cmds \
9923+postlink_cmds \
9924 postinstall_cmds \
9925 postuninstall_cmds \
9926 finish_cmds \
9927@@ -17954,7 +18800,8 @@ archive_expsym_cmds_CXX \
9928 module_cmds_CXX \
9929 module_expsym_cmds_CXX \
9930 export_symbols_cmds_CXX \
9931-prelink_cmds_CXX; do
9932+prelink_cmds_CXX \
9933+postlink_cmds_CXX; do
9934 case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
9935 *[\\\\\\\`\\"\\\$]*)
9936 eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
9937@@ -18711,7 +19558,8 @@ $as_echo X"$file" |
9938 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
9939 #
9940 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
9941-# 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
9942+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
9943+# Inc.
9944 # Written by Gordon Matzigkeit, 1996
9945 #
9946 # This file is part of GNU Libtool.
9947@@ -18814,19 +19662,42 @@ SP2NL=$lt_lt_SP2NL
9948 # turn newlines into spaces.
9949 NL2SP=$lt_lt_NL2SP
9950
9951+# convert \$build file names to \$host format.
9952+to_host_file_cmd=$lt_cv_to_host_file_cmd
9953+
9954+# convert \$build files to toolchain format.
9955+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
9956+
9957 # An object symbol dumper.
9958 OBJDUMP=$lt_OBJDUMP
9959
9960 # Method to check whether dependent libraries are shared objects.
9961 deplibs_check_method=$lt_deplibs_check_method
9962
9963-# Command to use when deplibs_check_method == "file_magic".
9964+# Command to use when deplibs_check_method = "file_magic".
9965 file_magic_cmd=$lt_file_magic_cmd
9966
9967+# How to find potential files when deplibs_check_method = "file_magic".
9968+file_magic_glob=$lt_file_magic_glob
9969+
9970+# Find potential files using nocaseglob when deplibs_check_method = "file_magic".
9971+want_nocaseglob=$lt_want_nocaseglob
9972+
9973+# DLL creation program.
9974+DLLTOOL=$lt_DLLTOOL
9975+
9976+# Command to associate shared and link libraries.
9977+sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd
9978+
9979 # The archiver.
9980 AR=$lt_AR
9981+
9982+# Flags to create an archive.
9983 AR_FLAGS=$lt_AR_FLAGS
9984
9985+# How to feed a file listing to the archiver.
9986+archiver_list_spec=$lt_archiver_list_spec
9987+
9988 # A symbol stripping program.
9989 STRIP=$lt_STRIP
9990
9991@@ -18856,6 +19727,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
9992 # Transform the output of nm in a C name address pair when lib prefix is needed.
9993 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
9994
9995+# Specify filename containing input files for \$NM.
9996+nm_file_list_spec=$lt_nm_file_list_spec
9997+
9998+# The root where to search for dependent libraries,and in which our libraries should be installed.
9999+lt_sysroot=$lt_sysroot
10000+
10001 # The name of the directory that contains temporary libtool files.
10002 objdir=$objdir
10003
10004@@ -18865,6 +19742,9 @@ MAGIC_CMD=$MAGIC_CMD
10005 # Must we lock files when doing compilation?
10006 need_locks=$lt_need_locks
10007
10008+# Manifest tool.
10009+MANIFEST_TOOL=$lt_MANIFEST_TOOL
10010+
10011 # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
10012 DSYMUTIL=$lt_DSYMUTIL
10013
10014@@ -18979,12 +19859,12 @@ with_gcc=$GCC
10015 # Compiler flag to turn off builtin functions.
10016 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
10017
10018-# How to pass a linker flag through the compiler.
10019-wl=$lt_lt_prog_compiler_wl
10020-
10021 # Additional compiler flags for building library objects.
10022 pic_flag=$lt_lt_prog_compiler_pic
10023
10024+# How to pass a linker flag through the compiler.
10025+wl=$lt_lt_prog_compiler_wl
10026+
10027 # Compiler flag to prevent dynamic linking.
10028 link_static_flag=$lt_lt_prog_compiler_static
10029
10030@@ -19071,9 +19951,6 @@ inherit_rpath=$inherit_rpath
10031 # Whether libtool must link a program against all its dependency libraries.
10032 link_all_deplibs=$link_all_deplibs
10033
10034-# Fix the shell variable \$srcfile for the compiler.
10035-fix_srcfile_path=$lt_fix_srcfile_path
10036-
10037 # Set to "yes" if exported symbols are required.
10038 always_export_symbols=$always_export_symbols
10039
10040@@ -19089,6 +19966,9 @@ include_expsyms=$lt_include_expsyms
10041 # Commands necessary for linking programs (against libraries) with templates.
10042 prelink_cmds=$lt_prelink_cmds
10043
10044+# Commands necessary for finishing linking programs.
10045+postlink_cmds=$lt_postlink_cmds
10046+
10047 # Specify filename containing input files.
10048 file_list_spec=$lt_file_list_spec
10049
10050@@ -19135,210 +20015,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
10051 # if finds mixed CR/LF and LF-only lines. Since sed operates in
10052 # text mode, it properly converts lines to CR/LF. This bash problem
10053 # is reportedly fixed, but why not run on old versions too?
10054- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
10055- || (rm -f "$cfgfile"; exit 1)
10056-
10057- case $xsi_shell in
10058- yes)
10059- cat << \_LT_EOF >> "$cfgfile"
10060-
10061-# func_dirname file append nondir_replacement
10062-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
10063-# otherwise set result to NONDIR_REPLACEMENT.
10064-func_dirname ()
10065-{
10066- case ${1} in
10067- */*) func_dirname_result="${1%/*}${2}" ;;
10068- * ) func_dirname_result="${3}" ;;
10069- esac
10070-}
10071-
10072-# func_basename file
10073-func_basename ()
10074-{
10075- func_basename_result="${1##*/}"
10076-}
10077-
10078-# func_dirname_and_basename file append nondir_replacement
10079-# perform func_basename and func_dirname in a single function
10080-# call:
10081-# dirname: Compute the dirname of FILE. If nonempty,
10082-# add APPEND to the result, otherwise set result
10083-# to NONDIR_REPLACEMENT.
10084-# value returned in "$func_dirname_result"
10085-# basename: Compute filename of FILE.
10086-# value retuned in "$func_basename_result"
10087-# Implementation must be kept synchronized with func_dirname
10088-# and func_basename. For efficiency, we do not delegate to
10089-# those functions but instead duplicate the functionality here.
10090-func_dirname_and_basename ()
10091-{
10092- case ${1} in
10093- */*) func_dirname_result="${1%/*}${2}" ;;
10094- * ) func_dirname_result="${3}" ;;
10095- esac
10096- func_basename_result="${1##*/}"
10097-}
10098-
10099-# func_stripname prefix suffix name
10100-# strip PREFIX and SUFFIX off of NAME.
10101-# PREFIX and SUFFIX must not contain globbing or regex special
10102-# characters, hashes, percent signs, but SUFFIX may contain a leading
10103-# dot (in which case that matches only a dot).
10104-func_stripname ()
10105-{
10106- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
10107- # positional parameters, so assign one to ordinary parameter first.
10108- func_stripname_result=${3}
10109- func_stripname_result=${func_stripname_result#"${1}"}
10110- func_stripname_result=${func_stripname_result%"${2}"}
10111-}
10112-
10113-# func_opt_split
10114-func_opt_split ()
10115-{
10116- func_opt_split_opt=${1%%=*}
10117- func_opt_split_arg=${1#*=}
10118-}
10119-
10120-# func_lo2o object
10121-func_lo2o ()
10122-{
10123- case ${1} in
10124- *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
10125- *) func_lo2o_result=${1} ;;
10126- esac
10127-}
10128-
10129-# func_xform libobj-or-source
10130-func_xform ()
10131-{
10132- func_xform_result=${1%.*}.lo
10133-}
10134-
10135-# func_arith arithmetic-term...
10136-func_arith ()
10137-{
10138- func_arith_result=$(( $* ))
10139-}
10140-
10141-# func_len string
10142-# STRING may not start with a hyphen.
10143-func_len ()
10144-{
10145- func_len_result=${#1}
10146-}
10147-
10148-_LT_EOF
10149- ;;
10150- *) # Bourne compatible functions.
10151- cat << \_LT_EOF >> "$cfgfile"
10152-
10153-# func_dirname file append nondir_replacement
10154-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
10155-# otherwise set result to NONDIR_REPLACEMENT.
10156-func_dirname ()
10157-{
10158- # Extract subdirectory from the argument.
10159- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
10160- if test "X$func_dirname_result" = "X${1}"; then
10161- func_dirname_result="${3}"
10162- else
10163- func_dirname_result="$func_dirname_result${2}"
10164- fi
10165-}
10166-
10167-# func_basename file
10168-func_basename ()
10169-{
10170- func_basename_result=`$ECHO "${1}" | $SED "$basename"`
10171-}
10172-
10173-
10174-# func_stripname prefix suffix name
10175-# strip PREFIX and SUFFIX off of NAME.
10176-# PREFIX and SUFFIX must not contain globbing or regex special
10177-# characters, hashes, percent signs, but SUFFIX may contain a leading
10178-# dot (in which case that matches only a dot).
10179-# func_strip_suffix prefix name
10180-func_stripname ()
10181-{
10182- case ${2} in
10183- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
10184- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
10185- esac
10186-}
10187-
10188-# sed scripts:
10189-my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q'
10190-my_sed_long_arg='1s/^-[^=]*=//'
10191-
10192-# func_opt_split
10193-func_opt_split ()
10194-{
10195- func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"`
10196- func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"`
10197-}
10198-
10199-# func_lo2o object
10200-func_lo2o ()
10201-{
10202- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
10203-}
10204-
10205-# func_xform libobj-or-source
10206-func_xform ()
10207-{
10208- func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`
10209-}
10210-
10211-# func_arith arithmetic-term...
10212-func_arith ()
10213-{
10214- func_arith_result=`expr "$@"`
10215-}
10216-
10217-# func_len string
10218-# STRING may not start with a hyphen.
10219-func_len ()
10220-{
10221- func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len`
10222-}
10223-
10224-_LT_EOF
10225-esac
10226-
10227-case $lt_shell_append in
10228- yes)
10229- cat << \_LT_EOF >> "$cfgfile"
10230-
10231-# func_append var value
10232-# Append VALUE to the end of shell variable VAR.
10233-func_append ()
10234-{
10235- eval "$1+=\$2"
10236-}
10237-_LT_EOF
10238- ;;
10239- *)
10240- cat << \_LT_EOF >> "$cfgfile"
10241-
10242-# func_append var value
10243-# Append VALUE to the end of shell variable VAR.
10244-func_append ()
10245-{
10246- eval "$1=\$$1\$2"
10247-}
10248-
10249-_LT_EOF
10250- ;;
10251- esac
10252-
10253-
10254- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
10255- || (rm -f "$cfgfile"; exit 1)
10256-
10257- mv -f "$cfgfile" "$ofile" ||
10258+ sed '$q' "$ltmain" >> "$cfgfile" \
10259+ || (rm -f "$cfgfile"; exit 1)
10260+
10261+ if test x"$xsi_shell" = xyes; then
10262+ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\
10263+func_dirname ()\
10264+{\
10265+\ case ${1} in\
10266+\ */*) func_dirname_result="${1%/*}${2}" ;;\
10267+\ * ) func_dirname_result="${3}" ;;\
10268+\ esac\
10269+} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \
10270+ && mv -f "$cfgfile.tmp" "$cfgfile" \
10271+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
10272+test 0 -eq $? || _lt_function_replace_fail=:
10273+
10274+
10275+ sed -e '/^func_basename ()$/,/^} # func_basename /c\
10276+func_basename ()\
10277+{\
10278+\ func_basename_result="${1##*/}"\
10279+} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \
10280+ && mv -f "$cfgfile.tmp" "$cfgfile" \
10281+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
10282+test 0 -eq $? || _lt_function_replace_fail=:
10283+
10284+
10285+ sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\
10286+func_dirname_and_basename ()\
10287+{\
10288+\ case ${1} in\
10289+\ */*) func_dirname_result="${1%/*}${2}" ;;\
10290+\ * ) func_dirname_result="${3}" ;;\
10291+\ esac\
10292+\ func_basename_result="${1##*/}"\
10293+} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \
10294+ && mv -f "$cfgfile.tmp" "$cfgfile" \
10295+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
10296+test 0 -eq $? || _lt_function_replace_fail=:
10297+
10298+
10299+ sed -e '/^func_stripname ()$/,/^} # func_stripname /c\
10300+func_stripname ()\
10301+{\
10302+\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\
10303+\ # positional parameters, so assign one to ordinary parameter first.\
10304+\ func_stripname_result=${3}\
10305+\ func_stripname_result=${func_stripname_result#"${1}"}\
10306+\ func_stripname_result=${func_stripname_result%"${2}"}\
10307+} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \
10308+ && mv -f "$cfgfile.tmp" "$cfgfile" \
10309+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
10310+test 0 -eq $? || _lt_function_replace_fail=:
10311+
10312+
10313+ sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\
10314+func_split_long_opt ()\
10315+{\
10316+\ func_split_long_opt_name=${1%%=*}\
10317+\ func_split_long_opt_arg=${1#*=}\
10318+} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \
10319+ && mv -f "$cfgfile.tmp" "$cfgfile" \
10320+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
10321+test 0 -eq $? || _lt_function_replace_fail=:
10322+
10323+
10324+ sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\
10325+func_split_short_opt ()\
10326+{\
10327+\ func_split_short_opt_arg=${1#??}\
10328+\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\
10329+} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \
10330+ && mv -f "$cfgfile.tmp" "$cfgfile" \
10331+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
10332+test 0 -eq $? || _lt_function_replace_fail=:
10333+
10334+
10335+ sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\
10336+func_lo2o ()\
10337+{\
10338+\ case ${1} in\
10339+\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\
10340+\ *) func_lo2o_result=${1} ;;\
10341+\ esac\
10342+} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \
10343+ && mv -f "$cfgfile.tmp" "$cfgfile" \
10344+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
10345+test 0 -eq $? || _lt_function_replace_fail=:
10346+
10347+
10348+ sed -e '/^func_xform ()$/,/^} # func_xform /c\
10349+func_xform ()\
10350+{\
10351+ func_xform_result=${1%.*}.lo\
10352+} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \
10353+ && mv -f "$cfgfile.tmp" "$cfgfile" \
10354+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
10355+test 0 -eq $? || _lt_function_replace_fail=:
10356+
10357+
10358+ sed -e '/^func_arith ()$/,/^} # func_arith /c\
10359+func_arith ()\
10360+{\
10361+ func_arith_result=$(( $* ))\
10362+} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \
10363+ && mv -f "$cfgfile.tmp" "$cfgfile" \
10364+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
10365+test 0 -eq $? || _lt_function_replace_fail=:
10366+
10367+
10368+ sed -e '/^func_len ()$/,/^} # func_len /c\
10369+func_len ()\
10370+{\
10371+ func_len_result=${#1}\
10372+} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \
10373+ && mv -f "$cfgfile.tmp" "$cfgfile" \
10374+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
10375+test 0 -eq $? || _lt_function_replace_fail=:
10376+
10377+fi
10378+
10379+if test x"$lt_shell_append" = xyes; then
10380+ sed -e '/^func_append ()$/,/^} # func_append /c\
10381+func_append ()\
10382+{\
10383+ eval "${1}+=\\${2}"\
10384+} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \
10385+ && mv -f "$cfgfile.tmp" "$cfgfile" \
10386+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
10387+test 0 -eq $? || _lt_function_replace_fail=:
10388+
10389+
10390+ sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\
10391+func_append_quoted ()\
10392+{\
10393+\ func_quote_for_eval "${2}"\
10394+\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\
10395+} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \
10396+ && mv -f "$cfgfile.tmp" "$cfgfile" \
10397+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
10398+test 0 -eq $? || _lt_function_replace_fail=:
10399+
10400+
10401+ # Save a `func_append' function call where possible by direct use of '+='
10402+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
10403+ && mv -f "$cfgfile.tmp" "$cfgfile" \
10404+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
10405+ test 0 -eq $? || _lt_function_replace_fail=:
10406+else
10407+ # Save a `func_append' function call even when '+=' is not available
10408+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
10409+ && mv -f "$cfgfile.tmp" "$cfgfile" \
10410+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
10411+ test 0 -eq $? || _lt_function_replace_fail=:
10412+fi
10413+
10414+if test x"$_lt_function_replace_fail" = x":"; then
10415+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5
10416+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;}
10417+fi
10418+
10419+
10420+ mv -f "$cfgfile" "$ofile" ||
10421 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
10422 chmod +x "$ofile"
10423
10424@@ -19366,12 +20205,12 @@ with_gcc=$GCC_CXX
10425 # Compiler flag to turn off builtin functions.
10426 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX
10427
10428-# How to pass a linker flag through the compiler.
10429-wl=$lt_lt_prog_compiler_wl_CXX
10430-
10431 # Additional compiler flags for building library objects.
10432 pic_flag=$lt_lt_prog_compiler_pic_CXX
10433
10434+# How to pass a linker flag through the compiler.
10435+wl=$lt_lt_prog_compiler_wl_CXX
10436+
10437 # Compiler flag to prevent dynamic linking.
10438 link_static_flag=$lt_lt_prog_compiler_static_CXX
10439
10440@@ -19458,9 +20297,6 @@ inherit_rpath=$inherit_rpath_CXX
10441 # Whether libtool must link a program against all its dependency libraries.
10442 link_all_deplibs=$link_all_deplibs_CXX
10443
10444-# Fix the shell variable \$srcfile for the compiler.
10445-fix_srcfile_path=$lt_fix_srcfile_path_CXX
10446-
10447 # Set to "yes" if exported symbols are required.
10448 always_export_symbols=$always_export_symbols_CXX
10449
10450@@ -19476,6 +20312,9 @@ include_expsyms=$lt_include_expsyms_CXX
10451 # Commands necessary for linking programs (against libraries) with templates.
10452 prelink_cmds=$lt_prelink_cmds_CXX
10453
10454+# Commands necessary for finishing linking programs.
10455+postlink_cmds=$lt_postlink_cmds_CXX
10456+
10457 # Specify filename containing input files.
10458 file_list_spec=$lt_file_list_spec_CXX
10459
10460diff --git a/gprofng/doc/Makefile.in b/gprofng/doc/Makefile.in
10461index 4050586f6a8..394469e3768 100644
10462--- a/gprofng/doc/Makefile.in
10463+++ b/gprofng/doc/Makefile.in
10464@@ -237,6 +237,7 @@ CXXFLAGS = @CXXFLAGS@
10465 CYGPATH_W = @CYGPATH_W@
10466 DEFS = @DEFS@
10467 DEPDIR = @DEPDIR@
10468+DLLTOOL = @DLLTOOL@
10469 DSYMUTIL = @DSYMUTIL@
10470 DUMPBIN = @DUMPBIN@
10471 ECHO_C = @ECHO_C@
10472@@ -272,6 +273,7 @@ LN_S = @LN_S@
10473 LTLIBOBJS = @LTLIBOBJS@
10474 MAINT = @MAINT@
10475 MAKEINFO = @MAKEINFO@
10476+MANIFEST_TOOL = @MANIFEST_TOOL@
10477 MKDIR_P = @MKDIR_P@
10478 NM = @NM@
10479 NMEDIT = @NMEDIT@
10480diff --git a/gprofng/gp-display-html/Makefile.in b/gprofng/gp-display-html/Makefile.in
10481index 1206a79d3f0..2f763e5f760 100644
10482--- a/gprofng/gp-display-html/Makefile.in
10483+++ b/gprofng/gp-display-html/Makefile.in
10484@@ -200,6 +200,7 @@ CXXFLAGS = @CXXFLAGS@
10485 CYGPATH_W = @CYGPATH_W@
10486 DEFS = @DEFS@
10487 DEPDIR = @DEPDIR@
10488+DLLTOOL = @DLLTOOL@
10489 DSYMUTIL = @DSYMUTIL@
10490 DUMPBIN = @DUMPBIN@
10491 ECHO_C = @ECHO_C@
10492@@ -235,6 +236,7 @@ LN_S = @LN_S@
10493 LTLIBOBJS = @LTLIBOBJS@
10494 MAINT = @MAINT@
10495 MAKEINFO = @MAKEINFO@
10496+MANIFEST_TOOL = @MANIFEST_TOOL@
10497 MKDIR_P = @MKDIR_P@
10498 NM = @NM@
10499 NMEDIT = @NMEDIT@
10500diff --git a/gprofng/libcollector/Makefile.in b/gprofng/libcollector/Makefile.in
10501index 9372c6dea78..0cf4f58c0ec 100644
10502--- a/gprofng/libcollector/Makefile.in
10503+++ b/gprofng/libcollector/Makefile.in
10504@@ -316,6 +316,7 @@ CXXFLAGS = @CXXFLAGS@
10505 CYGPATH_W = @CYGPATH_W@
10506 DEFS = @DEFS@
10507 DEPDIR = @DEPDIR@
10508+DLLTOOL = @DLLTOOL@
10509 DSYMUTIL = @DSYMUTIL@
10510 DUMPBIN = @DUMPBIN@
10511 ECHO_C = @ECHO_C@
10512@@ -342,6 +343,7 @@ LN_S = @LN_S@
10513 LTLIBOBJS = @LTLIBOBJS@
10514 MAINT = @MAINT@
10515 MAKEINFO = @MAKEINFO@
10516+MANIFEST_TOOL = @MANIFEST_TOOL@
10517 MKDIR_P = @MKDIR_P@
10518 NM = @NM@
10519 NMEDIT = @NMEDIT@
10520diff --git a/gprofng/libcollector/configure b/gprofng/libcollector/configure
10521index ec38721ced2..d9daed11e3f 100755
10522--- a/gprofng/libcollector/configure
10523+++ b/gprofng/libcollector/configure
10524@@ -641,6 +641,8 @@ OTOOL
10525 LIPO
10526 NMEDIT
10527 DSYMUTIL
10528+MANIFEST_TOOL
10529+DLLTOOL
10530 OBJDUMP
10531 LN_S
10532 NM
10533@@ -770,6 +772,7 @@ enable_static
10534 with_pic
10535 enable_fast_install
10536 with_gnu_ld
10537+with_libtool_sysroot
10538 enable_libtool_lock
10539 '
10540 ac_precious_vars='build_alias
10541@@ -1425,6 +1428,8 @@ Optional Packages:
10542 --with-pic try to use only PIC/non-PIC objects [default=use
10543 both]
10544 --with-gnu-ld assume the C compiler uses GNU ld [default=no]
10545+ --with-libtool-sysroot=DIR Search for dependent libraries within DIR
10546+ (or the compiler's sysroot if not specified).
10547
10548 Some influential environment variables:
10549 CC C compiler command
10550@@ -5969,8 +5974,8 @@ esac
10551
10552
10553
10554-macro_version='2.2.7a'
10555-macro_revision='1.3134'
10556+macro_version='2.4'
10557+macro_revision='1.3293'
10558
10559
10560
10561@@ -6010,7 +6015,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
10562 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
10563 $as_echo_n "checking how to print strings... " >&6; }
10564 # Test print first, because it will be a builtin if present.
10565-if test "X`print -r -- -n 2>/dev/null`" = X-n && \
10566+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
10567 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
10568 ECHO='print -r --'
10569 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
10570@@ -6703,8 +6708,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6;
10571 # Try some XSI features
10572 xsi_shell=no
10573 ( _lt_dummy="a/b/c"
10574- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
10575- = c,a/b,, \
10576+ test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
10577+ = c,a/b,b/c, \
10578 && eval 'test $(( 1 + 1 )) -eq 2 \
10579 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
10580 && xsi_shell=yes
10581@@ -6753,6 +6758,80 @@ esac
10582
10583
10584
10585+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5
10586+$as_echo_n "checking how to convert $build file names to $host format... " >&6; }
10587+if ${lt_cv_to_host_file_cmd+:} false; then :
10588+ $as_echo_n "(cached) " >&6
10589+else
10590+ case $host in
10591+ *-*-mingw* )
10592+ case $build in
10593+ *-*-mingw* ) # actually msys
10594+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
10595+ ;;
10596+ *-*-cygwin* )
10597+ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
10598+ ;;
10599+ * ) # otherwise, assume *nix
10600+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
10601+ ;;
10602+ esac
10603+ ;;
10604+ *-*-cygwin* )
10605+ case $build in
10606+ *-*-mingw* ) # actually msys
10607+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
10608+ ;;
10609+ *-*-cygwin* )
10610+ lt_cv_to_host_file_cmd=func_convert_file_noop
10611+ ;;
10612+ * ) # otherwise, assume *nix
10613+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
10614+ ;;
10615+ esac
10616+ ;;
10617+ * ) # unhandled hosts (and "normal" native builds)
10618+ lt_cv_to_host_file_cmd=func_convert_file_noop
10619+ ;;
10620+esac
10621+
10622+fi
10623+
10624+to_host_file_cmd=$lt_cv_to_host_file_cmd
10625+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5
10626+$as_echo "$lt_cv_to_host_file_cmd" >&6; }
10627+
10628+
10629+
10630+
10631+
10632+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5
10633+$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; }
10634+if ${lt_cv_to_tool_file_cmd+:} false; then :
10635+ $as_echo_n "(cached) " >&6
10636+else
10637+ #assume ordinary cross tools, or native build.
10638+lt_cv_to_tool_file_cmd=func_convert_file_noop
10639+case $host in
10640+ *-*-mingw* )
10641+ case $build in
10642+ *-*-mingw* ) # actually msys
10643+ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
10644+ ;;
10645+ esac
10646+ ;;
10647+esac
10648+
10649+fi
10650+
10651+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
10652+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5
10653+$as_echo "$lt_cv_to_tool_file_cmd" >&6; }
10654+
10655+
10656+
10657+
10658+
10659 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
10660 $as_echo_n "checking for $LD option to reload object files... " >&6; }
10661 if ${lt_cv_ld_reload_flag+:} false; then :
10662@@ -6769,6 +6848,11 @@ case $reload_flag in
10663 esac
10664 reload_cmds='$LD$reload_flag -o $output$reload_objs'
10665 case $host_os in
10666+ cygwin* | mingw* | pw32* | cegcc*)
10667+ if test "$GCC" != yes; then
10668+ reload_cmds=false
10669+ fi
10670+ ;;
10671 darwin*)
10672 if test "$GCC" = yes; then
10673 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
10674@@ -6937,7 +7021,8 @@ mingw* | pw32*)
10675 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
10676 lt_cv_file_magic_cmd='func_win32_libid'
10677 else
10678- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
10679+ # Keep this pattern in sync with the one in func_win32_libid.
10680+ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
10681 lt_cv_file_magic_cmd='$OBJDUMP -f'
10682 fi
10683 ;;
10684@@ -7091,6 +7176,21 @@ esac
10685 fi
10686 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
10687 $as_echo "$lt_cv_deplibs_check_method" >&6; }
10688+
10689+file_magic_glob=
10690+want_nocaseglob=no
10691+if test "$build" = "$host"; then
10692+ case $host_os in
10693+ mingw* | pw32*)
10694+ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
10695+ want_nocaseglob=yes
10696+ else
10697+ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"`
10698+ fi
10699+ ;;
10700+ esac
10701+fi
10702+
10703 file_magic_cmd=$lt_cv_file_magic_cmd
10704 deplibs_check_method=$lt_cv_deplibs_check_method
10705 test -z "$deplibs_check_method" && deplibs_check_method=unknown
10706@@ -7106,6 +7206,157 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
10707
10708
10709
10710+
10711+
10712+
10713+
10714+
10715+
10716+
10717+
10718+
10719+
10720+if test -n "$ac_tool_prefix"; then
10721+ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
10722+set dummy ${ac_tool_prefix}dlltool; ac_word=$2
10723+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
10724+$as_echo_n "checking for $ac_word... " >&6; }
10725+if ${ac_cv_prog_DLLTOOL+:} false; then :
10726+ $as_echo_n "(cached) " >&6
10727+else
10728+ if test -n "$DLLTOOL"; then
10729+ ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
10730+else
10731+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
10732+for as_dir in $PATH
10733+do
10734+ IFS=$as_save_IFS
10735+ test -z "$as_dir" && as_dir=.
10736+ for ac_exec_ext in '' $ac_executable_extensions; do
10737+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
10738+ ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
10739+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
10740+ break 2
10741+ fi
10742+done
10743+ done
10744+IFS=$as_save_IFS
10745+
10746+fi
10747+fi
10748+DLLTOOL=$ac_cv_prog_DLLTOOL
10749+if test -n "$DLLTOOL"; then
10750+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
10751+$as_echo "$DLLTOOL" >&6; }
10752+else
10753+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
10754+$as_echo "no" >&6; }
10755+fi
10756+
10757+
10758+fi
10759+if test -z "$ac_cv_prog_DLLTOOL"; then
10760+ ac_ct_DLLTOOL=$DLLTOOL
10761+ # Extract the first word of "dlltool", so it can be a program name with args.
10762+set dummy dlltool; ac_word=$2
10763+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
10764+$as_echo_n "checking for $ac_word... " >&6; }
10765+if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then :
10766+ $as_echo_n "(cached) " >&6
10767+else
10768+ if test -n "$ac_ct_DLLTOOL"; then
10769+ ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
10770+else
10771+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
10772+for as_dir in $PATH
10773+do
10774+ IFS=$as_save_IFS
10775+ test -z "$as_dir" && as_dir=.
10776+ for ac_exec_ext in '' $ac_executable_extensions; do
10777+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
10778+ ac_cv_prog_ac_ct_DLLTOOL="dlltool"
10779+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
10780+ break 2
10781+ fi
10782+done
10783+ done
10784+IFS=$as_save_IFS
10785+
10786+fi
10787+fi
10788+ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
10789+if test -n "$ac_ct_DLLTOOL"; then
10790+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
10791+$as_echo "$ac_ct_DLLTOOL" >&6; }
10792+else
10793+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
10794+$as_echo "no" >&6; }
10795+fi
10796+
10797+ if test "x$ac_ct_DLLTOOL" = x; then
10798+ DLLTOOL="false"
10799+ else
10800+ case $cross_compiling:$ac_tool_warned in
10801+yes:)
10802+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
10803+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
10804+ac_tool_warned=yes ;;
10805+esac
10806+ DLLTOOL=$ac_ct_DLLTOOL
10807+ fi
10808+else
10809+ DLLTOOL="$ac_cv_prog_DLLTOOL"
10810+fi
10811+
10812+test -z "$DLLTOOL" && DLLTOOL=dlltool
10813+
10814+
10815+
10816+
10817+
10818+
10819+
10820+
10821+
10822+
10823+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5
10824+$as_echo_n "checking how to associate runtime and link libraries... " >&6; }
10825+if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then :
10826+ $as_echo_n "(cached) " >&6
10827+else
10828+ lt_cv_sharedlib_from_linklib_cmd='unknown'
10829+
10830+case $host_os in
10831+cygwin* | mingw* | pw32* | cegcc*)
10832+ # two different shell functions defined in ltmain.sh
10833+ # decide which to use based on capabilities of $DLLTOOL
10834+ case `$DLLTOOL --help 2>&1` in
10835+ *--identify-strict*)
10836+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
10837+ ;;
10838+ *)
10839+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
10840+ ;;
10841+ esac
10842+ ;;
10843+*)
10844+ # fallback: assume linklib IS sharedlib
10845+ lt_cv_sharedlib_from_linklib_cmd="$ECHO"
10846+ ;;
10847+esac
10848+
10849+fi
10850+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5
10851+$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; }
10852+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
10853+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
10854+
10855+
10856+
10857+
10858+
10859+
10860+
10861 plugin_option=
10862 plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll"
10863 for plugin in $plugin_names; do
10864@@ -7120,8 +7371,10 @@ for plugin in $plugin_names; do
10865 done
10866
10867 if test -n "$ac_tool_prefix"; then
10868- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
10869-set dummy ${ac_tool_prefix}ar; ac_word=$2
10870+ for ac_prog in ar
10871+ do
10872+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
10873+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
10874 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
10875 $as_echo_n "checking for $ac_word... " >&6; }
10876 if ${ac_cv_prog_AR+:} false; then :
10877@@ -7137,7 +7390,7 @@ do
10878 test -z "$as_dir" && as_dir=.
10879 for ac_exec_ext in '' $ac_executable_extensions; do
10880 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
10881- ac_cv_prog_AR="${ac_tool_prefix}ar"
10882+ ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
10883 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
10884 break 2
10885 fi
10886@@ -7157,11 +7410,15 @@ $as_echo "no" >&6; }
10887 fi
10888
10889
10890+ test -n "$AR" && break
10891+ done
10892 fi
10893-if test -z "$ac_cv_prog_AR"; then
10894+if test -z "$AR"; then
10895 ac_ct_AR=$AR
10896- # Extract the first word of "ar", so it can be a program name with args.
10897-set dummy ar; ac_word=$2
10898+ for ac_prog in ar
10899+do
10900+ # Extract the first word of "$ac_prog", so it can be a program name with args.
10901+set dummy $ac_prog; ac_word=$2
10902 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
10903 $as_echo_n "checking for $ac_word... " >&6; }
10904 if ${ac_cv_prog_ac_ct_AR+:} false; then :
10905@@ -7177,7 +7434,7 @@ do
10906 test -z "$as_dir" && as_dir=.
10907 for ac_exec_ext in '' $ac_executable_extensions; do
10908 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
10909- ac_cv_prog_ac_ct_AR="ar"
10910+ ac_cv_prog_ac_ct_AR="$ac_prog"
10911 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
10912 break 2
10913 fi
10914@@ -7196,6 +7453,10 @@ else
10915 $as_echo "no" >&6; }
10916 fi
10917
10918+
10919+ test -n "$ac_ct_AR" && break
10920+done
10921+
10922 if test "x$ac_ct_AR" = x; then
10923 AR="false"
10924 else
10925@@ -7207,29 +7468,81 @@ ac_tool_warned=yes ;;
10926 esac
10927 AR=$ac_ct_AR
10928 fi
10929-else
10930- AR="$ac_cv_prog_AR"
10931 fi
10932
10933-test -z "$AR" && AR=ar
10934-if test -n "$plugin_option"; then
10935- if $AR --help 2>&1 | grep -q "\--plugin"; then
10936- touch conftest.c
10937- $AR $plugin_option rc conftest.a conftest.c
10938- if test "$?" != 0; then
10939- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5
10940+ touch conftest.c
10941+ $AR $plugin_option rc conftest.a conftest.c
10942+ if test "$?" != 0; then
10943+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5
10944 $as_echo "$as_me: WARNING: Failed: $AR $plugin_option rc" >&2;}
10945- else
10946- AR="$AR $plugin_option"
10947- fi
10948- rm -f conftest.*
10949+ else
10950+ AR="$AR $plugin_option"
10951 fi
10952-fi
10953-test -z "$AR_FLAGS" && AR_FLAGS=cru
10954+ rm -f conftest.*
10955+: ${AR=ar}
10956+: ${AR_FLAGS=cru}
10957+
10958+
10959+
10960+
10961+
10962+
10963+
10964
10965
10966
10967
10968+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
10969+$as_echo_n "checking for archiver @FILE support... " >&6; }
10970+if ${lt_cv_ar_at_file+:} false; then :
10971+ $as_echo_n "(cached) " >&6
10972+else
10973+ lt_cv_ar_at_file=no
10974+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
10975+/* end confdefs.h. */
10976+
10977+int
10978+main ()
10979+{
10980+
10981+ ;
10982+ return 0;
10983+}
10984+_ACEOF
10985+if ac_fn_c_try_compile "$LINENO"; then :
10986+ echo conftest.$ac_objext > conftest.lst
10987+ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5'
10988+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
10989+ (eval $lt_ar_try) 2>&5
10990+ ac_status=$?
10991+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
10992+ test $ac_status = 0; }
10993+ if test "$ac_status" -eq 0; then
10994+ # Ensure the archiver fails upon bogus file names.
10995+ rm -f conftest.$ac_objext libconftest.a
10996+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
10997+ (eval $lt_ar_try) 2>&5
10998+ ac_status=$?
10999+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
11000+ test $ac_status = 0; }
11001+ if test "$ac_status" -ne 0; then
11002+ lt_cv_ar_at_file=@
11003+ fi
11004+ fi
11005+ rm -f conftest.* libconftest.a
11006+
11007+fi
11008+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
11009+
11010+fi
11011+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
11012+$as_echo "$lt_cv_ar_at_file" >&6; }
11013+
11014+if test "x$lt_cv_ar_at_file" = xno; then
11015+ archiver_list_spec=
11016+else
11017+ archiver_list_spec=$lt_cv_ar_at_file
11018+fi
11019
11020
11021
11022@@ -7576,8 +7889,8 @@ esac
11023 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
11024
11025 # Transform an extracted symbol line into symbol name and symbol address
11026-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
11027-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'"
11028+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
11029+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'"
11030
11031 # Handle CRLF in mingw tool chain
11032 opt_cr=
11033@@ -7613,6 +7926,7 @@ for ac_symprfx in "" "_"; do
11034 else
11035 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
11036 fi
11037+ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
11038
11039 # Check to see that the pipe works correctly.
11040 pipe_works=no
11041@@ -7654,6 +7968,18 @@ _LT_EOF
11042 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
11043 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
11044 cat <<_LT_EOF > conftest.$ac_ext
11045+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */
11046+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
11047+/* DATA imports from DLLs on WIN32 con't be const, because runtime
11048+ relocations are performed -- see ld's documentation on pseudo-relocs. */
11049+# define LT_DLSYM_CONST
11050+#elif defined(__osf__)
11051+/* This system does not cope well with relocations in const data. */
11052+# define LT_DLSYM_CONST
11053+#else
11054+# define LT_DLSYM_CONST const
11055+#endif
11056+
11057 #ifdef __cplusplus
11058 extern "C" {
11059 #endif
11060@@ -7665,7 +7991,7 @@ _LT_EOF
11061 cat <<_LT_EOF >> conftest.$ac_ext
11062
11063 /* The mapping between symbol names and symbols. */
11064-const struct {
11065+LT_DLSYM_CONST struct {
11066 const char *name;
11067 void *address;
11068 }
11069@@ -7691,8 +8017,8 @@ static const void *lt_preloaded_setup() {
11070 _LT_EOF
11071 # Now try linking the two files.
11072 mv conftest.$ac_objext conftstm.$ac_objext
11073- lt_save_LIBS="$LIBS"
11074- lt_save_CFLAGS="$CFLAGS"
11075+ lt_globsym_save_LIBS=$LIBS
11076+ lt_globsym_save_CFLAGS=$CFLAGS
11077 LIBS="conftstm.$ac_objext"
11078 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
11079 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
11080@@ -7702,8 +8028,8 @@ _LT_EOF
11081 test $ac_status = 0; } && test -s conftest${ac_exeext}; then
11082 pipe_works=yes
11083 fi
11084- LIBS="$lt_save_LIBS"
11085- CFLAGS="$lt_save_CFLAGS"
11086+ LIBS=$lt_globsym_save_LIBS
11087+ CFLAGS=$lt_globsym_save_CFLAGS
11088 else
11089 echo "cannot find nm_test_func in $nlist" >&5
11090 fi
11091@@ -7740,6 +8066,13 @@ else
11092 $as_echo "ok" >&6; }
11093 fi
11094
11095+# Response file support.
11096+if test "$lt_cv_nm_interface" = "MS dumpbin"; then
11097+ nm_file_list_spec='@'
11098+elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then
11099+ nm_file_list_spec='@'
11100+fi
11101+
11102
11103
11104
11105@@ -7759,6 +8092,48 @@ fi
11106
11107
11108
11109+
11110+
11111+
11112+
11113+
11114+
11115+
11116+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
11117+$as_echo_n "checking for sysroot... " >&6; }
11118+
11119+# Check whether --with-libtool-sysroot was given.
11120+if test "${with_libtool_sysroot+set}" = set; then :
11121+ withval=$with_libtool_sysroot;
11122+else
11123+ with_libtool_sysroot=no
11124+fi
11125+
11126+
11127+lt_sysroot=
11128+case ${with_libtool_sysroot} in #(
11129+ yes)
11130+ if test "$GCC" = yes; then
11131+ lt_sysroot=`$CC --print-sysroot 2>/dev/null`
11132+ fi
11133+ ;; #(
11134+ /*)
11135+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"`
11136+ ;; #(
11137+ no|'')
11138+ ;; #(
11139+ *)
11140+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5
11141+$as_echo "${with_libtool_sysroot}" >&6; }
11142+ as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5
11143+ ;;
11144+esac
11145+
11146+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
11147+$as_echo "${lt_sysroot:-no}" >&6; }
11148+
11149+
11150+
11151
11152
11153 # Check whether --enable-libtool-lock was given.
11154@@ -7967,6 +8342,123 @@ esac
11155
11156 need_locks="$enable_libtool_lock"
11157
11158+if test -n "$ac_tool_prefix"; then
11159+ # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args.
11160+set dummy ${ac_tool_prefix}mt; ac_word=$2
11161+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
11162+$as_echo_n "checking for $ac_word... " >&6; }
11163+if ${ac_cv_prog_MANIFEST_TOOL+:} false; then :
11164+ $as_echo_n "(cached) " >&6
11165+else
11166+ if test -n "$MANIFEST_TOOL"; then
11167+ ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test.
11168+else
11169+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
11170+for as_dir in $PATH
11171+do
11172+ IFS=$as_save_IFS
11173+ test -z "$as_dir" && as_dir=.
11174+ for ac_exec_ext in '' $ac_executable_extensions; do
11175+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
11176+ ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
11177+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
11178+ break 2
11179+ fi
11180+done
11181+ done
11182+IFS=$as_save_IFS
11183+
11184+fi
11185+fi
11186+MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL
11187+if test -n "$MANIFEST_TOOL"; then
11188+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5
11189+$as_echo "$MANIFEST_TOOL" >&6; }
11190+else
11191+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
11192+$as_echo "no" >&6; }
11193+fi
11194+
11195+
11196+fi
11197+if test -z "$ac_cv_prog_MANIFEST_TOOL"; then
11198+ ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL
11199+ # Extract the first word of "mt", so it can be a program name with args.
11200+set dummy mt; ac_word=$2
11201+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
11202+$as_echo_n "checking for $ac_word... " >&6; }
11203+if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then :
11204+ $as_echo_n "(cached) " >&6
11205+else
11206+ if test -n "$ac_ct_MANIFEST_TOOL"; then
11207+ ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test.
11208+else
11209+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
11210+for as_dir in $PATH
11211+do
11212+ IFS=$as_save_IFS
11213+ test -z "$as_dir" && as_dir=.
11214+ for ac_exec_ext in '' $ac_executable_extensions; do
11215+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
11216+ ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
11217+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
11218+ break 2
11219+ fi
11220+done
11221+ done
11222+IFS=$as_save_IFS
11223+
11224+fi
11225+fi
11226+ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL
11227+if test -n "$ac_ct_MANIFEST_TOOL"; then
11228+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5
11229+$as_echo "$ac_ct_MANIFEST_TOOL" >&6; }
11230+else
11231+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
11232+$as_echo "no" >&6; }
11233+fi
11234+
11235+ if test "x$ac_ct_MANIFEST_TOOL" = x; then
11236+ MANIFEST_TOOL=":"
11237+ else
11238+ case $cross_compiling:$ac_tool_warned in
11239+yes:)
11240+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
11241+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
11242+ac_tool_warned=yes ;;
11243+esac
11244+ MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL
11245+ fi
11246+else
11247+ MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL"
11248+fi
11249+
11250+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
11251+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5
11252+$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; }
11253+if ${lt_cv_path_mainfest_tool+:} false; then :
11254+ $as_echo_n "(cached) " >&6
11255+else
11256+ lt_cv_path_mainfest_tool=no
11257+ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5
11258+ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
11259+ cat conftest.err >&5
11260+ if $GREP 'Manifest Tool' conftest.out > /dev/null; then
11261+ lt_cv_path_mainfest_tool=yes
11262+ fi
11263+ rm -f conftest*
11264+fi
11265+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5
11266+$as_echo "$lt_cv_path_mainfest_tool" >&6; }
11267+if test "x$lt_cv_path_mainfest_tool" != xyes; then
11268+ MANIFEST_TOOL=:
11269+fi
11270+
11271+
11272+
11273+
11274+
11275
11276 case $host_os in
11277 rhapsody* | darwin*)
11278@@ -8530,6 +9022,8 @@ _LT_EOF
11279 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
11280 echo "$AR cru libconftest.a conftest.o" >&5
11281 $AR cru libconftest.a conftest.o 2>&5
11282+ echo "$RANLIB libconftest.a" >&5
11283+ $RANLIB libconftest.a 2>&5
11284 cat > conftest.c << _LT_EOF
11285 int main() { return 0;}
11286 _LT_EOF
11287@@ -8598,6 +9092,16 @@ done
11288
11289
11290
11291+func_stripname_cnf ()
11292+{
11293+ case ${2} in
11294+ .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
11295+ *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
11296+ esac
11297+} # func_stripname_cnf
11298+
11299+
11300+
11301
11302
11303 # Set options
11304@@ -9113,8 +9617,6 @@ fi
11305 lt_prog_compiler_pic=
11306 lt_prog_compiler_static=
11307
11308-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
11309-$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
11310
11311 if test "$GCC" = yes; then
11312 lt_prog_compiler_wl='-Wl,'
11313@@ -9280,6 +9782,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
11314 lt_prog_compiler_pic='--shared'
11315 lt_prog_compiler_static='--static'
11316 ;;
11317+ nagfor*)
11318+ # NAG Fortran compiler
11319+ lt_prog_compiler_wl='-Wl,-Wl,,'
11320+ lt_prog_compiler_pic='-PIC'
11321+ lt_prog_compiler_static='-Bstatic'
11322+ ;;
11323 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
11324 # Portland Group compilers (*not* the Pentium gcc compiler,
11325 # which looks to be a dead project)
11326@@ -9342,7 +9850,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
11327 lt_prog_compiler_pic='-KPIC'
11328 lt_prog_compiler_static='-Bstatic'
11329 case $cc_basename in
11330- f77* | f90* | f95*)
11331+ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
11332 lt_prog_compiler_wl='-Qoption ld ';;
11333 *)
11334 lt_prog_compiler_wl='-Wl,';;
11335@@ -9399,13 +9907,17 @@ case $host_os in
11336 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
11337 ;;
11338 esac
11339-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5
11340-$as_echo "$lt_prog_compiler_pic" >&6; }
11341-
11342-
11343-
11344-
11345
11346+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
11347+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
11348+if ${lt_cv_prog_compiler_pic+:} false; then :
11349+ $as_echo_n "(cached) " >&6
11350+else
11351+ lt_cv_prog_compiler_pic=$lt_prog_compiler_pic
11352+fi
11353+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
11354+$as_echo "$lt_cv_prog_compiler_pic" >&6; }
11355+lt_prog_compiler_pic=$lt_cv_prog_compiler_pic
11356
11357 #
11358 # Check to make sure the PIC flag actually works.
11359@@ -9466,6 +9978,11 @@ fi
11360
11361
11362
11363+
11364+
11365+
11366+
11367+
11368 #
11369 # Check to make sure the static flag actually works.
11370 #
11371@@ -9816,7 +10333,8 @@ _LT_EOF
11372 allow_undefined_flag=unsupported
11373 always_export_symbols=no
11374 enable_shared_with_static_runtimes=yes
11375- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
11376+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols'
11377+ exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
11378
11379 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
11380 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
11381@@ -9915,12 +10433,12 @@ _LT_EOF
11382 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
11383 hardcode_libdir_flag_spec=
11384 hardcode_libdir_flag_spec_ld='-rpath $libdir'
11385- archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
11386+ archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
11387 if test "x$supports_anon_versioning" = xyes; then
11388 archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
11389 cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
11390 echo "local: *; };" >> $output_objdir/$libname.ver~
11391- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
11392+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
11393 fi
11394 ;;
11395 esac
11396@@ -9934,8 +10452,8 @@ _LT_EOF
11397 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
11398 wlarc=
11399 else
11400- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
11401- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
11402+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
11403+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
11404 fi
11405 ;;
11406
11407@@ -9953,8 +10471,8 @@ _LT_EOF
11408
11409 _LT_EOF
11410 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
11411- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
11412- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
11413+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
11414+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
11415 else
11416 ld_shlibs=no
11417 fi
11418@@ -10000,8 +10518,8 @@ _LT_EOF
11419
11420 *)
11421 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
11422- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
11423- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
11424+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
11425+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
11426 else
11427 ld_shlibs=no
11428 fi
11429@@ -10131,7 +10649,13 @@ _LT_EOF
11430 allow_undefined_flag='-berok'
11431 # Determine the default libpath from the value encoded in an
11432 # empty executable.
11433- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
11434+ if test "${lt_cv_aix_libpath+set}" = set; then
11435+ aix_libpath=$lt_cv_aix_libpath
11436+else
11437+ if ${lt_cv_aix_libpath_+:} false; then :
11438+ $as_echo_n "(cached) " >&6
11439+else
11440+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
11441 /* end confdefs.h. */
11442
11443 int
11444@@ -10144,22 +10668,29 @@ main ()
11445 _ACEOF
11446 if ac_fn_c_try_link "$LINENO"; then :
11447
11448-lt_aix_libpath_sed='
11449- /Import File Strings/,/^$/ {
11450- /^0/ {
11451- s/^0 *\(.*\)$/\1/
11452- p
11453- }
11454- }'
11455-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
11456-# Check for a 64-bit object if we didn't find anything.
11457-if test -z "$aix_libpath"; then
11458- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
11459-fi
11460+ lt_aix_libpath_sed='
11461+ /Import File Strings/,/^$/ {
11462+ /^0/ {
11463+ s/^0 *\([^ ]*\) *$/\1/
11464+ p
11465+ }
11466+ }'
11467+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
11468+ # Check for a 64-bit object if we didn't find anything.
11469+ if test -z "$lt_cv_aix_libpath_"; then
11470+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
11471+ fi
11472 fi
11473 rm -f core conftest.err conftest.$ac_objext \
11474 conftest$ac_exeext conftest.$ac_ext
11475-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
11476+ if test -z "$lt_cv_aix_libpath_"; then
11477+ lt_cv_aix_libpath_="/usr/lib:/lib"
11478+ fi
11479+
11480+fi
11481+
11482+ aix_libpath=$lt_cv_aix_libpath_
11483+fi
11484
11485 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
11486 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"
11487@@ -10171,7 +10702,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
11488 else
11489 # Determine the default libpath from the value encoded in an
11490 # empty executable.
11491- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
11492+ if test "${lt_cv_aix_libpath+set}" = set; then
11493+ aix_libpath=$lt_cv_aix_libpath
11494+else
11495+ if ${lt_cv_aix_libpath_+:} false; then :
11496+ $as_echo_n "(cached) " >&6
11497+else
11498+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
11499 /* end confdefs.h. */
11500
11501 int
11502@@ -10184,22 +10721,29 @@ main ()
11503 _ACEOF
11504 if ac_fn_c_try_link "$LINENO"; then :
11505
11506-lt_aix_libpath_sed='
11507- /Import File Strings/,/^$/ {
11508- /^0/ {
11509- s/^0 *\(.*\)$/\1/
11510- p
11511- }
11512- }'
11513-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
11514-# Check for a 64-bit object if we didn't find anything.
11515-if test -z "$aix_libpath"; then
11516- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
11517-fi
11518+ lt_aix_libpath_sed='
11519+ /Import File Strings/,/^$/ {
11520+ /^0/ {
11521+ s/^0 *\([^ ]*\) *$/\1/
11522+ p
11523+ }
11524+ }'
11525+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
11526+ # Check for a 64-bit object if we didn't find anything.
11527+ if test -z "$lt_cv_aix_libpath_"; then
11528+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
11529+ fi
11530 fi
11531 rm -f core conftest.err conftest.$ac_objext \
11532 conftest$ac_exeext conftest.$ac_ext
11533-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
11534+ if test -z "$lt_cv_aix_libpath_"; then
11535+ lt_cv_aix_libpath_="/usr/lib:/lib"
11536+ fi
11537+
11538+fi
11539+
11540+ aix_libpath=$lt_cv_aix_libpath_
11541+fi
11542
11543 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
11544 # Warning - without using the other run time loading flags,
11545@@ -10243,21 +10787,64 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
11546 # When not using gcc, we currently assume that we are using
11547 # Microsoft Visual C++.
11548 # hardcode_libdir_flag_spec is actually meaningless, as there is
11549- # no search path for DLLs.
11550- hardcode_libdir_flag_spec=' '
11551- allow_undefined_flag=unsupported
11552- # Tell ltmain to make .lib files, not .a files.
11553- libext=lib
11554- # Tell ltmain to make .dll files, not .so files.
11555- shrext_cmds=".dll"
11556- # FIXME: Setting linknames here is a bad hack.
11557- archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
11558- # The linker will automatically build a .lib file if we build a DLL.
11559- old_archive_from_new_cmds='true'
11560- # FIXME: Should let the user specify the lib program.
11561- old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
11562- fix_srcfile_path='`cygpath -w "$srcfile"`'
11563- enable_shared_with_static_runtimes=yes
11564+ # no search path for DLLs.
11565+ case $cc_basename in
11566+ cl*)
11567+ # Native MSVC
11568+ hardcode_libdir_flag_spec=' '
11569+ allow_undefined_flag=unsupported
11570+ always_export_symbols=yes
11571+ file_list_spec='@'
11572+ # Tell ltmain to make .lib files, not .a files.
11573+ libext=lib
11574+ # Tell ltmain to make .dll files, not .so files.
11575+ shrext_cmds=".dll"
11576+ # FIXME: Setting linknames here is a bad hack.
11577+ archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
11578+ archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
11579+ sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
11580+ else
11581+ sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
11582+ fi~
11583+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
11584+ linknames='
11585+ # The linker will not automatically build a static lib if we build a DLL.
11586+ # _LT_TAGVAR(old_archive_from_new_cmds, )='true'
11587+ enable_shared_with_static_runtimes=yes
11588+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
11589+ # Don't use ranlib
11590+ old_postinstall_cmds='chmod 644 $oldlib'
11591+ postlink_cmds='lt_outputfile="@OUTPUT@"~
11592+ lt_tool_outputfile="@TOOL_OUTPUT@"~
11593+ case $lt_outputfile in
11594+ *.exe|*.EXE) ;;
11595+ *)
11596+ lt_outputfile="$lt_outputfile.exe"
11597+ lt_tool_outputfile="$lt_tool_outputfile.exe"
11598+ ;;
11599+ esac~
11600+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
11601+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
11602+ $RM "$lt_outputfile.manifest";
11603+ fi'
11604+ ;;
11605+ *)
11606+ # Assume MSVC wrapper
11607+ hardcode_libdir_flag_spec=' '
11608+ allow_undefined_flag=unsupported
11609+ # Tell ltmain to make .lib files, not .a files.
11610+ libext=lib
11611+ # Tell ltmain to make .dll files, not .so files.
11612+ shrext_cmds=".dll"
11613+ # FIXME: Setting linknames here is a bad hack.
11614+ archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
11615+ # The linker will automatically build a .lib file if we build a DLL.
11616+ old_archive_from_new_cmds='true'
11617+ # FIXME: Should let the user specify the lib program.
11618+ old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
11619+ enable_shared_with_static_runtimes=yes
11620+ ;;
11621+ esac
11622 ;;
11623
11624 darwin* | rhapsody*)
11625@@ -10318,7 +10905,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
6878 11626
6879 # FreeBSD 3 and greater uses gcc -shared to do shared libraries. 11627 # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
6880 freebsd* | dragonfly*) 11628 freebsd* | dragonfly*)
@@ -6883,7 +11631,7 @@ index a7f788f0411..e7703613024 100755
6883 hardcode_libdir_flag_spec='-R$libdir' 11631 hardcode_libdir_flag_spec='-R$libdir'
6884 hardcode_direct=yes 11632 hardcode_direct=yes
6885 hardcode_shlibpath_var=no 11633 hardcode_shlibpath_var=no
6886@@ -8860,7 +9438,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 11634@@ -10326,7 +10913,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
6887 11635
6888 hpux9*) 11636 hpux9*)
6889 if test "$GCC" = yes; then 11637 if test "$GCC" = yes; then
@@ -6892,7 +11640,7 @@ index a7f788f0411..e7703613024 100755
6892 else 11640 else
6893 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' 11641 archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
6894 fi 11642 fi
6895@@ -8876,7 +9454,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 11643@@ -10342,7 +10929,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
6896 11644
6897 hpux10*) 11645 hpux10*)
6898 if test "$GCC" = yes && test "$with_gnu_ld" = no; then 11646 if test "$GCC" = yes && test "$with_gnu_ld" = no; then
@@ -6901,7 +11649,7 @@ index a7f788f0411..e7703613024 100755
6901 else 11649 else
6902 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' 11650 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
6903 fi 11651 fi
6904@@ -8900,10 +9478,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 11652@@ -10366,10 +10953,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
6905 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' 11653 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
6906 ;; 11654 ;;
6907 ia64*) 11655 ia64*)
@@ -6914,7 +11662,7 @@ index a7f788f0411..e7703613024 100755
6914 ;; 11662 ;;
6915 esac 11663 esac
6916 else 11664 else
6917@@ -8982,23 +9560,36 @@ fi 11665@@ -10448,23 +11035,36 @@ fi
6918 11666
6919 irix5* | irix6* | nonstopux*) 11667 irix5* | irix6* | nonstopux*)
6920 if test "$GCC" = yes; then 11668 if test "$GCC" = yes; then
@@ -6959,7 +11707,7 @@ index a7f788f0411..e7703613024 100755
6959 else 11707 else
6960 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' 11708 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
6961 archive_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' 11709 archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
6962@@ -9083,7 +9674,7 @@ rm -f core conftest.err conftest.$ac_objext \ 11710@@ -10549,7 +11149,7 @@ rm -f core conftest.err conftest.$ac_objext \
6963 osf4* | osf5*) # as osf3* with the addition of -msym flag 11711 osf4* | osf5*) # as osf3* with the addition of -msym flag
6964 if test "$GCC" = yes; then 11712 if test "$GCC" = yes; then
6965 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' 11713 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
@@ -6968,7 +11716,7 @@ index a7f788f0411..e7703613024 100755
6968 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' 11716 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
6969 else 11717 else
6970 allow_undefined_flag=' -expect_unresolved \*' 11718 allow_undefined_flag=' -expect_unresolved \*'
6971@@ -9102,9 +9693,9 @@ rm -f core conftest.err conftest.$ac_objext \ 11719@@ -10568,9 +11168,9 @@ rm -f core conftest.err conftest.$ac_objext \
6972 no_undefined_flag=' -z defs' 11720 no_undefined_flag=' -z defs'
6973 if test "$GCC" = yes; then 11721 if test "$GCC" = yes; then
6974 wlarc='${wl}' 11722 wlarc='${wl}'
@@ -6980,7 +11728,7 @@ index a7f788f0411..e7703613024 100755
6980 else 11728 else
6981 case `$CC -V 2>&1` in 11729 case `$CC -V 2>&1` in
6982 *"Compilers 5.0"*) 11730 *"Compilers 5.0"*)
6983@@ -9680,8 +10271,9 @@ cygwin* | mingw* | pw32* | cegcc*) 11731@@ -11146,8 +11746,9 @@ cygwin* | mingw* | pw32* | cegcc*)
6984 need_version=no 11732 need_version=no
6985 need_lib_prefix=no 11733 need_lib_prefix=no
6986 11734
@@ -6992,7 +11740,7 @@ index a7f788f0411..e7703613024 100755
6992 library_names_spec='$libname.dll.a' 11740 library_names_spec='$libname.dll.a'
6993 # DLL is installed to $(libdir)/../bin by postinstall_cmds 11741 # DLL is installed to $(libdir)/../bin by postinstall_cmds
6994 postinstall_cmds='base_file=`basename \${file}`~ 11742 postinstall_cmds='base_file=`basename \${file}`~
6995@@ -9714,13 +10306,71 @@ cygwin* | mingw* | pw32* | cegcc*) 11743@@ -11180,13 +11781,71 @@ cygwin* | mingw* | pw32* | cegcc*)
6996 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' 11744 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
6997 ;; 11745 ;;
6998 esac 11746 esac
@@ -7065,16 +11813,16 @@ index a7f788f0411..e7703613024 100755
7065 # FIXME: first we should search . and the directory the executable is in 11813 # FIXME: first we should search . and the directory the executable is in
7066 shlibpath_var=PATH 11814 shlibpath_var=PATH
7067 ;; 11815 ;;
7068@@ -10598,7 +11248,7 @@ else 11816@@ -12064,7 +12723,7 @@ else
7069 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 11817 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
7070 lt_status=$lt_dlunknown 11818 lt_status=$lt_dlunknown
7071 cat > conftest.$ac_ext <<_LT_EOF 11819 cat > conftest.$ac_ext <<_LT_EOF
7072-#line 10601 "configure" 11820-#line 12067 "configure"
7073+#line $LINENO "configure" 11821+#line $LINENO "configure"
7074 #include "confdefs.h" 11822 #include "confdefs.h"
7075 11823
7076 #if HAVE_DLFCN_H 11824 #if HAVE_DLFCN_H
7077@@ -10642,10 +11292,10 @@ else 11825@@ -12108,10 +12767,10 @@ else
7078 /* When -fvisbility=hidden is used, assume the code has been annotated 11826 /* When -fvisbility=hidden is used, assume the code has been annotated
7079 correspondingly for the symbols needed. */ 11827 correspondingly for the symbols needed. */
7080 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 11828 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
@@ -7087,16 +11835,16 @@ index a7f788f0411..e7703613024 100755
7087 int main () 11835 int main ()
7088 { 11836 {
7089 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 11837 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
7090@@ -10704,7 +11354,7 @@ else 11838@@ -12170,7 +12829,7 @@ else
7091 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 11839 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
7092 lt_status=$lt_dlunknown 11840 lt_status=$lt_dlunknown
7093 cat > conftest.$ac_ext <<_LT_EOF 11841 cat > conftest.$ac_ext <<_LT_EOF
7094-#line 10707 "configure" 11842-#line 12173 "configure"
7095+#line $LINENO "configure" 11843+#line $LINENO "configure"
7096 #include "confdefs.h" 11844 #include "confdefs.h"
7097 11845
7098 #if HAVE_DLFCN_H 11846 #if HAVE_DLFCN_H
7099@@ -10748,10 +11398,10 @@ else 11847@@ -12214,10 +12873,10 @@ else
7100 /* When -fvisbility=hidden is used, assume the code has been annotated 11848 /* When -fvisbility=hidden is used, assume the code has been annotated
7101 correspondingly for the symbols needed. */ 11849 correspondingly for the symbols needed. */
7102 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 11850 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
@@ -7109,7 +11857,592 @@ index a7f788f0411..e7703613024 100755
7109 int main () 11857 int main ()
7110 { 11858 {
7111 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 11859 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
7112@@ -12771,13 +13421,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' 11860@@ -12609,6 +13268,7 @@ $RM -r conftest*
11861
11862 # Allow CC to be a program name with arguments.
11863 lt_save_CC=$CC
11864+ lt_save_CFLAGS=$CFLAGS
11865 lt_save_LD=$LD
11866 lt_save_GCC=$GCC
11867 GCC=$GXX
11868@@ -12626,6 +13286,7 @@ $RM -r conftest*
11869 fi
11870 test -z "${LDCXX+set}" || LD=$LDCXX
11871 CC=${CXX-"c++"}
11872+ CFLAGS=$CXXFLAGS
11873 compiler=$CC
11874 compiler_CXX=$CC
11875 for cc_temp in $compiler""; do
11876@@ -12908,7 +13569,13 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
11877 allow_undefined_flag_CXX='-berok'
11878 # Determine the default libpath from the value encoded in an empty
11879 # executable.
11880- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
11881+ if test "${lt_cv_aix_libpath+set}" = set; then
11882+ aix_libpath=$lt_cv_aix_libpath
11883+else
11884+ if ${lt_cv_aix_libpath__CXX+:} false; then :
11885+ $as_echo_n "(cached) " >&6
11886+else
11887+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
11888 /* end confdefs.h. */
11889
11890 int
11891@@ -12921,22 +13588,29 @@ main ()
11892 _ACEOF
11893 if ac_fn_cxx_try_link "$LINENO"; then :
11894
11895-lt_aix_libpath_sed='
11896- /Import File Strings/,/^$/ {
11897- /^0/ {
11898- s/^0 *\(.*\)$/\1/
11899- p
11900- }
11901- }'
11902-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
11903-# Check for a 64-bit object if we didn't find anything.
11904-if test -z "$aix_libpath"; then
11905- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
11906-fi
11907+ lt_aix_libpath_sed='
11908+ /Import File Strings/,/^$/ {
11909+ /^0/ {
11910+ s/^0 *\([^ ]*\) *$/\1/
11911+ p
11912+ }
11913+ }'
11914+ lt_cv_aix_libpath__CXX=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
11915+ # Check for a 64-bit object if we didn't find anything.
11916+ if test -z "$lt_cv_aix_libpath__CXX"; then
11917+ lt_cv_aix_libpath__CXX=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
11918+ fi
11919 fi
11920 rm -f core conftest.err conftest.$ac_objext \
11921 conftest$ac_exeext conftest.$ac_ext
11922-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
11923+ if test -z "$lt_cv_aix_libpath__CXX"; then
11924+ lt_cv_aix_libpath__CXX="/usr/lib:/lib"
11925+ fi
11926+
11927+fi
11928+
11929+ aix_libpath=$lt_cv_aix_libpath__CXX
11930+fi
11931
11932 hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
11933
11934@@ -12949,7 +13623,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
11935 else
11936 # Determine the default libpath from the value encoded in an
11937 # empty executable.
11938- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
11939+ if test "${lt_cv_aix_libpath+set}" = set; then
11940+ aix_libpath=$lt_cv_aix_libpath
11941+else
11942+ if ${lt_cv_aix_libpath__CXX+:} false; then :
11943+ $as_echo_n "(cached) " >&6
11944+else
11945+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
11946 /* end confdefs.h. */
11947
11948 int
11949@@ -12962,22 +13642,29 @@ main ()
11950 _ACEOF
11951 if ac_fn_cxx_try_link "$LINENO"; then :
11952
11953-lt_aix_libpath_sed='
11954- /Import File Strings/,/^$/ {
11955- /^0/ {
11956- s/^0 *\(.*\)$/\1/
11957- p
11958- }
11959- }'
11960-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
11961-# Check for a 64-bit object if we didn't find anything.
11962-if test -z "$aix_libpath"; then
11963- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
11964-fi
11965+ lt_aix_libpath_sed='
11966+ /Import File Strings/,/^$/ {
11967+ /^0/ {
11968+ s/^0 *\([^ ]*\) *$/\1/
11969+ p
11970+ }
11971+ }'
11972+ lt_cv_aix_libpath__CXX=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
11973+ # Check for a 64-bit object if we didn't find anything.
11974+ if test -z "$lt_cv_aix_libpath__CXX"; then
11975+ lt_cv_aix_libpath__CXX=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
11976+ fi
11977 fi
11978 rm -f core conftest.err conftest.$ac_objext \
11979 conftest$ac_exeext conftest.$ac_ext
11980-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
11981+ if test -z "$lt_cv_aix_libpath__CXX"; then
11982+ lt_cv_aix_libpath__CXX="/usr/lib:/lib"
11983+ fi
11984+
11985+fi
11986+
11987+ aix_libpath=$lt_cv_aix_libpath__CXX
11988+fi
11989
11990 hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
11991 # Warning - without using the other run time loading flags,
11992@@ -13020,29 +13707,75 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
11993 ;;
11994
11995 cygwin* | mingw* | pw32* | cegcc*)
11996- # _LT_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless,
11997- # as there is no search path for DLLs.
11998- hardcode_libdir_flag_spec_CXX='-L$libdir'
11999- export_dynamic_flag_spec_CXX='${wl}--export-all-symbols'
12000- allow_undefined_flag_CXX=unsupported
12001- always_export_symbols_CXX=no
12002- enable_shared_with_static_runtimes_CXX=yes
12003-
12004- if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
12005- archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
12006- # If the export-symbols file already is a .def file (1st line
12007- # is EXPORTS), use it as is; otherwise, prepend...
12008- archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
12009- cp $export_symbols $output_objdir/$soname.def;
12010- else
12011- echo EXPORTS > $output_objdir/$soname.def;
12012- cat $export_symbols >> $output_objdir/$soname.def;
12013- fi~
12014- $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
12015- else
12016- ld_shlibs_CXX=no
12017- fi
12018- ;;
12019+ case $GXX,$cc_basename in
12020+ ,cl* | no,cl*)
12021+ # Native MSVC
12022+ # hardcode_libdir_flag_spec is actually meaningless, as there is
12023+ # no search path for DLLs.
12024+ hardcode_libdir_flag_spec_CXX=' '
12025+ allow_undefined_flag_CXX=unsupported
12026+ always_export_symbols_CXX=yes
12027+ file_list_spec_CXX='@'
12028+ # Tell ltmain to make .lib files, not .a files.
12029+ libext=lib
12030+ # Tell ltmain to make .dll files, not .so files.
12031+ shrext_cmds=".dll"
12032+ # FIXME: Setting linknames here is a bad hack.
12033+ archive_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
12034+ archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
12035+ $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
12036+ else
12037+ $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
12038+ fi~
12039+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
12040+ linknames='
12041+ # The linker will not automatically build a static lib if we build a DLL.
12042+ # _LT_TAGVAR(old_archive_from_new_cmds, CXX)='true'
12043+ enable_shared_with_static_runtimes_CXX=yes
12044+ # Don't use ranlib
12045+ old_postinstall_cmds_CXX='chmod 644 $oldlib'
12046+ postlink_cmds_CXX='lt_outputfile="@OUTPUT@"~
12047+ lt_tool_outputfile="@TOOL_OUTPUT@"~
12048+ case $lt_outputfile in
12049+ *.exe|*.EXE) ;;
12050+ *)
12051+ lt_outputfile="$lt_outputfile.exe"
12052+ lt_tool_outputfile="$lt_tool_outputfile.exe"
12053+ ;;
12054+ esac~
12055+ func_to_tool_file "$lt_outputfile"~
12056+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
12057+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
12058+ $RM "$lt_outputfile.manifest";
12059+ fi'
12060+ ;;
12061+ *)
12062+ # g++
12063+ # _LT_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless,
12064+ # as there is no search path for DLLs.
12065+ hardcode_libdir_flag_spec_CXX='-L$libdir'
12066+ export_dynamic_flag_spec_CXX='${wl}--export-all-symbols'
12067+ allow_undefined_flag_CXX=unsupported
12068+ always_export_symbols_CXX=no
12069+ enable_shared_with_static_runtimes_CXX=yes
12070+
12071+ if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
12072+ archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
12073+ # If the export-symbols file already is a .def file (1st line
12074+ # is EXPORTS), use it as is; otherwise, prepend...
12075+ archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
12076+ cp $export_symbols $output_objdir/$soname.def;
12077+ else
12078+ echo EXPORTS > $output_objdir/$soname.def;
12079+ cat $export_symbols >> $output_objdir/$soname.def;
12080+ fi~
12081+ $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
12082+ else
12083+ ld_shlibs_CXX=no
12084+ fi
12085+ ;;
12086+ esac
12087+ ;;
12088 darwin* | rhapsody*)
12089
12090
12091@@ -13148,7 +13881,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
12092 ;;
12093 *)
12094 if test "$GXX" = yes; then
12095- archive_cmds_CXX='$RM $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
12096+ archive_cmds_CXX='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
12097 else
12098 # FIXME: insert proper C++ library support
12099 ld_shlibs_CXX=no
12100@@ -13219,10 +13952,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
12101 archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
12102 ;;
12103 ia64*)
12104- archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
12105+ archive_cmds_CXX='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
12106 ;;
12107 *)
12108- archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
12109+ archive_cmds_CXX='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
12110 ;;
12111 esac
12112 fi
12113@@ -13263,9 +13996,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
12114 *)
12115 if test "$GXX" = yes; then
12116 if test "$with_gnu_ld" = no; then
12117- archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
12118+ archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
12119 else
12120- archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib'
12121+ archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib'
12122 fi
12123 fi
12124 link_all_deplibs_CXX=yes
12125@@ -13335,20 +14068,20 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
12126 prelink_cmds_CXX='tpldir=Template.dir~
12127 rm -rf $tpldir~
12128 $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
12129- compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"'
12130+ compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"'
12131 old_archive_cmds_CXX='tpldir=Template.dir~
12132 rm -rf $tpldir~
12133 $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
12134- $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~
12135+ $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~
12136 $RANLIB $oldlib'
12137 archive_cmds_CXX='tpldir=Template.dir~
12138 rm -rf $tpldir~
12139 $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
12140- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
12141+ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
12142 archive_expsym_cmds_CXX='tpldir=Template.dir~
12143 rm -rf $tpldir~
12144 $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
12145- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
12146+ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
12147 ;;
12148 *) # Version 6 and above use weak symbols
12149 archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
12150@@ -13543,7 +14276,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
12151 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'
12152 ;;
12153 *)
12154- archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
12155+ archive_cmds_CXX='$CC -shared $pic_flag -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
12156 ;;
12157 esac
12158
12159@@ -13589,7 +14322,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
12160
12161 solaris*)
12162 case $cc_basename in
12163- CC*)
12164+ CC* | sunCC*)
12165 # Sun C++ 4.2, 5.x and Centerline C++
12166 archive_cmds_need_lc_CXX=yes
12167 no_undefined_flag_CXX=' -zdefs'
12168@@ -13630,9 +14363,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
12169 if test "$GXX" = yes && test "$with_gnu_ld" = no; then
12170 no_undefined_flag_CXX=' ${wl}-z ${wl}defs'
12171 if $CC --version | $GREP -v '^2\.7' > /dev/null; then
12172- archive_cmds_CXX='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
12173+ archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
12174 archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
12175- $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
12176+ $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
12177
12178 # Commands to make compiler produce verbose output that lists
12179 # what "hidden" libraries, object files and flags are used when
12180@@ -13767,6 +14500,13 @@ private:
12181 };
12182 _LT_EOF
12183
12184+
12185+_lt_libdeps_save_CFLAGS=$CFLAGS
12186+case "$CC $CFLAGS " in #(
12187+*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;;
12188+*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;;
12189+esac
12190+
12191 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
12192 (eval $ac_compile) 2>&5
12193 ac_status=$?
12194@@ -13780,7 +14520,7 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
12195 pre_test_object_deps_done=no
12196
12197 for p in `eval "$output_verbose_link_cmd"`; do
12198- case $p in
12199+ case ${prev}${p} in
12200
12201 -L* | -R* | -l*)
12202 # Some compilers place space between "-{L,R}" and the path.
12203@@ -13789,13 +14529,22 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
12204 test $p = "-R"; then
12205 prev=$p
12206 continue
12207- else
12208- prev=
12209 fi
12210
12211+ # Expand the sysroot to ease extracting the directories later.
12212+ if test -z "$prev"; then
12213+ case $p in
12214+ -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;;
12215+ -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;;
12216+ -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;;
12217+ esac
12218+ fi
12219+ case $p in
12220+ =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;;
12221+ esac
12222 if test "$pre_test_object_deps_done" = no; then
12223- case $p in
12224- -L* | -R*)
12225+ case ${prev} in
12226+ -L | -R)
12227 # Internal compiler library paths should come after those
12228 # provided the user. The postdeps already come after the
12229 # user supplied libs so there is no need to process them.
12230@@ -13815,8 +14564,10 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
12231 postdeps_CXX="${postdeps_CXX} ${prev}${p}"
12232 fi
12233 fi
12234+ prev=
12235 ;;
12236
12237+ *.lto.$objext) ;; # Ignore GCC LTO objects
12238 *.$objext)
12239 # This assumes that the test object file only shows up
12240 # once in the compiler output.
12241@@ -13852,6 +14603,7 @@ else
12242 fi
12243
12244 $RM -f confest.$objext
12245+CFLAGS=$_lt_libdeps_save_CFLAGS
12246
12247 # PORTME: override above test on systems where it is broken
12248 case $host_os in
12249@@ -13887,7 +14639,7 @@ linux*)
12250
12251 solaris*)
12252 case $cc_basename in
12253- CC*)
12254+ CC* | sunCC*)
12255 # The more standards-conforming stlport4 library is
12256 # incompatible with the Cstd library. Avoid specifying
12257 # it if it's in CXXFLAGS. Ignore libCrun as
12258@@ -13952,8 +14704,6 @@ fi
12259 lt_prog_compiler_pic_CXX=
12260 lt_prog_compiler_static_CXX=
12261
12262-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
12263-$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
12264
12265 # C++ specific cases for pic, static, wl, etc.
12266 if test "$GXX" = yes; then
12267@@ -14058,6 +14808,11 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
12268 ;;
12269 esac
12270 ;;
12271+ mingw* | cygwin* | os2* | pw32* | cegcc*)
12272+ # This hack is so that the source file can tell whether it is being
12273+ # built for inclusion in a dll (and should export symbols for example).
12274+ lt_prog_compiler_pic_CXX='-DDLL_EXPORT'
12275+ ;;
12276 dgux*)
12277 case $cc_basename in
12278 ec++*)
12279@@ -14210,7 +14965,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
12280 ;;
12281 solaris*)
12282 case $cc_basename in
12283- CC*)
12284+ CC* | sunCC*)
12285 # Sun C++ 4.2, 5.x and Centerline C++
12286 lt_prog_compiler_pic_CXX='-KPIC'
12287 lt_prog_compiler_static_CXX='-Bstatic'
12288@@ -14275,10 +15030,17 @@ case $host_os in
12289 lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC"
12290 ;;
12291 esac
12292-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic_CXX" >&5
12293-$as_echo "$lt_prog_compiler_pic_CXX" >&6; }
12294-
12295
12296+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
12297+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
12298+if ${lt_cv_prog_compiler_pic_CXX+:} false; then :
12299+ $as_echo_n "(cached) " >&6
12300+else
12301+ lt_cv_prog_compiler_pic_CXX=$lt_prog_compiler_pic_CXX
12302+fi
12303+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_CXX" >&5
12304+$as_echo "$lt_cv_prog_compiler_pic_CXX" >&6; }
12305+lt_prog_compiler_pic_CXX=$lt_cv_prog_compiler_pic_CXX
12306
12307 #
12308 # Check to make sure the PIC flag actually works.
12309@@ -14336,6 +15098,8 @@ fi
12310
12311
12312
12313+
12314+
12315 #
12316 # Check to make sure the static flag actually works.
12317 #
12318@@ -14513,6 +15277,7 @@ fi
12319 $as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
12320
12321 export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
12322+ exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
12323 case $host_os in
12324 aix[4-9]*)
12325 # If we're using GNU nm, then we don't want the "-C" option.
12326@@ -14527,15 +15292,20 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
12327 ;;
12328 pw32*)
12329 export_symbols_cmds_CXX="$ltdll_cmds"
12330- ;;
12331+ ;;
12332 cygwin* | mingw* | cegcc*)
12333- export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;/^.*[ ]__nm__/s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols'
12334- ;;
12335+ case $cc_basename in
12336+ cl*) ;;
12337+ *)
12338+ export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols'
12339+ exclude_expsyms_CXX='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
12340+ ;;
12341+ esac
12342+ ;;
12343 *)
12344 export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
12345- ;;
12346+ ;;
12347 esac
12348- exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
12349
12350 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5
12351 $as_echo "$ld_shlibs_CXX" >&6; }
12352@@ -14798,8 +15568,9 @@ cygwin* | mingw* | pw32* | cegcc*)
12353 need_version=no
12354 need_lib_prefix=no
12355
12356- case $GCC,$host_os in
12357- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
12358+ case $GCC,$cc_basename in
12359+ yes,*)
12360+ # gcc
12361 library_names_spec='$libname.dll.a'
12362 # DLL is installed to $(libdir)/../bin by postinstall_cmds
12363 postinstall_cmds='base_file=`basename \${file}`~
12364@@ -14831,13 +15602,71 @@ cygwin* | mingw* | pw32* | cegcc*)
12365 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
12366 ;;
12367 esac
12368+ dynamic_linker='Win32 ld.exe'
12369+ ;;
12370+
12371+ *,cl*)
12372+ # Native MSVC
12373+ libname_spec='$name'
12374+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
12375+ library_names_spec='${libname}.dll.lib'
12376+
12377+ case $build_os in
12378+ mingw*)
12379+ sys_lib_search_path_spec=
12380+ lt_save_ifs=$IFS
12381+ IFS=';'
12382+ for lt_path in $LIB
12383+ do
12384+ IFS=$lt_save_ifs
12385+ # Let DOS variable expansion print the short 8.3 style file name.
12386+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
12387+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
12388+ done
12389+ IFS=$lt_save_ifs
12390+ # Convert to MSYS style.
12391+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
12392+ ;;
12393+ cygwin*)
12394+ # Convert to unix form, then to dos form, then back to unix form
12395+ # but this time dos style (no spaces!) so that the unix form looks
12396+ # like /cygdrive/c/PROGRA~1:/cygdr...
12397+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
12398+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
12399+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
12400+ ;;
12401+ *)
12402+ sys_lib_search_path_spec="$LIB"
12403+ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
12404+ # It is most probably a Windows format PATH.
12405+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
12406+ else
12407+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
12408+ fi
12409+ # FIXME: find the short name or the path components, as spaces are
12410+ # common. (e.g. "Program Files" -> "PROGRA~1")
12411+ ;;
12412+ esac
12413+
12414+ # DLL is installed to $(libdir)/../bin by postinstall_cmds
12415+ postinstall_cmds='base_file=`basename \${file}`~
12416+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
12417+ dldir=$destdir/`dirname \$dlpath`~
12418+ test -d \$dldir || mkdir -p \$dldir~
12419+ $install_prog $dir/$dlname \$dldir/$dlname'
12420+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
12421+ dlpath=$dir/\$dldll~
12422+ $RM \$dlpath'
12423+ shlibpath_overrides_runpath=yes
12424+ dynamic_linker='Win32 link.exe'
12425 ;;
12426
12427 *)
12428+ # Assume MSVC wrapper
12429 library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
12430+ dynamic_linker='Win32 ld.exe'
12431 ;;
12432 esac
12433- dynamic_linker='Win32 ld.exe'
12434 # FIXME: first we should search . and the directory the executable is in
12435 shlibpath_var=PATH
12436 ;;
12437@@ -15377,6 +16206,7 @@ fi
12438 fi # test -n "$compiler"
12439
12440 CC=$lt_save_CC
12441+ CFLAGS=$lt_save_CFLAGS
12442 LDCXX=$LD
12443 LD=$lt_save_LD
12444 GCC=$lt_save_GCC
12445@@ -16321,13 +17151,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
7113 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' 12446 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
7114 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' 12447 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
7115 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' 12448 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
@@ -7130,7 +12463,7 @@ index a7f788f0411..e7703613024 100755
7130 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' 12463 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
7131 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' 12464 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
7132 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' 12465 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
7133@@ -12792,14 +13449,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de 12466@@ -16342,14 +17179,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de
7134 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' 12467 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
7135 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' 12468 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
7136 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"`' 12469 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"`'
@@ -7149,7 +12482,7 @@ index a7f788f0411..e7703613024 100755
7149 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' 12482 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
7150 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' 12483 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
7151 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' 12484 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
7152@@ -12832,12 +13492,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q 12485@@ -16382,12 +17222,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q
7153 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' 12486 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
7154 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' 12487 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
7155 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' 12488 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
@@ -7163,7 +12496,31 @@ index a7f788f0411..e7703613024 100755
7163 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' 12496 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
7164 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' 12497 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
7165 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' 12498 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
7166@@ -12892,8 +13552,13 @@ reload_flag \ 12499@@ -16426,8 +17266,8 @@ old_archive_cmds_CXX='`$ECHO "$old_archive_cmds_CXX" | $SED "$delay_single_quote
12500 compiler_CXX='`$ECHO "$compiler_CXX" | $SED "$delay_single_quote_subst"`'
12501 GCC_CXX='`$ECHO "$GCC_CXX" | $SED "$delay_single_quote_subst"`'
12502 lt_prog_compiler_no_builtin_flag_CXX='`$ECHO "$lt_prog_compiler_no_builtin_flag_CXX" | $SED "$delay_single_quote_subst"`'
12503-lt_prog_compiler_wl_CXX='`$ECHO "$lt_prog_compiler_wl_CXX" | $SED "$delay_single_quote_subst"`'
12504 lt_prog_compiler_pic_CXX='`$ECHO "$lt_prog_compiler_pic_CXX" | $SED "$delay_single_quote_subst"`'
12505+lt_prog_compiler_wl_CXX='`$ECHO "$lt_prog_compiler_wl_CXX" | $SED "$delay_single_quote_subst"`'
12506 lt_prog_compiler_static_CXX='`$ECHO "$lt_prog_compiler_static_CXX" | $SED "$delay_single_quote_subst"`'
12507 lt_cv_prog_compiler_c_o_CXX='`$ECHO "$lt_cv_prog_compiler_c_o_CXX" | $SED "$delay_single_quote_subst"`'
12508 archive_cmds_need_lc_CXX='`$ECHO "$archive_cmds_need_lc_CXX" | $SED "$delay_single_quote_subst"`'
12509@@ -16454,12 +17294,12 @@ hardcode_shlibpath_var_CXX='`$ECHO "$hardcode_shlibpath_var_CXX" | $SED "$delay_
12510 hardcode_automatic_CXX='`$ECHO "$hardcode_automatic_CXX" | $SED "$delay_single_quote_subst"`'
12511 inherit_rpath_CXX='`$ECHO "$inherit_rpath_CXX" | $SED "$delay_single_quote_subst"`'
12512 link_all_deplibs_CXX='`$ECHO "$link_all_deplibs_CXX" | $SED "$delay_single_quote_subst"`'
12513-fix_srcfile_path_CXX='`$ECHO "$fix_srcfile_path_CXX" | $SED "$delay_single_quote_subst"`'
12514 always_export_symbols_CXX='`$ECHO "$always_export_symbols_CXX" | $SED "$delay_single_quote_subst"`'
12515 export_symbols_cmds_CXX='`$ECHO "$export_symbols_cmds_CXX" | $SED "$delay_single_quote_subst"`'
12516 exclude_expsyms_CXX='`$ECHO "$exclude_expsyms_CXX" | $SED "$delay_single_quote_subst"`'
12517 include_expsyms_CXX='`$ECHO "$include_expsyms_CXX" | $SED "$delay_single_quote_subst"`'
12518 prelink_cmds_CXX='`$ECHO "$prelink_cmds_CXX" | $SED "$delay_single_quote_subst"`'
12519+postlink_cmds_CXX='`$ECHO "$postlink_cmds_CXX" | $SED "$delay_single_quote_subst"`'
12520 file_list_spec_CXX='`$ECHO "$file_list_spec_CXX" | $SED "$delay_single_quote_subst"`'
12521 hardcode_action_CXX='`$ECHO "$hardcode_action_CXX" | $SED "$delay_single_quote_subst"`'
12522 compiler_lib_search_dirs_CXX='`$ECHO "$compiler_lib_search_dirs_CXX" | $SED "$delay_single_quote_subst"`'
12523@@ -16497,8 +17337,13 @@ reload_flag \
7167 OBJDUMP \ 12524 OBJDUMP \
7168 deplibs_check_method \ 12525 deplibs_check_method \
7169 file_magic_cmd \ 12526 file_magic_cmd \
@@ -7177,7 +12534,7 @@ index a7f788f0411..e7703613024 100755
7177 STRIP \ 12534 STRIP \
7178 RANLIB \ 12535 RANLIB \
7179 CC \ 12536 CC \
7180@@ -12903,12 +13568,14 @@ lt_cv_sys_global_symbol_pipe \ 12537@@ -16508,12 +17353,14 @@ lt_cv_sys_global_symbol_pipe \
7181 lt_cv_sys_global_symbol_to_cdecl \ 12538 lt_cv_sys_global_symbol_to_cdecl \
7182 lt_cv_sys_global_symbol_to_c_name_address \ 12539 lt_cv_sys_global_symbol_to_c_name_address \
7183 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ 12540 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
@@ -7193,7 +12550,7 @@ index a7f788f0411..e7703613024 100755
7193 DSYMUTIL \ 12550 DSYMUTIL \
7194 NMEDIT \ 12551 NMEDIT \
7195 LIPO \ 12552 LIPO \
7196@@ -12924,7 +13591,6 @@ no_undefined_flag \ 12553@@ -16529,7 +17376,6 @@ no_undefined_flag \
7197 hardcode_libdir_flag_spec \ 12554 hardcode_libdir_flag_spec \
7198 hardcode_libdir_flag_spec_ld \ 12555 hardcode_libdir_flag_spec_ld \
7199 hardcode_libdir_separator \ 12556 hardcode_libdir_separator \
@@ -7201,7 +12558,25 @@ index a7f788f0411..e7703613024 100755
7201 exclude_expsyms \ 12558 exclude_expsyms \
7202 include_expsyms \ 12559 include_expsyms \
7203 file_list_spec \ 12560 file_list_spec \
7204@@ -12960,6 +13626,7 @@ module_cmds \ 12561@@ -16551,8 +17397,8 @@ LD_CXX \
12562 reload_flag_CXX \
12563 compiler_CXX \
12564 lt_prog_compiler_no_builtin_flag_CXX \
12565-lt_prog_compiler_wl_CXX \
12566 lt_prog_compiler_pic_CXX \
12567+lt_prog_compiler_wl_CXX \
12568 lt_prog_compiler_static_CXX \
12569 lt_cv_prog_compiler_c_o_CXX \
12570 export_dynamic_flag_spec_CXX \
12571@@ -16564,7 +17410,6 @@ no_undefined_flag_CXX \
12572 hardcode_libdir_flag_spec_CXX \
12573 hardcode_libdir_flag_spec_ld_CXX \
12574 hardcode_libdir_separator_CXX \
12575-fix_srcfile_path_CXX \
12576 exclude_expsyms_CXX \
12577 include_expsyms_CXX \
12578 file_list_spec_CXX \
12579@@ -16598,6 +17443,7 @@ module_cmds \
7205 module_expsym_cmds \ 12580 module_expsym_cmds \
7206 export_symbols_cmds \ 12581 export_symbols_cmds \
7207 prelink_cmds \ 12582 prelink_cmds \
@@ -7209,7 +12584,17 @@ index a7f788f0411..e7703613024 100755
7209 postinstall_cmds \ 12584 postinstall_cmds \
7210 postuninstall_cmds \ 12585 postuninstall_cmds \
7211 finish_cmds \ 12586 finish_cmds \
7212@@ -13725,7 +14392,8 @@ $as_echo X"$file" | 12587@@ -16612,7 +17458,8 @@ archive_expsym_cmds_CXX \
12588 module_cmds_CXX \
12589 module_expsym_cmds_CXX \
12590 export_symbols_cmds_CXX \
12591-prelink_cmds_CXX; do
12592+prelink_cmds_CXX \
12593+postlink_cmds_CXX; do
12594 case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
12595 *[\\\\\\\`\\"\\\$]*)
12596 eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
12597@@ -17366,7 +18213,8 @@ $as_echo X"$file" |
7213 # NOTE: Changes made to this file will be lost: look at ltmain.sh. 12598 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
7214 # 12599 #
7215 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 12600 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
@@ -7219,7 +12604,7 @@ index a7f788f0411..e7703613024 100755
7219 # Written by Gordon Matzigkeit, 1996 12604 # Written by Gordon Matzigkeit, 1996
7220 # 12605 #
7221 # This file is part of GNU Libtool. 12606 # This file is part of GNU Libtool.
7222@@ -13828,19 +14496,42 @@ SP2NL=$lt_lt_SP2NL 12607@@ -17469,19 +18317,42 @@ SP2NL=$lt_lt_SP2NL
7223 # turn newlines into spaces. 12608 # turn newlines into spaces.
7224 NL2SP=$lt_lt_NL2SP 12609 NL2SP=$lt_lt_NL2SP
7225 12610
@@ -7263,7 +12648,7 @@ index a7f788f0411..e7703613024 100755
7263 # A symbol stripping program. 12648 # A symbol stripping program.
7264 STRIP=$lt_STRIP 12649 STRIP=$lt_STRIP
7265 12650
7266@@ -13870,6 +14561,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address 12651@@ -17511,6 +18382,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
7267 # Transform the output of nm in a C name address pair when lib prefix is needed. 12652 # Transform the output of nm in a C name address pair when lib prefix is needed.
7268 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix 12653 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
7269 12654
@@ -7276,7 +12661,7 @@ index a7f788f0411..e7703613024 100755
7276 # The name of the directory that contains temporary libtool files. 12661 # The name of the directory that contains temporary libtool files.
7277 objdir=$objdir 12662 objdir=$objdir
7278 12663
7279@@ -13879,6 +14576,9 @@ MAGIC_CMD=$MAGIC_CMD 12664@@ -17520,6 +18397,9 @@ MAGIC_CMD=$MAGIC_CMD
7280 # Must we lock files when doing compilation? 12665 # Must we lock files when doing compilation?
7281 need_locks=$lt_need_locks 12666 need_locks=$lt_need_locks
7282 12667
@@ -7286,7 +12671,7 @@ index a7f788f0411..e7703613024 100755
7286 # Tool to manipulate archived DWARF debug symbol files on Mac OS X. 12671 # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
7287 DSYMUTIL=$lt_DSYMUTIL 12672 DSYMUTIL=$lt_DSYMUTIL
7288 12673
7289@@ -13993,12 +14693,12 @@ with_gcc=$GCC 12674@@ -17634,12 +18514,12 @@ with_gcc=$GCC
7290 # Compiler flag to turn off builtin functions. 12675 # Compiler flag to turn off builtin functions.
7291 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag 12676 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
7292 12677
@@ -7302,7 +12687,7 @@ index a7f788f0411..e7703613024 100755
7302 # Compiler flag to prevent dynamic linking. 12687 # Compiler flag to prevent dynamic linking.
7303 link_static_flag=$lt_lt_prog_compiler_static 12688 link_static_flag=$lt_lt_prog_compiler_static
7304 12689
7305@@ -14085,9 +14785,6 @@ inherit_rpath=$inherit_rpath 12690@@ -17726,9 +18606,6 @@ inherit_rpath=$inherit_rpath
7306 # Whether libtool must link a program against all its dependency libraries. 12691 # Whether libtool must link a program against all its dependency libraries.
7307 link_all_deplibs=$link_all_deplibs 12692 link_all_deplibs=$link_all_deplibs
7308 12693
@@ -7312,7 +12697,7 @@ index a7f788f0411..e7703613024 100755
7312 # Set to "yes" if exported symbols are required. 12697 # Set to "yes" if exported symbols are required.
7313 always_export_symbols=$always_export_symbols 12698 always_export_symbols=$always_export_symbols
7314 12699
7315@@ -14103,6 +14800,9 @@ include_expsyms=$lt_include_expsyms 12700@@ -17744,6 +18621,9 @@ include_expsyms=$lt_include_expsyms
7316 # Commands necessary for linking programs (against libraries) with templates. 12701 # Commands necessary for linking programs (against libraries) with templates.
7317 prelink_cmds=$lt_prelink_cmds 12702 prelink_cmds=$lt_prelink_cmds
7318 12703
@@ -7322,7 +12707,7 @@ index a7f788f0411..e7703613024 100755
7322 # Specify filename containing input files. 12707 # Specify filename containing input files.
7323 file_list_spec=$lt_file_list_spec 12708 file_list_spec=$lt_file_list_spec
7324 12709
7325@@ -14135,210 +14835,169 @@ ltmain="$ac_aux_dir/ltmain.sh" 12710@@ -17790,210 +18670,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
7326 # if finds mixed CR/LF and LF-only lines. Since sed operates in 12711 # if finds mixed CR/LF and LF-only lines. Since sed operates in
7327 # text mode, it properly converts lines to CR/LF. This bash problem 12712 # text mode, it properly converts lines to CR/LF. This bash problem
7328 # is reportedly fixed, but why not run on old versions too? 12713 # is reportedly fixed, but why not run on old versions too?
@@ -7696,11 +13081,95 @@ index a7f788f0411..e7703613024 100755
7696 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") 13081 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
7697 chmod +x "$ofile" 13082 chmod +x "$ofile"
7698 13083
13084@@ -18021,12 +18860,12 @@ with_gcc=$GCC_CXX
13085 # Compiler flag to turn off builtin functions.
13086 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX
13087
13088-# How to pass a linker flag through the compiler.
13089-wl=$lt_lt_prog_compiler_wl_CXX
13090-
13091 # Additional compiler flags for building library objects.
13092 pic_flag=$lt_lt_prog_compiler_pic_CXX
13093
13094+# How to pass a linker flag through the compiler.
13095+wl=$lt_lt_prog_compiler_wl_CXX
13096+
13097 # Compiler flag to prevent dynamic linking.
13098 link_static_flag=$lt_lt_prog_compiler_static_CXX
13099
13100@@ -18113,9 +18952,6 @@ inherit_rpath=$inherit_rpath_CXX
13101 # Whether libtool must link a program against all its dependency libraries.
13102 link_all_deplibs=$link_all_deplibs_CXX
13103
13104-# Fix the shell variable \$srcfile for the compiler.
13105-fix_srcfile_path=$lt_fix_srcfile_path_CXX
13106-
13107 # Set to "yes" if exported symbols are required.
13108 always_export_symbols=$always_export_symbols_CXX
13109
13110@@ -18131,6 +18967,9 @@ include_expsyms=$lt_include_expsyms_CXX
13111 # Commands necessary for linking programs (against libraries) with templates.
13112 prelink_cmds=$lt_prelink_cmds_CXX
13113
13114+# Commands necessary for finishing linking programs.
13115+postlink_cmds=$lt_postlink_cmds_CXX
13116+
13117 # Specify filename containing input files.
13118 file_list_spec=$lt_file_list_spec_CXX
13119
13120diff --git a/gprofng/src/Makefile.in b/gprofng/src/Makefile.in
13121index ba7fdd6e8ad..3a0fc5dbbe7 100644
13122--- a/gprofng/src/Makefile.in
13123+++ b/gprofng/src/Makefile.in
13124@@ -324,6 +324,7 @@ CXXFLAGS = @CXXFLAGS@
13125 CYGPATH_W = @CYGPATH_W@
13126 DEFS = @DEFS@
13127 DEPDIR = @DEPDIR@
13128+DLLTOOL = @DLLTOOL@
13129 DSYMUTIL = @DSYMUTIL@
13130 DUMPBIN = @DUMPBIN@
13131 ECHO_C = @ECHO_C@
13132@@ -359,6 +360,7 @@ LN_S = @LN_S@
13133 LTLIBOBJS = @LTLIBOBJS@
13134 MAINT = @MAINT@
13135 MAKEINFO = @MAKEINFO@
13136+MANIFEST_TOOL = @MANIFEST_TOOL@
13137 MKDIR_P = @MKDIR_P@
13138 NM = @NM@
13139 NMEDIT = @NMEDIT@
13140diff --git a/ld/Makefile.in b/ld/Makefile.in
13141index 782d4017a60..71bbe487aef 100644
13142--- a/ld/Makefile.in
13143+++ b/ld/Makefile.in
13144@@ -383,6 +383,7 @@ CYGPATH_W = @CYGPATH_W@
13145 DATADIRNAME = @DATADIRNAME@
13146 DEFS = @DEFS@
13147 DEPDIR = @DEPDIR@
13148+DLLTOOL = @DLLTOOL@
13149 DSYMUTIL = @DSYMUTIL@
13150 DUMPBIN = @DUMPBIN@
13151 ECHO_C = @ECHO_C@
13152@@ -433,6 +434,7 @@ LN_S = @LN_S@
13153 LTLIBOBJS = @LTLIBOBJS@
13154 MAINT = @MAINT@
13155 MAKEINFO = @MAKEINFO@
13156+MANIFEST_TOOL = @MANIFEST_TOOL@
13157 MKDIR_P = @MKDIR_P@
13158 MKINSTALLDIRS = @MKINSTALLDIRS@
13159 MSGFMT = @MSGFMT@
13160@@ -481,6 +483,7 @@ abs_builddir = @abs_builddir@
13161 abs_srcdir = @abs_srcdir@
13162 abs_top_builddir = @abs_top_builddir@
13163 abs_top_srcdir = @abs_top_srcdir@
13164+ac_ct_AR = @ac_ct_AR@
13165 ac_ct_CC = @ac_ct_CC@
13166 ac_ct_CXX = @ac_ct_CXX@
13167 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
7699diff --git a/ld/configure b/ld/configure 13168diff --git a/ld/configure b/ld/configure
7700index 1f9ec8ec580..4a35108ce7c 100755 13169index d0a467ac101..45b20013a45 100755
7701--- a/ld/configure 13170--- a/ld/configure
7702+++ b/ld/configure 13171+++ b/ld/configure
7703@@ -695,8 +695,11 @@ OTOOL 13172@@ -700,8 +700,11 @@ OTOOL
7704 LIPO 13173 LIPO
7705 NMEDIT 13174 NMEDIT
7706 DSYMUTIL 13175 DSYMUTIL
@@ -7712,7 +13181,7 @@ index 1f9ec8ec580..4a35108ce7c 100755
7712 OBJDUMP 13181 OBJDUMP
7713 LN_S 13182 LN_S
7714 NM 13183 NM
7715@@ -823,6 +826,7 @@ enable_static 13184@@ -828,6 +831,7 @@ enable_static
7716 with_pic 13185 with_pic
7717 enable_fast_install 13186 enable_fast_install
7718 with_gnu_ld 13187 with_gnu_ld
@@ -7720,7 +13189,7 @@ index 1f9ec8ec580..4a35108ce7c 100755
7720 enable_libtool_lock 13189 enable_libtool_lock
7721 enable_plugins 13190 enable_plugins
7722 enable_largefile 13191 enable_largefile
7723@@ -1530,6 +1534,8 @@ Optional Packages: 13192@@ -1552,6 +1556,8 @@ Optional Packages:
7724 --with-pic try to use only PIC/non-PIC objects [default=use 13193 --with-pic try to use only PIC/non-PIC objects [default=use
7725 both] 13194 both]
7726 --with-gnu-ld assume the C compiler uses GNU ld [default=no] 13195 --with-gnu-ld assume the C compiler uses GNU ld [default=no]
@@ -7729,7 +13198,7 @@ index 1f9ec8ec580..4a35108ce7c 100755
7729 --with-lib-path=dir1:dir2... set default LIB_PATH 13198 --with-lib-path=dir1:dir2... set default LIB_PATH
7730 --with-sysroot=DIR Search for usr/lib et al within DIR. 13199 --with-sysroot=DIR Search for usr/lib et al within DIR.
7731 --with-system-zlib use installed libz 13200 --with-system-zlib use installed libz
7732@@ -5368,8 +5374,8 @@ esac 13201@@ -5399,8 +5405,8 @@ esac
7733 13202
7734 13203
7735 13204
@@ -7740,7 +13209,7 @@ index 1f9ec8ec580..4a35108ce7c 100755
7740 13209
7741 13210
7742 13211
7743@@ -5409,7 +5415,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO 13212@@ -5440,7 +5446,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
7744 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 13213 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
7745 $as_echo_n "checking how to print strings... " >&6; } 13214 $as_echo_n "checking how to print strings... " >&6; }
7746 # Test print first, because it will be a builtin if present. 13215 # Test print first, because it will be a builtin if present.
@@ -7749,7 +13218,7 @@ index 1f9ec8ec580..4a35108ce7c 100755
7749 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then 13218 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
7750 ECHO='print -r --' 13219 ECHO='print -r --'
7751 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then 13220 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
7752@@ -6096,8 +6102,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; 13221@@ -6133,8 +6139,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6;
7753 # Try some XSI features 13222 # Try some XSI features
7754 xsi_shell=no 13223 xsi_shell=no
7755 ( _lt_dummy="a/b/c" 13224 ( _lt_dummy="a/b/c"
@@ -7760,7 +13229,7 @@ index 1f9ec8ec580..4a35108ce7c 100755
7760 && eval 'test $(( 1 + 1 )) -eq 2 \ 13229 && eval 'test $(( 1 + 1 )) -eq 2 \
7761 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ 13230 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
7762 && xsi_shell=yes 13231 && xsi_shell=yes
7763@@ -6146,6 +6152,80 @@ esac 13232@@ -6183,6 +6189,80 @@ esac
7764 13233
7765 13234
7766 13235
@@ -7841,7 +13310,7 @@ index 1f9ec8ec580..4a35108ce7c 100755
7841 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 13310 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
7842 $as_echo_n "checking for $LD option to reload object files... " >&6; } 13311 $as_echo_n "checking for $LD option to reload object files... " >&6; }
7843 if ${lt_cv_ld_reload_flag+:} false; then : 13312 if ${lt_cv_ld_reload_flag+:} false; then :
7844@@ -6162,6 +6242,11 @@ case $reload_flag in 13313@@ -6199,6 +6279,11 @@ case $reload_flag in
7845 esac 13314 esac
7846 reload_cmds='$LD$reload_flag -o $output$reload_objs' 13315 reload_cmds='$LD$reload_flag -o $output$reload_objs'
7847 case $host_os in 13316 case $host_os in
@@ -7853,7 +13322,7 @@ index 1f9ec8ec580..4a35108ce7c 100755
7853 darwin*) 13322 darwin*)
7854 if test "$GCC" = yes; then 13323 if test "$GCC" = yes; then
7855 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' 13324 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
7856@@ -6330,7 +6415,8 @@ mingw* | pw32*) 13325@@ -6367,7 +6452,8 @@ mingw* | pw32*)
7857 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' 13326 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
7858 lt_cv_file_magic_cmd='func_win32_libid' 13327 lt_cv_file_magic_cmd='func_win32_libid'
7859 else 13328 else
@@ -7863,7 +13332,7 @@ index 1f9ec8ec580..4a35108ce7c 100755
7863 lt_cv_file_magic_cmd='$OBJDUMP -f' 13332 lt_cv_file_magic_cmd='$OBJDUMP -f'
7864 fi 13333 fi
7865 ;; 13334 ;;
7866@@ -6484,6 +6570,21 @@ esac 13335@@ -6521,6 +6607,21 @@ esac
7867 fi 13336 fi
7868 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 13337 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
7869 $as_echo "$lt_cv_deplibs_check_method" >&6; } 13338 $as_echo "$lt_cv_deplibs_check_method" >&6; }
@@ -7885,7 +13354,7 @@ index 1f9ec8ec580..4a35108ce7c 100755
7885 file_magic_cmd=$lt_cv_file_magic_cmd 13354 file_magic_cmd=$lt_cv_file_magic_cmd
7886 deplibs_check_method=$lt_cv_deplibs_check_method 13355 deplibs_check_method=$lt_cv_deplibs_check_method
7887 test -z "$deplibs_check_method" && deplibs_check_method=unknown 13356 test -z "$deplibs_check_method" && deplibs_check_method=unknown
7888@@ -6499,6 +6600,157 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown 13357@@ -6536,6 +6637,157 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
7889 13358
7890 13359
7891 13360
@@ -8043,7 +13512,7 @@ index 1f9ec8ec580..4a35108ce7c 100755
8043 plugin_option= 13512 plugin_option=
8044 plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll" 13513 plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll"
8045 for plugin in $plugin_names; do 13514 for plugin in $plugin_names; do
8046@@ -6513,8 +6765,10 @@ for plugin in $plugin_names; do 13515@@ -6550,8 +6802,10 @@ for plugin in $plugin_names; do
8047 done 13516 done
8048 13517
8049 if test -n "$ac_tool_prefix"; then 13518 if test -n "$ac_tool_prefix"; then
@@ -8056,7 +13525,7 @@ index 1f9ec8ec580..4a35108ce7c 100755
8056 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 13525 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
8057 $as_echo_n "checking for $ac_word... " >&6; } 13526 $as_echo_n "checking for $ac_word... " >&6; }
8058 if ${ac_cv_prog_AR+:} false; then : 13527 if ${ac_cv_prog_AR+:} false; then :
8059@@ -6530,7 +6784,7 @@ do 13528@@ -6567,7 +6821,7 @@ do
8060 test -z "$as_dir" && as_dir=. 13529 test -z "$as_dir" && as_dir=.
8061 for ac_exec_ext in '' $ac_executable_extensions; do 13530 for ac_exec_ext in '' $ac_executable_extensions; do
8062 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 13531 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
@@ -8065,7 +13534,7 @@ index 1f9ec8ec580..4a35108ce7c 100755
8065 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 13534 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
8066 break 2 13535 break 2
8067 fi 13536 fi
8068@@ -6550,11 +6804,15 @@ $as_echo "no" >&6; } 13537@@ -6587,11 +6841,15 @@ $as_echo "no" >&6; }
8069 fi 13538 fi
8070 13539
8071 13540
@@ -8084,7 +13553,7 @@ index 1f9ec8ec580..4a35108ce7c 100755
8084 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 13553 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
8085 $as_echo_n "checking for $ac_word... " >&6; } 13554 $as_echo_n "checking for $ac_word... " >&6; }
8086 if ${ac_cv_prog_ac_ct_AR+:} false; then : 13555 if ${ac_cv_prog_ac_ct_AR+:} false; then :
8087@@ -6570,7 +6828,7 @@ do 13556@@ -6607,7 +6865,7 @@ do
8088 test -z "$as_dir" && as_dir=. 13557 test -z "$as_dir" && as_dir=.
8089 for ac_exec_ext in '' $ac_executable_extensions; do 13558 for ac_exec_ext in '' $ac_executable_extensions; do
8090 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 13559 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
@@ -8093,7 +13562,7 @@ index 1f9ec8ec580..4a35108ce7c 100755
8093 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 13562 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
8094 break 2 13563 break 2
8095 fi 13564 fi
8096@@ -6589,6 +6847,10 @@ else 13565@@ -6626,6 +6884,10 @@ else
8097 $as_echo "no" >&6; } 13566 $as_echo "no" >&6; }
8098 fi 13567 fi
8099 13568
@@ -8104,7 +13573,7 @@ index 1f9ec8ec580..4a35108ce7c 100755
8104 if test "x$ac_ct_AR" = x; then 13573 if test "x$ac_ct_AR" = x; then
8105 AR="false" 13574 AR="false"
8106 else 13575 else
8107@@ -6600,25 +6862,19 @@ ac_tool_warned=yes ;; 13576@@ -6637,25 +6899,19 @@ ac_tool_warned=yes ;;
8108 esac 13577 esac
8109 AR=$ac_ct_AR 13578 AR=$ac_ct_AR
8110 fi 13579 fi
@@ -8139,7 +13608,7 @@ index 1f9ec8ec580..4a35108ce7c 100755
8139 13608
8140 13609
8141 13610
8142@@ -6630,6 +6886,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru 13611@@ -6667,6 +6923,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru
8143 13612
8144 13613
8145 13614
@@ -8204,7 +13673,7 @@ index 1f9ec8ec580..4a35108ce7c 100755
8204 if test -n "$ac_tool_prefix"; then 13673 if test -n "$ac_tool_prefix"; then
8205 # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. 13674 # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
8206 set dummy ${ac_tool_prefix}strip; ac_word=$2 13675 set dummy ${ac_tool_prefix}strip; ac_word=$2
8207@@ -6969,8 +7283,8 @@ esac 13676@@ -7006,8 +7320,8 @@ esac
8208 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" 13677 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
8209 13678
8210 # Transform an extracted symbol line into symbol name and symbol address 13679 # Transform an extracted symbol line into symbol name and symbol address
@@ -8215,7 +13684,7 @@ index 1f9ec8ec580..4a35108ce7c 100755
8215 13684
8216 # Handle CRLF in mingw tool chain 13685 # Handle CRLF in mingw tool chain
8217 opt_cr= 13686 opt_cr=
8218@@ -7006,6 +7320,7 @@ for ac_symprfx in "" "_"; do 13687@@ -7043,6 +7357,7 @@ for ac_symprfx in "" "_"; do
8219 else 13688 else
8220 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" 13689 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
8221 fi 13690 fi
@@ -8223,7 +13692,7 @@ index 1f9ec8ec580..4a35108ce7c 100755
8223 13692
8224 # Check to see that the pipe works correctly. 13693 # Check to see that the pipe works correctly.
8225 pipe_works=no 13694 pipe_works=no
8226@@ -7047,6 +7362,18 @@ _LT_EOF 13695@@ -7084,6 +7399,18 @@ _LT_EOF
8227 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then 13696 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
8228 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then 13697 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
8229 cat <<_LT_EOF > conftest.$ac_ext 13698 cat <<_LT_EOF > conftest.$ac_ext
@@ -8242,7 +13711,7 @@ index 1f9ec8ec580..4a35108ce7c 100755
8242 #ifdef __cplusplus 13711 #ifdef __cplusplus
8243 extern "C" { 13712 extern "C" {
8244 #endif 13713 #endif
8245@@ -7058,7 +7385,7 @@ _LT_EOF 13714@@ -7095,7 +7422,7 @@ _LT_EOF
8246 cat <<_LT_EOF >> conftest.$ac_ext 13715 cat <<_LT_EOF >> conftest.$ac_ext
8247 13716
8248 /* The mapping between symbol names and symbols. */ 13717 /* The mapping between symbol names and symbols. */
@@ -8251,7 +13720,7 @@ index 1f9ec8ec580..4a35108ce7c 100755
8251 const char *name; 13720 const char *name;
8252 void *address; 13721 void *address;
8253 } 13722 }
8254@@ -7084,8 +7411,8 @@ static const void *lt_preloaded_setup() { 13723@@ -7121,8 +7448,8 @@ static const void *lt_preloaded_setup() {
8255 _LT_EOF 13724 _LT_EOF
8256 # Now try linking the two files. 13725 # Now try linking the two files.
8257 mv conftest.$ac_objext conftstm.$ac_objext 13726 mv conftest.$ac_objext conftstm.$ac_objext
@@ -8262,7 +13731,7 @@ index 1f9ec8ec580..4a35108ce7c 100755
8262 LIBS="conftstm.$ac_objext" 13731 LIBS="conftstm.$ac_objext"
8263 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" 13732 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
8264 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 13733 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
8265@@ -7095,8 +7422,8 @@ _LT_EOF 13734@@ -7132,8 +7459,8 @@ _LT_EOF
8266 test $ac_status = 0; } && test -s conftest${ac_exeext}; then 13735 test $ac_status = 0; } && test -s conftest${ac_exeext}; then
8267 pipe_works=yes 13736 pipe_works=yes
8268 fi 13737 fi
@@ -8273,7 +13742,7 @@ index 1f9ec8ec580..4a35108ce7c 100755
8273 else 13742 else
8274 echo "cannot find nm_test_func in $nlist" >&5 13743 echo "cannot find nm_test_func in $nlist" >&5
8275 fi 13744 fi
8276@@ -7133,6 +7460,17 @@ else 13745@@ -7170,6 +7497,17 @@ else
8277 $as_echo "ok" >&6; } 13746 $as_echo "ok" >&6; }
8278 fi 13747 fi
8279 13748
@@ -8291,7 +13760,7 @@ index 1f9ec8ec580..4a35108ce7c 100755
8291 13760
8292 13761
8293 13762
8294@@ -7149,6 +7487,44 @@ fi 13763@@ -7186,6 +7524,44 @@ fi
8295 13764
8296 13765
8297 13766
@@ -8336,7 +13805,7 @@ index 1f9ec8ec580..4a35108ce7c 100755
8336 13805
8337 13806
8338 13807
8339@@ -7360,6 +7736,123 @@ esac 13808@@ -7397,6 +7773,123 @@ esac
8340 13809
8341 need_locks="$enable_libtool_lock" 13810 need_locks="$enable_libtool_lock"
8342 13811
@@ -8460,7 +13929,7 @@ index 1f9ec8ec580..4a35108ce7c 100755
8460 13929
8461 case $host_os in 13930 case $host_os in
8462 rhapsody* | darwin*) 13931 rhapsody* | darwin*)
8463@@ -7923,6 +8416,8 @@ _LT_EOF 13932@@ -7960,6 +8453,8 @@ _LT_EOF
8464 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 13933 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
8465 echo "$AR cru libconftest.a conftest.o" >&5 13934 echo "$AR cru libconftest.a conftest.o" >&5
8466 $AR cru libconftest.a conftest.o 2>&5 13935 $AR cru libconftest.a conftest.o 2>&5
@@ -8469,7 +13938,7 @@ index 1f9ec8ec580..4a35108ce7c 100755
8469 cat > conftest.c << _LT_EOF 13938 cat > conftest.c << _LT_EOF
8470 int main() { return 0;} 13939 int main() { return 0;}
8471 _LT_EOF 13940 _LT_EOF
8472@@ -7991,6 +8486,16 @@ done 13941@@ -8028,6 +8523,16 @@ done
8473 13942
8474 13943
8475 13944
@@ -8486,7 +13955,7 @@ index 1f9ec8ec580..4a35108ce7c 100755
8486 13955
8487 13956
8488 # Set options 13957 # Set options
8489@@ -8506,8 +9011,6 @@ fi 13958@@ -8543,8 +9048,6 @@ fi
8490 lt_prog_compiler_pic= 13959 lt_prog_compiler_pic=
8491 lt_prog_compiler_static= 13960 lt_prog_compiler_static=
8492 13961
@@ -8495,7 +13964,7 @@ index 1f9ec8ec580..4a35108ce7c 100755
8495 13964
8496 if test "$GCC" = yes; then 13965 if test "$GCC" = yes; then
8497 lt_prog_compiler_wl='-Wl,' 13966 lt_prog_compiler_wl='-Wl,'
8498@@ -8673,6 +9176,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 13967@@ -8710,6 +9213,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
8499 lt_prog_compiler_pic='--shared' 13968 lt_prog_compiler_pic='--shared'
8500 lt_prog_compiler_static='--static' 13969 lt_prog_compiler_static='--static'
8501 ;; 13970 ;;
@@ -8508,7 +13977,7 @@ index 1f9ec8ec580..4a35108ce7c 100755
8508 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) 13977 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
8509 # Portland Group compilers (*not* the Pentium gcc compiler, 13978 # Portland Group compilers (*not* the Pentium gcc compiler,
8510 # which looks to be a dead project) 13979 # which looks to be a dead project)
8511@@ -8735,7 +9244,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 13980@@ -8772,7 +9281,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
8512 lt_prog_compiler_pic='-KPIC' 13981 lt_prog_compiler_pic='-KPIC'
8513 lt_prog_compiler_static='-Bstatic' 13982 lt_prog_compiler_static='-Bstatic'
8514 case $cc_basename in 13983 case $cc_basename in
@@ -8517,7 +13986,7 @@ index 1f9ec8ec580..4a35108ce7c 100755
8517 lt_prog_compiler_wl='-Qoption ld ';; 13986 lt_prog_compiler_wl='-Qoption ld ';;
8518 *) 13987 *)
8519 lt_prog_compiler_wl='-Wl,';; 13988 lt_prog_compiler_wl='-Wl,';;
8520@@ -8792,13 +9301,17 @@ case $host_os in 13989@@ -8829,13 +9338,17 @@ case $host_os in
8521 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" 13990 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
8522 ;; 13991 ;;
8523 esac 13992 esac
@@ -8541,7 +14010,7 @@ index 1f9ec8ec580..4a35108ce7c 100755
8541 14010
8542 # 14011 #
8543 # Check to make sure the PIC flag actually works. 14012 # Check to make sure the PIC flag actually works.
8544@@ -8859,6 +9372,11 @@ fi 14013@@ -8896,6 +9409,11 @@ fi
8545 14014
8546 14015
8547 14016
@@ -8553,7 +14022,7 @@ index 1f9ec8ec580..4a35108ce7c 100755
8553 # 14022 #
8554 # Check to make sure the static flag actually works. 14023 # Check to make sure the static flag actually works.
8555 # 14024 #
8556@@ -9209,7 +9727,8 @@ _LT_EOF 14025@@ -9246,7 +9764,8 @@ _LT_EOF
8557 allow_undefined_flag=unsupported 14026 allow_undefined_flag=unsupported
8558 always_export_symbols=no 14027 always_export_symbols=no
8559 enable_shared_with_static_runtimes=yes 14028 enable_shared_with_static_runtimes=yes
@@ -8563,7 +14032,7 @@ index 1f9ec8ec580..4a35108ce7c 100755
8563 14032
8564 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then 14033 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
8565 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' 14034 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
8566@@ -9308,12 +9827,12 @@ _LT_EOF 14035@@ -9345,12 +9864,12 @@ _LT_EOF
8567 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' 14036 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
8568 hardcode_libdir_flag_spec= 14037 hardcode_libdir_flag_spec=
8569 hardcode_libdir_flag_spec_ld='-rpath $libdir' 14038 hardcode_libdir_flag_spec_ld='-rpath $libdir'
@@ -8578,7 +14047,7 @@ index 1f9ec8ec580..4a35108ce7c 100755
8578 fi 14047 fi
8579 ;; 14048 ;;
8580 esac 14049 esac
8581@@ -9327,8 +9846,8 @@ _LT_EOF 14050@@ -9364,8 +9883,8 @@ _LT_EOF
8582 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' 14051 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
8583 wlarc= 14052 wlarc=
8584 else 14053 else
@@ -8589,7 +14058,7 @@ index 1f9ec8ec580..4a35108ce7c 100755
8589 fi 14058 fi
8590 ;; 14059 ;;
8591 14060
8592@@ -9346,8 +9865,8 @@ _LT_EOF 14061@@ -9383,8 +9902,8 @@ _LT_EOF
8593 14062
8594 _LT_EOF 14063 _LT_EOF
8595 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 14064 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -8600,7 +14069,7 @@ index 1f9ec8ec580..4a35108ce7c 100755
8600 else 14069 else
8601 ld_shlibs=no 14070 ld_shlibs=no
8602 fi 14071 fi
8603@@ -9393,8 +9912,8 @@ _LT_EOF 14072@@ -9430,8 +9949,8 @@ _LT_EOF
8604 14073
8605 *) 14074 *)
8606 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 14075 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -8611,7 +14080,7 @@ index 1f9ec8ec580..4a35108ce7c 100755
8611 else 14080 else
8612 ld_shlibs=no 14081 ld_shlibs=no
8613 fi 14082 fi
8614@@ -9524,7 +10043,13 @@ _LT_EOF 14083@@ -9561,7 +10080,13 @@ _LT_EOF
8615 allow_undefined_flag='-berok' 14084 allow_undefined_flag='-berok'
8616 # Determine the default libpath from the value encoded in an 14085 # Determine the default libpath from the value encoded in an
8617 # empty executable. 14086 # empty executable.
@@ -8626,7 +14095,7 @@ index 1f9ec8ec580..4a35108ce7c 100755
8626 /* end confdefs.h. */ 14095 /* end confdefs.h. */
8627 14096
8628 int 14097 int
8629@@ -9537,22 +10062,29 @@ main () 14098@@ -9574,22 +10099,29 @@ main ()
8630 _ACEOF 14099 _ACEOF
8631 if ac_fn_c_try_link "$LINENO"; then : 14100 if ac_fn_c_try_link "$LINENO"; then :
8632 14101
@@ -8669,7 +14138,7 @@ index 1f9ec8ec580..4a35108ce7c 100755
8669 14138
8670 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 14139 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
8671 archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" 14140 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"
8672@@ -9564,7 +10096,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 14141@@ -9601,7 +10133,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
8673 else 14142 else
8674 # Determine the default libpath from the value encoded in an 14143 # Determine the default libpath from the value encoded in an
8675 # empty executable. 14144 # empty executable.
@@ -8684,7 +14153,7 @@ index 1f9ec8ec580..4a35108ce7c 100755
8684 /* end confdefs.h. */ 14153 /* end confdefs.h. */
8685 14154
8686 int 14155 int
8687@@ -9577,22 +10115,29 @@ main () 14156@@ -9614,22 +10152,29 @@ main ()
8688 _ACEOF 14157 _ACEOF
8689 if ac_fn_c_try_link "$LINENO"; then : 14158 if ac_fn_c_try_link "$LINENO"; then :
8690 14159
@@ -8727,7 +14196,7 @@ index 1f9ec8ec580..4a35108ce7c 100755
8727 14196
8728 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 14197 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
8729 # Warning - without using the other run time loading flags, 14198 # Warning - without using the other run time loading flags,
8730@@ -9636,21 +10181,64 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 14199@@ -9673,21 +10218,64 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
8731 # When not using gcc, we currently assume that we are using 14200 # When not using gcc, we currently assume that we are using
8732 # Microsoft Visual C++. 14201 # Microsoft Visual C++.
8733 # hardcode_libdir_flag_spec is actually meaningless, as there is 14202 # hardcode_libdir_flag_spec is actually meaningless, as there is
@@ -8807,7 +14276,7 @@ index 1f9ec8ec580..4a35108ce7c 100755
8807 ;; 14276 ;;
8808 14277
8809 darwin* | rhapsody*) 14278 darwin* | rhapsody*)
8810@@ -9711,7 +10299,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 14279@@ -9748,7 +10336,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
8811 14280
8812 # FreeBSD 3 and greater uses gcc -shared to do shared libraries. 14281 # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
8813 freebsd* | dragonfly*) 14282 freebsd* | dragonfly*)
@@ -8816,7 +14285,7 @@ index 1f9ec8ec580..4a35108ce7c 100755
8816 hardcode_libdir_flag_spec='-R$libdir' 14285 hardcode_libdir_flag_spec='-R$libdir'
8817 hardcode_direct=yes 14286 hardcode_direct=yes
8818 hardcode_shlibpath_var=no 14287 hardcode_shlibpath_var=no
8819@@ -9719,7 +10307,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 14288@@ -9756,7 +10344,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
8820 14289
8821 hpux9*) 14290 hpux9*)
8822 if test "$GCC" = yes; then 14291 if test "$GCC" = yes; then
@@ -8825,7 +14294,7 @@ index 1f9ec8ec580..4a35108ce7c 100755
8825 else 14294 else
8826 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' 14295 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'
8827 fi 14296 fi
8828@@ -9735,7 +10323,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 14297@@ -9772,7 +10360,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
8829 14298
8830 hpux10*) 14299 hpux10*)
8831 if test "$GCC" = yes && test "$with_gnu_ld" = no; then 14300 if test "$GCC" = yes && test "$with_gnu_ld" = no; then
@@ -8834,7 +14303,7 @@ index 1f9ec8ec580..4a35108ce7c 100755
8834 else 14303 else
8835 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' 14304 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
8836 fi 14305 fi
8837@@ -9759,10 +10347,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 14306@@ -9796,10 +10384,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
8838 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' 14307 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
8839 ;; 14308 ;;
8840 ia64*) 14309 ia64*)
@@ -8847,7 +14316,7 @@ index 1f9ec8ec580..4a35108ce7c 100755
8847 ;; 14316 ;;
8848 esac 14317 esac
8849 else 14318 else
8850@@ -9841,23 +10429,36 @@ fi 14319@@ -9878,23 +10466,36 @@ fi
8851 14320
8852 irix5* | irix6* | nonstopux*) 14321 irix5* | irix6* | nonstopux*)
8853 if test "$GCC" = yes; then 14322 if test "$GCC" = yes; then
@@ -8892,7 +14361,7 @@ index 1f9ec8ec580..4a35108ce7c 100755
8892 else 14361 else
8893 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' 14362 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'
8894 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' 14363 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'
8895@@ -9942,7 +10543,7 @@ rm -f core conftest.err conftest.$ac_objext \ 14364@@ -9979,7 +10580,7 @@ rm -f core conftest.err conftest.$ac_objext \
8896 osf4* | osf5*) # as osf3* with the addition of -msym flag 14365 osf4* | osf5*) # as osf3* with the addition of -msym flag
8897 if test "$GCC" = yes; then 14366 if test "$GCC" = yes; then
8898 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' 14367 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
@@ -8901,7 +14370,7 @@ index 1f9ec8ec580..4a35108ce7c 100755
8901 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' 14370 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
8902 else 14371 else
8903 allow_undefined_flag=' -expect_unresolved \*' 14372 allow_undefined_flag=' -expect_unresolved \*'
8904@@ -9961,9 +10562,9 @@ rm -f core conftest.err conftest.$ac_objext \ 14373@@ -9998,9 +10599,9 @@ rm -f core conftest.err conftest.$ac_objext \
8905 no_undefined_flag=' -z defs' 14374 no_undefined_flag=' -z defs'
8906 if test "$GCC" = yes; then 14375 if test "$GCC" = yes; then
8907 wlarc='${wl}' 14376 wlarc='${wl}'
@@ -8913,7 +14382,7 @@ index 1f9ec8ec580..4a35108ce7c 100755
8913 else 14382 else
8914 case `$CC -V 2>&1` in 14383 case `$CC -V 2>&1` in
8915 *"Compilers 5.0"*) 14384 *"Compilers 5.0"*)
8916@@ -10539,8 +11140,9 @@ cygwin* | mingw* | pw32* | cegcc*) 14385@@ -10576,8 +11177,9 @@ cygwin* | mingw* | pw32* | cegcc*)
8917 need_version=no 14386 need_version=no
8918 need_lib_prefix=no 14387 need_lib_prefix=no
8919 14388
@@ -8925,7 +14394,7 @@ index 1f9ec8ec580..4a35108ce7c 100755
8925 library_names_spec='$libname.dll.a' 14394 library_names_spec='$libname.dll.a'
8926 # DLL is installed to $(libdir)/../bin by postinstall_cmds 14395 # DLL is installed to $(libdir)/../bin by postinstall_cmds
8927 postinstall_cmds='base_file=`basename \${file}`~ 14396 postinstall_cmds='base_file=`basename \${file}`~
8928@@ -10573,13 +11175,71 @@ cygwin* | mingw* | pw32* | cegcc*) 14397@@ -10610,13 +11212,71 @@ cygwin* | mingw* | pw32* | cegcc*)
8929 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' 14398 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
8930 ;; 14399 ;;
8931 esac 14400 esac
@@ -8998,16 +14467,16 @@ index 1f9ec8ec580..4a35108ce7c 100755
8998 # FIXME: first we should search . and the directory the executable is in 14467 # FIXME: first we should search . and the directory the executable is in
8999 shlibpath_var=PATH 14468 shlibpath_var=PATH
9000 ;; 14469 ;;
9001@@ -11457,7 +12117,7 @@ else 14470@@ -11494,7 +12154,7 @@ else
9002 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 14471 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
9003 lt_status=$lt_dlunknown 14472 lt_status=$lt_dlunknown
9004 cat > conftest.$ac_ext <<_LT_EOF 14473 cat > conftest.$ac_ext <<_LT_EOF
9005-#line 11457 "configure" 14474-#line 11494 "configure"
9006+#line $LINENO "configure" 14475+#line $LINENO "configure"
9007 #include "confdefs.h" 14476 #include "confdefs.h"
9008 14477
9009 #if HAVE_DLFCN_H 14478 #if HAVE_DLFCN_H
9010@@ -11501,10 +12161,10 @@ else 14479@@ -11538,10 +12198,10 @@ else
9011 /* When -fvisbility=hidden is used, assume the code has been annotated 14480 /* When -fvisbility=hidden is used, assume the code has been annotated
9012 correspondingly for the symbols needed. */ 14481 correspondingly for the symbols needed. */
9013 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 14482 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
@@ -9020,16 +14489,16 @@ index 1f9ec8ec580..4a35108ce7c 100755
9020 int main () 14489 int main ()
9021 { 14490 {
9022 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 14491 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
9023@@ -11563,7 +12223,7 @@ else 14492@@ -11600,7 +12260,7 @@ else
9024 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 14493 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
9025 lt_status=$lt_dlunknown 14494 lt_status=$lt_dlunknown
9026 cat > conftest.$ac_ext <<_LT_EOF 14495 cat > conftest.$ac_ext <<_LT_EOF
9027-#line 11563 "configure" 14496-#line 11600 "configure"
9028+#line $LINENO "configure" 14497+#line $LINENO "configure"
9029 #include "confdefs.h" 14498 #include "confdefs.h"
9030 14499
9031 #if HAVE_DLFCN_H 14500 #if HAVE_DLFCN_H
9032@@ -11607,10 +12267,10 @@ else 14501@@ -11644,10 +12304,10 @@ else
9033 /* When -fvisbility=hidden is used, assume the code has been annotated 14502 /* When -fvisbility=hidden is used, assume the code has been annotated
9034 correspondingly for the symbols needed. */ 14503 correspondingly for the symbols needed. */
9035 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 14504 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
@@ -9042,7 +14511,7 @@ index 1f9ec8ec580..4a35108ce7c 100755
9042 int main () 14511 int main ()
9043 { 14512 {
9044 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 14513 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
9045@@ -12002,6 +12662,7 @@ $RM -r conftest* 14514@@ -12039,6 +12699,7 @@ $RM -r conftest*
9046 14515
9047 # Allow CC to be a program name with arguments. 14516 # Allow CC to be a program name with arguments.
9048 lt_save_CC=$CC 14517 lt_save_CC=$CC
@@ -9050,7 +14519,7 @@ index 1f9ec8ec580..4a35108ce7c 100755
9050 lt_save_LD=$LD 14519 lt_save_LD=$LD
9051 lt_save_GCC=$GCC 14520 lt_save_GCC=$GCC
9052 GCC=$GXX 14521 GCC=$GXX
9053@@ -12019,6 +12680,7 @@ $RM -r conftest* 14522@@ -12056,6 +12717,7 @@ $RM -r conftest*
9054 fi 14523 fi
9055 test -z "${LDCXX+set}" || LD=$LDCXX 14524 test -z "${LDCXX+set}" || LD=$LDCXX
9056 CC=${CXX-"c++"} 14525 CC=${CXX-"c++"}
@@ -9058,7 +14527,7 @@ index 1f9ec8ec580..4a35108ce7c 100755
9058 compiler=$CC 14527 compiler=$CC
9059 compiler_CXX=$CC 14528 compiler_CXX=$CC
9060 for cc_temp in $compiler""; do 14529 for cc_temp in $compiler""; do
9061@@ -12301,7 +12963,13 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie 14530@@ -12338,7 +13000,13 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
9062 allow_undefined_flag_CXX='-berok' 14531 allow_undefined_flag_CXX='-berok'
9063 # Determine the default libpath from the value encoded in an empty 14532 # Determine the default libpath from the value encoded in an empty
9064 # executable. 14533 # executable.
@@ -9073,7 +14542,7 @@ index 1f9ec8ec580..4a35108ce7c 100755
9073 /* end confdefs.h. */ 14542 /* end confdefs.h. */
9074 14543
9075 int 14544 int
9076@@ -12314,22 +12982,29 @@ main () 14545@@ -12351,22 +13019,29 @@ main ()
9077 _ACEOF 14546 _ACEOF
9078 if ac_fn_cxx_try_link "$LINENO"; then : 14547 if ac_fn_cxx_try_link "$LINENO"; then :
9079 14548
@@ -9116,7 +14585,7 @@ index 1f9ec8ec580..4a35108ce7c 100755
9116 14585
9117 hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" 14586 hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
9118 14587
9119@@ -12342,7 +13017,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 14588@@ -12379,7 +13054,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
9120 else 14589 else
9121 # Determine the default libpath from the value encoded in an 14590 # Determine the default libpath from the value encoded in an
9122 # empty executable. 14591 # empty executable.
@@ -9131,7 +14600,7 @@ index 1f9ec8ec580..4a35108ce7c 100755
9131 /* end confdefs.h. */ 14600 /* end confdefs.h. */
9132 14601
9133 int 14602 int
9134@@ -12355,22 +13036,29 @@ main () 14603@@ -12392,22 +13073,29 @@ main ()
9135 _ACEOF 14604 _ACEOF
9136 if ac_fn_cxx_try_link "$LINENO"; then : 14605 if ac_fn_cxx_try_link "$LINENO"; then :
9137 14606
@@ -9174,7 +14643,7 @@ index 1f9ec8ec580..4a35108ce7c 100755
9174 14643
9175 hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" 14644 hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
9176 # Warning - without using the other run time loading flags, 14645 # Warning - without using the other run time loading flags,
9177@@ -12413,29 +13101,75 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 14646@@ -12450,29 +13138,75 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
9178 ;; 14647 ;;
9179 14648
9180 cygwin* | mingw* | pw32* | cegcc*) 14649 cygwin* | mingw* | pw32* | cegcc*)
@@ -9273,7 +14742,7 @@ index 1f9ec8ec580..4a35108ce7c 100755
9273 darwin* | rhapsody*) 14742 darwin* | rhapsody*)
9274 14743
9275 14744
9276@@ -12541,7 +13275,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 14745@@ -12578,7 +13312,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
9277 ;; 14746 ;;
9278 *) 14747 *)
9279 if test "$GXX" = yes; then 14748 if test "$GXX" = yes; then
@@ -9282,7 +14751,7 @@ index 1f9ec8ec580..4a35108ce7c 100755
9282 else 14751 else
9283 # FIXME: insert proper C++ library support 14752 # FIXME: insert proper C++ library support
9284 ld_shlibs_CXX=no 14753 ld_shlibs_CXX=no
9285@@ -12612,10 +13346,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 14754@@ -12649,10 +13383,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
9286 archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' 14755 archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
9287 ;; 14756 ;;
9288 ia64*) 14757 ia64*)
@@ -9295,7 +14764,7 @@ index 1f9ec8ec580..4a35108ce7c 100755
9295 ;; 14764 ;;
9296 esac 14765 esac
9297 fi 14766 fi
9298@@ -12656,9 +13390,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 14767@@ -12693,9 +13427,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
9299 *) 14768 *)
9300 if test "$GXX" = yes; then 14769 if test "$GXX" = yes; then
9301 if test "$with_gnu_ld" = no; then 14770 if test "$with_gnu_ld" = no; then
@@ -9307,7 +14776,7 @@ index 1f9ec8ec580..4a35108ce7c 100755
9307 fi 14776 fi
9308 fi 14777 fi
9309 link_all_deplibs_CXX=yes 14778 link_all_deplibs_CXX=yes
9310@@ -12728,20 +13462,20 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 14779@@ -12765,20 +13499,20 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
9311 prelink_cmds_CXX='tpldir=Template.dir~ 14780 prelink_cmds_CXX='tpldir=Template.dir~
9312 rm -rf $tpldir~ 14781 rm -rf $tpldir~
9313 $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ 14782 $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
@@ -9332,7 +14801,7 @@ index 1f9ec8ec580..4a35108ce7c 100755
9332 ;; 14801 ;;
9333 *) # Version 6 and above use weak symbols 14802 *) # Version 6 and above use weak symbols
9334 archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' 14803 archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
9335@@ -12936,7 +13670,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 14804@@ -12973,7 +13707,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
9336 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' 14805 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'
9337 ;; 14806 ;;
9338 *) 14807 *)
@@ -9341,7 +14810,7 @@ index 1f9ec8ec580..4a35108ce7c 100755
9341 ;; 14810 ;;
9342 esac 14811 esac
9343 14812
9344@@ -12982,7 +13716,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 14813@@ -13019,7 +13753,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
9345 14814
9346 solaris*) 14815 solaris*)
9347 case $cc_basename in 14816 case $cc_basename in
@@ -9350,7 +14819,7 @@ index 1f9ec8ec580..4a35108ce7c 100755
9350 # Sun C++ 4.2, 5.x and Centerline C++ 14819 # Sun C++ 4.2, 5.x and Centerline C++
9351 archive_cmds_need_lc_CXX=yes 14820 archive_cmds_need_lc_CXX=yes
9352 no_undefined_flag_CXX=' -zdefs' 14821 no_undefined_flag_CXX=' -zdefs'
9353@@ -13023,9 +13757,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 14822@@ -13060,9 +13794,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
9354 if test "$GXX" = yes && test "$with_gnu_ld" = no; then 14823 if test "$GXX" = yes && test "$with_gnu_ld" = no; then
9355 no_undefined_flag_CXX=' ${wl}-z ${wl}defs' 14824 no_undefined_flag_CXX=' ${wl}-z ${wl}defs'
9356 if $CC --version | $GREP -v '^2\.7' > /dev/null; then 14825 if $CC --version | $GREP -v '^2\.7' > /dev/null; then
@@ -9362,7 +14831,7 @@ index 1f9ec8ec580..4a35108ce7c 100755
9362 14831
9363 # Commands to make compiler produce verbose output that lists 14832 # Commands to make compiler produce verbose output that lists
9364 # what "hidden" libraries, object files and flags are used when 14833 # what "hidden" libraries, object files and flags are used when
9365@@ -13160,6 +13894,13 @@ private: 14834@@ -13197,6 +13931,13 @@ private:
9366 }; 14835 };
9367 _LT_EOF 14836 _LT_EOF
9368 14837
@@ -9376,7 +14845,7 @@ index 1f9ec8ec580..4a35108ce7c 100755
9376 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 14845 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
9377 (eval $ac_compile) 2>&5 14846 (eval $ac_compile) 2>&5
9378 ac_status=$? 14847 ac_status=$?
9379@@ -13173,7 +13914,7 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 14848@@ -13210,7 +13951,7 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
9380 pre_test_object_deps_done=no 14849 pre_test_object_deps_done=no
9381 14850
9382 for p in `eval "$output_verbose_link_cmd"`; do 14851 for p in `eval "$output_verbose_link_cmd"`; do
@@ -9385,7 +14854,7 @@ index 1f9ec8ec580..4a35108ce7c 100755
9385 14854
9386 -L* | -R* | -l*) 14855 -L* | -R* | -l*)
9387 # Some compilers place space between "-{L,R}" and the path. 14856 # Some compilers place space between "-{L,R}" and the path.
9388@@ -13182,13 +13923,22 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 14857@@ -13219,13 +13960,22 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
9389 test $p = "-R"; then 14858 test $p = "-R"; then
9390 prev=$p 14859 prev=$p
9391 continue 14860 continue
@@ -9412,7 +14881,7 @@ index 1f9ec8ec580..4a35108ce7c 100755
9412 # Internal compiler library paths should come after those 14881 # Internal compiler library paths should come after those
9413 # provided the user. The postdeps already come after the 14882 # provided the user. The postdeps already come after the
9414 # user supplied libs so there is no need to process them. 14883 # user supplied libs so there is no need to process them.
9415@@ -13208,8 +13958,10 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 14884@@ -13245,8 +13995,10 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
9416 postdeps_CXX="${postdeps_CXX} ${prev}${p}" 14885 postdeps_CXX="${postdeps_CXX} ${prev}${p}"
9417 fi 14886 fi
9418 fi 14887 fi
@@ -9423,7 +14892,7 @@ index 1f9ec8ec580..4a35108ce7c 100755
9423 *.$objext) 14892 *.$objext)
9424 # This assumes that the test object file only shows up 14893 # This assumes that the test object file only shows up
9425 # once in the compiler output. 14894 # once in the compiler output.
9426@@ -13245,6 +13997,7 @@ else 14895@@ -13282,6 +14034,7 @@ else
9427 fi 14896 fi
9428 14897
9429 $RM -f confest.$objext 14898 $RM -f confest.$objext
@@ -9431,7 +14900,7 @@ index 1f9ec8ec580..4a35108ce7c 100755
9431 14900
9432 # PORTME: override above test on systems where it is broken 14901 # PORTME: override above test on systems where it is broken
9433 case $host_os in 14902 case $host_os in
9434@@ -13280,7 +14033,7 @@ linux*) 14903@@ -13317,7 +14070,7 @@ linux*)
9435 14904
9436 solaris*) 14905 solaris*)
9437 case $cc_basename in 14906 case $cc_basename in
@@ -9440,7 +14909,7 @@ index 1f9ec8ec580..4a35108ce7c 100755
9440 # The more standards-conforming stlport4 library is 14909 # The more standards-conforming stlport4 library is
9441 # incompatible with the Cstd library. Avoid specifying 14910 # incompatible with the Cstd library. Avoid specifying
9442 # it if it's in CXXFLAGS. Ignore libCrun as 14911 # it if it's in CXXFLAGS. Ignore libCrun as
9443@@ -13345,8 +14098,6 @@ fi 14912@@ -13382,8 +14135,6 @@ fi
9444 lt_prog_compiler_pic_CXX= 14913 lt_prog_compiler_pic_CXX=
9445 lt_prog_compiler_static_CXX= 14914 lt_prog_compiler_static_CXX=
9446 14915
@@ -9449,7 +14918,7 @@ index 1f9ec8ec580..4a35108ce7c 100755
9449 14918
9450 # C++ specific cases for pic, static, wl, etc. 14919 # C++ specific cases for pic, static, wl, etc.
9451 if test "$GXX" = yes; then 14920 if test "$GXX" = yes; then
9452@@ -13451,6 +14202,11 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 14921@@ -13488,6 +14239,11 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
9453 ;; 14922 ;;
9454 esac 14923 esac
9455 ;; 14924 ;;
@@ -9461,7 +14930,7 @@ index 1f9ec8ec580..4a35108ce7c 100755
9461 dgux*) 14930 dgux*)
9462 case $cc_basename in 14931 case $cc_basename in
9463 ec++*) 14932 ec++*)
9464@@ -13603,7 +14359,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 14933@@ -13640,7 +14396,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
9465 ;; 14934 ;;
9466 solaris*) 14935 solaris*)
9467 case $cc_basename in 14936 case $cc_basename in
@@ -9470,7 +14939,7 @@ index 1f9ec8ec580..4a35108ce7c 100755
9470 # Sun C++ 4.2, 5.x and Centerline C++ 14939 # Sun C++ 4.2, 5.x and Centerline C++
9471 lt_prog_compiler_pic_CXX='-KPIC' 14940 lt_prog_compiler_pic_CXX='-KPIC'
9472 lt_prog_compiler_static_CXX='-Bstatic' 14941 lt_prog_compiler_static_CXX='-Bstatic'
9473@@ -13668,10 +14424,17 @@ case $host_os in 14942@@ -13705,10 +14461,17 @@ case $host_os in
9474 lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC" 14943 lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC"
9475 ;; 14944 ;;
9476 esac 14945 esac
@@ -9491,7 +14960,7 @@ index 1f9ec8ec580..4a35108ce7c 100755
9491 14960
9492 # 14961 #
9493 # Check to make sure the PIC flag actually works. 14962 # Check to make sure the PIC flag actually works.
9494@@ -13729,6 +14492,8 @@ fi 14963@@ -13766,6 +14529,8 @@ fi
9495 14964
9496 14965
9497 14966
@@ -9500,7 +14969,7 @@ index 1f9ec8ec580..4a35108ce7c 100755
9500 # 14969 #
9501 # Check to make sure the static flag actually works. 14970 # Check to make sure the static flag actually works.
9502 # 14971 #
9503@@ -13906,6 +14671,7 @@ fi 14972@@ -13943,6 +14708,7 @@ fi
9504 $as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } 14973 $as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
9505 14974
9506 export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' 14975 export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
@@ -9508,7 +14977,7 @@ index 1f9ec8ec580..4a35108ce7c 100755
9508 case $host_os in 14977 case $host_os in
9509 aix[4-9]*) 14978 aix[4-9]*)
9510 # If we're using GNU nm, then we don't want the "-C" option. 14979 # If we're using GNU nm, then we don't want the "-C" option.
9511@@ -13920,15 +14686,20 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie 14980@@ -13957,15 +14723,20 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
9512 ;; 14981 ;;
9513 pw32*) 14982 pw32*)
9514 export_symbols_cmds_CXX="$ltdll_cmds" 14983 export_symbols_cmds_CXX="$ltdll_cmds"
@@ -9534,7 +15003,7 @@ index 1f9ec8ec580..4a35108ce7c 100755
9534 15003
9535 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5 15004 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5
9536 $as_echo "$ld_shlibs_CXX" >&6; } 15005 $as_echo "$ld_shlibs_CXX" >&6; }
9537@@ -14191,8 +14962,9 @@ cygwin* | mingw* | pw32* | cegcc*) 15006@@ -14228,8 +14999,9 @@ cygwin* | mingw* | pw32* | cegcc*)
9538 need_version=no 15007 need_version=no
9539 need_lib_prefix=no 15008 need_lib_prefix=no
9540 15009
@@ -9546,7 +15015,7 @@ index 1f9ec8ec580..4a35108ce7c 100755
9546 library_names_spec='$libname.dll.a' 15015 library_names_spec='$libname.dll.a'
9547 # DLL is installed to $(libdir)/../bin by postinstall_cmds 15016 # DLL is installed to $(libdir)/../bin by postinstall_cmds
9548 postinstall_cmds='base_file=`basename \${file}`~ 15017 postinstall_cmds='base_file=`basename \${file}`~
9549@@ -14224,13 +14996,71 @@ cygwin* | mingw* | pw32* | cegcc*) 15018@@ -14261,13 +15033,71 @@ cygwin* | mingw* | pw32* | cegcc*)
9550 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' 15019 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
9551 ;; 15020 ;;
9552 esac 15021 esac
@@ -9619,7 +15088,7 @@ index 1f9ec8ec580..4a35108ce7c 100755
9619 # FIXME: first we should search . and the directory the executable is in 15088 # FIXME: first we should search . and the directory the executable is in
9620 shlibpath_var=PATH 15089 shlibpath_var=PATH
9621 ;; 15090 ;;
9622@@ -14770,6 +15600,7 @@ fi 15091@@ -14807,6 +15637,7 @@ fi
9623 fi # test -n "$compiler" 15092 fi # test -n "$compiler"
9624 15093
9625 CC=$lt_save_CC 15094 CC=$lt_save_CC
@@ -9627,7 +15096,7 @@ index 1f9ec8ec580..4a35108ce7c 100755
9627 LDCXX=$LD 15096 LDCXX=$LD
9628 LD=$lt_save_LD 15097 LD=$lt_save_LD
9629 GCC=$lt_save_GCC 15098 GCC=$lt_save_GCC
9630@@ -17830,13 +18661,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' 15099@@ -18172,13 +19003,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
9631 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' 15100 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
9632 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' 15101 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
9633 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' 15102 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
@@ -9648,7 +15117,7 @@ index 1f9ec8ec580..4a35108ce7c 100755
9648 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' 15117 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
9649 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' 15118 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
9650 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' 15119 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
9651@@ -17851,14 +18689,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de 15120@@ -18193,14 +19031,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de
9652 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' 15121 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
9653 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' 15122 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
9654 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"`' 15123 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"`'
@@ -9667,7 +15136,7 @@ index 1f9ec8ec580..4a35108ce7c 100755
9667 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' 15136 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
9668 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' 15137 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
9669 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' 15138 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
9670@@ -17891,12 +18732,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q 15139@@ -18233,12 +19074,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q
9671 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' 15140 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
9672 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' 15141 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
9673 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' 15142 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
@@ -9681,7 +15150,7 @@ index 1f9ec8ec580..4a35108ce7c 100755
9681 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' 15150 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
9682 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' 15151 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
9683 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' 15152 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
9684@@ -17935,8 +18776,8 @@ old_archive_cmds_CXX='`$ECHO "$old_archive_cmds_CXX" | $SED "$delay_single_quote 15153@@ -18277,8 +19118,8 @@ old_archive_cmds_CXX='`$ECHO "$old_archive_cmds_CXX" | $SED "$delay_single_quote
9685 compiler_CXX='`$ECHO "$compiler_CXX" | $SED "$delay_single_quote_subst"`' 15154 compiler_CXX='`$ECHO "$compiler_CXX" | $SED "$delay_single_quote_subst"`'
9686 GCC_CXX='`$ECHO "$GCC_CXX" | $SED "$delay_single_quote_subst"`' 15155 GCC_CXX='`$ECHO "$GCC_CXX" | $SED "$delay_single_quote_subst"`'
9687 lt_prog_compiler_no_builtin_flag_CXX='`$ECHO "$lt_prog_compiler_no_builtin_flag_CXX" | $SED "$delay_single_quote_subst"`' 15156 lt_prog_compiler_no_builtin_flag_CXX='`$ECHO "$lt_prog_compiler_no_builtin_flag_CXX" | $SED "$delay_single_quote_subst"`'
@@ -9691,7 +15160,7 @@ index 1f9ec8ec580..4a35108ce7c 100755
9691 lt_prog_compiler_static_CXX='`$ECHO "$lt_prog_compiler_static_CXX" | $SED "$delay_single_quote_subst"`' 15160 lt_prog_compiler_static_CXX='`$ECHO "$lt_prog_compiler_static_CXX" | $SED "$delay_single_quote_subst"`'
9692 lt_cv_prog_compiler_c_o_CXX='`$ECHO "$lt_cv_prog_compiler_c_o_CXX" | $SED "$delay_single_quote_subst"`' 15161 lt_cv_prog_compiler_c_o_CXX='`$ECHO "$lt_cv_prog_compiler_c_o_CXX" | $SED "$delay_single_quote_subst"`'
9693 archive_cmds_need_lc_CXX='`$ECHO "$archive_cmds_need_lc_CXX" | $SED "$delay_single_quote_subst"`' 15162 archive_cmds_need_lc_CXX='`$ECHO "$archive_cmds_need_lc_CXX" | $SED "$delay_single_quote_subst"`'
9694@@ -17963,12 +18804,12 @@ hardcode_shlibpath_var_CXX='`$ECHO "$hardcode_shlibpath_var_CXX" | $SED "$delay_ 15163@@ -18305,12 +19146,12 @@ hardcode_shlibpath_var_CXX='`$ECHO "$hardcode_shlibpath_var_CXX" | $SED "$delay_
9695 hardcode_automatic_CXX='`$ECHO "$hardcode_automatic_CXX" | $SED "$delay_single_quote_subst"`' 15164 hardcode_automatic_CXX='`$ECHO "$hardcode_automatic_CXX" | $SED "$delay_single_quote_subst"`'
9696 inherit_rpath_CXX='`$ECHO "$inherit_rpath_CXX" | $SED "$delay_single_quote_subst"`' 15165 inherit_rpath_CXX='`$ECHO "$inherit_rpath_CXX" | $SED "$delay_single_quote_subst"`'
9697 link_all_deplibs_CXX='`$ECHO "$link_all_deplibs_CXX" | $SED "$delay_single_quote_subst"`' 15166 link_all_deplibs_CXX='`$ECHO "$link_all_deplibs_CXX" | $SED "$delay_single_quote_subst"`'
@@ -9705,7 +15174,7 @@ index 1f9ec8ec580..4a35108ce7c 100755
9705 file_list_spec_CXX='`$ECHO "$file_list_spec_CXX" | $SED "$delay_single_quote_subst"`' 15174 file_list_spec_CXX='`$ECHO "$file_list_spec_CXX" | $SED "$delay_single_quote_subst"`'
9706 hardcode_action_CXX='`$ECHO "$hardcode_action_CXX" | $SED "$delay_single_quote_subst"`' 15175 hardcode_action_CXX='`$ECHO "$hardcode_action_CXX" | $SED "$delay_single_quote_subst"`'
9707 compiler_lib_search_dirs_CXX='`$ECHO "$compiler_lib_search_dirs_CXX" | $SED "$delay_single_quote_subst"`' 15176 compiler_lib_search_dirs_CXX='`$ECHO "$compiler_lib_search_dirs_CXX" | $SED "$delay_single_quote_subst"`'
9708@@ -18006,8 +18847,13 @@ reload_flag \ 15177@@ -18348,8 +19189,13 @@ reload_flag \
9709 OBJDUMP \ 15178 OBJDUMP \
9710 deplibs_check_method \ 15179 deplibs_check_method \
9711 file_magic_cmd \ 15180 file_magic_cmd \
@@ -9719,7 +15188,7 @@ index 1f9ec8ec580..4a35108ce7c 100755
9719 STRIP \ 15188 STRIP \
9720 RANLIB \ 15189 RANLIB \
9721 CC \ 15190 CC \
9722@@ -18017,12 +18863,14 @@ lt_cv_sys_global_symbol_pipe \ 15191@@ -18359,12 +19205,14 @@ lt_cv_sys_global_symbol_pipe \
9723 lt_cv_sys_global_symbol_to_cdecl \ 15192 lt_cv_sys_global_symbol_to_cdecl \
9724 lt_cv_sys_global_symbol_to_c_name_address \ 15193 lt_cv_sys_global_symbol_to_c_name_address \
9725 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ 15194 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
@@ -9735,7 +15204,7 @@ index 1f9ec8ec580..4a35108ce7c 100755
9735 DSYMUTIL \ 15204 DSYMUTIL \
9736 NMEDIT \ 15205 NMEDIT \
9737 LIPO \ 15206 LIPO \
9738@@ -18038,7 +18886,6 @@ no_undefined_flag \ 15207@@ -18380,7 +19228,6 @@ no_undefined_flag \
9739 hardcode_libdir_flag_spec \ 15208 hardcode_libdir_flag_spec \
9740 hardcode_libdir_flag_spec_ld \ 15209 hardcode_libdir_flag_spec_ld \
9741 hardcode_libdir_separator \ 15210 hardcode_libdir_separator \
@@ -9743,7 +15212,7 @@ index 1f9ec8ec580..4a35108ce7c 100755
9743 exclude_expsyms \ 15212 exclude_expsyms \
9744 include_expsyms \ 15213 include_expsyms \
9745 file_list_spec \ 15214 file_list_spec \
9746@@ -18060,8 +18907,8 @@ LD_CXX \ 15215@@ -18402,8 +19249,8 @@ LD_CXX \
9747 reload_flag_CXX \ 15216 reload_flag_CXX \
9748 compiler_CXX \ 15217 compiler_CXX \
9749 lt_prog_compiler_no_builtin_flag_CXX \ 15218 lt_prog_compiler_no_builtin_flag_CXX \
@@ -9753,7 +15222,7 @@ index 1f9ec8ec580..4a35108ce7c 100755
9753 lt_prog_compiler_static_CXX \ 15222 lt_prog_compiler_static_CXX \
9754 lt_cv_prog_compiler_c_o_CXX \ 15223 lt_cv_prog_compiler_c_o_CXX \
9755 export_dynamic_flag_spec_CXX \ 15224 export_dynamic_flag_spec_CXX \
9756@@ -18073,7 +18920,6 @@ no_undefined_flag_CXX \ 15225@@ -18415,7 +19262,6 @@ no_undefined_flag_CXX \
9757 hardcode_libdir_flag_spec_CXX \ 15226 hardcode_libdir_flag_spec_CXX \
9758 hardcode_libdir_flag_spec_ld_CXX \ 15227 hardcode_libdir_flag_spec_ld_CXX \
9759 hardcode_libdir_separator_CXX \ 15228 hardcode_libdir_separator_CXX \
@@ -9761,7 +15230,7 @@ index 1f9ec8ec580..4a35108ce7c 100755
9761 exclude_expsyms_CXX \ 15230 exclude_expsyms_CXX \
9762 include_expsyms_CXX \ 15231 include_expsyms_CXX \
9763 file_list_spec_CXX \ 15232 file_list_spec_CXX \
9764@@ -18107,6 +18953,7 @@ module_cmds \ 15233@@ -18449,6 +19295,7 @@ module_cmds \
9765 module_expsym_cmds \ 15234 module_expsym_cmds \
9766 export_symbols_cmds \ 15235 export_symbols_cmds \
9767 prelink_cmds \ 15236 prelink_cmds \
@@ -9769,7 +15238,7 @@ index 1f9ec8ec580..4a35108ce7c 100755
9769 postinstall_cmds \ 15238 postinstall_cmds \
9770 postuninstall_cmds \ 15239 postuninstall_cmds \
9771 finish_cmds \ 15240 finish_cmds \
9772@@ -18121,7 +18968,8 @@ archive_expsym_cmds_CXX \ 15241@@ -18463,7 +19310,8 @@ archive_expsym_cmds_CXX \
9773 module_cmds_CXX \ 15242 module_cmds_CXX \
9774 module_expsym_cmds_CXX \ 15243 module_expsym_cmds_CXX \
9775 export_symbols_cmds_CXX \ 15244 export_symbols_cmds_CXX \
@@ -9779,7 +15248,7 @@ index 1f9ec8ec580..4a35108ce7c 100755
9779 case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in 15248 case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
9780 *[\\\\\\\`\\"\\\$]*) 15249 *[\\\\\\\`\\"\\\$]*)
9781 eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" 15250 eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
9782@@ -18886,7 +19734,8 @@ $as_echo X"$file" | 15251@@ -19228,7 +20076,8 @@ $as_echo X"$file" |
9783 # NOTE: Changes made to this file will be lost: look at ltmain.sh. 15252 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
9784 # 15253 #
9785 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 15254 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
@@ -9789,7 +15258,7 @@ index 1f9ec8ec580..4a35108ce7c 100755
9789 # Written by Gordon Matzigkeit, 1996 15258 # Written by Gordon Matzigkeit, 1996
9790 # 15259 #
9791 # This file is part of GNU Libtool. 15260 # This file is part of GNU Libtool.
9792@@ -18989,19 +19838,42 @@ SP2NL=$lt_lt_SP2NL 15261@@ -19331,19 +20180,42 @@ SP2NL=$lt_lt_SP2NL
9793 # turn newlines into spaces. 15262 # turn newlines into spaces.
9794 NL2SP=$lt_lt_NL2SP 15263 NL2SP=$lt_lt_NL2SP
9795 15264
@@ -9833,7 +15302,7 @@ index 1f9ec8ec580..4a35108ce7c 100755
9833 # A symbol stripping program. 15302 # A symbol stripping program.
9834 STRIP=$lt_STRIP 15303 STRIP=$lt_STRIP
9835 15304
9836@@ -19031,6 +19903,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address 15305@@ -19373,6 +20245,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
9837 # Transform the output of nm in a C name address pair when lib prefix is needed. 15306 # Transform the output of nm in a C name address pair when lib prefix is needed.
9838 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix 15307 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
9839 15308
@@ -9846,7 +15315,7 @@ index 1f9ec8ec580..4a35108ce7c 100755
9846 # The name of the directory that contains temporary libtool files. 15315 # The name of the directory that contains temporary libtool files.
9847 objdir=$objdir 15316 objdir=$objdir
9848 15317
9849@@ -19040,6 +19918,9 @@ MAGIC_CMD=$MAGIC_CMD 15318@@ -19382,6 +20260,9 @@ MAGIC_CMD=$MAGIC_CMD
9850 # Must we lock files when doing compilation? 15319 # Must we lock files when doing compilation?
9851 need_locks=$lt_need_locks 15320 need_locks=$lt_need_locks
9852 15321
@@ -9856,7 +15325,7 @@ index 1f9ec8ec580..4a35108ce7c 100755
9856 # Tool to manipulate archived DWARF debug symbol files on Mac OS X. 15325 # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
9857 DSYMUTIL=$lt_DSYMUTIL 15326 DSYMUTIL=$lt_DSYMUTIL
9858 15327
9859@@ -19154,12 +20035,12 @@ with_gcc=$GCC 15328@@ -19496,12 +20377,12 @@ with_gcc=$GCC
9860 # Compiler flag to turn off builtin functions. 15329 # Compiler flag to turn off builtin functions.
9861 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag 15330 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
9862 15331
@@ -9872,7 +15341,7 @@ index 1f9ec8ec580..4a35108ce7c 100755
9872 # Compiler flag to prevent dynamic linking. 15341 # Compiler flag to prevent dynamic linking.
9873 link_static_flag=$lt_lt_prog_compiler_static 15342 link_static_flag=$lt_lt_prog_compiler_static
9874 15343
9875@@ -19246,9 +20127,6 @@ inherit_rpath=$inherit_rpath 15344@@ -19588,9 +20469,6 @@ inherit_rpath=$inherit_rpath
9876 # Whether libtool must link a program against all its dependency libraries. 15345 # Whether libtool must link a program against all its dependency libraries.
9877 link_all_deplibs=$link_all_deplibs 15346 link_all_deplibs=$link_all_deplibs
9878 15347
@@ -9882,7 +15351,7 @@ index 1f9ec8ec580..4a35108ce7c 100755
9882 # Set to "yes" if exported symbols are required. 15351 # Set to "yes" if exported symbols are required.
9883 always_export_symbols=$always_export_symbols 15352 always_export_symbols=$always_export_symbols
9884 15353
9885@@ -19264,6 +20142,9 @@ include_expsyms=$lt_include_expsyms 15354@@ -19606,6 +20484,9 @@ include_expsyms=$lt_include_expsyms
9886 # Commands necessary for linking programs (against libraries) with templates. 15355 # Commands necessary for linking programs (against libraries) with templates.
9887 prelink_cmds=$lt_prelink_cmds 15356 prelink_cmds=$lt_prelink_cmds
9888 15357
@@ -9892,7 +15361,7 @@ index 1f9ec8ec580..4a35108ce7c 100755
9892 # Specify filename containing input files. 15361 # Specify filename containing input files.
9893 file_list_spec=$lt_file_list_spec 15362 file_list_spec=$lt_file_list_spec
9894 15363
9895@@ -19310,210 +20191,169 @@ ltmain="$ac_aux_dir/ltmain.sh" 15364@@ -19652,210 +20533,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
9896 # if finds mixed CR/LF and LF-only lines. Since sed operates in 15365 # if finds mixed CR/LF and LF-only lines. Since sed operates in
9897 # text mode, it properly converts lines to CR/LF. This bash problem 15366 # text mode, it properly converts lines to CR/LF. This bash problem
9898 # is reportedly fixed, but why not run on old versions too? 15367 # is reportedly fixed, but why not run on old versions too?
@@ -10266,7 +15735,7 @@ index 1f9ec8ec580..4a35108ce7c 100755
10266 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") 15735 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
10267 chmod +x "$ofile" 15736 chmod +x "$ofile"
10268 15737
10269@@ -19541,12 +20381,12 @@ with_gcc=$GCC_CXX 15738@@ -19883,12 +20723,12 @@ with_gcc=$GCC_CXX
10270 # Compiler flag to turn off builtin functions. 15739 # Compiler flag to turn off builtin functions.
10271 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX 15740 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX
10272 15741
@@ -10282,7 +15751,7 @@ index 1f9ec8ec580..4a35108ce7c 100755
10282 # Compiler flag to prevent dynamic linking. 15751 # Compiler flag to prevent dynamic linking.
10283 link_static_flag=$lt_lt_prog_compiler_static_CXX 15752 link_static_flag=$lt_lt_prog_compiler_static_CXX
10284 15753
10285@@ -19633,9 +20473,6 @@ inherit_rpath=$inherit_rpath_CXX 15754@@ -19975,9 +20815,6 @@ inherit_rpath=$inherit_rpath_CXX
10286 # Whether libtool must link a program against all its dependency libraries. 15755 # Whether libtool must link a program against all its dependency libraries.
10287 link_all_deplibs=$link_all_deplibs_CXX 15756 link_all_deplibs=$link_all_deplibs_CXX
10288 15757
@@ -10292,7 +15761,7 @@ index 1f9ec8ec580..4a35108ce7c 100755
10292 # Set to "yes" if exported symbols are required. 15761 # Set to "yes" if exported symbols are required.
10293 always_export_symbols=$always_export_symbols_CXX 15762 always_export_symbols=$always_export_symbols_CXX
10294 15763
10295@@ -19651,6 +20488,9 @@ include_expsyms=$lt_include_expsyms_CXX 15764@@ -19993,6 +20830,9 @@ include_expsyms=$lt_include_expsyms_CXX
10296 # Commands necessary for linking programs (against libraries) with templates. 15765 # Commands necessary for linking programs (against libraries) with templates.
10297 prelink_cmds=$lt_prelink_cmds_CXX 15766 prelink_cmds=$lt_prelink_cmds_CXX
10298 15767
@@ -10302,8 +15771,36 @@ index 1f9ec8ec580..4a35108ce7c 100755
10302 # Specify filename containing input files. 15771 # Specify filename containing input files.
10303 file_list_spec=$lt_file_list_spec_CXX 15772 file_list_spec=$lt_file_list_spec_CXX
10304 15773
15774diff --git a/libbacktrace/Makefile.in b/libbacktrace/Makefile.in
15775index e6a4c8e2ef3..3547e3649b7 100644
15776--- a/libbacktrace/Makefile.in
15777+++ b/libbacktrace/Makefile.in
15778@@ -827,6 +827,7 @@ CPP = @CPP@
15779 CPPFLAGS = @CPPFLAGS@
15780 CYGPATH_W = @CYGPATH_W@
15781 DEFS = @DEFS@
15782+DLLTOOL = @DLLTOOL@
15783 DSYMUTIL = @DSYMUTIL@
15784 DUMPBIN = @DUMPBIN@
15785 DWZ = @DWZ@
15786@@ -854,6 +855,7 @@ LN_S = @LN_S@
15787 LTLIBOBJS = @LTLIBOBJS@
15788 MAINT = @MAINT@
15789 MAKEINFO = @MAKEINFO@
15790+MANIFEST_TOOL = @MANIFEST_TOOL@
15791 MKDIR_P = @MKDIR_P@
15792 NM = @NM@
15793 NMEDIT = @NMEDIT@
15794@@ -886,6 +888,7 @@ abs_builddir = @abs_builddir@
15795 abs_srcdir = @abs_srcdir@
15796 abs_top_builddir = @abs_top_builddir@
15797 abs_top_srcdir = @abs_top_srcdir@
15798+ac_ct_AR = @ac_ct_AR@
15799 ac_ct_CC = @ac_ct_CC@
15800 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
15801 am__leading_dot = @am__leading_dot@
10305diff --git a/libbacktrace/configure b/libbacktrace/configure 15802diff --git a/libbacktrace/configure b/libbacktrace/configure
10306index a2f33c0f35d..90667680701 100755 15803index 406b67b8cbc..b648da40aab 100755
10307--- a/libbacktrace/configure 15804--- a/libbacktrace/configure
10308+++ b/libbacktrace/configure 15805+++ b/libbacktrace/configure
10309@@ -680,7 +680,10 @@ OTOOL 15806@@ -680,7 +680,10 @@ OTOOL
@@ -10354,99 +15851,7 @@ index a2f33c0f35d..90667680701 100755
10354 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then 15851 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
10355 ECHO='print -r --' 15852 ECHO='print -r --'
10356 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then 15853 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
10357@@ -5818,48 +5824,49 @@ if ${lt_cv_path_NM+:} false; then : 15854@@ -6180,8 +6186,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6;
10358 $as_echo_n "(cached) " >&6
10359 else
10360 if test -n "$NM"; then
10361- # Let the user override the test.
10362- lt_cv_path_NM="$NM"
10363-else
10364- lt_nm_to_check="${ac_tool_prefix}nm"
10365- if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
10366- lt_nm_to_check="$lt_nm_to_check nm"
10367- fi
10368- for lt_tmp_nm in $lt_nm_to_check; do
10369- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
10370- for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
10371- IFS="$lt_save_ifs"
10372- test -z "$ac_dir" && ac_dir=.
10373- tmp_nm="$ac_dir/$lt_tmp_nm"
10374- if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
10375- # Check to see if the nm accepts a BSD-compat flag.
10376- # Adding the `sed 1q' prevents false positives on HP-UX, which says:
10377- # nm: unknown option "B" ignored
10378- # Tru64's nm complains that /dev/null is an invalid object file
10379- case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
10380- */dev/null* | *'Invalid file or object type'*)
10381- lt_cv_path_NM="$tmp_nm -B"
10382- break
10383- ;;
10384- *)
10385- case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
10386- */dev/null*)
10387- lt_cv_path_NM="$tmp_nm -p"
10388- break
10389- ;;
10390- *)
10391- lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
10392- continue # so that we can try to find one that supports BSD flags
10393- ;;
10394- esac
10395- ;;
10396- esac
10397- fi
10398- done
10399- IFS="$lt_save_ifs"
10400- done
10401- : ${lt_cv_path_NM=no}
10402-fi
10403+ # Let the user override the nm to test.
10404+ lt_nm_to_check="$NM"
10405+ else
10406+ lt_nm_to_check="${ac_tool_prefix}nm"
10407+ if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
10408+ lt_nm_to_check="$lt_nm_to_check nm"
10409+ fi
10410+ fi
10411+ for lt_tmp_nm in $lt_nm_to_check; do
10412+ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
10413+ for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
10414+ IFS="$lt_save_ifs"
10415+ test -z "$ac_dir" && ac_dir=.
10416+ case "$lt_tmp_nm" in
10417+ */*|*\\*) tmp_nm="$lt_tmp_nm";;
10418+ *) tmp_nm="$ac_dir/$lt_tmp_nm";;
10419+ esac
10420+ if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
10421+ # Check to see if the nm accepts a BSD-compat flag.
10422+ # Adding the `sed 1q' prevents false positives on HP-UX, which says:
10423+ # nm: unknown option "B" ignored
10424+ case `"$tmp_nm" -B "$tmp_nm" 2>&1 | grep -v '^ *$' | sed '1q'` in
10425+ *$tmp_nm*) lt_cv_path_NM="$tmp_nm -B"
10426+ break
10427+ ;;
10428+ *)
10429+ case `"$tmp_nm" -p "$tmp_nm" 2>&1 | grep -v '^ *$' | sed '1q'` in
10430+ *$tmp_nm*)
10431+ lt_cv_path_NM="$tmp_nm -p"
10432+ break
10433+ ;;
10434+ *)
10435+ lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
10436+ continue # so that we can try to find one that supports BSD flags
10437+ ;;
10438+ esac
10439+ ;;
10440+ esac
10441+ fi
10442+ done
10443+ IFS="$lt_save_ifs"
10444+ done
10445+ : ${lt_cv_path_NM=no}
10446 fi
10447 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5
10448 $as_echo "$lt_cv_path_NM" >&6; }
10449@@ -6173,8 +6180,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6;
10450 # Try some XSI features 15855 # Try some XSI features
10451 xsi_shell=no 15856 xsi_shell=no
10452 ( _lt_dummy="a/b/c" 15857 ( _lt_dummy="a/b/c"
@@ -10457,7 +15862,7 @@ index a2f33c0f35d..90667680701 100755
10457 && eval 'test $(( 1 + 1 )) -eq 2 \ 15862 && eval 'test $(( 1 + 1 )) -eq 2 \
10458 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ 15863 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
10459 && xsi_shell=yes 15864 && xsi_shell=yes
10460@@ -6223,6 +6230,80 @@ esac 15865@@ -6230,6 +6236,80 @@ esac
10461 15866
10462 15867
10463 15868
@@ -10538,7 +15943,7 @@ index a2f33c0f35d..90667680701 100755
10538 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 15943 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
10539 $as_echo_n "checking for $LD option to reload object files... " >&6; } 15944 $as_echo_n "checking for $LD option to reload object files... " >&6; }
10540 if ${lt_cv_ld_reload_flag+:} false; then : 15945 if ${lt_cv_ld_reload_flag+:} false; then :
10541@@ -6239,6 +6320,11 @@ case $reload_flag in 15946@@ -6246,6 +6326,11 @@ case $reload_flag in
10542 esac 15947 esac
10543 reload_cmds='$LD$reload_flag -o $output$reload_objs' 15948 reload_cmds='$LD$reload_flag -o $output$reload_objs'
10544 case $host_os in 15949 case $host_os in
@@ -10550,7 +15955,7 @@ index a2f33c0f35d..90667680701 100755
10550 darwin*) 15955 darwin*)
10551 if test "$GCC" = yes; then 15956 if test "$GCC" = yes; then
10552 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' 15957 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
10553@@ -6407,7 +6493,8 @@ mingw* | pw32*) 15958@@ -6414,7 +6499,8 @@ mingw* | pw32*)
10554 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' 15959 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
10555 lt_cv_file_magic_cmd='func_win32_libid' 15960 lt_cv_file_magic_cmd='func_win32_libid'
10556 else 15961 else
@@ -10560,16 +15965,7 @@ index a2f33c0f35d..90667680701 100755
10560 lt_cv_file_magic_cmd='$OBJDUMP -f' 15965 lt_cv_file_magic_cmd='$OBJDUMP -f'
10561 fi 15966 fi
10562 ;; 15967 ;;
10563@@ -6480,7 +6567,7 @@ irix5* | irix6* | nonstopux*) 15968@@ -6568,6 +6654,21 @@ esac
10564 ;;
10565
10566 # This must be Linux ELF.
10567-linux* | k*bsd*-gnu | kopensolaris*-gnu | uclinuxfdpiceabi)
10568+linux* | k*bsd*-gnu | kopensolaris*-gnu)
10569 lt_cv_deplibs_check_method=pass_all
10570 ;;
10571
10572@@ -6561,6 +6648,21 @@ esac
10573 fi 15969 fi
10574 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 15970 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
10575 $as_echo "$lt_cv_deplibs_check_method" >&6; } 15971 $as_echo "$lt_cv_deplibs_check_method" >&6; }
@@ -10591,7 +15987,7 @@ index a2f33c0f35d..90667680701 100755
10591 file_magic_cmd=$lt_cv_file_magic_cmd 15987 file_magic_cmd=$lt_cv_file_magic_cmd
10592 deplibs_check_method=$lt_cv_deplibs_check_method 15988 deplibs_check_method=$lt_cv_deplibs_check_method
10593 test -z "$deplibs_check_method" && deplibs_check_method=unknown 15989 test -z "$deplibs_check_method" && deplibs_check_method=unknown
10594@@ -6574,11 +6676,177 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown 15990@@ -6583,6 +6684,157 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
10595 15991
10596 15992
10597 15993
@@ -10605,11 +16001,7 @@ index a2f33c0f35d..90667680701 100755
10605+ 16001+
10606+ 16002+
10607+ 16003+
10608 16004+if test -n "$ac_tool_prefix"; then
10609
10610 if test -n "$ac_tool_prefix"; then
10611- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
10612-set dummy ${ac_tool_prefix}ar; ac_word=$2
10613+ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. 16005+ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
10614+set dummy ${ac_tool_prefix}dlltool; ac_word=$2 16006+set dummy ${ac_tool_prefix}dlltool; ac_word=$2
10615+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 16007+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
@@ -10750,20 +16142,15 @@ index a2f33c0f35d..90667680701 100755
10750+ 16142+
10751+ 16143+
10752+ 16144+
10753+plugin_option= 16145 plugin_option=
10754+plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll" 16146 plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll"
10755+for plugin in $plugin_names; do 16147 for plugin in $plugin_names; do
10756+ plugin_so=`${CC} ${CFLAGS} --print-prog-name $plugin` 16148@@ -6597,8 +6849,10 @@ for plugin in $plugin_names; do
10757+ if test x$plugin_so = x$plugin; then 16149 done
10758+ plugin_so=`${CC} ${CFLAGS} --print-file-name $plugin` 16150
10759+ fi 16151 if test -n "$ac_tool_prefix"; then
10760+ if test x$plugin_so != x$plugin; then 16152- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
10761+ plugin_option="--plugin $plugin_so" 16153-set dummy ${ac_tool_prefix}ar; ac_word=$2
10762+ break
10763+ fi
10764+done
10765+
10766+if test -n "$ac_tool_prefix"; then
10767+ for ac_prog in ar 16154+ for ac_prog in ar
10768+ do 16155+ do
10769+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. 16156+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
@@ -10771,7 +16158,7 @@ index a2f33c0f35d..90667680701 100755
10771 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 16158 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
10772 $as_echo_n "checking for $ac_word... " >&6; } 16159 $as_echo_n "checking for $ac_word... " >&6; }
10773 if ${ac_cv_prog_AR+:} false; then : 16160 if ${ac_cv_prog_AR+:} false; then :
10774@@ -6594,7 +6862,7 @@ do 16161@@ -6614,7 +6868,7 @@ do
10775 test -z "$as_dir" && as_dir=. 16162 test -z "$as_dir" && as_dir=.
10776 for ac_exec_ext in '' $ac_executable_extensions; do 16163 for ac_exec_ext in '' $ac_executable_extensions; do
10777 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 16164 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
@@ -10780,7 +16167,7 @@ index a2f33c0f35d..90667680701 100755
10780 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 16167 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
10781 break 2 16168 break 2
10782 fi 16169 fi
10783@@ -6614,11 +6882,15 @@ $as_echo "no" >&6; } 16170@@ -6634,11 +6888,15 @@ $as_echo "no" >&6; }
10784 fi 16171 fi
10785 16172
10786 16173
@@ -10799,7 +16186,7 @@ index a2f33c0f35d..90667680701 100755
10799 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 16186 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
10800 $as_echo_n "checking for $ac_word... " >&6; } 16187 $as_echo_n "checking for $ac_word... " >&6; }
10801 if ${ac_cv_prog_ac_ct_AR+:} false; then : 16188 if ${ac_cv_prog_ac_ct_AR+:} false; then :
10802@@ -6634,7 +6906,7 @@ do 16189@@ -6654,7 +6912,7 @@ do
10803 test -z "$as_dir" && as_dir=. 16190 test -z "$as_dir" && as_dir=.
10804 for ac_exec_ext in '' $ac_executable_extensions; do 16191 for ac_exec_ext in '' $ac_executable_extensions; do
10805 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 16192 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
@@ -10808,7 +16195,7 @@ index a2f33c0f35d..90667680701 100755
10808 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 16195 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
10809 break 2 16196 break 2
10810 fi 16197 fi
10811@@ -6653,6 +6925,10 @@ else 16198@@ -6673,6 +6931,10 @@ else
10812 $as_echo "no" >&6; } 16199 $as_echo "no" >&6; }
10813 fi 16200 fi
10814 16201
@@ -10819,7 +16206,7 @@ index a2f33c0f35d..90667680701 100755
10819 if test "x$ac_ct_AR" = x; then 16206 if test "x$ac_ct_AR" = x; then
10820 AR="false" 16207 AR="false"
10821 else 16208 else
10822@@ -6664,12 +6940,21 @@ ac_tool_warned=yes ;; 16209@@ -6684,25 +6946,19 @@ ac_tool_warned=yes ;;
10823 esac 16210 esac
10824 AR=$ac_ct_AR 16211 AR=$ac_ct_AR
10825 fi 16212 fi
@@ -10828,24 +16215,33 @@ index a2f33c0f35d..90667680701 100755
10828 fi 16215 fi
10829 16216
10830-test -z "$AR" && AR=ar 16217-test -z "$AR" && AR=ar
10831-test -z "$AR_FLAGS" && AR_FLAGS=cru 16218-if test -n "$plugin_option"; then
16219- if $AR --help 2>&1 | grep -q "\--plugin"; then
16220- touch conftest.c
16221- $AR $plugin_option rc conftest.a conftest.c
16222- if test "$?" != 0; then
16223- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5
10832+ touch conftest.c 16224+ touch conftest.c
10833+ $AR $plugin_option rc conftest.a conftest.c 16225+ $AR $plugin_option rc conftest.a conftest.c
10834+ if test "$?" != 0; then 16226+ if test "$?" != 0; then
10835+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5 16227+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5
10836+$as_echo "$as_me: WARNING: Failed: $AR $plugin_option rc" >&2;} 16228 $as_echo "$as_me: WARNING: Failed: $AR $plugin_option rc" >&2;}
16229- else
16230- AR="$AR $plugin_option"
16231- fi
16232- rm -f conftest.*
10837+ else 16233+ else
10838+ AR="$AR $plugin_option" 16234+ AR="$AR $plugin_option"
10839+ fi 16235 fi
16236-fi
16237-test -z "$AR_FLAGS" && AR_FLAGS=cru
10840+ rm -f conftest.* 16238+ rm -f conftest.*
10841+: ${AR=ar} 16239+: ${AR=ar}
10842+: ${AR_FLAGS=cru} 16240+: ${AR_FLAGS=cru}
10843+
10844+
10845 16241
10846 16242
10847 16243
10848@@ -6679,6 +6964,62 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru 16244@@ -6714,6 +6970,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru
10849 16245
10850 16246
10851 16247
@@ -10905,31 +16301,12 @@ index a2f33c0f35d..90667680701 100755
10905+ 16301+
10906+ 16302+
10907+ 16303+
10908 16304+
10909 16305+
10910 if test -n "$ac_tool_prefix"; then 16306 if test -n "$ac_tool_prefix"; then
10911@@ -6873,6 +7214,11 @@ else 16307 # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
10912 fi 16308 set dummy ${ac_tool_prefix}strip; ac_word=$2
10913 16309@@ -7053,8 +7367,8 @@ esac
10914 test -z "$RANLIB" && RANLIB=:
10915+if test -n "$plugin_option" && test "$RANLIB" != ":"; then
10916+ if $RANLIB --help 2>&1 | grep -q "\--plugin"; then
10917+ RANLIB="$RANLIB $plugin_option"
10918+ fi
10919+fi
10920
10921
10922
10923@@ -6987,7 +7333,7 @@ osf*)
10924 symcode='[BCDEGQRST]'
10925 ;;
10926 solaris*)
10927- symcode='[BDRT]'
10928+ symcode='[BCDRT]'
10929 ;;
10930 sco3.2v5*)
10931 symcode='[DT]'
10932@@ -7015,8 +7361,8 @@ esac
10933 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" 16310 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
10934 16311
10935 # Transform an extracted symbol line into symbol name and symbol address 16312 # Transform an extracted symbol line into symbol name and symbol address
@@ -10940,7 +16317,7 @@ index a2f33c0f35d..90667680701 100755
10940 16317
10941 # Handle CRLF in mingw tool chain 16318 # Handle CRLF in mingw tool chain
10942 opt_cr= 16319 opt_cr=
10943@@ -7052,6 +7398,7 @@ for ac_symprfx in "" "_"; do 16320@@ -7090,6 +7404,7 @@ for ac_symprfx in "" "_"; do
10944 else 16321 else
10945 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" 16322 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
10946 fi 16323 fi
@@ -10948,7 +16325,7 @@ index a2f33c0f35d..90667680701 100755
10948 16325
10949 # Check to see that the pipe works correctly. 16326 # Check to see that the pipe works correctly.
10950 pipe_works=no 16327 pipe_works=no
10951@@ -7093,6 +7440,18 @@ _LT_EOF 16328@@ -7131,6 +7446,18 @@ _LT_EOF
10952 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then 16329 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
10953 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then 16330 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
10954 cat <<_LT_EOF > conftest.$ac_ext 16331 cat <<_LT_EOF > conftest.$ac_ext
@@ -10967,7 +16344,7 @@ index a2f33c0f35d..90667680701 100755
10967 #ifdef __cplusplus 16344 #ifdef __cplusplus
10968 extern "C" { 16345 extern "C" {
10969 #endif 16346 #endif
10970@@ -7104,7 +7463,7 @@ _LT_EOF 16347@@ -7142,7 +7469,7 @@ _LT_EOF
10971 cat <<_LT_EOF >> conftest.$ac_ext 16348 cat <<_LT_EOF >> conftest.$ac_ext
10972 16349
10973 /* The mapping between symbol names and symbols. */ 16350 /* The mapping between symbol names and symbols. */
@@ -10976,7 +16353,7 @@ index a2f33c0f35d..90667680701 100755
10976 const char *name; 16353 const char *name;
10977 void *address; 16354 void *address;
10978 } 16355 }
10979@@ -7130,8 +7489,8 @@ static const void *lt_preloaded_setup() { 16356@@ -7168,8 +7495,8 @@ static const void *lt_preloaded_setup() {
10980 _LT_EOF 16357 _LT_EOF
10981 # Now try linking the two files. 16358 # Now try linking the two files.
10982 mv conftest.$ac_objext conftstm.$ac_objext 16359 mv conftest.$ac_objext conftstm.$ac_objext
@@ -10987,7 +16364,7 @@ index a2f33c0f35d..90667680701 100755
10987 LIBS="conftstm.$ac_objext" 16364 LIBS="conftstm.$ac_objext"
10988 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" 16365 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
10989 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 16366 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
10990@@ -7141,8 +7500,8 @@ _LT_EOF 16367@@ -7179,8 +7506,8 @@ _LT_EOF
10991 test $ac_status = 0; } && test -s conftest${ac_exeext}; then 16368 test $ac_status = 0; } && test -s conftest${ac_exeext}; then
10992 pipe_works=yes 16369 pipe_works=yes
10993 fi 16370 fi
@@ -10998,7 +16375,7 @@ index a2f33c0f35d..90667680701 100755
10998 else 16375 else
10999 echo "cannot find nm_test_func in $nlist" >&5 16376 echo "cannot find nm_test_func in $nlist" >&5
11000 fi 16377 fi
11001@@ -7179,6 +7538,17 @@ else 16378@@ -7217,6 +7544,18 @@ else
11002 $as_echo "ok" >&6; } 16379 $as_echo "ok" >&6; }
11003 fi 16380 fi
11004 16381
@@ -11013,10 +16390,11 @@ index a2f33c0f35d..90667680701 100755
11013+ 16390+
11014+ 16391+
11015+ 16392+
16393+
11016 16394
11017 16395
11018 16396
11019@@ -7195,6 +7565,44 @@ fi 16397@@ -7233,6 +7572,43 @@ fi
11020 16398
11021 16399
11022 16400
@@ -11025,7 +16403,6 @@ index a2f33c0f35d..90667680701 100755
11025+ 16403+
11026+ 16404+
11027+ 16405+
11028+
11029+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 16406+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
11030+$as_echo_n "checking for sysroot... " >&6; } 16407+$as_echo_n "checking for sysroot... " >&6; }
11031+ 16408+
@@ -11061,49 +16438,10 @@ index a2f33c0f35d..90667680701 100755
11061 16438
11062 16439
11063 16440
11064@@ -7372,39 +7780,156 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ 16441@@ -7444,6 +7820,123 @@ esac
11065 ac_compiler_gnu=$ac_cv_c_compiler_gnu 16442
16443 need_locks="$enable_libtool_lock"
11066 16444
11067 fi
11068-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5
11069-$as_echo "$lt_cv_cc_needs_belf" >&6; }
11070- if test x"$lt_cv_cc_needs_belf" != x"yes"; then
11071- # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
11072- CFLAGS="$SAVE_CFLAGS"
11073+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5
11074+$as_echo "$lt_cv_cc_needs_belf" >&6; }
11075+ if test x"$lt_cv_cc_needs_belf" != x"yes"; then
11076+ # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
11077+ CFLAGS="$SAVE_CFLAGS"
11078+ fi
11079+ ;;
11080+sparc*-*solaris*)
11081+ # Find out which ABI we are using.
11082+ echo 'int i;' > conftest.$ac_ext
11083+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
11084+ (eval $ac_compile) 2>&5
11085+ ac_status=$?
11086+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
11087+ test $ac_status = 0; }; then
11088+ case `/usr/bin/file conftest.o` in
11089+ *64-bit*)
11090+ case $lt_cv_prog_gnu_ld in
11091+ yes*) LD="${LD-ld} -m elf64_sparc" ;;
11092+ *)
11093+ if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
11094+ LD="${LD-ld} -64"
11095+ fi
11096+ ;;
11097+ esac
11098+ ;;
11099+ esac
11100+ fi
11101+ rm -rf conftest*
11102+ ;;
11103+esac
11104+
11105+need_locks="$enable_libtool_lock"
11106+
11107+if test -n "$ac_tool_prefix"; then 16445+if test -n "$ac_tool_prefix"; then
11108+ # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args. 16446+ # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args.
11109+set dummy ${ac_tool_prefix}mt; ac_word=$2 16447+set dummy ${ac_tool_prefix}mt; ac_word=$2
@@ -11191,28 +16529,7 @@ index a2f33c0f35d..90667680701 100755
11191+ac_tool_warned=yes ;; 16529+ac_tool_warned=yes ;;
11192+esac 16530+esac
11193+ MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL 16531+ MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL
11194 fi 16532+ fi
11195- ;;
11196-sparc*-*solaris*)
11197- # Find out which ABI we are using.
11198- echo 'int i;' > conftest.$ac_ext
11199- if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
11200- (eval $ac_compile) 2>&5
11201- ac_status=$?
11202- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
11203- test $ac_status = 0; }; then
11204- case `/usr/bin/file conftest.o` in
11205- *64-bit*)
11206- case $lt_cv_prog_gnu_ld in
11207- yes*) LD="${LD-ld} -m elf64_sparc" ;;
11208- *)
11209- if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
11210- LD="${LD-ld} -64"
11211- fi
11212- ;;
11213- esac
11214- ;;
11215- esac
11216+else 16533+else
11217+ MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL" 16534+ MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL"
11218+fi 16535+fi
@@ -11229,10 +16546,7 @@ index a2f33c0f35d..90667680701 100755
11229+ cat conftest.err >&5 16546+ cat conftest.err >&5
11230+ if $GREP 'Manifest Tool' conftest.out > /dev/null; then 16547+ if $GREP 'Manifest Tool' conftest.out > /dev/null; then
11231+ lt_cv_path_mainfest_tool=yes 16548+ lt_cv_path_mainfest_tool=yes
11232 fi 16549+ fi
11233- rm -rf conftest*
11234- ;;
11235-esac
11236+ rm -f conftest* 16550+ rm -f conftest*
11237+fi 16551+fi
11238+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5 16552+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5
@@ -11243,12 +16557,12 @@ index a2f33c0f35d..90667680701 100755
11243+ 16557+
11244+ 16558+
11245+ 16559+
11246 16560+
11247-need_locks="$enable_libtool_lock" 16561+
11248
11249 16562
11250 case $host_os in 16563 case $host_os in
11251@@ -7969,6 +8494,8 @@ _LT_EOF 16564 rhapsody* | darwin*)
16565@@ -8007,6 +8500,8 @@ _LT_EOF
11252 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 16566 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
11253 echo "$AR cru libconftest.a conftest.o" >&5 16567 echo "$AR cru libconftest.a conftest.o" >&5
11254 $AR cru libconftest.a conftest.o 2>&5 16568 $AR cru libconftest.a conftest.o 2>&5
@@ -11257,47 +16571,7 @@ index a2f33c0f35d..90667680701 100755
11257 cat > conftest.c << _LT_EOF 16571 cat > conftest.c << _LT_EOF
11258 int main() { return 0;} 16572 int main() { return 0;}
11259 _LT_EOF 16573 _LT_EOF
11260@@ -7986,25 +8513,23 @@ _LT_EOF 16574@@ -8589,8 +9084,6 @@ fi
11261 fi
11262 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_force_load" >&5
11263 $as_echo "$lt_cv_ld_force_load" >&6; }
11264- # Allow for Darwin 4-7 (macOS 10.0-10.3) although these are not expect to
11265- # build without first building modern cctools / linker.
11266- case $host_cpu-$host_os in
11267- *-rhapsody* | *-darwin1.[012])
11268+ case $host_os in
11269+ rhapsody* | darwin1.[012])
11270 _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
11271- *-darwin1.*)
11272+ darwin1.*)
11273 _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
11274- *-darwin*)
11275- # darwin 5.x (macOS 10.1) onwards we only need to adjust when the
11276- # deployment target is forced to an earlier version.
11277- case ${MACOSX_DEPLOYMENT_TARGET-UNSET},$host in
11278- UNSET,*-darwin[89]*|UNSET,*-darwin[12][0123456789]*)
11279- ;;
11280+ darwin*) # darwin 5.x on
11281+ # if running on 10.5 or later, the deployment target defaults
11282+ # to the OS version, if on x86, and 10.4, the deployment
11283+ # target defaults to 10.4. Don't you love it?
11284+ case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
11285+ 10.0,*86*-darwin8*|10.0,*-darwin[91]*)
11286+ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
11287 10.[012][,.]*)
11288- _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
11289- ;;
11290- *)
11291- ;;
11292- esac
11293+ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
11294+ 10.*)
11295+ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
11296+ esac
11297 ;;
11298 esac
11299 if test "$lt_cv_apple_cc_single_mod" = "yes"; then
11300@@ -8553,8 +9078,6 @@ fi
11301 lt_prog_compiler_pic= 16575 lt_prog_compiler_pic=
11302 lt_prog_compiler_static= 16576 lt_prog_compiler_static=
11303 16577
@@ -11306,7 +16580,7 @@ index a2f33c0f35d..90667680701 100755
11306 16580
11307 if test "$GCC" = yes; then 16581 if test "$GCC" = yes; then
11308 lt_prog_compiler_wl='-Wl,' 16582 lt_prog_compiler_wl='-Wl,'
11309@@ -8720,6 +9243,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 16583@@ -8756,6 +9249,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
11310 lt_prog_compiler_pic='--shared' 16584 lt_prog_compiler_pic='--shared'
11311 lt_prog_compiler_static='--static' 16585 lt_prog_compiler_static='--static'
11312 ;; 16586 ;;
@@ -11319,7 +16593,7 @@ index a2f33c0f35d..90667680701 100755
11319 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) 16593 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
11320 # Portland Group compilers (*not* the Pentium gcc compiler, 16594 # Portland Group compilers (*not* the Pentium gcc compiler,
11321 # which looks to be a dead project) 16595 # which looks to be a dead project)
11322@@ -8782,7 +9311,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 16596@@ -8818,7 +9317,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
11323 lt_prog_compiler_pic='-KPIC' 16597 lt_prog_compiler_pic='-KPIC'
11324 lt_prog_compiler_static='-Bstatic' 16598 lt_prog_compiler_static='-Bstatic'
11325 case $cc_basename in 16599 case $cc_basename in
@@ -11328,7 +16602,7 @@ index a2f33c0f35d..90667680701 100755
11328 lt_prog_compiler_wl='-Qoption ld ';; 16602 lt_prog_compiler_wl='-Qoption ld ';;
11329 *) 16603 *)
11330 lt_prog_compiler_wl='-Wl,';; 16604 lt_prog_compiler_wl='-Wl,';;
11331@@ -8839,13 +9368,17 @@ case $host_os in 16605@@ -8875,13 +9374,17 @@ case $host_os in
11332 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" 16606 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
11333 ;; 16607 ;;
11334 esac 16608 esac
@@ -11352,7 +16626,7 @@ index a2f33c0f35d..90667680701 100755
11352 16626
11353 # 16627 #
11354 # Check to make sure the PIC flag actually works. 16628 # Check to make sure the PIC flag actually works.
11355@@ -8906,6 +9439,11 @@ fi 16629@@ -8942,6 +9445,11 @@ fi
11356 16630
11357 16631
11358 16632
@@ -11364,7 +16638,7 @@ index a2f33c0f35d..90667680701 100755
11364 # 16638 #
11365 # Check to make sure the static flag actually works. 16639 # Check to make sure the static flag actually works.
11366 # 16640 #
11367@@ -9256,7 +9794,8 @@ _LT_EOF 16641@@ -9292,7 +9800,8 @@ _LT_EOF
11368 allow_undefined_flag=unsupported 16642 allow_undefined_flag=unsupported
11369 always_export_symbols=no 16643 always_export_symbols=no
11370 enable_shared_with_static_runtimes=yes 16644 enable_shared_with_static_runtimes=yes
@@ -11374,16 +16648,7 @@ index a2f33c0f35d..90667680701 100755
11374 16648
11375 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then 16649 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
11376 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' 16650 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
11377@@ -9294,7 +9833,7 @@ _LT_EOF 16651@@ -9391,12 +9900,12 @@ _LT_EOF
11378 archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
11379 ;;
11380
11381- gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu | uclinuxfdpiceabi)
11382+ gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
11383 tmp_diet=no
11384 if test "$host_os" = linux-dietlibc; then
11385 case $cc_basename in
11386@@ -9355,12 +9894,12 @@ _LT_EOF
11387 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' 16652 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
11388 hardcode_libdir_flag_spec= 16653 hardcode_libdir_flag_spec=
11389 hardcode_libdir_flag_spec_ld='-rpath $libdir' 16654 hardcode_libdir_flag_spec_ld='-rpath $libdir'
@@ -11398,7 +16663,7 @@ index a2f33c0f35d..90667680701 100755
11398 fi 16663 fi
11399 ;; 16664 ;;
11400 esac 16665 esac
11401@@ -9374,8 +9913,8 @@ _LT_EOF 16666@@ -9410,8 +9919,8 @@ _LT_EOF
11402 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' 16667 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
11403 wlarc= 16668 wlarc=
11404 else 16669 else
@@ -11409,7 +16674,7 @@ index a2f33c0f35d..90667680701 100755
11409 fi 16674 fi
11410 ;; 16675 ;;
11411 16676
11412@@ -9393,8 +9932,8 @@ _LT_EOF 16677@@ -9429,8 +9938,8 @@ _LT_EOF
11413 16678
11414 _LT_EOF 16679 _LT_EOF
11415 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 16680 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -11420,7 +16685,7 @@ index a2f33c0f35d..90667680701 100755
11420 else 16685 else
11421 ld_shlibs=no 16686 ld_shlibs=no
11422 fi 16687 fi
11423@@ -9440,8 +9979,8 @@ _LT_EOF 16688@@ -9476,8 +9985,8 @@ _LT_EOF
11424 16689
11425 *) 16690 *)
11426 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 16691 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -11431,7 +16696,7 @@ index a2f33c0f35d..90667680701 100755
11431 else 16696 else
11432 ld_shlibs=no 16697 ld_shlibs=no
11433 fi 16698 fi
11434@@ -9571,7 +10110,13 @@ _LT_EOF 16699@@ -9607,7 +10116,13 @@ _LT_EOF
11435 allow_undefined_flag='-berok' 16700 allow_undefined_flag='-berok'
11436 # Determine the default libpath from the value encoded in an 16701 # Determine the default libpath from the value encoded in an
11437 # empty executable. 16702 # empty executable.
@@ -11446,7 +16711,7 @@ index a2f33c0f35d..90667680701 100755
11446 /* end confdefs.h. */ 16711 /* end confdefs.h. */
11447 16712
11448 int 16713 int
11449@@ -9584,22 +10129,29 @@ main () 16714@@ -9620,22 +10135,29 @@ main ()
11450 _ACEOF 16715 _ACEOF
11451 if ac_fn_c_try_link "$LINENO"; then : 16716 if ac_fn_c_try_link "$LINENO"; then :
11452 16717
@@ -11489,7 +16754,7 @@ index a2f33c0f35d..90667680701 100755
11489 16754
11490 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 16755 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
11491 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" 16756 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"
11492@@ -9611,7 +10163,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 16757@@ -9647,7 +10169,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
11493 else 16758 else
11494 # Determine the default libpath from the value encoded in an 16759 # Determine the default libpath from the value encoded in an
11495 # empty executable. 16760 # empty executable.
@@ -11504,7 +16769,7 @@ index a2f33c0f35d..90667680701 100755
11504 /* end confdefs.h. */ 16769 /* end confdefs.h. */
11505 16770
11506 int 16771 int
11507@@ -9624,22 +10182,29 @@ main () 16772@@ -9660,22 +10188,29 @@ main ()
11508 _ACEOF 16773 _ACEOF
11509 if ac_fn_c_try_link "$LINENO"; then : 16774 if ac_fn_c_try_link "$LINENO"; then :
11510 16775
@@ -11547,7 +16812,7 @@ index a2f33c0f35d..90667680701 100755
11547 16812
11548 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 16813 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
11549 # Warning - without using the other run time loading flags, 16814 # Warning - without using the other run time loading flags,
11550@@ -9684,20 +10249,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 16815@@ -9720,20 +10255,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
11551 # Microsoft Visual C++. 16816 # Microsoft Visual C++.
11552 # hardcode_libdir_flag_spec is actually meaningless, as there is 16817 # hardcode_libdir_flag_spec is actually meaningless, as there is
11553 # no search path for DLLs. 16818 # no search path for DLLs.
@@ -11625,7 +16890,7 @@ index a2f33c0f35d..90667680701 100755
11625 ;; 16890 ;;
11626 16891
11627 darwin* | rhapsody*) 16892 darwin* | rhapsody*)
11628@@ -9758,7 +10366,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 16893@@ -9794,7 +10372,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
11629 16894
11630 # FreeBSD 3 and greater uses gcc -shared to do shared libraries. 16895 # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
11631 freebsd* | dragonfly*) 16896 freebsd* | dragonfly*)
@@ -11634,7 +16899,7 @@ index a2f33c0f35d..90667680701 100755
11634 hardcode_libdir_flag_spec='-R$libdir' 16899 hardcode_libdir_flag_spec='-R$libdir'
11635 hardcode_direct=yes 16900 hardcode_direct=yes
11636 hardcode_shlibpath_var=no 16901 hardcode_shlibpath_var=no
11637@@ -9766,7 +10374,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 16902@@ -9802,7 +10380,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
11638 16903
11639 hpux9*) 16904 hpux9*)
11640 if test "$GCC" = yes; then 16905 if test "$GCC" = yes; then
@@ -11643,7 +16908,7 @@ index a2f33c0f35d..90667680701 100755
11643 else 16908 else
11644 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' 16909 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'
11645 fi 16910 fi
11646@@ -9782,7 +10390,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 16911@@ -9818,7 +10396,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
11647 16912
11648 hpux10*) 16913 hpux10*)
11649 if test "$GCC" = yes && test "$with_gnu_ld" = no; then 16914 if test "$GCC" = yes && test "$with_gnu_ld" = no; then
@@ -11652,12 +16917,8 @@ index a2f33c0f35d..90667680701 100755
11652 else 16917 else
11653 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' 16918 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
11654 fi 16919 fi
11655@@ -9803,19 +10411,19 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 16920@@ -9842,10 +10420,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
11656 if test "$GCC" = yes && test "$with_gnu_ld" = no; then 16921 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
11657 case $host_cpu in
11658 hppa*64*)
11659- archive_cmds='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
11660+ archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
11661 ;; 16922 ;;
11662 ia64*) 16923 ia64*)
11663- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' 16924- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
@@ -11669,14 +16930,7 @@ index a2f33c0f35d..90667680701 100755
11669 ;; 16930 ;;
11670 esac 16931 esac
11671 else 16932 else
11672 case $host_cpu in 16933@@ -9924,23 +10502,36 @@ fi
11673 hppa*64*)
11674- archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
11675+ archive_cmds='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
11676 ;;
11677 ia64*)
11678 archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
11679@@ -9888,23 +10496,36 @@ fi
11680 16934
11681 irix5* | irix6* | nonstopux*) 16935 irix5* | irix6* | nonstopux*)
11682 if test "$GCC" = yes; then 16936 if test "$GCC" = yes; then
@@ -11721,7 +16975,7 @@ index a2f33c0f35d..90667680701 100755
11721 else 16975 else
11722 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' 16976 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'
11723 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' 16977 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'
11724@@ -9989,7 +10610,7 @@ rm -f core conftest.err conftest.$ac_objext \ 16978@@ -10025,7 +10616,7 @@ rm -f core conftest.err conftest.$ac_objext \
11725 osf4* | osf5*) # as osf3* with the addition of -msym flag 16979 osf4* | osf5*) # as osf3* with the addition of -msym flag
11726 if test "$GCC" = yes; then 16980 if test "$GCC" = yes; then
11727 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' 16981 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
@@ -11730,7 +16984,7 @@ index a2f33c0f35d..90667680701 100755
11730 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' 16984 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
11731 else 16985 else
11732 allow_undefined_flag=' -expect_unresolved \*' 16986 allow_undefined_flag=' -expect_unresolved \*'
11733@@ -10008,9 +10629,9 @@ rm -f core conftest.err conftest.$ac_objext \ 16987@@ -10044,9 +10635,9 @@ rm -f core conftest.err conftest.$ac_objext \
11734 no_undefined_flag=' -z defs' 16988 no_undefined_flag=' -z defs'
11735 if test "$GCC" = yes; then 16989 if test "$GCC" = yes; then
11736 wlarc='${wl}' 16990 wlarc='${wl}'
@@ -11742,7 +16996,7 @@ index a2f33c0f35d..90667680701 100755
11742 else 16996 else
11743 case `$CC -V 2>&1` in 16997 case `$CC -V 2>&1` in
11744 *"Compilers 5.0"*) 16998 *"Compilers 5.0"*)
11745@@ -10586,8 +11207,9 @@ cygwin* | mingw* | pw32* | cegcc*) 16999@@ -10622,8 +11213,9 @@ cygwin* | mingw* | pw32* | cegcc*)
11746 need_version=no 17000 need_version=no
11747 need_lib_prefix=no 17001 need_lib_prefix=no
11748 17002
@@ -11754,7 +17008,7 @@ index a2f33c0f35d..90667680701 100755
11754 library_names_spec='$libname.dll.a' 17008 library_names_spec='$libname.dll.a'
11755 # DLL is installed to $(libdir)/../bin by postinstall_cmds 17009 # DLL is installed to $(libdir)/../bin by postinstall_cmds
11756 postinstall_cmds='base_file=`basename \${file}`~ 17010 postinstall_cmds='base_file=`basename \${file}`~
11757@@ -10620,13 +11242,71 @@ cygwin* | mingw* | pw32* | cegcc*) 17011@@ -10656,13 +11248,71 @@ cygwin* | mingw* | pw32* | cegcc*)
11758 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' 17012 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
11759 ;; 17013 ;;
11760 esac 17014 esac
@@ -11827,39 +17081,16 @@ index a2f33c0f35d..90667680701 100755
11827 # FIXME: first we should search . and the directory the executable is in 17081 # FIXME: first we should search . and the directory the executable is in
11828 shlibpath_var=PATH 17082 shlibpath_var=PATH
11829 ;; 17083 ;;
11830@@ -10708,7 +11388,7 @@ haiku*) 17084@@ -11540,7 +12190,7 @@ else
11831 soname_spec='${libname}${release}${shared_ext}$major'
11832 shlibpath_var=LIBRARY_PATH
11833 shlibpath_overrides_runpath=yes
11834- sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib'
11835+ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
11836 hardcode_into_libs=yes
11837 ;;
11838
11839@@ -10815,12 +11495,7 @@ linux*oldld* | linux*aout* | linux*coff*)
11840 ;;
11841
11842 # This must be Linux ELF.
11843-
11844-# uclinux* changes (here and below) have been submitted to the libtool
11845-# project, but have not yet been accepted: they are GCC-local changes
11846-# for the time being. (See
11847-# https://lists.gnu.org/archive/html/libtool-patches/2018-05/msg00000.html)
11848-linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu* | uclinuxfdpiceabi)
11849+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
11850 version_type=linux
11851 need_lib_prefix=no
11852 need_version=no
11853@@ -11509,7 +12184,7 @@ else
11854 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 17085 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
11855 lt_status=$lt_dlunknown 17086 lt_status=$lt_dlunknown
11856 cat > conftest.$ac_ext <<_LT_EOF 17087 cat > conftest.$ac_ext <<_LT_EOF
11857-#line 11512 "configure" 17088-#line 11543 "configure"
11858+#line $LINENO "configure" 17089+#line $LINENO "configure"
11859 #include "confdefs.h" 17090 #include "confdefs.h"
11860 17091
11861 #if HAVE_DLFCN_H 17092 #if HAVE_DLFCN_H
11862@@ -11553,10 +12228,10 @@ else 17093@@ -11584,10 +12234,10 @@ else
11863 /* When -fvisbility=hidden is used, assume the code has been annotated 17094 /* When -fvisbility=hidden is used, assume the code has been annotated
11864 correspondingly for the symbols needed. */ 17095 correspondingly for the symbols needed. */
11865 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 17096 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
@@ -11872,16 +17103,16 @@ index a2f33c0f35d..90667680701 100755
11872 int main () 17103 int main ()
11873 { 17104 {
11874 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 17105 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
11875@@ -11615,7 +12290,7 @@ else 17106@@ -11646,7 +12296,7 @@ else
11876 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 17107 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
11877 lt_status=$lt_dlunknown 17108 lt_status=$lt_dlunknown
11878 cat > conftest.$ac_ext <<_LT_EOF 17109 cat > conftest.$ac_ext <<_LT_EOF
11879-#line 11618 "configure" 17110-#line 11649 "configure"
11880+#line $LINENO "configure" 17111+#line $LINENO "configure"
11881 #include "confdefs.h" 17112 #include "confdefs.h"
11882 17113
11883 #if HAVE_DLFCN_H 17114 #if HAVE_DLFCN_H
11884@@ -11659,10 +12334,10 @@ else 17115@@ -11690,10 +12340,10 @@ else
11885 /* When -fvisbility=hidden is used, assume the code has been annotated 17116 /* When -fvisbility=hidden is used, assume the code has been annotated
11886 correspondingly for the symbols needed. */ 17117 correspondingly for the symbols needed. */
11887 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 17118 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
@@ -11894,7 +17125,7 @@ index a2f33c0f35d..90667680701 100755
11894 int main () 17125 int main ()
11895 { 17126 {
11896 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 17127 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
11897@@ -14948,13 +15623,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' 17128@@ -14979,13 +15629,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
11898 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' 17129 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
11899 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' 17130 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
11900 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' 17131 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
@@ -11915,7 +17146,7 @@ index a2f33c0f35d..90667680701 100755
11915 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' 17146 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
11916 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' 17147 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
11917 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' 17148 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
11918@@ -14969,14 +15651,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de 17149@@ -15000,14 +15657,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de
11919 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' 17150 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
11920 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' 17151 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
11921 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"`' 17152 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"`'
@@ -11934,7 +17165,7 @@ index a2f33c0f35d..90667680701 100755
11934 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' 17165 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
11935 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' 17166 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
11936 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' 17167 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
11937@@ -15009,12 +15694,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q 17168@@ -15040,12 +15700,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q
11938 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' 17169 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
11939 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' 17170 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
11940 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' 17171 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
@@ -11948,7 +17179,7 @@ index a2f33c0f35d..90667680701 100755
11948 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' 17179 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
11949 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' 17180 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
11950 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' 17181 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
11951@@ -15069,8 +15754,13 @@ reload_flag \ 17182@@ -15100,8 +15760,13 @@ reload_flag \
11952 OBJDUMP \ 17183 OBJDUMP \
11953 deplibs_check_method \ 17184 deplibs_check_method \
11954 file_magic_cmd \ 17185 file_magic_cmd \
@@ -11962,7 +17193,7 @@ index a2f33c0f35d..90667680701 100755
11962 STRIP \ 17193 STRIP \
11963 RANLIB \ 17194 RANLIB \
11964 CC \ 17195 CC \
11965@@ -15080,12 +15770,14 @@ lt_cv_sys_global_symbol_pipe \ 17196@@ -15111,12 +15776,14 @@ lt_cv_sys_global_symbol_pipe \
11966 lt_cv_sys_global_symbol_to_cdecl \ 17197 lt_cv_sys_global_symbol_to_cdecl \
11967 lt_cv_sys_global_symbol_to_c_name_address \ 17198 lt_cv_sys_global_symbol_to_c_name_address \
11968 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ 17199 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
@@ -11978,7 +17209,7 @@ index a2f33c0f35d..90667680701 100755
11978 DSYMUTIL \ 17209 DSYMUTIL \
11979 NMEDIT \ 17210 NMEDIT \
11980 LIPO \ 17211 LIPO \
11981@@ -15101,7 +15793,6 @@ no_undefined_flag \ 17212@@ -15132,7 +15799,6 @@ no_undefined_flag \
11982 hardcode_libdir_flag_spec \ 17213 hardcode_libdir_flag_spec \
11983 hardcode_libdir_flag_spec_ld \ 17214 hardcode_libdir_flag_spec_ld \
11984 hardcode_libdir_separator \ 17215 hardcode_libdir_separator \
@@ -11986,7 +17217,7 @@ index a2f33c0f35d..90667680701 100755
11986 exclude_expsyms \ 17217 exclude_expsyms \
11987 include_expsyms \ 17218 include_expsyms \
11988 file_list_spec \ 17219 file_list_spec \
11989@@ -15137,6 +15828,7 @@ module_cmds \ 17220@@ -15168,6 +15834,7 @@ module_cmds \
11990 module_expsym_cmds \ 17221 module_expsym_cmds \
11991 export_symbols_cmds \ 17222 export_symbols_cmds \
11992 prelink_cmds \ 17223 prelink_cmds \
@@ -11994,7 +17225,7 @@ index a2f33c0f35d..90667680701 100755
11994 postinstall_cmds \ 17225 postinstall_cmds \
11995 postuninstall_cmds \ 17226 postuninstall_cmds \
11996 finish_cmds \ 17227 finish_cmds \
11997@@ -15835,7 +16527,8 @@ esac ;; 17228@@ -15866,7 +16533,8 @@ esac ;;
11998 # NOTE: Changes made to this file will be lost: look at ltmain.sh. 17229 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
11999 # 17230 #
12000 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 17231 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
@@ -12004,7 +17235,7 @@ index a2f33c0f35d..90667680701 100755
12004 # Written by Gordon Matzigkeit, 1996 17235 # Written by Gordon Matzigkeit, 1996
12005 # 17236 #
12006 # This file is part of GNU Libtool. 17237 # This file is part of GNU Libtool.
12007@@ -15938,19 +16631,42 @@ SP2NL=$lt_lt_SP2NL 17238@@ -15969,19 +16637,42 @@ SP2NL=$lt_lt_SP2NL
12008 # turn newlines into spaces. 17239 # turn newlines into spaces.
12009 NL2SP=$lt_lt_NL2SP 17240 NL2SP=$lt_lt_NL2SP
12010 17241
@@ -12048,7 +17279,7 @@ index a2f33c0f35d..90667680701 100755
12048 # A symbol stripping program. 17279 # A symbol stripping program.
12049 STRIP=$lt_STRIP 17280 STRIP=$lt_STRIP
12050 17281
12051@@ -15980,6 +16696,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address 17282@@ -16011,6 +16702,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
12052 # Transform the output of nm in a C name address pair when lib prefix is needed. 17283 # Transform the output of nm in a C name address pair when lib prefix is needed.
12053 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix 17284 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
12054 17285
@@ -12061,7 +17292,7 @@ index a2f33c0f35d..90667680701 100755
12061 # The name of the directory that contains temporary libtool files. 17292 # The name of the directory that contains temporary libtool files.
12062 objdir=$objdir 17293 objdir=$objdir
12063 17294
12064@@ -15989,6 +16711,9 @@ MAGIC_CMD=$MAGIC_CMD 17295@@ -16020,6 +16717,9 @@ MAGIC_CMD=$MAGIC_CMD
12065 # Must we lock files when doing compilation? 17296 # Must we lock files when doing compilation?
12066 need_locks=$lt_need_locks 17297 need_locks=$lt_need_locks
12067 17298
@@ -12071,7 +17302,7 @@ index a2f33c0f35d..90667680701 100755
12071 # Tool to manipulate archived DWARF debug symbol files on Mac OS X. 17302 # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
12072 DSYMUTIL=$lt_DSYMUTIL 17303 DSYMUTIL=$lt_DSYMUTIL
12073 17304
12074@@ -16103,12 +16828,12 @@ with_gcc=$GCC 17305@@ -16134,12 +16834,12 @@ with_gcc=$GCC
12075 # Compiler flag to turn off builtin functions. 17306 # Compiler flag to turn off builtin functions.
12076 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag 17307 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
12077 17308
@@ -12087,7 +17318,7 @@ index a2f33c0f35d..90667680701 100755
12087 # Compiler flag to prevent dynamic linking. 17318 # Compiler flag to prevent dynamic linking.
12088 link_static_flag=$lt_lt_prog_compiler_static 17319 link_static_flag=$lt_lt_prog_compiler_static
12089 17320
12090@@ -16195,9 +16920,6 @@ inherit_rpath=$inherit_rpath 17321@@ -16226,9 +16926,6 @@ inherit_rpath=$inherit_rpath
12091 # Whether libtool must link a program against all its dependency libraries. 17322 # Whether libtool must link a program against all its dependency libraries.
12092 link_all_deplibs=$link_all_deplibs 17323 link_all_deplibs=$link_all_deplibs
12093 17324
@@ -12097,7 +17328,7 @@ index a2f33c0f35d..90667680701 100755
12097 # Set to "yes" if exported symbols are required. 17328 # Set to "yes" if exported symbols are required.
12098 always_export_symbols=$always_export_symbols 17329 always_export_symbols=$always_export_symbols
12099 17330
12100@@ -16213,6 +16935,9 @@ include_expsyms=$lt_include_expsyms 17331@@ -16244,6 +16941,9 @@ include_expsyms=$lt_include_expsyms
12101 # Commands necessary for linking programs (against libraries) with templates. 17332 # Commands necessary for linking programs (against libraries) with templates.
12102 prelink_cmds=$lt_prelink_cmds 17333 prelink_cmds=$lt_prelink_cmds
12103 17334
@@ -12107,7 +17338,7 @@ index a2f33c0f35d..90667680701 100755
12107 # Specify filename containing input files. 17338 # Specify filename containing input files.
12108 file_list_spec=$lt_file_list_spec 17339 file_list_spec=$lt_file_list_spec
12109 17340
12110@@ -16245,210 +16970,169 @@ ltmain="$ac_aux_dir/ltmain.sh" 17341@@ -16276,210 +16976,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
12111 # if finds mixed CR/LF and LF-only lines. Since sed operates in 17342 # if finds mixed CR/LF and LF-only lines. Since sed operates in
12112 # text mode, it properly converts lines to CR/LF. This bash problem 17343 # text mode, it properly converts lines to CR/LF. This bash problem
12113 # is reportedly fixed, but why not run on old versions too? 17344 # is reportedly fixed, but why not run on old versions too?
@@ -12481,8 +17712,28 @@ index a2f33c0f35d..90667680701 100755
12481 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") 17712 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
12482 chmod +x "$ofile" 17713 chmod +x "$ofile"
12483 17714
17715diff --git a/libctf/Makefile.in b/libctf/Makefile.in
17716index 1984f50867a..51a3dd26e87 100644
17717--- a/libctf/Makefile.in
17718+++ b/libctf/Makefile.in
17719@@ -393,6 +393,7 @@ CYGPATH_W = @CYGPATH_W@
17720 DATADIRNAME = @DATADIRNAME@
17721 DEFS = @DEFS@
17722 DEPDIR = @DEPDIR@
17723+DLLTOOL = @DLLTOOL@
17724 DSYMUTIL = @DSYMUTIL@
17725 DUMPBIN = @DUMPBIN@
17726 ECHO_C = @ECHO_C@
17727@@ -426,6 +427,7 @@ LN_S = @LN_S@
17728 LTLIBOBJS = @LTLIBOBJS@
17729 MAINT = @MAINT@
17730 MAKEINFO = @MAKEINFO@
17731+MANIFEST_TOOL = @MANIFEST_TOOL@
17732 MKDIR_P = @MKDIR_P@
17733 NM = @NM@
17734 NMEDIT = @NMEDIT@
12484diff --git a/libctf/configure b/libctf/configure 17735diff --git a/libctf/configure b/libctf/configure
12485index de10fef84a1..1b0ee0d32c6 100755 17736index 8704bc215f4..c1bf438bda6 100755
12486--- a/libctf/configure 17737--- a/libctf/configure
12487+++ b/libctf/configure 17738+++ b/libctf/configure
12488@@ -669,6 +669,8 @@ OTOOL 17739@@ -669,6 +669,8 @@ OTOOL
@@ -12494,7 +17745,7 @@ index de10fef84a1..1b0ee0d32c6 100755
12494 OBJDUMP 17745 OBJDUMP
12495 LN_S 17746 LN_S
12496 NM 17747 NM
12497@@ -801,6 +803,7 @@ enable_static 17748@@ -800,6 +802,7 @@ enable_static
12498 with_pic 17749 with_pic
12499 enable_fast_install 17750 enable_fast_install
12500 with_gnu_ld 17751 with_gnu_ld
@@ -12502,7 +17753,7 @@ index de10fef84a1..1b0ee0d32c6 100755
12502 enable_libtool_lock 17753 enable_libtool_lock
12503 enable_largefile 17754 enable_largefile
12504 enable_werror_always 17755 enable_werror_always
12505@@ -1475,6 +1478,8 @@ Optional Packages: 17756@@ -1463,6 +1466,8 @@ Optional Packages:
12506 --with-pic try to use only PIC/non-PIC objects [default=use 17757 --with-pic try to use only PIC/non-PIC objects [default=use
12507 both] 17758 both]
12508 --with-gnu-ld assume the C compiler uses GNU ld [default=no] 17759 --with-gnu-ld assume the C compiler uses GNU ld [default=no]
@@ -12511,7 +17762,7 @@ index de10fef84a1..1b0ee0d32c6 100755
12511 --with-system-zlib use installed libz 17762 --with-system-zlib use installed libz
12512 17763
12513 Some influential environment variables: 17764 Some influential environment variables:
12514@@ -5583,8 +5588,8 @@ esac 17765@@ -5571,8 +5576,8 @@ esac
12515 17766
12516 17767
12517 17768
@@ -12522,7 +17773,7 @@ index de10fef84a1..1b0ee0d32c6 100755
12522 17773
12523 17774
12524 17775
12525@@ -5624,7 +5629,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO 17776@@ -5612,7 +5617,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
12526 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 17777 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
12527 $as_echo_n "checking how to print strings... " >&6; } 17778 $as_echo_n "checking how to print strings... " >&6; }
12528 # Test print first, because it will be a builtin if present. 17779 # Test print first, because it will be a builtin if present.
@@ -12531,7 +17782,7 @@ index de10fef84a1..1b0ee0d32c6 100755
12531 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then 17782 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
12532 ECHO='print -r --' 17783 ECHO='print -r --'
12533 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then 17784 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
12534@@ -6311,8 +6316,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; 17785@@ -6305,8 +6310,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6;
12535 # Try some XSI features 17786 # Try some XSI features
12536 xsi_shell=no 17787 xsi_shell=no
12537 ( _lt_dummy="a/b/c" 17788 ( _lt_dummy="a/b/c"
@@ -12542,7 +17793,7 @@ index de10fef84a1..1b0ee0d32c6 100755
12542 && eval 'test $(( 1 + 1 )) -eq 2 \ 17793 && eval 'test $(( 1 + 1 )) -eq 2 \
12543 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ 17794 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
12544 && xsi_shell=yes 17795 && xsi_shell=yes
12545@@ -6361,6 +6366,80 @@ esac 17796@@ -6355,6 +6360,80 @@ esac
12546 17797
12547 17798
12548 17799
@@ -12623,7 +17874,7 @@ index de10fef84a1..1b0ee0d32c6 100755
12623 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 17874 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
12624 $as_echo_n "checking for $LD option to reload object files... " >&6; } 17875 $as_echo_n "checking for $LD option to reload object files... " >&6; }
12625 if ${lt_cv_ld_reload_flag+:} false; then : 17876 if ${lt_cv_ld_reload_flag+:} false; then :
12626@@ -6377,6 +6456,11 @@ case $reload_flag in 17877@@ -6371,6 +6450,11 @@ case $reload_flag in
12627 esac 17878 esac
12628 reload_cmds='$LD$reload_flag -o $output$reload_objs' 17879 reload_cmds='$LD$reload_flag -o $output$reload_objs'
12629 case $host_os in 17880 case $host_os in
@@ -12635,7 +17886,7 @@ index de10fef84a1..1b0ee0d32c6 100755
12635 darwin*) 17886 darwin*)
12636 if test "$GCC" = yes; then 17887 if test "$GCC" = yes; then
12637 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' 17888 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
12638@@ -6545,7 +6629,8 @@ mingw* | pw32*) 17889@@ -6539,7 +6623,8 @@ mingw* | pw32*)
12639 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' 17890 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
12640 lt_cv_file_magic_cmd='func_win32_libid' 17891 lt_cv_file_magic_cmd='func_win32_libid'
12641 else 17892 else
@@ -12645,7 +17896,7 @@ index de10fef84a1..1b0ee0d32c6 100755
12645 lt_cv_file_magic_cmd='$OBJDUMP -f' 17896 lt_cv_file_magic_cmd='$OBJDUMP -f'
12646 fi 17897 fi
12647 ;; 17898 ;;
12648@@ -6699,6 +6784,21 @@ esac 17899@@ -6693,6 +6778,21 @@ esac
12649 fi 17900 fi
12650 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 17901 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
12651 $as_echo "$lt_cv_deplibs_check_method" >&6; } 17902 $as_echo "$lt_cv_deplibs_check_method" >&6; }
@@ -12667,7 +17918,7 @@ index de10fef84a1..1b0ee0d32c6 100755
12667 file_magic_cmd=$lt_cv_file_magic_cmd 17918 file_magic_cmd=$lt_cv_file_magic_cmd
12668 deplibs_check_method=$lt_cv_deplibs_check_method 17919 deplibs_check_method=$lt_cv_deplibs_check_method
12669 test -z "$deplibs_check_method" && deplibs_check_method=unknown 17920 test -z "$deplibs_check_method" && deplibs_check_method=unknown
12670@@ -6714,6 +6814,157 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown 17921@@ -6708,6 +6808,157 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
12671 17922
12672 17923
12673 17924
@@ -12825,7 +18076,7 @@ index de10fef84a1..1b0ee0d32c6 100755
12825 plugin_option= 18076 plugin_option=
12826 plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll" 18077 plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll"
12827 for plugin in $plugin_names; do 18078 for plugin in $plugin_names; do
12828@@ -6728,8 +6979,10 @@ for plugin in $plugin_names; do 18079@@ -6722,8 +6973,10 @@ for plugin in $plugin_names; do
12829 done 18080 done
12830 18081
12831 if test -n "$ac_tool_prefix"; then 18082 if test -n "$ac_tool_prefix"; then
@@ -12838,7 +18089,7 @@ index de10fef84a1..1b0ee0d32c6 100755
12838 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 18089 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
12839 $as_echo_n "checking for $ac_word... " >&6; } 18090 $as_echo_n "checking for $ac_word... " >&6; }
12840 if ${ac_cv_prog_AR+:} false; then : 18091 if ${ac_cv_prog_AR+:} false; then :
12841@@ -6745,7 +6998,7 @@ do 18092@@ -6739,7 +6992,7 @@ do
12842 test -z "$as_dir" && as_dir=. 18093 test -z "$as_dir" && as_dir=.
12843 for ac_exec_ext in '' $ac_executable_extensions; do 18094 for ac_exec_ext in '' $ac_executable_extensions; do
12844 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 18095 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
@@ -12847,7 +18098,7 @@ index de10fef84a1..1b0ee0d32c6 100755
12847 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 18098 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
12848 break 2 18099 break 2
12849 fi 18100 fi
12850@@ -6765,11 +7018,15 @@ $as_echo "no" >&6; } 18101@@ -6759,11 +7012,15 @@ $as_echo "no" >&6; }
12851 fi 18102 fi
12852 18103
12853 18104
@@ -12866,7 +18117,7 @@ index de10fef84a1..1b0ee0d32c6 100755
12866 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 18117 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
12867 $as_echo_n "checking for $ac_word... " >&6; } 18118 $as_echo_n "checking for $ac_word... " >&6; }
12868 if ${ac_cv_prog_ac_ct_AR+:} false; then : 18119 if ${ac_cv_prog_ac_ct_AR+:} false; then :
12869@@ -6785,7 +7042,7 @@ do 18120@@ -6779,7 +7036,7 @@ do
12870 test -z "$as_dir" && as_dir=. 18121 test -z "$as_dir" && as_dir=.
12871 for ac_exec_ext in '' $ac_executable_extensions; do 18122 for ac_exec_ext in '' $ac_executable_extensions; do
12872 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 18123 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
@@ -12875,7 +18126,7 @@ index de10fef84a1..1b0ee0d32c6 100755
12875 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 18126 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
12876 break 2 18127 break 2
12877 fi 18128 fi
12878@@ -6804,6 +7061,10 @@ else 18129@@ -6798,6 +7055,10 @@ else
12879 $as_echo "no" >&6; } 18130 $as_echo "no" >&6; }
12880 fi 18131 fi
12881 18132
@@ -12886,7 +18137,7 @@ index de10fef84a1..1b0ee0d32c6 100755
12886 if test "x$ac_ct_AR" = x; then 18137 if test "x$ac_ct_AR" = x; then
12887 AR="false" 18138 AR="false"
12888 else 18139 else
12889@@ -6815,25 +7076,19 @@ ac_tool_warned=yes ;; 18140@@ -6809,25 +7070,19 @@ ac_tool_warned=yes ;;
12890 esac 18141 esac
12891 AR=$ac_ct_AR 18142 AR=$ac_ct_AR
12892 fi 18143 fi
@@ -12921,7 +18172,7 @@ index de10fef84a1..1b0ee0d32c6 100755
12921 18172
12922 18173
12923 18174
12924@@ -6845,6 +7100,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru 18175@@ -6839,6 +7094,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru
12925 18176
12926 18177
12927 18178
@@ -12986,7 +18237,7 @@ index de10fef84a1..1b0ee0d32c6 100755
12986 if test -n "$ac_tool_prefix"; then 18237 if test -n "$ac_tool_prefix"; then
12987 # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. 18238 # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
12988 set dummy ${ac_tool_prefix}strip; ac_word=$2 18239 set dummy ${ac_tool_prefix}strip; ac_word=$2
12989@@ -7184,8 +7497,8 @@ esac 18240@@ -7178,8 +7491,8 @@ esac
12990 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" 18241 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
12991 18242
12992 # Transform an extracted symbol line into symbol name and symbol address 18243 # Transform an extracted symbol line into symbol name and symbol address
@@ -12997,7 +18248,7 @@ index de10fef84a1..1b0ee0d32c6 100755
12997 18248
12998 # Handle CRLF in mingw tool chain 18249 # Handle CRLF in mingw tool chain
12999 opt_cr= 18250 opt_cr=
13000@@ -7221,6 +7534,7 @@ for ac_symprfx in "" "_"; do 18251@@ -7215,6 +7528,7 @@ for ac_symprfx in "" "_"; do
13001 else 18252 else
13002 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" 18253 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
13003 fi 18254 fi
@@ -13005,7 +18256,7 @@ index de10fef84a1..1b0ee0d32c6 100755
13005 18256
13006 # Check to see that the pipe works correctly. 18257 # Check to see that the pipe works correctly.
13007 pipe_works=no 18258 pipe_works=no
13008@@ -7262,6 +7576,18 @@ _LT_EOF 18259@@ -7256,6 +7570,18 @@ _LT_EOF
13009 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then 18260 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
13010 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then 18261 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
13011 cat <<_LT_EOF > conftest.$ac_ext 18262 cat <<_LT_EOF > conftest.$ac_ext
@@ -13024,7 +18275,7 @@ index de10fef84a1..1b0ee0d32c6 100755
13024 #ifdef __cplusplus 18275 #ifdef __cplusplus
13025 extern "C" { 18276 extern "C" {
13026 #endif 18277 #endif
13027@@ -7273,7 +7599,7 @@ _LT_EOF 18278@@ -7267,7 +7593,7 @@ _LT_EOF
13028 cat <<_LT_EOF >> conftest.$ac_ext 18279 cat <<_LT_EOF >> conftest.$ac_ext
13029 18280
13030 /* The mapping between symbol names and symbols. */ 18281 /* The mapping between symbol names and symbols. */
@@ -13033,7 +18284,7 @@ index de10fef84a1..1b0ee0d32c6 100755
13033 const char *name; 18284 const char *name;
13034 void *address; 18285 void *address;
13035 } 18286 }
13036@@ -7299,8 +7625,8 @@ static const void *lt_preloaded_setup() { 18287@@ -7293,8 +7619,8 @@ static const void *lt_preloaded_setup() {
13037 _LT_EOF 18288 _LT_EOF
13038 # Now try linking the two files. 18289 # Now try linking the two files.
13039 mv conftest.$ac_objext conftstm.$ac_objext 18290 mv conftest.$ac_objext conftstm.$ac_objext
@@ -13044,7 +18295,7 @@ index de10fef84a1..1b0ee0d32c6 100755
13044 LIBS="conftstm.$ac_objext" 18295 LIBS="conftstm.$ac_objext"
13045 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" 18296 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
13046 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 18297 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
13047@@ -7310,8 +7636,8 @@ _LT_EOF 18298@@ -7304,8 +7630,8 @@ _LT_EOF
13048 test $ac_status = 0; } && test -s conftest${ac_exeext}; then 18299 test $ac_status = 0; } && test -s conftest${ac_exeext}; then
13049 pipe_works=yes 18300 pipe_works=yes
13050 fi 18301 fi
@@ -13055,7 +18306,7 @@ index de10fef84a1..1b0ee0d32c6 100755
13055 else 18306 else
13056 echo "cannot find nm_test_func in $nlist" >&5 18307 echo "cannot find nm_test_func in $nlist" >&5
13057 fi 18308 fi
13058@@ -7348,6 +7674,14 @@ else 18309@@ -7342,6 +7668,14 @@ else
13059 $as_echo "ok" >&6; } 18310 $as_echo "ok" >&6; }
13060 fi 18311 fi
13061 18312
@@ -13070,7 +18321,7 @@ index de10fef84a1..1b0ee0d32c6 100755
13070 18321
13071 18322
13072 18323
13073@@ -7366,6 +7700,47 @@ fi 18324@@ -7360,6 +7694,47 @@ fi
13074 18325
13075 18326
13076 18327
@@ -13118,7 +18369,7 @@ index de10fef84a1..1b0ee0d32c6 100755
13118 18369
13119 18370
13120 18371
13121@@ -7575,6 +7950,123 @@ esac 18372@@ -7569,6 +7944,123 @@ esac
13122 18373
13123 need_locks="$enable_libtool_lock" 18374 need_locks="$enable_libtool_lock"
13124 18375
@@ -13242,7 +18493,7 @@ index de10fef84a1..1b0ee0d32c6 100755
13242 18493
13243 case $host_os in 18494 case $host_os in
13244 rhapsody* | darwin*) 18495 rhapsody* | darwin*)
13245@@ -8138,6 +8630,8 @@ _LT_EOF 18496@@ -8132,6 +8624,8 @@ _LT_EOF
13246 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 18497 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
13247 echo "$AR cru libconftest.a conftest.o" >&5 18498 echo "$AR cru libconftest.a conftest.o" >&5
13248 $AR cru libconftest.a conftest.o 2>&5 18499 $AR cru libconftest.a conftest.o 2>&5
@@ -13251,7 +18502,7 @@ index de10fef84a1..1b0ee0d32c6 100755
13251 cat > conftest.c << _LT_EOF 18502 cat > conftest.c << _LT_EOF
13252 int main() { return 0;} 18503 int main() { return 0;}
13253 _LT_EOF 18504 _LT_EOF
13254@@ -8690,8 +9184,6 @@ fi 18505@@ -8684,8 +9178,6 @@ fi
13255 lt_prog_compiler_pic= 18506 lt_prog_compiler_pic=
13256 lt_prog_compiler_static= 18507 lt_prog_compiler_static=
13257 18508
@@ -13260,7 +18511,7 @@ index de10fef84a1..1b0ee0d32c6 100755
13260 18511
13261 if test "$GCC" = yes; then 18512 if test "$GCC" = yes; then
13262 lt_prog_compiler_wl='-Wl,' 18513 lt_prog_compiler_wl='-Wl,'
13263@@ -8857,6 +9349,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 18514@@ -8851,6 +9343,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
13264 lt_prog_compiler_pic='--shared' 18515 lt_prog_compiler_pic='--shared'
13265 lt_prog_compiler_static='--static' 18516 lt_prog_compiler_static='--static'
13266 ;; 18517 ;;
@@ -13273,7 +18524,7 @@ index de10fef84a1..1b0ee0d32c6 100755
13273 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) 18524 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
13274 # Portland Group compilers (*not* the Pentium gcc compiler, 18525 # Portland Group compilers (*not* the Pentium gcc compiler,
13275 # which looks to be a dead project) 18526 # which looks to be a dead project)
13276@@ -8919,7 +9417,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 18527@@ -8913,7 +9411,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
13277 lt_prog_compiler_pic='-KPIC' 18528 lt_prog_compiler_pic='-KPIC'
13278 lt_prog_compiler_static='-Bstatic' 18529 lt_prog_compiler_static='-Bstatic'
13279 case $cc_basename in 18530 case $cc_basename in
@@ -13282,7 +18533,7 @@ index de10fef84a1..1b0ee0d32c6 100755
13282 lt_prog_compiler_wl='-Qoption ld ';; 18533 lt_prog_compiler_wl='-Qoption ld ';;
13283 *) 18534 *)
13284 lt_prog_compiler_wl='-Wl,';; 18535 lt_prog_compiler_wl='-Wl,';;
13285@@ -8976,13 +9474,17 @@ case $host_os in 18536@@ -8970,13 +9468,17 @@ case $host_os in
13286 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" 18537 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
13287 ;; 18538 ;;
13288 esac 18539 esac
@@ -13306,7 +18557,7 @@ index de10fef84a1..1b0ee0d32c6 100755
13306 18557
13307 # 18558 #
13308 # Check to make sure the PIC flag actually works. 18559 # Check to make sure the PIC flag actually works.
13309@@ -9043,6 +9545,11 @@ fi 18560@@ -9037,6 +9539,11 @@ fi
13310 18561
13311 18562
13312 18563
@@ -13318,7 +18569,7 @@ index de10fef84a1..1b0ee0d32c6 100755
13318 # 18569 #
13319 # Check to make sure the static flag actually works. 18570 # Check to make sure the static flag actually works.
13320 # 18571 #
13321@@ -9393,7 +9900,8 @@ _LT_EOF 18572@@ -9387,7 +9894,8 @@ _LT_EOF
13322 allow_undefined_flag=unsupported 18573 allow_undefined_flag=unsupported
13323 always_export_symbols=no 18574 always_export_symbols=no
13324 enable_shared_with_static_runtimes=yes 18575 enable_shared_with_static_runtimes=yes
@@ -13328,7 +18579,7 @@ index de10fef84a1..1b0ee0d32c6 100755
13328 18579
13329 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then 18580 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
13330 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' 18581 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
13331@@ -9492,12 +10000,12 @@ _LT_EOF 18582@@ -9486,12 +9994,12 @@ _LT_EOF
13332 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' 18583 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
13333 hardcode_libdir_flag_spec= 18584 hardcode_libdir_flag_spec=
13334 hardcode_libdir_flag_spec_ld='-rpath $libdir' 18585 hardcode_libdir_flag_spec_ld='-rpath $libdir'
@@ -13343,7 +18594,7 @@ index de10fef84a1..1b0ee0d32c6 100755
13343 fi 18594 fi
13344 ;; 18595 ;;
13345 esac 18596 esac
13346@@ -9511,8 +10019,8 @@ _LT_EOF 18597@@ -9505,8 +10013,8 @@ _LT_EOF
13347 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' 18598 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
13348 wlarc= 18599 wlarc=
13349 else 18600 else
@@ -13354,7 +18605,7 @@ index de10fef84a1..1b0ee0d32c6 100755
13354 fi 18605 fi
13355 ;; 18606 ;;
13356 18607
13357@@ -9530,8 +10038,8 @@ _LT_EOF 18608@@ -9524,8 +10032,8 @@ _LT_EOF
13358 18609
13359 _LT_EOF 18610 _LT_EOF
13360 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 18611 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -13365,7 +18616,7 @@ index de10fef84a1..1b0ee0d32c6 100755
13365 else 18616 else
13366 ld_shlibs=no 18617 ld_shlibs=no
13367 fi 18618 fi
13368@@ -9577,8 +10085,8 @@ _LT_EOF 18619@@ -9571,8 +10079,8 @@ _LT_EOF
13369 18620
13370 *) 18621 *)
13371 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 18622 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -13376,7 +18627,7 @@ index de10fef84a1..1b0ee0d32c6 100755
13376 else 18627 else
13377 ld_shlibs=no 18628 ld_shlibs=no
13378 fi 18629 fi
13379@@ -9708,7 +10216,13 @@ _LT_EOF 18630@@ -9702,7 +10210,13 @@ _LT_EOF
13380 allow_undefined_flag='-berok' 18631 allow_undefined_flag='-berok'
13381 # Determine the default libpath from the value encoded in an 18632 # Determine the default libpath from the value encoded in an
13382 # empty executable. 18633 # empty executable.
@@ -13391,7 +18642,7 @@ index de10fef84a1..1b0ee0d32c6 100755
13391 /* end confdefs.h. */ 18642 /* end confdefs.h. */
13392 18643
13393 int 18644 int
13394@@ -9721,22 +10235,29 @@ main () 18645@@ -9715,22 +10229,29 @@ main ()
13395 _ACEOF 18646 _ACEOF
13396 if ac_fn_c_try_link "$LINENO"; then : 18647 if ac_fn_c_try_link "$LINENO"; then :
13397 18648
@@ -13434,7 +18685,7 @@ index de10fef84a1..1b0ee0d32c6 100755
13434 18685
13435 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 18686 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
13436 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" 18687 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"
13437@@ -9748,7 +10269,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 18688@@ -9742,7 +10263,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
13438 else 18689 else
13439 # Determine the default libpath from the value encoded in an 18690 # Determine the default libpath from the value encoded in an
13440 # empty executable. 18691 # empty executable.
@@ -13449,7 +18700,7 @@ index de10fef84a1..1b0ee0d32c6 100755
13449 /* end confdefs.h. */ 18700 /* end confdefs.h. */
13450 18701
13451 int 18702 int
13452@@ -9761,22 +10288,29 @@ main () 18703@@ -9755,22 +10282,29 @@ main ()
13453 _ACEOF 18704 _ACEOF
13454 if ac_fn_c_try_link "$LINENO"; then : 18705 if ac_fn_c_try_link "$LINENO"; then :
13455 18706
@@ -13492,7 +18743,7 @@ index de10fef84a1..1b0ee0d32c6 100755
13492 18743
13493 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 18744 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
13494 # Warning - without using the other run time loading flags, 18745 # Warning - without using the other run time loading flags,
13495@@ -9821,20 +10355,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 18746@@ -9815,20 +10349,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
13496 # Microsoft Visual C++. 18747 # Microsoft Visual C++.
13497 # hardcode_libdir_flag_spec is actually meaningless, as there is 18748 # hardcode_libdir_flag_spec is actually meaningless, as there is
13498 # no search path for DLLs. 18749 # no search path for DLLs.
@@ -13570,7 +18821,7 @@ index de10fef84a1..1b0ee0d32c6 100755
13570 ;; 18821 ;;
13571 18822
13572 darwin* | rhapsody*) 18823 darwin* | rhapsody*)
13573@@ -9895,7 +10472,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 18824@@ -9889,7 +10466,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
13574 18825
13575 # FreeBSD 3 and greater uses gcc -shared to do shared libraries. 18826 # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
13576 freebsd* | dragonfly*) 18827 freebsd* | dragonfly*)
@@ -13579,7 +18830,7 @@ index de10fef84a1..1b0ee0d32c6 100755
13579 hardcode_libdir_flag_spec='-R$libdir' 18830 hardcode_libdir_flag_spec='-R$libdir'
13580 hardcode_direct=yes 18831 hardcode_direct=yes
13581 hardcode_shlibpath_var=no 18832 hardcode_shlibpath_var=no
13582@@ -9903,7 +10480,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 18833@@ -9897,7 +10474,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
13583 18834
13584 hpux9*) 18835 hpux9*)
13585 if test "$GCC" = yes; then 18836 if test "$GCC" = yes; then
@@ -13588,7 +18839,7 @@ index de10fef84a1..1b0ee0d32c6 100755
13588 else 18839 else
13589 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' 18840 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'
13590 fi 18841 fi
13591@@ -9919,7 +10496,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 18842@@ -9913,7 +10490,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
13592 18843
13593 hpux10*) 18844 hpux10*)
13594 if test "$GCC" = yes && test "$with_gnu_ld" = no; then 18845 if test "$GCC" = yes && test "$with_gnu_ld" = no; then
@@ -13597,7 +18848,7 @@ index de10fef84a1..1b0ee0d32c6 100755
13597 else 18848 else
13598 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' 18849 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
13599 fi 18850 fi
13600@@ -9943,10 +10520,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 18851@@ -9937,10 +10514,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
13601 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' 18852 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
13602 ;; 18853 ;;
13603 ia64*) 18854 ia64*)
@@ -13610,7 +18861,7 @@ index de10fef84a1..1b0ee0d32c6 100755
13610 ;; 18861 ;;
13611 esac 18862 esac
13612 else 18863 else
13613@@ -10025,23 +10602,36 @@ fi 18864@@ -10019,23 +10596,36 @@ fi
13614 18865
13615 irix5* | irix6* | nonstopux*) 18866 irix5* | irix6* | nonstopux*)
13616 if test "$GCC" = yes; then 18867 if test "$GCC" = yes; then
@@ -13655,7 +18906,7 @@ index de10fef84a1..1b0ee0d32c6 100755
13655 else 18906 else
13656 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' 18907 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'
13657 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' 18908 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'
13658@@ -10126,7 +10716,7 @@ rm -f core conftest.err conftest.$ac_objext \ 18909@@ -10120,7 +10710,7 @@ rm -f core conftest.err conftest.$ac_objext \
13659 osf4* | osf5*) # as osf3* with the addition of -msym flag 18910 osf4* | osf5*) # as osf3* with the addition of -msym flag
13660 if test "$GCC" = yes; then 18911 if test "$GCC" = yes; then
13661 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' 18912 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
@@ -13664,7 +18915,7 @@ index de10fef84a1..1b0ee0d32c6 100755
13664 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' 18915 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
13665 else 18916 else
13666 allow_undefined_flag=' -expect_unresolved \*' 18917 allow_undefined_flag=' -expect_unresolved \*'
13667@@ -10145,9 +10735,9 @@ rm -f core conftest.err conftest.$ac_objext \ 18918@@ -10139,9 +10729,9 @@ rm -f core conftest.err conftest.$ac_objext \
13668 no_undefined_flag=' -z defs' 18919 no_undefined_flag=' -z defs'
13669 if test "$GCC" = yes; then 18920 if test "$GCC" = yes; then
13670 wlarc='${wl}' 18921 wlarc='${wl}'
@@ -13676,7 +18927,7 @@ index de10fef84a1..1b0ee0d32c6 100755
13676 else 18927 else
13677 case `$CC -V 2>&1` in 18928 case `$CC -V 2>&1` in
13678 *"Compilers 5.0"*) 18929 *"Compilers 5.0"*)
13679@@ -10723,8 +11313,9 @@ cygwin* | mingw* | pw32* | cegcc*) 18930@@ -10717,8 +11307,9 @@ cygwin* | mingw* | pw32* | cegcc*)
13680 need_version=no 18931 need_version=no
13681 need_lib_prefix=no 18932 need_lib_prefix=no
13682 18933
@@ -13688,7 +18939,7 @@ index de10fef84a1..1b0ee0d32c6 100755
13688 library_names_spec='$libname.dll.a' 18939 library_names_spec='$libname.dll.a'
13689 # DLL is installed to $(libdir)/../bin by postinstall_cmds 18940 # DLL is installed to $(libdir)/../bin by postinstall_cmds
13690 postinstall_cmds='base_file=`basename \${file}`~ 18941 postinstall_cmds='base_file=`basename \${file}`~
13691@@ -10757,13 +11348,71 @@ cygwin* | mingw* | pw32* | cegcc*) 18942@@ -10751,13 +11342,71 @@ cygwin* | mingw* | pw32* | cegcc*)
13692 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' 18943 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
13693 ;; 18944 ;;
13694 esac 18945 esac
@@ -13761,16 +19012,16 @@ index de10fef84a1..1b0ee0d32c6 100755
13761 # FIXME: first we should search . and the directory the executable is in 19012 # FIXME: first we should search . and the directory the executable is in
13762 shlibpath_var=PATH 19013 shlibpath_var=PATH
13763 ;; 19014 ;;
13764@@ -11641,7 +12290,7 @@ else 19015@@ -11635,7 +12284,7 @@ else
13765 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 19016 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
13766 lt_status=$lt_dlunknown 19017 lt_status=$lt_dlunknown
13767 cat > conftest.$ac_ext <<_LT_EOF 19018 cat > conftest.$ac_ext <<_LT_EOF
13768-#line 11644 "configure" 19019-#line 11638 "configure"
13769+#line $LINENO "configure" 19020+#line $LINENO "configure"
13770 #include "confdefs.h" 19021 #include "confdefs.h"
13771 19022
13772 #if HAVE_DLFCN_H 19023 #if HAVE_DLFCN_H
13773@@ -11685,10 +12334,10 @@ else 19024@@ -11679,10 +12328,10 @@ else
13774 /* When -fvisbility=hidden is used, assume the code has been annotated 19025 /* When -fvisbility=hidden is used, assume the code has been annotated
13775 correspondingly for the symbols needed. */ 19026 correspondingly for the symbols needed. */
13776 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 19027 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
@@ -13783,16 +19034,16 @@ index de10fef84a1..1b0ee0d32c6 100755
13783 int main () 19034 int main ()
13784 { 19035 {
13785 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 19036 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
13786@@ -11747,7 +12396,7 @@ else 19037@@ -11741,7 +12390,7 @@ else
13787 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 19038 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
13788 lt_status=$lt_dlunknown 19039 lt_status=$lt_dlunknown
13789 cat > conftest.$ac_ext <<_LT_EOF 19040 cat > conftest.$ac_ext <<_LT_EOF
13790-#line 11750 "configure" 19041-#line 11744 "configure"
13791+#line $LINENO "configure" 19042+#line $LINENO "configure"
13792 #include "confdefs.h" 19043 #include "confdefs.h"
13793 19044
13794 #if HAVE_DLFCN_H 19045 #if HAVE_DLFCN_H
13795@@ -11791,10 +12440,10 @@ else 19046@@ -11785,10 +12434,10 @@ else
13796 /* When -fvisbility=hidden is used, assume the code has been annotated 19047 /* When -fvisbility=hidden is used, assume the code has been annotated
13797 correspondingly for the symbols needed. */ 19048 correspondingly for the symbols needed. */
13798 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 19049 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
@@ -13805,7 +19056,7 @@ index de10fef84a1..1b0ee0d32c6 100755
13805 int main () 19056 int main ()
13806 { 19057 {
13807 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 19058 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
13808@@ -14479,13 +15128,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' 19059@@ -14473,13 +15122,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
13809 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' 19060 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
13810 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' 19061 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
13811 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' 19062 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
@@ -13826,7 +19077,7 @@ index de10fef84a1..1b0ee0d32c6 100755
13826 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' 19077 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
13827 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' 19078 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
13828 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' 19079 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
13829@@ -14500,14 +15156,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de 19080@@ -14494,14 +15150,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de
13830 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' 19081 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
13831 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' 19082 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
13832 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"`' 19083 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"`'
@@ -13845,7 +19096,7 @@ index de10fef84a1..1b0ee0d32c6 100755
13845 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' 19096 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
13846 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' 19097 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
13847 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' 19098 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
13848@@ -14540,12 +15199,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q 19099@@ -14534,12 +15193,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q
13849 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' 19100 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
13850 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' 19101 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
13851 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' 19102 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
@@ -13859,7 +19110,7 @@ index de10fef84a1..1b0ee0d32c6 100755
13859 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' 19110 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
13860 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' 19111 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
13861 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' 19112 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
13862@@ -14600,8 +15259,13 @@ reload_flag \ 19113@@ -14594,8 +15253,13 @@ reload_flag \
13863 OBJDUMP \ 19114 OBJDUMP \
13864 deplibs_check_method \ 19115 deplibs_check_method \
13865 file_magic_cmd \ 19116 file_magic_cmd \
@@ -13873,7 +19124,7 @@ index de10fef84a1..1b0ee0d32c6 100755
13873 STRIP \ 19124 STRIP \
13874 RANLIB \ 19125 RANLIB \
13875 CC \ 19126 CC \
13876@@ -14611,12 +15275,14 @@ lt_cv_sys_global_symbol_pipe \ 19127@@ -14605,12 +15269,14 @@ lt_cv_sys_global_symbol_pipe \
13877 lt_cv_sys_global_symbol_to_cdecl \ 19128 lt_cv_sys_global_symbol_to_cdecl \
13878 lt_cv_sys_global_symbol_to_c_name_address \ 19129 lt_cv_sys_global_symbol_to_c_name_address \
13879 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ 19130 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
@@ -13889,7 +19140,7 @@ index de10fef84a1..1b0ee0d32c6 100755
13889 DSYMUTIL \ 19140 DSYMUTIL \
13890 NMEDIT \ 19141 NMEDIT \
13891 LIPO \ 19142 LIPO \
13892@@ -14632,7 +15298,6 @@ no_undefined_flag \ 19143@@ -14626,7 +15292,6 @@ no_undefined_flag \
13893 hardcode_libdir_flag_spec \ 19144 hardcode_libdir_flag_spec \
13894 hardcode_libdir_flag_spec_ld \ 19145 hardcode_libdir_flag_spec_ld \
13895 hardcode_libdir_separator \ 19146 hardcode_libdir_separator \
@@ -13897,7 +19148,7 @@ index de10fef84a1..1b0ee0d32c6 100755
13897 exclude_expsyms \ 19148 exclude_expsyms \
13898 include_expsyms \ 19149 include_expsyms \
13899 file_list_spec \ 19150 file_list_spec \
13900@@ -14668,6 +15333,7 @@ module_cmds \ 19151@@ -14662,6 +15327,7 @@ module_cmds \
13901 module_expsym_cmds \ 19152 module_expsym_cmds \
13902 export_symbols_cmds \ 19153 export_symbols_cmds \
13903 prelink_cmds \ 19154 prelink_cmds \
@@ -13905,7 +19156,7 @@ index de10fef84a1..1b0ee0d32c6 100755
13905 postinstall_cmds \ 19156 postinstall_cmds \
13906 postuninstall_cmds \ 19157 postuninstall_cmds \
13907 finish_cmds \ 19158 finish_cmds \
13908@@ -15424,7 +16090,8 @@ $as_echo X"$file" | 19159@@ -15418,7 +16084,8 @@ $as_echo X"$file" |
13909 # NOTE: Changes made to this file will be lost: look at ltmain.sh. 19160 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
13910 # 19161 #
13911 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 19162 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
@@ -13915,7 +19166,7 @@ index de10fef84a1..1b0ee0d32c6 100755
13915 # Written by Gordon Matzigkeit, 1996 19166 # Written by Gordon Matzigkeit, 1996
13916 # 19167 #
13917 # This file is part of GNU Libtool. 19168 # This file is part of GNU Libtool.
13918@@ -15527,19 +16194,42 @@ SP2NL=$lt_lt_SP2NL 19169@@ -15521,19 +16188,42 @@ SP2NL=$lt_lt_SP2NL
13919 # turn newlines into spaces. 19170 # turn newlines into spaces.
13920 NL2SP=$lt_lt_NL2SP 19171 NL2SP=$lt_lt_NL2SP
13921 19172
@@ -13959,7 +19210,7 @@ index de10fef84a1..1b0ee0d32c6 100755
13959 # A symbol stripping program. 19210 # A symbol stripping program.
13960 STRIP=$lt_STRIP 19211 STRIP=$lt_STRIP
13961 19212
13962@@ -15569,6 +16259,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address 19213@@ -15563,6 +16253,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
13963 # Transform the output of nm in a C name address pair when lib prefix is needed. 19214 # Transform the output of nm in a C name address pair when lib prefix is needed.
13964 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix 19215 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
13965 19216
@@ -13972,7 +19223,7 @@ index de10fef84a1..1b0ee0d32c6 100755
13972 # The name of the directory that contains temporary libtool files. 19223 # The name of the directory that contains temporary libtool files.
13973 objdir=$objdir 19224 objdir=$objdir
13974 19225
13975@@ -15578,6 +16274,9 @@ MAGIC_CMD=$MAGIC_CMD 19226@@ -15572,6 +16268,9 @@ MAGIC_CMD=$MAGIC_CMD
13976 # Must we lock files when doing compilation? 19227 # Must we lock files when doing compilation?
13977 need_locks=$lt_need_locks 19228 need_locks=$lt_need_locks
13978 19229
@@ -13982,7 +19233,7 @@ index de10fef84a1..1b0ee0d32c6 100755
13982 # Tool to manipulate archived DWARF debug symbol files on Mac OS X. 19233 # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
13983 DSYMUTIL=$lt_DSYMUTIL 19234 DSYMUTIL=$lt_DSYMUTIL
13984 19235
13985@@ -15692,12 +16391,12 @@ with_gcc=$GCC 19236@@ -15686,12 +16385,12 @@ with_gcc=$GCC
13986 # Compiler flag to turn off builtin functions. 19237 # Compiler flag to turn off builtin functions.
13987 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag 19238 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
13988 19239
@@ -13998,7 +19249,7 @@ index de10fef84a1..1b0ee0d32c6 100755
13998 # Compiler flag to prevent dynamic linking. 19249 # Compiler flag to prevent dynamic linking.
13999 link_static_flag=$lt_lt_prog_compiler_static 19250 link_static_flag=$lt_lt_prog_compiler_static
14000 19251
14001@@ -15784,9 +16483,6 @@ inherit_rpath=$inherit_rpath 19252@@ -15778,9 +16477,6 @@ inherit_rpath=$inherit_rpath
14002 # Whether libtool must link a program against all its dependency libraries. 19253 # Whether libtool must link a program against all its dependency libraries.
14003 link_all_deplibs=$link_all_deplibs 19254 link_all_deplibs=$link_all_deplibs
14004 19255
@@ -14008,7 +19259,7 @@ index de10fef84a1..1b0ee0d32c6 100755
14008 # Set to "yes" if exported symbols are required. 19259 # Set to "yes" if exported symbols are required.
14009 always_export_symbols=$always_export_symbols 19260 always_export_symbols=$always_export_symbols
14010 19261
14011@@ -15802,6 +16498,9 @@ include_expsyms=$lt_include_expsyms 19262@@ -15796,6 +16492,9 @@ include_expsyms=$lt_include_expsyms
14012 # Commands necessary for linking programs (against libraries) with templates. 19263 # Commands necessary for linking programs (against libraries) with templates.
14013 prelink_cmds=$lt_prelink_cmds 19264 prelink_cmds=$lt_prelink_cmds
14014 19265
@@ -14018,7 +19269,7 @@ index de10fef84a1..1b0ee0d32c6 100755
14018 # Specify filename containing input files. 19269 # Specify filename containing input files.
14019 file_list_spec=$lt_file_list_spec 19270 file_list_spec=$lt_file_list_spec
14020 19271
14021@@ -15834,210 +16533,169 @@ ltmain="$ac_aux_dir/ltmain.sh" 19272@@ -15828,210 +16527,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
14022 # if finds mixed CR/LF and LF-only lines. Since sed operates in 19273 # if finds mixed CR/LF and LF-only lines. Since sed operates in
14023 # text mode, it properly converts lines to CR/LF. This bash problem 19274 # text mode, it properly converts lines to CR/LF. This bash problem
14024 # is reportedly fixed, but why not run on old versions too? 19275 # is reportedly fixed, but why not run on old versions too?
@@ -14393,7 +19644,7 @@ index de10fef84a1..1b0ee0d32c6 100755
14393 chmod +x "$ofile" 19644 chmod +x "$ofile"
14394 19645
14395diff --git a/libtool.m4 b/libtool.m4 19646diff --git a/libtool.m4 b/libtool.m4
14396index a216bb14e99..e37c45ac0b1 100644 19647index ad63ebbb385..b65c22bf80d 100644
14397--- a/libtool.m4 19648--- a/libtool.m4
14398+++ b/libtool.m4 19649+++ b/libtool.m4
14399@@ -1,7 +1,8 @@ 19650@@ -1,7 +1,8 @@
@@ -14825,7 +20076,7 @@ index a216bb14e99..e37c45ac0b1 100644
14825 ])# _LT_CHECK_MAGIC_METHOD 20076 ])# _LT_CHECK_MAGIC_METHOD
14826 20077
14827 20078
14828@@ -3299,6 +3460,67 @@ dnl aclocal-1.4 backwards compatibility: 20079@@ -3305,6 +3466,67 @@ dnl aclocal-1.4 backwards compatibility:
14829 dnl AC_DEFUN([AM_PROG_NM], []) 20080 dnl AC_DEFUN([AM_PROG_NM], [])
14830 dnl AC_DEFUN([AC_PROG_NM], []) 20081 dnl AC_DEFUN([AC_PROG_NM], [])
14831 20082
@@ -14893,7 +20144,7 @@ index a216bb14e99..e37c45ac0b1 100644
14893 20144
14894 # LT_LIB_M 20145 # LT_LIB_M
14895 # -------- 20146 # --------
14896@@ -3425,8 +3647,8 @@ esac 20147@@ -3431,8 +3653,8 @@ esac
14897 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" 20148 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
14898 20149
14899 # Transform an extracted symbol line into symbol name and symbol address 20150 # Transform an extracted symbol line into symbol name and symbol address
@@ -14904,7 +20155,7 @@ index a216bb14e99..e37c45ac0b1 100644
14904 20155
14905 # Handle CRLF in mingw tool chain 20156 # Handle CRLF in mingw tool chain
14906 opt_cr= 20157 opt_cr=
14907@@ -3462,6 +3684,7 @@ for ac_symprfx in "" "_"; do 20158@@ -3468,6 +3690,7 @@ for ac_symprfx in "" "_"; do
14908 else 20159 else
14909 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" 20160 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
14910 fi 20161 fi
@@ -14912,7 +20163,7 @@ index a216bb14e99..e37c45ac0b1 100644
14912 20163
14913 # Check to see that the pipe works correctly. 20164 # Check to see that the pipe works correctly.
14914 pipe_works=no 20165 pipe_works=no
14915@@ -3495,6 +3718,18 @@ _LT_EOF 20166@@ -3501,6 +3724,18 @@ _LT_EOF
14916 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then 20167 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
14917 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then 20168 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
14918 cat <<_LT_EOF > conftest.$ac_ext 20169 cat <<_LT_EOF > conftest.$ac_ext
@@ -14931,7 +20182,7 @@ index a216bb14e99..e37c45ac0b1 100644
14931 #ifdef __cplusplus 20182 #ifdef __cplusplus
14932 extern "C" { 20183 extern "C" {
14933 #endif 20184 #endif
14934@@ -3506,7 +3741,7 @@ _LT_EOF 20185@@ -3512,7 +3747,7 @@ _LT_EOF
14935 cat <<_LT_EOF >> conftest.$ac_ext 20186 cat <<_LT_EOF >> conftest.$ac_ext
14936 20187
14937 /* The mapping between symbol names and symbols. */ 20188 /* The mapping between symbol names and symbols. */
@@ -14940,7 +20191,7 @@ index a216bb14e99..e37c45ac0b1 100644
14940 const char *name; 20191 const char *name;
14941 void *address; 20192 void *address;
14942 } 20193 }
14943@@ -3532,15 +3767,15 @@ static const void *lt_preloaded_setup() { 20194@@ -3538,15 +3773,15 @@ static const void *lt_preloaded_setup() {
14944 _LT_EOF 20195 _LT_EOF
14945 # Now try linking the two files. 20196 # Now try linking the two files.
14946 mv conftest.$ac_objext conftstm.$ac_objext 20197 mv conftest.$ac_objext conftstm.$ac_objext
@@ -14960,7 +20211,7 @@ index a216bb14e99..e37c45ac0b1 100644
14960 else 20211 else
14961 echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD 20212 echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD
14962 fi 20213 fi
14963@@ -3573,6 +3808,13 @@ else 20214@@ -3579,6 +3814,13 @@ else
14964 AC_MSG_RESULT(ok) 20215 AC_MSG_RESULT(ok)
14965 fi 20216 fi
14966 20217
@@ -14974,7 +20225,7 @@ index a216bb14e99..e37c45ac0b1 100644
14974 _LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1], 20225 _LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1],
14975 [Take the output of nm and produce a listing of raw symbols and C names]) 20226 [Take the output of nm and produce a listing of raw symbols and C names])
14976 _LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1], 20227 _LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1],
14977@@ -3583,6 +3825,8 @@ _LT_DECL([global_symbol_to_c_name_address], 20228@@ -3589,6 +3831,8 @@ _LT_DECL([global_symbol_to_c_name_address],
14978 _LT_DECL([global_symbol_to_c_name_address_lib_prefix], 20229 _LT_DECL([global_symbol_to_c_name_address_lib_prefix],
14979 [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1], 20230 [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1],
14980 [Transform the output of nm in a C name address pair when lib prefix is needed]) 20231 [Transform the output of nm in a C name address pair when lib prefix is needed])
@@ -14983,7 +20234,7 @@ index a216bb14e99..e37c45ac0b1 100644
14983 ]) # _LT_CMD_GLOBAL_SYMBOLS 20234 ]) # _LT_CMD_GLOBAL_SYMBOLS
14984 20235
14985 20236
14986@@ -3594,7 +3838,6 @@ _LT_TAGVAR(lt_prog_compiler_wl, $1)= 20237@@ -3600,7 +3844,6 @@ _LT_TAGVAR(lt_prog_compiler_wl, $1)=
14987 _LT_TAGVAR(lt_prog_compiler_pic, $1)= 20238 _LT_TAGVAR(lt_prog_compiler_pic, $1)=
14988 _LT_TAGVAR(lt_prog_compiler_static, $1)= 20239 _LT_TAGVAR(lt_prog_compiler_static, $1)=
14989 20240
@@ -14991,7 +20242,7 @@ index a216bb14e99..e37c45ac0b1 100644
14991 m4_if([$1], [CXX], [ 20242 m4_if([$1], [CXX], [
14992 # C++ specific cases for pic, static, wl, etc. 20243 # C++ specific cases for pic, static, wl, etc.
14993 if test "$GXX" = yes; then 20244 if test "$GXX" = yes; then
14994@@ -3700,6 +3943,12 @@ m4_if([$1], [CXX], [ 20245@@ -3706,6 +3949,12 @@ m4_if([$1], [CXX], [
14995 ;; 20246 ;;
14996 esac 20247 esac
14997 ;; 20248 ;;
@@ -15004,7 +20255,7 @@ index a216bb14e99..e37c45ac0b1 100644
15004 dgux*) 20255 dgux*)
15005 case $cc_basename in 20256 case $cc_basename in
15006 ec++*) 20257 ec++*)
15007@@ -3852,7 +4101,7 @@ m4_if([$1], [CXX], [ 20258@@ -3858,7 +4107,7 @@ m4_if([$1], [CXX], [
15008 ;; 20259 ;;
15009 solaris*) 20260 solaris*)
15010 case $cc_basename in 20261 case $cc_basename in
@@ -15013,7 +20264,7 @@ index a216bb14e99..e37c45ac0b1 100644
15013 # Sun C++ 4.2, 5.x and Centerline C++ 20264 # Sun C++ 4.2, 5.x and Centerline C++
15014 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' 20265 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
15015 _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' 20266 _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
15016@@ -4075,6 +4324,12 @@ m4_if([$1], [CXX], [ 20267@@ -4081,6 +4330,12 @@ m4_if([$1], [CXX], [
15017 _LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared' 20268 _LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared'
15018 _LT_TAGVAR(lt_prog_compiler_static, $1)='--static' 20269 _LT_TAGVAR(lt_prog_compiler_static, $1)='--static'
15019 ;; 20270 ;;
@@ -15026,7 +20277,7 @@ index a216bb14e99..e37c45ac0b1 100644
15026 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) 20277 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
15027 # Portland Group compilers (*not* the Pentium gcc compiler, 20278 # Portland Group compilers (*not* the Pentium gcc compiler,
15028 # which looks to be a dead project) 20279 # which looks to be a dead project)
15029@@ -4137,7 +4392,7 @@ m4_if([$1], [CXX], [ 20280@@ -4143,7 +4398,7 @@ m4_if([$1], [CXX], [
15030 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' 20281 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
15031 _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' 20282 _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
15032 case $cc_basename in 20283 case $cc_basename in
@@ -15035,7 +20286,7 @@ index a216bb14e99..e37c45ac0b1 100644
15035 _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';; 20286 _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';;
15036 *) 20287 *)
15037 _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';; 20288 _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';;
15038@@ -4194,9 +4449,11 @@ case $host_os in 20289@@ -4200,9 +4455,11 @@ case $host_os in
15039 _LT_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])" 20290 _LT_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])"
15040 ;; 20291 ;;
15041 esac 20292 esac
@@ -15050,7 +20301,7 @@ index a216bb14e99..e37c45ac0b1 100644
15050 20301
15051 # 20302 #
15052 # Check to make sure the PIC flag actually works. 20303 # Check to make sure the PIC flag actually works.
15053@@ -4215,6 +4472,8 @@ fi 20304@@ -4221,6 +4478,8 @@ fi
15054 _LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1], 20305 _LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1],
15055 [Additional compiler flags for building library objects]) 20306 [Additional compiler flags for building library objects])
15056 20307
@@ -15059,7 +20310,7 @@ index a216bb14e99..e37c45ac0b1 100644
15059 # 20310 #
15060 # Check to make sure the static flag actually works. 20311 # Check to make sure the static flag actually works.
15061 # 20312 #
15062@@ -4235,6 +4494,7 @@ _LT_TAGDECL([link_static_flag], [lt_prog_compiler_static], [1], 20313@@ -4241,6 +4500,7 @@ _LT_TAGDECL([link_static_flag], [lt_prog_compiler_static], [1],
15063 m4_defun([_LT_LINKER_SHLIBS], 20314 m4_defun([_LT_LINKER_SHLIBS],
15064 [AC_REQUIRE([LT_PATH_LD])dnl 20315 [AC_REQUIRE([LT_PATH_LD])dnl
15065 AC_REQUIRE([LT_PATH_NM])dnl 20316 AC_REQUIRE([LT_PATH_NM])dnl
@@ -15067,7 +20318,7 @@ index a216bb14e99..e37c45ac0b1 100644
15067 m4_require([_LT_FILEUTILS_DEFAULTS])dnl 20318 m4_require([_LT_FILEUTILS_DEFAULTS])dnl
15068 m4_require([_LT_DECL_EGREP])dnl 20319 m4_require([_LT_DECL_EGREP])dnl
15069 m4_require([_LT_DECL_SED])dnl 20320 m4_require([_LT_DECL_SED])dnl
15070@@ -4243,6 +4503,7 @@ m4_require([_LT_TAG_COMPILER])dnl 20321@@ -4249,6 +4509,7 @@ m4_require([_LT_TAG_COMPILER])dnl
15071 AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) 20322 AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
15072 m4_if([$1], [CXX], [ 20323 m4_if([$1], [CXX], [
15073 _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' 20324 _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
@@ -15075,7 +20326,7 @@ index a216bb14e99..e37c45ac0b1 100644
15075 case $host_os in 20326 case $host_os in
15076 aix[[4-9]]*) 20327 aix[[4-9]]*)
15077 # If we're using GNU nm, then we don't want the "-C" option. 20328 # If we're using GNU nm, then we don't want the "-C" option.
15078@@ -4257,15 +4518,20 @@ m4_if([$1], [CXX], [ 20329@@ -4263,15 +4524,20 @@ m4_if([$1], [CXX], [
15079 ;; 20330 ;;
15080 pw32*) 20331 pw32*)
15081 _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds" 20332 _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
@@ -15101,7 +20352,7 @@ index a216bb14e99..e37c45ac0b1 100644
15101 ], [ 20352 ], [
15102 runpath_var= 20353 runpath_var=
15103 _LT_TAGVAR(allow_undefined_flag, $1)= 20354 _LT_TAGVAR(allow_undefined_flag, $1)=
15104@@ -4433,7 +4699,8 @@ _LT_EOF 20355@@ -4439,7 +4705,8 @@ _LT_EOF
15105 _LT_TAGVAR(allow_undefined_flag, $1)=unsupported 20356 _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
15106 _LT_TAGVAR(always_export_symbols, $1)=no 20357 _LT_TAGVAR(always_export_symbols, $1)=no
15107 _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes 20358 _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
@@ -15111,7 +20362,7 @@ index a216bb14e99..e37c45ac0b1 100644
15111 20362
15112 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then 20363 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
15113 _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' 20364 _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
15114@@ -4532,12 +4799,12 @@ _LT_EOF 20365@@ -4538,12 +4805,12 @@ _LT_EOF
15115 _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive' 20366 _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive'
15116 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= 20367 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
15117 _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir' 20368 _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
@@ -15126,7 +20377,7 @@ index a216bb14e99..e37c45ac0b1 100644
15126 fi 20377 fi
15127 ;; 20378 ;;
15128 esac 20379 esac
15129@@ -4551,8 +4818,8 @@ _LT_EOF 20380@@ -4557,8 +4824,8 @@ _LT_EOF
15130 _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' 20381 _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
15131 wlarc= 20382 wlarc=
15132 else 20383 else
@@ -15137,7 +20388,7 @@ index a216bb14e99..e37c45ac0b1 100644
15137 fi 20388 fi
15138 ;; 20389 ;;
15139 20390
15140@@ -4570,8 +4837,8 @@ _LT_EOF 20391@@ -4576,8 +4843,8 @@ _LT_EOF
15141 20392
15142 _LT_EOF 20393 _LT_EOF
15143 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 20394 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -15148,7 +20399,7 @@ index a216bb14e99..e37c45ac0b1 100644
15148 else 20399 else
15149 _LT_TAGVAR(ld_shlibs, $1)=no 20400 _LT_TAGVAR(ld_shlibs, $1)=no
15150 fi 20401 fi
15151@@ -4617,8 +4884,8 @@ _LT_EOF 20402@@ -4623,8 +4890,8 @@ _LT_EOF
15152 20403
15153 *) 20404 *)
15154 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 20405 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -15159,7 +20410,7 @@ index a216bb14e99..e37c45ac0b1 100644
15159 else 20410 else
15160 _LT_TAGVAR(ld_shlibs, $1)=no 20411 _LT_TAGVAR(ld_shlibs, $1)=no
15161 fi 20412 fi
15162@@ -4748,7 +5015,7 @@ _LT_EOF 20413@@ -4754,7 +5021,7 @@ _LT_EOF
15163 _LT_TAGVAR(allow_undefined_flag, $1)='-berok' 20414 _LT_TAGVAR(allow_undefined_flag, $1)='-berok'
15164 # Determine the default libpath from the value encoded in an 20415 # Determine the default libpath from the value encoded in an
15165 # empty executable. 20416 # empty executable.
@@ -15168,7 +20419,7 @@ index a216bb14e99..e37c45ac0b1 100644
15168 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" 20419 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
15169 _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" 20420 _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
15170 else 20421 else
15171@@ -4759,7 +5026,7 @@ _LT_EOF 20422@@ -4765,7 +5032,7 @@ _LT_EOF
15172 else 20423 else
15173 # Determine the default libpath from the value encoded in an 20424 # Determine the default libpath from the value encoded in an
15174 # empty executable. 20425 # empty executable.
@@ -15177,7 +20428,7 @@ index a216bb14e99..e37c45ac0b1 100644
15177 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" 20428 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
15178 # Warning - without using the other run time loading flags, 20429 # Warning - without using the other run time loading flags,
15179 # -berok will link without error, but may produce a broken library. 20430 # -berok will link without error, but may produce a broken library.
15180@@ -4803,20 +5070,63 @@ _LT_EOF 20431@@ -4809,20 +5076,63 @@ _LT_EOF
15181 # Microsoft Visual C++. 20432 # Microsoft Visual C++.
15182 # hardcode_libdir_flag_spec is actually meaningless, as there is 20433 # hardcode_libdir_flag_spec is actually meaningless, as there is
15183 # no search path for DLLs. 20434 # no search path for DLLs.
@@ -15255,7 +20506,7 @@ index a216bb14e99..e37c45ac0b1 100644
15255 ;; 20506 ;;
15256 20507
15257 darwin* | rhapsody*) 20508 darwin* | rhapsody*)
15258@@ -4850,7 +5160,7 @@ _LT_EOF 20509@@ -4856,7 +5166,7 @@ _LT_EOF
15259 20510
15260 # FreeBSD 3 and greater uses gcc -shared to do shared libraries. 20511 # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
15261 freebsd* | dragonfly*) 20512 freebsd* | dragonfly*)
@@ -15264,7 +20515,7 @@ index a216bb14e99..e37c45ac0b1 100644
15264 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' 20515 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
15265 _LT_TAGVAR(hardcode_direct, $1)=yes 20516 _LT_TAGVAR(hardcode_direct, $1)=yes
15266 _LT_TAGVAR(hardcode_shlibpath_var, $1)=no 20517 _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
15267@@ -4858,7 +5168,7 @@ _LT_EOF 20518@@ -4864,7 +5174,7 @@ _LT_EOF
15268 20519
15269 hpux9*) 20520 hpux9*)
15270 if test "$GCC" = yes; then 20521 if test "$GCC" = yes; then
@@ -15273,7 +20524,7 @@ index a216bb14e99..e37c45ac0b1 100644
15273 else 20524 else
15274 _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' 20525 _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
15275 fi 20526 fi
15276@@ -4874,7 +5184,7 @@ _LT_EOF 20527@@ -4880,7 +5190,7 @@ _LT_EOF
15277 20528
15278 hpux10*) 20529 hpux10*)
15279 if test "$GCC" = yes && test "$with_gnu_ld" = no; then 20530 if test "$GCC" = yes && test "$with_gnu_ld" = no; then
@@ -15282,7 +20533,7 @@ index a216bb14e99..e37c45ac0b1 100644
15282 else 20533 else
15283 _LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' 20534 _LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
15284 fi 20535 fi
15285@@ -4898,10 +5208,10 @@ _LT_EOF 20536@@ -4904,10 +5214,10 @@ _LT_EOF
15286 _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' 20537 _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
15287 ;; 20538 ;;
15288 ia64*) 20539 ia64*)
@@ -15295,7 +20546,7 @@ index a216bb14e99..e37c45ac0b1 100644
15295 ;; 20546 ;;
15296 esac 20547 esac
15297 else 20548 else
15298@@ -4948,16 +5258,31 @@ _LT_EOF 20549@@ -4954,16 +5264,31 @@ _LT_EOF
15299 20550
15300 irix5* | irix6* | nonstopux*) 20551 irix5* | irix6* | nonstopux*)
15301 if test "$GCC" = yes; then 20552 if test "$GCC" = yes; then
@@ -15334,7 +20585,7 @@ index a216bb14e99..e37c45ac0b1 100644
15334 else 20585 else
15335 _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' 20586 _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
15336 _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' 20587 _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
15337@@ -5042,7 +5367,7 @@ _LT_EOF 20588@@ -5048,7 +5373,7 @@ _LT_EOF
15338 osf4* | osf5*) # as osf3* with the addition of -msym flag 20589 osf4* | osf5*) # as osf3* with the addition of -msym flag
15339 if test "$GCC" = yes; then 20590 if test "$GCC" = yes; then
15340 _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' 20591 _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
@@ -15343,7 +20594,7 @@ index a216bb14e99..e37c45ac0b1 100644
15343 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' 20594 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
15344 else 20595 else
15345 _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' 20596 _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
15346@@ -5061,9 +5386,9 @@ _LT_EOF 20597@@ -5067,9 +5392,9 @@ _LT_EOF
15347 _LT_TAGVAR(no_undefined_flag, $1)=' -z defs' 20598 _LT_TAGVAR(no_undefined_flag, $1)=' -z defs'
15348 if test "$GCC" = yes; then 20599 if test "$GCC" = yes; then
15349 wlarc='${wl}' 20600 wlarc='${wl}'
@@ -15355,7 +20606,7 @@ index a216bb14e99..e37c45ac0b1 100644
15355 else 20606 else
15356 case `$CC -V 2>&1` in 20607 case `$CC -V 2>&1` in
15357 *"Compilers 5.0"*) 20608 *"Compilers 5.0"*)
15358@@ -5335,8 +5660,6 @@ _LT_TAGDECL([], [inherit_rpath], [0], 20609@@ -5341,8 +5666,6 @@ _LT_TAGDECL([], [inherit_rpath], [0],
15359 to runtime path list]) 20610 to runtime path list])
15360 _LT_TAGDECL([], [link_all_deplibs], [0], 20611 _LT_TAGDECL([], [link_all_deplibs], [0],
15361 [Whether libtool must link a program against all its dependency libraries]) 20612 [Whether libtool must link a program against all its dependency libraries])
@@ -15364,7 +20615,7 @@ index a216bb14e99..e37c45ac0b1 100644
15364 _LT_TAGDECL([], [always_export_symbols], [0], 20615 _LT_TAGDECL([], [always_export_symbols], [0],
15365 [Set to "yes" if exported symbols are required]) 20616 [Set to "yes" if exported symbols are required])
15366 _LT_TAGDECL([], [export_symbols_cmds], [2], 20617 _LT_TAGDECL([], [export_symbols_cmds], [2],
15367@@ -5347,6 +5670,8 @@ _LT_TAGDECL([], [include_expsyms], [1], 20618@@ -5353,6 +5676,8 @@ _LT_TAGDECL([], [include_expsyms], [1],
15368 [Symbols that must always be exported]) 20619 [Symbols that must always be exported])
15369 _LT_TAGDECL([], [prelink_cmds], [2], 20620 _LT_TAGDECL([], [prelink_cmds], [2],
15370 [Commands necessary for linking programs (against libraries) with templates]) 20621 [Commands necessary for linking programs (against libraries) with templates])
@@ -15373,7 +20624,7 @@ index a216bb14e99..e37c45ac0b1 100644
15373 _LT_TAGDECL([], [file_list_spec], [1], 20624 _LT_TAGDECL([], [file_list_spec], [1],
15374 [Specify filename containing input files]) 20625 [Specify filename containing input files])
15375 dnl FIXME: Not yet implemented 20626 dnl FIXME: Not yet implemented
15376@@ -5448,6 +5773,7 @@ CC="$lt_save_CC" 20627@@ -5454,6 +5779,7 @@ CC="$lt_save_CC"
15377 m4_defun([_LT_LANG_CXX_CONFIG], 20628 m4_defun([_LT_LANG_CXX_CONFIG],
15378 [m4_require([_LT_FILEUTILS_DEFAULTS])dnl 20629 [m4_require([_LT_FILEUTILS_DEFAULTS])dnl
15379 m4_require([_LT_DECL_EGREP])dnl 20630 m4_require([_LT_DECL_EGREP])dnl
@@ -15381,7 +20632,7 @@ index a216bb14e99..e37c45ac0b1 100644
15381 if test -n "$CXX" && ( test "X$CXX" != "Xno" && 20632 if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
15382 ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || 20633 ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
15383 (test "X$CXX" != "Xg++"))) ; then 20634 (test "X$CXX" != "Xg++"))) ; then
15384@@ -5509,6 +5835,7 @@ if test "$_lt_caught_CXX_error" != yes; then 20635@@ -5515,6 +5841,7 @@ if test "$_lt_caught_CXX_error" != yes; then
15385 20636
15386 # Allow CC to be a program name with arguments. 20637 # Allow CC to be a program name with arguments.
15387 lt_save_CC=$CC 20638 lt_save_CC=$CC
@@ -15389,7 +20640,7 @@ index a216bb14e99..e37c45ac0b1 100644
15389 lt_save_LD=$LD 20640 lt_save_LD=$LD
15390 lt_save_GCC=$GCC 20641 lt_save_GCC=$GCC
15391 GCC=$GXX 20642 GCC=$GXX
15392@@ -5526,6 +5853,7 @@ if test "$_lt_caught_CXX_error" != yes; then 20643@@ -5532,6 +5859,7 @@ if test "$_lt_caught_CXX_error" != yes; then
15393 fi 20644 fi
15394 test -z "${LDCXX+set}" || LD=$LDCXX 20645 test -z "${LDCXX+set}" || LD=$LDCXX
15395 CC=${CXX-"c++"} 20646 CC=${CXX-"c++"}
@@ -15397,7 +20648,7 @@ index a216bb14e99..e37c45ac0b1 100644
15397 compiler=$CC 20648 compiler=$CC
15398 _LT_TAGVAR(compiler, $1)=$CC 20649 _LT_TAGVAR(compiler, $1)=$CC
15399 _LT_CC_BASENAME([$compiler]) 20650 _LT_CC_BASENAME([$compiler])
15400@@ -5689,7 +6017,7 @@ if test "$_lt_caught_CXX_error" != yes; then 20651@@ -5695,7 +6023,7 @@ if test "$_lt_caught_CXX_error" != yes; then
15401 _LT_TAGVAR(allow_undefined_flag, $1)='-berok' 20652 _LT_TAGVAR(allow_undefined_flag, $1)='-berok'
15402 # Determine the default libpath from the value encoded in an empty 20653 # Determine the default libpath from the value encoded in an empty
15403 # executable. 20654 # executable.
@@ -15406,7 +20657,7 @@ index a216bb14e99..e37c45ac0b1 100644
15406 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" 20657 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
15407 20658
15408 _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" 20659 _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
15409@@ -5701,7 +6029,7 @@ if test "$_lt_caught_CXX_error" != yes; then 20660@@ -5707,7 +6035,7 @@ if test "$_lt_caught_CXX_error" != yes; then
15410 else 20661 else
15411 # Determine the default libpath from the value encoded in an 20662 # Determine the default libpath from the value encoded in an
15412 # empty executable. 20663 # empty executable.
@@ -15415,7 +20666,7 @@ index a216bb14e99..e37c45ac0b1 100644
15415 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" 20666 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
15416 # Warning - without using the other run time loading flags, 20667 # Warning - without using the other run time loading flags,
15417 # -berok will link without error, but may produce a broken library. 20668 # -berok will link without error, but may produce a broken library.
15418@@ -5743,29 +6071,75 @@ if test "$_lt_caught_CXX_error" != yes; then 20669@@ -5749,29 +6077,75 @@ if test "$_lt_caught_CXX_error" != yes; then
15419 ;; 20670 ;;
15420 20671
15421 cygwin* | mingw* | pw32* | cegcc*) 20672 cygwin* | mingw* | pw32* | cegcc*)
@@ -15514,7 +20765,7 @@ index a216bb14e99..e37c45ac0b1 100644
15514 darwin* | rhapsody*) 20765 darwin* | rhapsody*)
15515 _LT_DARWIN_LINKER_FEATURES($1) 20766 _LT_DARWIN_LINKER_FEATURES($1)
15516 ;; 20767 ;;
15517@@ -5840,7 +6214,7 @@ if test "$_lt_caught_CXX_error" != yes; then 20768@@ -5846,7 +6220,7 @@ if test "$_lt_caught_CXX_error" != yes; then
15518 ;; 20769 ;;
15519 *) 20770 *)
15520 if test "$GXX" = yes; then 20771 if test "$GXX" = yes; then
@@ -15523,7 +20774,7 @@ index a216bb14e99..e37c45ac0b1 100644
15523 else 20774 else
15524 # FIXME: insert proper C++ library support 20775 # FIXME: insert proper C++ library support
15525 _LT_TAGVAR(ld_shlibs, $1)=no 20776 _LT_TAGVAR(ld_shlibs, $1)=no
15526@@ -5911,10 +6285,10 @@ if test "$_lt_caught_CXX_error" != yes; then 20777@@ -5917,10 +6291,10 @@ if test "$_lt_caught_CXX_error" != yes; then
15527 _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' 20778 _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
15528 ;; 20779 ;;
15529 ia64*) 20780 ia64*)
@@ -15536,7 +20787,7 @@ index a216bb14e99..e37c45ac0b1 100644
15536 ;; 20787 ;;
15537 esac 20788 esac
15538 fi 20789 fi
15539@@ -5955,9 +6329,9 @@ if test "$_lt_caught_CXX_error" != yes; then 20790@@ -5961,9 +6335,9 @@ if test "$_lt_caught_CXX_error" != yes; then
15540 *) 20791 *)
15541 if test "$GXX" = yes; then 20792 if test "$GXX" = yes; then
15542 if test "$with_gnu_ld" = no; then 20793 if test "$with_gnu_ld" = no; then
@@ -15548,7 +20799,7 @@ index a216bb14e99..e37c45ac0b1 100644
15548 fi 20799 fi
15549 fi 20800 fi
15550 _LT_TAGVAR(link_all_deplibs, $1)=yes 20801 _LT_TAGVAR(link_all_deplibs, $1)=yes
15551@@ -6027,20 +6401,20 @@ if test "$_lt_caught_CXX_error" != yes; then 20802@@ -6033,20 +6407,20 @@ if test "$_lt_caught_CXX_error" != yes; then
15552 _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~ 20803 _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~
15553 rm -rf $tpldir~ 20804 rm -rf $tpldir~
15554 $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ 20805 $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
@@ -15573,7 +20824,7 @@ index a216bb14e99..e37c45ac0b1 100644
15573 ;; 20824 ;;
15574 *) # Version 6 and above use weak symbols 20825 *) # Version 6 and above use weak symbols
15575 _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' 20826 _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
15576@@ -6235,7 +6609,7 @@ if test "$_lt_caught_CXX_error" != yes; then 20827@@ -6241,7 +6615,7 @@ if test "$_lt_caught_CXX_error" != yes; then
15577 _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' 20828 _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
15578 ;; 20829 ;;
15579 *) 20830 *)
@@ -15582,7 +20833,7 @@ index a216bb14e99..e37c45ac0b1 100644
15582 ;; 20833 ;;
15583 esac 20834 esac
15584 20835
15585@@ -6281,7 +6655,7 @@ if test "$_lt_caught_CXX_error" != yes; then 20836@@ -6287,7 +6661,7 @@ if test "$_lt_caught_CXX_error" != yes; then
15586 20837
15587 solaris*) 20838 solaris*)
15588 case $cc_basename in 20839 case $cc_basename in
@@ -15591,7 +20842,7 @@ index a216bb14e99..e37c45ac0b1 100644
15591 # Sun C++ 4.2, 5.x and Centerline C++ 20842 # Sun C++ 4.2, 5.x and Centerline C++
15592 _LT_TAGVAR(archive_cmds_need_lc,$1)=yes 20843 _LT_TAGVAR(archive_cmds_need_lc,$1)=yes
15593 _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs' 20844 _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
15594@@ -6322,9 +6696,9 @@ if test "$_lt_caught_CXX_error" != yes; then 20845@@ -6328,9 +6702,9 @@ if test "$_lt_caught_CXX_error" != yes; then
15595 if test "$GXX" = yes && test "$with_gnu_ld" = no; then 20846 if test "$GXX" = yes && test "$with_gnu_ld" = no; then
15596 _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs' 20847 _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
15597 if $CC --version | $GREP -v '^2\.7' > /dev/null; then 20848 if $CC --version | $GREP -v '^2\.7' > /dev/null; then
@@ -15603,7 +20854,7 @@ index a216bb14e99..e37c45ac0b1 100644
15603 20854
15604 # Commands to make compiler produce verbose output that lists 20855 # Commands to make compiler produce verbose output that lists
15605 # what "hidden" libraries, object files and flags are used when 20856 # what "hidden" libraries, object files and flags are used when
15606@@ -6453,6 +6827,7 @@ if test "$_lt_caught_CXX_error" != yes; then 20857@@ -6459,6 +6833,7 @@ if test "$_lt_caught_CXX_error" != yes; then
15607 fi # test -n "$compiler" 20858 fi # test -n "$compiler"
15608 20859
15609 CC=$lt_save_CC 20860 CC=$lt_save_CC
@@ -15611,7 +20862,7 @@ index a216bb14e99..e37c45ac0b1 100644
15611 LDCXX=$LD 20862 LDCXX=$LD
15612 LD=$lt_save_LD 20863 LD=$lt_save_LD
15613 GCC=$lt_save_GCC 20864 GCC=$lt_save_GCC
15614@@ -6467,6 +6842,29 @@ AC_LANG_POP 20865@@ -6473,6 +6848,29 @@ AC_LANG_POP
15615 ])# _LT_LANG_CXX_CONFIG 20866 ])# _LT_LANG_CXX_CONFIG
15616 20867
15617 20868
@@ -15641,7 +20892,7 @@ index a216bb14e99..e37c45ac0b1 100644
15641 # _LT_SYS_HIDDEN_LIBDEPS([TAGNAME]) 20892 # _LT_SYS_HIDDEN_LIBDEPS([TAGNAME])
15642 # --------------------------------- 20893 # ---------------------------------
15643 # Figure out "hidden" library dependencies from verbose 20894 # Figure out "hidden" library dependencies from verbose
15644@@ -6475,6 +6873,7 @@ AC_LANG_POP 20895@@ -6481,6 +6879,7 @@ AC_LANG_POP
15645 # objects, libraries and library flags. 20896 # objects, libraries and library flags.
15646 m4_defun([_LT_SYS_HIDDEN_LIBDEPS], 20897 m4_defun([_LT_SYS_HIDDEN_LIBDEPS],
15647 [m4_require([_LT_FILEUTILS_DEFAULTS])dnl 20898 [m4_require([_LT_FILEUTILS_DEFAULTS])dnl
@@ -15649,7 +20900,7 @@ index a216bb14e99..e37c45ac0b1 100644
15649 # Dependencies to place before and after the object being linked: 20900 # Dependencies to place before and after the object being linked:
15650 _LT_TAGVAR(predep_objects, $1)= 20901 _LT_TAGVAR(predep_objects, $1)=
15651 _LT_TAGVAR(postdep_objects, $1)= 20902 _LT_TAGVAR(postdep_objects, $1)=
15652@@ -6525,6 +6924,13 @@ public class foo { 20903@@ -6531,6 +6930,13 @@ public class foo {
15653 }; 20904 };
15654 _LT_EOF 20905 _LT_EOF
15655 ]) 20906 ])
@@ -15663,7 +20914,7 @@ index a216bb14e99..e37c45ac0b1 100644
15663 dnl Parse the compiler output and extract the necessary 20914 dnl Parse the compiler output and extract the necessary
15664 dnl objects, libraries and library flags. 20915 dnl objects, libraries and library flags.
15665 if AC_TRY_EVAL(ac_compile); then 20916 if AC_TRY_EVAL(ac_compile); then
15666@@ -6536,7 +6942,7 @@ if AC_TRY_EVAL(ac_compile); then 20917@@ -6542,7 +6948,7 @@ if AC_TRY_EVAL(ac_compile); then
15667 pre_test_object_deps_done=no 20918 pre_test_object_deps_done=no
15668 20919
15669 for p in `eval "$output_verbose_link_cmd"`; do 20920 for p in `eval "$output_verbose_link_cmd"`; do
@@ -15672,7 +20923,7 @@ index a216bb14e99..e37c45ac0b1 100644
15672 20923
15673 -L* | -R* | -l*) 20924 -L* | -R* | -l*)
15674 # Some compilers place space between "-{L,R}" and the path. 20925 # Some compilers place space between "-{L,R}" and the path.
15675@@ -6545,13 +6951,22 @@ if AC_TRY_EVAL(ac_compile); then 20926@@ -6551,13 +6957,22 @@ if AC_TRY_EVAL(ac_compile); then
15676 test $p = "-R"; then 20927 test $p = "-R"; then
15677 prev=$p 20928 prev=$p
15678 continue 20929 continue
@@ -15699,7 +20950,7 @@ index a216bb14e99..e37c45ac0b1 100644
15699 # Internal compiler library paths should come after those 20950 # Internal compiler library paths should come after those
15700 # provided the user. The postdeps already come after the 20951 # provided the user. The postdeps already come after the
15701 # user supplied libs so there is no need to process them. 20952 # user supplied libs so there is no need to process them.
15702@@ -6571,8 +6986,10 @@ if AC_TRY_EVAL(ac_compile); then 20953@@ -6577,8 +6992,10 @@ if AC_TRY_EVAL(ac_compile); then
15703 _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}" 20954 _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}"
15704 fi 20955 fi
15705 fi 20956 fi
@@ -15710,7 +20961,7 @@ index a216bb14e99..e37c45ac0b1 100644
15710 *.$objext) 20961 *.$objext)
15711 # This assumes that the test object file only shows up 20962 # This assumes that the test object file only shows up
15712 # once in the compiler output. 20963 # once in the compiler output.
15713@@ -6608,6 +7025,7 @@ else 20964@@ -6614,6 +7031,7 @@ else
15714 fi 20965 fi
15715 20966
15716 $RM -f confest.$objext 20967 $RM -f confest.$objext
@@ -15718,7 +20969,7 @@ index a216bb14e99..e37c45ac0b1 100644
15718 20969
15719 # PORTME: override above test on systems where it is broken 20970 # PORTME: override above test on systems where it is broken
15720 m4_if([$1], [CXX], 20971 m4_if([$1], [CXX],
15721@@ -6644,7 +7062,7 @@ linux*) 20972@@ -6650,7 +7068,7 @@ linux*)
15722 20973
15723 solaris*) 20974 solaris*)
15724 case $cc_basename in 20975 case $cc_basename in
@@ -15727,7 +20978,7 @@ index a216bb14e99..e37c45ac0b1 100644
15727 # The more standards-conforming stlport4 library is 20978 # The more standards-conforming stlport4 library is
15728 # incompatible with the Cstd library. Avoid specifying 20979 # incompatible with the Cstd library. Avoid specifying
15729 # it if it's in CXXFLAGS. Ignore libCrun as 20980 # it if it's in CXXFLAGS. Ignore libCrun as
15730@@ -6757,7 +7175,9 @@ if test "$_lt_disable_F77" != yes; then 20981@@ -6763,7 +7181,9 @@ if test "$_lt_disable_F77" != yes; then
15731 # Allow CC to be a program name with arguments. 20982 # Allow CC to be a program name with arguments.
15732 lt_save_CC="$CC" 20983 lt_save_CC="$CC"
15733 lt_save_GCC=$GCC 20984 lt_save_GCC=$GCC
@@ -15737,7 +20988,7 @@ index a216bb14e99..e37c45ac0b1 100644
15737 compiler=$CC 20988 compiler=$CC
15738 _LT_TAGVAR(compiler, $1)=$CC 20989 _LT_TAGVAR(compiler, $1)=$CC
15739 _LT_CC_BASENAME([$compiler]) 20990 _LT_CC_BASENAME([$compiler])
15740@@ -6811,6 +7231,7 @@ if test "$_lt_disable_F77" != yes; then 20991@@ -6817,6 +7237,7 @@ if test "$_lt_disable_F77" != yes; then
15741 20992
15742 GCC=$lt_save_GCC 20993 GCC=$lt_save_GCC
15743 CC="$lt_save_CC" 20994 CC="$lt_save_CC"
@@ -15745,7 +20996,7 @@ index a216bb14e99..e37c45ac0b1 100644
15745 fi # test "$_lt_disable_F77" != yes 20996 fi # test "$_lt_disable_F77" != yes
15746 20997
15747 AC_LANG_POP 20998 AC_LANG_POP
15748@@ -6887,7 +7308,9 @@ if test "$_lt_disable_FC" != yes; then 20999@@ -6893,7 +7314,9 @@ if test "$_lt_disable_FC" != yes; then
15749 # Allow CC to be a program name with arguments. 21000 # Allow CC to be a program name with arguments.
15750 lt_save_CC="$CC" 21001 lt_save_CC="$CC"
15751 lt_save_GCC=$GCC 21002 lt_save_GCC=$GCC
@@ -15755,7 +21006,7 @@ index a216bb14e99..e37c45ac0b1 100644
15755 compiler=$CC 21006 compiler=$CC
15756 GCC=$ac_cv_fc_compiler_gnu 21007 GCC=$ac_cv_fc_compiler_gnu
15757 21008
15758@@ -6943,7 +7366,8 @@ if test "$_lt_disable_FC" != yes; then 21009@@ -6949,7 +7372,8 @@ if test "$_lt_disable_FC" != yes; then
15759 fi # test -n "$compiler" 21010 fi # test -n "$compiler"
15760 21011
15761 GCC=$lt_save_GCC 21012 GCC=$lt_save_GCC
@@ -15765,7 +21016,7 @@ index a216bb14e99..e37c45ac0b1 100644
15765 fi # test "$_lt_disable_FC" != yes 21016 fi # test "$_lt_disable_FC" != yes
15766 21017
15767 AC_LANG_POP 21018 AC_LANG_POP
15768@@ -6980,10 +7404,12 @@ _LT_COMPILER_BOILERPLATE 21019@@ -6986,10 +7410,12 @@ _LT_COMPILER_BOILERPLATE
15769 _LT_LINKER_BOILERPLATE 21020 _LT_LINKER_BOILERPLATE
15770 21021
15771 # Allow CC to be a program name with arguments. 21022 # Allow CC to be a program name with arguments.
@@ -15779,7 +21030,7 @@ index a216bb14e99..e37c45ac0b1 100644
15779 compiler=$CC 21030 compiler=$CC
15780 _LT_TAGVAR(compiler, $1)=$CC 21031 _LT_TAGVAR(compiler, $1)=$CC
15781 _LT_TAGVAR(LD, $1)="$LD" 21032 _LT_TAGVAR(LD, $1)="$LD"
15782@@ -7014,7 +7440,8 @@ fi 21033@@ -7020,7 +7446,8 @@ fi
15783 AC_LANG_RESTORE 21034 AC_LANG_RESTORE
15784 21035
15785 GCC=$lt_save_GCC 21036 GCC=$lt_save_GCC
@@ -15789,7 +21040,7 @@ index a216bb14e99..e37c45ac0b1 100644
15789 ])# _LT_LANG_GCJ_CONFIG 21040 ])# _LT_LANG_GCJ_CONFIG
15790 21041
15791 21042
15792@@ -7049,9 +7476,11 @@ _LT_LINKER_BOILERPLATE 21043@@ -7055,9 +7482,11 @@ _LT_LINKER_BOILERPLATE
15793 21044
15794 # Allow CC to be a program name with arguments. 21045 # Allow CC to be a program name with arguments.
15795 lt_save_CC="$CC" 21046 lt_save_CC="$CC"
@@ -15801,7 +21052,7 @@ index a216bb14e99..e37c45ac0b1 100644
15801 compiler=$CC 21052 compiler=$CC
15802 _LT_TAGVAR(compiler, $1)=$CC 21053 _LT_TAGVAR(compiler, $1)=$CC
15803 _LT_CC_BASENAME([$compiler]) 21054 _LT_CC_BASENAME([$compiler])
15804@@ -7064,7 +7493,8 @@ fi 21055@@ -7070,7 +7499,8 @@ fi
15805 21056
15806 GCC=$lt_save_GCC 21057 GCC=$lt_save_GCC
15807 AC_LANG_RESTORE 21058 AC_LANG_RESTORE
@@ -15811,7 +21062,7 @@ index a216bb14e99..e37c45ac0b1 100644
15811 ])# _LT_LANG_RC_CONFIG 21062 ])# _LT_LANG_RC_CONFIG
15812 21063
15813 21064
15814@@ -7123,6 +7553,15 @@ _LT_DECL([], [OBJDUMP], [1], [An object symbol dumper]) 21065@@ -7129,6 +7559,15 @@ _LT_DECL([], [OBJDUMP], [1], [An object symbol dumper])
15815 AC_SUBST([OBJDUMP]) 21066 AC_SUBST([OBJDUMP])
15816 ]) 21067 ])
15817 21068
@@ -15827,7 +21078,7 @@ index a216bb14e99..e37c45ac0b1 100644
15827 21078
15828 # _LT_DECL_SED 21079 # _LT_DECL_SED
15829 # ------------ 21080 # ------------
15830@@ -7216,8 +7655,8 @@ m4_defun([_LT_CHECK_SHELL_FEATURES], 21081@@ -7222,8 +7661,8 @@ m4_defun([_LT_CHECK_SHELL_FEATURES],
15831 # Try some XSI features 21082 # Try some XSI features
15832 xsi_shell=no 21083 xsi_shell=no
15833 ( _lt_dummy="a/b/c" 21084 ( _lt_dummy="a/b/c"
@@ -15838,7 +21089,7 @@ index a216bb14e99..e37c45ac0b1 100644
15838 && eval 'test $(( 1 + 1 )) -eq 2 \ 21089 && eval 'test $(( 1 + 1 )) -eq 2 \
15839 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ 21090 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
15840 && xsi_shell=yes 21091 && xsi_shell=yes
15841@@ -7256,206 +7695,162 @@ _LT_DECL([NL2SP], [lt_NL2SP], [1], [turn newlines into spaces])dnl 21092@@ -7262,206 +7701,162 @@ _LT_DECL([NL2SP], [lt_NL2SP], [1], [turn newlines into spaces])dnl
15842 ])# _LT_CHECK_SHELL_FEATURES 21093 ])# _LT_CHECK_SHELL_FEATURES
15843 21094
15844 21095
@@ -21471,8 +26722,36 @@ index bf92b5e0790..c573da90c5c 100644
21471 26722
21472 # These exist entirely to fool aclocal when bootstrapping libtool. 26723 # These exist entirely to fool aclocal when bootstrapping libtool.
21473 # 26724 #
26725diff --git a/opcodes/Makefile.in b/opcodes/Makefile.in
26726index 2257b0872af..73aae3b210f 100644
26727--- a/opcodes/Makefile.in
26728+++ b/opcodes/Makefile.in
26729@@ -292,6 +292,7 @@ CYGPATH_W = @CYGPATH_W@
26730 DATADIRNAME = @DATADIRNAME@
26731 DEFS = @DEFS@
26732 DEPDIR = @DEPDIR@
26733+DLLTOOL = @DLLTOOL@
26734 DSYMUTIL = @DSYMUTIL@
26735 DUMPBIN = @DUMPBIN@
26736 ECHO_C = @ECHO_C@
26737@@ -325,6 +326,7 @@ LN_S = @LN_S@
26738 LTLIBOBJS = @LTLIBOBJS@
26739 MAINT = @MAINT@
26740 MAKEINFO = @MAKEINFO@
26741+MANIFEST_TOOL = @MANIFEST_TOOL@
26742 MKDIR_P = @MKDIR_P@
26743 MKINSTALLDIRS = @MKINSTALLDIRS@
26744 MSGFMT = @MSGFMT@
26745@@ -363,6 +365,7 @@ abs_builddir = @abs_builddir@
26746 abs_srcdir = @abs_srcdir@
26747 abs_top_builddir = @abs_top_builddir@
26748 abs_top_srcdir = @abs_top_srcdir@
26749+ac_ct_AR = @ac_ct_AR@
26750 ac_ct_CC = @ac_ct_CC@
26751 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
26752 am__include = @am__include@
21474diff --git a/opcodes/configure b/opcodes/configure 26753diff --git a/opcodes/configure b/opcodes/configure
21475index 6690a502b2f..badcc0776df 100755 26754index db023b48c28..c562aada2a4 100755
21476--- a/opcodes/configure 26755--- a/opcodes/configure
21477+++ b/opcodes/configure 26756+++ b/opcodes/configure
21478@@ -682,6 +682,9 @@ OTOOL 26757@@ -682,6 +682,9 @@ OTOOL
@@ -21522,7 +26801,7 @@ index 6690a502b2f..badcc0776df 100755
21522 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then 26801 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
21523 ECHO='print -r --' 26802 ECHO='print -r --'
21524 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then 26803 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
21525@@ -5705,8 +5711,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; 26804@@ -5711,8 +5717,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6;
21526 # Try some XSI features 26805 # Try some XSI features
21527 xsi_shell=no 26806 xsi_shell=no
21528 ( _lt_dummy="a/b/c" 26807 ( _lt_dummy="a/b/c"
@@ -21533,7 +26812,7 @@ index 6690a502b2f..badcc0776df 100755
21533 && eval 'test $(( 1 + 1 )) -eq 2 \ 26812 && eval 'test $(( 1 + 1 )) -eq 2 \
21534 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ 26813 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
21535 && xsi_shell=yes 26814 && xsi_shell=yes
21536@@ -5755,6 +5761,80 @@ esac 26815@@ -5761,6 +5767,80 @@ esac
21537 26816
21538 26817
21539 26818
@@ -21614,7 +26893,7 @@ index 6690a502b2f..badcc0776df 100755
21614 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 26893 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
21615 $as_echo_n "checking for $LD option to reload object files... " >&6; } 26894 $as_echo_n "checking for $LD option to reload object files... " >&6; }
21616 if ${lt_cv_ld_reload_flag+:} false; then : 26895 if ${lt_cv_ld_reload_flag+:} false; then :
21617@@ -5771,6 +5851,11 @@ case $reload_flag in 26896@@ -5777,6 +5857,11 @@ case $reload_flag in
21618 esac 26897 esac
21619 reload_cmds='$LD$reload_flag -o $output$reload_objs' 26898 reload_cmds='$LD$reload_flag -o $output$reload_objs'
21620 case $host_os in 26899 case $host_os in
@@ -21626,7 +26905,7 @@ index 6690a502b2f..badcc0776df 100755
21626 darwin*) 26905 darwin*)
21627 if test "$GCC" = yes; then 26906 if test "$GCC" = yes; then
21628 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' 26907 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
21629@@ -5939,7 +6024,8 @@ mingw* | pw32*) 26908@@ -5945,7 +6030,8 @@ mingw* | pw32*)
21630 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' 26909 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
21631 lt_cv_file_magic_cmd='func_win32_libid' 26910 lt_cv_file_magic_cmd='func_win32_libid'
21632 else 26911 else
@@ -21636,7 +26915,7 @@ index 6690a502b2f..badcc0776df 100755
21636 lt_cv_file_magic_cmd='$OBJDUMP -f' 26915 lt_cv_file_magic_cmd='$OBJDUMP -f'
21637 fi 26916 fi
21638 ;; 26917 ;;
21639@@ -6093,6 +6179,21 @@ esac 26918@@ -6099,6 +6185,21 @@ esac
21640 fi 26919 fi
21641 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 26920 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
21642 $as_echo "$lt_cv_deplibs_check_method" >&6; } 26921 $as_echo "$lt_cv_deplibs_check_method" >&6; }
@@ -21658,7 +26937,7 @@ index 6690a502b2f..badcc0776df 100755
21658 file_magic_cmd=$lt_cv_file_magic_cmd 26937 file_magic_cmd=$lt_cv_file_magic_cmd
21659 deplibs_check_method=$lt_cv_deplibs_check_method 26938 deplibs_check_method=$lt_cv_deplibs_check_method
21660 test -z "$deplibs_check_method" && deplibs_check_method=unknown 26939 test -z "$deplibs_check_method" && deplibs_check_method=unknown
21661@@ -6108,6 +6209,157 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown 26940@@ -6114,6 +6215,157 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
21662 26941
21663 26942
21664 26943
@@ -21816,7 +27095,7 @@ index 6690a502b2f..badcc0776df 100755
21816 plugin_option= 27095 plugin_option=
21817 plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll" 27096 plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll"
21818 for plugin in $plugin_names; do 27097 for plugin in $plugin_names; do
21819@@ -6122,8 +6374,10 @@ for plugin in $plugin_names; do 27098@@ -6128,8 +6380,10 @@ for plugin in $plugin_names; do
21820 done 27099 done
21821 27100
21822 if test -n "$ac_tool_prefix"; then 27101 if test -n "$ac_tool_prefix"; then
@@ -21829,7 +27108,7 @@ index 6690a502b2f..badcc0776df 100755
21829 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 27108 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
21830 $as_echo_n "checking for $ac_word... " >&6; } 27109 $as_echo_n "checking for $ac_word... " >&6; }
21831 if ${ac_cv_prog_AR+:} false; then : 27110 if ${ac_cv_prog_AR+:} false; then :
21832@@ -6139,7 +6393,7 @@ do 27111@@ -6145,7 +6399,7 @@ do
21833 test -z "$as_dir" && as_dir=. 27112 test -z "$as_dir" && as_dir=.
21834 for ac_exec_ext in '' $ac_executable_extensions; do 27113 for ac_exec_ext in '' $ac_executable_extensions; do
21835 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 27114 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
@@ -21838,7 +27117,7 @@ index 6690a502b2f..badcc0776df 100755
21838 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 27117 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
21839 break 2 27118 break 2
21840 fi 27119 fi
21841@@ -6159,11 +6413,15 @@ $as_echo "no" >&6; } 27120@@ -6165,11 +6419,15 @@ $as_echo "no" >&6; }
21842 fi 27121 fi
21843 27122
21844 27123
@@ -21857,7 +27136,7 @@ index 6690a502b2f..badcc0776df 100755
21857 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 27136 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
21858 $as_echo_n "checking for $ac_word... " >&6; } 27137 $as_echo_n "checking for $ac_word... " >&6; }
21859 if ${ac_cv_prog_ac_ct_AR+:} false; then : 27138 if ${ac_cv_prog_ac_ct_AR+:} false; then :
21860@@ -6179,7 +6437,7 @@ do 27139@@ -6185,7 +6443,7 @@ do
21861 test -z "$as_dir" && as_dir=. 27140 test -z "$as_dir" && as_dir=.
21862 for ac_exec_ext in '' $ac_executable_extensions; do 27141 for ac_exec_ext in '' $ac_executable_extensions; do
21863 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 27142 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
@@ -21866,7 +27145,7 @@ index 6690a502b2f..badcc0776df 100755
21866 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 27145 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
21867 break 2 27146 break 2
21868 fi 27147 fi
21869@@ -6198,6 +6456,10 @@ else 27148@@ -6204,6 +6462,10 @@ else
21870 $as_echo "no" >&6; } 27149 $as_echo "no" >&6; }
21871 fi 27150 fi
21872 27151
@@ -21877,7 +27156,7 @@ index 6690a502b2f..badcc0776df 100755
21877 if test "x$ac_ct_AR" = x; then 27156 if test "x$ac_ct_AR" = x; then
21878 AR="false" 27157 AR="false"
21879 else 27158 else
21880@@ -6209,25 +6471,20 @@ ac_tool_warned=yes ;; 27159@@ -6215,25 +6477,20 @@ ac_tool_warned=yes ;;
21881 esac 27160 esac
21882 AR=$ac_ct_AR 27161 AR=$ac_ct_AR
21883 fi 27162 fi
@@ -21913,7 +27192,7 @@ index 6690a502b2f..badcc0776df 100755
21913 27192
21914 27193
21915 27194
21916@@ -6238,6 +6495,63 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru 27195@@ -6244,6 +6501,63 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru
21917 27196
21918 27197
21919 27198
@@ -21977,7 +27256,7 @@ index 6690a502b2f..badcc0776df 100755
21977 27256
21978 if test -n "$ac_tool_prefix"; then 27257 if test -n "$ac_tool_prefix"; then
21979 # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. 27258 # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
21980@@ -6578,8 +6892,8 @@ esac 27259@@ -6584,8 +6898,8 @@ esac
21981 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" 27260 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
21982 27261
21983 # Transform an extracted symbol line into symbol name and symbol address 27262 # Transform an extracted symbol line into symbol name and symbol address
@@ -21988,7 +27267,7 @@ index 6690a502b2f..badcc0776df 100755
21988 27267
21989 # Handle CRLF in mingw tool chain 27268 # Handle CRLF in mingw tool chain
21990 opt_cr= 27269 opt_cr=
21991@@ -6615,6 +6929,7 @@ for ac_symprfx in "" "_"; do 27270@@ -6621,6 +6935,7 @@ for ac_symprfx in "" "_"; do
21992 else 27271 else
21993 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" 27272 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
21994 fi 27273 fi
@@ -21996,7 +27275,7 @@ index 6690a502b2f..badcc0776df 100755
21996 27275
21997 # Check to see that the pipe works correctly. 27276 # Check to see that the pipe works correctly.
21998 pipe_works=no 27277 pipe_works=no
21999@@ -6656,6 +6971,18 @@ _LT_EOF 27278@@ -6662,6 +6977,18 @@ _LT_EOF
22000 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then 27279 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
22001 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then 27280 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
22002 cat <<_LT_EOF > conftest.$ac_ext 27281 cat <<_LT_EOF > conftest.$ac_ext
@@ -22015,7 +27294,7 @@ index 6690a502b2f..badcc0776df 100755
22015 #ifdef __cplusplus 27294 #ifdef __cplusplus
22016 extern "C" { 27295 extern "C" {
22017 #endif 27296 #endif
22018@@ -6667,7 +6994,7 @@ _LT_EOF 27297@@ -6673,7 +7000,7 @@ _LT_EOF
22019 cat <<_LT_EOF >> conftest.$ac_ext 27298 cat <<_LT_EOF >> conftest.$ac_ext
22020 27299
22021 /* The mapping between symbol names and symbols. */ 27300 /* The mapping between symbol names and symbols. */
@@ -22024,7 +27303,7 @@ index 6690a502b2f..badcc0776df 100755
22024 const char *name; 27303 const char *name;
22025 void *address; 27304 void *address;
22026 } 27305 }
22027@@ -6693,8 +7020,8 @@ static const void *lt_preloaded_setup() { 27306@@ -6699,8 +7026,8 @@ static const void *lt_preloaded_setup() {
22028 _LT_EOF 27307 _LT_EOF
22029 # Now try linking the two files. 27308 # Now try linking the two files.
22030 mv conftest.$ac_objext conftstm.$ac_objext 27309 mv conftest.$ac_objext conftstm.$ac_objext
@@ -22035,7 +27314,7 @@ index 6690a502b2f..badcc0776df 100755
22035 LIBS="conftstm.$ac_objext" 27314 LIBS="conftstm.$ac_objext"
22036 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" 27315 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
22037 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 27316 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
22038@@ -6704,8 +7031,8 @@ _LT_EOF 27317@@ -6710,8 +7037,8 @@ _LT_EOF
22039 test $ac_status = 0; } && test -s conftest${ac_exeext}; then 27318 test $ac_status = 0; } && test -s conftest${ac_exeext}; then
22040 pipe_works=yes 27319 pipe_works=yes
22041 fi 27320 fi
@@ -22046,7 +27325,7 @@ index 6690a502b2f..badcc0776df 100755
22046 else 27325 else
22047 echo "cannot find nm_test_func in $nlist" >&5 27326 echo "cannot find nm_test_func in $nlist" >&5
22048 fi 27327 fi
22049@@ -6742,6 +7069,14 @@ else 27328@@ -6748,6 +7075,14 @@ else
22050 $as_echo "ok" >&6; } 27329 $as_echo "ok" >&6; }
22051 fi 27330 fi
22052 27331
@@ -22061,7 +27340,7 @@ index 6690a502b2f..badcc0776df 100755
22061 27340
22062 27341
22063 27342
22064@@ -6760,6 +7095,47 @@ fi 27343@@ -6766,6 +7101,47 @@ fi
22065 27344
22066 27345
22067 27346
@@ -22109,7 +27388,7 @@ index 6690a502b2f..badcc0776df 100755
22109 27388
22110 27389
22111 27390
22112@@ -6969,6 +7345,123 @@ esac 27391@@ -6975,6 +7351,123 @@ esac
22113 27392
22114 need_locks="$enable_libtool_lock" 27393 need_locks="$enable_libtool_lock"
22115 27394
@@ -22233,7 +27512,7 @@ index 6690a502b2f..badcc0776df 100755
22233 27512
22234 case $host_os in 27513 case $host_os in
22235 rhapsody* | darwin*) 27514 rhapsody* | darwin*)
22236@@ -7532,6 +8025,8 @@ _LT_EOF 27515@@ -7538,6 +8031,8 @@ _LT_EOF
22237 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 27516 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
22238 echo "$AR cru libconftest.a conftest.o" >&5 27517 echo "$AR cru libconftest.a conftest.o" >&5
22239 $AR cru libconftest.a conftest.o 2>&5 27518 $AR cru libconftest.a conftest.o 2>&5
@@ -22242,7 +27521,7 @@ index 6690a502b2f..badcc0776df 100755
22242 cat > conftest.c << _LT_EOF 27521 cat > conftest.c << _LT_EOF
22243 int main() { return 0;} 27522 int main() { return 0;}
22244 _LT_EOF 27523 _LT_EOF
22245@@ -8084,8 +8579,6 @@ fi 27524@@ -8090,8 +8585,6 @@ fi
22246 lt_prog_compiler_pic= 27525 lt_prog_compiler_pic=
22247 lt_prog_compiler_static= 27526 lt_prog_compiler_static=
22248 27527
@@ -22251,7 +27530,7 @@ index 6690a502b2f..badcc0776df 100755
22251 27530
22252 if test "$GCC" = yes; then 27531 if test "$GCC" = yes; then
22253 lt_prog_compiler_wl='-Wl,' 27532 lt_prog_compiler_wl='-Wl,'
22254@@ -8251,6 +8744,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 27533@@ -8257,6 +8750,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
22255 lt_prog_compiler_pic='--shared' 27534 lt_prog_compiler_pic='--shared'
22256 lt_prog_compiler_static='--static' 27535 lt_prog_compiler_static='--static'
22257 ;; 27536 ;;
@@ -22264,7 +27543,7 @@ index 6690a502b2f..badcc0776df 100755
22264 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) 27543 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
22265 # Portland Group compilers (*not* the Pentium gcc compiler, 27544 # Portland Group compilers (*not* the Pentium gcc compiler,
22266 # which looks to be a dead project) 27545 # which looks to be a dead project)
22267@@ -8313,7 +8812,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 27546@@ -8319,7 +8818,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
22268 lt_prog_compiler_pic='-KPIC' 27547 lt_prog_compiler_pic='-KPIC'
22269 lt_prog_compiler_static='-Bstatic' 27548 lt_prog_compiler_static='-Bstatic'
22270 case $cc_basename in 27549 case $cc_basename in
@@ -22273,7 +27552,7 @@ index 6690a502b2f..badcc0776df 100755
22273 lt_prog_compiler_wl='-Qoption ld ';; 27552 lt_prog_compiler_wl='-Qoption ld ';;
22274 *) 27553 *)
22275 lt_prog_compiler_wl='-Wl,';; 27554 lt_prog_compiler_wl='-Wl,';;
22276@@ -8370,13 +8869,17 @@ case $host_os in 27555@@ -8376,13 +8875,17 @@ case $host_os in
22277 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" 27556 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
22278 ;; 27557 ;;
22279 esac 27558 esac
@@ -22297,7 +27576,7 @@ index 6690a502b2f..badcc0776df 100755
22297 27576
22298 # 27577 #
22299 # Check to make sure the PIC flag actually works. 27578 # Check to make sure the PIC flag actually works.
22300@@ -8437,6 +8940,11 @@ fi 27579@@ -8443,6 +8946,11 @@ fi
22301 27580
22302 27581
22303 27582
@@ -22309,7 +27588,7 @@ index 6690a502b2f..badcc0776df 100755
22309 # 27588 #
22310 # Check to make sure the static flag actually works. 27589 # Check to make sure the static flag actually works.
22311 # 27590 #
22312@@ -8787,7 +9295,8 @@ _LT_EOF 27591@@ -8793,7 +9301,8 @@ _LT_EOF
22313 allow_undefined_flag=unsupported 27592 allow_undefined_flag=unsupported
22314 always_export_symbols=no 27593 always_export_symbols=no
22315 enable_shared_with_static_runtimes=yes 27594 enable_shared_with_static_runtimes=yes
@@ -22319,7 +27598,7 @@ index 6690a502b2f..badcc0776df 100755
22319 27598
22320 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then 27599 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
22321 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' 27600 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
22322@@ -8886,12 +9395,12 @@ _LT_EOF 27601@@ -8892,12 +9401,12 @@ _LT_EOF
22323 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' 27602 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
22324 hardcode_libdir_flag_spec= 27603 hardcode_libdir_flag_spec=
22325 hardcode_libdir_flag_spec_ld='-rpath $libdir' 27604 hardcode_libdir_flag_spec_ld='-rpath $libdir'
@@ -22334,7 +27613,7 @@ index 6690a502b2f..badcc0776df 100755
22334 fi 27613 fi
22335 ;; 27614 ;;
22336 esac 27615 esac
22337@@ -8905,8 +9414,8 @@ _LT_EOF 27616@@ -8911,8 +9420,8 @@ _LT_EOF
22338 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' 27617 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
22339 wlarc= 27618 wlarc=
22340 else 27619 else
@@ -22345,7 +27624,7 @@ index 6690a502b2f..badcc0776df 100755
22345 fi 27624 fi
22346 ;; 27625 ;;
22347 27626
22348@@ -8924,8 +9433,8 @@ _LT_EOF 27627@@ -8930,8 +9439,8 @@ _LT_EOF
22349 27628
22350 _LT_EOF 27629 _LT_EOF
22351 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 27630 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -22356,7 +27635,7 @@ index 6690a502b2f..badcc0776df 100755
22356 else 27635 else
22357 ld_shlibs=no 27636 ld_shlibs=no
22358 fi 27637 fi
22359@@ -8971,8 +9480,8 @@ _LT_EOF 27638@@ -8977,8 +9486,8 @@ _LT_EOF
22360 27639
22361 *) 27640 *)
22362 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 27641 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -22367,7 +27646,7 @@ index 6690a502b2f..badcc0776df 100755
22367 else 27646 else
22368 ld_shlibs=no 27647 ld_shlibs=no
22369 fi 27648 fi
22370@@ -9102,7 +9611,13 @@ _LT_EOF 27649@@ -9108,7 +9617,13 @@ _LT_EOF
22371 allow_undefined_flag='-berok' 27650 allow_undefined_flag='-berok'
22372 # Determine the default libpath from the value encoded in an 27651 # Determine the default libpath from the value encoded in an
22373 # empty executable. 27652 # empty executable.
@@ -22382,7 +27661,7 @@ index 6690a502b2f..badcc0776df 100755
22382 /* end confdefs.h. */ 27661 /* end confdefs.h. */
22383 27662
22384 int 27663 int
22385@@ -9115,22 +9630,29 @@ main () 27664@@ -9121,22 +9636,29 @@ main ()
22386 _ACEOF 27665 _ACEOF
22387 if ac_fn_c_try_link "$LINENO"; then : 27666 if ac_fn_c_try_link "$LINENO"; then :
22388 27667
@@ -22425,7 +27704,7 @@ index 6690a502b2f..badcc0776df 100755
22425 27704
22426 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 27705 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
22427 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" 27706 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"
22428@@ -9142,7 +9664,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 27707@@ -9148,7 +9670,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
22429 else 27708 else
22430 # Determine the default libpath from the value encoded in an 27709 # Determine the default libpath from the value encoded in an
22431 # empty executable. 27710 # empty executable.
@@ -22440,7 +27719,7 @@ index 6690a502b2f..badcc0776df 100755
22440 /* end confdefs.h. */ 27719 /* end confdefs.h. */
22441 27720
22442 int 27721 int
22443@@ -9155,22 +9683,29 @@ main () 27722@@ -9161,22 +9689,29 @@ main ()
22444 _ACEOF 27723 _ACEOF
22445 if ac_fn_c_try_link "$LINENO"; then : 27724 if ac_fn_c_try_link "$LINENO"; then :
22446 27725
@@ -22483,7 +27762,7 @@ index 6690a502b2f..badcc0776df 100755
22483 27762
22484 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 27763 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
22485 # Warning - without using the other run time loading flags, 27764 # Warning - without using the other run time loading flags,
22486@@ -9215,20 +9750,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 27765@@ -9221,20 +9756,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
22487 # Microsoft Visual C++. 27766 # Microsoft Visual C++.
22488 # hardcode_libdir_flag_spec is actually meaningless, as there is 27767 # hardcode_libdir_flag_spec is actually meaningless, as there is
22489 # no search path for DLLs. 27768 # no search path for DLLs.
@@ -22561,7 +27840,7 @@ index 6690a502b2f..badcc0776df 100755
22561 ;; 27840 ;;
22562 27841
22563 darwin* | rhapsody*) 27842 darwin* | rhapsody*)
22564@@ -9289,7 +9867,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 27843@@ -9295,7 +9873,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
22565 27844
22566 # FreeBSD 3 and greater uses gcc -shared to do shared libraries. 27845 # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
22567 freebsd* | dragonfly*) 27846 freebsd* | dragonfly*)
@@ -22570,7 +27849,7 @@ index 6690a502b2f..badcc0776df 100755
22570 hardcode_libdir_flag_spec='-R$libdir' 27849 hardcode_libdir_flag_spec='-R$libdir'
22571 hardcode_direct=yes 27850 hardcode_direct=yes
22572 hardcode_shlibpath_var=no 27851 hardcode_shlibpath_var=no
22573@@ -9297,7 +9875,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 27852@@ -9303,7 +9881,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
22574 27853
22575 hpux9*) 27854 hpux9*)
22576 if test "$GCC" = yes; then 27855 if test "$GCC" = yes; then
@@ -22579,7 +27858,7 @@ index 6690a502b2f..badcc0776df 100755
22579 else 27858 else
22580 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' 27859 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'
22581 fi 27860 fi
22582@@ -9313,7 +9891,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 27861@@ -9319,7 +9897,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
22583 27862
22584 hpux10*) 27863 hpux10*)
22585 if test "$GCC" = yes && test "$with_gnu_ld" = no; then 27864 if test "$GCC" = yes && test "$with_gnu_ld" = no; then
@@ -22588,7 +27867,7 @@ index 6690a502b2f..badcc0776df 100755
22588 else 27867 else
22589 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' 27868 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
22590 fi 27869 fi
22591@@ -9337,10 +9915,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 27870@@ -9343,10 +9921,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
22592 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' 27871 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
22593 ;; 27872 ;;
22594 ia64*) 27873 ia64*)
@@ -22601,7 +27880,7 @@ index 6690a502b2f..badcc0776df 100755
22601 ;; 27880 ;;
22602 esac 27881 esac
22603 else 27882 else
22604@@ -9419,23 +9997,36 @@ fi 27883@@ -9425,23 +10003,36 @@ fi
22605 27884
22606 irix5* | irix6* | nonstopux*) 27885 irix5* | irix6* | nonstopux*)
22607 if test "$GCC" = yes; then 27886 if test "$GCC" = yes; then
@@ -22646,7 +27925,7 @@ index 6690a502b2f..badcc0776df 100755
22646 else 27925 else
22647 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' 27926 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'
22648 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' 27927 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'
22649@@ -9520,7 +10111,7 @@ rm -f core conftest.err conftest.$ac_objext \ 27928@@ -9526,7 +10117,7 @@ rm -f core conftest.err conftest.$ac_objext \
22650 osf4* | osf5*) # as osf3* with the addition of -msym flag 27929 osf4* | osf5*) # as osf3* with the addition of -msym flag
22651 if test "$GCC" = yes; then 27930 if test "$GCC" = yes; then
22652 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' 27931 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
@@ -22655,7 +27934,7 @@ index 6690a502b2f..badcc0776df 100755
22655 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' 27934 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
22656 else 27935 else
22657 allow_undefined_flag=' -expect_unresolved \*' 27936 allow_undefined_flag=' -expect_unresolved \*'
22658@@ -9539,9 +10130,9 @@ rm -f core conftest.err conftest.$ac_objext \ 27937@@ -9545,9 +10136,9 @@ rm -f core conftest.err conftest.$ac_objext \
22659 no_undefined_flag=' -z defs' 27938 no_undefined_flag=' -z defs'
22660 if test "$GCC" = yes; then 27939 if test "$GCC" = yes; then
22661 wlarc='${wl}' 27940 wlarc='${wl}'
@@ -22667,7 +27946,7 @@ index 6690a502b2f..badcc0776df 100755
22667 else 27946 else
22668 case `$CC -V 2>&1` in 27947 case `$CC -V 2>&1` in
22669 *"Compilers 5.0"*) 27948 *"Compilers 5.0"*)
22670@@ -10117,8 +10708,9 @@ cygwin* | mingw* | pw32* | cegcc*) 27949@@ -10123,8 +10714,9 @@ cygwin* | mingw* | pw32* | cegcc*)
22671 need_version=no 27950 need_version=no
22672 need_lib_prefix=no 27951 need_lib_prefix=no
22673 27952
@@ -22679,7 +27958,7 @@ index 6690a502b2f..badcc0776df 100755
22679 library_names_spec='$libname.dll.a' 27958 library_names_spec='$libname.dll.a'
22680 # DLL is installed to $(libdir)/../bin by postinstall_cmds 27959 # DLL is installed to $(libdir)/../bin by postinstall_cmds
22681 postinstall_cmds='base_file=`basename \${file}`~ 27960 postinstall_cmds='base_file=`basename \${file}`~
22682@@ -10151,13 +10743,71 @@ cygwin* | mingw* | pw32* | cegcc*) 27961@@ -10157,13 +10749,71 @@ cygwin* | mingw* | pw32* | cegcc*)
22683 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' 27962 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
22684 ;; 27963 ;;
22685 esac 27964 esac
@@ -22752,16 +28031,16 @@ index 6690a502b2f..badcc0776df 100755
22752 # FIXME: first we should search . and the directory the executable is in 28031 # FIXME: first we should search . and the directory the executable is in
22753 shlibpath_var=PATH 28032 shlibpath_var=PATH
22754 ;; 28033 ;;
22755@@ -11035,7 +11685,7 @@ else 28034@@ -11041,7 +11691,7 @@ else
22756 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 28035 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
22757 lt_status=$lt_dlunknown 28036 lt_status=$lt_dlunknown
22758 cat > conftest.$ac_ext <<_LT_EOF 28037 cat > conftest.$ac_ext <<_LT_EOF
22759-#line 11038 "configure" 28038-#line 11044 "configure"
22760+#line $LINENO "configure" 28039+#line $LINENO "configure"
22761 #include "confdefs.h" 28040 #include "confdefs.h"
22762 28041
22763 #if HAVE_DLFCN_H 28042 #if HAVE_DLFCN_H
22764@@ -11079,10 +11729,10 @@ else 28043@@ -11085,10 +11735,10 @@ else
22765 /* When -fvisbility=hidden is used, assume the code has been annotated 28044 /* When -fvisbility=hidden is used, assume the code has been annotated
22766 correspondingly for the symbols needed. */ 28045 correspondingly for the symbols needed. */
22767 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 28046 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
@@ -22774,16 +28053,16 @@ index 6690a502b2f..badcc0776df 100755
22774 int main () 28053 int main ()
22775 { 28054 {
22776 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 28055 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
22777@@ -11141,7 +11791,7 @@ else 28056@@ -11147,7 +11797,7 @@ else
22778 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 28057 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
22779 lt_status=$lt_dlunknown 28058 lt_status=$lt_dlunknown
22780 cat > conftest.$ac_ext <<_LT_EOF 28059 cat > conftest.$ac_ext <<_LT_EOF
22781-#line 11144 "configure" 28060-#line 11150 "configure"
22782+#line $LINENO "configure" 28061+#line $LINENO "configure"
22783 #include "confdefs.h" 28062 #include "confdefs.h"
22784 28063
22785 #if HAVE_DLFCN_H 28064 #if HAVE_DLFCN_H
22786@@ -11185,10 +11835,10 @@ else 28065@@ -11191,10 +11841,10 @@ else
22787 /* When -fvisbility=hidden is used, assume the code has been annotated 28066 /* When -fvisbility=hidden is used, assume the code has been annotated
22788 correspondingly for the symbols needed. */ 28067 correspondingly for the symbols needed. */
22789 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 28068 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
@@ -22796,7 +28075,7 @@ index 6690a502b2f..badcc0776df 100755
22796 int main () 28075 int main ()
22797 { 28076 {
22798 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 28077 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
22799@@ -13390,13 +14040,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' 28078@@ -13396,13 +14046,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
22800 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' 28079 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
22801 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' 28080 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
22802 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' 28081 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
@@ -22817,7 +28096,7 @@ index 6690a502b2f..badcc0776df 100755
22817 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' 28096 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
22818 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' 28097 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
22819 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' 28098 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
22820@@ -13411,14 +14068,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de 28099@@ -13417,14 +14074,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de
22821 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' 28100 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
22822 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' 28101 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
22823 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"`' 28102 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"`'
@@ -22836,7 +28115,7 @@ index 6690a502b2f..badcc0776df 100755
22836 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' 28115 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
22837 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' 28116 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
22838 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' 28117 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
22839@@ -13451,12 +14111,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q 28118@@ -13457,12 +14117,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q
22840 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' 28119 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
22841 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' 28120 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
22842 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' 28121 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
@@ -22850,7 +28129,7 @@ index 6690a502b2f..badcc0776df 100755
22850 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' 28129 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
22851 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' 28130 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
22852 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' 28131 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
22853@@ -13511,8 +14171,13 @@ reload_flag \ 28132@@ -13517,8 +14177,13 @@ reload_flag \
22854 OBJDUMP \ 28133 OBJDUMP \
22855 deplibs_check_method \ 28134 deplibs_check_method \
22856 file_magic_cmd \ 28135 file_magic_cmd \
@@ -22864,7 +28143,7 @@ index 6690a502b2f..badcc0776df 100755
22864 STRIP \ 28143 STRIP \
22865 RANLIB \ 28144 RANLIB \
22866 CC \ 28145 CC \
22867@@ -13522,12 +14187,14 @@ lt_cv_sys_global_symbol_pipe \ 28146@@ -13528,12 +14193,14 @@ lt_cv_sys_global_symbol_pipe \
22868 lt_cv_sys_global_symbol_to_cdecl \ 28147 lt_cv_sys_global_symbol_to_cdecl \
22869 lt_cv_sys_global_symbol_to_c_name_address \ 28148 lt_cv_sys_global_symbol_to_c_name_address \
22870 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ 28149 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
@@ -22880,7 +28159,7 @@ index 6690a502b2f..badcc0776df 100755
22880 DSYMUTIL \ 28159 DSYMUTIL \
22881 NMEDIT \ 28160 NMEDIT \
22882 LIPO \ 28161 LIPO \
22883@@ -13543,7 +14210,6 @@ no_undefined_flag \ 28162@@ -13549,7 +14216,6 @@ no_undefined_flag \
22884 hardcode_libdir_flag_spec \ 28163 hardcode_libdir_flag_spec \
22885 hardcode_libdir_flag_spec_ld \ 28164 hardcode_libdir_flag_spec_ld \
22886 hardcode_libdir_separator \ 28165 hardcode_libdir_separator \
@@ -22888,7 +28167,7 @@ index 6690a502b2f..badcc0776df 100755
22888 exclude_expsyms \ 28167 exclude_expsyms \
22889 include_expsyms \ 28168 include_expsyms \
22890 file_list_spec \ 28169 file_list_spec \
22891@@ -13579,6 +14245,7 @@ module_cmds \ 28170@@ -13585,6 +14251,7 @@ module_cmds \
22892 module_expsym_cmds \ 28171 module_expsym_cmds \
22893 export_symbols_cmds \ 28172 export_symbols_cmds \
22894 prelink_cmds \ 28173 prelink_cmds \
@@ -22896,7 +28175,7 @@ index 6690a502b2f..badcc0776df 100755
22896 postinstall_cmds \ 28175 postinstall_cmds \
22897 postuninstall_cmds \ 28176 postuninstall_cmds \
22898 finish_cmds \ 28177 finish_cmds \
22899@@ -14344,7 +15011,8 @@ $as_echo X"$file" | 28178@@ -14350,7 +15017,8 @@ $as_echo X"$file" |
22900 # NOTE: Changes made to this file will be lost: look at ltmain.sh. 28179 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
22901 # 28180 #
22902 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 28181 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
@@ -22906,7 +28185,7 @@ index 6690a502b2f..badcc0776df 100755
22906 # Written by Gordon Matzigkeit, 1996 28185 # Written by Gordon Matzigkeit, 1996
22907 # 28186 #
22908 # This file is part of GNU Libtool. 28187 # This file is part of GNU Libtool.
22909@@ -14447,19 +15115,42 @@ SP2NL=$lt_lt_SP2NL 28188@@ -14453,19 +15121,42 @@ SP2NL=$lt_lt_SP2NL
22910 # turn newlines into spaces. 28189 # turn newlines into spaces.
22911 NL2SP=$lt_lt_NL2SP 28190 NL2SP=$lt_lt_NL2SP
22912 28191
@@ -22950,7 +28229,7 @@ index 6690a502b2f..badcc0776df 100755
22950 # A symbol stripping program. 28229 # A symbol stripping program.
22951 STRIP=$lt_STRIP 28230 STRIP=$lt_STRIP
22952 28231
22953@@ -14489,6 +15180,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address 28232@@ -14495,6 +15186,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
22954 # Transform the output of nm in a C name address pair when lib prefix is needed. 28233 # Transform the output of nm in a C name address pair when lib prefix is needed.
22955 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix 28234 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
22956 28235
@@ -22963,7 +28242,7 @@ index 6690a502b2f..badcc0776df 100755
22963 # The name of the directory that contains temporary libtool files. 28242 # The name of the directory that contains temporary libtool files.
22964 objdir=$objdir 28243 objdir=$objdir
22965 28244
22966@@ -14498,6 +15195,9 @@ MAGIC_CMD=$MAGIC_CMD 28245@@ -14504,6 +15201,9 @@ MAGIC_CMD=$MAGIC_CMD
22967 # Must we lock files when doing compilation? 28246 # Must we lock files when doing compilation?
22968 need_locks=$lt_need_locks 28247 need_locks=$lt_need_locks
22969 28248
@@ -22973,7 +28252,7 @@ index 6690a502b2f..badcc0776df 100755
22973 # Tool to manipulate archived DWARF debug symbol files on Mac OS X. 28252 # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
22974 DSYMUTIL=$lt_DSYMUTIL 28253 DSYMUTIL=$lt_DSYMUTIL
22975 28254
22976@@ -14612,12 +15312,12 @@ with_gcc=$GCC 28255@@ -14618,12 +15318,12 @@ with_gcc=$GCC
22977 # Compiler flag to turn off builtin functions. 28256 # Compiler flag to turn off builtin functions.
22978 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag 28257 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
22979 28258
@@ -22989,7 +28268,7 @@ index 6690a502b2f..badcc0776df 100755
22989 # Compiler flag to prevent dynamic linking. 28268 # Compiler flag to prevent dynamic linking.
22990 link_static_flag=$lt_lt_prog_compiler_static 28269 link_static_flag=$lt_lt_prog_compiler_static
22991 28270
22992@@ -14704,9 +15404,6 @@ inherit_rpath=$inherit_rpath 28271@@ -14710,9 +15410,6 @@ inherit_rpath=$inherit_rpath
22993 # Whether libtool must link a program against all its dependency libraries. 28272 # Whether libtool must link a program against all its dependency libraries.
22994 link_all_deplibs=$link_all_deplibs 28273 link_all_deplibs=$link_all_deplibs
22995 28274
@@ -22999,7 +28278,7 @@ index 6690a502b2f..badcc0776df 100755
22999 # Set to "yes" if exported symbols are required. 28278 # Set to "yes" if exported symbols are required.
23000 always_export_symbols=$always_export_symbols 28279 always_export_symbols=$always_export_symbols
23001 28280
23002@@ -14722,6 +15419,9 @@ include_expsyms=$lt_include_expsyms 28281@@ -14728,6 +15425,9 @@ include_expsyms=$lt_include_expsyms
23003 # Commands necessary for linking programs (against libraries) with templates. 28282 # Commands necessary for linking programs (against libraries) with templates.
23004 prelink_cmds=$lt_prelink_cmds 28283 prelink_cmds=$lt_prelink_cmds
23005 28284
@@ -23009,7 +28288,7 @@ index 6690a502b2f..badcc0776df 100755
23009 # Specify filename containing input files. 28288 # Specify filename containing input files.
23010 file_list_spec=$lt_file_list_spec 28289 file_list_spec=$lt_file_list_spec
23011 28290
23012@@ -14754,210 +15454,169 @@ ltmain="$ac_aux_dir/ltmain.sh" 28291@@ -14760,210 +15460,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
23013 # if finds mixed CR/LF and LF-only lines. Since sed operates in 28292 # if finds mixed CR/LF and LF-only lines. Since sed operates in
23014 # text mode, it properly converts lines to CR/LF. This bash problem 28293 # text mode, it properly converts lines to CR/LF. This bash problem
23015 # is reportedly fixed, but why not run on old versions too? 28294 # is reportedly fixed, but why not run on old versions too?
@@ -23383,8 +28662,838 @@ index 6690a502b2f..badcc0776df 100755
23383 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") 28662 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
23384 chmod +x "$ofile" 28663 chmod +x "$ofile"
23385 28664
28665diff --git a/sim/Makefile.in b/sim/Makefile.in
28666index dbbaa84224a..f819bbe0bdd 100644
28667--- a/sim/Makefile.in
28668+++ b/sim/Makefile.in
28669@@ -744,6 +744,7 @@ C_DIALECT = @C_DIALECT@
28670 DATADIRNAME = @DATADIRNAME@
28671 DEFS = @DEFS@
28672 DEPDIR = @DEPDIR@
28673+DLLTOOL = @DLLTOOL@
28674 DSYMUTIL = @DSYMUTIL@
28675 DTC = @DTC@
28676 DUMPBIN = @DUMPBIN@
28677@@ -809,6 +810,7 @@ LN_S = @LN_S@
28678 LTLIBOBJS = @LTLIBOBJS@
28679 MAINT = @MAINT@
28680 MAKEINFO = @MAKEINFO@
28681+MANIFEST_TOOL = @MANIFEST_TOOL@
28682 MKDIR_P = @MKDIR_P@
28683 NM = @NM@
28684 NMEDIT = @NMEDIT@
28685@@ -859,6 +861,7 @@ abs_builddir = @abs_builddir@
28686 abs_srcdir = @abs_srcdir@
28687 abs_top_builddir = @abs_top_builddir@
28688 abs_top_srcdir = @abs_top_srcdir@
28689+ac_ct_AR = @ac_ct_AR@
28690 ac_ct_CC = @ac_ct_CC@
28691 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
28692 am__include = @am__include@
28693diff --git a/zlib/Makefile.in b/zlib/Makefile.in
28694index c7584492a65..0605835c14f 100644
28695--- a/zlib/Makefile.in
28696+++ b/zlib/Makefile.in
28697@@ -1,7 +1,7 @@
28698-# Makefile.in generated by automake 1.16.5 from Makefile.am.
28699+# Makefile.in generated by automake 1.15.1 from Makefile.am.
28700 # @configure_input@
28701
28702-# Copyright (C) 1994-2021 Free Software Foundation, Inc.
28703+# Copyright (C) 1994-2017 Free Software Foundation, Inc.
28704
28705 # This Makefile.in is free software; the Free Software Foundation
28706 # gives unlimited permission to copy and/or distribute it,
28707@@ -138,7 +138,6 @@ am__uninstall_files_from_dir = { \
28708 }
28709 am__installdirs = "$(DESTDIR)$(toolexeclibdir)"
28710 LIBRARIES = $(toolexeclib_LIBRARIES)
28711-LTLIBRARIES = $(noinst_LTLIBRARIES)
28712 ARFLAGS = cru
28713 AM_V_AR = $(am__v_AR_@AM_V@)
28714 am__v_AR_ = $(am__v_AR_@AM_DEFAULT_V@)
28715@@ -161,6 +160,7 @@ am__objects_1 = libz_a-adler32.$(OBJEXT) libz_a-compress.$(OBJEXT) \
28716 libz_a-zutil.$(OBJEXT)
28717 @TARGET_LIBRARY_FALSE@am_libz_a_OBJECTS = $(am__objects_1)
28718 libz_a_OBJECTS = $(am_libz_a_OBJECTS)
28719+LTLIBRARIES = $(noinst_LTLIBRARIES)
28720 libzgcj_convenience_la_LIBADD =
28721 am__libzgcj_convenience_la_SOURCES_DIST = adler32.c compress.c crc32.c \
28722 crc32.h deflate.c deflate.h gzguts.h gzread.c gzclose.c \
28723@@ -192,22 +192,7 @@ am__v_at_0 = @
28724 am__v_at_1 =
28725 DEFAULT_INCLUDES = -I.@am__isrc@
28726 depcomp = $(SHELL) $(top_srcdir)/../depcomp
28727-am__maybe_remake_depfiles = depfiles
28728-am__depfiles_remade = ./$(DEPDIR)/adler32.Plo ./$(DEPDIR)/compress.Plo \
28729- ./$(DEPDIR)/crc32.Plo ./$(DEPDIR)/deflate.Plo \
28730- ./$(DEPDIR)/gzclose.Plo ./$(DEPDIR)/gzlib.Plo \
28731- ./$(DEPDIR)/gzread.Plo ./$(DEPDIR)/gzwrite.Plo \
28732- ./$(DEPDIR)/infback.Plo ./$(DEPDIR)/inffast.Plo \
28733- ./$(DEPDIR)/inflate.Plo ./$(DEPDIR)/inftrees.Plo \
28734- ./$(DEPDIR)/libz_a-adler32.Po ./$(DEPDIR)/libz_a-compress.Po \
28735- ./$(DEPDIR)/libz_a-crc32.Po ./$(DEPDIR)/libz_a-deflate.Po \
28736- ./$(DEPDIR)/libz_a-gzclose.Po ./$(DEPDIR)/libz_a-gzlib.Po \
28737- ./$(DEPDIR)/libz_a-gzread.Po ./$(DEPDIR)/libz_a-gzwrite.Po \
28738- ./$(DEPDIR)/libz_a-infback.Po ./$(DEPDIR)/libz_a-inffast.Po \
28739- ./$(DEPDIR)/libz_a-inflate.Po ./$(DEPDIR)/libz_a-inftrees.Po \
28740- ./$(DEPDIR)/libz_a-trees.Po ./$(DEPDIR)/libz_a-uncompr.Po \
28741- ./$(DEPDIR)/libz_a-zutil.Po ./$(DEPDIR)/trees.Plo \
28742- ./$(DEPDIR)/uncompr.Plo ./$(DEPDIR)/zutil.Plo
28743+am__depfiles_maybe = depfiles
28744 am__mv = mv -f
28745 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
28746 $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
28747@@ -252,6 +237,9 @@ am__define_uniq_tagged_files = \
28748 unique=`for i in $$list; do \
28749 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
28750 done | $(am__uniquify_input)`
28751+ETAGS = etags
28752+CTAGS = ctags
28753+CSCOPE = cscope
28754 AM_RECURSIVE_TARGETS = cscope
28755 am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/../compile \
28756 $(top_srcdir)/../config.guess $(top_srcdir)/../config.sub \
28757@@ -272,8 +260,6 @@ am__post_remove_distdir = $(am__remove_distdir)
28758 DIST_ARCHIVES = $(distdir).tar.gz
28759 GZIP_ENV = --best
28760 DIST_TARGETS = dist-gzip
28761-# Exists only to be overridden by the user if desired.
28762-AM_DISTCHECK_DVI_TARGET = dvi
28763 distuninstallcheck_listfiles = find . -type f -print
28764 am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
28765 | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
28766@@ -292,18 +278,16 @@ CFLAGS = @CFLAGS@
28767 COMPPATH = @COMPPATH@
28768 CPP = @CPP@
28769 CPPFLAGS = @CPPFLAGS@
28770-CSCOPE = @CSCOPE@
28771-CTAGS = @CTAGS@
28772 CYGPATH_W = @CYGPATH_W@
28773 DEFS = @DEFS@
28774 DEPDIR = @DEPDIR@
28775+DLLTOOL = @DLLTOOL@
28776 DSYMUTIL = @DSYMUTIL@
28777 DUMPBIN = @DUMPBIN@
28778 ECHO_C = @ECHO_C@
28779 ECHO_N = @ECHO_N@
28780 ECHO_T = @ECHO_T@
28781 EGREP = @EGREP@
28782-ETAGS = @ETAGS@
28783 EXEEXT = @EXEEXT@
28784 FGREP = @FGREP@
28785 GREP = @GREP@
28786@@ -322,6 +306,7 @@ LN_S = @LN_S@
28787 LTLIBOBJS = @LTLIBOBJS@
28788 MAINT = @MAINT@
28789 MAKEINFO = @MAKEINFO@
28790+MANIFEST_TOOL = @MANIFEST_TOOL@
28791 MKDIR_P = @MKDIR_P@
28792 NM = @NM@
28793 NMEDIT = @NMEDIT@
28794@@ -348,6 +333,7 @@ abs_builddir = @abs_builddir@
28795 abs_srcdir = @abs_srcdir@
28796 abs_top_builddir = @abs_top_builddir@
28797 abs_top_srcdir = @abs_top_srcdir@
28798+ac_ct_AR = @ac_ct_AR@
28799 ac_ct_CC = @ac_ct_CC@
28800 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
28801 am__include = @am__include@
28802@@ -491,8 +477,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
28803 echo ' $(SHELL) ./config.status'; \
28804 $(SHELL) ./config.status;; \
28805 *) \
28806- echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles)'; \
28807- cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles);; \
28808+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
28809+ cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
28810 esac;
28811 $(top_srcdir)/../multilib.am $(am__empty):
28812
28813@@ -536,6 +522,11 @@ uninstall-toolexeclibLIBRARIES:
28814 clean-toolexeclibLIBRARIES:
28815 -test -z "$(toolexeclib_LIBRARIES)" || rm -f $(toolexeclib_LIBRARIES)
28816
28817+libz.a: $(libz_a_OBJECTS) $(libz_a_DEPENDENCIES) $(EXTRA_libz_a_DEPENDENCIES)
28818+ $(AM_V_at)-rm -f libz.a
28819+ $(AM_V_AR)$(libz_a_AR) libz.a $(libz_a_OBJECTS) $(libz_a_LIBADD)
28820+ $(AM_V_at)$(RANLIB) libz.a
28821+
28822 clean-noinstLTLIBRARIES:
28823 -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
28824 @list='$(noinst_LTLIBRARIES)'; \
28825@@ -547,11 +538,6 @@ clean-noinstLTLIBRARIES:
28826 rm -f $${locs}; \
28827 }
28828
28829-libz.a: $(libz_a_OBJECTS) $(libz_a_DEPENDENCIES) $(EXTRA_libz_a_DEPENDENCIES)
28830- $(AM_V_at)-rm -f libz.a
28831- $(AM_V_AR)$(libz_a_AR) libz.a $(libz_a_OBJECTS) $(libz_a_LIBADD)
28832- $(AM_V_at)$(RANLIB) libz.a
28833-
28834 libzgcj_convenience.la: $(libzgcj_convenience_la_OBJECTS) $(libzgcj_convenience_la_DEPENDENCIES) $(EXTRA_libzgcj_convenience_la_DEPENDENCIES)
28835 $(AM_V_CCLD)$(LINK) $(am_libzgcj_convenience_la_rpath) $(libzgcj_convenience_la_OBJECTS) $(libzgcj_convenience_la_LIBADD) $(LIBS)
28836
28837@@ -561,42 +547,36 @@ mostlyclean-compile:
28838 distclean-compile:
28839 -rm -f *.tab.c
28840
28841-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/adler32.Plo@am__quote@ # am--include-marker
28842-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/compress.Plo@am__quote@ # am--include-marker
28843-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/crc32.Plo@am__quote@ # am--include-marker
28844-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/deflate.Plo@am__quote@ # am--include-marker
28845-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gzclose.Plo@am__quote@ # am--include-marker
28846-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gzlib.Plo@am__quote@ # am--include-marker
28847-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gzread.Plo@am__quote@ # am--include-marker
28848-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gzwrite.Plo@am__quote@ # am--include-marker
28849-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/infback.Plo@am__quote@ # am--include-marker
28850-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/inffast.Plo@am__quote@ # am--include-marker
28851-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/inflate.Plo@am__quote@ # am--include-marker
28852-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/inftrees.Plo@am__quote@ # am--include-marker
28853-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libz_a-adler32.Po@am__quote@ # am--include-marker
28854-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libz_a-compress.Po@am__quote@ # am--include-marker
28855-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libz_a-crc32.Po@am__quote@ # am--include-marker
28856-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libz_a-deflate.Po@am__quote@ # am--include-marker
28857-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libz_a-gzclose.Po@am__quote@ # am--include-marker
28858-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libz_a-gzlib.Po@am__quote@ # am--include-marker
28859-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libz_a-gzread.Po@am__quote@ # am--include-marker
28860-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libz_a-gzwrite.Po@am__quote@ # am--include-marker
28861-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libz_a-infback.Po@am__quote@ # am--include-marker
28862-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libz_a-inffast.Po@am__quote@ # am--include-marker
28863-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libz_a-inflate.Po@am__quote@ # am--include-marker
28864-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libz_a-inftrees.Po@am__quote@ # am--include-marker
28865-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libz_a-trees.Po@am__quote@ # am--include-marker
28866-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libz_a-uncompr.Po@am__quote@ # am--include-marker
28867-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libz_a-zutil.Po@am__quote@ # am--include-marker
28868-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/trees.Plo@am__quote@ # am--include-marker
28869-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/uncompr.Plo@am__quote@ # am--include-marker
28870-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/zutil.Plo@am__quote@ # am--include-marker
28871-
28872-$(am__depfiles_remade):
28873- @$(MKDIR_P) $(@D)
28874- @echo '# dummy' >$@-t && $(am__mv) $@-t $@
28875-
28876-am--depfiles: $(am__depfiles_remade)
28877+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/adler32.Plo@am__quote@
28878+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/compress.Plo@am__quote@
28879+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/crc32.Plo@am__quote@
28880+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/deflate.Plo@am__quote@
28881+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gzclose.Plo@am__quote@
28882+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gzlib.Plo@am__quote@
28883+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gzread.Plo@am__quote@
28884+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gzwrite.Plo@am__quote@
28885+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/infback.Plo@am__quote@
28886+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/inffast.Plo@am__quote@
28887+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/inflate.Plo@am__quote@
28888+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/inftrees.Plo@am__quote@
28889+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libz_a-adler32.Po@am__quote@
28890+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libz_a-compress.Po@am__quote@
28891+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libz_a-crc32.Po@am__quote@
28892+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libz_a-deflate.Po@am__quote@
28893+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libz_a-gzclose.Po@am__quote@
28894+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libz_a-gzlib.Po@am__quote@
28895+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libz_a-gzread.Po@am__quote@
28896+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libz_a-gzwrite.Po@am__quote@
28897+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libz_a-infback.Po@am__quote@
28898+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libz_a-inffast.Po@am__quote@
28899+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libz_a-inflate.Po@am__quote@
28900+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libz_a-inftrees.Po@am__quote@
28901+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libz_a-trees.Po@am__quote@
28902+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libz_a-uncompr.Po@am__quote@
28903+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libz_a-zutil.Po@am__quote@
28904+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/trees.Plo@am__quote@
28905+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/uncompr.Plo@am__quote@
28906+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/zutil.Plo@am__quote@
28907
28908 .c.o:
28909 @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
28910@@ -896,10 +876,8 @@ cscopelist-am: $(am__tagged_files)
28911 distclean-tags:
28912 -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
28913 -rm -f cscope.out cscope.in.out cscope.po.out cscope.files
28914-distdir: $(BUILT_SOURCES)
28915- $(MAKE) $(AM_MAKEFLAGS) distdir-am
28916
28917-distdir-am: $(DISTFILES)
28918+distdir: $(DISTFILES)
28919 $(am__remove_distdir)
28920 test -d "$(distdir)" || mkdir "$(distdir)"
28921 @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
28922@@ -954,10 +932,6 @@ dist-xz: distdir
28923 tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
28924 $(am__post_remove_distdir)
28925
28926-dist-zstd: distdir
28927- tardir=$(distdir) && $(am__tar) | zstd -c $${ZSTD_CLEVEL-$${ZSTD_OPT--19}} >$(distdir).tar.zst
28928- $(am__post_remove_distdir)
28929-
28930 dist-tarZ: distdir
28931 @echo WARNING: "Support for distribution archives compressed with" \
28932 "legacy program 'compress' is deprecated." >&2
28933@@ -1000,8 +974,6 @@ distcheck: dist
28934 eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\
28935 *.zip*) \
28936 unzip $(distdir).zip ;;\
28937- *.tar.zst*) \
28938- zstd -dc $(distdir).tar.zst | $(am__untar) ;;\
28939 esac
28940 chmod -R a-w $(distdir)
28941 chmod u+w $(distdir)
28942@@ -1017,7 +989,7 @@ distcheck: dist
28943 $(DISTCHECK_CONFIGURE_FLAGS) \
28944 --srcdir=../.. --prefix="$$dc_install_base" \
28945 && $(MAKE) $(AM_MAKEFLAGS) \
28946- && $(MAKE) $(AM_MAKEFLAGS) $(AM_DISTCHECK_DVI_TARGET) \
28947+ && $(MAKE) $(AM_MAKEFLAGS) dvi \
28948 && $(MAKE) $(AM_MAKEFLAGS) check \
28949 && $(MAKE) $(AM_MAKEFLAGS) install \
28950 && $(MAKE) $(AM_MAKEFLAGS) installcheck \
28951@@ -1113,36 +1085,7 @@ clean-am: clean-generic clean-libtool clean-local \
28952
28953 distclean: distclean-am
28954 -rm -f $(am__CONFIG_DISTCLEAN_FILES)
28955- -rm -f ./$(DEPDIR)/adler32.Plo
28956- -rm -f ./$(DEPDIR)/compress.Plo
28957- -rm -f ./$(DEPDIR)/crc32.Plo
28958- -rm -f ./$(DEPDIR)/deflate.Plo
28959- -rm -f ./$(DEPDIR)/gzclose.Plo
28960- -rm -f ./$(DEPDIR)/gzlib.Plo
28961- -rm -f ./$(DEPDIR)/gzread.Plo
28962- -rm -f ./$(DEPDIR)/gzwrite.Plo
28963- -rm -f ./$(DEPDIR)/infback.Plo
28964- -rm -f ./$(DEPDIR)/inffast.Plo
28965- -rm -f ./$(DEPDIR)/inflate.Plo
28966- -rm -f ./$(DEPDIR)/inftrees.Plo
28967- -rm -f ./$(DEPDIR)/libz_a-adler32.Po
28968- -rm -f ./$(DEPDIR)/libz_a-compress.Po
28969- -rm -f ./$(DEPDIR)/libz_a-crc32.Po
28970- -rm -f ./$(DEPDIR)/libz_a-deflate.Po
28971- -rm -f ./$(DEPDIR)/libz_a-gzclose.Po
28972- -rm -f ./$(DEPDIR)/libz_a-gzlib.Po
28973- -rm -f ./$(DEPDIR)/libz_a-gzread.Po
28974- -rm -f ./$(DEPDIR)/libz_a-gzwrite.Po
28975- -rm -f ./$(DEPDIR)/libz_a-infback.Po
28976- -rm -f ./$(DEPDIR)/libz_a-inffast.Po
28977- -rm -f ./$(DEPDIR)/libz_a-inflate.Po
28978- -rm -f ./$(DEPDIR)/libz_a-inftrees.Po
28979- -rm -f ./$(DEPDIR)/libz_a-trees.Po
28980- -rm -f ./$(DEPDIR)/libz_a-uncompr.Po
28981- -rm -f ./$(DEPDIR)/libz_a-zutil.Po
28982- -rm -f ./$(DEPDIR)/trees.Plo
28983- -rm -f ./$(DEPDIR)/uncompr.Plo
28984- -rm -f ./$(DEPDIR)/zutil.Plo
28985+ -rm -rf ./$(DEPDIR)
28986 -rm -f Makefile
28987 distclean-am: clean-am distclean-compile distclean-generic \
28988 distclean-libtool distclean-local distclean-tags
28989@@ -1190,36 +1133,7 @@ installcheck-am:
28990 maintainer-clean: maintainer-clean-am
28991 -rm -f $(am__CONFIG_DISTCLEAN_FILES)
28992 -rm -rf $(top_srcdir)/autom4te.cache
28993- -rm -f ./$(DEPDIR)/adler32.Plo
28994- -rm -f ./$(DEPDIR)/compress.Plo
28995- -rm -f ./$(DEPDIR)/crc32.Plo
28996- -rm -f ./$(DEPDIR)/deflate.Plo
28997- -rm -f ./$(DEPDIR)/gzclose.Plo
28998- -rm -f ./$(DEPDIR)/gzlib.Plo
28999- -rm -f ./$(DEPDIR)/gzread.Plo
29000- -rm -f ./$(DEPDIR)/gzwrite.Plo
29001- -rm -f ./$(DEPDIR)/infback.Plo
29002- -rm -f ./$(DEPDIR)/inffast.Plo
29003- -rm -f ./$(DEPDIR)/inflate.Plo
29004- -rm -f ./$(DEPDIR)/inftrees.Plo
29005- -rm -f ./$(DEPDIR)/libz_a-adler32.Po
29006- -rm -f ./$(DEPDIR)/libz_a-compress.Po
29007- -rm -f ./$(DEPDIR)/libz_a-crc32.Po
29008- -rm -f ./$(DEPDIR)/libz_a-deflate.Po
29009- -rm -f ./$(DEPDIR)/libz_a-gzclose.Po
29010- -rm -f ./$(DEPDIR)/libz_a-gzlib.Po
29011- -rm -f ./$(DEPDIR)/libz_a-gzread.Po
29012- -rm -f ./$(DEPDIR)/libz_a-gzwrite.Po
29013- -rm -f ./$(DEPDIR)/libz_a-infback.Po
29014- -rm -f ./$(DEPDIR)/libz_a-inffast.Po
29015- -rm -f ./$(DEPDIR)/libz_a-inflate.Po
29016- -rm -f ./$(DEPDIR)/libz_a-inftrees.Po
29017- -rm -f ./$(DEPDIR)/libz_a-trees.Po
29018- -rm -f ./$(DEPDIR)/libz_a-uncompr.Po
29019- -rm -f ./$(DEPDIR)/libz_a-zutil.Po
29020- -rm -f ./$(DEPDIR)/trees.Plo
29021- -rm -f ./$(DEPDIR)/uncompr.Plo
29022- -rm -f ./$(DEPDIR)/zutil.Plo
29023+ -rm -rf ./$(DEPDIR)
29024 -rm -f Makefile
29025 maintainer-clean-am: distclean-am maintainer-clean-generic \
29026 maintainer-clean-local
29027@@ -1241,17 +1155,17 @@ uninstall-am: uninstall-toolexeclibLIBRARIES
29028
29029 .MAKE: install-am install-strip
29030
29031-.PHONY: CTAGS GTAGS TAGS all all-am all-local am--depfiles am--refresh \
29032- check check-am clean clean-cscope clean-generic clean-libtool \
29033+.PHONY: CTAGS GTAGS TAGS all all-am all-local am--refresh check \
29034+ check-am clean clean-cscope clean-generic clean-libtool \
29035 clean-local clean-noinstLTLIBRARIES clean-toolexeclibLIBRARIES \
29036 cscope cscopelist-am ctags ctags-am dist dist-all dist-bzip2 \
29037 dist-gzip dist-lzip dist-shar dist-tarZ dist-xz dist-zip \
29038- dist-zstd distcheck distclean distclean-compile \
29039- distclean-generic distclean-libtool distclean-local \
29040- distclean-tags distcleancheck distdir distuninstallcheck dvi \
29041- dvi-am html html-am info info-am install install-am \
29042- install-data install-data-am install-dvi install-dvi-am \
29043- install-exec install-exec-am install-exec-local install-html \
29044+ distcheck distclean distclean-compile distclean-generic \
29045+ distclean-libtool distclean-local distclean-tags \
29046+ distcleancheck distdir distuninstallcheck dvi dvi-am html \
29047+ html-am info info-am install install-am install-data \
29048+ install-data-am install-dvi install-dvi-am install-exec \
29049+ install-exec-am install-exec-local install-html \
29050 install-html-am install-info install-info-am install-man \
29051 install-pdf install-pdf-am install-ps install-ps-am \
29052 install-strip install-toolexeclibLIBRARIES installcheck \
29053diff --git a/zlib/aclocal.m4 b/zlib/aclocal.m4
29054index 3538b0f0aea..e5eed57bd68 100644
29055--- a/zlib/aclocal.m4
29056+++ b/zlib/aclocal.m4
29057@@ -1,6 +1,6 @@
29058-# generated automatically by aclocal 1.16.5 -*- Autoconf -*-
29059+# generated automatically by aclocal 1.15.1 -*- Autoconf -*-
29060
29061-# Copyright (C) 1996-2021 Free Software Foundation, Inc.
29062+# Copyright (C) 1996-2017 Free Software Foundation, Inc.
29063
29064 # This file is free software; the Free Software Foundation
29065 # gives unlimited permission to copy and/or distribute it,
29066@@ -20,7 +20,7 @@ You have another version of autoconf. It may work, but is not guaranteed to.
29067 If you have problems, you may need to regenerate the build system entirely.
29068 To do so, use the procedure documented by the package, typically 'autoreconf'.])])
29069
29070-# Copyright (C) 2002-2021 Free Software Foundation, Inc.
29071+# Copyright (C) 2002-2017 Free Software Foundation, Inc.
29072 #
29073 # This file is free software; the Free Software Foundation
29074 # gives unlimited permission to copy and/or distribute it,
29075@@ -32,10 +32,10 @@ To do so, use the procedure documented by the package, typically 'autoreconf'.])
29076 # generated from the m4 files accompanying Automake X.Y.
29077 # (This private macro should not be called outside this file.)
29078 AC_DEFUN([AM_AUTOMAKE_VERSION],
29079-[am__api_version='1.16'
29080+[am__api_version='1.15'
29081 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
29082 dnl require some minimum version. Point them to the right macro.
29083-m4_if([$1], [1.16.5], [],
29084+m4_if([$1], [1.15.1], [],
29085 [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
29086 ])
29087
29088@@ -51,14 +51,14 @@ m4_define([_AM_AUTOCONF_VERSION], [])
29089 # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
29090 # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
29091 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
29092-[AM_AUTOMAKE_VERSION([1.16.5])dnl
29093+[AM_AUTOMAKE_VERSION([1.15.1])dnl
29094 m4_ifndef([AC_AUTOCONF_VERSION],
29095 [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
29096 _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
29097
29098 # AM_AUX_DIR_EXPAND -*- Autoconf -*-
29099
29100-# Copyright (C) 2001-2021 Free Software Foundation, Inc.
29101+# Copyright (C) 2001-2017 Free Software Foundation, Inc.
29102 #
29103 # This file is free software; the Free Software Foundation
29104 # gives unlimited permission to copy and/or distribute it,
29105@@ -110,7 +110,7 @@ am_aux_dir=`cd "$ac_aux_dir" && pwd`
29106
29107 # AM_CONDITIONAL -*- Autoconf -*-
29108
29109-# Copyright (C) 1997-2021 Free Software Foundation, Inc.
29110+# Copyright (C) 1997-2017 Free Software Foundation, Inc.
29111 #
29112 # This file is free software; the Free Software Foundation
29113 # gives unlimited permission to copy and/or distribute it,
29114@@ -141,7 +141,7 @@ AC_CONFIG_COMMANDS_PRE(
29115 Usually this means the macro was only invoked conditionally.]])
29116 fi])])
29117
29118-# Copyright (C) 1999-2021 Free Software Foundation, Inc.
29119+# Copyright (C) 1999-2017 Free Software Foundation, Inc.
29120 #
29121 # This file is free software; the Free Software Foundation
29122 # gives unlimited permission to copy and/or distribute it,
29123@@ -332,12 +332,13 @@ _AM_SUBST_NOTMAKE([am__nodep])dnl
29124
29125 # Generate code to set up dependency tracking. -*- Autoconf -*-
29126
29127-# Copyright (C) 1999-2021 Free Software Foundation, Inc.
29128+# Copyright (C) 1999-2017 Free Software Foundation, Inc.
29129 #
29130 # This file is free software; the Free Software Foundation
29131 # gives unlimited permission to copy and/or distribute it,
29132 # with or without modifications, as long as this notice is preserved.
29133
29134+
29135 # _AM_OUTPUT_DEPENDENCY_COMMANDS
29136 # ------------------------------
29137 AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
29138@@ -345,43 +346,49 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
29139 # Older Autoconf quotes --file arguments for eval, but not when files
29140 # are listed without --file. Let's play safe and only enable the eval
29141 # if we detect the quoting.
29142- # TODO: see whether this extra hack can be removed once we start
29143- # requiring Autoconf 2.70 or later.
29144- AS_CASE([$CONFIG_FILES],
29145- [*\'*], [eval set x "$CONFIG_FILES"],
29146- [*], [set x $CONFIG_FILES])
29147+ case $CONFIG_FILES in
29148+ *\'*) eval set x "$CONFIG_FILES" ;;
29149+ *) set x $CONFIG_FILES ;;
29150+ esac
29151 shift
29152- # Used to flag and report bootstrapping failures.
29153- am_rc=0
29154- for am_mf
29155+ for mf
29156 do
29157 # Strip MF so we end up with the name of the file.
29158- am_mf=`AS_ECHO(["$am_mf"]) | sed -e 's/:.*$//'`
29159- # Check whether this is an Automake generated Makefile which includes
29160- # dependency-tracking related rules and includes.
29161- # Grep'ing the whole file directly is not great: AIX grep has a line
29162+ mf=`echo "$mf" | sed -e 's/:.*$//'`
29163+ # Check whether this is an Automake generated Makefile or not.
29164+ # We used to match only the files named 'Makefile.in', but
29165+ # some people rename them; so instead we look at the file content.
29166+ # Grep'ing the first line is not enough: some people post-process
29167+ # each Makefile.in and add a new line on top of each file to say so.
29168+ # Grep'ing the whole file is not good either: AIX grep has a line
29169 # limit of 2048, but all sed's we know have understand at least 4000.
29170- sed -n 's,^am--depfiles:.*,X,p' "$am_mf" | grep X >/dev/null 2>&1 \
29171- || continue
29172- am_dirpart=`AS_DIRNAME(["$am_mf"])`
29173- am_filepart=`AS_BASENAME(["$am_mf"])`
29174- AM_RUN_LOG([cd "$am_dirpart" \
29175- && sed -e '/# am--include-marker/d' "$am_filepart" \
29176- | $MAKE -f - am--depfiles]) || am_rc=$?
29177+ if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
29178+ dirpart=`AS_DIRNAME("$mf")`
29179+ else
29180+ continue
29181+ fi
29182+ # Extract the definition of DEPDIR, am__include, and am__quote
29183+ # from the Makefile without running 'make'.
29184+ DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
29185+ test -z "$DEPDIR" && continue
29186+ am__include=`sed -n 's/^am__include = //p' < "$mf"`
29187+ test -z "$am__include" && continue
29188+ am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
29189+ # Find all dependency output files, they are included files with
29190+ # $(DEPDIR) in their names. We invoke sed twice because it is the
29191+ # simplest approach to changing $(DEPDIR) to its actual value in the
29192+ # expansion.
29193+ for file in `sed -n "
29194+ s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
29195+ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
29196+ # Make sure the directory exists.
29197+ test -f "$dirpart/$file" && continue
29198+ fdir=`AS_DIRNAME(["$file"])`
29199+ AS_MKDIR_P([$dirpart/$fdir])
29200+ # echo "creating $dirpart/$file"
29201+ echo '# dummy' > "$dirpart/$file"
29202+ done
29203 done
29204- if test $am_rc -ne 0; then
29205- AC_MSG_FAILURE([Something went wrong bootstrapping makefile fragments
29206- for automatic dependency tracking. If GNU make was not used, consider
29207- re-running the configure script with MAKE="gmake" (or whatever is
29208- necessary). You can also try re-running configure with the
29209- '--disable-dependency-tracking' option to at least be able to build
29210- the package (albeit without support for automatic dependency tracking).])
29211- fi
29212- AS_UNSET([am_dirpart])
29213- AS_UNSET([am_filepart])
29214- AS_UNSET([am_mf])
29215- AS_UNSET([am_rc])
29216- rm -f conftest-deps.mk
29217 }
29218 ])# _AM_OUTPUT_DEPENDENCY_COMMANDS
29219
29220@@ -390,17 +397,18 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
29221 # -----------------------------
29222 # This macro should only be invoked once -- use via AC_REQUIRE.
29223 #
29224-# This code is only required when automatic dependency tracking is enabled.
29225-# This creates each '.Po' and '.Plo' makefile fragment that we'll need in
29226-# order to bootstrap the dependency handling code.
29227+# This code is only required when automatic dependency tracking
29228+# is enabled. FIXME. This creates each '.P' file that we will
29229+# need in order to bootstrap the dependency handling code.
29230 AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
29231 [AC_CONFIG_COMMANDS([depfiles],
29232 [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
29233- [AMDEP_TRUE="$AMDEP_TRUE" MAKE="${MAKE-make}"])])
29234+ [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
29235+])
29236
29237 # Do all the work for Automake. -*- Autoconf -*-
29238
29239-# Copyright (C) 1996-2021 Free Software Foundation, Inc.
29240+# Copyright (C) 1996-2017 Free Software Foundation, Inc.
29241 #
29242 # This file is free software; the Free Software Foundation
29243 # gives unlimited permission to copy and/or distribute it,
29244@@ -428,10 +436,6 @@ m4_defn([AC_PROG_CC])
29245 # release and drop the old call support.
29246 AC_DEFUN([AM_INIT_AUTOMAKE],
29247 [AC_PREREQ([2.65])dnl
29248-m4_ifdef([_$0_ALREADY_INIT],
29249- [m4_fatal([$0 expanded multiple times
29250-]m4_defn([_$0_ALREADY_INIT]))],
29251- [m4_define([_$0_ALREADY_INIT], m4_expansion_stack)])dnl
29252 dnl Autoconf wants to disallow AM_ names. We explicitly allow
29253 dnl the ones we care about.
29254 m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
29255@@ -468,7 +472,7 @@ m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
29256 [_AM_SET_OPTIONS([$1])dnl
29257 dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
29258 m4_if(
29259- m4_ifset([AC_PACKAGE_NAME], [ok]):m4_ifset([AC_PACKAGE_VERSION], [ok]),
29260+ m4_ifdef([AC_PACKAGE_NAME], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]),
29261 [ok:ok],,
29262 [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
29263 AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
29264@@ -491,8 +495,8 @@ AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl
29265 AC_REQUIRE([AC_PROG_MKDIR_P])dnl
29266 # For better backward compatibility. To be removed once Automake 1.9.x
29267 # dies out for good. For more background, see:
29268-# <https://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
29269-# <https://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
29270+# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
29271+# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
29272 AC_SUBST([mkdir_p], ['$(MKDIR_P)'])
29273 # We need awk for the "check" target (and possibly the TAP driver). The
29274 # system "awk" is bad on some platforms.
29275@@ -520,20 +524,6 @@ AC_PROVIDE_IFELSE([AC_PROG_OBJCXX],
29276 [m4_define([AC_PROG_OBJCXX],
29277 m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl
29278 ])
29279-# Variables for tags utilities; see am/tags.am
29280-if test -z "$CTAGS"; then
29281- CTAGS=ctags
29282-fi
29283-AC_SUBST([CTAGS])
29284-if test -z "$ETAGS"; then
29285- ETAGS=etags
29286-fi
29287-AC_SUBST([ETAGS])
29288-if test -z "$CSCOPE"; then
29289- CSCOPE=cscope
29290-fi
29291-AC_SUBST([CSCOPE])
29292-
29293 AC_REQUIRE([AM_SILENT_RULES])dnl
29294 dnl The testsuite driver may need to know about EXEEXT, so add the
29295 dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This
29296@@ -573,7 +563,7 @@ END
29297 Aborting the configuration process, to ensure you take notice of the issue.
29298
29299 You can download and install GNU coreutils to get an 'rm' implementation
29300-that behaves properly: <https://www.gnu.org/software/coreutils/>.
29301+that behaves properly: <http://www.gnu.org/software/coreutils/>.
29302
29303 If you want to complete the configuration process using your problematic
29304 'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
29305@@ -615,7 +605,7 @@ for _am_header in $config_headers :; do
29306 done
29307 echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
29308
29309-# Copyright (C) 2001-2021 Free Software Foundation, Inc.
29310+# Copyright (C) 2001-2017 Free Software Foundation, Inc.
29311 #
29312 # This file is free software; the Free Software Foundation
29313 # gives unlimited permission to copy and/or distribute it,
29314@@ -639,7 +629,7 @@ AC_SUBST([install_sh])])
29315 # Add --enable-maintainer-mode option to configure. -*- Autoconf -*-
29316 # From Jim Meyering
29317
29318-# Copyright (C) 1996-2021 Free Software Foundation, Inc.
29319+# Copyright (C) 1996-2017 Free Software Foundation, Inc.
29320 #
29321 # This file is free software; the Free Software Foundation
29322 # gives unlimited permission to copy and/or distribute it,
29323@@ -674,7 +664,7 @@ AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
29324
29325 # Check to see how 'make' treats includes. -*- Autoconf -*-
29326
29327-# Copyright (C) 2001-2021 Free Software Foundation, Inc.
29328+# Copyright (C) 2001-2017 Free Software Foundation, Inc.
29329 #
29330 # This file is free software; the Free Software Foundation
29331 # gives unlimited permission to copy and/or distribute it,
29332@@ -682,42 +672,49 @@ AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
29333
29334 # AM_MAKE_INCLUDE()
29335 # -----------------
29336-# Check whether make has an 'include' directive that can support all
29337-# the idioms we need for our automatic dependency tracking code.
29338+# Check to see how make treats includes.
29339 AC_DEFUN([AM_MAKE_INCLUDE],
29340-[AC_MSG_CHECKING([whether ${MAKE-make} supports the include directive])
29341-cat > confinc.mk << 'END'
29342+[am_make=${MAKE-make}
29343+cat > confinc << 'END'
29344 am__doit:
29345- @echo this is the am__doit target >confinc.out
29346+ @echo this is the am__doit target
29347 .PHONY: am__doit
29348 END
29349+# If we don't find an include directive, just comment out the code.
29350+AC_MSG_CHECKING([for style of include used by $am_make])
29351 am__include="#"
29352 am__quote=
29353-# BSD make does it like this.
29354-echo '.include "confinc.mk" # ignored' > confmf.BSD
29355-# Other make implementations (GNU, Solaris 10, AIX) do it like this.
29356-echo 'include confinc.mk # ignored' > confmf.GNU
29357-_am_result=no
29358-for s in GNU BSD; do
29359- AM_RUN_LOG([${MAKE-make} -f confmf.$s && cat confinc.out])
29360- AS_CASE([$?:`cat confinc.out 2>/dev/null`],
29361- ['0:this is the am__doit target'],
29362- [AS_CASE([$s],
29363- [BSD], [am__include='.include' am__quote='"'],
29364- [am__include='include' am__quote=''])])
29365- if test "$am__include" != "#"; then
29366- _am_result="yes ($s style)"
29367- break
29368- fi
29369-done
29370-rm -f confinc.* confmf.*
29371-AC_MSG_RESULT([${_am_result}])
29372-AC_SUBST([am__include])])
29373-AC_SUBST([am__quote])])
29374+_am_result=none
29375+# First try GNU make style include.
29376+echo "include confinc" > confmf
29377+# Ignore all kinds of additional output from 'make'.
29378+case `$am_make -s -f confmf 2> /dev/null` in #(
29379+*the\ am__doit\ target*)
29380+ am__include=include
29381+ am__quote=
29382+ _am_result=GNU
29383+ ;;
29384+esac
29385+# Now try BSD make style include.
29386+if test "$am__include" = "#"; then
29387+ echo '.include "confinc"' > confmf
29388+ case `$am_make -s -f confmf 2> /dev/null` in #(
29389+ *the\ am__doit\ target*)
29390+ am__include=.include
29391+ am__quote="\""
29392+ _am_result=BSD
29393+ ;;
29394+ esac
29395+fi
29396+AC_SUBST([am__include])
29397+AC_SUBST([am__quote])
29398+AC_MSG_RESULT([$_am_result])
29399+rm -f confinc confmf
29400+])
29401
29402 # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
29403
29404-# Copyright (C) 1997-2021 Free Software Foundation, Inc.
29405+# Copyright (C) 1997-2017 Free Software Foundation, Inc.
29406 #
29407 # This file is free software; the Free Software Foundation
29408 # gives unlimited permission to copy and/or distribute it,
29409@@ -738,7 +735,12 @@ AC_DEFUN([AM_MISSING_HAS_RUN],
29410 [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
29411 AC_REQUIRE_AUX_FILE([missing])dnl
29412 if test x"${MISSING+set}" != xset; then
29413- MISSING="\${SHELL} '$am_aux_dir/missing'"
29414+ case $am_aux_dir in
29415+ *\ * | *\ *)
29416+ MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
29417+ *)
29418+ MISSING="\${SHELL} $am_aux_dir/missing" ;;
29419+ esac
29420 fi
29421 # Use eval to expand $SHELL
29422 if eval "$MISSING --is-lightweight"; then
29423@@ -751,7 +753,7 @@ fi
29424
29425 # Helper functions for option handling. -*- Autoconf -*-
29426
29427-# Copyright (C) 2001-2021 Free Software Foundation, Inc.
29428+# Copyright (C) 2001-2017 Free Software Foundation, Inc.
29429 #
29430 # This file is free software; the Free Software Foundation
29431 # gives unlimited permission to copy and/or distribute it,
29432@@ -780,7 +782,7 @@ AC_DEFUN([_AM_SET_OPTIONS],
29433 AC_DEFUN([_AM_IF_OPTION],
29434 [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
29435
29436-# Copyright (C) 1999-2021 Free Software Foundation, Inc.
29437+# Copyright (C) 1999-2017 Free Software Foundation, Inc.
29438 #
29439 # This file is free software; the Free Software Foundation
29440 # gives unlimited permission to copy and/or distribute it,
29441@@ -827,7 +829,7 @@ AC_LANG_POP([C])])
29442 # For backward compatibility.
29443 AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])
29444
29445-# Copyright (C) 2001-2021 Free Software Foundation, Inc.
29446+# Copyright (C) 2001-2017 Free Software Foundation, Inc.
29447 #
29448 # This file is free software; the Free Software Foundation
29449 # gives unlimited permission to copy and/or distribute it,
29450@@ -846,7 +848,7 @@ AC_DEFUN([AM_RUN_LOG],
29451
29452 # Check to make sure that the build environment is sane. -*- Autoconf -*-
29453
29454-# Copyright (C) 1996-2021 Free Software Foundation, Inc.
29455+# Copyright (C) 1996-2017 Free Software Foundation, Inc.
29456 #
29457 # This file is free software; the Free Software Foundation
29458 # gives unlimited permission to copy and/or distribute it,
29459@@ -927,7 +929,7 @@ AC_CONFIG_COMMANDS_PRE(
29460 rm -f conftest.file
29461 ])
29462
29463-# Copyright (C) 2009-2021 Free Software Foundation, Inc.
29464+# Copyright (C) 2009-2017 Free Software Foundation, Inc.
29465 #
29466 # This file is free software; the Free Software Foundation
29467 # gives unlimited permission to copy and/or distribute it,
29468@@ -987,7 +989,7 @@ AC_SUBST([AM_BACKSLASH])dnl
29469 _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
29470 ])
29471
29472-# Copyright (C) 2001-2021 Free Software Foundation, Inc.
29473+# Copyright (C) 2001-2017 Free Software Foundation, Inc.
29474 #
29475 # This file is free software; the Free Software Foundation
29476 # gives unlimited permission to copy and/or distribute it,
29477@@ -1015,7 +1017,7 @@ fi
29478 INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
29479 AC_SUBST([INSTALL_STRIP_PROGRAM])])
29480
29481-# Copyright (C) 2006-2021 Free Software Foundation, Inc.
29482+# Copyright (C) 2006-2017 Free Software Foundation, Inc.
29483 #
29484 # This file is free software; the Free Software Foundation
29485 # gives unlimited permission to copy and/or distribute it,
29486@@ -1034,7 +1036,7 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
29487
29488 # Check how to create a tarball. -*- Autoconf -*-
29489
29490-# Copyright (C) 2004-2021 Free Software Foundation, Inc.
29491+# Copyright (C) 2004-2017 Free Software Foundation, Inc.
29492 #
29493 # This file is free software; the Free Software Foundation
29494 # gives unlimited permission to copy and/or distribute it,
23386diff --git a/zlib/configure b/zlib/configure 29495diff --git a/zlib/configure b/zlib/configure
23387index db7845c5d42..cd59daa39b5 100755 29496index 0a9ad9e8ccb..35b44e2819c 100755
23388--- a/zlib/configure 29497--- a/zlib/configure
23389+++ b/zlib/configure 29498+++ b/zlib/configure
23390@@ -646,8 +646,11 @@ OTOOL 29499@@ -646,8 +646,11 @@ OTOOL
@@ -23399,7 +29508,35 @@ index db7845c5d42..cd59daa39b5 100755
23399 OBJDUMP 29508 OBJDUMP
23400 LN_S 29509 LN_S
23401 NM 29510 NM
23402@@ -774,6 +777,7 @@ enable_static 29511@@ -666,6 +669,7 @@ am__nodep
29512 AMDEPBACKSLASH
29513 AMDEP_FALSE
29514 AMDEP_TRUE
29515+am__quote
29516 am__include
29517 DEPDIR
29518 OBJEXT
29519@@ -683,9 +687,6 @@ AM_BACKSLASH
29520 AM_DEFAULT_VERBOSITY
29521 AM_DEFAULT_V
29522 AM_V
29523-CSCOPE
29524-ETAGS
29525-CTAGS
29526 am__untar
29527 am__tar
29528 AMTAR
29529@@ -760,8 +761,7 @@ PACKAGE_VERSION
29530 PACKAGE_TARNAME
29531 PACKAGE_NAME
29532 PATH_SEPARATOR
29533-SHELL
29534-am__quote'
29535+SHELL'
29536 ac_subst_files=''
29537 ac_user_opts='
29538 enable_option_checking
29539@@ -777,6 +777,7 @@ enable_static
23403 with_pic 29540 with_pic
23404 enable_fast_install 29541 enable_fast_install
23405 with_gnu_ld 29542 with_gnu_ld
@@ -23407,7 +29544,7 @@ index db7845c5d42..cd59daa39b5 100755
23407 enable_libtool_lock 29544 enable_libtool_lock
23408 enable_host_shared 29545 enable_host_shared
23409 ' 29546 '
23410@@ -1428,6 +1432,8 @@ Optional Packages: 29547@@ -1431,6 +1432,8 @@ Optional Packages:
23411 --with-pic try to use only PIC/non-PIC objects [default=use 29548 --with-pic try to use only PIC/non-PIC objects [default=use
23412 both] 29549 both]
23413 --with-gnu-ld assume the C compiler uses GNU ld [default=no] 29550 --with-gnu-ld assume the C compiler uses GNU ld [default=no]
@@ -23416,7 +29553,150 @@ index db7845c5d42..cd59daa39b5 100755
23416 29553
23417 Some influential environment variables: 29554 Some influential environment variables:
23418 CC C compiler command 29555 CC C compiler command
23419@@ -4186,8 +4192,8 @@ esac 29556@@ -2417,7 +2420,7 @@ test -n "$target_alias" &&
29557 mkinstalldirs="`cd $ac_aux_dir && ${PWDCMD-pwd}`/mkinstalldirs"
29558
29559
29560-am__api_version='1.16'
29561+am__api_version='1.15'
29562
29563 # Find a good install program. We prefer a C program (faster),
29564 # so one script is as good as another. But avoid the broken or
29565@@ -2593,7 +2596,12 @@ program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
29566 am_aux_dir=`cd "$ac_aux_dir" && pwd`
29567
29568 if test x"${MISSING+set}" != xset; then
29569- MISSING="\${SHELL} '$am_aux_dir/missing'"
29570+ case $am_aux_dir in
29571+ *\ * | *\ *)
29572+ MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
29573+ *)
29574+ MISSING="\${SHELL} $am_aux_dir/missing" ;;
29575+ esac
29576 fi
29577 # Use eval to expand $SHELL
29578 if eval "$MISSING --is-lightweight"; then
29579@@ -2928,8 +2936,8 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
29580
29581 # For better backward compatibility. To be removed once Automake 1.9.x
29582 # dies out for good. For more background, see:
29583-# <https://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
29584-# <https://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
29585+# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
29586+# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
29587 mkdir_p='$(MKDIR_P)'
29588
29589 # We need awk for the "check" target (and possibly the TAP driver). The
29590@@ -2948,20 +2956,6 @@ am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'
29591
29592
29593
29594-# Variables for tags utilities; see am/tags.am
29595-if test -z "$CTAGS"; then
29596- CTAGS=ctags
29597-fi
29598-
29599-if test -z "$ETAGS"; then
29600- ETAGS=etags
29601-fi
29602-
29603-if test -z "$CSCOPE"; then
29604- CSCOPE=cscope
29605-fi
29606-
29607-
29608
29609 # POSIX will say in a future version that running "rm -f" with no argument
29610 # is OK; and we want to be able to make that assumption in our Makefile
29611@@ -2994,7 +2988,7 @@ END
29612 Aborting the configuration process, to ensure you take notice of the issue.
29613
29614 You can download and install GNU coreutils to get an 'rm' implementation
29615-that behaves properly: <https://www.gnu.org/software/coreutils/>.
29616+that behaves properly: <http://www.gnu.org/software/coreutils/>.
29617
29618 If you want to complete the configuration process using your problematic
29619 'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
29620@@ -3998,45 +3992,45 @@ DEPDIR="${am__leading_dot}deps"
29621
29622 ac_config_commands="$ac_config_commands depfiles"
29623
29624-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} supports the include directive" >&5
29625-$as_echo_n "checking whether ${MAKE-make} supports the include directive... " >&6; }
29626-cat > confinc.mk << 'END'
29627+
29628+am_make=${MAKE-make}
29629+cat > confinc << 'END'
29630 am__doit:
29631- @echo this is the am__doit target >confinc.out
29632+ @echo this is the am__doit target
29633 .PHONY: am__doit
29634 END
29635+# If we don't find an include directive, just comment out the code.
29636+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5
29637+$as_echo_n "checking for style of include used by $am_make... " >&6; }
29638 am__include="#"
29639 am__quote=
29640-# BSD make does it like this.
29641-echo '.include "confinc.mk" # ignored' > confmf.BSD
29642-# Other make implementations (GNU, Solaris 10, AIX) do it like this.
29643-echo 'include confinc.mk # ignored' > confmf.GNU
29644-_am_result=no
29645-for s in GNU BSD; do
29646- { echo "$as_me:$LINENO: ${MAKE-make} -f confmf.$s && cat confinc.out" >&5
29647- (${MAKE-make} -f confmf.$s && cat confinc.out) >&5 2>&5
29648- ac_status=$?
29649- echo "$as_me:$LINENO: \$? = $ac_status" >&5
29650- (exit $ac_status); }
29651- case $?:`cat confinc.out 2>/dev/null` in #(
29652- '0:this is the am__doit target') :
29653- case $s in #(
29654- BSD) :
29655- am__include='.include' am__quote='"' ;; #(
29656- *) :
29657- am__include='include' am__quote='' ;;
29658-esac ;; #(
29659- *) :
29660- ;;
29661+_am_result=none
29662+# First try GNU make style include.
29663+echo "include confinc" > confmf
29664+# Ignore all kinds of additional output from 'make'.
29665+case `$am_make -s -f confmf 2> /dev/null` in #(
29666+*the\ am__doit\ target*)
29667+ am__include=include
29668+ am__quote=
29669+ _am_result=GNU
29670+ ;;
29671 esac
29672- if test "$am__include" != "#"; then
29673- _am_result="yes ($s style)"
29674- break
29675- fi
29676-done
29677-rm -f confinc.* confmf.*
29678-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${_am_result}" >&5
29679-$as_echo "${_am_result}" >&6; }
29680+# Now try BSD make style include.
29681+if test "$am__include" = "#"; then
29682+ echo '.include "confinc"' > confmf
29683+ case `$am_make -s -f confmf 2> /dev/null` in #(
29684+ *the\ am__doit\ target*)
29685+ am__include=.include
29686+ am__quote="\""
29687+ _am_result=BSD
29688+ ;;
29689+ esac
29690+fi
29691+
29692+
29693+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5
29694+$as_echo "$_am_result" >&6; }
29695+rm -f confinc confmf
29696
29697 # Check whether --enable-dependency-tracking was given.
29698 if test "${enable_dependency_tracking+set}" = set; then :
29699@@ -4198,8 +4192,8 @@ esac
23420 29700
23421 29701
23422 29702
@@ -23427,7 +29707,7 @@ index db7845c5d42..cd59daa39b5 100755
23427 29707
23428 29708
23429 29709
23430@@ -4227,7 +4233,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO 29710@@ -4239,7 +4233,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
23431 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 29711 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
23432 $as_echo_n "checking how to print strings... " >&6; } 29712 $as_echo_n "checking how to print strings... " >&6; }
23433 # Test print first, because it will be a builtin if present. 29713 # Test print first, because it will be a builtin if present.
@@ -23436,7 +29716,7 @@ index db7845c5d42..cd59daa39b5 100755
23436 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then 29716 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
23437 ECHO='print -r --' 29717 ECHO='print -r --'
23438 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then 29718 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
23439@@ -5044,8 +5050,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; 29719@@ -5062,8 +5056,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6;
23440 # Try some XSI features 29720 # Try some XSI features
23441 xsi_shell=no 29721 xsi_shell=no
23442 ( _lt_dummy="a/b/c" 29722 ( _lt_dummy="a/b/c"
@@ -23447,7 +29727,7 @@ index db7845c5d42..cd59daa39b5 100755
23447 && eval 'test $(( 1 + 1 )) -eq 2 \ 29727 && eval 'test $(( 1 + 1 )) -eq 2 \
23448 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ 29728 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
23449 && xsi_shell=yes 29729 && xsi_shell=yes
23450@@ -5094,6 +5100,80 @@ esac 29730@@ -5112,6 +5106,80 @@ esac
23451 29731
23452 29732
23453 29733
@@ -23528,7 +29808,7 @@ index db7845c5d42..cd59daa39b5 100755
23528 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 29808 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
23529 $as_echo_n "checking for $LD option to reload object files... " >&6; } 29809 $as_echo_n "checking for $LD option to reload object files... " >&6; }
23530 if ${lt_cv_ld_reload_flag+:} false; then : 29810 if ${lt_cv_ld_reload_flag+:} false; then :
23531@@ -5110,6 +5190,11 @@ case $reload_flag in 29811@@ -5128,6 +5196,11 @@ case $reload_flag in
23532 esac 29812 esac
23533 reload_cmds='$LD$reload_flag -o $output$reload_objs' 29813 reload_cmds='$LD$reload_flag -o $output$reload_objs'
23534 case $host_os in 29814 case $host_os in
@@ -23540,7 +29820,7 @@ index db7845c5d42..cd59daa39b5 100755
23540 darwin*) 29820 darwin*)
23541 if test "$GCC" = yes; then 29821 if test "$GCC" = yes; then
23542 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' 29822 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
23543@@ -5278,7 +5363,8 @@ mingw* | pw32*) 29823@@ -5296,7 +5369,8 @@ mingw* | pw32*)
23544 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' 29824 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
23545 lt_cv_file_magic_cmd='func_win32_libid' 29825 lt_cv_file_magic_cmd='func_win32_libid'
23546 else 29826 else
@@ -23550,7 +29830,7 @@ index db7845c5d42..cd59daa39b5 100755
23550 lt_cv_file_magic_cmd='$OBJDUMP -f' 29830 lt_cv_file_magic_cmd='$OBJDUMP -f'
23551 fi 29831 fi
23552 ;; 29832 ;;
23553@@ -5432,6 +5518,21 @@ esac 29833@@ -5450,6 +5524,21 @@ esac
23554 fi 29834 fi
23555 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 29835 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
23556 $as_echo "$lt_cv_deplibs_check_method" >&6; } 29836 $as_echo "$lt_cv_deplibs_check_method" >&6; }
@@ -23572,7 +29852,7 @@ index db7845c5d42..cd59daa39b5 100755
23572 file_magic_cmd=$lt_cv_file_magic_cmd 29852 file_magic_cmd=$lt_cv_file_magic_cmd
23573 deplibs_check_method=$lt_cv_deplibs_check_method 29853 deplibs_check_method=$lt_cv_deplibs_check_method
23574 test -z "$deplibs_check_method" && deplibs_check_method=unknown 29854 test -z "$deplibs_check_method" && deplibs_check_method=unknown
23575@@ -5447,6 +5548,158 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown 29855@@ -5465,6 +5554,158 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
23576 29856
23577 29857
23578 29858
@@ -23731,7 +30011,7 @@ index db7845c5d42..cd59daa39b5 100755
23731 plugin_option= 30011 plugin_option=
23732 plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll" 30012 plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll"
23733 for plugin in $plugin_names; do 30013 for plugin in $plugin_names; do
23734@@ -5461,8 +5714,10 @@ for plugin in $plugin_names; do 30014@@ -5479,8 +5720,10 @@ for plugin in $plugin_names; do
23735 done 30015 done
23736 30016
23737 if test -n "$ac_tool_prefix"; then 30017 if test -n "$ac_tool_prefix"; then
@@ -23744,7 +30024,7 @@ index db7845c5d42..cd59daa39b5 100755
23744 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 30024 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
23745 $as_echo_n "checking for $ac_word... " >&6; } 30025 $as_echo_n "checking for $ac_word... " >&6; }
23746 if ${ac_cv_prog_AR+:} false; then : 30026 if ${ac_cv_prog_AR+:} false; then :
23747@@ -5478,7 +5733,7 @@ do 30027@@ -5496,7 +5739,7 @@ do
23748 test -z "$as_dir" && as_dir=. 30028 test -z "$as_dir" && as_dir=.
23749 for ac_exec_ext in '' $ac_executable_extensions; do 30029 for ac_exec_ext in '' $ac_executable_extensions; do
23750 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 30030 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
@@ -23753,7 +30033,7 @@ index db7845c5d42..cd59daa39b5 100755
23753 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 30033 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
23754 break 2 30034 break 2
23755 fi 30035 fi
23756@@ -5498,11 +5753,15 @@ $as_echo "no" >&6; } 30036@@ -5516,11 +5759,15 @@ $as_echo "no" >&6; }
23757 fi 30037 fi
23758 30038
23759 30039
@@ -23772,7 +30052,7 @@ index db7845c5d42..cd59daa39b5 100755
23772 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 30052 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
23773 $as_echo_n "checking for $ac_word... " >&6; } 30053 $as_echo_n "checking for $ac_word... " >&6; }
23774 if ${ac_cv_prog_ac_ct_AR+:} false; then : 30054 if ${ac_cv_prog_ac_ct_AR+:} false; then :
23775@@ -5518,7 +5777,7 @@ do 30055@@ -5536,7 +5783,7 @@ do
23776 test -z "$as_dir" && as_dir=. 30056 test -z "$as_dir" && as_dir=.
23777 for ac_exec_ext in '' $ac_executable_extensions; do 30057 for ac_exec_ext in '' $ac_executable_extensions; do
23778 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 30058 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
@@ -23781,7 +30061,7 @@ index db7845c5d42..cd59daa39b5 100755
23781 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 30061 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
23782 break 2 30062 break 2
23783 fi 30063 fi
23784@@ -5537,6 +5796,10 @@ else 30064@@ -5555,6 +5802,10 @@ else
23785 $as_echo "no" >&6; } 30065 $as_echo "no" >&6; }
23786 fi 30066 fi
23787 30067
@@ -23792,7 +30072,7 @@ index db7845c5d42..cd59daa39b5 100755
23792 if test "x$ac_ct_AR" = x; then 30072 if test "x$ac_ct_AR" = x; then
23793 AR="false" 30073 AR="false"
23794 else 30074 else
23795@@ -5548,25 +5811,19 @@ ac_tool_warned=yes ;; 30075@@ -5566,25 +5817,22 @@ ac_tool_warned=yes ;;
23796 esac 30076 esac
23797 AR=$ac_ct_AR 30077 AR=$ac_ct_AR
23798 fi 30078 fi
@@ -23824,10 +30104,13 @@ index db7845c5d42..cd59daa39b5 100755
23824+ rm -f conftest.* 30104+ rm -f conftest.*
23825+: ${AR=ar} 30105+: ${AR=ar}
23826+: ${AR_FLAGS=cru} 30106+: ${AR_FLAGS=cru}
30107+
30108+
30109+
23827 30110
23828 30111
23829 30112
23830@@ -5578,6 +5835,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru 30113@@ -5593,6 +5841,61 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru
23831 30114
23832 30115
23833 30116
@@ -23886,13 +30169,10 @@ index db7845c5d42..cd59daa39b5 100755
23886+ 30169+
23887+ 30170+
23888+ 30171+
23889+ 30172
23890+ 30173
23891+ 30174
23892 if test -n "$ac_tool_prefix"; then 30175@@ -5935,8 +6238,8 @@ esac
23893 # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
23894 set dummy ${ac_tool_prefix}strip; ac_word=$2
23895@@ -5917,8 +6232,8 @@ esac
23896 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" 30176 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
23897 30177
23898 # Transform an extracted symbol line into symbol name and symbol address 30178 # Transform an extracted symbol line into symbol name and symbol address
@@ -23903,7 +30183,7 @@ index db7845c5d42..cd59daa39b5 100755
23903 30183
23904 # Handle CRLF in mingw tool chain 30184 # Handle CRLF in mingw tool chain
23905 opt_cr= 30185 opt_cr=
23906@@ -5954,6 +6269,7 @@ for ac_symprfx in "" "_"; do 30186@@ -5972,6 +6275,7 @@ for ac_symprfx in "" "_"; do
23907 else 30187 else
23908 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" 30188 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
23909 fi 30189 fi
@@ -23911,7 +30191,7 @@ index db7845c5d42..cd59daa39b5 100755
23911 30191
23912 # Check to see that the pipe works correctly. 30192 # Check to see that the pipe works correctly.
23913 pipe_works=no 30193 pipe_works=no
23914@@ -5995,6 +6311,18 @@ _LT_EOF 30194@@ -6013,6 +6317,18 @@ _LT_EOF
23915 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then 30195 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
23916 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then 30196 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
23917 cat <<_LT_EOF > conftest.$ac_ext 30197 cat <<_LT_EOF > conftest.$ac_ext
@@ -23930,7 +30210,7 @@ index db7845c5d42..cd59daa39b5 100755
23930 #ifdef __cplusplus 30210 #ifdef __cplusplus
23931 extern "C" { 30211 extern "C" {
23932 #endif 30212 #endif
23933@@ -6006,7 +6334,7 @@ _LT_EOF 30213@@ -6024,7 +6340,7 @@ _LT_EOF
23934 cat <<_LT_EOF >> conftest.$ac_ext 30214 cat <<_LT_EOF >> conftest.$ac_ext
23935 30215
23936 /* The mapping between symbol names and symbols. */ 30216 /* The mapping between symbol names and symbols. */
@@ -23939,7 +30219,7 @@ index db7845c5d42..cd59daa39b5 100755
23939 const char *name; 30219 const char *name;
23940 void *address; 30220 void *address;
23941 } 30221 }
23942@@ -6032,8 +6360,8 @@ static const void *lt_preloaded_setup() { 30222@@ -6050,8 +6366,8 @@ static const void *lt_preloaded_setup() {
23943 _LT_EOF 30223 _LT_EOF
23944 # Now try linking the two files. 30224 # Now try linking the two files.
23945 mv conftest.$ac_objext conftstm.$ac_objext 30225 mv conftest.$ac_objext conftstm.$ac_objext
@@ -23950,7 +30230,7 @@ index db7845c5d42..cd59daa39b5 100755
23950 LIBS="conftstm.$ac_objext" 30230 LIBS="conftstm.$ac_objext"
23951 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" 30231 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
23952 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 30232 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
23953@@ -6043,8 +6371,8 @@ _LT_EOF 30233@@ -6061,8 +6377,8 @@ _LT_EOF
23954 test $ac_status = 0; } && test -s conftest${ac_exeext}; then 30234 test $ac_status = 0; } && test -s conftest${ac_exeext}; then
23955 pipe_works=yes 30235 pipe_works=yes
23956 fi 30236 fi
@@ -23961,7 +30241,7 @@ index db7845c5d42..cd59daa39b5 100755
23961 else 30241 else
23962 echo "cannot find nm_test_func in $nlist" >&5 30242 echo "cannot find nm_test_func in $nlist" >&5
23963 fi 30243 fi
23964@@ -6081,6 +6409,17 @@ else 30244@@ -6099,6 +6415,16 @@ else
23965 $as_echo "ok" >&6; } 30245 $as_echo "ok" >&6; }
23966 fi 30246 fi
23967 30247
@@ -23975,11 +30255,10 @@ index db7845c5d42..cd59daa39b5 100755
23975+ 30255+
23976+ 30256+
23977+ 30257+
23978+
23979 30258
23980 30259
23981 30260
23982@@ -6098,6 +6437,43 @@ fi 30261@@ -6116,6 +6442,44 @@ fi
23983 30262
23984 30263
23985 30264
@@ -23988,6 +30267,7 @@ index db7845c5d42..cd59daa39b5 100755
23988+ 30267+
23989+ 30268+
23990+ 30269+
30270+
23991+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 30271+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
23992+$as_echo_n "checking for sysroot... " >&6; } 30272+$as_echo_n "checking for sysroot... " >&6; }
23993+ 30273+
@@ -24023,10 +30303,18 @@ index db7845c5d42..cd59daa39b5 100755
24023 30303
24024 30304
24025 30305
24026@@ -6312,6 +6688,123 @@ esac 30306@@ -6324,11 +6688,128 @@ sparc*-*solaris*)
24027 30307 ;;
24028 need_locks="$enable_libtool_lock" 30308 esac
24029 30309 fi
30310- rm -rf conftest*
30311- ;;
30312+ rm -rf conftest*
30313+ ;;
30314+esac
30315+
30316+need_locks="$enable_libtool_lock"
30317+
24030+if test -n "$ac_tool_prefix"; then 30318+if test -n "$ac_tool_prefix"; then
24031+ # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args. 30319+ # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args.
24032+set dummy ${ac_tool_prefix}mt; ac_word=$2 30320+set dummy ${ac_tool_prefix}mt; ac_word=$2
@@ -24112,7 +30400,7 @@ index db7845c5d42..cd59daa39b5 100755
24112+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 30400+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
24113+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} 30401+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
24114+ac_tool_warned=yes ;; 30402+ac_tool_warned=yes ;;
24115+esac 30403 esac
24116+ MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL 30404+ MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL
24117+ fi 30405+ fi
24118+else 30406+else
@@ -24142,12 +30430,12 @@ index db7845c5d42..cd59daa39b5 100755
24142+ 30430+
24143+ 30431+
24144+ 30432+
24145+ 30433
24146+ 30434-need_locks="$enable_libtool_lock"
30435
24147 30436
24148 case $host_os in 30437 case $host_os in
24149 rhapsody* | darwin*) 30438@@ -6896,6 +7377,8 @@ _LT_EOF
24150@@ -6878,6 +7371,8 @@ _LT_EOF
24151 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 30439 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
24152 echo "$AR cru libconftest.a conftest.o" >&5 30440 echo "$AR cru libconftest.a conftest.o" >&5
24153 $AR cru libconftest.a conftest.o 2>&5 30441 $AR cru libconftest.a conftest.o 2>&5
@@ -24156,7 +30444,7 @@ index db7845c5d42..cd59daa39b5 100755
24156 cat > conftest.c << _LT_EOF 30444 cat > conftest.c << _LT_EOF
24157 int main() { return 0;} 30445 int main() { return 0;}
24158 _LT_EOF 30446 _LT_EOF
24159@@ -7727,8 +8222,6 @@ fi 30447@@ -7745,8 +8228,6 @@ fi
24160 lt_prog_compiler_pic= 30448 lt_prog_compiler_pic=
24161 lt_prog_compiler_static= 30449 lt_prog_compiler_static=
24162 30450
@@ -24165,7 +30453,7 @@ index db7845c5d42..cd59daa39b5 100755
24165 30453
24166 if test "$GCC" = yes; then 30454 if test "$GCC" = yes; then
24167 lt_prog_compiler_wl='-Wl,' 30455 lt_prog_compiler_wl='-Wl,'
24168@@ -7894,6 +8387,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 30456@@ -7912,6 +8393,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
24169 lt_prog_compiler_pic='--shared' 30457 lt_prog_compiler_pic='--shared'
24170 lt_prog_compiler_static='--static' 30458 lt_prog_compiler_static='--static'
24171 ;; 30459 ;;
@@ -24178,7 +30466,7 @@ index db7845c5d42..cd59daa39b5 100755
24178 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) 30466 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
24179 # Portland Group compilers (*not* the Pentium gcc compiler, 30467 # Portland Group compilers (*not* the Pentium gcc compiler,
24180 # which looks to be a dead project) 30468 # which looks to be a dead project)
24181@@ -7956,7 +8455,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 30469@@ -7974,7 +8461,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
24182 lt_prog_compiler_pic='-KPIC' 30470 lt_prog_compiler_pic='-KPIC'
24183 lt_prog_compiler_static='-Bstatic' 30471 lt_prog_compiler_static='-Bstatic'
24184 case $cc_basename in 30472 case $cc_basename in
@@ -24187,7 +30475,7 @@ index db7845c5d42..cd59daa39b5 100755
24187 lt_prog_compiler_wl='-Qoption ld ';; 30475 lt_prog_compiler_wl='-Qoption ld ';;
24188 *) 30476 *)
24189 lt_prog_compiler_wl='-Wl,';; 30477 lt_prog_compiler_wl='-Wl,';;
24190@@ -8013,13 +8512,17 @@ case $host_os in 30478@@ -8031,13 +8518,17 @@ case $host_os in
24191 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" 30479 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
24192 ;; 30480 ;;
24193 esac 30481 esac
@@ -24211,7 +30499,7 @@ index db7845c5d42..cd59daa39b5 100755
24211 30499
24212 # 30500 #
24213 # Check to make sure the PIC flag actually works. 30501 # Check to make sure the PIC flag actually works.
24214@@ -8080,6 +8583,11 @@ fi 30502@@ -8098,6 +8589,11 @@ fi
24215 30503
24216 30504
24217 30505
@@ -24223,7 +30511,7 @@ index db7845c5d42..cd59daa39b5 100755
24223 # 30511 #
24224 # Check to make sure the static flag actually works. 30512 # Check to make sure the static flag actually works.
24225 # 30513 #
24226@@ -8430,7 +8938,8 @@ _LT_EOF 30514@@ -8448,7 +8944,8 @@ _LT_EOF
24227 allow_undefined_flag=unsupported 30515 allow_undefined_flag=unsupported
24228 always_export_symbols=no 30516 always_export_symbols=no
24229 enable_shared_with_static_runtimes=yes 30517 enable_shared_with_static_runtimes=yes
@@ -24233,7 +30521,7 @@ index db7845c5d42..cd59daa39b5 100755
24233 30521
24234 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then 30522 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
24235 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' 30523 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
24236@@ -8529,12 +9038,12 @@ _LT_EOF 30524@@ -8547,12 +9044,12 @@ _LT_EOF
24237 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' 30525 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
24238 hardcode_libdir_flag_spec= 30526 hardcode_libdir_flag_spec=
24239 hardcode_libdir_flag_spec_ld='-rpath $libdir' 30527 hardcode_libdir_flag_spec_ld='-rpath $libdir'
@@ -24248,7 +30536,7 @@ index db7845c5d42..cd59daa39b5 100755
24248 fi 30536 fi
24249 ;; 30537 ;;
24250 esac 30538 esac
24251@@ -8548,8 +9057,8 @@ _LT_EOF 30539@@ -8566,8 +9063,8 @@ _LT_EOF
24252 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' 30540 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
24253 wlarc= 30541 wlarc=
24254 else 30542 else
@@ -24259,7 +30547,7 @@ index db7845c5d42..cd59daa39b5 100755
24259 fi 30547 fi
24260 ;; 30548 ;;
24261 30549
24262@@ -8567,8 +9076,8 @@ _LT_EOF 30550@@ -8585,8 +9082,8 @@ _LT_EOF
24263 30551
24264 _LT_EOF 30552 _LT_EOF
24265 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 30553 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -24270,7 +30558,7 @@ index db7845c5d42..cd59daa39b5 100755
24270 else 30558 else
24271 ld_shlibs=no 30559 ld_shlibs=no
24272 fi 30560 fi
24273@@ -8614,8 +9123,8 @@ _LT_EOF 30561@@ -8632,8 +9129,8 @@ _LT_EOF
24274 30562
24275 *) 30563 *)
24276 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 30564 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -24281,7 +30569,7 @@ index db7845c5d42..cd59daa39b5 100755
24281 else 30569 else
24282 ld_shlibs=no 30570 ld_shlibs=no
24283 fi 30571 fi
24284@@ -8745,7 +9254,13 @@ _LT_EOF 30572@@ -8763,7 +9260,13 @@ _LT_EOF
24285 allow_undefined_flag='-berok' 30573 allow_undefined_flag='-berok'
24286 # Determine the default libpath from the value encoded in an 30574 # Determine the default libpath from the value encoded in an
24287 # empty executable. 30575 # empty executable.
@@ -24296,7 +30584,7 @@ index db7845c5d42..cd59daa39b5 100755
24296 as_fn_error $? "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5 30584 as_fn_error $? "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5
24297 fi 30585 fi
24298 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 30586 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
24299@@ -8761,22 +9276,29 @@ main () 30587@@ -8779,22 +9282,29 @@ main ()
24300 _ACEOF 30588 _ACEOF
24301 if ac_fn_c_try_link "$LINENO"; then : 30589 if ac_fn_c_try_link "$LINENO"; then :
24302 30590
@@ -24339,7 +30627,7 @@ index db7845c5d42..cd59daa39b5 100755
24339 30627
24340 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 30628 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
24341 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" 30629 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"
24342@@ -8788,7 +9310,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 30630@@ -8806,7 +9316,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
24343 else 30631 else
24344 # Determine the default libpath from the value encoded in an 30632 # Determine the default libpath from the value encoded in an
24345 # empty executable. 30633 # empty executable.
@@ -24354,7 +30642,7 @@ index db7845c5d42..cd59daa39b5 100755
24354 as_fn_error $? "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5 30642 as_fn_error $? "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5
24355 fi 30643 fi
24356 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 30644 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
24357@@ -8804,22 +9332,29 @@ main () 30645@@ -8822,22 +9338,29 @@ main ()
24358 _ACEOF 30646 _ACEOF
24359 if ac_fn_c_try_link "$LINENO"; then : 30647 if ac_fn_c_try_link "$LINENO"; then :
24360 30648
@@ -24397,7 +30685,7 @@ index db7845c5d42..cd59daa39b5 100755
24397 30685
24398 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 30686 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
24399 # Warning - without using the other run time loading flags, 30687 # Warning - without using the other run time loading flags,
24400@@ -8864,20 +9399,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 30688@@ -8882,20 +9405,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
24401 # Microsoft Visual C++. 30689 # Microsoft Visual C++.
24402 # hardcode_libdir_flag_spec is actually meaningless, as there is 30690 # hardcode_libdir_flag_spec is actually meaningless, as there is
24403 # no search path for DLLs. 30691 # no search path for DLLs.
@@ -24475,7 +30763,7 @@ index db7845c5d42..cd59daa39b5 100755
24475 ;; 30763 ;;
24476 30764
24477 darwin* | rhapsody*) 30765 darwin* | rhapsody*)
24478@@ -8938,7 +9516,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 30766@@ -8956,7 +9522,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
24479 30767
24480 # FreeBSD 3 and greater uses gcc -shared to do shared libraries. 30768 # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
24481 freebsd* | dragonfly*) 30769 freebsd* | dragonfly*)
@@ -24484,7 +30772,7 @@ index db7845c5d42..cd59daa39b5 100755
24484 hardcode_libdir_flag_spec='-R$libdir' 30772 hardcode_libdir_flag_spec='-R$libdir'
24485 hardcode_direct=yes 30773 hardcode_direct=yes
24486 hardcode_shlibpath_var=no 30774 hardcode_shlibpath_var=no
24487@@ -8946,7 +9524,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 30775@@ -8964,7 +9530,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
24488 30776
24489 hpux9*) 30777 hpux9*)
24490 if test "$GCC" = yes; then 30778 if test "$GCC" = yes; then
@@ -24493,7 +30781,7 @@ index db7845c5d42..cd59daa39b5 100755
24493 else 30781 else
24494 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' 30782 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'
24495 fi 30783 fi
24496@@ -8962,7 +9540,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 30784@@ -8980,7 +9546,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
24497 30785
24498 hpux10*) 30786 hpux10*)
24499 if test "$GCC" = yes && test "$with_gnu_ld" = no; then 30787 if test "$GCC" = yes && test "$with_gnu_ld" = no; then
@@ -24502,7 +30790,7 @@ index db7845c5d42..cd59daa39b5 100755
24502 else 30790 else
24503 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' 30791 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
24504 fi 30792 fi
24505@@ -8986,10 +9564,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 30793@@ -9004,10 +9570,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
24506 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' 30794 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
24507 ;; 30795 ;;
24508 ia64*) 30796 ia64*)
@@ -24515,7 +30803,7 @@ index db7845c5d42..cd59daa39b5 100755
24515 ;; 30803 ;;
24516 esac 30804 esac
24517 else 30805 else
24518@@ -9068,26 +9646,39 @@ fi 30806@@ -9086,26 +9652,39 @@ fi
24519 30807
24520 irix5* | irix6* | nonstopux*) 30808 irix5* | irix6* | nonstopux*)
24521 if test "$GCC" = yes; then 30809 if test "$GCC" = yes; then
@@ -24563,7 +30851,7 @@ index db7845c5d42..cd59daa39b5 100755
24563 else 30851 else
24564 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' 30852 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'
24565 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' 30853 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'
24566@@ -9172,7 +9763,7 @@ rm -f core conftest.err conftest.$ac_objext \ 30854@@ -9190,7 +9769,7 @@ rm -f core conftest.err conftest.$ac_objext \
24567 osf4* | osf5*) # as osf3* with the addition of -msym flag 30855 osf4* | osf5*) # as osf3* with the addition of -msym flag
24568 if test "$GCC" = yes; then 30856 if test "$GCC" = yes; then
24569 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' 30857 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
@@ -24572,7 +30860,7 @@ index db7845c5d42..cd59daa39b5 100755
24572 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' 30860 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
24573 else 30861 else
24574 allow_undefined_flag=' -expect_unresolved \*' 30862 allow_undefined_flag=' -expect_unresolved \*'
24575@@ -9191,9 +9782,9 @@ rm -f core conftest.err conftest.$ac_objext \ 30863@@ -9209,9 +9788,9 @@ rm -f core conftest.err conftest.$ac_objext \
24576 no_undefined_flag=' -z defs' 30864 no_undefined_flag=' -z defs'
24577 if test "$GCC" = yes; then 30865 if test "$GCC" = yes; then
24578 wlarc='${wl}' 30866 wlarc='${wl}'
@@ -24584,7 +30872,7 @@ index db7845c5d42..cd59daa39b5 100755
24584 else 30872 else
24585 case `$CC -V 2>&1` in 30873 case `$CC -V 2>&1` in
24586 *"Compilers 5.0"*) 30874 *"Compilers 5.0"*)
24587@@ -9769,8 +10360,9 @@ cygwin* | mingw* | pw32* | cegcc*) 30875@@ -9787,8 +10366,9 @@ cygwin* | mingw* | pw32* | cegcc*)
24588 need_version=no 30876 need_version=no
24589 need_lib_prefix=no 30877 need_lib_prefix=no
24590 30878
@@ -24596,7 +30884,7 @@ index db7845c5d42..cd59daa39b5 100755
24596 library_names_spec='$libname.dll.a' 30884 library_names_spec='$libname.dll.a'
24597 # DLL is installed to $(libdir)/../bin by postinstall_cmds 30885 # DLL is installed to $(libdir)/../bin by postinstall_cmds
24598 postinstall_cmds='base_file=`basename \${file}`~ 30886 postinstall_cmds='base_file=`basename \${file}`~
24599@@ -9803,13 +10395,71 @@ cygwin* | mingw* | pw32* | cegcc*) 30887@@ -9821,13 +10401,71 @@ cygwin* | mingw* | pw32* | cegcc*)
24600 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' 30888 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
24601 ;; 30889 ;;
24602 esac 30890 esac
@@ -24669,16 +30957,16 @@ index db7845c5d42..cd59daa39b5 100755
24669 # FIXME: first we should search . and the directory the executable is in 30957 # FIXME: first we should search . and the directory the executable is in
24670 shlibpath_var=PATH 30958 shlibpath_var=PATH
24671 ;; 30959 ;;
24672@@ -10705,7 +11355,7 @@ else 30960@@ -10723,7 +11361,7 @@ else
24673 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 30961 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
24674 lt_status=$lt_dlunknown 30962 lt_status=$lt_dlunknown
24675 cat > conftest.$ac_ext <<_LT_EOF 30963 cat > conftest.$ac_ext <<_LT_EOF
24676-#line 10708 "configure" 30964-#line 10726 "configure"
24677+#line $LINENO "configure" 30965+#line $LINENO "configure"
24678 #include "confdefs.h" 30966 #include "confdefs.h"
24679 30967
24680 #if HAVE_DLFCN_H 30968 #if HAVE_DLFCN_H
24681@@ -10749,10 +11399,10 @@ else 30969@@ -10767,10 +11405,10 @@ else
24682 /* When -fvisbility=hidden is used, assume the code has been annotated 30970 /* When -fvisbility=hidden is used, assume the code has been annotated
24683 correspondingly for the symbols needed. */ 30971 correspondingly for the symbols needed. */
24684 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 30972 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
@@ -24691,16 +30979,16 @@ index db7845c5d42..cd59daa39b5 100755
24691 int main () 30979 int main ()
24692 { 30980 {
24693 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 30981 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
24694@@ -10811,7 +11461,7 @@ else 30982@@ -10829,7 +11467,7 @@ else
24695 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 30983 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
24696 lt_status=$lt_dlunknown 30984 lt_status=$lt_dlunknown
24697 cat > conftest.$ac_ext <<_LT_EOF 30985 cat > conftest.$ac_ext <<_LT_EOF
24698-#line 10814 "configure" 30986-#line 10832 "configure"
24699+#line $LINENO "configure" 30987+#line $LINENO "configure"
24700 #include "confdefs.h" 30988 #include "confdefs.h"
24701 30989
24702 #if HAVE_DLFCN_H 30990 #if HAVE_DLFCN_H
24703@@ -10855,10 +11505,10 @@ else 30991@@ -10873,10 +11511,10 @@ else
24704 /* When -fvisbility=hidden is used, assume the code has been annotated 30992 /* When -fvisbility=hidden is used, assume the code has been annotated
24705 correspondingly for the symbols needed. */ 30993 correspondingly for the symbols needed. */
24706 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 30994 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
@@ -24713,7 +31001,16 @@ index db7845c5d42..cd59daa39b5 100755
24713 int main () 31001 int main ()
24714 { 31002 {
24715 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 31003 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
24716@@ -12328,13 +12978,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' 31004@@ -12308,7 +12946,7 @@ CC="$CC"
31005 CXX="$CXX"
31006 GFORTRAN="$GFORTRAN"
31007 GDC="$GDC"
31008-AMDEP_TRUE="$AMDEP_TRUE" MAKE="${MAKE-make}"
31009+AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
31010
31011
31012 # The HP-UX ksh and POSIX shell print the target directory to stdout
31013@@ -12346,13 +12984,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
24717 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' 31014 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
24718 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' 31015 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
24719 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' 31016 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
@@ -24734,7 +31031,7 @@ index db7845c5d42..cd59daa39b5 100755
24734 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' 31031 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
24735 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' 31032 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
24736 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' 31033 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
24737@@ -12349,14 +13006,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de 31034@@ -12367,14 +13012,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de
24738 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' 31035 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
24739 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' 31036 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
24740 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"`' 31037 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"`'
@@ -24753,7 +31050,7 @@ index db7845c5d42..cd59daa39b5 100755
24753 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' 31050 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
24754 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' 31051 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
24755 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' 31052 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
24756@@ -12389,12 +13049,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q 31053@@ -12407,12 +13055,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q
24757 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' 31054 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
24758 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' 31055 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
24759 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' 31056 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
@@ -24767,7 +31064,7 @@ index db7845c5d42..cd59daa39b5 100755
24767 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' 31064 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
24768 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' 31065 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
24769 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' 31066 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
24770@@ -12449,8 +13109,13 @@ reload_flag \ 31067@@ -12467,8 +13115,13 @@ reload_flag \
24771 OBJDUMP \ 31068 OBJDUMP \
24772 deplibs_check_method \ 31069 deplibs_check_method \
24773 file_magic_cmd \ 31070 file_magic_cmd \
@@ -24781,7 +31078,7 @@ index db7845c5d42..cd59daa39b5 100755
24781 STRIP \ 31078 STRIP \
24782 RANLIB \ 31079 RANLIB \
24783 CC \ 31080 CC \
24784@@ -12460,12 +13125,14 @@ lt_cv_sys_global_symbol_pipe \ 31081@@ -12478,12 +13131,14 @@ lt_cv_sys_global_symbol_pipe \
24785 lt_cv_sys_global_symbol_to_cdecl \ 31082 lt_cv_sys_global_symbol_to_cdecl \
24786 lt_cv_sys_global_symbol_to_c_name_address \ 31083 lt_cv_sys_global_symbol_to_c_name_address \
24787 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ 31084 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
@@ -24797,7 +31094,7 @@ index db7845c5d42..cd59daa39b5 100755
24797 DSYMUTIL \ 31094 DSYMUTIL \
24798 NMEDIT \ 31095 NMEDIT \
24799 LIPO \ 31096 LIPO \
24800@@ -12481,7 +13148,6 @@ no_undefined_flag \ 31097@@ -12499,7 +13154,6 @@ no_undefined_flag \
24801 hardcode_libdir_flag_spec \ 31098 hardcode_libdir_flag_spec \
24802 hardcode_libdir_flag_spec_ld \ 31099 hardcode_libdir_flag_spec_ld \
24803 hardcode_libdir_separator \ 31100 hardcode_libdir_separator \
@@ -24805,7 +31102,7 @@ index db7845c5d42..cd59daa39b5 100755
24805 exclude_expsyms \ 31102 exclude_expsyms \
24806 include_expsyms \ 31103 include_expsyms \
24807 file_list_spec \ 31104 file_list_spec \
24808@@ -12517,6 +13183,7 @@ module_cmds \ 31105@@ -12535,6 +13189,7 @@ module_cmds \
24809 module_expsym_cmds \ 31106 module_expsym_cmds \
24810 export_symbols_cmds \ 31107 export_symbols_cmds \
24811 prelink_cmds \ 31108 prelink_cmds \
@@ -24813,7 +31110,149 @@ index db7845c5d42..cd59daa39b5 100755
24813 postinstall_cmds \ 31110 postinstall_cmds \
24814 postuninstall_cmds \ 31111 postuninstall_cmds \
24815 finish_cmds \ 31112 finish_cmds \
24816@@ -13115,7 +13782,8 @@ $as_echo X"$file" | 31113@@ -13023,35 +13678,29 @@ esac ;;
31114 # Older Autoconf quotes --file arguments for eval, but not when files
31115 # are listed without --file. Let's play safe and only enable the eval
31116 # if we detect the quoting.
31117- # TODO: see whether this extra hack can be removed once we start
31118- # requiring Autoconf 2.70 or later.
31119- case $CONFIG_FILES in #(
31120- *\'*) :
31121- eval set x "$CONFIG_FILES" ;; #(
31122- *) :
31123- set x $CONFIG_FILES ;; #(
31124- *) :
31125- ;;
31126-esac
31127+ case $CONFIG_FILES in
31128+ *\'*) eval set x "$CONFIG_FILES" ;;
31129+ *) set x $CONFIG_FILES ;;
31130+ esac
31131 shift
31132- # Used to flag and report bootstrapping failures.
31133- am_rc=0
31134- for am_mf
31135+ for mf
31136 do
31137 # Strip MF so we end up with the name of the file.
31138- am_mf=`$as_echo "$am_mf" | sed -e 's/:.*$//'`
31139- # Check whether this is an Automake generated Makefile which includes
31140- # dependency-tracking related rules and includes.
31141- # Grep'ing the whole file directly is not great: AIX grep has a line
31142+ mf=`echo "$mf" | sed -e 's/:.*$//'`
31143+ # Check whether this is an Automake generated Makefile or not.
31144+ # We used to match only the files named 'Makefile.in', but
31145+ # some people rename them; so instead we look at the file content.
31146+ # Grep'ing the first line is not enough: some people post-process
31147+ # each Makefile.in and add a new line on top of each file to say so.
31148+ # Grep'ing the whole file is not good either: AIX grep has a line
31149 # limit of 2048, but all sed's we know have understand at least 4000.
31150- sed -n 's,^am--depfiles:.*,X,p' "$am_mf" | grep X >/dev/null 2>&1 \
31151- || continue
31152- am_dirpart=`$as_dirname -- "$am_mf" ||
31153-$as_expr X"$am_mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
31154- X"$am_mf" : 'X\(//\)[^/]' \| \
31155- X"$am_mf" : 'X\(//\)$' \| \
31156- X"$am_mf" : 'X\(/\)' \| . 2>/dev/null ||
31157-$as_echo X"$am_mf" |
31158+ if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
31159+ dirpart=`$as_dirname -- "$mf" ||
31160+$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
31161+ X"$mf" : 'X\(//\)[^/]' \| \
31162+ X"$mf" : 'X\(//\)$' \| \
31163+ X"$mf" : 'X\(/\)' \| . 2>/dev/null ||
31164+$as_echo X"$mf" |
31165 sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
31166 s//\1/
31167 q
31168@@ -13069,50 +13718,53 @@ $as_echo X"$am_mf" |
31169 q
31170 }
31171 s/.*/./; q'`
31172- am_filepart=`$as_basename -- "$am_mf" ||
31173-$as_expr X/"$am_mf" : '.*/\([^/][^/]*\)/*$' \| \
31174- X"$am_mf" : 'X\(//\)$' \| \
31175- X"$am_mf" : 'X\(/\)' \| . 2>/dev/null ||
31176-$as_echo X/"$am_mf" |
31177- sed '/^.*\/\([^/][^/]*\)\/*$/{
31178+ else
31179+ continue
31180+ fi
31181+ # Extract the definition of DEPDIR, am__include, and am__quote
31182+ # from the Makefile without running 'make'.
31183+ DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
31184+ test -z "$DEPDIR" && continue
31185+ am__include=`sed -n 's/^am__include = //p' < "$mf"`
31186+ test -z "$am__include" && continue
31187+ am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
31188+ # Find all dependency output files, they are included files with
31189+ # $(DEPDIR) in their names. We invoke sed twice because it is the
31190+ # simplest approach to changing $(DEPDIR) to its actual value in the
31191+ # expansion.
31192+ for file in `sed -n "
31193+ s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
31194+ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
31195+ # Make sure the directory exists.
31196+ test -f "$dirpart/$file" && continue
31197+ fdir=`$as_dirname -- "$file" ||
31198+$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
31199+ X"$file" : 'X\(//\)[^/]' \| \
31200+ X"$file" : 'X\(//\)$' \| \
31201+ X"$file" : 'X\(/\)' \| . 2>/dev/null ||
31202+$as_echo X"$file" |
31203+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
31204 s//\1/
31205 q
31206 }
31207- /^X\/\(\/\/\)$/{
31208+ /^X\(\/\/\)[^/].*/{
31209 s//\1/
31210 q
31211 }
31212- /^X\/\(\/\).*/{
31213+ /^X\(\/\/\)$/{
31214+ s//\1/
31215+ q
31216+ }
31217+ /^X\(\/\).*/{
31218 s//\1/
31219 q
31220 }
31221 s/.*/./; q'`
31222- { echo "$as_me:$LINENO: cd "$am_dirpart" \
31223- && sed -e '/# am--include-marker/d' "$am_filepart" \
31224- | $MAKE -f - am--depfiles" >&5
31225- (cd "$am_dirpart" \
31226- && sed -e '/# am--include-marker/d' "$am_filepart" \
31227- | $MAKE -f - am--depfiles) >&5 2>&5
31228- ac_status=$?
31229- echo "$as_me:$LINENO: \$? = $ac_status" >&5
31230- (exit $ac_status); } || am_rc=$?
31231+ as_dir=$dirpart/$fdir; as_fn_mkdir_p
31232+ # echo "creating $dirpart/$file"
31233+ echo '# dummy' > "$dirpart/$file"
31234+ done
31235 done
31236- if test $am_rc -ne 0; then
31237- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
31238-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
31239-as_fn_error $? "Something went wrong bootstrapping makefile fragments
31240- for automatic dependency tracking. If GNU make was not used, consider
31241- re-running the configure script with MAKE=\"gmake\" (or whatever is
31242- necessary). You can also try re-running configure with the
31243- '--disable-dependency-tracking' option to at least be able to build
31244- the package (albeit without support for automatic dependency tracking).
31245-See \`config.log' for more details" "$LINENO" 5; }
31246- fi
31247- { am_dirpart=; unset am_dirpart;}
31248- { am_filepart=; unset am_filepart;}
31249- { am_mf=; unset am_mf;}
31250- { am_rc=; unset am_rc;}
31251- rm -f conftest-deps.mk
31252 }
31253 ;;
31254 "libtool":C)
31255@@ -13136,7 +13788,8 @@ See \`config.log' for more details" "$LINENO" 5; }
24817 # NOTE: Changes made to this file will be lost: look at ltmain.sh. 31256 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
24818 # 31257 #
24819 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 31258 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
@@ -24823,7 +31262,7 @@ index db7845c5d42..cd59daa39b5 100755
24823 # Written by Gordon Matzigkeit, 1996 31262 # Written by Gordon Matzigkeit, 1996
24824 # 31263 #
24825 # This file is part of GNU Libtool. 31264 # This file is part of GNU Libtool.
24826@@ -13218,19 +13886,42 @@ SP2NL=$lt_lt_SP2NL 31265@@ -13239,19 +13892,42 @@ SP2NL=$lt_lt_SP2NL
24827 # turn newlines into spaces. 31266 # turn newlines into spaces.
24828 NL2SP=$lt_lt_NL2SP 31267 NL2SP=$lt_lt_NL2SP
24829 31268
@@ -24867,7 +31306,7 @@ index db7845c5d42..cd59daa39b5 100755
24867 # A symbol stripping program. 31306 # A symbol stripping program.
24868 STRIP=$lt_STRIP 31307 STRIP=$lt_STRIP
24869 31308
24870@@ -13260,6 +13951,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address 31309@@ -13281,6 +13957,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
24871 # Transform the output of nm in a C name address pair when lib prefix is needed. 31310 # Transform the output of nm in a C name address pair when lib prefix is needed.
24872 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix 31311 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
24873 31312
@@ -24880,7 +31319,7 @@ index db7845c5d42..cd59daa39b5 100755
24880 # The name of the directory that contains temporary libtool files. 31319 # The name of the directory that contains temporary libtool files.
24881 objdir=$objdir 31320 objdir=$objdir
24882 31321
24883@@ -13269,6 +13966,9 @@ MAGIC_CMD=$MAGIC_CMD 31322@@ -13290,6 +13972,9 @@ MAGIC_CMD=$MAGIC_CMD
24884 # Must we lock files when doing compilation? 31323 # Must we lock files when doing compilation?
24885 need_locks=$lt_need_locks 31324 need_locks=$lt_need_locks
24886 31325
@@ -24890,7 +31329,7 @@ index db7845c5d42..cd59daa39b5 100755
24890 # Tool to manipulate archived DWARF debug symbol files on Mac OS X. 31329 # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
24891 DSYMUTIL=$lt_DSYMUTIL 31330 DSYMUTIL=$lt_DSYMUTIL
24892 31331
24893@@ -13383,12 +14083,12 @@ with_gcc=$GCC 31332@@ -13404,12 +14089,12 @@ with_gcc=$GCC
24894 # Compiler flag to turn off builtin functions. 31333 # Compiler flag to turn off builtin functions.
24895 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag 31334 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
24896 31335
@@ -24906,7 +31345,7 @@ index db7845c5d42..cd59daa39b5 100755
24906 # Compiler flag to prevent dynamic linking. 31345 # Compiler flag to prevent dynamic linking.
24907 link_static_flag=$lt_lt_prog_compiler_static 31346 link_static_flag=$lt_lt_prog_compiler_static
24908 31347
24909@@ -13475,9 +14175,6 @@ inherit_rpath=$inherit_rpath 31348@@ -13496,9 +14181,6 @@ inherit_rpath=$inherit_rpath
24910 # Whether libtool must link a program against all its dependency libraries. 31349 # Whether libtool must link a program against all its dependency libraries.
24911 link_all_deplibs=$link_all_deplibs 31350 link_all_deplibs=$link_all_deplibs
24912 31351
@@ -24916,7 +31355,7 @@ index db7845c5d42..cd59daa39b5 100755
24916 # Set to "yes" if exported symbols are required. 31355 # Set to "yes" if exported symbols are required.
24917 always_export_symbols=$always_export_symbols 31356 always_export_symbols=$always_export_symbols
24918 31357
24919@@ -13493,6 +14190,9 @@ include_expsyms=$lt_include_expsyms 31358@@ -13514,6 +14196,9 @@ include_expsyms=$lt_include_expsyms
24920 # Commands necessary for linking programs (against libraries) with templates. 31359 # Commands necessary for linking programs (against libraries) with templates.
24921 prelink_cmds=$lt_prelink_cmds 31360 prelink_cmds=$lt_prelink_cmds
24922 31361
@@ -24926,7 +31365,7 @@ index db7845c5d42..cd59daa39b5 100755
24926 # Specify filename containing input files. 31365 # Specify filename containing input files.
24927 file_list_spec=$lt_file_list_spec 31366 file_list_spec=$lt_file_list_spec
24928 31367
24929@@ -13525,210 +14225,169 @@ ltmain="$ac_aux_dir/ltmain.sh" 31368@@ -13546,210 +14231,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
24930 # if finds mixed CR/LF and LF-only lines. Since sed operates in 31369 # if finds mixed CR/LF and LF-only lines. Since sed operates in
24931 # text mode, it properly converts lines to CR/LF. This bash problem 31370 # text mode, it properly converts lines to CR/LF. This bash problem
24932 # is reportedly fixed, but why not run on old versions too? 31371 # is reportedly fixed, but why not run on old versions too?
diff --git a/meta/recipes-devtools/binutils/binutils/0010-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 217ba5df85..2c4ffec4e6 100644
--- a/meta/recipes-devtools/binutils/binutils/0010-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 1c4581a059afe2799bb825b388ae92f8fa6f19a3 Mon Sep 17 00:00:00 2001 1From 98410efc334e31ccfbdc0080fb293b0e06885454 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 2 Mar 2015 01:42:38 +0000 3Date: Mon, 2 Mar 2015 01:42:38 +0000
4Subject: [PATCH] Fix rpath in libtool when sysroot is enabled 4Subject: [PATCH] Fix rpath in libtool when sysroot is enabled
diff --git a/meta/recipes-devtools/binutils/binutils/0011-sync-with-OE-libtool-changes.patch b/meta/recipes-devtools/binutils/binutils/0010-sync-with-OE-libtool-changes.patch
index 3607e36ef4..199aafcaee 100644
--- a/meta/recipes-devtools/binutils/binutils/0011-sync-with-OE-libtool-changes.patch
+++ b/meta/recipes-devtools/binutils/binutils/0010-sync-with-OE-libtool-changes.patch
@@ -1,4 +1,4 @@
1From d71c715554a054c534954b0aa357ca699ed68430 Mon Sep 17 00:00:00 2001 1From 84fc4ceafcbfad4c6ddc9d65f6a425bd62dd062e Mon Sep 17 00:00:00 2001
2From: Ross Burton <ross.burton@intel.com> 2From: Ross Burton <ross.burton@intel.com>
3Date: Mon, 6 Mar 2017 23:33:27 -0800 3Date: Mon, 6 Mar 2017 23:33:27 -0800
4Subject: [PATCH] sync with OE libtool changes 4Subject: [PATCH] sync with OE libtool changes
diff --git a/meta/recipes-devtools/binutils/binutils/0012-Check-for-clang-before-checking-gcc-version.patch b/meta/recipes-devtools/binutils/binutils/0011-Check-for-clang-before-checking-gcc-version.patch
index 8848c05ae0..f75ec2ee9d 100644
--- a/meta/recipes-devtools/binutils/binutils/0012-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 787d7cd71d7886d3193c0fd747101c54ad7c3cd8 Mon Sep 17 00:00:00 2001 1From 628c10087e6e11a7bc748437c5b695835b704aaf 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 6a1da1665d8..916656dc233 100755 21index be433ef6d5d..7494fbd2f06 100755
22--- a/configure 22--- a/configure
23+++ b/configure 23+++ b/configure
24@@ -5287,7 +5287,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu 24@@ -5294,7 +5294,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 6a1da1665d8..916656dc233 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 2b10e9a1b02..677a0196c2b 100644 34index 1651cbf3b02..2e2ecc47542 100644
35--- a/configure.ac 35--- a/configure.ac
36+++ b/configure.ac 36+++ b/configure.ac
37@@ -1309,7 +1309,7 @@ if test "$GCC" = yes; then 37@@ -1323,7 +1323,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/0005-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 997774020e..c4b4198910 100644
--- a/meta/recipes-devtools/binutils/binutils/0005-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch
+++ b/meta/recipes-devtools/binutils/binutils/0012-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch
@@ -1,6 +1,6 @@
1From edddb1f294d667eac94649ba0665fe464990ed18 Mon Sep 17 00:00:00 2001 1From 63157cb403b6aa13147840c036a8555c4ea9c166 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 2 Mar 2015 01:27:17 +0000 3Date: 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
5 5
6for cases where -rpath isn't specified. debian (#151024) 6for cases where -rpath isn't specified. debian (#151024)
@@ -10,23 +10,24 @@ Upstream-Status: Pending
10Signed-off-by: Chris Chimelis <chris@debian.org> 10Signed-off-by: Chris Chimelis <chris@debian.org>
11Signed-off-by: Khem Raj <raj.khem@gmail.com> 11Signed-off-by: Khem Raj <raj.khem@gmail.com>
12--- 12---
13 ld/ldelf.c | 4 ++++ 13 ld/ldelf.c | 5 +++++
14 1 file changed, 4 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 34cbc60e5e9..b1965a9e96f 100644 17index 0d61a3209ec..cd0da2013e2 100644
18--- a/ld/ldelf.c 18--- a/ld/ldelf.c
19+++ b/ld/ldelf.c 19+++ b/ld/ldelf.c
20@@ -1277,6 +1277,8 @@ ldelf_after_open (int use_libpath, int native, int is_linux, int is_freebsd, 20@@ -1127,6 +1127,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");
24+ if ((path) && (strlen (path) == 0)) 24+ if ((path) && (strlen (path) == 0))
25+ path = NULL; 25+ path = NULL;
26+
26 if (path 27 if (path
27 && ldelf_search_needed (path, &n, force, 28 && ldelf_search_needed (path, &n, force,
28 is_linux, elfsize)) 29 is_linux, elfsize))
29@@ -1636,6 +1638,8 @@ ldelf_before_allocation (char *audit, char *depaudit, 30@@ -1801,6 +1804,8 @@ ldelf_before_allocation (char *audit, char *depaudit,
30 rpath = command_line.rpath; 31 rpath = command_line.rpath;
31 if (rpath == NULL) 32 if (rpath == NULL)
32 rpath = (const char *) getenv ("LD_RUN_PATH"); 33 rpath = (const char *) getenv ("LD_RUN_PATH");
diff --git a/meta/recipes-devtools/binutils/binutils/0013-Avoid-as-info-race-condition.patch b/meta/recipes-devtools/binutils/binutils/0013-Avoid-as-info-race-condition.patch
deleted file mode 100644
index 3b3d0bb769..0000000000
--- a/meta/recipes-devtools/binutils/binutils/0013-Avoid-as-info-race-condition.patch
+++ /dev/null
@@ -1,75 +0,0 @@
1From 9a84a44d5df4618dd616137fa755bd71b7eacc5f Mon Sep 17 00:00:00 2001
2From: Mike Frysinger <vapier@gentoo.org>
3Date: Sun, 23 Jan 2022 12:44:24 -0500
4Subject: [PATCH] gas: drop old cygnus install hack
5
6This was needed when gas was using the automake cygnus option, but
7this was removed years ago by Simon in d0ac1c44885daf68f631befa37e
8("Bump to autoconf 2.69 and automake 1.15.1"). So delete it here.
9The info pages are already & still installed by default w/out it.
10
11Upstream-Status: Backport [https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=9a84a44d5df4618dd616137fa755bd71b7eacc5f]
12
13Signed-off-by: Khem Raj <raj.khem@gmail.com>
14---
15 gas/Makefile.in | 14 +++++---------
16 gas/doc/local.mk | 4 ----
17 2 files changed, 5 insertions(+), 13 deletions(-)
18
19diff --git a/gas/Makefile.in b/gas/Makefile.in
20index 8f0a56fd8d6..67dac53f68c 100644
21--- a/gas/Makefile.in
22+++ b/gas/Makefile.in
23@@ -1854,7 +1854,7 @@ info: info-recursive
24
25 info-am: $(INFO_DEPS) info-local
26
27-install-data-am: install-data-local install-info-am install-man
28+install-data-am: install-info-am install-man
29
30 install-dvi: install-dvi-recursive
31
32@@ -2008,10 +2008,10 @@ uninstall-man: uninstall-man1
33 distclean-DEJAGNU distclean-compile distclean-generic \
34 distclean-hdr distclean-libtool distclean-tags dvi dvi-am html \
35 html-am html-local info info-am info-local install install-am \
36- install-data install-data-am install-data-local install-dvi \
37- install-dvi-am install-exec install-exec-am install-exec-local \
38- install-html install-html-am install-info install-info-am \
39- install-man install-man1 install-pdf install-pdf-am install-ps \
40+ install-data install-data-am install-dvi install-dvi-am \
41+ install-exec install-exec-am install-exec-local install-html \
42+ install-html-am install-info install-info-am install-man \
43+ install-man1 install-pdf install-pdf-am install-ps \
44 install-ps-am install-strip installcheck installcheck-am \
45 installdirs installdirs-am maintainer-clean \
46 maintainer-clean-aminfo maintainer-clean-generic mostlyclean \
47@@ -2211,10 +2211,6 @@ doc/asconfig.texi: doc/$(CONFIG).texi doc/$(am__dirstamp)
48 $(AM_V_GEN)cp $(srcdir)/doc/$(CONFIG).texi doc/asconfig.texi
49 $(AM_V_at)chmod u+w doc/asconfig.texi
50
51-# We want install to imply install-info as per GNU standards, despite the
52-# cygnus option.
53-install-data-local: install-info
54-
55 # Maintenance
56
57 # We need it for the taz target in ../Makefile.in.
58diff --git a/gas/doc/local.mk b/gas/doc/local.mk
59index c2de441257c..ac205cf08a2 100644
60--- a/gas/doc/local.mk
61+++ b/gas/doc/local.mk
62@@ -101,10 +101,6 @@ CPU_DOCS = \
63 %D%/c-z80.texi \
64 %D%/c-z8k.texi
65
66-# We want install to imply install-info as per GNU standards, despite the
67-# cygnus option.
68-install-data-local: install-info
69-
70 # This one isn't ready for prime time yet. Not even a little bit.
71
72 noinst_TEXINFOS = %D%/internals.texi
73--
742.27.0
75
diff --git a/meta/recipes-devtools/binutils/binutils/0014-CVE-2019-1010204.patch b/meta/recipes-devtools/binutils/binutils/0014-CVE-2019-1010204.patch
deleted file mode 100644
index dad4a62038..0000000000
--- a/meta/recipes-devtools/binutils/binutils/0014-CVE-2019-1010204.patch
+++ /dev/null
@@ -1,49 +0,0 @@
1From 2a4fc266dbf77ed7ab83da16468e9ba627b8bc2d Mon Sep 17 00:00:00 2001
2From: Nick Clifton <nickc@redhat.com>
3Date: Mon, 27 Jun 2022 13:07:40 +0100
4Subject: [PATCH] Have gold's File_read::do_read() function check the start
5 parameter
6
7 PR 23765
8 * fileread.cc (File_read::do_read): Check start parameter before
9 computing number of bytes to read.
10
11Upstream-Status: Backport [https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=2a4fc266dbf77ed7ab83da16468e9ba627b8bc2d]
12
13Signed-off-by: Pgowda <pgowda.cve@gmail.com>
14---
15 gold/ChangeLog | 6 ++++++
16 gold/fileread.cc | 6 ++++++
17 2 files changed, 12 insertions(+)
18
19diff --git a/gold/ChangeLog b/gold/ChangeLog
20index 5103dab7b67..8557dc6db7f 100644
21--- a/gold/ChangeLog
22+++ b/gold/ChangeLog
23@@ -1,3 +1,9 @@
24+2022-06-27 Nick Clifton <nickc@redhat.com>
25+
26+ PR 23765
27+ * fileread.cc (File_read::do_read): Check start parameter before
28+ computing number of bytes to read.
29+
30 2022-02-17 Nick Clifton <nickc@redhat.com>
31
32 * po/sr.po: Updated Serbian translation.
33diff --git a/gold/fileread.cc b/gold/fileread.cc
34index 2b653f78c2e..af2df215468 100644
35--- a/gold/fileread.cc
36+++ b/gold/fileread.cc
37@@ -385,6 +385,12 @@ File_read::do_read(off_t start, section_
38 ssize_t bytes;
39 if (this->whole_file_view_ != NULL)
40 {
41+ // See PR 23765 for an example of a testcase that triggers this error.
42+ if (((ssize_t) start) < 0)
43+ gold_fatal(_("%s: read failed, starting offset (%#llx) less than zero"),
44+ this->filename().c_str(),
45+ static_cast<long long>(start));
46+
47 bytes = this->size_ - start;
48 if (static_cast<section_size_type>(bytes) >= size)
49 {
diff --git a/meta/recipes-devtools/binutils/binutils_2.38.bb b/meta/recipes-devtools/binutils/binutils_2.39.bb
index 12a6fb5577..12a6fb5577 100644
--- a/meta/recipes-devtools/binutils/binutils_2.38.bb
+++ b/meta/recipes-devtools/binutils/binutils_2.39.bb
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2026-04-22 20:03:33 +0000