summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2024-02-02 16:27:29 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2024-02-05 14:06:10 +0000
commitb0e5542e7a4682c6949a4943ed25156916ddb298 (patch)
tree1ae91d10fe77d5541d0e4cc9b4100db84277a58f
parent17a2c6e38d306de3367478e3e24fe2d5c1f4c13b (diff)
downloadpoky-b0e5542e7a4682c6949a4943ed25156916ddb298.tar.gz
binutils: Upgrade to binutils 2.42
Release Notes are here [1] [1] https://sourceware.org/pipermail/binutils/2024-January/132213.html (From OE-Core rev: 795af50ed4005c097069a65f67eb604da9f41b92) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat
-rw-r--r--meta/conf/distro/include/tcmode-default.inc2
-rw-r--r--meta/recipes-devtools/binutils/binutils-2.42.inc (renamed from meta/recipes-devtools/binutils/binutils-2.41.inc)9
-rw-r--r--meta/recipes-devtools/binutils/binutils-cross-canadian_2.42.bb (renamed from meta/recipes-devtools/binutils/binutils-cross-canadian_2.41.bb)0
-rw-r--r--meta/recipes-devtools/binutils/binutils-cross-testsuite_2.42.bb (renamed from meta/recipes-devtools/binutils/binutils-cross-testsuite_2.41.bb)0
-rw-r--r--meta/recipes-devtools/binutils/binutils-cross_2.42.bb (renamed from meta/recipes-devtools/binutils/binutils-cross_2.41.bb)0
-rw-r--r--meta/recipes-devtools/binutils/binutils-crosssdk_2.42.bb (renamed from meta/recipes-devtools/binutils/binutils-crosssdk_2.41.bb)0
-rw-r--r--meta/recipes-devtools/binutils/binutils/0001-binutils-crosssdk-Generate-relocatable-SDKs.patch14
-rw-r--r--meta/recipes-devtools/binutils/binutils/0002-binutils-cross-Do-not-generate-linker-script-directo.patch6
-rw-r--r--meta/recipes-devtools/binutils/binutils/0003-binutils-nativesdk-Search-for-alternative-ld.so.conf.patch24
-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.patch4
-rw-r--r--meta/recipes-devtools/binutils/binutils/0006-warn-for-uses-of-system-directories-when-cross-linki.patch38
-rw-r--r--meta/recipes-devtools/binutils/binutils/0007-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch4
-rw-r--r--meta/recipes-devtools/binutils/binutils/0008-Use-libtool-2.4.patch2546
-rw-r--r--meta/recipes-devtools/binutils/binutils/0009-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch4
-rw-r--r--meta/recipes-devtools/binutils/binutils/0010-sync-with-OE-libtool-changes.patch4
-rw-r--r--meta/recipes-devtools/binutils/binutils/0011-Check-for-clang-before-checking-gcc-version.patch10
-rw-r--r--meta/recipes-devtools/binutils/binutils/0012-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch8
-rw-r--r--meta/recipes-devtools/binutils/binutils/0013-Define-alignof-using-_Alignof-when-using-C11-or-newe.patch6
-rw-r--r--meta/recipes-devtools/binutils/binutils/0014-Remove-duplicate-pe-dll.o-entry-deom-targ_extra_ofil.patch6
-rw-r--r--meta/recipes-devtools/binutils/binutils/0015-gprofng-Fix-build-with-64bit-file-offset-on-32bit-ma.patch55
-rw-r--r--meta/recipes-devtools/binutils/binutils_2.42.bb (renamed from meta/recipes-devtools/binutils/binutils_2.41.bb)0
22 files changed, 1294 insertions, 1456 deletions
diff --git a/meta/conf/distro/include/tcmode-default.inc b/meta/conf/distro/include/tcmode-default.inc
index a12b202e43..fa86bf4842 100644
--- a/meta/conf/distro/include/tcmode-default.inc
+++ b/meta/conf/distro/include/tcmode-default.inc
@@ -18,7 +18,7 @@ PREFERRED_PROVIDER_virtual/gettext ??= "gettext"
18 18
19GCCVERSION ?= "13.%" 19GCCVERSION ?= "13.%"
20SDKGCCVERSION ?= "${GCCVERSION}" 20SDKGCCVERSION ?= "${GCCVERSION}"
21BINUVERSION ?= "2.41%" 21BINUVERSION ?= "2.42%"
22GDBVERSION ?= "14.%" 22GDBVERSION ?= "14.%"
23GLIBCVERSION ?= "2.38%" 23GLIBCVERSION ?= "2.38%"
24LINUXLIBCVERSION ?= "6.6%" 24LINUXLIBCVERSION ?= "6.6%"
diff --git a/meta/recipes-devtools/binutils/binutils-2.41.inc b/meta/recipes-devtools/binutils/binutils-2.42.inc
index 804f092965..f48a1eb249 100644
--- a/meta/recipes-devtools/binutils/binutils-2.41.inc
+++ b/meta/recipes-devtools/binutils/binutils-2.42.inc
@@ -12,13 +12,13 @@ LIC_FILES_CHKSUM="\
12 12
13# When upgrading to 2.42, please make sure there is no trailing .0, so 13# When upgrading to 2.42, 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.41" 15PV = "2.42"
16CVE_VERSION = "2.41" 16CVE_VERSION = "2.42"
17SRCBRANCH ?= "binutils-2_41-branch" 17SRCBRANCH ?= "binutils-2_42-branch"
18 18
19UPSTREAM_CHECK_GITTAGREGEX = "binutils-(?P<pver>\d+_(\d_?)*)" 19UPSTREAM_CHECK_GITTAGREGEX = "binutils-(?P<pver>\d+_(\d_?)*)"
20 20
21SRCREV ?= "c1321df4eb0a136304205085cd4913dd4eb01054" 21SRCREV ?= "42cde237366398f6e318232f4ce080bef42f0371"
22BINUTILS_GIT_URI ?= "git://sourceware.org/git/binutils-gdb.git;branch=${SRCBRANCH};protocol=https" 22BINUTILS_GIT_URI ?= "git://sourceware.org/git/binutils-gdb.git;branch=${SRCBRANCH};protocol=https"
23SRC_URI = "\ 23SRC_URI = "\
24 ${BINUTILS_GIT_URI} \ 24 ${BINUTILS_GIT_URI} \
@@ -33,6 +33,5 @@ SRC_URI = "\
33 file://0012-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch \ 33 file://0012-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch \
34 file://0013-Define-alignof-using-_Alignof-when-using-C11-or-newe.patch \ 34 file://0013-Define-alignof-using-_Alignof-when-using-C11-or-newe.patch \
35 file://0014-Remove-duplicate-pe-dll.o-entry-deom-targ_extra_ofil.patch \ 35 file://0014-Remove-duplicate-pe-dll.o-entry-deom-targ_extra_ofil.patch \
36 file://0015-gprofng-Fix-build-with-64bit-file-offset-on-32bit-ma.patch \
37" 36"
38S = "${WORKDIR}/git" 37S = "${WORKDIR}/git"
diff --git a/meta/recipes-devtools/binutils/binutils-cross-canadian_2.41.bb b/meta/recipes-devtools/binutils/binutils-cross-canadian_2.42.bb
index 5dbaa03017..5dbaa03017 100644
--- a/meta/recipes-devtools/binutils/binutils-cross-canadian_2.41.bb
+++ b/meta/recipes-devtools/binutils/binutils-cross-canadian_2.42.bb
diff --git a/meta/recipes-devtools/binutils/binutils-cross-testsuite_2.41.bb b/meta/recipes-devtools/binutils/binutils-cross-testsuite_2.42.bb
index 630815c7a3..630815c7a3 100644
--- a/meta/recipes-devtools/binutils/binutils-cross-testsuite_2.41.bb
+++ b/meta/recipes-devtools/binutils/binutils-cross-testsuite_2.42.bb
diff --git a/meta/recipes-devtools/binutils/binutils-cross_2.41.bb b/meta/recipes-devtools/binutils/binutils-cross_2.42.bb
index fbd1f7d25a..fbd1f7d25a 100644
--- a/meta/recipes-devtools/binutils/binutils-cross_2.41.bb
+++ b/meta/recipes-devtools/binutils/binutils-cross_2.42.bb
diff --git a/meta/recipes-devtools/binutils/binutils-crosssdk_2.41.bb b/meta/recipes-devtools/binutils/binutils-crosssdk_2.42.bb
index 6752659304..6752659304 100644
--- a/meta/recipes-devtools/binutils/binutils-crosssdk_2.41.bb
+++ b/meta/recipes-devtools/binutils/binutils-crosssdk_2.42.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 ef7e1c4317..148c9a29db 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 95e23fba624c90d0e62c1adaf2bcc4f3cd3175c0 Mon Sep 17 00:00:00 2001 1From 07237f83e4bfefab6473ed7c7b601d9d23b11edd Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 2 Mar 2015 01:58:54 +0000 3Date: Mon, 2 Mar 2015 01:58:54 +0000
4Subject: [PATCH] binutils-crosssdk: Generate relocatable SDKs 4Subject: [PATCH] binutils-crosssdk: Generate relocatable SDKs
@@ -21,7 +21,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
21 3 files changed, 6 insertions(+), 3 deletions(-) 21 3 files changed, 6 insertions(+), 3 deletions(-)
22 22
23diff --git a/gold/layout.cc b/gold/layout.cc 23diff --git a/gold/layout.cc b/gold/layout.cc
24index b94855f8662..51f2d74d79d 100644 24index b43ae841a6c..6101a95195b 100644
25--- a/gold/layout.cc 25--- a/gold/layout.cc
26+++ b/gold/layout.cc 26+++ b/gold/layout.cc
27@@ -5102,7 +5102,7 @@ Layout::create_interp(const Target* target) 27@@ -5102,7 +5102,7 @@ Layout::create_interp(const Target* target)
@@ -34,10 +34,10 @@ index b94855f8662..51f2d74d79d 100644
34 Output_section_data* odata = new Output_data_const(interp, len, 1); 34 Output_section_data* odata = new Output_data_const(interp, len, 1);
35 35
36diff --git a/ld/genscripts.sh b/ld/genscripts.sh 36diff --git a/ld/genscripts.sh b/ld/genscripts.sh
37index 382bd07ffe2..9fbd0c4cb8a 100755 37index d6ceb3fe4f5..365c0e778cc 100755
38--- a/ld/genscripts.sh 38--- a/ld/genscripts.sh
39+++ b/ld/genscripts.sh 39+++ b/ld/genscripts.sh
40@@ -304,6 +304,7 @@ DATA_ALIGNMENT_u="${DATA_ALIGNMENT_u-${DATA_ALIGNMENT_r}}" 40@@ -298,6 +298,7 @@ DATA_ALIGNMENT_u="${DATA_ALIGNMENT_u-${DATA_ALIGNMENT_r}}"
41 LD_FLAG=r 41 LD_FLAG=r
42 DATA_ALIGNMENT=${DATA_ALIGNMENT_r} 42 DATA_ALIGNMENT=${DATA_ALIGNMENT_r}
43 DEFAULT_DATA_ALIGNMENT="ALIGN(${SEGMENT_SIZE})" 43 DEFAULT_DATA_ALIGNMENT="ALIGN(${SEGMENT_SIZE})"
@@ -45,7 +45,7 @@ index 382bd07ffe2..9fbd0c4cb8a 100755
45 ( echo "/* Script for -r */" 45 ( echo "/* Script for -r */"
46 source_sh ${CUSTOMIZER_SCRIPT} 46 source_sh ${CUSTOMIZER_SCRIPT}
47 source_sh ${srcdir}/scripttempl/${SCRIPT_NAME}.sc 47 source_sh ${srcdir}/scripttempl/${SCRIPT_NAME}.sc
48@@ -312,10 +313,12 @@ DEFAULT_DATA_ALIGNMENT="ALIGN(${SEGMENT_SIZE})" 48@@ -306,10 +307,12 @@ DEFAULT_DATA_ALIGNMENT="ALIGN(${SEGMENT_SIZE})"
49 LD_FLAG=u 49 LD_FLAG=u
50 DATA_ALIGNMENT=${DATA_ALIGNMENT_u} 50 DATA_ALIGNMENT=${DATA_ALIGNMENT_u}
51 CONSTRUCTING=" " 51 CONSTRUCTING=" "
@@ -59,10 +59,10 @@ index 382bd07ffe2..9fbd0c4cb8a 100755
59 DATA_ALIGNMENT=${DATA_ALIGNMENT_} 59 DATA_ALIGNMENT=${DATA_ALIGNMENT_}
60 RELOCATING=" " 60 RELOCATING=" "
61diff --git a/ld/scripttempl/elf.sc b/ld/scripttempl/elf.sc 61diff --git a/ld/scripttempl/elf.sc b/ld/scripttempl/elf.sc
62index 1e3c5aa8504..b8d1977b3f0 100644 62index fae7c2ad71c..7fe37eb1874 100644
63--- a/ld/scripttempl/elf.sc 63--- a/ld/scripttempl/elf.sc
64+++ b/ld/scripttempl/elf.sc 64+++ b/ld/scripttempl/elf.sc
65@@ -148,8 +148,8 @@ if test -z "$DATA_SEGMENT_ALIGN"; then 65@@ -150,8 +150,8 @@ if test -z "$DATA_SEGMENT_ALIGN"; then
66 DATA_SEGMENT_RELRO_END=". = DATA_SEGMENT_RELRO_END (${SEPARATE_GOTPLT-0}, .);" 66 DATA_SEGMENT_RELRO_END=". = DATA_SEGMENT_RELRO_END (${SEPARATE_GOTPLT-0}, .);"
67 fi 67 fi
68 fi 68 fi
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 3ea6923fd8..bea1be9e83 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 2b3017e7dab4d929d3ab664c5e6f94226b0a6d31 Mon Sep 17 00:00:00 2001 1From 4988a5a42289e43ab0fbd87793f293e263dc3dc1 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 6 Mar 2017 23:37:05 -0800 3Date: Mon, 6 Mar 2017 23:37:05 -0800
4Subject: [PATCH] binutils-cross: Do not generate linker script directories 4Subject: [PATCH] binutils-cross: Do not generate linker script directories
@@ -22,10 +22,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
22 1 file changed, 25 deletions(-) 22 1 file changed, 25 deletions(-)
23 23
24diff --git a/ld/genscripts.sh b/ld/genscripts.sh 24diff --git a/ld/genscripts.sh b/ld/genscripts.sh
25index 9fbd0c4cb8a..6be07038c9b 100755 25index 365c0e778cc..b0893fda3c5 100755
26--- a/ld/genscripts.sh 26--- a/ld/genscripts.sh
27+++ b/ld/genscripts.sh 27+++ b/ld/genscripts.sh
28@@ -235,31 +235,6 @@ append_to_lib_path() 28@@ -229,31 +229,6 @@ append_to_lib_path()
29 fi 29 fi
30 } 30 }
31 31
diff --git a/meta/recipes-devtools/binutils/binutils/0003-binutils-nativesdk-Search-for-alternative-ld.so.conf.patch b/meta/recipes-devtools/binutils/binutils/0003-binutils-nativesdk-Search-for-alternative-ld.so.conf.patch
index ace279bd84..6f23abc250 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 c00ead7264dc1335cb43222cb742b95614666be8 Mon Sep 17 00:00:00 2001 1From a0047134327e312a22f798bd328becf4053a6973 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,38 +29,38 @@ 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 c3adbb0ccad..ce0f7e7f85d 100644 32index f9ee05b1400..07801c2c3ac 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@
36 36
37 ELF_CLFAGS=-DELF_LIST_OPTIONS=@elf_list_options@ \ 37 ELF_CFLAGS=-DELF_LIST_OPTIONS=@elf_list_options@ \
38 -DELF_SHLIB_LIST_OPTIONS=@elf_shlib_list_options@ \ 38 -DELF_SHLIB_LIST_OPTIONS=@elf_shlib_list_options@ \
39- -DELF_PLT_UNWIND_LIST_OPTIONS=@elf_plt_unwind_list_options@ 39- -DELF_PLT_UNWIND_LIST_OPTIONS=@elf_plt_unwind_list_options@
40+ -DELF_PLT_UNWIND_LIST_OPTIONS=@elf_plt_unwind_list_options@ \ 40+ -DELF_PLT_UNWIND_LIST_OPTIONS=@elf_plt_unwind_list_options@ \
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) $(JANSSON_CFLAGS) $(ZSTD_CFLAGS) 44 AM_CFLAGS = $(WARN_CFLAGS) $(ELF_CFLAGS) $(JANSSON_CFLAGS) $(ZSTD_CFLAGS)
45diff --git a/ld/Makefile.in b/ld/Makefile.in 45diff --git a/ld/Makefile.in b/ld/Makefile.in
46index d1a56026437..9d86aed12c6 100644 46index abb0565718f..6329a12a0d6 100644
47--- a/ld/Makefile.in 47--- a/ld/Makefile.in
48+++ b/ld/Makefile.in 48+++ b/ld/Makefile.in
49@@ -566,7 +566,8 @@ ZLIB = @zlibdir@ -lz 49@@ -576,7 +576,8 @@ ZLIB = @zlibdir@ -lz
50 ZLIBINC = @zlibinc@ 50 ZLIBINC = @zlibinc@
51 ELF_CLFAGS = -DELF_LIST_OPTIONS=@elf_list_options@ \ 51 ELF_CFLAGS = -DELF_LIST_OPTIONS=@elf_list_options@ \
52 -DELF_SHLIB_LIST_OPTIONS=@elf_shlib_list_options@ \ 52 -DELF_SHLIB_LIST_OPTIONS=@elf_shlib_list_options@ \
53- -DELF_PLT_UNWIND_LIST_OPTIONS=@elf_plt_unwind_list_options@ 53- -DELF_PLT_UNWIND_LIST_OPTIONS=@elf_plt_unwind_list_options@
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) $(JANSSON_CFLAGS) $(ZSTD_CFLAGS) 57 AM_CFLAGS = $(WARN_CFLAGS) $(ELF_CFLAGS) $(JANSSON_CFLAGS) $(ZSTD_CFLAGS)
58 58
59diff --git a/ld/ldelf.c b/ld/ldelf.c 59diff --git a/ld/ldelf.c b/ld/ldelf.c
60index f9a6819366f..1519f8ac4e5 100644 60index 2852851dcd5..187b359af86 100644
61--- a/ld/ldelf.c 61--- a/ld/ldelf.c
62+++ b/ld/ldelf.c 62+++ b/ld/ldelf.c
63@@ -936,7 +936,7 @@ ldelf_check_ld_so_conf (const struct bfd_link_needed_list *l, int force, 63@@ -939,7 +939,7 @@ ldelf_check_ld_so_conf (const struct bfd_link_needed_list *l, int force,
64 64
65 info.path = NULL; 65 info.path = NULL;
66 info.len = info.alloc = 0; 66 info.len = info.alloc = 0;
@@ -70,7 +70,7 @@ index f9a6819366f..1519f8ac4e5 100644
70 if (!ldelf_parse_ld_so_conf (&info, tmppath)) 70 if (!ldelf_parse_ld_so_conf (&info, tmppath))
71 { 71 {
72diff --git a/ld/ldmain.c b/ld/ldmain.c 72diff --git a/ld/ldmain.c b/ld/ldmain.c
73index 06ac2c64fa8..5c38e8cd313 100644 73index e90c2021b33..01b306e58a1 100644
74--- a/ld/ldmain.c 74--- a/ld/ldmain.c
75+++ b/ld/ldmain.c 75+++ b/ld/ldmain.c
76@@ -69,6 +69,7 @@ char *program_name; 76@@ -69,6 +69,7 @@ char *program_name;
@@ -82,7 +82,7 @@ index 06ac2c64fa8..5c38e8cd313 100644
82 /* The canonical representation of ld_sysroot. */ 82 /* The canonical representation of ld_sysroot. */
83 char *ld_canon_sysroot; 83 char *ld_canon_sysroot;
84diff --git a/ld/ldmain.h b/ld/ldmain.h 84diff --git a/ld/ldmain.h b/ld/ldmain.h
85index dda124b96e8..ba06a7d7be2 100644 85index 0238aed0ebd..2dd00db13b3 100644
86--- a/ld/ldmain.h 86--- a/ld/ldmain.h
87+++ b/ld/ldmain.h 87+++ b/ld/ldmain.h
88@@ -23,6 +23,7 @@ 88@@ -23,6 +23,7 @@
diff --git a/meta/recipes-devtools/binutils/binutils/0004-Point-scripts-location-to-libdir.patch b/meta/recipes-devtools/binutils/binutils/0004-Point-scripts-location-to-libdir.patch
index 0747e40491..b2e9ef1ff8 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 d2d1281b0b76f96c64a2043772c52c85f58994d5 Mon Sep 17 00:00:00 2001 1From 1647f124bf0b48ca90189ecbd9ddd4b2c348ce03 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 ce0f7e7f85d..2e36ab4efc4 100644 15index 07801c2c3ac..a2bcffecf73 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) $(JANSSON_CFLAGS) $(ZSTD_CFLAGS) 18@@ -51,7 +51,7 @@ AM_CFLAGS = $(WARN_CFLAGS) $(ELF_CFLAGS) $(JANSSON_CFLAGS) $(ZSTD_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 ce0f7e7f85d..2e36ab4efc4 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 9d86aed12c6..c21c554e432 100644 28index 6329a12a0d6..15311048855 100644
29--- a/ld/Makefile.in 29--- a/ld/Makefile.in
30+++ b/ld/Makefile.in 30+++ b/ld/Makefile.in
31@@ -574,7 +574,7 @@ AM_CFLAGS = $(WARN_CFLAGS) $(ELF_CLFAGS) $(JANSSON_CFLAGS) $(ZSTD_CFLAGS) 31@@ -584,7 +584,7 @@ AM_CFLAGS = $(WARN_CFLAGS) $(ELF_CFLAGS) $(JANSSON_CFLAGS) $(ZSTD_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/0005-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch b/meta/recipes-devtools/binutils/binutils/0005-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch
index 9fe8b73d87..fbb4418e56 100644
--- a/meta/recipes-devtools/binutils/binutils/0005-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch
+++ b/meta/recipes-devtools/binutils/binutils/0005-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch
@@ -1,4 +1,4 @@
1From 5564cdf1433255a00acb427fb5b0656b772b2651 Mon Sep 17 00:00:00 2001 1From 1e09d056a802c0d12bdf31aceead3725b69bd626 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 2 Mar 2015 01:39:01 +0000 3Date: Mon, 2 Mar 2015 01:39:01 +0000
4Subject: [PATCH] don't let the distro compiler point to the wrong installation 4Subject: [PATCH] don't let the distro compiler point to the wrong installation
@@ -17,7 +17,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
17 1 file changed, 2 insertions(+), 1 deletion(-) 17 1 file changed, 2 insertions(+), 1 deletion(-)
18 18
19diff --git a/libiberty/Makefile.in b/libiberty/Makefile.in 19diff --git a/libiberty/Makefile.in b/libiberty/Makefile.in
20index f9fbba23e2c..93495e45d6f 100644 20index 85c4b6b6ef8..cb6e91c8f9b 100644
21--- a/libiberty/Makefile.in 21--- a/libiberty/Makefile.in
22+++ b/libiberty/Makefile.in 22+++ b/libiberty/Makefile.in
23@@ -385,7 +385,8 @@ install-strip: install 23@@ -385,7 +385,8 @@ install-strip: install
diff --git a/meta/recipes-devtools/binutils/binutils/0006-warn-for-uses-of-system-directories-when-cross-linki.patch b/meta/recipes-devtools/binutils/binutils/0006-warn-for-uses-of-system-directories-when-cross-linki.patch
index 9b09ec09cb..1dcea9fe28 100644
--- a/meta/recipes-devtools/binutils/binutils/0006-warn-for-uses-of-system-directories-when-cross-linki.patch
+++ b/meta/recipes-devtools/binutils/binutils/0006-warn-for-uses-of-system-directories-when-cross-linki.patch
@@ -1,4 +1,4 @@
1From 41b09c6a9d78a31db0f3c70d27c05475292bde7e Mon Sep 17 00:00:00 2001 1From 7a6074edd927273ae6924dc676ca2fdf127ce542 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 15 Jan 2016 06:31:09 +0000 3Date: Fri, 15 Jan 2016 06:31:09 +0000
4Subject: [PATCH] warn for uses of system directories when cross linking 4Subject: [PATCH] warn for uses of system directories when cross linking
@@ -63,10 +63,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
63 9 files changed, 87 insertions(+), 2 deletions(-) 63 9 files changed, 87 insertions(+), 2 deletions(-)
64 64
65diff --git a/ld/config.in b/ld/config.in 65diff --git a/ld/config.in b/ld/config.in
66index ad0dc6a106c..d21edaddce7 100644 66index 52d62f06ff0..b5944e7ba55 100644
67--- a/ld/config.in 67--- a/ld/config.in
68+++ b/ld/config.in 68+++ b/ld/config.in
69@@ -58,6 +58,9 @@ 69@@ -70,6 +70,9 @@
70 language is requested. */ 70 language is requested. */
71 #undef ENABLE_NLS 71 #undef ENABLE_NLS
72 72
@@ -77,10 +77,10 @@ index ad0dc6a106c..d21edaddce7 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 1503936432f..29896853a90 100755 80index add770f883c..867f3f62c88 100755
81--- a/ld/configure 81--- a/ld/configure
82+++ b/ld/configure 82+++ b/ld/configure
83@@ -839,6 +839,7 @@ with_lib_path 83@@ -844,6 +844,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 1503936432f..29896853a90 100755
88 enable_gold 88 enable_gold
89 enable_got 89 enable_got
90 enable_compressed_debug_sections 90 enable_compressed_debug_sections
91@@ -1521,6 +1522,8 @@ Optional Features: 91@@ -1534,6 +1535,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 1503936432f..29896853a90 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@@ -15483,6 +15486,19 @@ fi 100@@ -15566,6 +15569,19 @@ fi
101 101
102 102
103 103
@@ -118,7 +118,7 @@ index 1503936432f..29896853a90 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 77edac3258c..a74dac63038 100644 121index 4a11787ae71..104a531fb0f 100644
122--- a/ld/configure.ac 122--- a/ld/configure.ac
123+++ b/ld/configure.ac 123+++ b/ld/configure.ac
124@@ -103,6 +103,16 @@ AC_SUBST(use_sysroot) 124@@ -103,6 +103,16 @@ AC_SUBST(use_sysroot)
@@ -139,10 +139,10 @@ index 77edac3258c..a74dac63038 100644
139 dnl "install_as_default" is set to false if gold is the default linker. 139 dnl "install_as_default" is set to false if gold is the default linker.
140 dnl "installed_linker" is the installed BFD linker name. 140 dnl "installed_linker" is the installed BFD linker name.
141diff --git a/ld/ld.h b/ld/ld.h 141diff --git a/ld/ld.h b/ld/ld.h
142index a0f8a15c7a9..e3db345f3a5 100644 142index 54d9079678c..9f0163b2911 100644
143--- a/ld/ld.h 143--- a/ld/ld.h
144+++ b/ld/ld.h 144+++ b/ld/ld.h
145@@ -163,6 +163,14 @@ typedef struct 145@@ -166,6 +166,14 @@ typedef struct
146 in the linker script. */ 146 in the linker script. */
147 bool force_group_allocation; 147 bool force_group_allocation;
148 148
@@ -158,11 +158,11 @@ index a0f8a15c7a9..e3db345f3a5 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 aa8b1aa86eb..9bc4bc28823 100644 161index 4fda259a552..22685f5f1dd 100644
162--- a/ld/ld.texi 162--- a/ld/ld.texi
163+++ b/ld/ld.texi 163+++ b/ld/ld.texi
164@@ -3059,6 +3059,18 @@ creation of the metadata note, if one had been enabled by an earlier 164@@ -3119,6 +3119,18 @@ creation of the metadata note, if one had been enabled by an earlier
165 occurrence of the --package-metdata option. 165 occurrence of the --package-metadata option.
166 If the linker has been built with libjansson, then the JSON string 166 If the linker has been built with libjansson, then the JSON string
167 will be validated. 167 will be validated.
168+ 168+
@@ -181,7 +181,7 @@ index aa8b1aa86eb..9bc4bc28823 100644
181 181
182 @c man end 182 @c man end
183diff --git a/ld/ldfile.c b/ld/ldfile.c 183diff --git a/ld/ldfile.c b/ld/ldfile.c
184index df7c9cbd65e..0c965593225 100644 184index dc9875d8813..49d899ee49d 100644
185--- a/ld/ldfile.c 185--- a/ld/ldfile.c
186+++ b/ld/ldfile.c 186+++ b/ld/ldfile.c
187@@ -327,6 +327,23 @@ ldfile_add_library_path (const char *name, bool cmdline) 187@@ -327,6 +327,23 @@ ldfile_add_library_path (const char *name, bool cmdline)
@@ -209,7 +209,7 @@ index df7c9cbd65e..0c965593225 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 87cac02141d..d1a478fb827 100644 212index 161a9d4d8dc..757fe2f7650 100644
213--- a/ld/ldlex.h 213--- a/ld/ldlex.h
214+++ b/ld/ldlex.h 214+++ b/ld/ldlex.h
215@@ -147,6 +147,8 @@ enum option_values 215@@ -147,6 +147,8 @@ enum option_values
@@ -222,7 +222,7 @@ index 87cac02141d..d1a478fb827 100644
222 OPTION_PRINT_OUTPUT_FORMAT, 222 OPTION_PRINT_OUTPUT_FORMAT,
223 OPTION_PRINT_SYSROOT, 223 OPTION_PRINT_SYSROOT,
224diff --git a/ld/ldmain.c b/ld/ldmain.c 224diff --git a/ld/ldmain.c b/ld/ldmain.c
225index 5c38e8cd313..04eed320aca 100644 225index 01b306e58a1..eddefc24332 100644
226--- a/ld/ldmain.c 226--- a/ld/ldmain.c
227+++ b/ld/ldmain.c 227+++ b/ld/ldmain.c
228@@ -326,6 +326,8 @@ main (int argc, char **argv) 228@@ -326,6 +326,8 @@ main (int argc, char **argv)
@@ -253,10 +253,10 @@ index 5c38e8cd313..04eed320aca 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 fe8722313fe..1df7af3ccaa 100644 256index 099dff8ecde..e9939000b2e 100644
257--- a/ld/lexsup.c 257--- a/ld/lexsup.c
258+++ b/ld/lexsup.c 258+++ b/ld/lexsup.c
259@@ -629,6 +629,14 @@ static const struct ld_option ld_options[] = 259@@ -642,6 +642,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 fe8722313fe..1df7af3ccaa 100644
271 }; 271 };
272 272
273 #define OPTION_COUNT ARRAY_SIZE (ld_options) 273 #define OPTION_COUNT ARRAY_SIZE (ld_options)
274@@ -1787,6 +1795,13 @@ parse_args (unsigned argc, char **argv) 274@@ -1818,6 +1826,13 @@ parse_args (unsigned argc, char **argv)
275 275
276 case OPTION_PRINT_MAP_LOCALS: 276 case OPTION_PRINT_MAP_LOCALS:
277 config.print_map_locals = true; 277 config.print_map_locals = true;
diff --git a/meta/recipes-devtools/binutils/binutils/0007-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch b/meta/recipes-devtools/binutils/binutils/0007-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch
index d39979068e..7bf4ecabe1 100644
--- a/meta/recipes-devtools/binutils/binutils/0007-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch
+++ b/meta/recipes-devtools/binutils/binutils/0007-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch
@@ -1,4 +1,4 @@
1From 7f04e82ac2ded9a7f68dba9fabf1251d680bd0b9 Mon Sep 17 00:00:00 2001 1From 9784134b2670b284fb4d31360964a14d1e9a070d Mon Sep 17 00:00:00 2001
2From: Zhenhua Luo <zhenhua.luo@nxp.com> 2From: Zhenhua Luo <zhenhua.luo@nxp.com>
3Date: Sat, 11 Jun 2016 22:08:29 -0500 3Date: Sat, 11 Jun 2016 22:08:29 -0500
4Subject: [PATCH] fix the incorrect assembling for ppc wait mnemonic 4Subject: [PATCH] fix the incorrect assembling for ppc wait mnemonic
@@ -14,7 +14,7 @@ Signed-off-by: Zhenhua Luo <zhenhua.luo@nxp.com>
14 1 file changed, 1 insertion(+), 3 deletions(-) 14 1 file changed, 1 insertion(+), 3 deletions(-)
15 15
16diff --git a/opcodes/ppc-opc.c b/opcodes/ppc-opc.c 16diff --git a/opcodes/ppc-opc.c b/opcodes/ppc-opc.c
17index 37f1aeb780c..45774c7cf79 100644 17index e55bfe846cd..66b37e36e6f 100644
18--- a/opcodes/ppc-opc.c 18--- a/opcodes/ppc-opc.c
19+++ b/opcodes/ppc-opc.c 19+++ b/opcodes/ppc-opc.c
20@@ -7138,8 +7138,6 @@ const struct powerpc_opcode powerpc_opcodes[] = { 20@@ -7138,8 +7138,6 @@ const struct powerpc_opcode powerpc_opcodes[] = {
diff --git a/meta/recipes-devtools/binutils/binutils/0008-Use-libtool-2.4.patch b/meta/recipes-devtools/binutils/binutils/0008-Use-libtool-2.4.patch
index 432c431032..ebaa3c55b5 100644
--- a/meta/recipes-devtools/binutils/binutils/0008-Use-libtool-2.4.patch
+++ b/meta/recipes-devtools/binutils/binutils/0008-Use-libtool-2.4.patch
@@ -1,4 +1,4 @@
1From 8fc55f06d8950607f22e81f51c67dd4e6b4f6742 Mon Sep 17 00:00:00 2001 1From 952a0e386cb925190561ad6b33a2dedacec1056b 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
@@ -19,24 +19,24 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
19 gprof/Makefile.in | 3 + 19 gprof/Makefile.in | 3 +
20 gprof/configure | 1331 +++++++++--- 20 gprof/configure | 1331 +++++++++---
21 gprofng/Makefile.in | 2 + 21 gprofng/Makefile.in | 2 +
22 gprofng/configure | 1701 ++++++++++++---- 22 gprofng/configure | 1693 ++++++++++++----
23 gprofng/doc/Makefile.in | 2 + 23 gprofng/doc/Makefile.in | 2 +
24 gprofng/gp-display-html/Makefile.in | 2 + 24 gprofng/gp-display-html/Makefile.in | 2 +
25 gprofng/libcollector/Makefile.in | 2 + 25 gprofng/libcollector/Makefile.in | 2 +
26 gprofng/libcollector/configure | 1703 ++++++++++++---- 26 gprofng/libcollector/configure | 1693 ++++++++++++----
27 gprofng/src/Makefile.in | 2 + 27 gprofng/src/Makefile.in | 2 +
28 ld/Makefile.in | 3 + 28 ld/Makefile.in | 3 +
29 ld/configure | 1704 ++++++++++++---- 29 ld/configure | 1694 ++++++++++++----
30 libbacktrace/Makefile.in | 108 +- 30 libbacktrace/Makefile.in | 108 +-
31 libbacktrace/aclocal.m4 | 73 +- 31 libbacktrace/aclocal.m4 | 73 +-
32 libbacktrace/configure | 1441 +++++++++---- 32 libbacktrace/configure | 1441 +++++++++----
33 libctf/Makefile.in | 2 + 33 libctf/Makefile.in | 2 +
34 libctf/configure | 1330 +++++++++--- 34 libctf/configure | 1334 +++++++++---
35 libsframe/Makefile.in | 344 ++-- 35 libsframe/Makefile.in | 344 ++--
36 libsframe/aclocal.m4 | 220 +- 36 libsframe/aclocal.m4 | 220 +-
37 libsframe/configure | 1553 ++++++++++---- 37 libsframe/configure | 1553 ++++++++++----
38 libtool.m4 | 1093 ++++++---- 38 libtool.m4 | 1085 ++++++----
39 ltmain.sh | 2925 ++++++++++++++++++--------- 39 ltmain.sh | 2921 ++++++++++++++++++---------
40 ltoptions.m4 | 2 +- 40 ltoptions.m4 | 2 +-
41 ltversion.m4 | 12 +- 41 ltversion.m4 | 12 +-
42 lt~obsolete.m4 | 2 +- 42 lt~obsolete.m4 | 2 +-
@@ -44,13 +44,13 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
44 opcodes/configure | 1331 +++++++++--- 44 opcodes/configure | 1331 +++++++++---
45 zlib/Makefile.in | 3 + 45 zlib/Makefile.in | 3 +
46 zlib/configure | 1331 +++++++++--- 46 zlib/configure | 1331 +++++++++---
47 35 files changed, 16108 insertions(+), 6126 deletions(-) 47 35 files changed, 16094 insertions(+), 6104 deletions(-)
48 48
49diff --git a/bfd/Makefile.in b/bfd/Makefile.in 49diff --git a/bfd/Makefile.in b/bfd/Makefile.in
50index 4edfedee924..ed7257f2e96 100644 50index faaa0c424b8..5371e093163 100644
51--- a/bfd/Makefile.in 51--- a/bfd/Makefile.in
52+++ b/bfd/Makefile.in 52+++ b/bfd/Makefile.in
53@@ -334,6 +334,7 @@ DATADIRNAME = @DATADIRNAME@ 53@@ -340,6 +340,7 @@ DATADIRNAME = @DATADIRNAME@
54 DEBUGDIR = @DEBUGDIR@ 54 DEBUGDIR = @DEBUGDIR@
55 DEFS = @DEFS@ 55 DEFS = @DEFS@
56 DEPDIR = @DEPDIR@ 56 DEPDIR = @DEPDIR@
@@ -58,7 +58,7 @@ index 4edfedee924..ed7257f2e96 100644
58 DSYMUTIL = @DSYMUTIL@ 58 DSYMUTIL = @DSYMUTIL@
59 DUMPBIN = @DUMPBIN@ 59 DUMPBIN = @DUMPBIN@
60 ECHO_C = @ECHO_C@ 60 ECHO_C = @ECHO_C@
61@@ -368,6 +369,7 @@ LN_S = @LN_S@ 61@@ -379,6 +380,7 @@ LTLIBINTL = @LTLIBINTL@
62 LTLIBOBJS = @LTLIBOBJS@ 62 LTLIBOBJS = @LTLIBOBJS@
63 MAINT = @MAINT@ 63 MAINT = @MAINT@
64 MAKEINFO = @MAKEINFO@ 64 MAKEINFO = @MAKEINFO@
@@ -66,7 +66,7 @@ index 4edfedee924..ed7257f2e96 100644
66 MKDIR_P = @MKDIR_P@ 66 MKDIR_P = @MKDIR_P@
67 MKINSTALLDIRS = @MKINSTALLDIRS@ 67 MKINSTALLDIRS = @MKINSTALLDIRS@
68 MSGFMT = @MSGFMT@ 68 MSGFMT = @MSGFMT@
69@@ -414,6 +416,7 @@ abs_builddir = @abs_builddir@ 69@@ -425,6 +427,7 @@ abs_builddir = @abs_builddir@
70 abs_srcdir = @abs_srcdir@ 70 abs_srcdir = @abs_srcdir@
71 abs_top_builddir = @abs_top_builddir@ 71 abs_top_builddir = @abs_top_builddir@
72 abs_top_srcdir = @abs_top_srcdir@ 72 abs_top_srcdir = @abs_top_srcdir@
@@ -75,10 +75,10 @@ index 4edfedee924..ed7257f2e96 100644
75 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ 75 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
76 all_backends = @all_backends@ 76 all_backends = @all_backends@
77diff --git a/bfd/configure b/bfd/configure 77diff --git a/bfd/configure b/bfd/configure
78index abc24a93028..f4c8ea4e54b 100755 78index 0a6e96c5b3b..970732f338a 100755
79--- a/bfd/configure 79--- a/bfd/configure
80+++ b/bfd/configure 80+++ b/bfd/configure
81@@ -706,6 +706,9 @@ OTOOL 81@@ -712,6 +712,9 @@ OTOOL
82 LIPO 82 LIPO
83 NMEDIT 83 NMEDIT
84 DSYMUTIL 84 DSYMUTIL
@@ -88,7 +88,7 @@ index abc24a93028..f4c8ea4e54b 100755
88 OBJDUMP 88 OBJDUMP
89 LN_S 89 LN_S
90 NM 90 NM
91@@ -824,6 +827,7 @@ enable_static 91@@ -830,6 +833,7 @@ enable_static
92 with_pic 92 with_pic
93 enable_fast_install 93 enable_fast_install
94 with_gnu_ld 94 with_gnu_ld
@@ -96,7 +96,7 @@ index abc24a93028..f4c8ea4e54b 100755
96 enable_libtool_lock 96 enable_libtool_lock
97 enable_plugins 97 enable_plugins
98 enable_largefile 98 enable_largefile
99@@ -1514,6 +1518,8 @@ Optional Packages: 99@@ -1526,6 +1530,8 @@ Optional Packages:
100 --with-pic try to use only PIC/non-PIC objects [default=use 100 --with-pic try to use only PIC/non-PIC objects [default=use
101 both] 101 both]
102 --with-gnu-ld assume the C compiler uses GNU ld [default=no] 102 --with-gnu-ld assume the C compiler uses GNU ld [default=no]
@@ -105,7 +105,7 @@ index abc24a93028..f4c8ea4e54b 100755
105 --with-mmap try using mmap for BFD input files if available 105 --with-mmap try using mmap for BFD input files if available
106 --with-separate-debug-dir=DIR 106 --with-separate-debug-dir=DIR
107 Look for global separate debug info in DIR 107 Look for global separate debug info in DIR
108@@ -5043,8 +5049,8 @@ esac 108@@ -5063,8 +5069,8 @@ esac
109 109
110 110
111 111
@@ -116,7 +116,7 @@ index abc24a93028..f4c8ea4e54b 100755
116 116
117 117
118 118
119@@ -5084,7 +5090,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO 119@@ -5104,7 +5110,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
120 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 120 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
121 $as_echo_n "checking how to print strings... " >&6; } 121 $as_echo_n "checking how to print strings... " >&6; }
122 # Test print first, because it will be a builtin if present. 122 # Test print first, because it will be a builtin if present.
@@ -125,7 +125,7 @@ index abc24a93028..f4c8ea4e54b 100755
125 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then 125 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
126 ECHO='print -r --' 126 ECHO='print -r --'
127 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then 127 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
128@@ -5777,8 +5783,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; 128@@ -5797,8 +5803,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6;
129 # Try some XSI features 129 # Try some XSI features
130 xsi_shell=no 130 xsi_shell=no
131 ( _lt_dummy="a/b/c" 131 ( _lt_dummy="a/b/c"
@@ -136,7 +136,7 @@ index abc24a93028..f4c8ea4e54b 100755
136 && eval 'test $(( 1 + 1 )) -eq 2 \ 136 && eval 'test $(( 1 + 1 )) -eq 2 \
137 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ 137 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
138 && xsi_shell=yes 138 && xsi_shell=yes
139@@ -5827,6 +5833,80 @@ esac 139@@ -5847,6 +5853,80 @@ esac
140 140
141 141
142 142
@@ -217,7 +217,7 @@ index abc24a93028..f4c8ea4e54b 100755
217 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 217 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
218 $as_echo_n "checking for $LD option to reload object files... " >&6; } 218 $as_echo_n "checking for $LD option to reload object files... " >&6; }
219 if ${lt_cv_ld_reload_flag+:} false; then : 219 if ${lt_cv_ld_reload_flag+:} false; then :
220@@ -5843,6 +5923,11 @@ case $reload_flag in 220@@ -5863,6 +5943,11 @@ case $reload_flag in
221 esac 221 esac
222 reload_cmds='$LD$reload_flag -o $output$reload_objs' 222 reload_cmds='$LD$reload_flag -o $output$reload_objs'
223 case $host_os in 223 case $host_os in
@@ -229,7 +229,7 @@ index abc24a93028..f4c8ea4e54b 100755
229 darwin*) 229 darwin*)
230 if test "$GCC" = yes; then 230 if test "$GCC" = yes; then
231 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' 231 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
232@@ -6011,7 +6096,8 @@ mingw* | pw32*) 232@@ -6031,7 +6116,8 @@ mingw* | pw32*)
233 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' 233 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
234 lt_cv_file_magic_cmd='func_win32_libid' 234 lt_cv_file_magic_cmd='func_win32_libid'
235 else 235 else
@@ -239,7 +239,7 @@ index abc24a93028..f4c8ea4e54b 100755
239 lt_cv_file_magic_cmd='$OBJDUMP -f' 239 lt_cv_file_magic_cmd='$OBJDUMP -f'
240 fi 240 fi
241 ;; 241 ;;
242@@ -6165,6 +6251,21 @@ esac 242@@ -6190,6 +6276,21 @@ esac
243 fi 243 fi
244 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 244 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
245 $as_echo "$lt_cv_deplibs_check_method" >&6; } 245 $as_echo "$lt_cv_deplibs_check_method" >&6; }
@@ -261,7 +261,7 @@ index abc24a93028..f4c8ea4e54b 100755
261 file_magic_cmd=$lt_cv_file_magic_cmd 261 file_magic_cmd=$lt_cv_file_magic_cmd
262 deplibs_check_method=$lt_cv_deplibs_check_method 262 deplibs_check_method=$lt_cv_deplibs_check_method
263 test -z "$deplibs_check_method" && deplibs_check_method=unknown 263 test -z "$deplibs_check_method" && deplibs_check_method=unknown
264@@ -6180,6 +6281,157 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown 264@@ -6205,6 +6306,157 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
265 265
266 266
267 267
@@ -419,7 +419,7 @@ index abc24a93028..f4c8ea4e54b 100755
419 plugin_option= 419 plugin_option=
420 plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll" 420 plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll"
421 for plugin in $plugin_names; do 421 for plugin in $plugin_names; do
422@@ -6194,8 +6446,10 @@ for plugin in $plugin_names; do 422@@ -6219,8 +6471,10 @@ for plugin in $plugin_names; do
423 done 423 done
424 424
425 if test -n "$ac_tool_prefix"; then 425 if test -n "$ac_tool_prefix"; then
@@ -432,7 +432,7 @@ index abc24a93028..f4c8ea4e54b 100755
432 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 432 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
433 $as_echo_n "checking for $ac_word... " >&6; } 433 $as_echo_n "checking for $ac_word... " >&6; }
434 if ${ac_cv_prog_AR+:} false; then : 434 if ${ac_cv_prog_AR+:} false; then :
435@@ -6211,7 +6465,7 @@ do 435@@ -6236,7 +6490,7 @@ do
436 test -z "$as_dir" && as_dir=. 436 test -z "$as_dir" && as_dir=.
437 for ac_exec_ext in '' $ac_executable_extensions; do 437 for ac_exec_ext in '' $ac_executable_extensions; do
438 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 438 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
@@ -441,7 +441,7 @@ index abc24a93028..f4c8ea4e54b 100755
441 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 441 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
442 break 2 442 break 2
443 fi 443 fi
444@@ -6231,11 +6485,15 @@ $as_echo "no" >&6; } 444@@ -6256,11 +6510,15 @@ $as_echo "no" >&6; }
445 fi 445 fi
446 446
447 447
@@ -460,7 +460,7 @@ index abc24a93028..f4c8ea4e54b 100755
460 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 460 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
461 $as_echo_n "checking for $ac_word... " >&6; } 461 $as_echo_n "checking for $ac_word... " >&6; }
462 if ${ac_cv_prog_ac_ct_AR+:} false; then : 462 if ${ac_cv_prog_ac_ct_AR+:} false; then :
463@@ -6251,7 +6509,7 @@ do 463@@ -6276,7 +6534,7 @@ do
464 test -z "$as_dir" && as_dir=. 464 test -z "$as_dir" && as_dir=.
465 for ac_exec_ext in '' $ac_executable_extensions; do 465 for ac_exec_ext in '' $ac_executable_extensions; do
466 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 466 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
@@ -469,7 +469,7 @@ index abc24a93028..f4c8ea4e54b 100755
469 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 469 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
470 break 2 470 break 2
471 fi 471 fi
472@@ -6270,6 +6528,10 @@ else 472@@ -6295,6 +6553,10 @@ else
473 $as_echo "no" >&6; } 473 $as_echo "no" >&6; }
474 fi 474 fi
475 475
@@ -480,7 +480,7 @@ index abc24a93028..f4c8ea4e54b 100755
480 if test "x$ac_ct_AR" = x; then 480 if test "x$ac_ct_AR" = x; then
481 AR="false" 481 AR="false"
482 else 482 else
483@@ -6281,25 +6543,20 @@ ac_tool_warned=yes ;; 483@@ -6306,25 +6568,20 @@ ac_tool_warned=yes ;;
484 esac 484 esac
485 AR=$ac_ct_AR 485 AR=$ac_ct_AR
486 fi 486 fi
@@ -516,7 +516,7 @@ index abc24a93028..f4c8ea4e54b 100755
516 516
517 517
518 518
519@@ -6310,6 +6567,63 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru 519@@ -6335,6 +6592,63 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru
520 520
521 521
522 522
@@ -580,7 +580,7 @@ index abc24a93028..f4c8ea4e54b 100755
580 580
581 if test -n "$ac_tool_prefix"; then 581 if test -n "$ac_tool_prefix"; then
582 # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. 582 # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
583@@ -6650,8 +6964,8 @@ esac 583@@ -6675,8 +6989,8 @@ esac
584 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" 584 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
585 585
586 # Transform an extracted symbol line into symbol name and symbol address 586 # Transform an extracted symbol line into symbol name and symbol address
@@ -591,7 +591,7 @@ index abc24a93028..f4c8ea4e54b 100755
591 591
592 # Handle CRLF in mingw tool chain 592 # Handle CRLF in mingw tool chain
593 opt_cr= 593 opt_cr=
594@@ -6687,6 +7001,7 @@ for ac_symprfx in "" "_"; do 594@@ -6712,6 +7026,7 @@ for ac_symprfx in "" "_"; do
595 else 595 else
596 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" 596 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
597 fi 597 fi
@@ -599,7 +599,7 @@ index abc24a93028..f4c8ea4e54b 100755
599 599
600 # Check to see that the pipe works correctly. 600 # Check to see that the pipe works correctly.
601 pipe_works=no 601 pipe_works=no
602@@ -6728,6 +7043,18 @@ _LT_EOF 602@@ -6753,6 +7068,18 @@ _LT_EOF
603 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then 603 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
604 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then 604 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
605 cat <<_LT_EOF > conftest.$ac_ext 605 cat <<_LT_EOF > conftest.$ac_ext
@@ -618,7 +618,7 @@ index abc24a93028..f4c8ea4e54b 100755
618 #ifdef __cplusplus 618 #ifdef __cplusplus
619 extern "C" { 619 extern "C" {
620 #endif 620 #endif
621@@ -6739,7 +7066,7 @@ _LT_EOF 621@@ -6764,7 +7091,7 @@ _LT_EOF
622 cat <<_LT_EOF >> conftest.$ac_ext 622 cat <<_LT_EOF >> conftest.$ac_ext
623 623
624 /* The mapping between symbol names and symbols. */ 624 /* The mapping between symbol names and symbols. */
@@ -627,7 +627,7 @@ index abc24a93028..f4c8ea4e54b 100755
627 const char *name; 627 const char *name;
628 void *address; 628 void *address;
629 } 629 }
630@@ -6765,8 +7092,8 @@ static const void *lt_preloaded_setup() { 630@@ -6790,8 +7117,8 @@ static const void *lt_preloaded_setup() {
631 _LT_EOF 631 _LT_EOF
632 # Now try linking the two files. 632 # Now try linking the two files.
633 mv conftest.$ac_objext conftstm.$ac_objext 633 mv conftest.$ac_objext conftstm.$ac_objext
@@ -638,7 +638,7 @@ index abc24a93028..f4c8ea4e54b 100755
638 LIBS="conftstm.$ac_objext" 638 LIBS="conftstm.$ac_objext"
639 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" 639 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
640 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 640 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
641@@ -6776,8 +7103,8 @@ _LT_EOF 641@@ -6801,8 +7128,8 @@ _LT_EOF
642 test $ac_status = 0; } && test -s conftest${ac_exeext}; then 642 test $ac_status = 0; } && test -s conftest${ac_exeext}; then
643 pipe_works=yes 643 pipe_works=yes
644 fi 644 fi
@@ -649,7 +649,7 @@ index abc24a93028..f4c8ea4e54b 100755
649 else 649 else
650 echo "cannot find nm_test_func in $nlist" >&5 650 echo "cannot find nm_test_func in $nlist" >&5
651 fi 651 fi
652@@ -6814,6 +7141,14 @@ else 652@@ -6839,6 +7166,14 @@ else
653 $as_echo "ok" >&6; } 653 $as_echo "ok" >&6; }
654 fi 654 fi
655 655
@@ -664,7 +664,7 @@ index abc24a93028..f4c8ea4e54b 100755
664 664
665 665
666 666
667@@ -6832,6 +7167,47 @@ fi 667@@ -6857,6 +7192,47 @@ fi
668 668
669 669
670 670
@@ -712,7 +712,7 @@ index abc24a93028..f4c8ea4e54b 100755
712 712
713 713
714 714
715@@ -7041,6 +7417,123 @@ esac 715@@ -7066,6 +7442,123 @@ esac
716 716
717 need_locks="$enable_libtool_lock" 717 need_locks="$enable_libtool_lock"
718 718
@@ -836,7 +836,7 @@ index abc24a93028..f4c8ea4e54b 100755
836 836
837 case $host_os in 837 case $host_os in
838 rhapsody* | darwin*) 838 rhapsody* | darwin*)
839@@ -7604,6 +8097,8 @@ _LT_EOF 839@@ -7629,6 +8122,8 @@ _LT_EOF
840 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 840 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
841 echo "$AR cru libconftest.a conftest.o" >&5 841 echo "$AR cru libconftest.a conftest.o" >&5
842 $AR cru libconftest.a conftest.o 2>&5 842 $AR cru libconftest.a conftest.o 2>&5
@@ -845,7 +845,7 @@ index abc24a93028..f4c8ea4e54b 100755
845 cat > conftest.c << _LT_EOF 845 cat > conftest.c << _LT_EOF
846 int main() { return 0;} 846 int main() { return 0;}
847 _LT_EOF 847 _LT_EOF
848@@ -8155,8 +8650,6 @@ fi 848@@ -8182,8 +8677,6 @@ fi
849 lt_prog_compiler_pic= 849 lt_prog_compiler_pic=
850 lt_prog_compiler_static= 850 lt_prog_compiler_static=
851 851
@@ -854,7 +854,7 @@ index abc24a93028..f4c8ea4e54b 100755
854 854
855 if test "$GCC" = yes; then 855 if test "$GCC" = yes; then
856 lt_prog_compiler_wl='-Wl,' 856 lt_prog_compiler_wl='-Wl,'
857@@ -8322,6 +8815,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 857@@ -8349,6 +8842,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
858 lt_prog_compiler_pic='--shared' 858 lt_prog_compiler_pic='--shared'
859 lt_prog_compiler_static='--static' 859 lt_prog_compiler_static='--static'
860 ;; 860 ;;
@@ -867,7 +867,7 @@ index abc24a93028..f4c8ea4e54b 100755
867 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) 867 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
868 # Portland Group compilers (*not* the Pentium gcc compiler, 868 # Portland Group compilers (*not* the Pentium gcc compiler,
869 # which looks to be a dead project) 869 # which looks to be a dead project)
870@@ -8384,7 +8883,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 870@@ -8411,7 +8910,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
871 lt_prog_compiler_pic='-KPIC' 871 lt_prog_compiler_pic='-KPIC'
872 lt_prog_compiler_static='-Bstatic' 872 lt_prog_compiler_static='-Bstatic'
873 case $cc_basename in 873 case $cc_basename in
@@ -876,7 +876,7 @@ index abc24a93028..f4c8ea4e54b 100755
876 lt_prog_compiler_wl='-Qoption ld ';; 876 lt_prog_compiler_wl='-Qoption ld ';;
877 *) 877 *)
878 lt_prog_compiler_wl='-Wl,';; 878 lt_prog_compiler_wl='-Wl,';;
879@@ -8441,13 +8940,17 @@ case $host_os in 879@@ -8468,13 +8967,17 @@ case $host_os in
880 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" 880 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
881 ;; 881 ;;
882 esac 882 esac
@@ -900,7 +900,7 @@ index abc24a93028..f4c8ea4e54b 100755
900 900
901 # 901 #
902 # Check to make sure the PIC flag actually works. 902 # Check to make sure the PIC flag actually works.
903@@ -8508,6 +9011,11 @@ fi 903@@ -8535,6 +9038,11 @@ fi
904 904
905 905
906 906
@@ -912,7 +912,7 @@ index abc24a93028..f4c8ea4e54b 100755
912 # 912 #
913 # Check to make sure the static flag actually works. 913 # Check to make sure the static flag actually works.
914 # 914 #
915@@ -8858,7 +9366,8 @@ _LT_EOF 915@@ -8885,7 +9393,8 @@ _LT_EOF
916 allow_undefined_flag=unsupported 916 allow_undefined_flag=unsupported
917 always_export_symbols=no 917 always_export_symbols=no
918 enable_shared_with_static_runtimes=yes 918 enable_shared_with_static_runtimes=yes
@@ -922,7 +922,7 @@ index abc24a93028..f4c8ea4e54b 100755
922 922
923 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then 923 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
924 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' 924 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
925@@ -8957,12 +9466,12 @@ _LT_EOF 925@@ -8984,12 +9493,12 @@ _LT_EOF
926 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' 926 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
927 hardcode_libdir_flag_spec= 927 hardcode_libdir_flag_spec=
928 hardcode_libdir_flag_spec_ld='-rpath $libdir' 928 hardcode_libdir_flag_spec_ld='-rpath $libdir'
@@ -937,7 +937,7 @@ index abc24a93028..f4c8ea4e54b 100755
937 fi 937 fi
938 ;; 938 ;;
939 esac 939 esac
940@@ -8976,8 +9485,8 @@ _LT_EOF 940@@ -9003,8 +9512,8 @@ _LT_EOF
941 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' 941 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
942 wlarc= 942 wlarc=
943 else 943 else
@@ -948,7 +948,7 @@ index abc24a93028..f4c8ea4e54b 100755
948 fi 948 fi
949 ;; 949 ;;
950 950
951@@ -8995,8 +9504,8 @@ _LT_EOF 951@@ -9022,8 +9531,8 @@ _LT_EOF
952 952
953 _LT_EOF 953 _LT_EOF
954 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 954 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -959,7 +959,7 @@ index abc24a93028..f4c8ea4e54b 100755
959 else 959 else
960 ld_shlibs=no 960 ld_shlibs=no
961 fi 961 fi
962@@ -9042,8 +9551,8 @@ _LT_EOF 962@@ -9069,8 +9578,8 @@ _LT_EOF
963 963
964 *) 964 *)
965 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 965 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -970,7 +970,7 @@ index abc24a93028..f4c8ea4e54b 100755
970 else 970 else
971 ld_shlibs=no 971 ld_shlibs=no
972 fi 972 fi
973@@ -9173,7 +9682,13 @@ _LT_EOF 973@@ -9200,7 +9709,13 @@ _LT_EOF
974 allow_undefined_flag='-berok' 974 allow_undefined_flag='-berok'
975 # Determine the default libpath from the value encoded in an 975 # Determine the default libpath from the value encoded in an
976 # empty executable. 976 # empty executable.
@@ -985,7 +985,7 @@ index abc24a93028..f4c8ea4e54b 100755
985 /* end confdefs.h. */ 985 /* end confdefs.h. */
986 986
987 int 987 int
988@@ -9186,22 +9701,29 @@ main () 988@@ -9213,22 +9728,29 @@ main ()
989 _ACEOF 989 _ACEOF
990 if ac_fn_c_try_link "$LINENO"; then : 990 if ac_fn_c_try_link "$LINENO"; then :
991 991
@@ -1028,7 +1028,7 @@ index abc24a93028..f4c8ea4e54b 100755
1028 1028
1029 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 1029 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
1030 archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" 1030 archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
1031@@ -9213,7 +9735,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 1031@@ -9240,7 +9762,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
1032 else 1032 else
1033 # Determine the default libpath from the value encoded in an 1033 # Determine the default libpath from the value encoded in an
1034 # empty executable. 1034 # empty executable.
@@ -1043,7 +1043,7 @@ index abc24a93028..f4c8ea4e54b 100755
1043 /* end confdefs.h. */ 1043 /* end confdefs.h. */
1044 1044
1045 int 1045 int
1046@@ -9226,22 +9754,29 @@ main () 1046@@ -9253,22 +9781,29 @@ main ()
1047 _ACEOF 1047 _ACEOF
1048 if ac_fn_c_try_link "$LINENO"; then : 1048 if ac_fn_c_try_link "$LINENO"; then :
1049 1049
@@ -1086,7 +1086,7 @@ index abc24a93028..f4c8ea4e54b 100755
1086 1086
1087 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 1087 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
1088 # Warning - without using the other run time loading flags, 1088 # Warning - without using the other run time loading flags,
1089@@ -9286,20 +9821,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 1089@@ -9313,20 +9848,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
1090 # Microsoft Visual C++. 1090 # Microsoft Visual C++.
1091 # hardcode_libdir_flag_spec is actually meaningless, as there is 1091 # hardcode_libdir_flag_spec is actually meaningless, as there is
1092 # no search path for DLLs. 1092 # no search path for DLLs.
@@ -1164,7 +1164,7 @@ index abc24a93028..f4c8ea4e54b 100755
1164 ;; 1164 ;;
1165 1165
1166 darwin* | rhapsody*) 1166 darwin* | rhapsody*)
1167@@ -9360,7 +9938,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 1167@@ -9387,7 +9965,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
1168 1168
1169 # FreeBSD 3 and greater uses gcc -shared to do shared libraries. 1169 # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
1170 freebsd* | dragonfly*) 1170 freebsd* | dragonfly*)
@@ -1173,7 +1173,7 @@ index abc24a93028..f4c8ea4e54b 100755
1173 hardcode_libdir_flag_spec='-R$libdir' 1173 hardcode_libdir_flag_spec='-R$libdir'
1174 hardcode_direct=yes 1174 hardcode_direct=yes
1175 hardcode_shlibpath_var=no 1175 hardcode_shlibpath_var=no
1176@@ -9368,7 +9946,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 1176@@ -9395,7 +9973,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
1177 1177
1178 hpux9*) 1178 hpux9*)
1179 if test "$GCC" = yes; then 1179 if test "$GCC" = yes; then
@@ -1182,7 +1182,7 @@ index abc24a93028..f4c8ea4e54b 100755
1182 else 1182 else
1183 archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' 1183 archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
1184 fi 1184 fi
1185@@ -9384,7 +9962,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 1185@@ -9411,7 +9989,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
1186 1186
1187 hpux10*) 1187 hpux10*)
1188 if test "$GCC" = yes && test "$with_gnu_ld" = no; then 1188 if test "$GCC" = yes && test "$with_gnu_ld" = no; then
@@ -1191,8 +1191,8 @@ index abc24a93028..f4c8ea4e54b 100755
1191 else 1191 else
1192 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' 1192 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
1193 fi 1193 fi
1194@@ -9408,10 +9986,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 1194@@ -9435,10 +10013,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
1195 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' 1195 archive_cmds='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
1196 ;; 1196 ;;
1197 ia64*) 1197 ia64*)
1198- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' 1198- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
@@ -1204,7 +1204,7 @@ index abc24a93028..f4c8ea4e54b 100755
1204 ;; 1204 ;;
1205 esac 1205 esac
1206 else 1206 else
1207@@ -9490,23 +10068,36 @@ fi 1207@@ -9517,23 +10095,36 @@ fi
1208 1208
1209 irix5* | irix6* | nonstopux*) 1209 irix5* | irix6* | nonstopux*)
1210 if test "$GCC" = yes; then 1210 if test "$GCC" = yes; then
@@ -1249,7 +1249,7 @@ index abc24a93028..f4c8ea4e54b 100755
1249 else 1249 else
1250 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' 1250 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
1251 archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' 1251 archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
1252@@ -9591,7 +10182,7 @@ rm -f core conftest.err conftest.$ac_objext \ 1252@@ -9618,7 +10209,7 @@ rm -f core conftest.err conftest.$ac_objext \
1253 osf4* | osf5*) # as osf3* with the addition of -msym flag 1253 osf4* | osf5*) # as osf3* with the addition of -msym flag
1254 if test "$GCC" = yes; then 1254 if test "$GCC" = yes; then
1255 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' 1255 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
@@ -1258,7 +1258,7 @@ index abc24a93028..f4c8ea4e54b 100755
1258 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' 1258 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
1259 else 1259 else
1260 allow_undefined_flag=' -expect_unresolved \*' 1260 allow_undefined_flag=' -expect_unresolved \*'
1261@@ -9610,9 +10201,9 @@ rm -f core conftest.err conftest.$ac_objext \ 1261@@ -9637,9 +10228,9 @@ rm -f core conftest.err conftest.$ac_objext \
1262 no_undefined_flag=' -z defs' 1262 no_undefined_flag=' -z defs'
1263 if test "$GCC" = yes; then 1263 if test "$GCC" = yes; then
1264 wlarc='${wl}' 1264 wlarc='${wl}'
@@ -1270,7 +1270,7 @@ index abc24a93028..f4c8ea4e54b 100755
1270 else 1270 else
1271 case `$CC -V 2>&1` in 1271 case `$CC -V 2>&1` in
1272 *"Compilers 5.0"*) 1272 *"Compilers 5.0"*)
1273@@ -10188,8 +10779,9 @@ cygwin* | mingw* | pw32* | cegcc*) 1273@@ -10215,8 +10806,9 @@ cygwin* | mingw* | pw32* | cegcc*)
1274 need_version=no 1274 need_version=no
1275 need_lib_prefix=no 1275 need_lib_prefix=no
1276 1276
@@ -1282,7 +1282,7 @@ index abc24a93028..f4c8ea4e54b 100755
1282 library_names_spec='$libname.dll.a' 1282 library_names_spec='$libname.dll.a'
1283 # DLL is installed to $(libdir)/../bin by postinstall_cmds 1283 # DLL is installed to $(libdir)/../bin by postinstall_cmds
1284 postinstall_cmds='base_file=`basename \${file}`~ 1284 postinstall_cmds='base_file=`basename \${file}`~
1285@@ -10222,13 +10814,71 @@ cygwin* | mingw* | pw32* | cegcc*) 1285@@ -10249,13 +10841,71 @@ cygwin* | mingw* | pw32* | cegcc*)
1286 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' 1286 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
1287 ;; 1287 ;;
1288 esac 1288 esac
@@ -1355,16 +1355,16 @@ index abc24a93028..f4c8ea4e54b 100755
1355 # FIXME: first we should search . and the directory the executable is in 1355 # FIXME: first we should search . and the directory the executable is in
1356 shlibpath_var=PATH 1356 shlibpath_var=PATH
1357 ;; 1357 ;;
1358@@ -11106,7 +11756,7 @@ else 1358@@ -11157,7 +11807,7 @@ else
1359 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 1359 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
1360 lt_status=$lt_dlunknown 1360 lt_status=$lt_dlunknown
1361 cat > conftest.$ac_ext <<_LT_EOF 1361 cat > conftest.$ac_ext <<_LT_EOF
1362-#line 11109 "configure" 1362-#line 11160 "configure"
1363+#line $LINENO "configure" 1363+#line $LINENO "configure"
1364 #include "confdefs.h" 1364 #include "confdefs.h"
1365 1365
1366 #if HAVE_DLFCN_H 1366 #if HAVE_DLFCN_H
1367@@ -11150,10 +11800,10 @@ else 1367@@ -11201,10 +11851,10 @@ else
1368 /* When -fvisbility=hidden is used, assume the code has been annotated 1368 /* When -fvisbility=hidden is used, assume the code has been annotated
1369 correspondingly for the symbols needed. */ 1369 correspondingly for the symbols needed. */
1370 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 1370 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
@@ -1377,16 +1377,16 @@ index abc24a93028..f4c8ea4e54b 100755
1377 int main () 1377 int main ()
1378 { 1378 {
1379 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 1379 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
1380@@ -11212,7 +11862,7 @@ else 1380@@ -11263,7 +11913,7 @@ else
1381 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 1381 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
1382 lt_status=$lt_dlunknown 1382 lt_status=$lt_dlunknown
1383 cat > conftest.$ac_ext <<_LT_EOF 1383 cat > conftest.$ac_ext <<_LT_EOF
1384-#line 11215 "configure" 1384-#line 11266 "configure"
1385+#line $LINENO "configure" 1385+#line $LINENO "configure"
1386 #include "confdefs.h" 1386 #include "confdefs.h"
1387 1387
1388 #if HAVE_DLFCN_H 1388 #if HAVE_DLFCN_H
1389@@ -11256,10 +11906,10 @@ else 1389@@ -11307,10 +11957,10 @@ else
1390 /* When -fvisbility=hidden is used, assume the code has been annotated 1390 /* When -fvisbility=hidden is used, assume the code has been annotated
1391 correspondingly for the symbols needed. */ 1391 correspondingly for the symbols needed. */
1392 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 1392 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
@@ -1399,7 +1399,7 @@ index abc24a93028..f4c8ea4e54b 100755
1399 int main () 1399 int main ()
1400 { 1400 {
1401 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 1401 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
1402@@ -13707,7 +14357,7 @@ SHARED_LDFLAGS= 1402@@ -15691,7 +16341,7 @@ SHARED_LDFLAGS=
1403 if test "$enable_shared" = "yes"; then 1403 if test "$enable_shared" = "yes"; then
1404 x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'` 1404 x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'`
1405 if test -n "$x"; then 1405 if test -n "$x"; then
@@ -1408,7 +1408,7 @@ index abc24a93028..f4c8ea4e54b 100755
1408 fi 1408 fi
1409 fi 1409 fi
1410 1410
1411@@ -16326,13 +16976,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' 1411@@ -18313,13 +18963,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
1412 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' 1412 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
1413 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' 1413 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
1414 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' 1414 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
@@ -1429,7 +1429,7 @@ index abc24a93028..f4c8ea4e54b 100755
1429 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' 1429 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
1430 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' 1430 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
1431 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' 1431 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
1432@@ -16347,14 +17004,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de 1432@@ -18334,14 +18991,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de
1433 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' 1433 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
1434 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' 1434 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
1435 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`' 1435 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`'
@@ -1448,7 +1448,7 @@ index abc24a93028..f4c8ea4e54b 100755
1448 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' 1448 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
1449 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' 1449 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
1450 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' 1450 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
1451@@ -16387,12 +17047,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q 1451@@ -18374,12 +19034,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q
1452 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' 1452 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
1453 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' 1453 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
1454 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' 1454 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
@@ -1462,7 +1462,7 @@ index abc24a93028..f4c8ea4e54b 100755
1462 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' 1462 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
1463 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' 1463 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
1464 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' 1464 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
1465@@ -16447,8 +17107,13 @@ reload_flag \ 1465@@ -18434,8 +19094,13 @@ reload_flag \
1466 OBJDUMP \ 1466 OBJDUMP \
1467 deplibs_check_method \ 1467 deplibs_check_method \
1468 file_magic_cmd \ 1468 file_magic_cmd \
@@ -1476,7 +1476,7 @@ index abc24a93028..f4c8ea4e54b 100755
1476 STRIP \ 1476 STRIP \
1477 RANLIB \ 1477 RANLIB \
1478 CC \ 1478 CC \
1479@@ -16458,12 +17123,14 @@ lt_cv_sys_global_symbol_pipe \ 1479@@ -18445,12 +19110,14 @@ lt_cv_sys_global_symbol_pipe \
1480 lt_cv_sys_global_symbol_to_cdecl \ 1480 lt_cv_sys_global_symbol_to_cdecl \
1481 lt_cv_sys_global_symbol_to_c_name_address \ 1481 lt_cv_sys_global_symbol_to_c_name_address \
1482 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ 1482 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
@@ -1492,7 +1492,7 @@ index abc24a93028..f4c8ea4e54b 100755
1492 DSYMUTIL \ 1492 DSYMUTIL \
1493 NMEDIT \ 1493 NMEDIT \
1494 LIPO \ 1494 LIPO \
1495@@ -16479,7 +17146,6 @@ no_undefined_flag \ 1495@@ -18466,7 +19133,6 @@ no_undefined_flag \
1496 hardcode_libdir_flag_spec \ 1496 hardcode_libdir_flag_spec \
1497 hardcode_libdir_flag_spec_ld \ 1497 hardcode_libdir_flag_spec_ld \
1498 hardcode_libdir_separator \ 1498 hardcode_libdir_separator \
@@ -1500,7 +1500,7 @@ index abc24a93028..f4c8ea4e54b 100755
1500 exclude_expsyms \ 1500 exclude_expsyms \
1501 include_expsyms \ 1501 include_expsyms \
1502 file_list_spec \ 1502 file_list_spec \
1503@@ -16515,6 +17181,7 @@ module_cmds \ 1503@@ -18502,6 +19168,7 @@ module_cmds \
1504 module_expsym_cmds \ 1504 module_expsym_cmds \
1505 export_symbols_cmds \ 1505 export_symbols_cmds \
1506 prelink_cmds \ 1506 prelink_cmds \
@@ -1508,7 +1508,7 @@ index abc24a93028..f4c8ea4e54b 100755
1508 postinstall_cmds \ 1508 postinstall_cmds \
1509 postuninstall_cmds \ 1509 postuninstall_cmds \
1510 finish_cmds \ 1510 finish_cmds \
1511@@ -17283,7 +17950,8 @@ $as_echo X"$file" | 1511@@ -19278,7 +19945,8 @@ $as_echo X"$file" |
1512 # NOTE: Changes made to this file will be lost: look at ltmain.sh. 1512 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
1513 # 1513 #
1514 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 1514 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
@@ -1518,7 +1518,7 @@ index abc24a93028..f4c8ea4e54b 100755
1518 # Written by Gordon Matzigkeit, 1996 1518 # Written by Gordon Matzigkeit, 1996
1519 # 1519 #
1520 # This file is part of GNU Libtool. 1520 # This file is part of GNU Libtool.
1521@@ -17386,19 +18054,42 @@ SP2NL=$lt_lt_SP2NL 1521@@ -19381,19 +20049,42 @@ SP2NL=$lt_lt_SP2NL
1522 # turn newlines into spaces. 1522 # turn newlines into spaces.
1523 NL2SP=$lt_lt_NL2SP 1523 NL2SP=$lt_lt_NL2SP
1524 1524
@@ -1562,7 +1562,7 @@ index abc24a93028..f4c8ea4e54b 100755
1562 # A symbol stripping program. 1562 # A symbol stripping program.
1563 STRIP=$lt_STRIP 1563 STRIP=$lt_STRIP
1564 1564
1565@@ -17428,6 +18119,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address 1565@@ -19423,6 +20114,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
1566 # Transform the output of nm in a C name address pair when lib prefix is needed. 1566 # Transform the output of nm in a C name address pair when lib prefix is needed.
1567 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix 1567 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
1568 1568
@@ -1575,7 +1575,7 @@ index abc24a93028..f4c8ea4e54b 100755
1575 # The name of the directory that contains temporary libtool files. 1575 # The name of the directory that contains temporary libtool files.
1576 objdir=$objdir 1576 objdir=$objdir
1577 1577
1578@@ -17437,6 +18134,9 @@ MAGIC_CMD=$MAGIC_CMD 1578@@ -19432,6 +20129,9 @@ MAGIC_CMD=$MAGIC_CMD
1579 # Must we lock files when doing compilation? 1579 # Must we lock files when doing compilation?
1580 need_locks=$lt_need_locks 1580 need_locks=$lt_need_locks
1581 1581
@@ -1585,7 +1585,7 @@ index abc24a93028..f4c8ea4e54b 100755
1585 # Tool to manipulate archived DWARF debug symbol files on Mac OS X. 1585 # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
1586 DSYMUTIL=$lt_DSYMUTIL 1586 DSYMUTIL=$lt_DSYMUTIL
1587 1587
1588@@ -17551,12 +18251,12 @@ with_gcc=$GCC 1588@@ -19546,12 +20246,12 @@ with_gcc=$GCC
1589 # Compiler flag to turn off builtin functions. 1589 # Compiler flag to turn off builtin functions.
1590 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag 1590 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
1591 1591
@@ -1601,7 +1601,7 @@ index abc24a93028..f4c8ea4e54b 100755
1601 # Compiler flag to prevent dynamic linking. 1601 # Compiler flag to prevent dynamic linking.
1602 link_static_flag=$lt_lt_prog_compiler_static 1602 link_static_flag=$lt_lt_prog_compiler_static
1603 1603
1604@@ -17643,9 +18343,6 @@ inherit_rpath=$inherit_rpath 1604@@ -19638,9 +20338,6 @@ inherit_rpath=$inherit_rpath
1605 # Whether libtool must link a program against all its dependency libraries. 1605 # Whether libtool must link a program against all its dependency libraries.
1606 link_all_deplibs=$link_all_deplibs 1606 link_all_deplibs=$link_all_deplibs
1607 1607
@@ -1611,7 +1611,7 @@ index abc24a93028..f4c8ea4e54b 100755
1611 # Set to "yes" if exported symbols are required. 1611 # Set to "yes" if exported symbols are required.
1612 always_export_symbols=$always_export_symbols 1612 always_export_symbols=$always_export_symbols
1613 1613
1614@@ -17661,6 +18358,9 @@ include_expsyms=$lt_include_expsyms 1614@@ -19656,6 +20353,9 @@ include_expsyms=$lt_include_expsyms
1615 # Commands necessary for linking programs (against libraries) with templates. 1615 # Commands necessary for linking programs (against libraries) with templates.
1616 prelink_cmds=$lt_prelink_cmds 1616 prelink_cmds=$lt_prelink_cmds
1617 1617
@@ -1621,7 +1621,7 @@ index abc24a93028..f4c8ea4e54b 100755
1621 # Specify filename containing input files. 1621 # Specify filename containing input files.
1622 file_list_spec=$lt_file_list_spec 1622 file_list_spec=$lt_file_list_spec
1623 1623
1624@@ -17693,210 +18393,169 @@ ltmain="$ac_aux_dir/ltmain.sh" 1624@@ -19688,210 +20388,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
1625 # if finds mixed CR/LF and LF-only lines. Since sed operates in 1625 # if finds mixed CR/LF and LF-only lines. Since sed operates in
1626 # text mode, it properly converts lines to CR/LF. This bash problem 1626 # text mode, it properly converts lines to CR/LF. This bash problem
1627 # is reportedly fixed, but why not run on old versions too? 1627 # is reportedly fixed, but why not run on old versions too?
@@ -1996,10 +1996,10 @@ index abc24a93028..f4c8ea4e54b 100755
1996 chmod +x "$ofile" 1996 chmod +x "$ofile"
1997 1997
1998diff --git a/bfd/configure.ac b/bfd/configure.ac 1998diff --git a/bfd/configure.ac b/bfd/configure.ac
1999index f044616f4d9..c2b2ab1ec68 100644 1999index 7fcc5d4a947..f7191d3f30f 100644
2000--- a/bfd/configure.ac 2000--- a/bfd/configure.ac
2001+++ b/bfd/configure.ac 2001+++ b/bfd/configure.ac
2002@@ -274,7 +274,7 @@ changequote(,)dnl 2002@@ -276,7 +276,7 @@ changequote(,)dnl
2003 x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'` 2003 x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'`
2004 changequote([,])dnl 2004 changequote([,])dnl
2005 if test -n "$x"; then 2005 if test -n "$x"; then
@@ -2009,10 +2009,10 @@ index f044616f4d9..c2b2ab1ec68 100644
2009 fi 2009 fi
2010 2010
2011diff --git a/binutils/Makefile.in b/binutils/Makefile.in 2011diff --git a/binutils/Makefile.in b/binutils/Makefile.in
2012index 2de46be1b30..70a04f1c538 100644 2012index 842a6d99b54..037cccde038 100644
2013--- a/binutils/Makefile.in 2013--- a/binutils/Makefile.in
2014+++ b/binutils/Makefile.in 2014+++ b/binutils/Makefile.in
2015@@ -493,6 +493,7 @@ DEBUGINFOD_LIBS = @DEBUGINFOD_LIBS@ 2015@@ -495,6 +495,7 @@ DEBUGINFOD_LIBS = @DEBUGINFOD_LIBS@
2016 DEFS = @DEFS@ 2016 DEFS = @DEFS@
2017 DEMANGLER_NAME = @DEMANGLER_NAME@ 2017 DEMANGLER_NAME = @DEMANGLER_NAME@
2018 DEPDIR = @DEPDIR@ 2018 DEPDIR = @DEPDIR@
@@ -2020,7 +2020,7 @@ index 2de46be1b30..70a04f1c538 100644
2020 DLLTOOL_DEFS = @DLLTOOL_DEFS@ 2020 DLLTOOL_DEFS = @DLLTOOL_DEFS@
2021 DSYMUTIL = @DSYMUTIL@ 2021 DSYMUTIL = @DSYMUTIL@
2022 DUMPBIN = @DUMPBIN@ 2022 DUMPBIN = @DUMPBIN@
2023@@ -534,6 +535,7 @@ LTLIBICONV = @LTLIBICONV@ 2023@@ -539,6 +540,7 @@ LTLIBINTL = @LTLIBINTL@
2024 LTLIBOBJS = @LTLIBOBJS@ 2024 LTLIBOBJS = @LTLIBOBJS@
2025 MAINT = @MAINT@ 2025 MAINT = @MAINT@
2026 MAKEINFO = @MAKEINFO@ 2026 MAKEINFO = @MAKEINFO@
@@ -2028,7 +2028,7 @@ index 2de46be1b30..70a04f1c538 100644
2028 MKDIR_P = @MKDIR_P@ 2028 MKDIR_P = @MKDIR_P@
2029 MKINSTALLDIRS = @MKINSTALLDIRS@ 2029 MKINSTALLDIRS = @MKINSTALLDIRS@
2030 MSGFMT = @MSGFMT@ 2030 MSGFMT = @MSGFMT@
2031@@ -582,6 +584,7 @@ abs_builddir = @abs_builddir@ 2031@@ -587,6 +589,7 @@ abs_builddir = @abs_builddir@
2032 abs_srcdir = @abs_srcdir@ 2032 abs_srcdir = @abs_srcdir@
2033 abs_top_builddir = @abs_top_builddir@ 2033 abs_top_builddir = @abs_top_builddir@
2034 abs_top_srcdir = @abs_top_srcdir@ 2034 abs_top_srcdir = @abs_top_srcdir@
@@ -2037,10 +2037,10 @@ index 2de46be1b30..70a04f1c538 100644
2037 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ 2037 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
2038 am__include = @am__include@ 2038 am__include = @am__include@
2039diff --git a/binutils/configure b/binutils/configure 2039diff --git a/binutils/configure b/binutils/configure
2040index 4cd196ab74b..dca6f77919d 100755 2040index 6f08b6bdcde..03d922de70e 100755
2041--- a/binutils/configure 2041--- a/binutils/configure
2042+++ b/binutils/configure 2042+++ b/binutils/configure
2043@@ -700,8 +700,11 @@ OTOOL 2043@@ -704,8 +704,11 @@ OTOOL
2044 LIPO 2044 LIPO
2045 NMEDIT 2045 NMEDIT
2046 DSYMUTIL 2046 DSYMUTIL
@@ -2052,7 +2052,7 @@ index 4cd196ab74b..dca6f77919d 100755
2052 OBJDUMP 2052 OBJDUMP
2053 LN_S 2053 LN_S
2054 NM 2054 NM
2055@@ -818,6 +821,7 @@ enable_static 2055@@ -822,6 +825,7 @@ enable_static
2056 with_pic 2056 with_pic
2057 enable_fast_install 2057 enable_fast_install
2058 with_gnu_ld 2058 with_gnu_ld
@@ -2060,7 +2060,7 @@ index 4cd196ab74b..dca6f77919d 100755
2060 enable_libtool_lock 2060 enable_libtool_lock
2061 enable_plugins 2061 enable_plugins
2062 enable_largefile 2062 enable_largefile
2063@@ -1523,6 +1527,8 @@ Optional Packages: 2063@@ -1529,6 +1533,8 @@ Optional Packages:
2064 --with-pic try to use only PIC/non-PIC objects [default=use 2064 --with-pic try to use only PIC/non-PIC objects [default=use
2065 both] 2065 both]
2066 --with-gnu-ld assume the C compiler uses GNU ld [default=no] 2066 --with-gnu-ld assume the C compiler uses GNU ld [default=no]
@@ -2068,8 +2068,8 @@ index 4cd196ab74b..dca6f77919d 100755
2068+ (or the compiler's sysroot if not specified). 2068+ (or the compiler's sysroot if not specified).
2069 --with-debuginfod Enable debuginfo lookups with debuginfod 2069 --with-debuginfod Enable debuginfo lookups with debuginfod
2070 (auto/yes/no) 2070 (auto/yes/no)
2071 --with-system-zlib use installed libz 2071 --with-gnu-ld assume the C compiler uses GNU ld default=no
2072@@ -4723,8 +4729,8 @@ esac 2072@@ -4733,8 +4739,8 @@ esac
2073 2073
2074 2074
2075 2075
@@ -2080,7 +2080,7 @@ index 4cd196ab74b..dca6f77919d 100755
2080 2080
2081 2081
2082 2082
2083@@ -4764,7 +4770,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO 2083@@ -4774,7 +4780,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
2084 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 2084 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
2085 $as_echo_n "checking how to print strings... " >&6; } 2085 $as_echo_n "checking how to print strings... " >&6; }
2086 # Test print first, because it will be a builtin if present. 2086 # Test print first, because it will be a builtin if present.
@@ -2089,7 +2089,7 @@ index 4cd196ab74b..dca6f77919d 100755
2089 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then 2089 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
2090 ECHO='print -r --' 2090 ECHO='print -r --'
2091 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then 2091 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
2092@@ -5457,8 +5463,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; 2092@@ -5467,8 +5473,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6;
2093 # Try some XSI features 2093 # Try some XSI features
2094 xsi_shell=no 2094 xsi_shell=no
2095 ( _lt_dummy="a/b/c" 2095 ( _lt_dummy="a/b/c"
@@ -2100,7 +2100,7 @@ index 4cd196ab74b..dca6f77919d 100755
2100 && eval 'test $(( 1 + 1 )) -eq 2 \ 2100 && eval 'test $(( 1 + 1 )) -eq 2 \
2101 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ 2101 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
2102 && xsi_shell=yes 2102 && xsi_shell=yes
2103@@ -5507,6 +5513,80 @@ esac 2103@@ -5517,6 +5523,80 @@ esac
2104 2104
2105 2105
2106 2106
@@ -2181,7 +2181,7 @@ index 4cd196ab74b..dca6f77919d 100755
2181 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 2181 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
2182 $as_echo_n "checking for $LD option to reload object files... " >&6; } 2182 $as_echo_n "checking for $LD option to reload object files... " >&6; }
2183 if ${lt_cv_ld_reload_flag+:} false; then : 2183 if ${lt_cv_ld_reload_flag+:} false; then :
2184@@ -5523,6 +5603,11 @@ case $reload_flag in 2184@@ -5533,6 +5613,11 @@ case $reload_flag in
2185 esac 2185 esac
2186 reload_cmds='$LD$reload_flag -o $output$reload_objs' 2186 reload_cmds='$LD$reload_flag -o $output$reload_objs'
2187 case $host_os in 2187 case $host_os in
@@ -2193,7 +2193,7 @@ index 4cd196ab74b..dca6f77919d 100755
2193 darwin*) 2193 darwin*)
2194 if test "$GCC" = yes; then 2194 if test "$GCC" = yes; then
2195 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' 2195 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
2196@@ -5691,7 +5776,8 @@ mingw* | pw32*) 2196@@ -5701,7 +5786,8 @@ mingw* | pw32*)
2197 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' 2197 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
2198 lt_cv_file_magic_cmd='func_win32_libid' 2198 lt_cv_file_magic_cmd='func_win32_libid'
2199 else 2199 else
@@ -2203,7 +2203,7 @@ index 4cd196ab74b..dca6f77919d 100755
2203 lt_cv_file_magic_cmd='$OBJDUMP -f' 2203 lt_cv_file_magic_cmd='$OBJDUMP -f'
2204 fi 2204 fi
2205 ;; 2205 ;;
2206@@ -5845,6 +5931,21 @@ esac 2206@@ -5860,6 +5946,21 @@ esac
2207 fi 2207 fi
2208 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 2208 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
2209 $as_echo "$lt_cv_deplibs_check_method" >&6; } 2209 $as_echo "$lt_cv_deplibs_check_method" >&6; }
@@ -2225,7 +2225,7 @@ index 4cd196ab74b..dca6f77919d 100755
2225 file_magic_cmd=$lt_cv_file_magic_cmd 2225 file_magic_cmd=$lt_cv_file_magic_cmd
2226 deplibs_check_method=$lt_cv_deplibs_check_method 2226 deplibs_check_method=$lt_cv_deplibs_check_method
2227 test -z "$deplibs_check_method" && deplibs_check_method=unknown 2227 test -z "$deplibs_check_method" && deplibs_check_method=unknown
2228@@ -5860,6 +5961,157 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown 2228@@ -5875,6 +5976,157 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
2229 2229
2230 2230
2231 2231
@@ -2383,7 +2383,7 @@ index 4cd196ab74b..dca6f77919d 100755
2383 plugin_option= 2383 plugin_option=
2384 plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll" 2384 plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll"
2385 for plugin in $plugin_names; do 2385 for plugin in $plugin_names; do
2386@@ -5874,8 +6126,10 @@ for plugin in $plugin_names; do 2386@@ -5889,8 +6141,10 @@ for plugin in $plugin_names; do
2387 done 2387 done
2388 2388
2389 if test -n "$ac_tool_prefix"; then 2389 if test -n "$ac_tool_prefix"; then
@@ -2396,7 +2396,7 @@ index 4cd196ab74b..dca6f77919d 100755
2396 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 2396 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
2397 $as_echo_n "checking for $ac_word... " >&6; } 2397 $as_echo_n "checking for $ac_word... " >&6; }
2398 if ${ac_cv_prog_AR+:} false; then : 2398 if ${ac_cv_prog_AR+:} false; then :
2399@@ -5891,7 +6145,7 @@ do 2399@@ -5906,7 +6160,7 @@ do
2400 test -z "$as_dir" && as_dir=. 2400 test -z "$as_dir" && as_dir=.
2401 for ac_exec_ext in '' $ac_executable_extensions; do 2401 for ac_exec_ext in '' $ac_executable_extensions; do
2402 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 2402 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
@@ -2405,7 +2405,7 @@ index 4cd196ab74b..dca6f77919d 100755
2405 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 2405 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
2406 break 2 2406 break 2
2407 fi 2407 fi
2408@@ -5911,11 +6165,15 @@ $as_echo "no" >&6; } 2408@@ -5926,11 +6180,15 @@ $as_echo "no" >&6; }
2409 fi 2409 fi
2410 2410
2411 2411
@@ -2424,7 +2424,7 @@ index 4cd196ab74b..dca6f77919d 100755
2424 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 2424 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
2425 $as_echo_n "checking for $ac_word... " >&6; } 2425 $as_echo_n "checking for $ac_word... " >&6; }
2426 if ${ac_cv_prog_ac_ct_AR+:} false; then : 2426 if ${ac_cv_prog_ac_ct_AR+:} false; then :
2427@@ -5931,7 +6189,7 @@ do 2427@@ -5946,7 +6204,7 @@ do
2428 test -z "$as_dir" && as_dir=. 2428 test -z "$as_dir" && as_dir=.
2429 for ac_exec_ext in '' $ac_executable_extensions; do 2429 for ac_exec_ext in '' $ac_executable_extensions; do
2430 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 2430 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
@@ -2433,7 +2433,7 @@ index 4cd196ab74b..dca6f77919d 100755
2433 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 2433 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
2434 break 2 2434 break 2
2435 fi 2435 fi
2436@@ -5950,6 +6208,10 @@ else 2436@@ -5965,6 +6223,10 @@ else
2437 $as_echo "no" >&6; } 2437 $as_echo "no" >&6; }
2438 fi 2438 fi
2439 2439
@@ -2444,7 +2444,7 @@ index 4cd196ab74b..dca6f77919d 100755
2444 if test "x$ac_ct_AR" = x; then 2444 if test "x$ac_ct_AR" = x; then
2445 AR="false" 2445 AR="false"
2446 else 2446 else
2447@@ -5961,29 +6223,81 @@ ac_tool_warned=yes ;; 2447@@ -5976,25 +6238,19 @@ ac_tool_warned=yes ;;
2448 esac 2448 esac
2449 AR=$ac_ct_AR 2449 AR=$ac_ct_AR
2450 fi 2450 fi
@@ -2476,17 +2476,13 @@ index 4cd196ab74b..dca6f77919d 100755
2476+ rm -f conftest.* 2476+ rm -f conftest.*
2477+: ${AR=ar} 2477+: ${AR=ar}
2478+: ${AR_FLAGS=cru} 2478+: ${AR_FLAGS=cru}
2479+ 2479
2480+ 2480
2481+ 2481
2482+ 2482@@ -6006,6 +6262,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru
2483+ 2483
2484+ 2484
2485+ 2485
2486+
2487+
2488+
2489+
2490+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 2486+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
2491+$as_echo_n "checking for archiver @FILE support... " >&6; } 2487+$as_echo_n "checking for archiver @FILE support... " >&6; }
2492+if ${lt_cv_ar_at_file+:} false; then : 2488+if ${lt_cv_ar_at_file+:} false; then :
@@ -2499,7 +2495,7 @@ index 4cd196ab74b..dca6f77919d 100755
2499+int 2495+int
2500+main () 2496+main ()
2501+{ 2497+{
2502 2498+
2503+ ; 2499+ ;
2504+ return 0; 2500+ return 0;
2505+} 2501+}
@@ -2525,23 +2521,30 @@ index 4cd196ab74b..dca6f77919d 100755
2525+ fi 2521+ fi
2526+ fi 2522+ fi
2527+ rm -f conftest.* libconftest.a 2523+ rm -f conftest.* libconftest.a
2528 2524+
2529+fi 2525+fi
2530+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext 2526+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
2531 2527+
2532+fi 2528+fi
2533+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 2529+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
2534+$as_echo "$lt_cv_ar_at_file" >&6; } 2530+$as_echo "$lt_cv_ar_at_file" >&6; }
2535 2531+
2536+if test "x$lt_cv_ar_at_file" = xno; then 2532+if test "x$lt_cv_ar_at_file" = xno; then
2537+ archiver_list_spec= 2533+ archiver_list_spec=
2538+else 2534+else
2539+ archiver_list_spec=$lt_cv_ar_at_file 2535+ archiver_list_spec=$lt_cv_ar_at_file
2540+fi 2536+fi
2541 2537+
2542 2538+
2543 2539+
2544@@ -6330,8 +6644,8 @@ esac 2540+
2541+
2542+
2543+
2544 if test -n "$ac_tool_prefix"; then
2545 # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
2546 set dummy ${ac_tool_prefix}strip; ac_word=$2
2547@@ -6345,8 +6659,8 @@ esac
2545 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" 2548 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
2546 2549
2547 # Transform an extracted symbol line into symbol name and symbol address 2550 # Transform an extracted symbol line into symbol name and symbol address
@@ -2552,7 +2555,7 @@ index 4cd196ab74b..dca6f77919d 100755
2552 2555
2553 # Handle CRLF in mingw tool chain 2556 # Handle CRLF in mingw tool chain
2554 opt_cr= 2557 opt_cr=
2555@@ -6367,6 +6681,7 @@ for ac_symprfx in "" "_"; do 2558@@ -6382,6 +6696,7 @@ for ac_symprfx in "" "_"; do
2556 else 2559 else
2557 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" 2560 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
2558 fi 2561 fi
@@ -2560,7 +2563,7 @@ index 4cd196ab74b..dca6f77919d 100755
2560 2563
2561 # Check to see that the pipe works correctly. 2564 # Check to see that the pipe works correctly.
2562 pipe_works=no 2565 pipe_works=no
2563@@ -6408,6 +6723,18 @@ _LT_EOF 2566@@ -6423,6 +6738,18 @@ _LT_EOF
2564 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then 2567 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
2565 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then 2568 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
2566 cat <<_LT_EOF > conftest.$ac_ext 2569 cat <<_LT_EOF > conftest.$ac_ext
@@ -2579,7 +2582,7 @@ index 4cd196ab74b..dca6f77919d 100755
2579 #ifdef __cplusplus 2582 #ifdef __cplusplus
2580 extern "C" { 2583 extern "C" {
2581 #endif 2584 #endif
2582@@ -6419,7 +6746,7 @@ _LT_EOF 2585@@ -6434,7 +6761,7 @@ _LT_EOF
2583 cat <<_LT_EOF >> conftest.$ac_ext 2586 cat <<_LT_EOF >> conftest.$ac_ext
2584 2587
2585 /* The mapping between symbol names and symbols. */ 2588 /* The mapping between symbol names and symbols. */
@@ -2588,7 +2591,7 @@ index 4cd196ab74b..dca6f77919d 100755
2588 const char *name; 2591 const char *name;
2589 void *address; 2592 void *address;
2590 } 2593 }
2591@@ -6445,8 +6772,8 @@ static const void *lt_preloaded_setup() { 2594@@ -6460,8 +6787,8 @@ static const void *lt_preloaded_setup() {
2592 _LT_EOF 2595 _LT_EOF
2593 # Now try linking the two files. 2596 # Now try linking the two files.
2594 mv conftest.$ac_objext conftstm.$ac_objext 2597 mv conftest.$ac_objext conftstm.$ac_objext
@@ -2599,7 +2602,7 @@ index 4cd196ab74b..dca6f77919d 100755
2599 LIBS="conftstm.$ac_objext" 2602 LIBS="conftstm.$ac_objext"
2600 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" 2603 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
2601 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 2604 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
2602@@ -6456,8 +6783,8 @@ _LT_EOF 2605@@ -6471,8 +6798,8 @@ _LT_EOF
2603 test $ac_status = 0; } && test -s conftest${ac_exeext}; then 2606 test $ac_status = 0; } && test -s conftest${ac_exeext}; then
2604 pipe_works=yes 2607 pipe_works=yes
2605 fi 2608 fi
@@ -2610,7 +2613,7 @@ index 4cd196ab74b..dca6f77919d 100755
2610 else 2613 else
2611 echo "cannot find nm_test_func in $nlist" >&5 2614 echo "cannot find nm_test_func in $nlist" >&5
2612 fi 2615 fi
2613@@ -6494,6 +6821,19 @@ else 2616@@ -6509,6 +6836,18 @@ else
2614 $as_echo "ok" >&6; } 2617 $as_echo "ok" >&6; }
2615 fi 2618 fi
2616 2619
@@ -2626,11 +2629,10 @@ index 4cd196ab74b..dca6f77919d 100755
2626+ 2629+
2627+ 2630+
2628+ 2631+
2629+
2630 2632
2631 2633
2632 2634
2633@@ -6510,6 +6850,42 @@ fi 2635@@ -6525,6 +6864,43 @@ fi
2634 2636
2635 2637
2636 2638
@@ -2638,6 +2640,7 @@ index 4cd196ab74b..dca6f77919d 100755
2638+ 2640+
2639+ 2641+
2640+ 2642+
2643+
2641+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 2644+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
2642+$as_echo_n "checking for sysroot... " >&6; } 2645+$as_echo_n "checking for sysroot... " >&6; }
2643+ 2646+
@@ -2673,7 +2676,7 @@ index 4cd196ab74b..dca6f77919d 100755
2673 2676
2674 2677
2675 2678
2676@@ -6721,6 +7097,123 @@ esac 2679@@ -6736,6 +7112,123 @@ esac
2677 2680
2678 need_locks="$enable_libtool_lock" 2681 need_locks="$enable_libtool_lock"
2679 2682
@@ -2797,7 +2800,7 @@ index 4cd196ab74b..dca6f77919d 100755
2797 2800
2798 case $host_os in 2801 case $host_os in
2799 rhapsody* | darwin*) 2802 rhapsody* | darwin*)
2800@@ -7284,6 +7777,8 @@ _LT_EOF 2803@@ -7299,6 +7792,8 @@ _LT_EOF
2801 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 2804 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
2802 echo "$AR cru libconftest.a conftest.o" >&5 2805 echo "$AR cru libconftest.a conftest.o" >&5
2803 $AR cru libconftest.a conftest.o 2>&5 2806 $AR cru libconftest.a conftest.o 2>&5
@@ -2806,7 +2809,7 @@ index 4cd196ab74b..dca6f77919d 100755
2806 cat > conftest.c << _LT_EOF 2809 cat > conftest.c << _LT_EOF
2807 int main() { return 0;} 2810 int main() { return 0;}
2808 _LT_EOF 2811 _LT_EOF
2809@@ -7866,8 +8361,6 @@ fi 2812@@ -7883,8 +8378,6 @@ fi
2810 lt_prog_compiler_pic= 2813 lt_prog_compiler_pic=
2811 lt_prog_compiler_static= 2814 lt_prog_compiler_static=
2812 2815
@@ -2815,7 +2818,7 @@ index 4cd196ab74b..dca6f77919d 100755
2815 2818
2816 if test "$GCC" = yes; then 2819 if test "$GCC" = yes; then
2817 lt_prog_compiler_wl='-Wl,' 2820 lt_prog_compiler_wl='-Wl,'
2818@@ -8033,6 +8526,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 2821@@ -8050,6 +8543,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
2819 lt_prog_compiler_pic='--shared' 2822 lt_prog_compiler_pic='--shared'
2820 lt_prog_compiler_static='--static' 2823 lt_prog_compiler_static='--static'
2821 ;; 2824 ;;
@@ -2828,7 +2831,7 @@ index 4cd196ab74b..dca6f77919d 100755
2828 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) 2831 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
2829 # Portland Group compilers (*not* the Pentium gcc compiler, 2832 # Portland Group compilers (*not* the Pentium gcc compiler,
2830 # which looks to be a dead project) 2833 # which looks to be a dead project)
2831@@ -8095,7 +8594,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 2834@@ -8112,7 +8611,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
2832 lt_prog_compiler_pic='-KPIC' 2835 lt_prog_compiler_pic='-KPIC'
2833 lt_prog_compiler_static='-Bstatic' 2836 lt_prog_compiler_static='-Bstatic'
2834 case $cc_basename in 2837 case $cc_basename in
@@ -2837,7 +2840,7 @@ index 4cd196ab74b..dca6f77919d 100755
2837 lt_prog_compiler_wl='-Qoption ld ';; 2840 lt_prog_compiler_wl='-Qoption ld ';;
2838 *) 2841 *)
2839 lt_prog_compiler_wl='-Wl,';; 2842 lt_prog_compiler_wl='-Wl,';;
2840@@ -8152,13 +8651,17 @@ case $host_os in 2843@@ -8169,13 +8668,17 @@ case $host_os in
2841 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" 2844 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
2842 ;; 2845 ;;
2843 esac 2846 esac
@@ -2861,7 +2864,7 @@ index 4cd196ab74b..dca6f77919d 100755
2861 2864
2862 # 2865 #
2863 # Check to make sure the PIC flag actually works. 2866 # Check to make sure the PIC flag actually works.
2864@@ -8219,6 +8722,11 @@ fi 2867@@ -8236,6 +8739,11 @@ fi
2865 2868
2866 2869
2867 2870
@@ -2873,7 +2876,7 @@ index 4cd196ab74b..dca6f77919d 100755
2873 # 2876 #
2874 # Check to make sure the static flag actually works. 2877 # Check to make sure the static flag actually works.
2875 # 2878 #
2876@@ -8569,7 +9077,8 @@ _LT_EOF 2879@@ -8586,7 +9094,8 @@ _LT_EOF
2877 allow_undefined_flag=unsupported 2880 allow_undefined_flag=unsupported
2878 always_export_symbols=no 2881 always_export_symbols=no
2879 enable_shared_with_static_runtimes=yes 2882 enable_shared_with_static_runtimes=yes
@@ -2883,7 +2886,7 @@ index 4cd196ab74b..dca6f77919d 100755
2883 2886
2884 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then 2887 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
2885 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' 2888 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
2886@@ -8668,12 +9177,12 @@ _LT_EOF 2889@@ -8685,12 +9194,12 @@ _LT_EOF
2887 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' 2890 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
2888 hardcode_libdir_flag_spec= 2891 hardcode_libdir_flag_spec=
2889 hardcode_libdir_flag_spec_ld='-rpath $libdir' 2892 hardcode_libdir_flag_spec_ld='-rpath $libdir'
@@ -2898,7 +2901,7 @@ index 4cd196ab74b..dca6f77919d 100755
2898 fi 2901 fi
2899 ;; 2902 ;;
2900 esac 2903 esac
2901@@ -8687,8 +9196,8 @@ _LT_EOF 2904@@ -8704,8 +9213,8 @@ _LT_EOF
2902 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' 2905 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
2903 wlarc= 2906 wlarc=
2904 else 2907 else
@@ -2909,7 +2912,7 @@ index 4cd196ab74b..dca6f77919d 100755
2909 fi 2912 fi
2910 ;; 2913 ;;
2911 2914
2912@@ -8706,8 +9215,8 @@ _LT_EOF 2915@@ -8723,8 +9232,8 @@ _LT_EOF
2913 2916
2914 _LT_EOF 2917 _LT_EOF
2915 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 2918 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -2920,7 +2923,7 @@ index 4cd196ab74b..dca6f77919d 100755
2920 else 2923 else
2921 ld_shlibs=no 2924 ld_shlibs=no
2922 fi 2925 fi
2923@@ -8753,8 +9262,8 @@ _LT_EOF 2926@@ -8770,8 +9279,8 @@ _LT_EOF
2924 2927
2925 *) 2928 *)
2926 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 2929 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -2931,7 +2934,7 @@ index 4cd196ab74b..dca6f77919d 100755
2931 else 2934 else
2932 ld_shlibs=no 2935 ld_shlibs=no
2933 fi 2936 fi
2934@@ -8884,7 +9393,13 @@ _LT_EOF 2937@@ -8901,7 +9410,13 @@ _LT_EOF
2935 allow_undefined_flag='-berok' 2938 allow_undefined_flag='-berok'
2936 # Determine the default libpath from the value encoded in an 2939 # Determine the default libpath from the value encoded in an
2937 # empty executable. 2940 # empty executable.
@@ -2946,7 +2949,7 @@ index 4cd196ab74b..dca6f77919d 100755
2946 /* end confdefs.h. */ 2949 /* end confdefs.h. */
2947 2950
2948 int 2951 int
2949@@ -8897,22 +9412,29 @@ main () 2952@@ -8914,22 +9429,29 @@ main ()
2950 _ACEOF 2953 _ACEOF
2951 if ac_fn_c_try_link "$LINENO"; then : 2954 if ac_fn_c_try_link "$LINENO"; then :
2952 2955
@@ -2989,7 +2992,7 @@ index 4cd196ab74b..dca6f77919d 100755
2989 2992
2990 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 2993 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
2991 archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" 2994 archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
2992@@ -8924,7 +9446,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 2995@@ -8941,7 +9463,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
2993 else 2996 else
2994 # Determine the default libpath from the value encoded in an 2997 # Determine the default libpath from the value encoded in an
2995 # empty executable. 2998 # empty executable.
@@ -3004,7 +3007,7 @@ index 4cd196ab74b..dca6f77919d 100755
3004 /* end confdefs.h. */ 3007 /* end confdefs.h. */
3005 3008
3006 int 3009 int
3007@@ -8937,22 +9465,29 @@ main () 3010@@ -8954,22 +9482,29 @@ main ()
3008 _ACEOF 3011 _ACEOF
3009 if ac_fn_c_try_link "$LINENO"; then : 3012 if ac_fn_c_try_link "$LINENO"; then :
3010 3013
@@ -3047,7 +3050,7 @@ index 4cd196ab74b..dca6f77919d 100755
3047 3050
3048 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 3051 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
3049 # Warning - without using the other run time loading flags, 3052 # Warning - without using the other run time loading flags,
3050@@ -8997,20 +9532,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 3053@@ -9014,20 +9549,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
3051 # Microsoft Visual C++. 3054 # Microsoft Visual C++.
3052 # hardcode_libdir_flag_spec is actually meaningless, as there is 3055 # hardcode_libdir_flag_spec is actually meaningless, as there is
3053 # no search path for DLLs. 3056 # no search path for DLLs.
@@ -3125,7 +3128,7 @@ index 4cd196ab74b..dca6f77919d 100755
3125 ;; 3128 ;;
3126 3129
3127 darwin* | rhapsody*) 3130 darwin* | rhapsody*)
3128@@ -9071,7 +9649,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 3131@@ -9088,7 +9666,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
3129 3132
3130 # FreeBSD 3 and greater uses gcc -shared to do shared libraries. 3133 # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
3131 freebsd* | dragonfly*) 3134 freebsd* | dragonfly*)
@@ -3134,7 +3137,7 @@ index 4cd196ab74b..dca6f77919d 100755
3134 hardcode_libdir_flag_spec='-R$libdir' 3137 hardcode_libdir_flag_spec='-R$libdir'
3135 hardcode_direct=yes 3138 hardcode_direct=yes
3136 hardcode_shlibpath_var=no 3139 hardcode_shlibpath_var=no
3137@@ -9079,7 +9657,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 3140@@ -9096,7 +9674,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
3138 3141
3139 hpux9*) 3142 hpux9*)
3140 if test "$GCC" = yes; then 3143 if test "$GCC" = yes; then
@@ -3143,7 +3146,7 @@ index 4cd196ab74b..dca6f77919d 100755
3143 else 3146 else
3144 archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' 3147 archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
3145 fi 3148 fi
3146@@ -9095,7 +9673,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 3149@@ -9112,7 +9690,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
3147 3150
3148 hpux10*) 3151 hpux10*)
3149 if test "$GCC" = yes && test "$with_gnu_ld" = no; then 3152 if test "$GCC" = yes && test "$with_gnu_ld" = no; then
@@ -3152,8 +3155,8 @@ index 4cd196ab74b..dca6f77919d 100755
3152 else 3155 else
3153 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' 3156 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
3154 fi 3157 fi
3155@@ -9119,10 +9697,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 3158@@ -9136,10 +9714,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
3156 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' 3159 archive_cmds='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
3157 ;; 3160 ;;
3158 ia64*) 3161 ia64*)
3159- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' 3162- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
@@ -3165,7 +3168,7 @@ index 4cd196ab74b..dca6f77919d 100755
3165 ;; 3168 ;;
3166 esac 3169 esac
3167 else 3170 else
3168@@ -9201,23 +9779,36 @@ fi 3171@@ -9218,23 +9796,36 @@ fi
3169 3172
3170 irix5* | irix6* | nonstopux*) 3173 irix5* | irix6* | nonstopux*)
3171 if test "$GCC" = yes; then 3174 if test "$GCC" = yes; then
@@ -3210,7 +3213,7 @@ index 4cd196ab74b..dca6f77919d 100755
3210 else 3213 else
3211 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' 3214 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
3212 archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' 3215 archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
3213@@ -9302,7 +9893,7 @@ rm -f core conftest.err conftest.$ac_objext \ 3216@@ -9319,7 +9910,7 @@ rm -f core conftest.err conftest.$ac_objext \
3214 osf4* | osf5*) # as osf3* with the addition of -msym flag 3217 osf4* | osf5*) # as osf3* with the addition of -msym flag
3215 if test "$GCC" = yes; then 3218 if test "$GCC" = yes; then
3216 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' 3219 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
@@ -3219,7 +3222,7 @@ index 4cd196ab74b..dca6f77919d 100755
3219 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' 3222 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
3220 else 3223 else
3221 allow_undefined_flag=' -expect_unresolved \*' 3224 allow_undefined_flag=' -expect_unresolved \*'
3222@@ -9321,9 +9912,9 @@ rm -f core conftest.err conftest.$ac_objext \ 3225@@ -9338,9 +9929,9 @@ rm -f core conftest.err conftest.$ac_objext \
3223 no_undefined_flag=' -z defs' 3226 no_undefined_flag=' -z defs'
3224 if test "$GCC" = yes; then 3227 if test "$GCC" = yes; then
3225 wlarc='${wl}' 3228 wlarc='${wl}'
@@ -3231,7 +3234,7 @@ index 4cd196ab74b..dca6f77919d 100755
3231 else 3234 else
3232 case `$CC -V 2>&1` in 3235 case `$CC -V 2>&1` in
3233 *"Compilers 5.0"*) 3236 *"Compilers 5.0"*)
3234@@ -9899,8 +10490,9 @@ cygwin* | mingw* | pw32* | cegcc*) 3237@@ -9916,8 +10507,9 @@ cygwin* | mingw* | pw32* | cegcc*)
3235 need_version=no 3238 need_version=no
3236 need_lib_prefix=no 3239 need_lib_prefix=no
3237 3240
@@ -3243,7 +3246,7 @@ index 4cd196ab74b..dca6f77919d 100755
3243 library_names_spec='$libname.dll.a' 3246 library_names_spec='$libname.dll.a'
3244 # DLL is installed to $(libdir)/../bin by postinstall_cmds 3247 # DLL is installed to $(libdir)/../bin by postinstall_cmds
3245 postinstall_cmds='base_file=`basename \${file}`~ 3248 postinstall_cmds='base_file=`basename \${file}`~
3246@@ -9933,13 +10525,71 @@ cygwin* | mingw* | pw32* | cegcc*) 3249@@ -9950,13 +10542,71 @@ cygwin* | mingw* | pw32* | cegcc*)
3247 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' 3250 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
3248 ;; 3251 ;;
3249 esac 3252 esac
@@ -3316,16 +3319,16 @@ index 4cd196ab74b..dca6f77919d 100755
3316 # FIXME: first we should search . and the directory the executable is in 3319 # FIXME: first we should search . and the directory the executable is in
3317 shlibpath_var=PATH 3320 shlibpath_var=PATH
3318 ;; 3321 ;;
3319@@ -10817,7 +11467,7 @@ else 3322@@ -10858,7 +11508,7 @@ else
3320 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 3323 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
3321 lt_status=$lt_dlunknown 3324 lt_status=$lt_dlunknown
3322 cat > conftest.$ac_ext <<_LT_EOF 3325 cat > conftest.$ac_ext <<_LT_EOF
3323-#line 10820 "configure" 3326-#line 10861 "configure"
3324+#line $LINENO "configure" 3327+#line $LINENO "configure"
3325 #include "confdefs.h" 3328 #include "confdefs.h"
3326 3329
3327 #if HAVE_DLFCN_H 3330 #if HAVE_DLFCN_H
3328@@ -10861,10 +11511,10 @@ else 3331@@ -10902,10 +11552,10 @@ else
3329 /* When -fvisbility=hidden is used, assume the code has been annotated 3332 /* When -fvisbility=hidden is used, assume the code has been annotated
3330 correspondingly for the symbols needed. */ 3333 correspondingly for the symbols needed. */
3331 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 3334 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
@@ -3338,16 +3341,16 @@ index 4cd196ab74b..dca6f77919d 100755
3338 int main () 3341 int main ()
3339 { 3342 {
3340 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 3343 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
3341@@ -10923,7 +11573,7 @@ else 3344@@ -10964,7 +11614,7 @@ else
3342 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 3345 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
3343 lt_status=$lt_dlunknown 3346 lt_status=$lt_dlunknown
3344 cat > conftest.$ac_ext <<_LT_EOF 3347 cat > conftest.$ac_ext <<_LT_EOF
3345-#line 10926 "configure" 3348-#line 10967 "configure"
3346+#line $LINENO "configure" 3349+#line $LINENO "configure"
3347 #include "confdefs.h" 3350 #include "confdefs.h"
3348 3351
3349 #if HAVE_DLFCN_H 3352 #if HAVE_DLFCN_H
3350@@ -10967,10 +11617,10 @@ else 3353@@ -11008,10 +11658,10 @@ else
3351 /* When -fvisbility=hidden is used, assume the code has been annotated 3354 /* When -fvisbility=hidden is used, assume the code has been annotated
3352 correspondingly for the symbols needed. */ 3355 correspondingly for the symbols needed. */
3353 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 3356 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
@@ -3360,7 +3363,7 @@ index 4cd196ab74b..dca6f77919d 100755
3360 int main () 3363 int main ()
3361 { 3364 {
3362 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 3365 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
3363@@ -15555,13 +16205,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' 3366@@ -17164,13 +17814,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
3364 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' 3367 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
3365 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' 3368 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
3366 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' 3369 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
@@ -3381,7 +3384,7 @@ index 4cd196ab74b..dca6f77919d 100755
3381 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' 3384 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
3382 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' 3385 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
3383 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' 3386 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
3384@@ -15576,14 +16233,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de 3387@@ -17185,14 +17842,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de
3385 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' 3388 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
3386 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' 3389 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
3387 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`' 3390 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`'
@@ -3400,7 +3403,7 @@ index 4cd196ab74b..dca6f77919d 100755
3400 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' 3403 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
3401 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' 3404 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
3402 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' 3405 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
3403@@ -15616,12 +16276,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q 3406@@ -17225,12 +17885,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q
3404 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' 3407 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
3405 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' 3408 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
3406 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' 3409 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
@@ -3414,7 +3417,7 @@ index 4cd196ab74b..dca6f77919d 100755
3414 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' 3417 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
3415 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' 3418 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
3416 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' 3419 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
3417@@ -15676,8 +16336,13 @@ reload_flag \ 3420@@ -17285,8 +17945,13 @@ reload_flag \
3418 OBJDUMP \ 3421 OBJDUMP \
3419 deplibs_check_method \ 3422 deplibs_check_method \
3420 file_magic_cmd \ 3423 file_magic_cmd \
@@ -3428,7 +3431,7 @@ index 4cd196ab74b..dca6f77919d 100755
3428 STRIP \ 3431 STRIP \
3429 RANLIB \ 3432 RANLIB \
3430 CC \ 3433 CC \
3431@@ -15687,12 +16352,14 @@ lt_cv_sys_global_symbol_pipe \ 3434@@ -17296,12 +17961,14 @@ lt_cv_sys_global_symbol_pipe \
3432 lt_cv_sys_global_symbol_to_cdecl \ 3435 lt_cv_sys_global_symbol_to_cdecl \
3433 lt_cv_sys_global_symbol_to_c_name_address \ 3436 lt_cv_sys_global_symbol_to_c_name_address \
3434 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ 3437 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
@@ -3444,7 +3447,7 @@ index 4cd196ab74b..dca6f77919d 100755
3444 DSYMUTIL \ 3447 DSYMUTIL \
3445 NMEDIT \ 3448 NMEDIT \
3446 LIPO \ 3449 LIPO \
3447@@ -15708,7 +16375,6 @@ no_undefined_flag \ 3450@@ -17317,7 +17984,6 @@ no_undefined_flag \
3448 hardcode_libdir_flag_spec \ 3451 hardcode_libdir_flag_spec \
3449 hardcode_libdir_flag_spec_ld \ 3452 hardcode_libdir_flag_spec_ld \
3450 hardcode_libdir_separator \ 3453 hardcode_libdir_separator \
@@ -3452,7 +3455,7 @@ index 4cd196ab74b..dca6f77919d 100755
3452 exclude_expsyms \ 3455 exclude_expsyms \
3453 include_expsyms \ 3456 include_expsyms \
3454 file_list_spec \ 3457 file_list_spec \
3455@@ -15744,6 +16410,7 @@ module_cmds \ 3458@@ -17353,6 +18019,7 @@ module_cmds \
3456 module_expsym_cmds \ 3459 module_expsym_cmds \
3457 export_symbols_cmds \ 3460 export_symbols_cmds \
3458 prelink_cmds \ 3461 prelink_cmds \
@@ -3460,7 +3463,7 @@ index 4cd196ab74b..dca6f77919d 100755
3460 postinstall_cmds \ 3463 postinstall_cmds \
3461 postuninstall_cmds \ 3464 postuninstall_cmds \
3462 finish_cmds \ 3465 finish_cmds \
3463@@ -16509,7 +17176,8 @@ $as_echo X"$file" | 3466@@ -18126,7 +18793,8 @@ $as_echo X"$file" |
3464 # NOTE: Changes made to this file will be lost: look at ltmain.sh. 3467 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
3465 # 3468 #
3466 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 3469 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
@@ -3470,7 +3473,7 @@ index 4cd196ab74b..dca6f77919d 100755
3470 # Written by Gordon Matzigkeit, 1996 3473 # Written by Gordon Matzigkeit, 1996
3471 # 3474 #
3472 # This file is part of GNU Libtool. 3475 # This file is part of GNU Libtool.
3473@@ -16612,19 +17280,42 @@ SP2NL=$lt_lt_SP2NL 3476@@ -18229,19 +18897,42 @@ SP2NL=$lt_lt_SP2NL
3474 # turn newlines into spaces. 3477 # turn newlines into spaces.
3475 NL2SP=$lt_lt_NL2SP 3478 NL2SP=$lt_lt_NL2SP
3476 3479
@@ -3514,7 +3517,7 @@ index 4cd196ab74b..dca6f77919d 100755
3514 # A symbol stripping program. 3517 # A symbol stripping program.
3515 STRIP=$lt_STRIP 3518 STRIP=$lt_STRIP
3516 3519
3517@@ -16654,6 +17345,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address 3520@@ -18271,6 +18962,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
3518 # Transform the output of nm in a C name address pair when lib prefix is needed. 3521 # Transform the output of nm in a C name address pair when lib prefix is needed.
3519 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix 3522 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
3520 3523
@@ -3527,7 +3530,7 @@ index 4cd196ab74b..dca6f77919d 100755
3527 # The name of the directory that contains temporary libtool files. 3530 # The name of the directory that contains temporary libtool files.
3528 objdir=$objdir 3531 objdir=$objdir
3529 3532
3530@@ -16663,6 +17360,9 @@ MAGIC_CMD=$MAGIC_CMD 3533@@ -18280,6 +18977,9 @@ MAGIC_CMD=$MAGIC_CMD
3531 # Must we lock files when doing compilation? 3534 # Must we lock files when doing compilation?
3532 need_locks=$lt_need_locks 3535 need_locks=$lt_need_locks
3533 3536
@@ -3537,7 +3540,7 @@ index 4cd196ab74b..dca6f77919d 100755
3537 # Tool to manipulate archived DWARF debug symbol files on Mac OS X. 3540 # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
3538 DSYMUTIL=$lt_DSYMUTIL 3541 DSYMUTIL=$lt_DSYMUTIL
3539 3542
3540@@ -16777,12 +17477,12 @@ with_gcc=$GCC 3543@@ -18394,12 +19094,12 @@ with_gcc=$GCC
3541 # Compiler flag to turn off builtin functions. 3544 # Compiler flag to turn off builtin functions.
3542 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag 3545 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
3543 3546
@@ -3553,7 +3556,7 @@ index 4cd196ab74b..dca6f77919d 100755
3553 # Compiler flag to prevent dynamic linking. 3556 # Compiler flag to prevent dynamic linking.
3554 link_static_flag=$lt_lt_prog_compiler_static 3557 link_static_flag=$lt_lt_prog_compiler_static
3555 3558
3556@@ -16869,9 +17569,6 @@ inherit_rpath=$inherit_rpath 3559@@ -18486,9 +19186,6 @@ inherit_rpath=$inherit_rpath
3557 # Whether libtool must link a program against all its dependency libraries. 3560 # Whether libtool must link a program against all its dependency libraries.
3558 link_all_deplibs=$link_all_deplibs 3561 link_all_deplibs=$link_all_deplibs
3559 3562
@@ -3563,7 +3566,7 @@ index 4cd196ab74b..dca6f77919d 100755
3563 # Set to "yes" if exported symbols are required. 3566 # Set to "yes" if exported symbols are required.
3564 always_export_symbols=$always_export_symbols 3567 always_export_symbols=$always_export_symbols
3565 3568
3566@@ -16887,6 +17584,9 @@ include_expsyms=$lt_include_expsyms 3569@@ -18504,6 +19201,9 @@ include_expsyms=$lt_include_expsyms
3567 # Commands necessary for linking programs (against libraries) with templates. 3570 # Commands necessary for linking programs (against libraries) with templates.
3568 prelink_cmds=$lt_prelink_cmds 3571 prelink_cmds=$lt_prelink_cmds
3569 3572
@@ -3573,7 +3576,7 @@ index 4cd196ab74b..dca6f77919d 100755
3573 # Specify filename containing input files. 3576 # Specify filename containing input files.
3574 file_list_spec=$lt_file_list_spec 3577 file_list_spec=$lt_file_list_spec
3575 3578
3576@@ -16919,210 +17619,169 @@ ltmain="$ac_aux_dir/ltmain.sh" 3579@@ -18536,210 +19236,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
3577 # if finds mixed CR/LF and LF-only lines. Since sed operates in 3580 # if finds mixed CR/LF and LF-only lines. Since sed operates in
3578 # text mode, it properly converts lines to CR/LF. This bash problem 3581 # text mode, it properly converts lines to CR/LF. This bash problem
3579 # is reportedly fixed, but why not run on old versions too? 3582 # is reportedly fixed, but why not run on old versions too?
@@ -3948,10 +3951,10 @@ index 4cd196ab74b..dca6f77919d 100755
3948 chmod +x "$ofile" 3951 chmod +x "$ofile"
3949 3952
3950diff --git a/gas/Makefile.in b/gas/Makefile.in 3953diff --git a/gas/Makefile.in b/gas/Makefile.in
3951index 427f42dfa3a..ec6615d34e3 100644 3954index bc25765cb5b..c481d96a05a 100644
3952--- a/gas/Makefile.in 3955--- a/gas/Makefile.in
3953+++ b/gas/Makefile.in 3956+++ b/gas/Makefile.in
3954@@ -377,6 +377,7 @@ CYGPATH_W = @CYGPATH_W@ 3957@@ -384,6 +384,7 @@ CYGPATH_W = @CYGPATH_W@
3955 DATADIRNAME = @DATADIRNAME@ 3958 DATADIRNAME = @DATADIRNAME@
3956 DEFS = @DEFS@ 3959 DEFS = @DEFS@
3957 DEPDIR = @DEPDIR@ 3960 DEPDIR = @DEPDIR@
@@ -3959,7 +3962,7 @@ index 427f42dfa3a..ec6615d34e3 100644
3959 DSYMUTIL = @DSYMUTIL@ 3962 DSYMUTIL = @DSYMUTIL@
3960 DUMPBIN = @DUMPBIN@ 3963 DUMPBIN = @DUMPBIN@
3961 ECHO_C = @ECHO_C@ 3964 ECHO_C = @ECHO_C@
3962@@ -413,6 +414,7 @@ LN_S = @LN_S@ 3965@@ -425,6 +426,7 @@ LTLIBINTL = @LTLIBINTL@
3963 LTLIBOBJS = @LTLIBOBJS@ 3966 LTLIBOBJS = @LTLIBOBJS@
3964 MAINT = @MAINT@ 3967 MAINT = @MAINT@
3965 MAKEINFO = @MAKEINFO@ 3968 MAKEINFO = @MAKEINFO@
@@ -3967,7 +3970,7 @@ index 427f42dfa3a..ec6615d34e3 100644
3967 MKDIR_P = @MKDIR_P@ 3970 MKDIR_P = @MKDIR_P@
3968 MKINSTALLDIRS = @MKINSTALLDIRS@ 3971 MKINSTALLDIRS = @MKINSTALLDIRS@
3969 MSGFMT = @MSGFMT@ 3972 MSGFMT = @MSGFMT@
3970@@ -456,6 +458,7 @@ abs_builddir = @abs_builddir@ 3973@@ -468,6 +470,7 @@ abs_builddir = @abs_builddir@
3971 abs_srcdir = @abs_srcdir@ 3974 abs_srcdir = @abs_srcdir@
3972 abs_top_builddir = @abs_top_builddir@ 3975 abs_top_builddir = @abs_top_builddir@
3973 abs_top_srcdir = @abs_top_srcdir@ 3976 abs_top_srcdir = @abs_top_srcdir@
@@ -3976,10 +3979,10 @@ index 427f42dfa3a..ec6615d34e3 100644
3976 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ 3979 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
3977 am__include = @am__include@ 3980 am__include = @am__include@
3978diff --git a/gas/configure b/gas/configure 3981diff --git a/gas/configure b/gas/configure
3979index db1b80fc907..4bdd9705d8d 100755 3982index e4c4bcb69a5..63ee2a1445d 100755
3980--- a/gas/configure 3983--- a/gas/configure
3981+++ b/gas/configure 3984+++ b/gas/configure
3982@@ -686,8 +686,11 @@ OTOOL 3985@@ -692,8 +692,11 @@ OTOOL
3983 LIPO 3986 LIPO
3984 NMEDIT 3987 NMEDIT
3985 DSYMUTIL 3988 DSYMUTIL
@@ -3991,7 +3994,7 @@ index db1b80fc907..4bdd9705d8d 100755
3991 OBJDUMP 3994 OBJDUMP
3992 LN_S 3995 LN_S
3993 NM 3996 NM
3994@@ -804,6 +807,7 @@ enable_static 3997@@ -810,6 +813,7 @@ enable_static
3995 with_pic 3998 with_pic
3996 enable_fast_install 3999 enable_fast_install
3997 with_gnu_ld 4000 with_gnu_ld
@@ -3999,7 +4002,7 @@ index db1b80fc907..4bdd9705d8d 100755
3999 enable_libtool_lock 4002 enable_libtool_lock
4000 enable_plugins 4003 enable_plugins
4001 enable_largefile 4004 enable_largefile
4002@@ -1505,6 +1509,8 @@ Optional Packages: 4005@@ -1517,6 +1521,8 @@ Optional Packages:
4003 --with-pic try to use only PIC/non-PIC objects [default=use 4006 --with-pic try to use only PIC/non-PIC objects [default=use
4004 both] 4007 both]
4005 --with-gnu-ld assume the C compiler uses GNU ld [default=no] 4008 --with-gnu-ld assume the C compiler uses GNU ld [default=no]
@@ -4007,8 +4010,8 @@ index db1b80fc907..4bdd9705d8d 100755
4007+ (or the compiler's sysroot if not specified). 4010+ (or the compiler's sysroot if not specified).
4008 --with-cpu=CPU default cpu variant is CPU (currently only supported 4011 --with-cpu=CPU default cpu variant is CPU (currently only supported
4009 on ARC) 4012 on ARC)
4010 --with-system-zlib use installed libz 4013 --with-gnu-ld assume the C compiler uses GNU ld default=no
4011@@ -4632,8 +4638,8 @@ esac 4014@@ -4652,8 +4658,8 @@ esac
4012 4015
4013 4016
4014 4017
@@ -4019,7 +4022,7 @@ index db1b80fc907..4bdd9705d8d 100755
4019 4022
4020 4023
4021 4024
4022@@ -4673,7 +4679,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO 4025@@ -4693,7 +4699,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
4023 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 4026 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
4024 $as_echo_n "checking how to print strings... " >&6; } 4027 $as_echo_n "checking how to print strings... " >&6; }
4025 # Test print first, because it will be a builtin if present. 4028 # Test print first, because it will be a builtin if present.
@@ -4028,7 +4031,7 @@ index db1b80fc907..4bdd9705d8d 100755
4028 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then 4031 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
4029 ECHO='print -r --' 4032 ECHO='print -r --'
4030 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then 4033 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
4031@@ -5366,8 +5372,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; 4034@@ -5386,8 +5392,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6;
4032 # Try some XSI features 4035 # Try some XSI features
4033 xsi_shell=no 4036 xsi_shell=no
4034 ( _lt_dummy="a/b/c" 4037 ( _lt_dummy="a/b/c"
@@ -4039,7 +4042,7 @@ index db1b80fc907..4bdd9705d8d 100755
4039 && eval 'test $(( 1 + 1 )) -eq 2 \ 4042 && eval 'test $(( 1 + 1 )) -eq 2 \
4040 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ 4043 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
4041 && xsi_shell=yes 4044 && xsi_shell=yes
4042@@ -5416,6 +5422,80 @@ esac 4045@@ -5436,6 +5442,80 @@ esac
4043 4046
4044 4047
4045 4048
@@ -4120,7 +4123,7 @@ index db1b80fc907..4bdd9705d8d 100755
4120 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 4123 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
4121 $as_echo_n "checking for $LD option to reload object files... " >&6; } 4124 $as_echo_n "checking for $LD option to reload object files... " >&6; }
4122 if ${lt_cv_ld_reload_flag+:} false; then : 4125 if ${lt_cv_ld_reload_flag+:} false; then :
4123@@ -5432,6 +5512,11 @@ case $reload_flag in 4126@@ -5452,6 +5532,11 @@ case $reload_flag in
4124 esac 4127 esac
4125 reload_cmds='$LD$reload_flag -o $output$reload_objs' 4128 reload_cmds='$LD$reload_flag -o $output$reload_objs'
4126 case $host_os in 4129 case $host_os in
@@ -4132,7 +4135,7 @@ index db1b80fc907..4bdd9705d8d 100755
4132 darwin*) 4135 darwin*)
4133 if test "$GCC" = yes; then 4136 if test "$GCC" = yes; then
4134 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' 4137 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
4135@@ -5600,7 +5685,8 @@ mingw* | pw32*) 4138@@ -5620,7 +5705,8 @@ mingw* | pw32*)
4136 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' 4139 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
4137 lt_cv_file_magic_cmd='func_win32_libid' 4140 lt_cv_file_magic_cmd='func_win32_libid'
4138 else 4141 else
@@ -4142,7 +4145,7 @@ index db1b80fc907..4bdd9705d8d 100755
4142 lt_cv_file_magic_cmd='$OBJDUMP -f' 4145 lt_cv_file_magic_cmd='$OBJDUMP -f'
4143 fi 4146 fi
4144 ;; 4147 ;;
4145@@ -5754,6 +5840,21 @@ esac 4148@@ -5779,6 +5865,21 @@ esac
4146 fi 4149 fi
4147 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 4150 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
4148 $as_echo "$lt_cv_deplibs_check_method" >&6; } 4151 $as_echo "$lt_cv_deplibs_check_method" >&6; }
@@ -4164,7 +4167,7 @@ index db1b80fc907..4bdd9705d8d 100755
4164 file_magic_cmd=$lt_cv_file_magic_cmd 4167 file_magic_cmd=$lt_cv_file_magic_cmd
4165 deplibs_check_method=$lt_cv_deplibs_check_method 4168 deplibs_check_method=$lt_cv_deplibs_check_method
4166 test -z "$deplibs_check_method" && deplibs_check_method=unknown 4169 test -z "$deplibs_check_method" && deplibs_check_method=unknown
4167@@ -5769,6 +5870,157 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown 4170@@ -5794,6 +5895,157 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
4168 4171
4169 4172
4170 4173
@@ -4322,7 +4325,7 @@ index db1b80fc907..4bdd9705d8d 100755
4322 plugin_option= 4325 plugin_option=
4323 plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll" 4326 plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll"
4324 for plugin in $plugin_names; do 4327 for plugin in $plugin_names; do
4325@@ -5783,8 +6035,10 @@ for plugin in $plugin_names; do 4328@@ -5808,8 +6060,10 @@ for plugin in $plugin_names; do
4326 done 4329 done
4327 4330
4328 if test -n "$ac_tool_prefix"; then 4331 if test -n "$ac_tool_prefix"; then
@@ -4335,7 +4338,7 @@ index db1b80fc907..4bdd9705d8d 100755
4335 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 4338 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
4336 $as_echo_n "checking for $ac_word... " >&6; } 4339 $as_echo_n "checking for $ac_word... " >&6; }
4337 if ${ac_cv_prog_AR+:} false; then : 4340 if ${ac_cv_prog_AR+:} false; then :
4338@@ -5800,7 +6054,7 @@ do 4341@@ -5825,7 +6079,7 @@ do
4339 test -z "$as_dir" && as_dir=. 4342 test -z "$as_dir" && as_dir=.
4340 for ac_exec_ext in '' $ac_executable_extensions; do 4343 for ac_exec_ext in '' $ac_executable_extensions; do
4341 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 4344 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
@@ -4344,7 +4347,7 @@ index db1b80fc907..4bdd9705d8d 100755
4344 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 4347 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
4345 break 2 4348 break 2
4346 fi 4349 fi
4347@@ -5820,11 +6074,15 @@ $as_echo "no" >&6; } 4350@@ -5845,11 +6099,15 @@ $as_echo "no" >&6; }
4348 fi 4351 fi
4349 4352
4350 4353
@@ -4363,7 +4366,7 @@ index db1b80fc907..4bdd9705d8d 100755
4363 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 4366 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
4364 $as_echo_n "checking for $ac_word... " >&6; } 4367 $as_echo_n "checking for $ac_word... " >&6; }
4365 if ${ac_cv_prog_ac_ct_AR+:} false; then : 4368 if ${ac_cv_prog_ac_ct_AR+:} false; then :
4366@@ -5840,7 +6098,7 @@ do 4369@@ -5865,7 +6123,7 @@ do
4367 test -z "$as_dir" && as_dir=. 4370 test -z "$as_dir" && as_dir=.
4368 for ac_exec_ext in '' $ac_executable_extensions; do 4371 for ac_exec_ext in '' $ac_executable_extensions; do
4369 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 4372 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
@@ -4372,7 +4375,7 @@ index db1b80fc907..4bdd9705d8d 100755
4372 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 4375 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
4373 break 2 4376 break 2
4374 fi 4377 fi
4375@@ -5859,6 +6117,10 @@ else 4378@@ -5884,6 +6142,10 @@ else
4376 $as_echo "no" >&6; } 4379 $as_echo "no" >&6; }
4377 fi 4380 fi
4378 4381
@@ -4383,7 +4386,7 @@ index db1b80fc907..4bdd9705d8d 100755
4383 if test "x$ac_ct_AR" = x; then 4386 if test "x$ac_ct_AR" = x; then
4384 AR="false" 4387 AR="false"
4385 else 4388 else
4386@@ -5870,29 +6132,81 @@ ac_tool_warned=yes ;; 4389@@ -5895,29 +6157,81 @@ ac_tool_warned=yes ;;
4387 esac 4390 esac
4388 AR=$ac_ct_AR 4391 AR=$ac_ct_AR
4389 fi 4392 fi
@@ -4480,7 +4483,7 @@ index db1b80fc907..4bdd9705d8d 100755
4480 4483
4481 4484
4482 4485
4483@@ -6239,8 +6553,8 @@ esac 4486@@ -6264,8 +6578,8 @@ esac
4484 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" 4487 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
4485 4488
4486 # Transform an extracted symbol line into symbol name and symbol address 4489 # Transform an extracted symbol line into symbol name and symbol address
@@ -4491,7 +4494,7 @@ index db1b80fc907..4bdd9705d8d 100755
4491 4494
4492 # Handle CRLF in mingw tool chain 4495 # Handle CRLF in mingw tool chain
4493 opt_cr= 4496 opt_cr=
4494@@ -6276,6 +6590,7 @@ for ac_symprfx in "" "_"; do 4497@@ -6301,6 +6615,7 @@ for ac_symprfx in "" "_"; do
4495 else 4498 else
4496 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" 4499 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
4497 fi 4500 fi
@@ -4499,7 +4502,7 @@ index db1b80fc907..4bdd9705d8d 100755
4499 4502
4500 # Check to see that the pipe works correctly. 4503 # Check to see that the pipe works correctly.
4501 pipe_works=no 4504 pipe_works=no
4502@@ -6317,6 +6632,18 @@ _LT_EOF 4505@@ -6342,6 +6657,18 @@ _LT_EOF
4503 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then 4506 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
4504 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then 4507 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
4505 cat <<_LT_EOF > conftest.$ac_ext 4508 cat <<_LT_EOF > conftest.$ac_ext
@@ -4518,7 +4521,7 @@ index db1b80fc907..4bdd9705d8d 100755
4518 #ifdef __cplusplus 4521 #ifdef __cplusplus
4519 extern "C" { 4522 extern "C" {
4520 #endif 4523 #endif
4521@@ -6328,7 +6655,7 @@ _LT_EOF 4524@@ -6353,7 +6680,7 @@ _LT_EOF
4522 cat <<_LT_EOF >> conftest.$ac_ext 4525 cat <<_LT_EOF >> conftest.$ac_ext
4523 4526
4524 /* The mapping between symbol names and symbols. */ 4527 /* The mapping between symbol names and symbols. */
@@ -4527,7 +4530,7 @@ index db1b80fc907..4bdd9705d8d 100755
4527 const char *name; 4530 const char *name;
4528 void *address; 4531 void *address;
4529 } 4532 }
4530@@ -6354,8 +6681,8 @@ static const void *lt_preloaded_setup() { 4533@@ -6379,8 +6706,8 @@ static const void *lt_preloaded_setup() {
4531 _LT_EOF 4534 _LT_EOF
4532 # Now try linking the two files. 4535 # Now try linking the two files.
4533 mv conftest.$ac_objext conftstm.$ac_objext 4536 mv conftest.$ac_objext conftstm.$ac_objext
@@ -4538,7 +4541,7 @@ index db1b80fc907..4bdd9705d8d 100755
4538 LIBS="conftstm.$ac_objext" 4541 LIBS="conftstm.$ac_objext"
4539 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" 4542 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
4540 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 4543 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
4541@@ -6365,8 +6692,8 @@ _LT_EOF 4544@@ -6390,8 +6717,8 @@ _LT_EOF
4542 test $ac_status = 0; } && test -s conftest${ac_exeext}; then 4545 test $ac_status = 0; } && test -s conftest${ac_exeext}; then
4543 pipe_works=yes 4546 pipe_works=yes
4544 fi 4547 fi
@@ -4549,7 +4552,7 @@ index db1b80fc907..4bdd9705d8d 100755
4549 else 4552 else
4550 echo "cannot find nm_test_func in $nlist" >&5 4553 echo "cannot find nm_test_func in $nlist" >&5
4551 fi 4554 fi
4552@@ -6403,6 +6730,19 @@ else 4555@@ -6428,6 +6755,19 @@ else
4553 $as_echo "ok" >&6; } 4556 $as_echo "ok" >&6; }
4554 fi 4557 fi
4555 4558
@@ -4569,7 +4572,7 @@ index db1b80fc907..4bdd9705d8d 100755
4569 4572
4570 4573
4571 4574
4572@@ -6419,6 +6759,42 @@ fi 4575@@ -6444,6 +6784,42 @@ fi
4573 4576
4574 4577
4575 4578
@@ -4612,7 +4615,7 @@ index db1b80fc907..4bdd9705d8d 100755
4612 4615
4613 4616
4614 4617
4615@@ -6630,6 +7006,123 @@ esac 4618@@ -6655,6 +7031,123 @@ esac
4616 4619
4617 need_locks="$enable_libtool_lock" 4620 need_locks="$enable_libtool_lock"
4618 4621
@@ -4736,7 +4739,7 @@ index db1b80fc907..4bdd9705d8d 100755
4736 4739
4737 case $host_os in 4740 case $host_os in
4738 rhapsody* | darwin*) 4741 rhapsody* | darwin*)
4739@@ -7193,6 +7686,8 @@ _LT_EOF 4742@@ -7218,6 +7711,8 @@ _LT_EOF
4740 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 4743 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
4741 echo "$AR cru libconftest.a conftest.o" >&5 4744 echo "$AR cru libconftest.a conftest.o" >&5
4742 $AR cru libconftest.a conftest.o 2>&5 4745 $AR cru libconftest.a conftest.o 2>&5
@@ -4745,7 +4748,7 @@ index db1b80fc907..4bdd9705d8d 100755
4745 cat > conftest.c << _LT_EOF 4748 cat > conftest.c << _LT_EOF
4746 int main() { return 0;} 4749 int main() { return 0;}
4747 _LT_EOF 4750 _LT_EOF
4748@@ -7775,8 +8270,6 @@ fi 4751@@ -7802,8 +8297,6 @@ fi
4749 lt_prog_compiler_pic= 4752 lt_prog_compiler_pic=
4750 lt_prog_compiler_static= 4753 lt_prog_compiler_static=
4751 4754
@@ -4754,7 +4757,7 @@ index db1b80fc907..4bdd9705d8d 100755
4754 4757
4755 if test "$GCC" = yes; then 4758 if test "$GCC" = yes; then
4756 lt_prog_compiler_wl='-Wl,' 4759 lt_prog_compiler_wl='-Wl,'
4757@@ -7942,6 +8435,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 4760@@ -7969,6 +8462,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
4758 lt_prog_compiler_pic='--shared' 4761 lt_prog_compiler_pic='--shared'
4759 lt_prog_compiler_static='--static' 4762 lt_prog_compiler_static='--static'
4760 ;; 4763 ;;
@@ -4767,7 +4770,7 @@ index db1b80fc907..4bdd9705d8d 100755
4767 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) 4770 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
4768 # Portland Group compilers (*not* the Pentium gcc compiler, 4771 # Portland Group compilers (*not* the Pentium gcc compiler,
4769 # which looks to be a dead project) 4772 # which looks to be a dead project)
4770@@ -8004,7 +8503,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 4773@@ -8031,7 +8530,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
4771 lt_prog_compiler_pic='-KPIC' 4774 lt_prog_compiler_pic='-KPIC'
4772 lt_prog_compiler_static='-Bstatic' 4775 lt_prog_compiler_static='-Bstatic'
4773 case $cc_basename in 4776 case $cc_basename in
@@ -4776,7 +4779,7 @@ index db1b80fc907..4bdd9705d8d 100755
4776 lt_prog_compiler_wl='-Qoption ld ';; 4779 lt_prog_compiler_wl='-Qoption ld ';;
4777 *) 4780 *)
4778 lt_prog_compiler_wl='-Wl,';; 4781 lt_prog_compiler_wl='-Wl,';;
4779@@ -8061,13 +8560,17 @@ case $host_os in 4782@@ -8088,13 +8587,17 @@ case $host_os in
4780 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" 4783 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
4781 ;; 4784 ;;
4782 esac 4785 esac
@@ -4800,7 +4803,7 @@ index db1b80fc907..4bdd9705d8d 100755
4800 4803
4801 # 4804 #
4802 # Check to make sure the PIC flag actually works. 4805 # Check to make sure the PIC flag actually works.
4803@@ -8128,6 +8631,11 @@ fi 4806@@ -8155,6 +8658,11 @@ fi
4804 4807
4805 4808
4806 4809
@@ -4812,7 +4815,7 @@ index db1b80fc907..4bdd9705d8d 100755
4812 # 4815 #
4813 # Check to make sure the static flag actually works. 4816 # Check to make sure the static flag actually works.
4814 # 4817 #
4815@@ -8478,7 +8986,8 @@ _LT_EOF 4818@@ -8505,7 +9013,8 @@ _LT_EOF
4816 allow_undefined_flag=unsupported 4819 allow_undefined_flag=unsupported
4817 always_export_symbols=no 4820 always_export_symbols=no
4818 enable_shared_with_static_runtimes=yes 4821 enable_shared_with_static_runtimes=yes
@@ -4822,7 +4825,7 @@ index db1b80fc907..4bdd9705d8d 100755
4822 4825
4823 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then 4826 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
4824 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' 4827 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
4825@@ -8577,12 +9086,12 @@ _LT_EOF 4828@@ -8604,12 +9113,12 @@ _LT_EOF
4826 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' 4829 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
4827 hardcode_libdir_flag_spec= 4830 hardcode_libdir_flag_spec=
4828 hardcode_libdir_flag_spec_ld='-rpath $libdir' 4831 hardcode_libdir_flag_spec_ld='-rpath $libdir'
@@ -4837,7 +4840,7 @@ index db1b80fc907..4bdd9705d8d 100755
4837 fi 4840 fi
4838 ;; 4841 ;;
4839 esac 4842 esac
4840@@ -8596,8 +9105,8 @@ _LT_EOF 4843@@ -8623,8 +9132,8 @@ _LT_EOF
4841 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' 4844 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
4842 wlarc= 4845 wlarc=
4843 else 4846 else
@@ -4848,7 +4851,7 @@ index db1b80fc907..4bdd9705d8d 100755
4848 fi 4851 fi
4849 ;; 4852 ;;
4850 4853
4851@@ -8615,8 +9124,8 @@ _LT_EOF 4854@@ -8642,8 +9151,8 @@ _LT_EOF
4852 4855
4853 _LT_EOF 4856 _LT_EOF
4854 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 4857 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -4859,7 +4862,7 @@ index db1b80fc907..4bdd9705d8d 100755
4859 else 4862 else
4860 ld_shlibs=no 4863 ld_shlibs=no
4861 fi 4864 fi
4862@@ -8662,8 +9171,8 @@ _LT_EOF 4865@@ -8689,8 +9198,8 @@ _LT_EOF
4863 4866
4864 *) 4867 *)
4865 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 4868 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -4870,7 +4873,7 @@ index db1b80fc907..4bdd9705d8d 100755
4870 else 4873 else
4871 ld_shlibs=no 4874 ld_shlibs=no
4872 fi 4875 fi
4873@@ -8793,7 +9302,13 @@ _LT_EOF 4876@@ -8820,7 +9329,13 @@ _LT_EOF
4874 allow_undefined_flag='-berok' 4877 allow_undefined_flag='-berok'
4875 # Determine the default libpath from the value encoded in an 4878 # Determine the default libpath from the value encoded in an
4876 # empty executable. 4879 # empty executable.
@@ -4885,7 +4888,7 @@ index db1b80fc907..4bdd9705d8d 100755
4885 /* end confdefs.h. */ 4888 /* end confdefs.h. */
4886 4889
4887 int 4890 int
4888@@ -8806,22 +9321,29 @@ main () 4891@@ -8833,22 +9348,29 @@ main ()
4889 _ACEOF 4892 _ACEOF
4890 if ac_fn_c_try_link "$LINENO"; then : 4893 if ac_fn_c_try_link "$LINENO"; then :
4891 4894
@@ -4928,7 +4931,7 @@ index db1b80fc907..4bdd9705d8d 100755
4928 4931
4929 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 4932 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
4930 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" 4933 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"
4931@@ -8833,7 +9355,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 4934@@ -8860,7 +9382,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
4932 else 4935 else
4933 # Determine the default libpath from the value encoded in an 4936 # Determine the default libpath from the value encoded in an
4934 # empty executable. 4937 # empty executable.
@@ -4943,7 +4946,7 @@ index db1b80fc907..4bdd9705d8d 100755
4943 /* end confdefs.h. */ 4946 /* end confdefs.h. */
4944 4947
4945 int 4948 int
4946@@ -8846,22 +9374,29 @@ main () 4949@@ -8873,22 +9401,29 @@ main ()
4947 _ACEOF 4950 _ACEOF
4948 if ac_fn_c_try_link "$LINENO"; then : 4951 if ac_fn_c_try_link "$LINENO"; then :
4949 4952
@@ -4986,7 +4989,7 @@ index db1b80fc907..4bdd9705d8d 100755
4986 4989
4987 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 4990 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
4988 # Warning - without using the other run time loading flags, 4991 # Warning - without using the other run time loading flags,
4989@@ -8906,20 +9441,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 4992@@ -8933,20 +9468,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
4990 # Microsoft Visual C++. 4993 # Microsoft Visual C++.
4991 # hardcode_libdir_flag_spec is actually meaningless, as there is 4994 # hardcode_libdir_flag_spec is actually meaningless, as there is
4992 # no search path for DLLs. 4995 # no search path for DLLs.
@@ -5064,7 +5067,7 @@ index db1b80fc907..4bdd9705d8d 100755
5064 ;; 5067 ;;
5065 5068
5066 darwin* | rhapsody*) 5069 darwin* | rhapsody*)
5067@@ -8980,7 +9558,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 5070@@ -9007,7 +9585,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
5068 5071
5069 # FreeBSD 3 and greater uses gcc -shared to do shared libraries. 5072 # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
5070 freebsd* | dragonfly*) 5073 freebsd* | dragonfly*)
@@ -5073,7 +5076,7 @@ index db1b80fc907..4bdd9705d8d 100755
5073 hardcode_libdir_flag_spec='-R$libdir' 5076 hardcode_libdir_flag_spec='-R$libdir'
5074 hardcode_direct=yes 5077 hardcode_direct=yes
5075 hardcode_shlibpath_var=no 5078 hardcode_shlibpath_var=no
5076@@ -8988,7 +9566,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 5079@@ -9015,7 +9593,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
5077 5080
5078 hpux9*) 5081 hpux9*)
5079 if test "$GCC" = yes; then 5082 if test "$GCC" = yes; then
@@ -5082,7 +5085,7 @@ index db1b80fc907..4bdd9705d8d 100755
5082 else 5085 else
5083 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' 5086 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'
5084 fi 5087 fi
5085@@ -9004,7 +9582,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 5088@@ -9031,7 +9609,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
5086 5089
5087 hpux10*) 5090 hpux10*)
5088 if test "$GCC" = yes && test "$with_gnu_ld" = no; then 5091 if test "$GCC" = yes && test "$with_gnu_ld" = no; then
@@ -5091,8 +5094,8 @@ index db1b80fc907..4bdd9705d8d 100755
5091 else 5094 else
5092 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' 5095 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
5093 fi 5096 fi
5094@@ -9028,10 +9606,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 5097@@ -9055,10 +9633,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
5095 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' 5098 archive_cmds='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
5096 ;; 5099 ;;
5097 ia64*) 5100 ia64*)
5098- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' 5101- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
@@ -5104,7 +5107,7 @@ index db1b80fc907..4bdd9705d8d 100755
5104 ;; 5107 ;;
5105 esac 5108 esac
5106 else 5109 else
5107@@ -9110,23 +9688,36 @@ fi 5110@@ -9137,23 +9715,36 @@ fi
5108 5111
5109 irix5* | irix6* | nonstopux*) 5112 irix5* | irix6* | nonstopux*)
5110 if test "$GCC" = yes; then 5113 if test "$GCC" = yes; then
@@ -5149,7 +5152,7 @@ index db1b80fc907..4bdd9705d8d 100755
5149 else 5152 else
5150 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' 5153 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'
5151 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' 5154 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'
5152@@ -9211,7 +9802,7 @@ rm -f core conftest.err conftest.$ac_objext \ 5155@@ -9238,7 +9829,7 @@ rm -f core conftest.err conftest.$ac_objext \
5153 osf4* | osf5*) # as osf3* with the addition of -msym flag 5156 osf4* | osf5*) # as osf3* with the addition of -msym flag
5154 if test "$GCC" = yes; then 5157 if test "$GCC" = yes; then
5155 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' 5158 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
@@ -5158,7 +5161,7 @@ index db1b80fc907..4bdd9705d8d 100755
5158 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' 5161 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
5159 else 5162 else
5160 allow_undefined_flag=' -expect_unresolved \*' 5163 allow_undefined_flag=' -expect_unresolved \*'
5161@@ -9230,9 +9821,9 @@ rm -f core conftest.err conftest.$ac_objext \ 5164@@ -9257,9 +9848,9 @@ rm -f core conftest.err conftest.$ac_objext \
5162 no_undefined_flag=' -z defs' 5165 no_undefined_flag=' -z defs'
5163 if test "$GCC" = yes; then 5166 if test "$GCC" = yes; then
5164 wlarc='${wl}' 5167 wlarc='${wl}'
@@ -5170,7 +5173,7 @@ index db1b80fc907..4bdd9705d8d 100755
5170 else 5173 else
5171 case `$CC -V 2>&1` in 5174 case `$CC -V 2>&1` in
5172 *"Compilers 5.0"*) 5175 *"Compilers 5.0"*)
5173@@ -9808,8 +10399,9 @@ cygwin* | mingw* | pw32* | cegcc*) 5176@@ -9835,8 +10426,9 @@ cygwin* | mingw* | pw32* | cegcc*)
5174 need_version=no 5177 need_version=no
5175 need_lib_prefix=no 5178 need_lib_prefix=no
5176 5179
@@ -5182,7 +5185,7 @@ index db1b80fc907..4bdd9705d8d 100755
5182 library_names_spec='$libname.dll.a' 5185 library_names_spec='$libname.dll.a'
5183 # DLL is installed to $(libdir)/../bin by postinstall_cmds 5186 # DLL is installed to $(libdir)/../bin by postinstall_cmds
5184 postinstall_cmds='base_file=`basename \${file}`~ 5187 postinstall_cmds='base_file=`basename \${file}`~
5185@@ -9842,13 +10434,71 @@ cygwin* | mingw* | pw32* | cegcc*) 5188@@ -9869,13 +10461,71 @@ cygwin* | mingw* | pw32* | cegcc*)
5186 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' 5189 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
5187 ;; 5190 ;;
5188 esac 5191 esac
@@ -5255,16 +5258,16 @@ index db1b80fc907..4bdd9705d8d 100755
5255 # FIXME: first we should search . and the directory the executable is in 5258 # FIXME: first we should search . and the directory the executable is in
5256 shlibpath_var=PATH 5259 shlibpath_var=PATH
5257 ;; 5260 ;;
5258@@ -10726,7 +11376,7 @@ else 5261@@ -10777,7 +11427,7 @@ else
5259 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 5262 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
5260 lt_status=$lt_dlunknown 5263 lt_status=$lt_dlunknown
5261 cat > conftest.$ac_ext <<_LT_EOF 5264 cat > conftest.$ac_ext <<_LT_EOF
5262-#line 10729 "configure" 5265-#line 10780 "configure"
5263+#line $LINENO "configure" 5266+#line $LINENO "configure"
5264 #include "confdefs.h" 5267 #include "confdefs.h"
5265 5268
5266 #if HAVE_DLFCN_H 5269 #if HAVE_DLFCN_H
5267@@ -10770,10 +11420,10 @@ else 5270@@ -10821,10 +11471,10 @@ else
5268 /* When -fvisbility=hidden is used, assume the code has been annotated 5271 /* When -fvisbility=hidden is used, assume the code has been annotated
5269 correspondingly for the symbols needed. */ 5272 correspondingly for the symbols needed. */
5270 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 5273 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
@@ -5277,16 +5280,16 @@ index db1b80fc907..4bdd9705d8d 100755
5277 int main () 5280 int main ()
5278 { 5281 {
5279 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 5282 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
5280@@ -10832,7 +11482,7 @@ else 5283@@ -10883,7 +11533,7 @@ else
5281 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 5284 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
5282 lt_status=$lt_dlunknown 5285 lt_status=$lt_dlunknown
5283 cat > conftest.$ac_ext <<_LT_EOF 5286 cat > conftest.$ac_ext <<_LT_EOF
5284-#line 10835 "configure" 5287-#line 10886 "configure"
5285+#line $LINENO "configure" 5288+#line $LINENO "configure"
5286 #include "confdefs.h" 5289 #include "confdefs.h"
5287 5290
5288 #if HAVE_DLFCN_H 5291 #if HAVE_DLFCN_H
5289@@ -10876,10 +11526,10 @@ else 5292@@ -10927,10 +11577,10 @@ else
5290 /* When -fvisbility=hidden is used, assume the code has been annotated 5293 /* When -fvisbility=hidden is used, assume the code has been annotated
5291 correspondingly for the symbols needed. */ 5294 correspondingly for the symbols needed. */
5292 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 5295 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
@@ -5299,7 +5302,7 @@ index db1b80fc907..4bdd9705d8d 100755
5299 int main () 5302 int main ()
5300 { 5303 {
5301 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 5304 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
5302@@ -15132,13 +15782,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' 5305@@ -17080,13 +17730,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
5303 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' 5306 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
5304 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' 5307 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
5305 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' 5308 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
@@ -5320,7 +5323,7 @@ index db1b80fc907..4bdd9705d8d 100755
5320 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' 5323 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
5321 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' 5324 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
5322 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' 5325 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
5323@@ -15153,14 +15810,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de 5326@@ -17101,14 +17758,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de
5324 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' 5327 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
5325 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' 5328 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
5326 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`' 5329 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`'
@@ -5339,7 +5342,7 @@ index db1b80fc907..4bdd9705d8d 100755
5339 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' 5342 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
5340 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' 5343 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
5341 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' 5344 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
5342@@ -15193,12 +15853,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q 5345@@ -17141,12 +17801,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q
5343 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' 5346 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
5344 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' 5347 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
5345 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' 5348 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
@@ -5353,7 +5356,7 @@ index db1b80fc907..4bdd9705d8d 100755
5353 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' 5356 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
5354 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' 5357 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
5355 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' 5358 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
5356@@ -15253,8 +15913,13 @@ reload_flag \ 5359@@ -17201,8 +17861,13 @@ reload_flag \
5357 OBJDUMP \ 5360 OBJDUMP \
5358 deplibs_check_method \ 5361 deplibs_check_method \
5359 file_magic_cmd \ 5362 file_magic_cmd \
@@ -5367,7 +5370,7 @@ index db1b80fc907..4bdd9705d8d 100755
5367 STRIP \ 5370 STRIP \
5368 RANLIB \ 5371 RANLIB \
5369 CC \ 5372 CC \
5370@@ -15264,12 +15929,14 @@ lt_cv_sys_global_symbol_pipe \ 5373@@ -17212,12 +17877,14 @@ lt_cv_sys_global_symbol_pipe \
5371 lt_cv_sys_global_symbol_to_cdecl \ 5374 lt_cv_sys_global_symbol_to_cdecl \
5372 lt_cv_sys_global_symbol_to_c_name_address \ 5375 lt_cv_sys_global_symbol_to_c_name_address \
5373 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ 5376 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
@@ -5383,7 +5386,7 @@ index db1b80fc907..4bdd9705d8d 100755
5383 DSYMUTIL \ 5386 DSYMUTIL \
5384 NMEDIT \ 5387 NMEDIT \
5385 LIPO \ 5388 LIPO \
5386@@ -15285,7 +15952,6 @@ no_undefined_flag \ 5389@@ -17233,7 +17900,6 @@ no_undefined_flag \
5387 hardcode_libdir_flag_spec \ 5390 hardcode_libdir_flag_spec \
5388 hardcode_libdir_flag_spec_ld \ 5391 hardcode_libdir_flag_spec_ld \
5389 hardcode_libdir_separator \ 5392 hardcode_libdir_separator \
@@ -5391,7 +5394,7 @@ index db1b80fc907..4bdd9705d8d 100755
5391 exclude_expsyms \ 5394 exclude_expsyms \
5392 include_expsyms \ 5395 include_expsyms \
5393 file_list_spec \ 5396 file_list_spec \
5394@@ -15321,6 +15987,7 @@ module_cmds \ 5397@@ -17269,6 +17935,7 @@ module_cmds \
5395 module_expsym_cmds \ 5398 module_expsym_cmds \
5396 export_symbols_cmds \ 5399 export_symbols_cmds \
5397 prelink_cmds \ 5400 prelink_cmds \
@@ -5399,7 +5402,7 @@ index db1b80fc907..4bdd9705d8d 100755
5399 postinstall_cmds \ 5402 postinstall_cmds \
5400 postuninstall_cmds \ 5403 postuninstall_cmds \
5401 finish_cmds \ 5404 finish_cmds \
5402@@ -16093,7 +16760,8 @@ $as_echo X"$file" | 5405@@ -18049,7 +18716,8 @@ $as_echo X"$file" |
5403 # NOTE: Changes made to this file will be lost: look at ltmain.sh. 5406 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
5404 # 5407 #
5405 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 5408 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
@@ -5409,7 +5412,7 @@ index db1b80fc907..4bdd9705d8d 100755
5409 # Written by Gordon Matzigkeit, 1996 5412 # Written by Gordon Matzigkeit, 1996
5410 # 5413 #
5411 # This file is part of GNU Libtool. 5414 # This file is part of GNU Libtool.
5412@@ -16196,19 +16864,42 @@ SP2NL=$lt_lt_SP2NL 5415@@ -18152,19 +18820,42 @@ SP2NL=$lt_lt_SP2NL
5413 # turn newlines into spaces. 5416 # turn newlines into spaces.
5414 NL2SP=$lt_lt_NL2SP 5417 NL2SP=$lt_lt_NL2SP
5415 5418
@@ -5453,7 +5456,7 @@ index db1b80fc907..4bdd9705d8d 100755
5453 # A symbol stripping program. 5456 # A symbol stripping program.
5454 STRIP=$lt_STRIP 5457 STRIP=$lt_STRIP
5455 5458
5456@@ -16238,6 +16929,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address 5459@@ -18194,6 +18885,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
5457 # Transform the output of nm in a C name address pair when lib prefix is needed. 5460 # Transform the output of nm in a C name address pair when lib prefix is needed.
5458 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix 5461 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
5459 5462
@@ -5466,7 +5469,7 @@ index db1b80fc907..4bdd9705d8d 100755
5466 # The name of the directory that contains temporary libtool files. 5469 # The name of the directory that contains temporary libtool files.
5467 objdir=$objdir 5470 objdir=$objdir
5468 5471
5469@@ -16247,6 +16944,9 @@ MAGIC_CMD=$MAGIC_CMD 5472@@ -18203,6 +18900,9 @@ MAGIC_CMD=$MAGIC_CMD
5470 # Must we lock files when doing compilation? 5473 # Must we lock files when doing compilation?
5471 need_locks=$lt_need_locks 5474 need_locks=$lt_need_locks
5472 5475
@@ -5476,7 +5479,7 @@ index db1b80fc907..4bdd9705d8d 100755
5476 # Tool to manipulate archived DWARF debug symbol files on Mac OS X. 5479 # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
5477 DSYMUTIL=$lt_DSYMUTIL 5480 DSYMUTIL=$lt_DSYMUTIL
5478 5481
5479@@ -16361,12 +17061,12 @@ with_gcc=$GCC 5482@@ -18317,12 +19017,12 @@ with_gcc=$GCC
5480 # Compiler flag to turn off builtin functions. 5483 # Compiler flag to turn off builtin functions.
5481 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag 5484 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
5482 5485
@@ -5492,7 +5495,7 @@ index db1b80fc907..4bdd9705d8d 100755
5492 # Compiler flag to prevent dynamic linking. 5495 # Compiler flag to prevent dynamic linking.
5493 link_static_flag=$lt_lt_prog_compiler_static 5496 link_static_flag=$lt_lt_prog_compiler_static
5494 5497
5495@@ -16453,9 +17153,6 @@ inherit_rpath=$inherit_rpath 5498@@ -18409,9 +19109,6 @@ inherit_rpath=$inherit_rpath
5496 # Whether libtool must link a program against all its dependency libraries. 5499 # Whether libtool must link a program against all its dependency libraries.
5497 link_all_deplibs=$link_all_deplibs 5500 link_all_deplibs=$link_all_deplibs
5498 5501
@@ -5502,7 +5505,7 @@ index db1b80fc907..4bdd9705d8d 100755
5502 # Set to "yes" if exported symbols are required. 5505 # Set to "yes" if exported symbols are required.
5503 always_export_symbols=$always_export_symbols 5506 always_export_symbols=$always_export_symbols
5504 5507
5505@@ -16471,6 +17168,9 @@ include_expsyms=$lt_include_expsyms 5508@@ -18427,6 +19124,9 @@ include_expsyms=$lt_include_expsyms
5506 # Commands necessary for linking programs (against libraries) with templates. 5509 # Commands necessary for linking programs (against libraries) with templates.
5507 prelink_cmds=$lt_prelink_cmds 5510 prelink_cmds=$lt_prelink_cmds
5508 5511
@@ -5512,7 +5515,7 @@ index db1b80fc907..4bdd9705d8d 100755
5512 # Specify filename containing input files. 5515 # Specify filename containing input files.
5513 file_list_spec=$lt_file_list_spec 5516 file_list_spec=$lt_file_list_spec
5514 5517
5515@@ -16503,210 +17203,169 @@ ltmain="$ac_aux_dir/ltmain.sh" 5518@@ -18459,210 +19159,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
5516 # if finds mixed CR/LF and LF-only lines. Since sed operates in 5519 # if finds mixed CR/LF and LF-only lines. Since sed operates in
5517 # text mode, it properly converts lines to CR/LF. This bash problem 5520 # text mode, it properly converts lines to CR/LF. This bash problem
5518 # is reportedly fixed, but why not run on old versions too? 5521 # is reportedly fixed, but why not run on old versions too?
@@ -5887,10 +5890,10 @@ index db1b80fc907..4bdd9705d8d 100755
5887 chmod +x "$ofile" 5890 chmod +x "$ofile"
5888 5891
5889diff --git a/gprof/Makefile.in b/gprof/Makefile.in 5892diff --git a/gprof/Makefile.in b/gprof/Makefile.in
5890index c9914e46d7d..1857eb8b5a8 100644 5893index a7398231030..fc7a3d78db0 100644
5891--- a/gprof/Makefile.in 5894--- a/gprof/Makefile.in
5892+++ b/gprof/Makefile.in 5895+++ b/gprof/Makefile.in
5893@@ -321,6 +321,7 @@ CYGPATH_W = @CYGPATH_W@ 5896@@ -327,6 +327,7 @@ CYGPATH_W = @CYGPATH_W@
5894 DATADIRNAME = @DATADIRNAME@ 5897 DATADIRNAME = @DATADIRNAME@
5895 DEFS = @DEFS@ 5898 DEFS = @DEFS@
5896 DEPDIR = @DEPDIR@ 5899 DEPDIR = @DEPDIR@
@@ -5898,7 +5901,7 @@ index c9914e46d7d..1857eb8b5a8 100644
5898 DSYMUTIL = @DSYMUTIL@ 5901 DSYMUTIL = @DSYMUTIL@
5899 DUMPBIN = @DUMPBIN@ 5902 DUMPBIN = @DUMPBIN@
5900 ECHO_C = @ECHO_C@ 5903 ECHO_C = @ECHO_C@
5901@@ -352,6 +353,7 @@ LN_S = @LN_S@ 5904@@ -363,6 +364,7 @@ LTLIBINTL = @LTLIBINTL@
5902 LTLIBOBJS = @LTLIBOBJS@ 5905 LTLIBOBJS = @LTLIBOBJS@
5903 MAINT = @MAINT@ 5906 MAINT = @MAINT@
5904 MAKEINFO = @MAKEINFO@ 5907 MAKEINFO = @MAKEINFO@
@@ -5906,7 +5909,7 @@ index c9914e46d7d..1857eb8b5a8 100644
5906 MKDIR_P = @MKDIR_P@ 5909 MKDIR_P = @MKDIR_P@
5907 MKINSTALLDIRS = @MKINSTALLDIRS@ 5910 MKINSTALLDIRS = @MKINSTALLDIRS@
5908 MSGFMT = @MSGFMT@ 5911 MSGFMT = @MSGFMT@
5909@@ -387,6 +389,7 @@ abs_builddir = @abs_builddir@ 5912@@ -398,6 +400,7 @@ abs_builddir = @abs_builddir@
5910 abs_srcdir = @abs_srcdir@ 5913 abs_srcdir = @abs_srcdir@
5911 abs_top_builddir = @abs_top_builddir@ 5914 abs_top_builddir = @abs_top_builddir@
5912 abs_top_srcdir = @abs_top_srcdir@ 5915 abs_top_srcdir = @abs_top_srcdir@
@@ -5915,10 +5918,10 @@ index c9914e46d7d..1857eb8b5a8 100644
5915 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ 5918 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
5916 am__include = @am__include@ 5919 am__include = @am__include@
5917diff --git a/gprof/configure b/gprof/configure 5920diff --git a/gprof/configure b/gprof/configure
5918index 98ba6d7f5b3..113505b963c 100755 5921index 6d5c3612d3d..b2d9125ab60 100755
5919--- a/gprof/configure 5922--- a/gprof/configure
5920+++ b/gprof/configure 5923+++ b/gprof/configure
5921@@ -663,8 +663,11 @@ OTOOL 5924@@ -669,8 +669,11 @@ OTOOL
5922 LIPO 5925 LIPO
5923 NMEDIT 5926 NMEDIT
5924 DSYMUTIL 5927 DSYMUTIL
@@ -5930,7 +5933,7 @@ index 98ba6d7f5b3..113505b963c 100755
5930 OBJDUMP 5933 OBJDUMP
5931 LN_S 5934 LN_S
5932 NM 5935 NM
5933@@ -781,6 +784,7 @@ enable_static 5936@@ -787,6 +790,7 @@ enable_static
5934 with_pic 5937 with_pic
5935 enable_fast_install 5938 enable_fast_install
5936 with_gnu_ld 5939 with_gnu_ld
@@ -5938,16 +5941,16 @@ index 98ba6d7f5b3..113505b963c 100755
5938 enable_libtool_lock 5941 enable_libtool_lock
5939 enable_plugins 5942 enable_plugins
5940 enable_largefile 5943 enable_largefile
5941@@ -1443,6 +1447,8 @@ Optional Packages: 5944@@ -1462,6 +1466,8 @@ Optional Packages:
5942 --with-pic try to use only PIC/non-PIC objects [default=use 5945 --with-libintl-prefix[=DIR] search for libintl in DIR/include and DIR/lib
5943 both] 5946 --without-libintl-prefix don't search for libintl in includedir and libdir
5944 --with-gnu-ld assume the C compiler uses GNU ld [default=no] 5947 --with-libintl-type=TYPE type of library to search for (auto/static/shared)
5945+ --with-libtool-sysroot=DIR Search for dependent libraries within DIR 5948+ --with-libtool-sysroot=DIR Search for dependent libraries within DIR
5946+ (or the compiler's sysroot if not specified). 5949+ (or the compiler's sysroot if not specified).
5947 5950
5948 Some influential environment variables: 5951 Some influential environment variables:
5949 CC C compiler command 5952 CC C compiler command
5950@@ -4510,8 +4516,8 @@ esac 5953@@ -4530,8 +4536,8 @@ esac
5951 5954
5952 5955
5953 5956
@@ -5958,7 +5961,7 @@ index 98ba6d7f5b3..113505b963c 100755
5958 5961
5959 5962
5960 5963
5961@@ -4551,7 +4557,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO 5964@@ -4571,7 +4577,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
5962 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 5965 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
5963 $as_echo_n "checking how to print strings... " >&6; } 5966 $as_echo_n "checking how to print strings... " >&6; }
5964 # Test print first, because it will be a builtin if present. 5967 # Test print first, because it will be a builtin if present.
@@ -5967,7 +5970,7 @@ index 98ba6d7f5b3..113505b963c 100755
5967 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then 5970 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
5968 ECHO='print -r --' 5971 ECHO='print -r --'
5969 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then 5972 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
5970@@ -5244,8 +5250,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; 5973@@ -5264,8 +5270,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6;
5971 # Try some XSI features 5974 # Try some XSI features
5972 xsi_shell=no 5975 xsi_shell=no
5973 ( _lt_dummy="a/b/c" 5976 ( _lt_dummy="a/b/c"
@@ -5978,7 +5981,7 @@ index 98ba6d7f5b3..113505b963c 100755
5978 && eval 'test $(( 1 + 1 )) -eq 2 \ 5981 && eval 'test $(( 1 + 1 )) -eq 2 \
5979 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ 5982 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
5980 && xsi_shell=yes 5983 && xsi_shell=yes
5981@@ -5294,6 +5300,80 @@ esac 5984@@ -5314,6 +5320,80 @@ esac
5982 5985
5983 5986
5984 5987
@@ -6059,7 +6062,7 @@ index 98ba6d7f5b3..113505b963c 100755
6059 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 6062 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
6060 $as_echo_n "checking for $LD option to reload object files... " >&6; } 6063 $as_echo_n "checking for $LD option to reload object files... " >&6; }
6061 if ${lt_cv_ld_reload_flag+:} false; then : 6064 if ${lt_cv_ld_reload_flag+:} false; then :
6062@@ -5310,6 +5390,11 @@ case $reload_flag in 6065@@ -5330,6 +5410,11 @@ case $reload_flag in
6063 esac 6066 esac
6064 reload_cmds='$LD$reload_flag -o $output$reload_objs' 6067 reload_cmds='$LD$reload_flag -o $output$reload_objs'
6065 case $host_os in 6068 case $host_os in
@@ -6071,7 +6074,7 @@ index 98ba6d7f5b3..113505b963c 100755
6071 darwin*) 6074 darwin*)
6072 if test "$GCC" = yes; then 6075 if test "$GCC" = yes; then
6073 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' 6076 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
6074@@ -5478,7 +5563,8 @@ mingw* | pw32*) 6077@@ -5498,7 +5583,8 @@ mingw* | pw32*)
6075 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' 6078 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
6076 lt_cv_file_magic_cmd='func_win32_libid' 6079 lt_cv_file_magic_cmd='func_win32_libid'
6077 else 6080 else
@@ -6081,7 +6084,7 @@ index 98ba6d7f5b3..113505b963c 100755
6081 lt_cv_file_magic_cmd='$OBJDUMP -f' 6084 lt_cv_file_magic_cmd='$OBJDUMP -f'
6082 fi 6085 fi
6083 ;; 6086 ;;
6084@@ -5632,6 +5718,21 @@ esac 6087@@ -5657,6 +5743,21 @@ esac
6085 fi 6088 fi
6086 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 6089 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
6087 $as_echo "$lt_cv_deplibs_check_method" >&6; } 6090 $as_echo "$lt_cv_deplibs_check_method" >&6; }
@@ -6103,7 +6106,7 @@ index 98ba6d7f5b3..113505b963c 100755
6103 file_magic_cmd=$lt_cv_file_magic_cmd 6106 file_magic_cmd=$lt_cv_file_magic_cmd
6104 deplibs_check_method=$lt_cv_deplibs_check_method 6107 deplibs_check_method=$lt_cv_deplibs_check_method
6105 test -z "$deplibs_check_method" && deplibs_check_method=unknown 6108 test -z "$deplibs_check_method" && deplibs_check_method=unknown
6106@@ -5647,6 +5748,157 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown 6109@@ -5672,6 +5773,157 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
6107 6110
6108 6111
6109 6112
@@ -6261,7 +6264,7 @@ index 98ba6d7f5b3..113505b963c 100755
6261 plugin_option= 6264 plugin_option=
6262 plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll" 6265 plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll"
6263 for plugin in $plugin_names; do 6266 for plugin in $plugin_names; do
6264@@ -5661,8 +5913,10 @@ for plugin in $plugin_names; do 6267@@ -5686,8 +5938,10 @@ for plugin in $plugin_names; do
6265 done 6268 done
6266 6269
6267 if test -n "$ac_tool_prefix"; then 6270 if test -n "$ac_tool_prefix"; then
@@ -6274,7 +6277,7 @@ index 98ba6d7f5b3..113505b963c 100755
6274 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 6277 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
6275 $as_echo_n "checking for $ac_word... " >&6; } 6278 $as_echo_n "checking for $ac_word... " >&6; }
6276 if ${ac_cv_prog_AR+:} false; then : 6279 if ${ac_cv_prog_AR+:} false; then :
6277@@ -5678,7 +5932,7 @@ do 6280@@ -5703,7 +5957,7 @@ do
6278 test -z "$as_dir" && as_dir=. 6281 test -z "$as_dir" && as_dir=.
6279 for ac_exec_ext in '' $ac_executable_extensions; do 6282 for ac_exec_ext in '' $ac_executable_extensions; do
6280 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 6283 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
@@ -6283,7 +6286,7 @@ index 98ba6d7f5b3..113505b963c 100755
6283 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 6286 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
6284 break 2 6287 break 2
6285 fi 6288 fi
6286@@ -5698,11 +5952,15 @@ $as_echo "no" >&6; } 6289@@ -5723,11 +5977,15 @@ $as_echo "no" >&6; }
6287 fi 6290 fi
6288 6291
6289 6292
@@ -6302,7 +6305,7 @@ index 98ba6d7f5b3..113505b963c 100755
6302 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 6305 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
6303 $as_echo_n "checking for $ac_word... " >&6; } 6306 $as_echo_n "checking for $ac_word... " >&6; }
6304 if ${ac_cv_prog_ac_ct_AR+:} false; then : 6307 if ${ac_cv_prog_ac_ct_AR+:} false; then :
6305@@ -5718,7 +5976,7 @@ do 6308@@ -5743,7 +6001,7 @@ do
6306 test -z "$as_dir" && as_dir=. 6309 test -z "$as_dir" && as_dir=.
6307 for ac_exec_ext in '' $ac_executable_extensions; do 6310 for ac_exec_ext in '' $ac_executable_extensions; do
6308 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 6311 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
@@ -6311,7 +6314,7 @@ index 98ba6d7f5b3..113505b963c 100755
6311 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 6314 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
6312 break 2 6315 break 2
6313 fi 6316 fi
6314@@ -5737,6 +5995,10 @@ else 6317@@ -5762,6 +6020,10 @@ else
6315 $as_echo "no" >&6; } 6318 $as_echo "no" >&6; }
6316 fi 6319 fi
6317 6320
@@ -6322,7 +6325,7 @@ index 98ba6d7f5b3..113505b963c 100755
6322 if test "x$ac_ct_AR" = x; then 6325 if test "x$ac_ct_AR" = x; then
6323 AR="false" 6326 AR="false"
6324 else 6327 else
6325@@ -5748,25 +6010,19 @@ ac_tool_warned=yes ;; 6328@@ -5773,25 +6035,19 @@ ac_tool_warned=yes ;;
6326 esac 6329 esac
6327 AR=$ac_ct_AR 6330 AR=$ac_ct_AR
6328 fi 6331 fi
@@ -6357,7 +6360,7 @@ index 98ba6d7f5b3..113505b963c 100755
6357 6360
6358 6361
6359 6362
6360@@ -5778,6 +6034,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru 6363@@ -5803,6 +6059,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru
6361 6364
6362 6365
6363 6366
@@ -6422,7 +6425,7 @@ index 98ba6d7f5b3..113505b963c 100755
6422 if test -n "$ac_tool_prefix"; then 6425 if test -n "$ac_tool_prefix"; then
6423 # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. 6426 # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
6424 set dummy ${ac_tool_prefix}strip; ac_word=$2 6427 set dummy ${ac_tool_prefix}strip; ac_word=$2
6425@@ -6117,8 +6431,8 @@ esac 6428@@ -6142,8 +6456,8 @@ esac
6426 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" 6429 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
6427 6430
6428 # Transform an extracted symbol line into symbol name and symbol address 6431 # Transform an extracted symbol line into symbol name and symbol address
@@ -6433,7 +6436,7 @@ index 98ba6d7f5b3..113505b963c 100755
6433 6436
6434 # Handle CRLF in mingw tool chain 6437 # Handle CRLF in mingw tool chain
6435 opt_cr= 6438 opt_cr=
6436@@ -6154,6 +6468,7 @@ for ac_symprfx in "" "_"; do 6439@@ -6179,6 +6493,7 @@ for ac_symprfx in "" "_"; do
6437 else 6440 else
6438 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" 6441 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
6439 fi 6442 fi
@@ -6441,7 +6444,7 @@ index 98ba6d7f5b3..113505b963c 100755
6441 6444
6442 # Check to see that the pipe works correctly. 6445 # Check to see that the pipe works correctly.
6443 pipe_works=no 6446 pipe_works=no
6444@@ -6195,6 +6510,18 @@ _LT_EOF 6447@@ -6220,6 +6535,18 @@ _LT_EOF
6445 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then 6448 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
6446 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then 6449 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
6447 cat <<_LT_EOF > conftest.$ac_ext 6450 cat <<_LT_EOF > conftest.$ac_ext
@@ -6460,7 +6463,7 @@ index 98ba6d7f5b3..113505b963c 100755
6460 #ifdef __cplusplus 6463 #ifdef __cplusplus
6461 extern "C" { 6464 extern "C" {
6462 #endif 6465 #endif
6463@@ -6206,7 +6533,7 @@ _LT_EOF 6466@@ -6231,7 +6558,7 @@ _LT_EOF
6464 cat <<_LT_EOF >> conftest.$ac_ext 6467 cat <<_LT_EOF >> conftest.$ac_ext
6465 6468
6466 /* The mapping between symbol names and symbols. */ 6469 /* The mapping between symbol names and symbols. */
@@ -6469,7 +6472,7 @@ index 98ba6d7f5b3..113505b963c 100755
6469 const char *name; 6472 const char *name;
6470 void *address; 6473 void *address;
6471 } 6474 }
6472@@ -6232,8 +6559,8 @@ static const void *lt_preloaded_setup() { 6475@@ -6257,8 +6584,8 @@ static const void *lt_preloaded_setup() {
6473 _LT_EOF 6476 _LT_EOF
6474 # Now try linking the two files. 6477 # Now try linking the two files.
6475 mv conftest.$ac_objext conftstm.$ac_objext 6478 mv conftest.$ac_objext conftstm.$ac_objext
@@ -6480,7 +6483,7 @@ index 98ba6d7f5b3..113505b963c 100755
6480 LIBS="conftstm.$ac_objext" 6483 LIBS="conftstm.$ac_objext"
6481 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" 6484 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
6482 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 6485 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
6483@@ -6243,8 +6570,8 @@ _LT_EOF 6486@@ -6268,8 +6595,8 @@ _LT_EOF
6484 test $ac_status = 0; } && test -s conftest${ac_exeext}; then 6487 test $ac_status = 0; } && test -s conftest${ac_exeext}; then
6485 pipe_works=yes 6488 pipe_works=yes
6486 fi 6489 fi
@@ -6491,7 +6494,7 @@ index 98ba6d7f5b3..113505b963c 100755
6491 else 6494 else
6492 echo "cannot find nm_test_func in $nlist" >&5 6495 echo "cannot find nm_test_func in $nlist" >&5
6493 fi 6496 fi
6494@@ -6281,6 +6608,18 @@ else 6497@@ -6306,6 +6633,18 @@ else
6495 $as_echo "ok" >&6; } 6498 $as_echo "ok" >&6; }
6496 fi 6499 fi
6497 6500
@@ -6510,7 +6513,7 @@ index 98ba6d7f5b3..113505b963c 100755
6510 6513
6511 6514
6512 6515
6513@@ -6297,6 +6636,43 @@ fi 6516@@ -6322,6 +6661,43 @@ fi
6514 6517
6515 6518
6516 6519
@@ -6554,7 +6557,7 @@ index 98ba6d7f5b3..113505b963c 100755
6554 6557
6555 6558
6556 6559
6557@@ -6508,6 +6884,123 @@ esac 6560@@ -6533,6 +6909,123 @@ esac
6558 6561
6559 need_locks="$enable_libtool_lock" 6562 need_locks="$enable_libtool_lock"
6560 6563
@@ -6678,7 +6681,7 @@ index 98ba6d7f5b3..113505b963c 100755
6678 6681
6679 case $host_os in 6682 case $host_os in
6680 rhapsody* | darwin*) 6683 rhapsody* | darwin*)
6681@@ -7071,6 +7564,8 @@ _LT_EOF 6684@@ -7096,6 +7589,8 @@ _LT_EOF
6682 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 6685 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
6683 echo "$AR cru libconftest.a conftest.o" >&5 6686 echo "$AR cru libconftest.a conftest.o" >&5
6684 $AR cru libconftest.a conftest.o 2>&5 6687 $AR cru libconftest.a conftest.o 2>&5
@@ -6687,7 +6690,7 @@ index 98ba6d7f5b3..113505b963c 100755
6687 cat > conftest.c << _LT_EOF 6690 cat > conftest.c << _LT_EOF
6688 int main() { return 0;} 6691 int main() { return 0;}
6689 _LT_EOF 6692 _LT_EOF
6690@@ -7653,8 +8148,6 @@ fi 6693@@ -7680,8 +8175,6 @@ fi
6691 lt_prog_compiler_pic= 6694 lt_prog_compiler_pic=
6692 lt_prog_compiler_static= 6695 lt_prog_compiler_static=
6693 6696
@@ -6696,7 +6699,7 @@ index 98ba6d7f5b3..113505b963c 100755
6696 6699
6697 if test "$GCC" = yes; then 6700 if test "$GCC" = yes; then
6698 lt_prog_compiler_wl='-Wl,' 6701 lt_prog_compiler_wl='-Wl,'
6699@@ -7820,6 +8313,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 6702@@ -7847,6 +8340,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
6700 lt_prog_compiler_pic='--shared' 6703 lt_prog_compiler_pic='--shared'
6701 lt_prog_compiler_static='--static' 6704 lt_prog_compiler_static='--static'
6702 ;; 6705 ;;
@@ -6709,7 +6712,7 @@ index 98ba6d7f5b3..113505b963c 100755
6709 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) 6712 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
6710 # Portland Group compilers (*not* the Pentium gcc compiler, 6713 # Portland Group compilers (*not* the Pentium gcc compiler,
6711 # which looks to be a dead project) 6714 # which looks to be a dead project)
6712@@ -7882,7 +8381,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 6715@@ -7909,7 +8408,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
6713 lt_prog_compiler_pic='-KPIC' 6716 lt_prog_compiler_pic='-KPIC'
6714 lt_prog_compiler_static='-Bstatic' 6717 lt_prog_compiler_static='-Bstatic'
6715 case $cc_basename in 6718 case $cc_basename in
@@ -6718,7 +6721,7 @@ index 98ba6d7f5b3..113505b963c 100755
6718 lt_prog_compiler_wl='-Qoption ld ';; 6721 lt_prog_compiler_wl='-Qoption ld ';;
6719 *) 6722 *)
6720 lt_prog_compiler_wl='-Wl,';; 6723 lt_prog_compiler_wl='-Wl,';;
6721@@ -7939,13 +8438,17 @@ case $host_os in 6724@@ -7966,13 +8465,17 @@ case $host_os in
6722 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" 6725 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
6723 ;; 6726 ;;
6724 esac 6727 esac
@@ -6742,7 +6745,7 @@ index 98ba6d7f5b3..113505b963c 100755
6742 6745
6743 # 6746 #
6744 # Check to make sure the PIC flag actually works. 6747 # Check to make sure the PIC flag actually works.
6745@@ -8006,6 +8509,11 @@ fi 6748@@ -8033,6 +8536,11 @@ fi
6746 6749
6747 6750
6748 6751
@@ -6754,7 +6757,7 @@ index 98ba6d7f5b3..113505b963c 100755
6754 # 6757 #
6755 # Check to make sure the static flag actually works. 6758 # Check to make sure the static flag actually works.
6756 # 6759 #
6757@@ -8356,7 +8864,8 @@ _LT_EOF 6760@@ -8383,7 +8891,8 @@ _LT_EOF
6758 allow_undefined_flag=unsupported 6761 allow_undefined_flag=unsupported
6759 always_export_symbols=no 6762 always_export_symbols=no
6760 enable_shared_with_static_runtimes=yes 6763 enable_shared_with_static_runtimes=yes
@@ -6764,7 +6767,7 @@ index 98ba6d7f5b3..113505b963c 100755
6764 6767
6765 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then 6768 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
6766 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' 6769 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
6767@@ -8455,12 +8964,12 @@ _LT_EOF 6770@@ -8482,12 +8991,12 @@ _LT_EOF
6768 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' 6771 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
6769 hardcode_libdir_flag_spec= 6772 hardcode_libdir_flag_spec=
6770 hardcode_libdir_flag_spec_ld='-rpath $libdir' 6773 hardcode_libdir_flag_spec_ld='-rpath $libdir'
@@ -6779,7 +6782,7 @@ index 98ba6d7f5b3..113505b963c 100755
6779 fi 6782 fi
6780 ;; 6783 ;;
6781 esac 6784 esac
6782@@ -8474,8 +8983,8 @@ _LT_EOF 6785@@ -8501,8 +9010,8 @@ _LT_EOF
6783 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' 6786 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
6784 wlarc= 6787 wlarc=
6785 else 6788 else
@@ -6790,7 +6793,7 @@ index 98ba6d7f5b3..113505b963c 100755
6790 fi 6793 fi
6791 ;; 6794 ;;
6792 6795
6793@@ -8493,8 +9002,8 @@ _LT_EOF 6796@@ -8520,8 +9029,8 @@ _LT_EOF
6794 6797
6795 _LT_EOF 6798 _LT_EOF
6796 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 6799 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -6801,7 +6804,7 @@ index 98ba6d7f5b3..113505b963c 100755
6801 else 6804 else
6802 ld_shlibs=no 6805 ld_shlibs=no
6803 fi 6806 fi
6804@@ -8540,8 +9049,8 @@ _LT_EOF 6807@@ -8567,8 +9076,8 @@ _LT_EOF
6805 6808
6806 *) 6809 *)
6807 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 6810 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -6812,7 +6815,7 @@ index 98ba6d7f5b3..113505b963c 100755
6812 else 6815 else
6813 ld_shlibs=no 6816 ld_shlibs=no
6814 fi 6817 fi
6815@@ -8671,7 +9180,13 @@ _LT_EOF 6818@@ -8698,7 +9207,13 @@ _LT_EOF
6816 allow_undefined_flag='-berok' 6819 allow_undefined_flag='-berok'
6817 # Determine the default libpath from the value encoded in an 6820 # Determine the default libpath from the value encoded in an
6818 # empty executable. 6821 # empty executable.
@@ -6827,7 +6830,7 @@ index 98ba6d7f5b3..113505b963c 100755
6827 /* end confdefs.h. */ 6830 /* end confdefs.h. */
6828 6831
6829 int 6832 int
6830@@ -8684,22 +9199,29 @@ main () 6833@@ -8711,22 +9226,29 @@ main ()
6831 _ACEOF 6834 _ACEOF
6832 if ac_fn_c_try_link "$LINENO"; then : 6835 if ac_fn_c_try_link "$LINENO"; then :
6833 6836
@@ -6870,7 +6873,7 @@ index 98ba6d7f5b3..113505b963c 100755
6870 6873
6871 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 6874 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
6872 archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" 6875 archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
6873@@ -8711,7 +9233,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 6876@@ -8738,7 +9260,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
6874 else 6877 else
6875 # Determine the default libpath from the value encoded in an 6878 # Determine the default libpath from the value encoded in an
6876 # empty executable. 6879 # empty executable.
@@ -6885,7 +6888,7 @@ index 98ba6d7f5b3..113505b963c 100755
6885 /* end confdefs.h. */ 6888 /* end confdefs.h. */
6886 6889
6887 int 6890 int
6888@@ -8724,22 +9252,29 @@ main () 6891@@ -8751,22 +9279,29 @@ main ()
6889 _ACEOF 6892 _ACEOF
6890 if ac_fn_c_try_link "$LINENO"; then : 6893 if ac_fn_c_try_link "$LINENO"; then :
6891 6894
@@ -6928,7 +6931,7 @@ index 98ba6d7f5b3..113505b963c 100755
6928 6931
6929 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 6932 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
6930 # Warning - without using the other run time loading flags, 6933 # Warning - without using the other run time loading flags,
6931@@ -8784,20 +9319,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 6934@@ -8811,20 +9346,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
6932 # Microsoft Visual C++. 6935 # Microsoft Visual C++.
6933 # hardcode_libdir_flag_spec is actually meaningless, as there is 6936 # hardcode_libdir_flag_spec is actually meaningless, as there is
6934 # no search path for DLLs. 6937 # no search path for DLLs.
@@ -7006,7 +7009,7 @@ index 98ba6d7f5b3..113505b963c 100755
7006 ;; 7009 ;;
7007 7010
7008 darwin* | rhapsody*) 7011 darwin* | rhapsody*)
7009@@ -8858,7 +9436,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 7012@@ -8885,7 +9463,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
7010 7013
7011 # FreeBSD 3 and greater uses gcc -shared to do shared libraries. 7014 # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
7012 freebsd* | dragonfly*) 7015 freebsd* | dragonfly*)
@@ -7015,7 +7018,7 @@ index 98ba6d7f5b3..113505b963c 100755
7015 hardcode_libdir_flag_spec='-R$libdir' 7018 hardcode_libdir_flag_spec='-R$libdir'
7016 hardcode_direct=yes 7019 hardcode_direct=yes
7017 hardcode_shlibpath_var=no 7020 hardcode_shlibpath_var=no
7018@@ -8866,7 +9444,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 7021@@ -8893,7 +9471,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
7019 7022
7020 hpux9*) 7023 hpux9*)
7021 if test "$GCC" = yes; then 7024 if test "$GCC" = yes; then
@@ -7024,7 +7027,7 @@ index 98ba6d7f5b3..113505b963c 100755
7024 else 7027 else
7025 archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' 7028 archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
7026 fi 7029 fi
7027@@ -8882,7 +9460,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 7030@@ -8909,7 +9487,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
7028 7031
7029 hpux10*) 7032 hpux10*)
7030 if test "$GCC" = yes && test "$with_gnu_ld" = no; then 7033 if test "$GCC" = yes && test "$with_gnu_ld" = no; then
@@ -7033,8 +7036,8 @@ index 98ba6d7f5b3..113505b963c 100755
7033 else 7036 else
7034 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' 7037 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
7035 fi 7038 fi
7036@@ -8906,10 +9484,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 7039@@ -8933,10 +9511,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
7037 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' 7040 archive_cmds='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
7038 ;; 7041 ;;
7039 ia64*) 7042 ia64*)
7040- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' 7043- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
@@ -7046,7 +7049,7 @@ index 98ba6d7f5b3..113505b963c 100755
7046 ;; 7049 ;;
7047 esac 7050 esac
7048 else 7051 else
7049@@ -8988,23 +9566,36 @@ fi 7052@@ -9015,23 +9593,36 @@ fi
7050 7053
7051 irix5* | irix6* | nonstopux*) 7054 irix5* | irix6* | nonstopux*)
7052 if test "$GCC" = yes; then 7055 if test "$GCC" = yes; then
@@ -7091,7 +7094,7 @@ index 98ba6d7f5b3..113505b963c 100755
7091 else 7094 else
7092 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' 7095 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
7093 archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' 7096 archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
7094@@ -9089,7 +9680,7 @@ rm -f core conftest.err conftest.$ac_objext \ 7097@@ -9116,7 +9707,7 @@ rm -f core conftest.err conftest.$ac_objext \
7095 osf4* | osf5*) # as osf3* with the addition of -msym flag 7098 osf4* | osf5*) # as osf3* with the addition of -msym flag
7096 if test "$GCC" = yes; then 7099 if test "$GCC" = yes; then
7097 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' 7100 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
@@ -7100,7 +7103,7 @@ index 98ba6d7f5b3..113505b963c 100755
7100 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' 7103 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
7101 else 7104 else
7102 allow_undefined_flag=' -expect_unresolved \*' 7105 allow_undefined_flag=' -expect_unresolved \*'
7103@@ -9108,9 +9699,9 @@ rm -f core conftest.err conftest.$ac_objext \ 7106@@ -9135,9 +9726,9 @@ rm -f core conftest.err conftest.$ac_objext \
7104 no_undefined_flag=' -z defs' 7107 no_undefined_flag=' -z defs'
7105 if test "$GCC" = yes; then 7108 if test "$GCC" = yes; then
7106 wlarc='${wl}' 7109 wlarc='${wl}'
@@ -7112,7 +7115,7 @@ index 98ba6d7f5b3..113505b963c 100755
7112 else 7115 else
7113 case `$CC -V 2>&1` in 7116 case `$CC -V 2>&1` in
7114 *"Compilers 5.0"*) 7117 *"Compilers 5.0"*)
7115@@ -9686,8 +10277,9 @@ cygwin* | mingw* | pw32* | cegcc*) 7118@@ -9713,8 +10304,9 @@ cygwin* | mingw* | pw32* | cegcc*)
7116 need_version=no 7119 need_version=no
7117 need_lib_prefix=no 7120 need_lib_prefix=no
7118 7121
@@ -7124,7 +7127,7 @@ index 98ba6d7f5b3..113505b963c 100755
7124 library_names_spec='$libname.dll.a' 7127 library_names_spec='$libname.dll.a'
7125 # DLL is installed to $(libdir)/../bin by postinstall_cmds 7128 # DLL is installed to $(libdir)/../bin by postinstall_cmds
7126 postinstall_cmds='base_file=`basename \${file}`~ 7129 postinstall_cmds='base_file=`basename \${file}`~
7127@@ -9720,13 +10312,71 @@ cygwin* | mingw* | pw32* | cegcc*) 7130@@ -9747,13 +10339,71 @@ cygwin* | mingw* | pw32* | cegcc*)
7128 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' 7131 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
7129 ;; 7132 ;;
7130 esac 7133 esac
@@ -7197,16 +7200,16 @@ index 98ba6d7f5b3..113505b963c 100755
7197 # FIXME: first we should search . and the directory the executable is in 7200 # FIXME: first we should search . and the directory the executable is in
7198 shlibpath_var=PATH 7201 shlibpath_var=PATH
7199 ;; 7202 ;;
7200@@ -10604,7 +11254,7 @@ else 7203@@ -10655,7 +11305,7 @@ else
7201 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 7204 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
7202 lt_status=$lt_dlunknown 7205 lt_status=$lt_dlunknown
7203 cat > conftest.$ac_ext <<_LT_EOF 7206 cat > conftest.$ac_ext <<_LT_EOF
7204-#line 10607 "configure" 7207-#line 10658 "configure"
7205+#line $LINENO "configure" 7208+#line $LINENO "configure"
7206 #include "confdefs.h" 7209 #include "confdefs.h"
7207 7210
7208 #if HAVE_DLFCN_H 7211 #if HAVE_DLFCN_H
7209@@ -10648,10 +11298,10 @@ else 7212@@ -10699,10 +11349,10 @@ else
7210 /* When -fvisbility=hidden is used, assume the code has been annotated 7213 /* When -fvisbility=hidden is used, assume the code has been annotated
7211 correspondingly for the symbols needed. */ 7214 correspondingly for the symbols needed. */
7212 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 7215 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
@@ -7219,16 +7222,16 @@ index 98ba6d7f5b3..113505b963c 100755
7219 int main () 7222 int main ()
7220 { 7223 {
7221 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 7224 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
7222@@ -10710,7 +11360,7 @@ else 7225@@ -10761,7 +11411,7 @@ else
7223 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 7226 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
7224 lt_status=$lt_dlunknown 7227 lt_status=$lt_dlunknown
7225 cat > conftest.$ac_ext <<_LT_EOF 7228 cat > conftest.$ac_ext <<_LT_EOF
7226-#line 10713 "configure" 7229-#line 10764 "configure"
7227+#line $LINENO "configure" 7230+#line $LINENO "configure"
7228 #include "confdefs.h" 7231 #include "confdefs.h"
7229 7232
7230 #if HAVE_DLFCN_H 7233 #if HAVE_DLFCN_H
7231@@ -10754,10 +11404,10 @@ else 7234@@ -10805,10 +11455,10 @@ else
7232 /* When -fvisbility=hidden is used, assume the code has been annotated 7235 /* When -fvisbility=hidden is used, assume the code has been annotated
7233 correspondingly for the symbols needed. */ 7236 correspondingly for the symbols needed. */
7234 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 7237 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
@@ -7241,7 +7244,7 @@ index 98ba6d7f5b3..113505b963c 100755
7241 int main () 7244 int main ()
7242 { 7245 {
7243 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 7246 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
7244@@ -12795,13 +13445,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' 7247@@ -14728,13 +15378,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
7245 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' 7248 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
7246 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' 7249 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
7247 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' 7250 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
@@ -7262,7 +7265,7 @@ index 98ba6d7f5b3..113505b963c 100755
7262 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' 7265 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
7263 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' 7266 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
7264 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' 7267 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
7265@@ -12816,14 +13473,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de 7268@@ -14749,14 +15406,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de
7266 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' 7269 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
7267 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' 7270 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
7268 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`' 7271 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`'
@@ -7281,7 +7284,7 @@ index 98ba6d7f5b3..113505b963c 100755
7281 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' 7284 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
7282 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' 7285 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
7283 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' 7286 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
7284@@ -12856,12 +13516,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q 7287@@ -14789,12 +15449,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q
7285 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' 7288 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
7286 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' 7289 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
7287 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' 7290 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
@@ -7295,7 +7298,7 @@ index 98ba6d7f5b3..113505b963c 100755
7295 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' 7298 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
7296 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' 7299 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
7297 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' 7300 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
7298@@ -12916,8 +13576,13 @@ reload_flag \ 7301@@ -14849,8 +15509,13 @@ reload_flag \
7299 OBJDUMP \ 7302 OBJDUMP \
7300 deplibs_check_method \ 7303 deplibs_check_method \
7301 file_magic_cmd \ 7304 file_magic_cmd \
@@ -7309,7 +7312,7 @@ index 98ba6d7f5b3..113505b963c 100755
7309 STRIP \ 7312 STRIP \
7310 RANLIB \ 7313 RANLIB \
7311 CC \ 7314 CC \
7312@@ -12927,12 +13592,14 @@ lt_cv_sys_global_symbol_pipe \ 7315@@ -14860,12 +15525,14 @@ lt_cv_sys_global_symbol_pipe \
7313 lt_cv_sys_global_symbol_to_cdecl \ 7316 lt_cv_sys_global_symbol_to_cdecl \
7314 lt_cv_sys_global_symbol_to_c_name_address \ 7317 lt_cv_sys_global_symbol_to_c_name_address \
7315 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ 7318 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
@@ -7325,7 +7328,7 @@ index 98ba6d7f5b3..113505b963c 100755
7325 DSYMUTIL \ 7328 DSYMUTIL \
7326 NMEDIT \ 7329 NMEDIT \
7327 LIPO \ 7330 LIPO \
7328@@ -12948,7 +13615,6 @@ no_undefined_flag \ 7331@@ -14881,7 +15548,6 @@ no_undefined_flag \
7329 hardcode_libdir_flag_spec \ 7332 hardcode_libdir_flag_spec \
7330 hardcode_libdir_flag_spec_ld \ 7333 hardcode_libdir_flag_spec_ld \
7331 hardcode_libdir_separator \ 7334 hardcode_libdir_separator \
@@ -7333,7 +7336,7 @@ index 98ba6d7f5b3..113505b963c 100755
7333 exclude_expsyms \ 7336 exclude_expsyms \
7334 include_expsyms \ 7337 include_expsyms \
7335 file_list_spec \ 7338 file_list_spec \
7336@@ -12984,6 +13650,7 @@ module_cmds \ 7339@@ -14917,6 +15583,7 @@ module_cmds \
7337 module_expsym_cmds \ 7340 module_expsym_cmds \
7338 export_symbols_cmds \ 7341 export_symbols_cmds \
7339 prelink_cmds \ 7342 prelink_cmds \
@@ -7341,7 +7344,7 @@ index 98ba6d7f5b3..113505b963c 100755
7341 postinstall_cmds \ 7344 postinstall_cmds \
7342 postuninstall_cmds \ 7345 postuninstall_cmds \
7343 finish_cmds \ 7346 finish_cmds \
7344@@ -13749,7 +14416,8 @@ $as_echo X"$file" | 7347@@ -15690,7 +16357,8 @@ $as_echo X"$file" |
7345 # NOTE: Changes made to this file will be lost: look at ltmain.sh. 7348 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
7346 # 7349 #
7347 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 7350 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
@@ -7351,7 +7354,7 @@ index 98ba6d7f5b3..113505b963c 100755
7351 # Written by Gordon Matzigkeit, 1996 7354 # Written by Gordon Matzigkeit, 1996
7352 # 7355 #
7353 # This file is part of GNU Libtool. 7356 # This file is part of GNU Libtool.
7354@@ -13852,19 +14520,42 @@ SP2NL=$lt_lt_SP2NL 7357@@ -15793,19 +16461,42 @@ SP2NL=$lt_lt_SP2NL
7355 # turn newlines into spaces. 7358 # turn newlines into spaces.
7356 NL2SP=$lt_lt_NL2SP 7359 NL2SP=$lt_lt_NL2SP
7357 7360
@@ -7395,7 +7398,7 @@ index 98ba6d7f5b3..113505b963c 100755
7395 # A symbol stripping program. 7398 # A symbol stripping program.
7396 STRIP=$lt_STRIP 7399 STRIP=$lt_STRIP
7397 7400
7398@@ -13894,6 +14585,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address 7401@@ -15835,6 +16526,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
7399 # Transform the output of nm in a C name address pair when lib prefix is needed. 7402 # Transform the output of nm in a C name address pair when lib prefix is needed.
7400 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix 7403 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
7401 7404
@@ -7408,7 +7411,7 @@ index 98ba6d7f5b3..113505b963c 100755
7408 # The name of the directory that contains temporary libtool files. 7411 # The name of the directory that contains temporary libtool files.
7409 objdir=$objdir 7412 objdir=$objdir
7410 7413
7411@@ -13903,6 +14600,9 @@ MAGIC_CMD=$MAGIC_CMD 7414@@ -15844,6 +16541,9 @@ MAGIC_CMD=$MAGIC_CMD
7412 # Must we lock files when doing compilation? 7415 # Must we lock files when doing compilation?
7413 need_locks=$lt_need_locks 7416 need_locks=$lt_need_locks
7414 7417
@@ -7418,7 +7421,7 @@ index 98ba6d7f5b3..113505b963c 100755
7418 # Tool to manipulate archived DWARF debug symbol files on Mac OS X. 7421 # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
7419 DSYMUTIL=$lt_DSYMUTIL 7422 DSYMUTIL=$lt_DSYMUTIL
7420 7423
7421@@ -14017,12 +14717,12 @@ with_gcc=$GCC 7424@@ -15958,12 +16658,12 @@ with_gcc=$GCC
7422 # Compiler flag to turn off builtin functions. 7425 # Compiler flag to turn off builtin functions.
7423 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag 7426 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
7424 7427
@@ -7434,7 +7437,7 @@ index 98ba6d7f5b3..113505b963c 100755
7434 # Compiler flag to prevent dynamic linking. 7437 # Compiler flag to prevent dynamic linking.
7435 link_static_flag=$lt_lt_prog_compiler_static 7438 link_static_flag=$lt_lt_prog_compiler_static
7436 7439
7437@@ -14109,9 +14809,6 @@ inherit_rpath=$inherit_rpath 7440@@ -16050,9 +16750,6 @@ inherit_rpath=$inherit_rpath
7438 # Whether libtool must link a program against all its dependency libraries. 7441 # Whether libtool must link a program against all its dependency libraries.
7439 link_all_deplibs=$link_all_deplibs 7442 link_all_deplibs=$link_all_deplibs
7440 7443
@@ -7444,7 +7447,7 @@ index 98ba6d7f5b3..113505b963c 100755
7444 # Set to "yes" if exported symbols are required. 7447 # Set to "yes" if exported symbols are required.
7445 always_export_symbols=$always_export_symbols 7448 always_export_symbols=$always_export_symbols
7446 7449
7447@@ -14127,6 +14824,9 @@ include_expsyms=$lt_include_expsyms 7450@@ -16068,6 +16765,9 @@ include_expsyms=$lt_include_expsyms
7448 # Commands necessary for linking programs (against libraries) with templates. 7451 # Commands necessary for linking programs (against libraries) with templates.
7449 prelink_cmds=$lt_prelink_cmds 7452 prelink_cmds=$lt_prelink_cmds
7450 7453
@@ -7454,7 +7457,7 @@ index 98ba6d7f5b3..113505b963c 100755
7454 # Specify filename containing input files. 7457 # Specify filename containing input files.
7455 file_list_spec=$lt_file_list_spec 7458 file_list_spec=$lt_file_list_spec
7456 7459
7457@@ -14159,210 +14859,169 @@ ltmain="$ac_aux_dir/ltmain.sh" 7460@@ -16100,210 +16800,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
7458 # if finds mixed CR/LF and LF-only lines. Since sed operates in 7461 # if finds mixed CR/LF and LF-only lines. Since sed operates in
7459 # text mode, it properly converts lines to CR/LF. This bash problem 7462 # text mode, it properly converts lines to CR/LF. This bash problem
7460 # is reportedly fixed, but why not run on old versions too? 7463 # is reportedly fixed, but why not run on old versions too?
@@ -7829,7 +7832,7 @@ index 98ba6d7f5b3..113505b963c 100755
7829 chmod +x "$ofile" 7832 chmod +x "$ofile"
7830 7833
7831diff --git a/gprofng/Makefile.in b/gprofng/Makefile.in 7834diff --git a/gprofng/Makefile.in b/gprofng/Makefile.in
7832index 06b563cb8ef..b6ae509fd6c 100644 7835index dbc868191b7..1ca6dd01f58 100644
7833--- a/gprofng/Makefile.in 7836--- a/gprofng/Makefile.in
7834+++ b/gprofng/Makefile.in 7837+++ b/gprofng/Makefile.in
7835@@ -253,6 +253,7 @@ CXXFLAGS = @CXXFLAGS@ 7838@@ -253,6 +253,7 @@ CXXFLAGS = @CXXFLAGS@
@@ -7840,7 +7843,7 @@ index 06b563cb8ef..b6ae509fd6c 100644
7840 DSYMUTIL = @DSYMUTIL@ 7843 DSYMUTIL = @DSYMUTIL@
7841 DUMPBIN = @DUMPBIN@ 7844 DUMPBIN = @DUMPBIN@
7842 ECHO_C = @ECHO_C@ 7845 ECHO_C = @ECHO_C@
7843@@ -290,6 +291,7 @@ LN_S = @LN_S@ 7846@@ -289,6 +290,7 @@ LN_S = @LN_S@
7844 LTLIBOBJS = @LTLIBOBJS@ 7847 LTLIBOBJS = @LTLIBOBJS@
7845 MAINT = @MAINT@ 7848 MAINT = @MAINT@
7846 MAKEINFO = @MAKEINFO@ 7849 MAKEINFO = @MAKEINFO@
@@ -7849,10 +7852,10 @@ index 06b563cb8ef..b6ae509fd6c 100644
7849 NM = @NM@ 7852 NM = @NM@
7850 NMEDIT = @NMEDIT@ 7853 NMEDIT = @NMEDIT@
7851diff --git a/gprofng/configure b/gprofng/configure 7854diff --git a/gprofng/configure b/gprofng/configure
7852index 69eb806a17d..9e97e334544 100755 7855index 6dfafb4e483..2dc8702f339 100755
7853--- a/gprofng/configure 7856--- a/gprofng/configure
7854+++ b/gprofng/configure 7857+++ b/gprofng/configure
7855@@ -672,6 +672,8 @@ OTOOL 7858@@ -671,6 +671,8 @@ OTOOL
7856 LIPO 7859 LIPO
7857 NMEDIT 7860 NMEDIT
7858 DSYMUTIL 7861 DSYMUTIL
@@ -7861,7 +7864,7 @@ index 69eb806a17d..9e97e334544 100755
7861 OBJDUMP 7864 OBJDUMP
7862 LN_S 7865 LN_S
7863 NM 7866 NM
7864@@ -802,6 +804,7 @@ enable_static 7867@@ -801,6 +803,7 @@ enable_static
7865 with_pic 7868 with_pic
7866 enable_fast_install 7869 enable_fast_install
7867 with_gnu_ld 7870 with_gnu_ld
@@ -7869,7 +7872,7 @@ index 69eb806a17d..9e97e334544 100755
7869 enable_libtool_lock 7872 enable_libtool_lock
7870 enable_werror_always 7873 enable_werror_always
7871 enable_gprofng_tools 7874 enable_gprofng_tools
7872@@ -1465,6 +1468,8 @@ Optional Packages: 7875@@ -1464,6 +1467,8 @@ Optional Packages:
7873 --with-pic try to use only PIC/non-PIC objects [default=use 7876 --with-pic try to use only PIC/non-PIC objects [default=use
7874 both] 7877 both]
7875 --with-gnu-ld assume the C compiler uses GNU ld [default=no] 7878 --with-gnu-ld assume the C compiler uses GNU ld [default=no]
@@ -7878,7 +7881,7 @@ index 69eb806a17d..9e97e334544 100755
7878 --with-jdk=PATH specify prefix directory for installed JDK. 7881 --with-jdk=PATH specify prefix directory for installed JDK.
7879 --with-system-zlib use installed libz 7882 --with-system-zlib use installed libz
7880 7883
7881@@ -6156,8 +6161,8 @@ esac 7884@@ -6152,8 +6157,8 @@ esac
7882 7885
7883 7886
7884 7887
@@ -7889,7 +7892,7 @@ index 69eb806a17d..9e97e334544 100755
7889 7892
7890 7893
7891 7894
7892@@ -6197,7 +6202,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO 7895@@ -6193,7 +6198,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
7893 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 7896 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
7894 $as_echo_n "checking how to print strings... " >&6; } 7897 $as_echo_n "checking how to print strings... " >&6; }
7895 # Test print first, because it will be a builtin if present. 7898 # Test print first, because it will be a builtin if present.
@@ -7898,7 +7901,7 @@ index 69eb806a17d..9e97e334544 100755
7898 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then 7901 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
7899 ECHO='print -r --' 7902 ECHO='print -r --'
7900 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then 7903 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
7901@@ -6890,8 +6895,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; 7904@@ -6886,8 +6891,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6;
7902 # Try some XSI features 7905 # Try some XSI features
7903 xsi_shell=no 7906 xsi_shell=no
7904 ( _lt_dummy="a/b/c" 7907 ( _lt_dummy="a/b/c"
@@ -7909,7 +7912,7 @@ index 69eb806a17d..9e97e334544 100755
7909 && eval 'test $(( 1 + 1 )) -eq 2 \ 7912 && eval 'test $(( 1 + 1 )) -eq 2 \
7910 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ 7913 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
7911 && xsi_shell=yes 7914 && xsi_shell=yes
7912@@ -6940,6 +6945,80 @@ esac 7915@@ -6936,6 +6941,80 @@ esac
7913 7916
7914 7917
7915 7918
@@ -7990,7 +7993,7 @@ index 69eb806a17d..9e97e334544 100755
7990 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 7993 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
7991 $as_echo_n "checking for $LD option to reload object files... " >&6; } 7994 $as_echo_n "checking for $LD option to reload object files... " >&6; }
7992 if ${lt_cv_ld_reload_flag+:} false; then : 7995 if ${lt_cv_ld_reload_flag+:} false; then :
7993@@ -6956,6 +7035,11 @@ case $reload_flag in 7996@@ -6952,6 +7031,11 @@ case $reload_flag in
7994 esac 7997 esac
7995 reload_cmds='$LD$reload_flag -o $output$reload_objs' 7998 reload_cmds='$LD$reload_flag -o $output$reload_objs'
7996 case $host_os in 7999 case $host_os in
@@ -8002,7 +8005,7 @@ index 69eb806a17d..9e97e334544 100755
8002 darwin*) 8005 darwin*)
8003 if test "$GCC" = yes; then 8006 if test "$GCC" = yes; then
8004 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' 8007 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
8005@@ -7124,7 +7208,8 @@ mingw* | pw32*) 8008@@ -7120,7 +7204,8 @@ mingw* | pw32*)
8006 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' 8009 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
8007 lt_cv_file_magic_cmd='func_win32_libid' 8010 lt_cv_file_magic_cmd='func_win32_libid'
8008 else 8011 else
@@ -8012,7 +8015,7 @@ index 69eb806a17d..9e97e334544 100755
8012 lt_cv_file_magic_cmd='$OBJDUMP -f' 8015 lt_cv_file_magic_cmd='$OBJDUMP -f'
8013 fi 8016 fi
8014 ;; 8017 ;;
8015@@ -7278,6 +7363,21 @@ esac 8018@@ -7279,6 +7364,21 @@ esac
8016 fi 8019 fi
8017 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 8020 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
8018 $as_echo "$lt_cv_deplibs_check_method" >&6; } 8021 $as_echo "$lt_cv_deplibs_check_method" >&6; }
@@ -8034,7 +8037,7 @@ index 69eb806a17d..9e97e334544 100755
8034 file_magic_cmd=$lt_cv_file_magic_cmd 8037 file_magic_cmd=$lt_cv_file_magic_cmd
8035 deplibs_check_method=$lt_cv_deplibs_check_method 8038 deplibs_check_method=$lt_cv_deplibs_check_method
8036 test -z "$deplibs_check_method" && deplibs_check_method=unknown 8039 test -z "$deplibs_check_method" && deplibs_check_method=unknown
8037@@ -7293,6 +7393,157 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown 8040@@ -7294,6 +7394,157 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
8038 8041
8039 8042
8040 8043
@@ -8192,7 +8195,7 @@ index 69eb806a17d..9e97e334544 100755
8192 plugin_option= 8195 plugin_option=
8193 plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll" 8196 plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll"
8194 for plugin in $plugin_names; do 8197 for plugin in $plugin_names; do
8195@@ -7307,8 +7558,10 @@ for plugin in $plugin_names; do 8198@@ -7308,8 +7559,10 @@ for plugin in $plugin_names; do
8196 done 8199 done
8197 8200
8198 if test -n "$ac_tool_prefix"; then 8201 if test -n "$ac_tool_prefix"; then
@@ -8205,7 +8208,7 @@ index 69eb806a17d..9e97e334544 100755
8205 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 8208 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
8206 $as_echo_n "checking for $ac_word... " >&6; } 8209 $as_echo_n "checking for $ac_word... " >&6; }
8207 if ${ac_cv_prog_AR+:} false; then : 8210 if ${ac_cv_prog_AR+:} false; then :
8208@@ -7324,7 +7577,7 @@ do 8211@@ -7325,7 +7578,7 @@ do
8209 test -z "$as_dir" && as_dir=. 8212 test -z "$as_dir" && as_dir=.
8210 for ac_exec_ext in '' $ac_executable_extensions; do 8213 for ac_exec_ext in '' $ac_executable_extensions; do
8211 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 8214 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
@@ -8214,7 +8217,7 @@ index 69eb806a17d..9e97e334544 100755
8214 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 8217 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
8215 break 2 8218 break 2
8216 fi 8219 fi
8217@@ -7344,11 +7597,15 @@ $as_echo "no" >&6; } 8220@@ -7345,11 +7598,15 @@ $as_echo "no" >&6; }
8218 fi 8221 fi
8219 8222
8220 8223
@@ -8233,7 +8236,7 @@ index 69eb806a17d..9e97e334544 100755
8233 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 8236 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
8234 $as_echo_n "checking for $ac_word... " >&6; } 8237 $as_echo_n "checking for $ac_word... " >&6; }
8235 if ${ac_cv_prog_ac_ct_AR+:} false; then : 8238 if ${ac_cv_prog_ac_ct_AR+:} false; then :
8236@@ -7364,7 +7621,7 @@ do 8239@@ -7365,7 +7622,7 @@ do
8237 test -z "$as_dir" && as_dir=. 8240 test -z "$as_dir" && as_dir=.
8238 for ac_exec_ext in '' $ac_executable_extensions; do 8241 for ac_exec_ext in '' $ac_executable_extensions; do
8239 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 8242 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
@@ -8242,7 +8245,7 @@ index 69eb806a17d..9e97e334544 100755
8242 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 8245 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
8243 break 2 8246 break 2
8244 fi 8247 fi
8245@@ -7383,6 +7640,10 @@ else 8248@@ -7384,6 +7641,10 @@ else
8246 $as_echo "no" >&6; } 8249 $as_echo "no" >&6; }
8247 fi 8250 fi
8248 8251
@@ -8253,7 +8256,7 @@ index 69eb806a17d..9e97e334544 100755
8253 if test "x$ac_ct_AR" = x; then 8256 if test "x$ac_ct_AR" = x; then
8254 AR="false" 8257 AR="false"
8255 else 8258 else
8256@@ -7394,29 +7655,81 @@ ac_tool_warned=yes ;; 8259@@ -7395,25 +7656,19 @@ ac_tool_warned=yes ;;
8257 esac 8260 esac
8258 AR=$ac_ct_AR 8261 AR=$ac_ct_AR
8259 fi 8262 fi
@@ -8285,16 +8288,12 @@ index 69eb806a17d..9e97e334544 100755
8285+ rm -f conftest.* 8288+ rm -f conftest.*
8286+: ${AR=ar} 8289+: ${AR=ar}
8287+: ${AR_FLAGS=cru} 8290+: ${AR_FLAGS=cru}
8288+
8289+
8290+
8291+
8292+
8293+
8294+
8295 8291
8296 8292
8297 8293
8294@@ -7425,6 +7680,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru
8295
8296
8298 8297
8299+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 8298+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
8300+$as_echo_n "checking for archiver @FILE support... " >&6; } 8299+$as_echo_n "checking for archiver @FILE support... " >&6; }
@@ -8347,10 +8346,17 @@ index 69eb806a17d..9e97e334544 100755
8347+else 8346+else
8348+ archiver_list_spec=$lt_cv_ar_at_file 8347+ archiver_list_spec=$lt_cv_ar_at_file
8349+fi 8348+fi
8350 8349+
8351 8350+
8352 8351+
8353@@ -7763,8 +8076,8 @@ esac 8352+
8353+
8354+
8355+
8356 if test -n "$ac_tool_prefix"; then
8357 # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
8358 set dummy ${ac_tool_prefix}strip; ac_word=$2
8359@@ -7764,8 +8077,8 @@ esac
8354 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" 8360 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
8355 8361
8356 # Transform an extracted symbol line into symbol name and symbol address 8362 # Transform an extracted symbol line into symbol name and symbol address
@@ -8361,7 +8367,7 @@ index 69eb806a17d..9e97e334544 100755
8361 8367
8362 # Handle CRLF in mingw tool chain 8368 # Handle CRLF in mingw tool chain
8363 opt_cr= 8369 opt_cr=
8364@@ -7800,6 +8113,7 @@ for ac_symprfx in "" "_"; do 8370@@ -7801,6 +8114,7 @@ for ac_symprfx in "" "_"; do
8365 else 8371 else
8366 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" 8372 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
8367 fi 8373 fi
@@ -8369,7 +8375,7 @@ index 69eb806a17d..9e97e334544 100755
8369 8375
8370 # Check to see that the pipe works correctly. 8376 # Check to see that the pipe works correctly.
8371 pipe_works=no 8377 pipe_works=no
8372@@ -7841,6 +8155,18 @@ _LT_EOF 8378@@ -7842,6 +8156,18 @@ _LT_EOF
8373 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then 8379 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
8374 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then 8380 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
8375 cat <<_LT_EOF > conftest.$ac_ext 8381 cat <<_LT_EOF > conftest.$ac_ext
@@ -8388,7 +8394,7 @@ index 69eb806a17d..9e97e334544 100755
8388 #ifdef __cplusplus 8394 #ifdef __cplusplus
8389 extern "C" { 8395 extern "C" {
8390 #endif 8396 #endif
8391@@ -7852,7 +8178,7 @@ _LT_EOF 8397@@ -7853,7 +8179,7 @@ _LT_EOF
8392 cat <<_LT_EOF >> conftest.$ac_ext 8398 cat <<_LT_EOF >> conftest.$ac_ext
8393 8399
8394 /* The mapping between symbol names and symbols. */ 8400 /* The mapping between symbol names and symbols. */
@@ -8397,7 +8403,7 @@ index 69eb806a17d..9e97e334544 100755
8397 const char *name; 8403 const char *name;
8398 void *address; 8404 void *address;
8399 } 8405 }
8400@@ -7878,8 +8204,8 @@ static const void *lt_preloaded_setup() { 8406@@ -7879,8 +8205,8 @@ static const void *lt_preloaded_setup() {
8401 _LT_EOF 8407 _LT_EOF
8402 # Now try linking the two files. 8408 # Now try linking the two files.
8403 mv conftest.$ac_objext conftstm.$ac_objext 8409 mv conftest.$ac_objext conftstm.$ac_objext
@@ -8408,7 +8414,7 @@ index 69eb806a17d..9e97e334544 100755
8408 LIBS="conftstm.$ac_objext" 8414 LIBS="conftstm.$ac_objext"
8409 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" 8415 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
8410 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 8416 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
8411@@ -7889,8 +8215,8 @@ _LT_EOF 8417@@ -7890,8 +8216,8 @@ _LT_EOF
8412 test $ac_status = 0; } && test -s conftest${ac_exeext}; then 8418 test $ac_status = 0; } && test -s conftest${ac_exeext}; then
8413 pipe_works=yes 8419 pipe_works=yes
8414 fi 8420 fi
@@ -8419,7 +8425,7 @@ index 69eb806a17d..9e97e334544 100755
8419 else 8425 else
8420 echo "cannot find nm_test_func in $nlist" >&5 8426 echo "cannot find nm_test_func in $nlist" >&5
8421 fi 8427 fi
8422@@ -7927,6 +8253,13 @@ else 8428@@ -7928,6 +8254,14 @@ else
8423 $as_echo "ok" >&6; } 8429 $as_echo "ok" >&6; }
8424 fi 8430 fi
8425 8431
@@ -8430,10 +8436,11 @@ index 69eb806a17d..9e97e334544 100755
8430+ nm_file_list_spec='@' 8436+ nm_file_list_spec='@'
8431+fi 8437+fi
8432+ 8438+
8439+
8433 8440
8434 8441
8435 8442
8436@@ -7946,6 +8279,48 @@ fi 8443@@ -7946,6 +8280,47 @@ fi
8437 8444
8438 8445
8439 8446
@@ -8478,11 +8485,10 @@ index 69eb806a17d..9e97e334544 100755
8478+$as_echo "${lt_sysroot:-no}" >&6; } 8485+$as_echo "${lt_sysroot:-no}" >&6; }
8479+ 8486+
8480+ 8487+
8481+
8482 8488
8483 8489
8484 # Check whether --enable-libtool-lock was given. 8490
8485@@ -8154,6 +8529,123 @@ esac 8491@@ -8155,6 +8530,123 @@ esac
8486 8492
8487 need_locks="$enable_libtool_lock" 8493 need_locks="$enable_libtool_lock"
8488 8494
@@ -8606,7 +8612,7 @@ index 69eb806a17d..9e97e334544 100755
8606 8612
8607 case $host_os in 8613 case $host_os in
8608 rhapsody* | darwin*) 8614 rhapsody* | darwin*)
8609@@ -8717,6 +9209,8 @@ _LT_EOF 8615@@ -8718,6 +9210,8 @@ _LT_EOF
8610 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 8616 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
8611 echo "$AR cru libconftest.a conftest.o" >&5 8617 echo "$AR cru libconftest.a conftest.o" >&5
8612 $AR cru libconftest.a conftest.o 2>&5 8618 $AR cru libconftest.a conftest.o 2>&5
@@ -8615,7 +8621,7 @@ index 69eb806a17d..9e97e334544 100755
8615 cat > conftest.c << _LT_EOF 8621 cat > conftest.c << _LT_EOF
8616 int main() { return 0;} 8622 int main() { return 0;}
8617 _LT_EOF 8623 _LT_EOF
8618@@ -8785,6 +9279,16 @@ done 8624@@ -8788,6 +9282,16 @@ done
8619 8625
8620 8626
8621 8627
@@ -8632,7 +8638,7 @@ index 69eb806a17d..9e97e334544 100755
8632 8638
8633 8639
8634 # Set options 8640 # Set options
8635@@ -9270,8 +9774,6 @@ fi 8641@@ -9273,8 +9777,6 @@ fi
8636 lt_prog_compiler_pic= 8642 lt_prog_compiler_pic=
8637 lt_prog_compiler_static= 8643 lt_prog_compiler_static=
8638 8644
@@ -8641,7 +8647,7 @@ index 69eb806a17d..9e97e334544 100755
8641 8647
8642 if test "$GCC" = yes; then 8648 if test "$GCC" = yes; then
8643 lt_prog_compiler_wl='-Wl,' 8649 lt_prog_compiler_wl='-Wl,'
8644@@ -9437,6 +9939,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 8650@@ -9440,6 +9942,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
8645 lt_prog_compiler_pic='--shared' 8651 lt_prog_compiler_pic='--shared'
8646 lt_prog_compiler_static='--static' 8652 lt_prog_compiler_static='--static'
8647 ;; 8653 ;;
@@ -8654,7 +8660,7 @@ index 69eb806a17d..9e97e334544 100755
8654 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) 8660 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
8655 # Portland Group compilers (*not* the Pentium gcc compiler, 8661 # Portland Group compilers (*not* the Pentium gcc compiler,
8656 # which looks to be a dead project) 8662 # which looks to be a dead project)
8657@@ -9499,7 +10007,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 8663@@ -9502,7 +10010,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
8658 lt_prog_compiler_pic='-KPIC' 8664 lt_prog_compiler_pic='-KPIC'
8659 lt_prog_compiler_static='-Bstatic' 8665 lt_prog_compiler_static='-Bstatic'
8660 case $cc_basename in 8666 case $cc_basename in
@@ -8663,7 +8669,7 @@ index 69eb806a17d..9e97e334544 100755
8663 lt_prog_compiler_wl='-Qoption ld ';; 8669 lt_prog_compiler_wl='-Qoption ld ';;
8664 *) 8670 *)
8665 lt_prog_compiler_wl='-Wl,';; 8671 lt_prog_compiler_wl='-Wl,';;
8666@@ -9556,13 +10064,17 @@ case $host_os in 8672@@ -9559,13 +10067,17 @@ case $host_os in
8667 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" 8673 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
8668 ;; 8674 ;;
8669 esac 8675 esac
@@ -8687,7 +8693,7 @@ index 69eb806a17d..9e97e334544 100755
8687 8693
8688 # 8694 #
8689 # Check to make sure the PIC flag actually works. 8695 # Check to make sure the PIC flag actually works.
8690@@ -9623,6 +10135,11 @@ fi 8696@@ -9626,6 +10138,11 @@ fi
8691 8697
8692 8698
8693 8699
@@ -8699,7 +8705,7 @@ index 69eb806a17d..9e97e334544 100755
8699 # 8705 #
8700 # Check to make sure the static flag actually works. 8706 # Check to make sure the static flag actually works.
8701 # 8707 #
8702@@ -9973,7 +10490,8 @@ _LT_EOF 8708@@ -9976,7 +10493,8 @@ _LT_EOF
8703 allow_undefined_flag=unsupported 8709 allow_undefined_flag=unsupported
8704 always_export_symbols=no 8710 always_export_symbols=no
8705 enable_shared_with_static_runtimes=yes 8711 enable_shared_with_static_runtimes=yes
@@ -8709,7 +8715,7 @@ index 69eb806a17d..9e97e334544 100755
8709 8715
8710 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then 8716 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
8711 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' 8717 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
8712@@ -10072,12 +10590,12 @@ _LT_EOF 8718@@ -10075,12 +10593,12 @@ _LT_EOF
8713 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' 8719 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
8714 hardcode_libdir_flag_spec= 8720 hardcode_libdir_flag_spec=
8715 hardcode_libdir_flag_spec_ld='-rpath $libdir' 8721 hardcode_libdir_flag_spec_ld='-rpath $libdir'
@@ -8724,7 +8730,7 @@ index 69eb806a17d..9e97e334544 100755
8724 fi 8730 fi
8725 ;; 8731 ;;
8726 esac 8732 esac
8727@@ -10091,8 +10609,8 @@ _LT_EOF 8733@@ -10094,8 +10612,8 @@ _LT_EOF
8728 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' 8734 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
8729 wlarc= 8735 wlarc=
8730 else 8736 else
@@ -8735,7 +8741,7 @@ index 69eb806a17d..9e97e334544 100755
8735 fi 8741 fi
8736 ;; 8742 ;;
8737 8743
8738@@ -10110,8 +10628,8 @@ _LT_EOF 8744@@ -10113,8 +10631,8 @@ _LT_EOF
8739 8745
8740 _LT_EOF 8746 _LT_EOF
8741 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 8747 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -8746,7 +8752,7 @@ index 69eb806a17d..9e97e334544 100755
8746 else 8752 else
8747 ld_shlibs=no 8753 ld_shlibs=no
8748 fi 8754 fi
8749@@ -10157,8 +10675,8 @@ _LT_EOF 8755@@ -10160,8 +10678,8 @@ _LT_EOF
8750 8756
8751 *) 8757 *)
8752 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 8758 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -8757,7 +8763,7 @@ index 69eb806a17d..9e97e334544 100755
8757 else 8763 else
8758 ld_shlibs=no 8764 ld_shlibs=no
8759 fi 8765 fi
8760@@ -10288,7 +10806,13 @@ _LT_EOF 8766@@ -10291,7 +10809,13 @@ _LT_EOF
8761 allow_undefined_flag='-berok' 8767 allow_undefined_flag='-berok'
8762 # Determine the default libpath from the value encoded in an 8768 # Determine the default libpath from the value encoded in an
8763 # empty executable. 8769 # empty executable.
@@ -8772,7 +8778,7 @@ index 69eb806a17d..9e97e334544 100755
8772 /* end confdefs.h. */ 8778 /* end confdefs.h. */
8773 8779
8774 int 8780 int
8775@@ -10301,22 +10825,29 @@ main () 8781@@ -10304,22 +10828,29 @@ main ()
8776 _ACEOF 8782 _ACEOF
8777 if ac_fn_c_try_link "$LINENO"; then : 8783 if ac_fn_c_try_link "$LINENO"; then :
8778 8784
@@ -8815,7 +8821,7 @@ index 69eb806a17d..9e97e334544 100755
8815 8821
8816 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 8822 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
8817 archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" 8823 archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
8818@@ -10328,7 +10859,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 8824@@ -10331,7 +10862,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
8819 else 8825 else
8820 # Determine the default libpath from the value encoded in an 8826 # Determine the default libpath from the value encoded in an
8821 # empty executable. 8827 # empty executable.
@@ -8830,7 +8836,7 @@ index 69eb806a17d..9e97e334544 100755
8830 /* end confdefs.h. */ 8836 /* end confdefs.h. */
8831 8837
8832 int 8838 int
8833@@ -10341,22 +10878,29 @@ main () 8839@@ -10344,22 +10881,29 @@ main ()
8834 _ACEOF 8840 _ACEOF
8835 if ac_fn_c_try_link "$LINENO"; then : 8841 if ac_fn_c_try_link "$LINENO"; then :
8836 8842
@@ -8873,7 +8879,7 @@ index 69eb806a17d..9e97e334544 100755
8873 8879
8874 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 8880 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
8875 # Warning - without using the other run time loading flags, 8881 # Warning - without using the other run time loading flags,
8876@@ -10401,20 +10945,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 8882@@ -10404,20 +10948,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
8877 # Microsoft Visual C++. 8883 # Microsoft Visual C++.
8878 # hardcode_libdir_flag_spec is actually meaningless, as there is 8884 # hardcode_libdir_flag_spec is actually meaningless, as there is
8879 # no search path for DLLs. 8885 # no search path for DLLs.
@@ -8951,7 +8957,7 @@ index 69eb806a17d..9e97e334544 100755
8951 ;; 8957 ;;
8952 8958
8953 darwin* | rhapsody*) 8959 darwin* | rhapsody*)
8954@@ -10475,7 +11062,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 8960@@ -10478,7 +11065,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
8955 8961
8956 # FreeBSD 3 and greater uses gcc -shared to do shared libraries. 8962 # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
8957 freebsd* | dragonfly*) 8963 freebsd* | dragonfly*)
@@ -8960,7 +8966,7 @@ index 69eb806a17d..9e97e334544 100755
8960 hardcode_libdir_flag_spec='-R$libdir' 8966 hardcode_libdir_flag_spec='-R$libdir'
8961 hardcode_direct=yes 8967 hardcode_direct=yes
8962 hardcode_shlibpath_var=no 8968 hardcode_shlibpath_var=no
8963@@ -10483,7 +11070,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 8969@@ -10486,7 +11073,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
8964 8970
8965 hpux9*) 8971 hpux9*)
8966 if test "$GCC" = yes; then 8972 if test "$GCC" = yes; then
@@ -8969,7 +8975,7 @@ index 69eb806a17d..9e97e334544 100755
8969 else 8975 else
8970 archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' 8976 archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
8971 fi 8977 fi
8972@@ -10499,7 +11086,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 8978@@ -10502,7 +11089,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
8973 8979
8974 hpux10*) 8980 hpux10*)
8975 if test "$GCC" = yes && test "$with_gnu_ld" = no; then 8981 if test "$GCC" = yes && test "$with_gnu_ld" = no; then
@@ -8978,8 +8984,8 @@ index 69eb806a17d..9e97e334544 100755
8978 else 8984 else
8979 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' 8985 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
8980 fi 8986 fi
8981@@ -10523,10 +11110,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 8987@@ -10526,10 +11113,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
8982 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' 8988 archive_cmds='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
8983 ;; 8989 ;;
8984 ia64*) 8990 ia64*)
8985- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' 8991- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
@@ -8991,7 +8997,7 @@ index 69eb806a17d..9e97e334544 100755
8991 ;; 8997 ;;
8992 esac 8998 esac
8993 else 8999 else
8994@@ -10605,23 +11192,36 @@ fi 9000@@ -10608,23 +11195,36 @@ fi
8995 9001
8996 irix5* | irix6* | nonstopux*) 9002 irix5* | irix6* | nonstopux*)
8997 if test "$GCC" = yes; then 9003 if test "$GCC" = yes; then
@@ -9036,7 +9042,7 @@ index 69eb806a17d..9e97e334544 100755
9036 else 9042 else
9037 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' 9043 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
9038 archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' 9044 archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
9039@@ -10706,7 +11306,7 @@ rm -f core conftest.err conftest.$ac_objext \ 9045@@ -10709,7 +11309,7 @@ rm -f core conftest.err conftest.$ac_objext \
9040 osf4* | osf5*) # as osf3* with the addition of -msym flag 9046 osf4* | osf5*) # as osf3* with the addition of -msym flag
9041 if test "$GCC" = yes; then 9047 if test "$GCC" = yes; then
9042 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' 9048 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
@@ -9045,7 +9051,7 @@ index 69eb806a17d..9e97e334544 100755
9045 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' 9051 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
9046 else 9052 else
9047 allow_undefined_flag=' -expect_unresolved \*' 9053 allow_undefined_flag=' -expect_unresolved \*'
9048@@ -10725,9 +11325,9 @@ rm -f core conftest.err conftest.$ac_objext \ 9054@@ -10728,9 +11328,9 @@ rm -f core conftest.err conftest.$ac_objext \
9049 no_undefined_flag=' -z defs' 9055 no_undefined_flag=' -z defs'
9050 if test "$GCC" = yes; then 9056 if test "$GCC" = yes; then
9051 wlarc='${wl}' 9057 wlarc='${wl}'
@@ -9057,7 +9063,7 @@ index 69eb806a17d..9e97e334544 100755
9057 else 9063 else
9058 case `$CC -V 2>&1` in 9064 case `$CC -V 2>&1` in
9059 *"Compilers 5.0"*) 9065 *"Compilers 5.0"*)
9060@@ -11303,8 +11903,9 @@ cygwin* | mingw* | pw32* | cegcc*) 9066@@ -11306,8 +11906,9 @@ cygwin* | mingw* | pw32* | cegcc*)
9061 need_version=no 9067 need_version=no
9062 need_lib_prefix=no 9068 need_lib_prefix=no
9063 9069
@@ -9069,7 +9075,7 @@ index 69eb806a17d..9e97e334544 100755
9069 library_names_spec='$libname.dll.a' 9075 library_names_spec='$libname.dll.a'
9070 # DLL is installed to $(libdir)/../bin by postinstall_cmds 9076 # DLL is installed to $(libdir)/../bin by postinstall_cmds
9071 postinstall_cmds='base_file=`basename \${file}`~ 9077 postinstall_cmds='base_file=`basename \${file}`~
9072@@ -11337,13 +11938,71 @@ cygwin* | mingw* | pw32* | cegcc*) 9078@@ -11340,13 +11941,71 @@ cygwin* | mingw* | pw32* | cegcc*)
9073 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' 9079 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
9074 ;; 9080 ;;
9075 esac 9081 esac
@@ -9142,16 +9148,16 @@ index 69eb806a17d..9e97e334544 100755
9142 # FIXME: first we should search . and the directory the executable is in 9148 # FIXME: first we should search . and the directory the executable is in
9143 shlibpath_var=PATH 9149 shlibpath_var=PATH
9144 ;; 9150 ;;
9145@@ -12221,7 +12880,7 @@ else 9151@@ -12248,7 +12907,7 @@ else
9146 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 9152 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
9147 lt_status=$lt_dlunknown 9153 lt_status=$lt_dlunknown
9148 cat > conftest.$ac_ext <<_LT_EOF 9154 cat > conftest.$ac_ext <<_LT_EOF
9149-#line 12224 "configure" 9155-#line 12251 "configure"
9150+#line $LINENO "configure" 9156+#line $LINENO "configure"
9151 #include "confdefs.h" 9157 #include "confdefs.h"
9152 9158
9153 #if HAVE_DLFCN_H 9159 #if HAVE_DLFCN_H
9154@@ -12265,10 +12924,10 @@ else 9160@@ -12292,10 +12951,10 @@ else
9155 /* When -fvisbility=hidden is used, assume the code has been annotated 9161 /* When -fvisbility=hidden is used, assume the code has been annotated
9156 correspondingly for the symbols needed. */ 9162 correspondingly for the symbols needed. */
9157 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 9163 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
@@ -9164,16 +9170,16 @@ index 69eb806a17d..9e97e334544 100755
9164 int main () 9170 int main ()
9165 { 9171 {
9166 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 9172 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
9167@@ -12327,7 +12986,7 @@ else 9173@@ -12354,7 +13013,7 @@ else
9168 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 9174 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
9169 lt_status=$lt_dlunknown 9175 lt_status=$lt_dlunknown
9170 cat > conftest.$ac_ext <<_LT_EOF 9176 cat > conftest.$ac_ext <<_LT_EOF
9171-#line 12330 "configure" 9177-#line 12357 "configure"
9172+#line $LINENO "configure" 9178+#line $LINENO "configure"
9173 #include "confdefs.h" 9179 #include "confdefs.h"
9174 9180
9175 #if HAVE_DLFCN_H 9181 #if HAVE_DLFCN_H
9176@@ -12371,10 +13030,10 @@ else 9182@@ -12398,10 +13057,10 @@ else
9177 /* When -fvisbility=hidden is used, assume the code has been annotated 9183 /* When -fvisbility=hidden is used, assume the code has been annotated
9178 correspondingly for the symbols needed. */ 9184 correspondingly for the symbols needed. */
9179 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 9185 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
@@ -9186,7 +9192,7 @@ index 69eb806a17d..9e97e334544 100755
9186 int main () 9192 int main ()
9187 { 9193 {
9188 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 9194 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
9189@@ -12766,6 +13425,7 @@ $RM -r conftest* 9195@@ -12793,6 +13452,7 @@ $RM -r conftest*
9190 9196
9191 # Allow CC to be a program name with arguments. 9197 # Allow CC to be a program name with arguments.
9192 lt_save_CC=$CC 9198 lt_save_CC=$CC
@@ -9194,7 +9200,7 @@ index 69eb806a17d..9e97e334544 100755
9194 lt_save_LD=$LD 9200 lt_save_LD=$LD
9195 lt_save_GCC=$GCC 9201 lt_save_GCC=$GCC
9196 GCC=$GXX 9202 GCC=$GXX
9197@@ -12783,6 +13443,7 @@ $RM -r conftest* 9203@@ -12810,6 +13470,7 @@ $RM -r conftest*
9198 fi 9204 fi
9199 test -z "${LDCXX+set}" || LD=$LDCXX 9205 test -z "${LDCXX+set}" || LD=$LDCXX
9200 CC=${CXX-"c++"} 9206 CC=${CXX-"c++"}
@@ -9202,7 +9208,7 @@ index 69eb806a17d..9e97e334544 100755
9202 compiler=$CC 9208 compiler=$CC
9203 compiler_CXX=$CC 9209 compiler_CXX=$CC
9204 for cc_temp in $compiler""; do 9210 for cc_temp in $compiler""; do
9205@@ -13065,7 +13726,13 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie 9211@@ -13092,7 +13753,13 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
9206 allow_undefined_flag_CXX='-berok' 9212 allow_undefined_flag_CXX='-berok'
9207 # Determine the default libpath from the value encoded in an empty 9213 # Determine the default libpath from the value encoded in an empty
9208 # executable. 9214 # executable.
@@ -9217,7 +9223,7 @@ index 69eb806a17d..9e97e334544 100755
9217 /* end confdefs.h. */ 9223 /* end confdefs.h. */
9218 9224
9219 int 9225 int
9220@@ -13078,22 +13745,29 @@ main () 9226@@ -13105,22 +13772,29 @@ main ()
9221 _ACEOF 9227 _ACEOF
9222 if ac_fn_cxx_try_link "$LINENO"; then : 9228 if ac_fn_cxx_try_link "$LINENO"; then :
9223 9229
@@ -9260,7 +9266,7 @@ index 69eb806a17d..9e97e334544 100755
9260 9266
9261 hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" 9267 hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
9262 9268
9263@@ -13106,7 +13780,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 9269@@ -13133,7 +13807,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
9264 else 9270 else
9265 # Determine the default libpath from the value encoded in an 9271 # Determine the default libpath from the value encoded in an
9266 # empty executable. 9272 # empty executable.
@@ -9275,7 +9281,7 @@ index 69eb806a17d..9e97e334544 100755
9275 /* end confdefs.h. */ 9281 /* end confdefs.h. */
9276 9282
9277 int 9283 int
9278@@ -13119,22 +13799,29 @@ main () 9284@@ -13146,22 +13826,29 @@ main ()
9279 _ACEOF 9285 _ACEOF
9280 if ac_fn_cxx_try_link "$LINENO"; then : 9286 if ac_fn_cxx_try_link "$LINENO"; then :
9281 9287
@@ -9318,7 +9324,7 @@ index 69eb806a17d..9e97e334544 100755
9318 9324
9319 hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" 9325 hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
9320 # Warning - without using the other run time loading flags, 9326 # Warning - without using the other run time loading flags,
9321@@ -13177,29 +13864,75 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 9327@@ -13204,29 +13891,75 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
9322 ;; 9328 ;;
9323 9329
9324 cygwin* | mingw* | pw32* | cegcc*) 9330 cygwin* | mingw* | pw32* | cegcc*)
@@ -9417,7 +9423,7 @@ index 69eb806a17d..9e97e334544 100755
9417 darwin* | rhapsody*) 9423 darwin* | rhapsody*)
9418 9424
9419 9425
9420@@ -13305,7 +14038,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 9426@@ -13332,7 +14065,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
9421 ;; 9427 ;;
9422 *) 9428 *)
9423 if test "$GXX" = yes; then 9429 if test "$GXX" = yes; then
@@ -9426,8 +9432,8 @@ index 69eb806a17d..9e97e334544 100755
9426 else 9432 else
9427 # FIXME: insert proper C++ library support 9433 # FIXME: insert proper C++ library support
9428 ld_shlibs_CXX=no 9434 ld_shlibs_CXX=no
9429@@ -13376,10 +14109,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 9435@@ -13403,10 +14136,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
9430 archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' 9436 archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
9431 ;; 9437 ;;
9432 ia64*) 9438 ia64*)
9433- archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' 9439- archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
@@ -9439,7 +9445,7 @@ index 69eb806a17d..9e97e334544 100755
9439 ;; 9445 ;;
9440 esac 9446 esac
9441 fi 9447 fi
9442@@ -13420,9 +14153,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 9448@@ -13447,9 +14180,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
9443 *) 9449 *)
9444 if test "$GXX" = yes; then 9450 if test "$GXX" = yes; then
9445 if test "$with_gnu_ld" = no; then 9451 if test "$with_gnu_ld" = no; then
@@ -9451,32 +9457,7 @@ index 69eb806a17d..9e97e334544 100755
9451 fi 9457 fi
9452 fi 9458 fi
9453 link_all_deplibs_CXX=yes 9459 link_all_deplibs_CXX=yes
9454@@ -13492,20 +14225,20 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 9460@@ -13727,7 +14460,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
9455 prelink_cmds_CXX='tpldir=Template.dir~
9456 rm -rf $tpldir~
9457 $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
9458- compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"'
9459+ compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"'
9460 old_archive_cmds_CXX='tpldir=Template.dir~
9461 rm -rf $tpldir~
9462 $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
9463- $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~
9464+ $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~
9465 $RANLIB $oldlib'
9466 archive_cmds_CXX='tpldir=Template.dir~
9467 rm -rf $tpldir~
9468 $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
9469- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
9470+ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
9471 archive_expsym_cmds_CXX='tpldir=Template.dir~
9472 rm -rf $tpldir~
9473 $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
9474- $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'
9475+ $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'
9476 ;;
9477 *) # Version 6 and above use weak symbols
9478 archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
9479@@ -13700,7 +14433,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
9480 archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' 9461 archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
9481 ;; 9462 ;;
9482 *) 9463 *)
@@ -9485,7 +9466,7 @@ index 69eb806a17d..9e97e334544 100755
9485 ;; 9466 ;;
9486 esac 9467 esac
9487 9468
9488@@ -13746,7 +14479,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 9469@@ -13773,7 +14506,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
9489 9470
9490 solaris*) 9471 solaris*)
9491 case $cc_basename in 9472 case $cc_basename in
@@ -9494,7 +9475,7 @@ index 69eb806a17d..9e97e334544 100755
9494 # Sun C++ 4.2, 5.x and Centerline C++ 9475 # Sun C++ 4.2, 5.x and Centerline C++
9495 archive_cmds_need_lc_CXX=yes 9476 archive_cmds_need_lc_CXX=yes
9496 no_undefined_flag_CXX=' -zdefs' 9477 no_undefined_flag_CXX=' -zdefs'
9497@@ -13787,9 +14520,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 9478@@ -13814,9 +14547,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
9498 if test "$GXX" = yes && test "$with_gnu_ld" = no; then 9479 if test "$GXX" = yes && test "$with_gnu_ld" = no; then
9499 no_undefined_flag_CXX=' ${wl}-z ${wl}defs' 9480 no_undefined_flag_CXX=' ${wl}-z ${wl}defs'
9500 if $CC --version | $GREP -v '^2\.7' > /dev/null; then 9481 if $CC --version | $GREP -v '^2\.7' > /dev/null; then
@@ -9506,7 +9487,7 @@ index 69eb806a17d..9e97e334544 100755
9506 9487
9507 # Commands to make compiler produce verbose output that lists 9488 # Commands to make compiler produce verbose output that lists
9508 # what "hidden" libraries, object files and flags are used when 9489 # what "hidden" libraries, object files and flags are used when
9509@@ -13924,6 +14657,13 @@ private: 9490@@ -13952,6 +14685,13 @@ private:
9510 }; 9491 };
9511 _LT_EOF 9492 _LT_EOF
9512 9493
@@ -9520,7 +9501,7 @@ index 69eb806a17d..9e97e334544 100755
9520 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 9501 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
9521 (eval $ac_compile) 2>&5 9502 (eval $ac_compile) 2>&5
9522 ac_status=$? 9503 ac_status=$?
9523@@ -13937,7 +14677,7 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 9504@@ -13965,7 +14705,7 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
9524 pre_test_object_deps_done=no 9505 pre_test_object_deps_done=no
9525 9506
9526 for p in `eval "$output_verbose_link_cmd"`; do 9507 for p in `eval "$output_verbose_link_cmd"`; do
@@ -9529,7 +9510,7 @@ index 69eb806a17d..9e97e334544 100755
9529 9510
9530 -L* | -R* | -l*) 9511 -L* | -R* | -l*)
9531 # Some compilers place space between "-{L,R}" and the path. 9512 # Some compilers place space between "-{L,R}" and the path.
9532@@ -13946,13 +14686,22 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 9513@@ -13974,13 +14714,22 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
9533 test $p = "-R"; then 9514 test $p = "-R"; then
9534 prev=$p 9515 prev=$p
9535 continue 9516 continue
@@ -9556,7 +9537,7 @@ index 69eb806a17d..9e97e334544 100755
9556 # Internal compiler library paths should come after those 9537 # Internal compiler library paths should come after those
9557 # provided the user. The postdeps already come after the 9538 # provided the user. The postdeps already come after the
9558 # user supplied libs so there is no need to process them. 9539 # user supplied libs so there is no need to process them.
9559@@ -13972,8 +14721,10 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 9540@@ -14000,8 +14749,10 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
9560 postdeps_CXX="${postdeps_CXX} ${prev}${p}" 9541 postdeps_CXX="${postdeps_CXX} ${prev}${p}"
9561 fi 9542 fi
9562 fi 9543 fi
@@ -9567,7 +9548,7 @@ index 69eb806a17d..9e97e334544 100755
9567 *.$objext) 9548 *.$objext)
9568 # This assumes that the test object file only shows up 9549 # This assumes that the test object file only shows up
9569 # once in the compiler output. 9550 # once in the compiler output.
9570@@ -14009,6 +14760,7 @@ else 9551@@ -14037,6 +14788,7 @@ else
9571 fi 9552 fi
9572 9553
9573 $RM -f confest.$objext 9554 $RM -f confest.$objext
@@ -9575,7 +9556,7 @@ index 69eb806a17d..9e97e334544 100755
9575 9556
9576 # PORTME: override above test on systems where it is broken 9557 # PORTME: override above test on systems where it is broken
9577 case $host_os in 9558 case $host_os in
9578@@ -14044,7 +14796,7 @@ linux*) 9559@@ -14072,7 +14824,7 @@ linux*)
9579 9560
9580 solaris*) 9561 solaris*)
9581 case $cc_basename in 9562 case $cc_basename in
@@ -9584,7 +9565,7 @@ index 69eb806a17d..9e97e334544 100755
9584 # The more standards-conforming stlport4 library is 9565 # The more standards-conforming stlport4 library is
9585 # incompatible with the Cstd library. Avoid specifying 9566 # incompatible with the Cstd library. Avoid specifying
9586 # it if it's in CXXFLAGS. Ignore libCrun as 9567 # it if it's in CXXFLAGS. Ignore libCrun as
9587@@ -14109,8 +14861,6 @@ fi 9568@@ -14137,8 +14889,6 @@ fi
9588 lt_prog_compiler_pic_CXX= 9569 lt_prog_compiler_pic_CXX=
9589 lt_prog_compiler_static_CXX= 9570 lt_prog_compiler_static_CXX=
9590 9571
@@ -9593,7 +9574,7 @@ index 69eb806a17d..9e97e334544 100755
9593 9574
9594 # C++ specific cases for pic, static, wl, etc. 9575 # C++ specific cases for pic, static, wl, etc.
9595 if test "$GXX" = yes; then 9576 if test "$GXX" = yes; then
9596@@ -14215,6 +14965,11 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 9577@@ -14243,6 +14993,11 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
9597 ;; 9578 ;;
9598 esac 9579 esac
9599 ;; 9580 ;;
@@ -9605,7 +9586,7 @@ index 69eb806a17d..9e97e334544 100755
9605 dgux*) 9586 dgux*)
9606 case $cc_basename in 9587 case $cc_basename in
9607 ec++*) 9588 ec++*)
9608@@ -14367,7 +15122,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 9589@@ -14395,7 +15150,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
9609 ;; 9590 ;;
9610 solaris*) 9591 solaris*)
9611 case $cc_basename in 9592 case $cc_basename in
@@ -9614,7 +9595,7 @@ index 69eb806a17d..9e97e334544 100755
9614 # Sun C++ 4.2, 5.x and Centerline C++ 9595 # Sun C++ 4.2, 5.x and Centerline C++
9615 lt_prog_compiler_pic_CXX='-KPIC' 9596 lt_prog_compiler_pic_CXX='-KPIC'
9616 lt_prog_compiler_static_CXX='-Bstatic' 9597 lt_prog_compiler_static_CXX='-Bstatic'
9617@@ -14432,10 +15187,17 @@ case $host_os in 9598@@ -14460,10 +15215,17 @@ case $host_os in
9618 lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC" 9599 lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC"
9619 ;; 9600 ;;
9620 esac 9601 esac
@@ -9635,7 +9616,7 @@ index 69eb806a17d..9e97e334544 100755
9635 9616
9636 # 9617 #
9637 # Check to make sure the PIC flag actually works. 9618 # Check to make sure the PIC flag actually works.
9638@@ -14493,6 +15255,8 @@ fi 9619@@ -14521,6 +15283,8 @@ fi
9639 9620
9640 9621
9641 9622
@@ -9644,7 +9625,7 @@ index 69eb806a17d..9e97e334544 100755
9644 # 9625 #
9645 # Check to make sure the static flag actually works. 9626 # Check to make sure the static flag actually works.
9646 # 9627 #
9647@@ -14670,6 +15434,7 @@ fi 9628@@ -14698,6 +15462,7 @@ fi
9648 $as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } 9629 $as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
9649 9630
9650 export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' 9631 export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
@@ -9652,7 +9633,7 @@ index 69eb806a17d..9e97e334544 100755
9652 case $host_os in 9633 case $host_os in
9653 aix[4-9]*) 9634 aix[4-9]*)
9654 # If we're using GNU nm, then we don't want the "-C" option. 9635 # If we're using GNU nm, then we don't want the "-C" option.
9655@@ -14684,15 +15449,20 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie 9636@@ -14712,15 +15477,20 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
9656 ;; 9637 ;;
9657 pw32*) 9638 pw32*)
9658 export_symbols_cmds_CXX="$ltdll_cmds" 9639 export_symbols_cmds_CXX="$ltdll_cmds"
@@ -9678,7 +9659,7 @@ index 69eb806a17d..9e97e334544 100755
9678 9659
9679 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5 9660 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5
9680 $as_echo "$ld_shlibs_CXX" >&6; } 9661 $as_echo "$ld_shlibs_CXX" >&6; }
9681@@ -14955,8 +15725,9 @@ cygwin* | mingw* | pw32* | cegcc*) 9662@@ -14983,8 +15753,9 @@ cygwin* | mingw* | pw32* | cegcc*)
9682 need_version=no 9663 need_version=no
9683 need_lib_prefix=no 9664 need_lib_prefix=no
9684 9665
@@ -9690,7 +9671,7 @@ index 69eb806a17d..9e97e334544 100755
9690 library_names_spec='$libname.dll.a' 9671 library_names_spec='$libname.dll.a'
9691 # DLL is installed to $(libdir)/../bin by postinstall_cmds 9672 # DLL is installed to $(libdir)/../bin by postinstall_cmds
9692 postinstall_cmds='base_file=`basename \${file}`~ 9673 postinstall_cmds='base_file=`basename \${file}`~
9693@@ -14988,13 +15759,71 @@ cygwin* | mingw* | pw32* | cegcc*) 9674@@ -15016,13 +15787,71 @@ cygwin* | mingw* | pw32* | cegcc*)
9694 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' 9675 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
9695 ;; 9676 ;;
9696 esac 9677 esac
@@ -9763,7 +9744,7 @@ index 69eb806a17d..9e97e334544 100755
9763 # FIXME: first we should search . and the directory the executable is in 9744 # FIXME: first we should search . and the directory the executable is in
9764 shlibpath_var=PATH 9745 shlibpath_var=PATH
9765 ;; 9746 ;;
9766@@ -15534,6 +16363,7 @@ fi 9747@@ -15586,6 +16415,7 @@ fi
9767 fi # test -n "$compiler" 9748 fi # test -n "$compiler"
9768 9749
9769 CC=$lt_save_CC 9750 CC=$lt_save_CC
@@ -9771,7 +9752,7 @@ index 69eb806a17d..9e97e334544 100755
9771 LDCXX=$LD 9752 LDCXX=$LD
9772 LD=$lt_save_LD 9753 LD=$lt_save_LD
9773 GCC=$lt_save_GCC 9754 GCC=$lt_save_GCC
9774@@ -17737,13 +18567,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' 9755@@ -17738,13 +18568,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
9775 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' 9756 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
9776 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' 9757 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
9777 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' 9758 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
@@ -9792,7 +9773,7 @@ index 69eb806a17d..9e97e334544 100755
9792 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' 9773 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
9793 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' 9774 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
9794 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' 9775 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
9795@@ -17758,14 +18595,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de 9776@@ -17759,14 +18596,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de
9796 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' 9777 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
9797 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' 9778 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
9798 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`' 9779 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`'
@@ -9811,7 +9792,7 @@ index 69eb806a17d..9e97e334544 100755
9811 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' 9792 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
9812 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' 9793 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
9813 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' 9794 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
9814@@ -17798,12 +18638,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q 9795@@ -17799,12 +18639,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q
9815 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' 9796 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
9816 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' 9797 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
9817 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' 9798 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
@@ -9825,7 +9806,7 @@ index 69eb806a17d..9e97e334544 100755
9825 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' 9806 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
9826 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' 9807 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
9827 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' 9808 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
9828@@ -17842,8 +18682,8 @@ old_archive_cmds_CXX='`$ECHO "$old_archive_cmds_CXX" | $SED "$delay_single_quote 9809@@ -17843,8 +18683,8 @@ old_archive_cmds_CXX='`$ECHO "$old_archive_cmds_CXX" | $SED "$delay_single_quote
9829 compiler_CXX='`$ECHO "$compiler_CXX" | $SED "$delay_single_quote_subst"`' 9810 compiler_CXX='`$ECHO "$compiler_CXX" | $SED "$delay_single_quote_subst"`'
9830 GCC_CXX='`$ECHO "$GCC_CXX" | $SED "$delay_single_quote_subst"`' 9811 GCC_CXX='`$ECHO "$GCC_CXX" | $SED "$delay_single_quote_subst"`'
9831 lt_prog_compiler_no_builtin_flag_CXX='`$ECHO "$lt_prog_compiler_no_builtin_flag_CXX" | $SED "$delay_single_quote_subst"`' 9812 lt_prog_compiler_no_builtin_flag_CXX='`$ECHO "$lt_prog_compiler_no_builtin_flag_CXX" | $SED "$delay_single_quote_subst"`'
@@ -9835,7 +9816,7 @@ index 69eb806a17d..9e97e334544 100755
9835 lt_prog_compiler_static_CXX='`$ECHO "$lt_prog_compiler_static_CXX" | $SED "$delay_single_quote_subst"`' 9816 lt_prog_compiler_static_CXX='`$ECHO "$lt_prog_compiler_static_CXX" | $SED "$delay_single_quote_subst"`'
9836 lt_cv_prog_compiler_c_o_CXX='`$ECHO "$lt_cv_prog_compiler_c_o_CXX" | $SED "$delay_single_quote_subst"`' 9817 lt_cv_prog_compiler_c_o_CXX='`$ECHO "$lt_cv_prog_compiler_c_o_CXX" | $SED "$delay_single_quote_subst"`'
9837 archive_cmds_need_lc_CXX='`$ECHO "$archive_cmds_need_lc_CXX" | $SED "$delay_single_quote_subst"`' 9818 archive_cmds_need_lc_CXX='`$ECHO "$archive_cmds_need_lc_CXX" | $SED "$delay_single_quote_subst"`'
9838@@ -17870,12 +18710,12 @@ hardcode_shlibpath_var_CXX='`$ECHO "$hardcode_shlibpath_var_CXX" | $SED "$delay_ 9819@@ -17871,12 +18711,12 @@ hardcode_shlibpath_var_CXX='`$ECHO "$hardcode_shlibpath_var_CXX" | $SED "$delay_
9839 hardcode_automatic_CXX='`$ECHO "$hardcode_automatic_CXX" | $SED "$delay_single_quote_subst"`' 9820 hardcode_automatic_CXX='`$ECHO "$hardcode_automatic_CXX" | $SED "$delay_single_quote_subst"`'
9840 inherit_rpath_CXX='`$ECHO "$inherit_rpath_CXX" | $SED "$delay_single_quote_subst"`' 9821 inherit_rpath_CXX='`$ECHO "$inherit_rpath_CXX" | $SED "$delay_single_quote_subst"`'
9841 link_all_deplibs_CXX='`$ECHO "$link_all_deplibs_CXX" | $SED "$delay_single_quote_subst"`' 9822 link_all_deplibs_CXX='`$ECHO "$link_all_deplibs_CXX" | $SED "$delay_single_quote_subst"`'
@@ -9849,7 +9830,7 @@ index 69eb806a17d..9e97e334544 100755
9849 file_list_spec_CXX='`$ECHO "$file_list_spec_CXX" | $SED "$delay_single_quote_subst"`' 9830 file_list_spec_CXX='`$ECHO "$file_list_spec_CXX" | $SED "$delay_single_quote_subst"`'
9850 hardcode_action_CXX='`$ECHO "$hardcode_action_CXX" | $SED "$delay_single_quote_subst"`' 9831 hardcode_action_CXX='`$ECHO "$hardcode_action_CXX" | $SED "$delay_single_quote_subst"`'
9851 compiler_lib_search_dirs_CXX='`$ECHO "$compiler_lib_search_dirs_CXX" | $SED "$delay_single_quote_subst"`' 9832 compiler_lib_search_dirs_CXX='`$ECHO "$compiler_lib_search_dirs_CXX" | $SED "$delay_single_quote_subst"`'
9852@@ -17913,8 +18753,13 @@ reload_flag \ 9833@@ -17914,8 +18754,13 @@ reload_flag \
9853 OBJDUMP \ 9834 OBJDUMP \
9854 deplibs_check_method \ 9835 deplibs_check_method \
9855 file_magic_cmd \ 9836 file_magic_cmd \
@@ -9863,7 +9844,7 @@ index 69eb806a17d..9e97e334544 100755
9863 STRIP \ 9844 STRIP \
9864 RANLIB \ 9845 RANLIB \
9865 CC \ 9846 CC \
9866@@ -17924,12 +18769,14 @@ lt_cv_sys_global_symbol_pipe \ 9847@@ -17925,12 +18770,14 @@ lt_cv_sys_global_symbol_pipe \
9867 lt_cv_sys_global_symbol_to_cdecl \ 9848 lt_cv_sys_global_symbol_to_cdecl \
9868 lt_cv_sys_global_symbol_to_c_name_address \ 9849 lt_cv_sys_global_symbol_to_c_name_address \
9869 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ 9850 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
@@ -9879,7 +9860,7 @@ index 69eb806a17d..9e97e334544 100755
9879 DSYMUTIL \ 9860 DSYMUTIL \
9880 NMEDIT \ 9861 NMEDIT \
9881 LIPO \ 9862 LIPO \
9882@@ -17945,7 +18792,6 @@ no_undefined_flag \ 9863@@ -17946,7 +18793,6 @@ no_undefined_flag \
9883 hardcode_libdir_flag_spec \ 9864 hardcode_libdir_flag_spec \
9884 hardcode_libdir_flag_spec_ld \ 9865 hardcode_libdir_flag_spec_ld \
9885 hardcode_libdir_separator \ 9866 hardcode_libdir_separator \
@@ -9887,7 +9868,7 @@ index 69eb806a17d..9e97e334544 100755
9887 exclude_expsyms \ 9868 exclude_expsyms \
9888 include_expsyms \ 9869 include_expsyms \
9889 file_list_spec \ 9870 file_list_spec \
9890@@ -17967,8 +18813,8 @@ LD_CXX \ 9871@@ -17968,8 +18814,8 @@ LD_CXX \
9891 reload_flag_CXX \ 9872 reload_flag_CXX \
9892 compiler_CXX \ 9873 compiler_CXX \
9893 lt_prog_compiler_no_builtin_flag_CXX \ 9874 lt_prog_compiler_no_builtin_flag_CXX \
@@ -9897,7 +9878,7 @@ index 69eb806a17d..9e97e334544 100755
9897 lt_prog_compiler_static_CXX \ 9878 lt_prog_compiler_static_CXX \
9898 lt_cv_prog_compiler_c_o_CXX \ 9879 lt_cv_prog_compiler_c_o_CXX \
9899 export_dynamic_flag_spec_CXX \ 9880 export_dynamic_flag_spec_CXX \
9900@@ -17980,7 +18826,6 @@ no_undefined_flag_CXX \ 9881@@ -17981,7 +18827,6 @@ no_undefined_flag_CXX \
9901 hardcode_libdir_flag_spec_CXX \ 9882 hardcode_libdir_flag_spec_CXX \
9902 hardcode_libdir_flag_spec_ld_CXX \ 9883 hardcode_libdir_flag_spec_ld_CXX \
9903 hardcode_libdir_separator_CXX \ 9884 hardcode_libdir_separator_CXX \
@@ -9905,7 +9886,7 @@ index 69eb806a17d..9e97e334544 100755
9905 exclude_expsyms_CXX \ 9886 exclude_expsyms_CXX \
9906 include_expsyms_CXX \ 9887 include_expsyms_CXX \
9907 file_list_spec_CXX \ 9888 file_list_spec_CXX \
9908@@ -18014,6 +18859,7 @@ module_cmds \ 9889@@ -18015,6 +18860,7 @@ module_cmds \
9909 module_expsym_cmds \ 9890 module_expsym_cmds \
9910 export_symbols_cmds \ 9891 export_symbols_cmds \
9911 prelink_cmds \ 9892 prelink_cmds \
@@ -9913,7 +9894,7 @@ index 69eb806a17d..9e97e334544 100755
9913 postinstall_cmds \ 9894 postinstall_cmds \
9914 postuninstall_cmds \ 9895 postuninstall_cmds \
9915 finish_cmds \ 9896 finish_cmds \
9916@@ -18028,7 +18874,8 @@ archive_expsym_cmds_CXX \ 9897@@ -18029,7 +18875,8 @@ archive_expsym_cmds_CXX \
9917 module_cmds_CXX \ 9898 module_cmds_CXX \
9918 module_expsym_cmds_CXX \ 9899 module_expsym_cmds_CXX \
9919 export_symbols_cmds_CXX \ 9900 export_symbols_cmds_CXX \
@@ -9923,7 +9904,7 @@ index 69eb806a17d..9e97e334544 100755
9923 case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in 9904 case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
9924 *[\\\\\\\`\\"\\\$]*) 9905 *[\\\\\\\`\\"\\\$]*)
9925 eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" 9906 eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
9926@@ -18785,7 +19632,8 @@ $as_echo X"$file" | 9907@@ -18786,7 +19633,8 @@ $as_echo X"$file" |
9927 # NOTE: Changes made to this file will be lost: look at ltmain.sh. 9908 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
9928 # 9909 #
9929 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 9910 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
@@ -9933,7 +9914,7 @@ index 69eb806a17d..9e97e334544 100755
9933 # Written by Gordon Matzigkeit, 1996 9914 # Written by Gordon Matzigkeit, 1996
9934 # 9915 #
9935 # This file is part of GNU Libtool. 9916 # This file is part of GNU Libtool.
9936@@ -18888,19 +19736,42 @@ SP2NL=$lt_lt_SP2NL 9917@@ -18889,19 +19737,42 @@ SP2NL=$lt_lt_SP2NL
9937 # turn newlines into spaces. 9918 # turn newlines into spaces.
9938 NL2SP=$lt_lt_NL2SP 9919 NL2SP=$lt_lt_NL2SP
9939 9920
@@ -9977,7 +9958,7 @@ index 69eb806a17d..9e97e334544 100755
9977 # A symbol stripping program. 9958 # A symbol stripping program.
9978 STRIP=$lt_STRIP 9959 STRIP=$lt_STRIP
9979 9960
9980@@ -18930,6 +19801,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address 9961@@ -18931,6 +19802,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
9981 # Transform the output of nm in a C name address pair when lib prefix is needed. 9962 # Transform the output of nm in a C name address pair when lib prefix is needed.
9982 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix 9963 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
9983 9964
@@ -9990,7 +9971,7 @@ index 69eb806a17d..9e97e334544 100755
9990 # The name of the directory that contains temporary libtool files. 9971 # The name of the directory that contains temporary libtool files.
9991 objdir=$objdir 9972 objdir=$objdir
9992 9973
9993@@ -18939,6 +19816,9 @@ MAGIC_CMD=$MAGIC_CMD 9974@@ -18940,6 +19817,9 @@ MAGIC_CMD=$MAGIC_CMD
9994 # Must we lock files when doing compilation? 9975 # Must we lock files when doing compilation?
9995 need_locks=$lt_need_locks 9976 need_locks=$lt_need_locks
9996 9977
@@ -10000,7 +9981,7 @@ index 69eb806a17d..9e97e334544 100755
10000 # Tool to manipulate archived DWARF debug symbol files on Mac OS X. 9981 # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
10001 DSYMUTIL=$lt_DSYMUTIL 9982 DSYMUTIL=$lt_DSYMUTIL
10002 9983
10003@@ -19053,12 +19933,12 @@ with_gcc=$GCC 9984@@ -19054,12 +19934,12 @@ with_gcc=$GCC
10004 # Compiler flag to turn off builtin functions. 9985 # Compiler flag to turn off builtin functions.
10005 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag 9986 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
10006 9987
@@ -10016,7 +9997,7 @@ index 69eb806a17d..9e97e334544 100755
10016 # Compiler flag to prevent dynamic linking. 9997 # Compiler flag to prevent dynamic linking.
10017 link_static_flag=$lt_lt_prog_compiler_static 9998 link_static_flag=$lt_lt_prog_compiler_static
10018 9999
10019@@ -19145,9 +20025,6 @@ inherit_rpath=$inherit_rpath 10000@@ -19146,9 +20026,6 @@ inherit_rpath=$inherit_rpath
10020 # Whether libtool must link a program against all its dependency libraries. 10001 # Whether libtool must link a program against all its dependency libraries.
10021 link_all_deplibs=$link_all_deplibs 10002 link_all_deplibs=$link_all_deplibs
10022 10003
@@ -10026,7 +10007,7 @@ index 69eb806a17d..9e97e334544 100755
10026 # Set to "yes" if exported symbols are required. 10007 # Set to "yes" if exported symbols are required.
10027 always_export_symbols=$always_export_symbols 10008 always_export_symbols=$always_export_symbols
10028 10009
10029@@ -19163,6 +20040,9 @@ include_expsyms=$lt_include_expsyms 10010@@ -19164,6 +20041,9 @@ include_expsyms=$lt_include_expsyms
10030 # Commands necessary for linking programs (against libraries) with templates. 10011 # Commands necessary for linking programs (against libraries) with templates.
10031 prelink_cmds=$lt_prelink_cmds 10012 prelink_cmds=$lt_prelink_cmds
10032 10013
@@ -10036,7 +10017,7 @@ index 69eb806a17d..9e97e334544 100755
10036 # Specify filename containing input files. 10017 # Specify filename containing input files.
10037 file_list_spec=$lt_file_list_spec 10018 file_list_spec=$lt_file_list_spec
10038 10019
10039@@ -19209,210 +20089,169 @@ ltmain="$ac_aux_dir/ltmain.sh" 10020@@ -19210,210 +20090,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
10040 # if finds mixed CR/LF and LF-only lines. Since sed operates in 10021 # if finds mixed CR/LF and LF-only lines. Since sed operates in
10041 # text mode, it properly converts lines to CR/LF. This bash problem 10022 # text mode, it properly converts lines to CR/LF. This bash problem
10042 # is reportedly fixed, but why not run on old versions too? 10023 # is reportedly fixed, but why not run on old versions too?
@@ -10410,7 +10391,7 @@ index 69eb806a17d..9e97e334544 100755
10410 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") 10391 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
10411 chmod +x "$ofile" 10392 chmod +x "$ofile"
10412 10393
10413@@ -19440,12 +20279,12 @@ with_gcc=$GCC_CXX 10394@@ -19441,12 +20280,12 @@ with_gcc=$GCC_CXX
10414 # Compiler flag to turn off builtin functions. 10395 # Compiler flag to turn off builtin functions.
10415 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX 10396 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX
10416 10397
@@ -10426,7 +10407,7 @@ index 69eb806a17d..9e97e334544 100755
10426 # Compiler flag to prevent dynamic linking. 10407 # Compiler flag to prevent dynamic linking.
10427 link_static_flag=$lt_lt_prog_compiler_static_CXX 10408 link_static_flag=$lt_lt_prog_compiler_static_CXX
10428 10409
10429@@ -19532,9 +20371,6 @@ inherit_rpath=$inherit_rpath_CXX 10410@@ -19533,9 +20372,6 @@ inherit_rpath=$inherit_rpath_CXX
10430 # Whether libtool must link a program against all its dependency libraries. 10411 # Whether libtool must link a program against all its dependency libraries.
10431 link_all_deplibs=$link_all_deplibs_CXX 10412 link_all_deplibs=$link_all_deplibs_CXX
10432 10413
@@ -10436,7 +10417,7 @@ index 69eb806a17d..9e97e334544 100755
10436 # Set to "yes" if exported symbols are required. 10417 # Set to "yes" if exported symbols are required.
10437 always_export_symbols=$always_export_symbols_CXX 10418 always_export_symbols=$always_export_symbols_CXX
10438 10419
10439@@ -19550,6 +20386,9 @@ include_expsyms=$lt_include_expsyms_CXX 10420@@ -19551,6 +20387,9 @@ include_expsyms=$lt_include_expsyms_CXX
10440 # Commands necessary for linking programs (against libraries) with templates. 10421 # Commands necessary for linking programs (against libraries) with templates.
10441 prelink_cmds=$lt_prelink_cmds_CXX 10422 prelink_cmds=$lt_prelink_cmds_CXX
10442 10423
@@ -10447,7 +10428,7 @@ index 69eb806a17d..9e97e334544 100755
10447 file_list_spec=$lt_file_list_spec_CXX 10428 file_list_spec=$lt_file_list_spec_CXX
10448 10429
10449diff --git a/gprofng/doc/Makefile.in b/gprofng/doc/Makefile.in 10430diff --git a/gprofng/doc/Makefile.in b/gprofng/doc/Makefile.in
10450index 78f8ae11fc7..48058763422 100644 10431index 3306c51b31c..6ab3d9636c8 100644
10451--- a/gprofng/doc/Makefile.in 10432--- a/gprofng/doc/Makefile.in
10452+++ b/gprofng/doc/Makefile.in 10433+++ b/gprofng/doc/Makefile.in
10453@@ -238,6 +238,7 @@ CXXFLAGS = @CXXFLAGS@ 10434@@ -238,6 +238,7 @@ CXXFLAGS = @CXXFLAGS@
@@ -10458,7 +10439,7 @@ index 78f8ae11fc7..48058763422 100644
10458 DSYMUTIL = @DSYMUTIL@ 10439 DSYMUTIL = @DSYMUTIL@
10459 DUMPBIN = @DUMPBIN@ 10440 DUMPBIN = @DUMPBIN@
10460 ECHO_C = @ECHO_C@ 10441 ECHO_C = @ECHO_C@
10461@@ -273,6 +274,7 @@ LN_S = @LN_S@ 10442@@ -272,6 +273,7 @@ LN_S = @LN_S@
10462 LTLIBOBJS = @LTLIBOBJS@ 10443 LTLIBOBJS = @LTLIBOBJS@
10463 MAINT = @MAINT@ 10444 MAINT = @MAINT@
10464 MAKEINFO = @MAKEINFO@ 10445 MAKEINFO = @MAKEINFO@
@@ -10467,7 +10448,7 @@ index 78f8ae11fc7..48058763422 100644
10467 NM = @NM@ 10448 NM = @NM@
10468 NMEDIT = @NMEDIT@ 10449 NMEDIT = @NMEDIT@
10469diff --git a/gprofng/gp-display-html/Makefile.in b/gprofng/gp-display-html/Makefile.in 10450diff --git a/gprofng/gp-display-html/Makefile.in b/gprofng/gp-display-html/Makefile.in
10470index 21cc1c6623b..e989804603e 100644 10451index 61c00cd6e46..edce3cb94c5 100644
10471--- a/gprofng/gp-display-html/Makefile.in 10452--- a/gprofng/gp-display-html/Makefile.in
10472+++ b/gprofng/gp-display-html/Makefile.in 10453+++ b/gprofng/gp-display-html/Makefile.in
10473@@ -197,6 +197,7 @@ CXXFLAGS = @CXXFLAGS@ 10454@@ -197,6 +197,7 @@ CXXFLAGS = @CXXFLAGS@
@@ -10478,7 +10459,7 @@ index 21cc1c6623b..e989804603e 100644
10478 DSYMUTIL = @DSYMUTIL@ 10459 DSYMUTIL = @DSYMUTIL@
10479 DUMPBIN = @DUMPBIN@ 10460 DUMPBIN = @DUMPBIN@
10480 ECHO_C = @ECHO_C@ 10461 ECHO_C = @ECHO_C@
10481@@ -232,6 +233,7 @@ LN_S = @LN_S@ 10462@@ -231,6 +232,7 @@ LN_S = @LN_S@
10482 LTLIBOBJS = @LTLIBOBJS@ 10463 LTLIBOBJS = @LTLIBOBJS@
10483 MAINT = @MAINT@ 10464 MAINT = @MAINT@
10484 MAKEINFO = @MAKEINFO@ 10465 MAKEINFO = @MAKEINFO@
@@ -10487,7 +10468,7 @@ index 21cc1c6623b..e989804603e 100644
10487 NM = @NM@ 10468 NM = @NM@
10488 NMEDIT = @NMEDIT@ 10469 NMEDIT = @NMEDIT@
10489diff --git a/gprofng/libcollector/Makefile.in b/gprofng/libcollector/Makefile.in 10470diff --git a/gprofng/libcollector/Makefile.in b/gprofng/libcollector/Makefile.in
10490index dc76a76bd67..763b08822f2 100644 10471index ce8755c80c9..91e29c29ab8 100644
10491--- a/gprofng/libcollector/Makefile.in 10472--- a/gprofng/libcollector/Makefile.in
10492+++ b/gprofng/libcollector/Makefile.in 10473+++ b/gprofng/libcollector/Makefile.in
10493@@ -316,6 +316,7 @@ CXXFLAGS = @CXXFLAGS@ 10474@@ -316,6 +316,7 @@ CXXFLAGS = @CXXFLAGS@
@@ -10507,7 +10488,7 @@ index dc76a76bd67..763b08822f2 100644
10507 NM = @NM@ 10488 NM = @NM@
10508 NMEDIT = @NMEDIT@ 10489 NMEDIT = @NMEDIT@
10509diff --git a/gprofng/libcollector/configure b/gprofng/libcollector/configure 10490diff --git a/gprofng/libcollector/configure b/gprofng/libcollector/configure
10510index 865ddb3d91d..31533528ee2 100755 10491index b6737b96bd5..d1552932a75 100755
10511--- a/gprofng/libcollector/configure 10492--- a/gprofng/libcollector/configure
10512+++ b/gprofng/libcollector/configure 10493+++ b/gprofng/libcollector/configure
10513@@ -640,6 +640,8 @@ OTOOL 10494@@ -640,6 +640,8 @@ OTOOL
@@ -10670,7 +10651,7 @@ index 865ddb3d91d..31533528ee2 100755
10670 lt_cv_file_magic_cmd='$OBJDUMP -f' 10651 lt_cv_file_magic_cmd='$OBJDUMP -f'
10671 fi 10652 fi
10672 ;; 10653 ;;
10673@@ -7090,6 +7175,21 @@ esac 10654@@ -7095,6 +7180,21 @@ esac
10674 fi 10655 fi
10675 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 10656 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
10676 $as_echo "$lt_cv_deplibs_check_method" >&6; } 10657 $as_echo "$lt_cv_deplibs_check_method" >&6; }
@@ -10692,7 +10673,7 @@ index 865ddb3d91d..31533528ee2 100755
10692 file_magic_cmd=$lt_cv_file_magic_cmd 10673 file_magic_cmd=$lt_cv_file_magic_cmd
10693 deplibs_check_method=$lt_cv_deplibs_check_method 10674 deplibs_check_method=$lt_cv_deplibs_check_method
10694 test -z "$deplibs_check_method" && deplibs_check_method=unknown 10675 test -z "$deplibs_check_method" && deplibs_check_method=unknown
10695@@ -7105,6 +7205,157 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown 10676@@ -7110,6 +7210,157 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
10696 10677
10697 10678
10698 10679
@@ -10850,7 +10831,7 @@ index 865ddb3d91d..31533528ee2 100755
10850 plugin_option= 10831 plugin_option=
10851 plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll" 10832 plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll"
10852 for plugin in $plugin_names; do 10833 for plugin in $plugin_names; do
10853@@ -7119,8 +7370,10 @@ for plugin in $plugin_names; do 10834@@ -7124,8 +7375,10 @@ for plugin in $plugin_names; do
10854 done 10835 done
10855 10836
10856 if test -n "$ac_tool_prefix"; then 10837 if test -n "$ac_tool_prefix"; then
@@ -10863,7 +10844,7 @@ index 865ddb3d91d..31533528ee2 100755
10863 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 10844 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
10864 $as_echo_n "checking for $ac_word... " >&6; } 10845 $as_echo_n "checking for $ac_word... " >&6; }
10865 if ${ac_cv_prog_AR+:} false; then : 10846 if ${ac_cv_prog_AR+:} false; then :
10866@@ -7136,7 +7389,7 @@ do 10847@@ -7141,7 +7394,7 @@ do
10867 test -z "$as_dir" && as_dir=. 10848 test -z "$as_dir" && as_dir=.
10868 for ac_exec_ext in '' $ac_executable_extensions; do 10849 for ac_exec_ext in '' $ac_executable_extensions; do
10869 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 10850 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
@@ -10872,7 +10853,7 @@ index 865ddb3d91d..31533528ee2 100755
10872 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 10853 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
10873 break 2 10854 break 2
10874 fi 10855 fi
10875@@ -7156,11 +7409,15 @@ $as_echo "no" >&6; } 10856@@ -7161,11 +7414,15 @@ $as_echo "no" >&6; }
10876 fi 10857 fi
10877 10858
10878 10859
@@ -10891,7 +10872,7 @@ index 865ddb3d91d..31533528ee2 100755
10891 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 10872 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
10892 $as_echo_n "checking for $ac_word... " >&6; } 10873 $as_echo_n "checking for $ac_word... " >&6; }
10893 if ${ac_cv_prog_ac_ct_AR+:} false; then : 10874 if ${ac_cv_prog_ac_ct_AR+:} false; then :
10894@@ -7176,7 +7433,7 @@ do 10875@@ -7181,7 +7438,7 @@ do
10895 test -z "$as_dir" && as_dir=. 10876 test -z "$as_dir" && as_dir=.
10896 for ac_exec_ext in '' $ac_executable_extensions; do 10877 for ac_exec_ext in '' $ac_executable_extensions; do
10897 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 10878 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
@@ -10900,7 +10881,7 @@ index 865ddb3d91d..31533528ee2 100755
10900 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 10881 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
10901 break 2 10882 break 2
10902 fi 10883 fi
10903@@ -7195,6 +7452,10 @@ else 10884@@ -7200,6 +7457,10 @@ else
10904 $as_echo "no" >&6; } 10885 $as_echo "no" >&6; }
10905 fi 10886 fi
10906 10887
@@ -10911,7 +10892,7 @@ index 865ddb3d91d..31533528ee2 100755
10911 if test "x$ac_ct_AR" = x; then 10892 if test "x$ac_ct_AR" = x; then
10912 AR="false" 10893 AR="false"
10913 else 10894 else
10914@@ -7206,29 +7467,81 @@ ac_tool_warned=yes ;; 10895@@ -7211,25 +7472,19 @@ ac_tool_warned=yes ;;
10915 esac 10896 esac
10916 AR=$ac_ct_AR 10897 AR=$ac_ct_AR
10917 fi 10898 fi
@@ -10943,16 +10924,12 @@ index 865ddb3d91d..31533528ee2 100755
10943+ rm -f conftest.* 10924+ rm -f conftest.*
10944+: ${AR=ar} 10925+: ${AR=ar}
10945+: ${AR_FLAGS=cru} 10926+: ${AR_FLAGS=cru}
10946+
10947+
10948+
10949+
10950+
10951+
10952+
10953 10927
10954 10928
10955 10929
10930@@ -7241,6 +7496,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru
10931
10932
10956 10933
10957+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 10934+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
10958+$as_echo_n "checking for archiver @FILE support... " >&6; } 10935+$as_echo_n "checking for archiver @FILE support... " >&6; }
@@ -11005,10 +10982,17 @@ index 865ddb3d91d..31533528ee2 100755
11005+else 10982+else
11006+ archiver_list_spec=$lt_cv_ar_at_file 10983+ archiver_list_spec=$lt_cv_ar_at_file
11007+fi 10984+fi
11008 10985+
11009 10986+
11010 10987+
11011@@ -7575,8 +7888,8 @@ esac 10988+
10989+
10990+
10991+
10992 if test -n "$ac_tool_prefix"; then
10993 # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
10994 set dummy ${ac_tool_prefix}strip; ac_word=$2
10995@@ -7580,8 +7893,8 @@ esac
11012 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" 10996 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
11013 10997
11014 # Transform an extracted symbol line into symbol name and symbol address 10998 # Transform an extracted symbol line into symbol name and symbol address
@@ -11019,7 +11003,7 @@ index 865ddb3d91d..31533528ee2 100755
11019 11003
11020 # Handle CRLF in mingw tool chain 11004 # Handle CRLF in mingw tool chain
11021 opt_cr= 11005 opt_cr=
11022@@ -7612,6 +7925,7 @@ for ac_symprfx in "" "_"; do 11006@@ -7617,6 +7930,7 @@ for ac_symprfx in "" "_"; do
11023 else 11007 else
11024 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" 11008 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
11025 fi 11009 fi
@@ -11027,7 +11011,7 @@ index 865ddb3d91d..31533528ee2 100755
11027 11011
11028 # Check to see that the pipe works correctly. 11012 # Check to see that the pipe works correctly.
11029 pipe_works=no 11013 pipe_works=no
11030@@ -7653,6 +7967,18 @@ _LT_EOF 11014@@ -7658,6 +7972,18 @@ _LT_EOF
11031 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then 11015 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
11032 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then 11016 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
11033 cat <<_LT_EOF > conftest.$ac_ext 11017 cat <<_LT_EOF > conftest.$ac_ext
@@ -11046,7 +11030,7 @@ index 865ddb3d91d..31533528ee2 100755
11046 #ifdef __cplusplus 11030 #ifdef __cplusplus
11047 extern "C" { 11031 extern "C" {
11048 #endif 11032 #endif
11049@@ -7664,7 +7990,7 @@ _LT_EOF 11033@@ -7669,7 +7995,7 @@ _LT_EOF
11050 cat <<_LT_EOF >> conftest.$ac_ext 11034 cat <<_LT_EOF >> conftest.$ac_ext
11051 11035
11052 /* The mapping between symbol names and symbols. */ 11036 /* The mapping between symbol names and symbols. */
@@ -11055,7 +11039,7 @@ index 865ddb3d91d..31533528ee2 100755
11055 const char *name; 11039 const char *name;
11056 void *address; 11040 void *address;
11057 } 11041 }
11058@@ -7690,8 +8016,8 @@ static const void *lt_preloaded_setup() { 11042@@ -7695,8 +8021,8 @@ static const void *lt_preloaded_setup() {
11059 _LT_EOF 11043 _LT_EOF
11060 # Now try linking the two files. 11044 # Now try linking the two files.
11061 mv conftest.$ac_objext conftstm.$ac_objext 11045 mv conftest.$ac_objext conftstm.$ac_objext
@@ -11066,7 +11050,7 @@ index 865ddb3d91d..31533528ee2 100755
11066 LIBS="conftstm.$ac_objext" 11050 LIBS="conftstm.$ac_objext"
11067 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" 11051 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
11068 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 11052 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
11069@@ -7701,8 +8027,8 @@ _LT_EOF 11053@@ -7706,8 +8032,8 @@ _LT_EOF
11070 test $ac_status = 0; } && test -s conftest${ac_exeext}; then 11054 test $ac_status = 0; } && test -s conftest${ac_exeext}; then
11071 pipe_works=yes 11055 pipe_works=yes
11072 fi 11056 fi
@@ -11077,7 +11061,7 @@ index 865ddb3d91d..31533528ee2 100755
11077 else 11061 else
11078 echo "cannot find nm_test_func in $nlist" >&5 11062 echo "cannot find nm_test_func in $nlist" >&5
11079 fi 11063 fi
11080@@ -7739,6 +8065,13 @@ else 11064@@ -7744,6 +8070,13 @@ else
11081 $as_echo "ok" >&6; } 11065 $as_echo "ok" >&6; }
11082 fi 11066 fi
11083 11067
@@ -11091,7 +11075,7 @@ index 865ddb3d91d..31533528ee2 100755
11091 11075
11092 11076
11093 11077
11094@@ -7758,6 +8091,48 @@ fi 11078@@ -7763,6 +8096,48 @@ fi
11095 11079
11096 11080
11097 11081
@@ -11140,7 +11124,7 @@ index 865ddb3d91d..31533528ee2 100755
11140 11124
11141 11125
11142 # Check whether --enable-libtool-lock was given. 11126 # Check whether --enable-libtool-lock was given.
11143@@ -7966,6 +8341,123 @@ esac 11127@@ -7971,6 +8346,123 @@ esac
11144 11128
11145 need_locks="$enable_libtool_lock" 11129 need_locks="$enable_libtool_lock"
11146 11130
@@ -11264,7 +11248,7 @@ index 865ddb3d91d..31533528ee2 100755
11264 11248
11265 case $host_os in 11249 case $host_os in
11266 rhapsody* | darwin*) 11250 rhapsody* | darwin*)
11267@@ -8529,6 +9021,8 @@ _LT_EOF 11251@@ -8534,6 +9026,8 @@ _LT_EOF
11268 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 11252 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
11269 echo "$AR cru libconftest.a conftest.o" >&5 11253 echo "$AR cru libconftest.a conftest.o" >&5
11270 $AR cru libconftest.a conftest.o 2>&5 11254 $AR cru libconftest.a conftest.o 2>&5
@@ -11273,7 +11257,7 @@ index 865ddb3d91d..31533528ee2 100755
11273 cat > conftest.c << _LT_EOF 11257 cat > conftest.c << _LT_EOF
11274 int main() { return 0;} 11258 int main() { return 0;}
11275 _LT_EOF 11259 _LT_EOF
11276@@ -8597,6 +9091,16 @@ done 11260@@ -8604,6 +9098,16 @@ done
11277 11261
11278 11262
11279 11263
@@ -11290,7 +11274,7 @@ index 865ddb3d91d..31533528ee2 100755
11290 11274
11291 11275
11292 # Set options 11276 # Set options
11293@@ -9112,8 +9616,6 @@ fi 11277@@ -9119,8 +9623,6 @@ fi
11294 lt_prog_compiler_pic= 11278 lt_prog_compiler_pic=
11295 lt_prog_compiler_static= 11279 lt_prog_compiler_static=
11296 11280
@@ -11299,7 +11283,7 @@ index 865ddb3d91d..31533528ee2 100755
11299 11283
11300 if test "$GCC" = yes; then 11284 if test "$GCC" = yes; then
11301 lt_prog_compiler_wl='-Wl,' 11285 lt_prog_compiler_wl='-Wl,'
11302@@ -9279,6 +9781,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 11286@@ -9286,6 +9788,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
11303 lt_prog_compiler_pic='--shared' 11287 lt_prog_compiler_pic='--shared'
11304 lt_prog_compiler_static='--static' 11288 lt_prog_compiler_static='--static'
11305 ;; 11289 ;;
@@ -11312,7 +11296,7 @@ index 865ddb3d91d..31533528ee2 100755
11312 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) 11296 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
11313 # Portland Group compilers (*not* the Pentium gcc compiler, 11297 # Portland Group compilers (*not* the Pentium gcc compiler,
11314 # which looks to be a dead project) 11298 # which looks to be a dead project)
11315@@ -9341,7 +9849,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 11299@@ -9348,7 +9856,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
11316 lt_prog_compiler_pic='-KPIC' 11300 lt_prog_compiler_pic='-KPIC'
11317 lt_prog_compiler_static='-Bstatic' 11301 lt_prog_compiler_static='-Bstatic'
11318 case $cc_basename in 11302 case $cc_basename in
@@ -11321,7 +11305,7 @@ index 865ddb3d91d..31533528ee2 100755
11321 lt_prog_compiler_wl='-Qoption ld ';; 11305 lt_prog_compiler_wl='-Qoption ld ';;
11322 *) 11306 *)
11323 lt_prog_compiler_wl='-Wl,';; 11307 lt_prog_compiler_wl='-Wl,';;
11324@@ -9398,13 +9906,17 @@ case $host_os in 11308@@ -9405,13 +9913,17 @@ case $host_os in
11325 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" 11309 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
11326 ;; 11310 ;;
11327 esac 11311 esac
@@ -11345,7 +11329,7 @@ index 865ddb3d91d..31533528ee2 100755
11345 11329
11346 # 11330 #
11347 # Check to make sure the PIC flag actually works. 11331 # Check to make sure the PIC flag actually works.
11348@@ -9465,6 +9977,11 @@ fi 11332@@ -9472,6 +9984,11 @@ fi
11349 11333
11350 11334
11351 11335
@@ -11357,7 +11341,7 @@ index 865ddb3d91d..31533528ee2 100755
11357 # 11341 #
11358 # Check to make sure the static flag actually works. 11342 # Check to make sure the static flag actually works.
11359 # 11343 #
11360@@ -9815,7 +10332,8 @@ _LT_EOF 11344@@ -9822,7 +10339,8 @@ _LT_EOF
11361 allow_undefined_flag=unsupported 11345 allow_undefined_flag=unsupported
11362 always_export_symbols=no 11346 always_export_symbols=no
11363 enable_shared_with_static_runtimes=yes 11347 enable_shared_with_static_runtimes=yes
@@ -11367,7 +11351,7 @@ index 865ddb3d91d..31533528ee2 100755
11367 11351
11368 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then 11352 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
11369 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' 11353 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
11370@@ -9914,12 +10432,12 @@ _LT_EOF 11354@@ -9921,12 +10439,12 @@ _LT_EOF
11371 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' 11355 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
11372 hardcode_libdir_flag_spec= 11356 hardcode_libdir_flag_spec=
11373 hardcode_libdir_flag_spec_ld='-rpath $libdir' 11357 hardcode_libdir_flag_spec_ld='-rpath $libdir'
@@ -11382,7 +11366,7 @@ index 865ddb3d91d..31533528ee2 100755
11382 fi 11366 fi
11383 ;; 11367 ;;
11384 esac 11368 esac
11385@@ -9933,8 +10451,8 @@ _LT_EOF 11369@@ -9940,8 +10458,8 @@ _LT_EOF
11386 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' 11370 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
11387 wlarc= 11371 wlarc=
11388 else 11372 else
@@ -11393,7 +11377,7 @@ index 865ddb3d91d..31533528ee2 100755
11393 fi 11377 fi
11394 ;; 11378 ;;
11395 11379
11396@@ -9952,8 +10470,8 @@ _LT_EOF 11380@@ -9959,8 +10477,8 @@ _LT_EOF
11397 11381
11398 _LT_EOF 11382 _LT_EOF
11399 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 11383 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -11404,7 +11388,7 @@ index 865ddb3d91d..31533528ee2 100755
11404 else 11388 else
11405 ld_shlibs=no 11389 ld_shlibs=no
11406 fi 11390 fi
11407@@ -9999,8 +10517,8 @@ _LT_EOF 11391@@ -10006,8 +10524,8 @@ _LT_EOF
11408 11392
11409 *) 11393 *)
11410 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 11394 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -11415,7 +11399,7 @@ index 865ddb3d91d..31533528ee2 100755
11415 else 11399 else
11416 ld_shlibs=no 11400 ld_shlibs=no
11417 fi 11401 fi
11418@@ -10130,7 +10648,13 @@ _LT_EOF 11402@@ -10137,7 +10655,13 @@ _LT_EOF
11419 allow_undefined_flag='-berok' 11403 allow_undefined_flag='-berok'
11420 # Determine the default libpath from the value encoded in an 11404 # Determine the default libpath from the value encoded in an
11421 # empty executable. 11405 # empty executable.
@@ -11430,7 +11414,7 @@ index 865ddb3d91d..31533528ee2 100755
11430 /* end confdefs.h. */ 11414 /* end confdefs.h. */
11431 11415
11432 int 11416 int
11433@@ -10143,22 +10667,29 @@ main () 11417@@ -10150,22 +10674,29 @@ main ()
11434 _ACEOF 11418 _ACEOF
11435 if ac_fn_c_try_link "$LINENO"; then : 11419 if ac_fn_c_try_link "$LINENO"; then :
11436 11420
@@ -11473,7 +11457,7 @@ index 865ddb3d91d..31533528ee2 100755
11473 11457
11474 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 11458 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
11475 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" 11459 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"
11476@@ -10170,7 +10701,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 11460@@ -10177,7 +10708,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
11477 else 11461 else
11478 # Determine the default libpath from the value encoded in an 11462 # Determine the default libpath from the value encoded in an
11479 # empty executable. 11463 # empty executable.
@@ -11488,7 +11472,7 @@ index 865ddb3d91d..31533528ee2 100755
11488 /* end confdefs.h. */ 11472 /* end confdefs.h. */
11489 11473
11490 int 11474 int
11491@@ -10183,22 +10720,29 @@ main () 11475@@ -10190,22 +10727,29 @@ main ()
11492 _ACEOF 11476 _ACEOF
11493 if ac_fn_c_try_link "$LINENO"; then : 11477 if ac_fn_c_try_link "$LINENO"; then :
11494 11478
@@ -11531,11 +11515,10 @@ index 865ddb3d91d..31533528ee2 100755
11531 11515
11532 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 11516 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
11533 # Warning - without using the other run time loading flags, 11517 # Warning - without using the other run time loading flags,
11534@@ -10242,21 +10786,64 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 11518@@ -10250,20 +10794,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
11535 # When not using gcc, we currently assume that we are using
11536 # Microsoft Visual C++. 11519 # Microsoft Visual C++.
11537 # hardcode_libdir_flag_spec is actually meaningless, as there is 11520 # hardcode_libdir_flag_spec is actually meaningless, as there is
11538- # no search path for DLLs. 11521 # no search path for DLLs.
11539- hardcode_libdir_flag_spec=' ' 11522- hardcode_libdir_flag_spec=' '
11540- allow_undefined_flag=unsupported 11523- allow_undefined_flag=unsupported
11541- # Tell ltmain to make .lib files, not .a files. 11524- # Tell ltmain to make .lib files, not .a files.
@@ -11550,7 +11533,6 @@ index 865ddb3d91d..31533528ee2 100755
11550- old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' 11533- old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
11551- fix_srcfile_path='`cygpath -w "$srcfile"`' 11534- fix_srcfile_path='`cygpath -w "$srcfile"`'
11552- enable_shared_with_static_runtimes=yes 11535- enable_shared_with_static_runtimes=yes
11553+ # no search path for DLLs.
11554+ case $cc_basename in 11536+ case $cc_basename in
11555+ cl*) 11537+ cl*)
11556+ # Native MSVC 11538+ # Native MSVC
@@ -11611,7 +11593,7 @@ index 865ddb3d91d..31533528ee2 100755
11611 ;; 11593 ;;
11612 11594
11613 darwin* | rhapsody*) 11595 darwin* | rhapsody*)
11614@@ -10317,7 +10904,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 11596@@ -10324,7 +10911,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
11615 11597
11616 # FreeBSD 3 and greater uses gcc -shared to do shared libraries. 11598 # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
11617 freebsd* | dragonfly*) 11599 freebsd* | dragonfly*)
@@ -11620,7 +11602,7 @@ index 865ddb3d91d..31533528ee2 100755
11620 hardcode_libdir_flag_spec='-R$libdir' 11602 hardcode_libdir_flag_spec='-R$libdir'
11621 hardcode_direct=yes 11603 hardcode_direct=yes
11622 hardcode_shlibpath_var=no 11604 hardcode_shlibpath_var=no
11623@@ -10325,7 +10912,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 11605@@ -10332,7 +10919,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
11624 11606
11625 hpux9*) 11607 hpux9*)
11626 if test "$GCC" = yes; then 11608 if test "$GCC" = yes; then
@@ -11629,7 +11611,7 @@ index 865ddb3d91d..31533528ee2 100755
11629 else 11611 else
11630 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' 11612 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'
11631 fi 11613 fi
11632@@ -10341,7 +10928,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 11614@@ -10348,7 +10935,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
11633 11615
11634 hpux10*) 11616 hpux10*)
11635 if test "$GCC" = yes && test "$with_gnu_ld" = no; then 11617 if test "$GCC" = yes && test "$with_gnu_ld" = no; then
@@ -11638,8 +11620,8 @@ index 865ddb3d91d..31533528ee2 100755
11638 else 11620 else
11639 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' 11621 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
11640 fi 11622 fi
11641@@ -10365,10 +10952,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 11623@@ -10372,10 +10959,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
11642 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' 11624 archive_cmds='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
11643 ;; 11625 ;;
11644 ia64*) 11626 ia64*)
11645- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' 11627- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
@@ -11651,7 +11633,7 @@ index 865ddb3d91d..31533528ee2 100755
11651 ;; 11633 ;;
11652 esac 11634 esac
11653 else 11635 else
11654@@ -10447,23 +11034,36 @@ fi 11636@@ -10454,23 +11041,36 @@ fi
11655 11637
11656 irix5* | irix6* | nonstopux*) 11638 irix5* | irix6* | nonstopux*)
11657 if test "$GCC" = yes; then 11639 if test "$GCC" = yes; then
@@ -11696,7 +11678,7 @@ index 865ddb3d91d..31533528ee2 100755
11696 else 11678 else
11697 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' 11679 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'
11698 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' 11680 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'
11699@@ -10548,7 +11148,7 @@ rm -f core conftest.err conftest.$ac_objext \ 11681@@ -10555,7 +11155,7 @@ rm -f core conftest.err conftest.$ac_objext \
11700 osf4* | osf5*) # as osf3* with the addition of -msym flag 11682 osf4* | osf5*) # as osf3* with the addition of -msym flag
11701 if test "$GCC" = yes; then 11683 if test "$GCC" = yes; then
11702 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' 11684 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
@@ -11705,7 +11687,7 @@ index 865ddb3d91d..31533528ee2 100755
11705 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' 11687 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
11706 else 11688 else
11707 allow_undefined_flag=' -expect_unresolved \*' 11689 allow_undefined_flag=' -expect_unresolved \*'
11708@@ -10567,9 +11167,9 @@ rm -f core conftest.err conftest.$ac_objext \ 11690@@ -10574,9 +11174,9 @@ rm -f core conftest.err conftest.$ac_objext \
11709 no_undefined_flag=' -z defs' 11691 no_undefined_flag=' -z defs'
11710 if test "$GCC" = yes; then 11692 if test "$GCC" = yes; then
11711 wlarc='${wl}' 11693 wlarc='${wl}'
@@ -11717,7 +11699,7 @@ index 865ddb3d91d..31533528ee2 100755
11717 else 11699 else
11718 case `$CC -V 2>&1` in 11700 case `$CC -V 2>&1` in
11719 *"Compilers 5.0"*) 11701 *"Compilers 5.0"*)
11720@@ -11145,8 +11745,9 @@ cygwin* | mingw* | pw32* | cegcc*) 11702@@ -11152,8 +11752,9 @@ cygwin* | mingw* | pw32* | cegcc*)
11721 need_version=no 11703 need_version=no
11722 need_lib_prefix=no 11704 need_lib_prefix=no
11723 11705
@@ -11729,7 +11711,7 @@ index 865ddb3d91d..31533528ee2 100755
11729 library_names_spec='$libname.dll.a' 11711 library_names_spec='$libname.dll.a'
11730 # DLL is installed to $(libdir)/../bin by postinstall_cmds 11712 # DLL is installed to $(libdir)/../bin by postinstall_cmds
11731 postinstall_cmds='base_file=`basename \${file}`~ 11713 postinstall_cmds='base_file=`basename \${file}`~
11732@@ -11179,13 +11780,71 @@ cygwin* | mingw* | pw32* | cegcc*) 11714@@ -11186,13 +11787,71 @@ cygwin* | mingw* | pw32* | cegcc*)
11733 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' 11715 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
11734 ;; 11716 ;;
11735 esac 11717 esac
@@ -11802,16 +11784,16 @@ index 865ddb3d91d..31533528ee2 100755
11802 # FIXME: first we should search . and the directory the executable is in 11784 # FIXME: first we should search . and the directory the executable is in
11803 shlibpath_var=PATH 11785 shlibpath_var=PATH
11804 ;; 11786 ;;
11805@@ -12063,7 +12722,7 @@ else 11787@@ -12094,7 +12753,7 @@ else
11806 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 11788 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
11807 lt_status=$lt_dlunknown 11789 lt_status=$lt_dlunknown
11808 cat > conftest.$ac_ext <<_LT_EOF 11790 cat > conftest.$ac_ext <<_LT_EOF
11809-#line 12066 "configure" 11791-#line 12097 "configure"
11810+#line $LINENO "configure" 11792+#line $LINENO "configure"
11811 #include "confdefs.h" 11793 #include "confdefs.h"
11812 11794
11813 #if HAVE_DLFCN_H 11795 #if HAVE_DLFCN_H
11814@@ -12107,10 +12766,10 @@ else 11796@@ -12138,10 +12797,10 @@ else
11815 /* When -fvisbility=hidden is used, assume the code has been annotated 11797 /* When -fvisbility=hidden is used, assume the code has been annotated
11816 correspondingly for the symbols needed. */ 11798 correspondingly for the symbols needed. */
11817 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 11799 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
@@ -11824,16 +11806,16 @@ index 865ddb3d91d..31533528ee2 100755
11824 int main () 11806 int main ()
11825 { 11807 {
11826 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 11808 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
11827@@ -12169,7 +12828,7 @@ else 11809@@ -12200,7 +12859,7 @@ else
11828 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 11810 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
11829 lt_status=$lt_dlunknown 11811 lt_status=$lt_dlunknown
11830 cat > conftest.$ac_ext <<_LT_EOF 11812 cat > conftest.$ac_ext <<_LT_EOF
11831-#line 12172 "configure" 11813-#line 12203 "configure"
11832+#line $LINENO "configure" 11814+#line $LINENO "configure"
11833 #include "confdefs.h" 11815 #include "confdefs.h"
11834 11816
11835 #if HAVE_DLFCN_H 11817 #if HAVE_DLFCN_H
11836@@ -12213,10 +12872,10 @@ else 11818@@ -12244,10 +12903,10 @@ else
11837 /* When -fvisbility=hidden is used, assume the code has been annotated 11819 /* When -fvisbility=hidden is used, assume the code has been annotated
11838 correspondingly for the symbols needed. */ 11820 correspondingly for the symbols needed. */
11839 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 11821 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
@@ -11846,7 +11828,7 @@ index 865ddb3d91d..31533528ee2 100755
11846 int main () 11828 int main ()
11847 { 11829 {
11848 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 11830 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
11849@@ -12608,6 +13267,7 @@ $RM -r conftest* 11831@@ -12639,6 +13298,7 @@ $RM -r conftest*
11850 11832
11851 # Allow CC to be a program name with arguments. 11833 # Allow CC to be a program name with arguments.
11852 lt_save_CC=$CC 11834 lt_save_CC=$CC
@@ -11854,7 +11836,7 @@ index 865ddb3d91d..31533528ee2 100755
11854 lt_save_LD=$LD 11836 lt_save_LD=$LD
11855 lt_save_GCC=$GCC 11837 lt_save_GCC=$GCC
11856 GCC=$GXX 11838 GCC=$GXX
11857@@ -12625,6 +13285,7 @@ $RM -r conftest* 11839@@ -12656,6 +13316,7 @@ $RM -r conftest*
11858 fi 11840 fi
11859 test -z "${LDCXX+set}" || LD=$LDCXX 11841 test -z "${LDCXX+set}" || LD=$LDCXX
11860 CC=${CXX-"c++"} 11842 CC=${CXX-"c++"}
@@ -11862,7 +11844,7 @@ index 865ddb3d91d..31533528ee2 100755
11862 compiler=$CC 11844 compiler=$CC
11863 compiler_CXX=$CC 11845 compiler_CXX=$CC
11864 for cc_temp in $compiler""; do 11846 for cc_temp in $compiler""; do
11865@@ -12907,7 +13568,13 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie 11847@@ -12938,7 +13599,13 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
11866 allow_undefined_flag_CXX='-berok' 11848 allow_undefined_flag_CXX='-berok'
11867 # Determine the default libpath from the value encoded in an empty 11849 # Determine the default libpath from the value encoded in an empty
11868 # executable. 11850 # executable.
@@ -11877,7 +11859,7 @@ index 865ddb3d91d..31533528ee2 100755
11877 /* end confdefs.h. */ 11859 /* end confdefs.h. */
11878 11860
11879 int 11861 int
11880@@ -12920,22 +13587,29 @@ main () 11862@@ -12951,22 +13618,29 @@ main ()
11881 _ACEOF 11863 _ACEOF
11882 if ac_fn_cxx_try_link "$LINENO"; then : 11864 if ac_fn_cxx_try_link "$LINENO"; then :
11883 11865
@@ -11920,7 +11902,7 @@ index 865ddb3d91d..31533528ee2 100755
11920 11902
11921 hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" 11903 hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
11922 11904
11923@@ -12948,7 +13622,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 11905@@ -12979,7 +13653,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
11924 else 11906 else
11925 # Determine the default libpath from the value encoded in an 11907 # Determine the default libpath from the value encoded in an
11926 # empty executable. 11908 # empty executable.
@@ -11935,7 +11917,7 @@ index 865ddb3d91d..31533528ee2 100755
11935 /* end confdefs.h. */ 11917 /* end confdefs.h. */
11936 11918
11937 int 11919 int
11938@@ -12961,22 +13641,29 @@ main () 11920@@ -12992,22 +13672,29 @@ main ()
11939 _ACEOF 11921 _ACEOF
11940 if ac_fn_cxx_try_link "$LINENO"; then : 11922 if ac_fn_cxx_try_link "$LINENO"; then :
11941 11923
@@ -11978,7 +11960,7 @@ index 865ddb3d91d..31533528ee2 100755
11978 11960
11979 hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" 11961 hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
11980 # Warning - without using the other run time loading flags, 11962 # Warning - without using the other run time loading flags,
11981@@ -13019,29 +13706,75 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 11963@@ -13050,29 +13737,75 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
11982 ;; 11964 ;;
11983 11965
11984 cygwin* | mingw* | pw32* | cegcc*) 11966 cygwin* | mingw* | pw32* | cegcc*)
@@ -12077,7 +12059,7 @@ index 865ddb3d91d..31533528ee2 100755
12077 darwin* | rhapsody*) 12059 darwin* | rhapsody*)
12078 12060
12079 12061
12080@@ -13147,7 +13880,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 12062@@ -13178,7 +13911,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
12081 ;; 12063 ;;
12082 *) 12064 *)
12083 if test "$GXX" = yes; then 12065 if test "$GXX" = yes; then
@@ -12086,8 +12068,8 @@ index 865ddb3d91d..31533528ee2 100755
12086 else 12068 else
12087 # FIXME: insert proper C++ library support 12069 # FIXME: insert proper C++ library support
12088 ld_shlibs_CXX=no 12070 ld_shlibs_CXX=no
12089@@ -13218,10 +13951,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 12071@@ -13249,10 +13982,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
12090 archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' 12072 archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
12091 ;; 12073 ;;
12092 ia64*) 12074 ia64*)
12093- archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' 12075- archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
@@ -12099,7 +12081,7 @@ index 865ddb3d91d..31533528ee2 100755
12099 ;; 12081 ;;
12100 esac 12082 esac
12101 fi 12083 fi
12102@@ -13262,9 +13995,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 12084@@ -13293,9 +14026,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
12103 *) 12085 *)
12104 if test "$GXX" = yes; then 12086 if test "$GXX" = yes; then
12105 if test "$with_gnu_ld" = no; then 12087 if test "$with_gnu_ld" = no; then
@@ -12111,32 +12093,7 @@ index 865ddb3d91d..31533528ee2 100755
12111 fi 12093 fi
12112 fi 12094 fi
12113 link_all_deplibs_CXX=yes 12095 link_all_deplibs_CXX=yes
12114@@ -13334,20 +14067,20 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 12096@@ -13573,7 +14306,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
12115 prelink_cmds_CXX='tpldir=Template.dir~
12116 rm -rf $tpldir~
12117 $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
12118- compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"'
12119+ compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"'
12120 old_archive_cmds_CXX='tpldir=Template.dir~
12121 rm -rf $tpldir~
12122 $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
12123- $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~
12124+ $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~
12125 $RANLIB $oldlib'
12126 archive_cmds_CXX='tpldir=Template.dir~
12127 rm -rf $tpldir~
12128 $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
12129- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
12130+ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
12131 archive_expsym_cmds_CXX='tpldir=Template.dir~
12132 rm -rf $tpldir~
12133 $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
12134- $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'
12135+ $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'
12136 ;;
12137 *) # Version 6 and above use weak symbols
12138 archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
12139@@ -13542,7 +14275,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
12140 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' 12097 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'
12141 ;; 12098 ;;
12142 *) 12099 *)
@@ -12145,7 +12102,7 @@ index 865ddb3d91d..31533528ee2 100755
12145 ;; 12102 ;;
12146 esac 12103 esac
12147 12104
12148@@ -13588,7 +14321,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 12105@@ -13619,7 +14352,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
12149 12106
12150 solaris*) 12107 solaris*)
12151 case $cc_basename in 12108 case $cc_basename in
@@ -12154,7 +12111,7 @@ index 865ddb3d91d..31533528ee2 100755
12154 # Sun C++ 4.2, 5.x and Centerline C++ 12111 # Sun C++ 4.2, 5.x and Centerline C++
12155 archive_cmds_need_lc_CXX=yes 12112 archive_cmds_need_lc_CXX=yes
12156 no_undefined_flag_CXX=' -zdefs' 12113 no_undefined_flag_CXX=' -zdefs'
12157@@ -13629,9 +14362,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 12114@@ -13660,9 +14393,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
12158 if test "$GXX" = yes && test "$with_gnu_ld" = no; then 12115 if test "$GXX" = yes && test "$with_gnu_ld" = no; then
12159 no_undefined_flag_CXX=' ${wl}-z ${wl}defs' 12116 no_undefined_flag_CXX=' ${wl}-z ${wl}defs'
12160 if $CC --version | $GREP -v '^2\.7' > /dev/null; then 12117 if $CC --version | $GREP -v '^2\.7' > /dev/null; then
@@ -12166,7 +12123,7 @@ index 865ddb3d91d..31533528ee2 100755
12166 12123
12167 # Commands to make compiler produce verbose output that lists 12124 # Commands to make compiler produce verbose output that lists
12168 # what "hidden" libraries, object files and flags are used when 12125 # what "hidden" libraries, object files and flags are used when
12169@@ -13766,6 +14499,13 @@ private: 12126@@ -13798,6 +14531,13 @@ private:
12170 }; 12127 };
12171 _LT_EOF 12128 _LT_EOF
12172 12129
@@ -12180,7 +12137,7 @@ index 865ddb3d91d..31533528ee2 100755
12180 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 12137 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
12181 (eval $ac_compile) 2>&5 12138 (eval $ac_compile) 2>&5
12182 ac_status=$? 12139 ac_status=$?
12183@@ -13779,7 +14519,7 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 12140@@ -13811,7 +14551,7 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
12184 pre_test_object_deps_done=no 12141 pre_test_object_deps_done=no
12185 12142
12186 for p in `eval "$output_verbose_link_cmd"`; do 12143 for p in `eval "$output_verbose_link_cmd"`; do
@@ -12189,7 +12146,7 @@ index 865ddb3d91d..31533528ee2 100755
12189 12146
12190 -L* | -R* | -l*) 12147 -L* | -R* | -l*)
12191 # Some compilers place space between "-{L,R}" and the path. 12148 # Some compilers place space between "-{L,R}" and the path.
12192@@ -13788,13 +14528,22 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 12149@@ -13820,13 +14560,22 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
12193 test $p = "-R"; then 12150 test $p = "-R"; then
12194 prev=$p 12151 prev=$p
12195 continue 12152 continue
@@ -12216,7 +12173,7 @@ index 865ddb3d91d..31533528ee2 100755
12216 # Internal compiler library paths should come after those 12173 # Internal compiler library paths should come after those
12217 # provided the user. The postdeps already come after the 12174 # provided the user. The postdeps already come after the
12218 # user supplied libs so there is no need to process them. 12175 # user supplied libs so there is no need to process them.
12219@@ -13814,8 +14563,10 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 12176@@ -13846,8 +14595,10 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
12220 postdeps_CXX="${postdeps_CXX} ${prev}${p}" 12177 postdeps_CXX="${postdeps_CXX} ${prev}${p}"
12221 fi 12178 fi
12222 fi 12179 fi
@@ -12227,7 +12184,7 @@ index 865ddb3d91d..31533528ee2 100755
12227 *.$objext) 12184 *.$objext)
12228 # This assumes that the test object file only shows up 12185 # This assumes that the test object file only shows up
12229 # once in the compiler output. 12186 # once in the compiler output.
12230@@ -13851,6 +14602,7 @@ else 12187@@ -13883,6 +14634,7 @@ else
12231 fi 12188 fi
12232 12189
12233 $RM -f confest.$objext 12190 $RM -f confest.$objext
@@ -12235,7 +12192,7 @@ index 865ddb3d91d..31533528ee2 100755
12235 12192
12236 # PORTME: override above test on systems where it is broken 12193 # PORTME: override above test on systems where it is broken
12237 case $host_os in 12194 case $host_os in
12238@@ -13886,7 +14638,7 @@ linux*) 12195@@ -13918,7 +14670,7 @@ linux*)
12239 12196
12240 solaris*) 12197 solaris*)
12241 case $cc_basename in 12198 case $cc_basename in
@@ -12244,7 +12201,7 @@ index 865ddb3d91d..31533528ee2 100755
12244 # The more standards-conforming stlport4 library is 12201 # The more standards-conforming stlport4 library is
12245 # incompatible with the Cstd library. Avoid specifying 12202 # incompatible with the Cstd library. Avoid specifying
12246 # it if it's in CXXFLAGS. Ignore libCrun as 12203 # it if it's in CXXFLAGS. Ignore libCrun as
12247@@ -13951,8 +14703,6 @@ fi 12204@@ -13983,8 +14735,6 @@ fi
12248 lt_prog_compiler_pic_CXX= 12205 lt_prog_compiler_pic_CXX=
12249 lt_prog_compiler_static_CXX= 12206 lt_prog_compiler_static_CXX=
12250 12207
@@ -12253,7 +12210,7 @@ index 865ddb3d91d..31533528ee2 100755
12253 12210
12254 # C++ specific cases for pic, static, wl, etc. 12211 # C++ specific cases for pic, static, wl, etc.
12255 if test "$GXX" = yes; then 12212 if test "$GXX" = yes; then
12256@@ -14057,6 +14807,11 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 12213@@ -14089,6 +14839,11 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
12257 ;; 12214 ;;
12258 esac 12215 esac
12259 ;; 12216 ;;
@@ -12265,7 +12222,7 @@ index 865ddb3d91d..31533528ee2 100755
12265 dgux*) 12222 dgux*)
12266 case $cc_basename in 12223 case $cc_basename in
12267 ec++*) 12224 ec++*)
12268@@ -14209,7 +14964,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 12225@@ -14241,7 +14996,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
12269 ;; 12226 ;;
12270 solaris*) 12227 solaris*)
12271 case $cc_basename in 12228 case $cc_basename in
@@ -12274,7 +12231,7 @@ index 865ddb3d91d..31533528ee2 100755
12274 # Sun C++ 4.2, 5.x and Centerline C++ 12231 # Sun C++ 4.2, 5.x and Centerline C++
12275 lt_prog_compiler_pic_CXX='-KPIC' 12232 lt_prog_compiler_pic_CXX='-KPIC'
12276 lt_prog_compiler_static_CXX='-Bstatic' 12233 lt_prog_compiler_static_CXX='-Bstatic'
12277@@ -14274,10 +15029,17 @@ case $host_os in 12234@@ -14306,10 +15061,17 @@ case $host_os in
12278 lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC" 12235 lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC"
12279 ;; 12236 ;;
12280 esac 12237 esac
@@ -12295,7 +12252,7 @@ index 865ddb3d91d..31533528ee2 100755
12295 12252
12296 # 12253 #
12297 # Check to make sure the PIC flag actually works. 12254 # Check to make sure the PIC flag actually works.
12298@@ -14335,6 +15097,8 @@ fi 12255@@ -14367,6 +15129,8 @@ fi
12299 12256
12300 12257
12301 12258
@@ -12304,7 +12261,7 @@ index 865ddb3d91d..31533528ee2 100755
12304 # 12261 #
12305 # Check to make sure the static flag actually works. 12262 # Check to make sure the static flag actually works.
12306 # 12263 #
12307@@ -14512,6 +15276,7 @@ fi 12264@@ -14544,6 +15308,7 @@ fi
12308 $as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } 12265 $as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
12309 12266
12310 export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' 12267 export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
@@ -12312,7 +12269,7 @@ index 865ddb3d91d..31533528ee2 100755
12312 case $host_os in 12269 case $host_os in
12313 aix[4-9]*) 12270 aix[4-9]*)
12314 # If we're using GNU nm, then we don't want the "-C" option. 12271 # If we're using GNU nm, then we don't want the "-C" option.
12315@@ -14526,15 +15291,20 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie 12272@@ -14558,15 +15323,20 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
12316 ;; 12273 ;;
12317 pw32*) 12274 pw32*)
12318 export_symbols_cmds_CXX="$ltdll_cmds" 12275 export_symbols_cmds_CXX="$ltdll_cmds"
@@ -12338,7 +12295,7 @@ index 865ddb3d91d..31533528ee2 100755
12338 12295
12339 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5 12296 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5
12340 $as_echo "$ld_shlibs_CXX" >&6; } 12297 $as_echo "$ld_shlibs_CXX" >&6; }
12341@@ -14797,8 +15567,9 @@ cygwin* | mingw* | pw32* | cegcc*) 12298@@ -14829,8 +15599,9 @@ cygwin* | mingw* | pw32* | cegcc*)
12342 need_version=no 12299 need_version=no
12343 need_lib_prefix=no 12300 need_lib_prefix=no
12344 12301
@@ -12350,7 +12307,7 @@ index 865ddb3d91d..31533528ee2 100755
12350 library_names_spec='$libname.dll.a' 12307 library_names_spec='$libname.dll.a'
12351 # DLL is installed to $(libdir)/../bin by postinstall_cmds 12308 # DLL is installed to $(libdir)/../bin by postinstall_cmds
12352 postinstall_cmds='base_file=`basename \${file}`~ 12309 postinstall_cmds='base_file=`basename \${file}`~
12353@@ -14830,13 +15601,71 @@ cygwin* | mingw* | pw32* | cegcc*) 12310@@ -14862,13 +15633,71 @@ cygwin* | mingw* | pw32* | cegcc*)
12354 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' 12311 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
12355 ;; 12312 ;;
12356 esac 12313 esac
@@ -12423,7 +12380,7 @@ index 865ddb3d91d..31533528ee2 100755
12423 # FIXME: first we should search . and the directory the executable is in 12380 # FIXME: first we should search . and the directory the executable is in
12424 shlibpath_var=PATH 12381 shlibpath_var=PATH
12425 ;; 12382 ;;
12426@@ -15376,6 +16205,7 @@ fi 12383@@ -15432,6 +16261,7 @@ fi
12427 fi # test -n "$compiler" 12384 fi # test -n "$compiler"
12428 12385
12429 CC=$lt_save_CC 12386 CC=$lt_save_CC
@@ -12431,7 +12388,7 @@ index 865ddb3d91d..31533528ee2 100755
12431 LDCXX=$LD 12388 LDCXX=$LD
12432 LD=$lt_save_LD 12389 LD=$lt_save_LD
12433 GCC=$lt_save_GCC 12390 GCC=$lt_save_GCC
12434@@ -16303,13 +17133,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' 12391@@ -16359,13 +17189,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
12435 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' 12392 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
12436 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' 12393 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
12437 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' 12394 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
@@ -12452,7 +12409,7 @@ index 865ddb3d91d..31533528ee2 100755
12452 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' 12409 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
12453 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' 12410 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
12454 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' 12411 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
12455@@ -16324,14 +17161,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de 12412@@ -16380,14 +17217,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de
12456 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' 12413 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
12457 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' 12414 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
12458 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"`' 12415 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"`'
@@ -12471,7 +12428,7 @@ index 865ddb3d91d..31533528ee2 100755
12471 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' 12428 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
12472 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' 12429 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
12473 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' 12430 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
12474@@ -16364,12 +17204,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q 12431@@ -16420,12 +17260,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q
12475 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' 12432 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
12476 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' 12433 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
12477 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' 12434 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
@@ -12485,7 +12442,7 @@ index 865ddb3d91d..31533528ee2 100755
12485 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' 12442 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
12486 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' 12443 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
12487 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' 12444 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
12488@@ -16408,8 +17248,8 @@ old_archive_cmds_CXX='`$ECHO "$old_archive_cmds_CXX" | $SED "$delay_single_quote 12445@@ -16464,8 +17304,8 @@ old_archive_cmds_CXX='`$ECHO "$old_archive_cmds_CXX" | $SED "$delay_single_quote
12489 compiler_CXX='`$ECHO "$compiler_CXX" | $SED "$delay_single_quote_subst"`' 12446 compiler_CXX='`$ECHO "$compiler_CXX" | $SED "$delay_single_quote_subst"`'
12490 GCC_CXX='`$ECHO "$GCC_CXX" | $SED "$delay_single_quote_subst"`' 12447 GCC_CXX='`$ECHO "$GCC_CXX" | $SED "$delay_single_quote_subst"`'
12491 lt_prog_compiler_no_builtin_flag_CXX='`$ECHO "$lt_prog_compiler_no_builtin_flag_CXX" | $SED "$delay_single_quote_subst"`' 12448 lt_prog_compiler_no_builtin_flag_CXX='`$ECHO "$lt_prog_compiler_no_builtin_flag_CXX" | $SED "$delay_single_quote_subst"`'
@@ -12495,7 +12452,7 @@ index 865ddb3d91d..31533528ee2 100755
12495 lt_prog_compiler_static_CXX='`$ECHO "$lt_prog_compiler_static_CXX" | $SED "$delay_single_quote_subst"`' 12452 lt_prog_compiler_static_CXX='`$ECHO "$lt_prog_compiler_static_CXX" | $SED "$delay_single_quote_subst"`'
12496 lt_cv_prog_compiler_c_o_CXX='`$ECHO "$lt_cv_prog_compiler_c_o_CXX" | $SED "$delay_single_quote_subst"`' 12453 lt_cv_prog_compiler_c_o_CXX='`$ECHO "$lt_cv_prog_compiler_c_o_CXX" | $SED "$delay_single_quote_subst"`'
12497 archive_cmds_need_lc_CXX='`$ECHO "$archive_cmds_need_lc_CXX" | $SED "$delay_single_quote_subst"`' 12454 archive_cmds_need_lc_CXX='`$ECHO "$archive_cmds_need_lc_CXX" | $SED "$delay_single_quote_subst"`'
12498@@ -16436,12 +17276,12 @@ hardcode_shlibpath_var_CXX='`$ECHO "$hardcode_shlibpath_var_CXX" | $SED "$delay_ 12455@@ -16492,12 +17332,12 @@ hardcode_shlibpath_var_CXX='`$ECHO "$hardcode_shlibpath_var_CXX" | $SED "$delay_
12499 hardcode_automatic_CXX='`$ECHO "$hardcode_automatic_CXX" | $SED "$delay_single_quote_subst"`' 12456 hardcode_automatic_CXX='`$ECHO "$hardcode_automatic_CXX" | $SED "$delay_single_quote_subst"`'
12500 inherit_rpath_CXX='`$ECHO "$inherit_rpath_CXX" | $SED "$delay_single_quote_subst"`' 12457 inherit_rpath_CXX='`$ECHO "$inherit_rpath_CXX" | $SED "$delay_single_quote_subst"`'
12501 link_all_deplibs_CXX='`$ECHO "$link_all_deplibs_CXX" | $SED "$delay_single_quote_subst"`' 12458 link_all_deplibs_CXX='`$ECHO "$link_all_deplibs_CXX" | $SED "$delay_single_quote_subst"`'
@@ -12509,7 +12466,7 @@ index 865ddb3d91d..31533528ee2 100755
12509 file_list_spec_CXX='`$ECHO "$file_list_spec_CXX" | $SED "$delay_single_quote_subst"`' 12466 file_list_spec_CXX='`$ECHO "$file_list_spec_CXX" | $SED "$delay_single_quote_subst"`'
12510 hardcode_action_CXX='`$ECHO "$hardcode_action_CXX" | $SED "$delay_single_quote_subst"`' 12467 hardcode_action_CXX='`$ECHO "$hardcode_action_CXX" | $SED "$delay_single_quote_subst"`'
12511 compiler_lib_search_dirs_CXX='`$ECHO "$compiler_lib_search_dirs_CXX" | $SED "$delay_single_quote_subst"`' 12468 compiler_lib_search_dirs_CXX='`$ECHO "$compiler_lib_search_dirs_CXX" | $SED "$delay_single_quote_subst"`'
12512@@ -16479,8 +17319,13 @@ reload_flag \ 12469@@ -16535,8 +17375,13 @@ reload_flag \
12513 OBJDUMP \ 12470 OBJDUMP \
12514 deplibs_check_method \ 12471 deplibs_check_method \
12515 file_magic_cmd \ 12472 file_magic_cmd \
@@ -12523,7 +12480,7 @@ index 865ddb3d91d..31533528ee2 100755
12523 STRIP \ 12480 STRIP \
12524 RANLIB \ 12481 RANLIB \
12525 CC \ 12482 CC \
12526@@ -16490,12 +17335,14 @@ lt_cv_sys_global_symbol_pipe \ 12483@@ -16546,12 +17391,14 @@ lt_cv_sys_global_symbol_pipe \
12527 lt_cv_sys_global_symbol_to_cdecl \ 12484 lt_cv_sys_global_symbol_to_cdecl \
12528 lt_cv_sys_global_symbol_to_c_name_address \ 12485 lt_cv_sys_global_symbol_to_c_name_address \
12529 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ 12486 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
@@ -12539,7 +12496,7 @@ index 865ddb3d91d..31533528ee2 100755
12539 DSYMUTIL \ 12496 DSYMUTIL \
12540 NMEDIT \ 12497 NMEDIT \
12541 LIPO \ 12498 LIPO \
12542@@ -16511,7 +17358,6 @@ no_undefined_flag \ 12499@@ -16567,7 +17414,6 @@ no_undefined_flag \
12543 hardcode_libdir_flag_spec \ 12500 hardcode_libdir_flag_spec \
12544 hardcode_libdir_flag_spec_ld \ 12501 hardcode_libdir_flag_spec_ld \
12545 hardcode_libdir_separator \ 12502 hardcode_libdir_separator \
@@ -12547,7 +12504,7 @@ index 865ddb3d91d..31533528ee2 100755
12547 exclude_expsyms \ 12504 exclude_expsyms \
12548 include_expsyms \ 12505 include_expsyms \
12549 file_list_spec \ 12506 file_list_spec \
12550@@ -16533,8 +17379,8 @@ LD_CXX \ 12507@@ -16589,8 +17435,8 @@ LD_CXX \
12551 reload_flag_CXX \ 12508 reload_flag_CXX \
12552 compiler_CXX \ 12509 compiler_CXX \
12553 lt_prog_compiler_no_builtin_flag_CXX \ 12510 lt_prog_compiler_no_builtin_flag_CXX \
@@ -12557,7 +12514,7 @@ index 865ddb3d91d..31533528ee2 100755
12557 lt_prog_compiler_static_CXX \ 12514 lt_prog_compiler_static_CXX \
12558 lt_cv_prog_compiler_c_o_CXX \ 12515 lt_cv_prog_compiler_c_o_CXX \
12559 export_dynamic_flag_spec_CXX \ 12516 export_dynamic_flag_spec_CXX \
12560@@ -16546,7 +17392,6 @@ no_undefined_flag_CXX \ 12517@@ -16602,7 +17448,6 @@ no_undefined_flag_CXX \
12561 hardcode_libdir_flag_spec_CXX \ 12518 hardcode_libdir_flag_spec_CXX \
12562 hardcode_libdir_flag_spec_ld_CXX \ 12519 hardcode_libdir_flag_spec_ld_CXX \
12563 hardcode_libdir_separator_CXX \ 12520 hardcode_libdir_separator_CXX \
@@ -12565,7 +12522,7 @@ index 865ddb3d91d..31533528ee2 100755
12565 exclude_expsyms_CXX \ 12522 exclude_expsyms_CXX \
12566 include_expsyms_CXX \ 12523 include_expsyms_CXX \
12567 file_list_spec_CXX \ 12524 file_list_spec_CXX \
12568@@ -16580,6 +17425,7 @@ module_cmds \ 12525@@ -16636,6 +17481,7 @@ module_cmds \
12569 module_expsym_cmds \ 12526 module_expsym_cmds \
12570 export_symbols_cmds \ 12527 export_symbols_cmds \
12571 prelink_cmds \ 12528 prelink_cmds \
@@ -12573,7 +12530,7 @@ index 865ddb3d91d..31533528ee2 100755
12573 postinstall_cmds \ 12530 postinstall_cmds \
12574 postuninstall_cmds \ 12531 postuninstall_cmds \
12575 finish_cmds \ 12532 finish_cmds \
12576@@ -16594,7 +17440,8 @@ archive_expsym_cmds_CXX \ 12533@@ -16650,7 +17496,8 @@ archive_expsym_cmds_CXX \
12577 module_cmds_CXX \ 12534 module_cmds_CXX \
12578 module_expsym_cmds_CXX \ 12535 module_expsym_cmds_CXX \
12579 export_symbols_cmds_CXX \ 12536 export_symbols_cmds_CXX \
@@ -12583,7 +12540,7 @@ index 865ddb3d91d..31533528ee2 100755
12583 case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in 12540 case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
12584 *[\\\\\\\`\\"\\\$]*) 12541 *[\\\\\\\`\\"\\\$]*)
12585 eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" 12542 eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
12586@@ -17348,7 +18195,8 @@ $as_echo X"$file" | 12543@@ -17404,7 +18251,8 @@ $as_echo X"$file" |
12587 # NOTE: Changes made to this file will be lost: look at ltmain.sh. 12544 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
12588 # 12545 #
12589 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 12546 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
@@ -12593,7 +12550,7 @@ index 865ddb3d91d..31533528ee2 100755
12593 # Written by Gordon Matzigkeit, 1996 12550 # Written by Gordon Matzigkeit, 1996
12594 # 12551 #
12595 # This file is part of GNU Libtool. 12552 # This file is part of GNU Libtool.
12596@@ -17451,19 +18299,42 @@ SP2NL=$lt_lt_SP2NL 12553@@ -17507,19 +18355,42 @@ SP2NL=$lt_lt_SP2NL
12597 # turn newlines into spaces. 12554 # turn newlines into spaces.
12598 NL2SP=$lt_lt_NL2SP 12555 NL2SP=$lt_lt_NL2SP
12599 12556
@@ -12637,7 +12594,7 @@ index 865ddb3d91d..31533528ee2 100755
12637 # A symbol stripping program. 12594 # A symbol stripping program.
12638 STRIP=$lt_STRIP 12595 STRIP=$lt_STRIP
12639 12596
12640@@ -17493,6 +18364,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address 12597@@ -17549,6 +18420,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
12641 # Transform the output of nm in a C name address pair when lib prefix is needed. 12598 # Transform the output of nm in a C name address pair when lib prefix is needed.
12642 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix 12599 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
12643 12600
@@ -12650,7 +12607,7 @@ index 865ddb3d91d..31533528ee2 100755
12650 # The name of the directory that contains temporary libtool files. 12607 # The name of the directory that contains temporary libtool files.
12651 objdir=$objdir 12608 objdir=$objdir
12652 12609
12653@@ -17502,6 +18379,9 @@ MAGIC_CMD=$MAGIC_CMD 12610@@ -17558,6 +18435,9 @@ MAGIC_CMD=$MAGIC_CMD
12654 # Must we lock files when doing compilation? 12611 # Must we lock files when doing compilation?
12655 need_locks=$lt_need_locks 12612 need_locks=$lt_need_locks
12656 12613
@@ -12660,7 +12617,7 @@ index 865ddb3d91d..31533528ee2 100755
12660 # Tool to manipulate archived DWARF debug symbol files on Mac OS X. 12617 # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
12661 DSYMUTIL=$lt_DSYMUTIL 12618 DSYMUTIL=$lt_DSYMUTIL
12662 12619
12663@@ -17616,12 +18496,12 @@ with_gcc=$GCC 12620@@ -17672,12 +18552,12 @@ with_gcc=$GCC
12664 # Compiler flag to turn off builtin functions. 12621 # Compiler flag to turn off builtin functions.
12665 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag 12622 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
12666 12623
@@ -12676,7 +12633,7 @@ index 865ddb3d91d..31533528ee2 100755
12676 # Compiler flag to prevent dynamic linking. 12633 # Compiler flag to prevent dynamic linking.
12677 link_static_flag=$lt_lt_prog_compiler_static 12634 link_static_flag=$lt_lt_prog_compiler_static
12678 12635
12679@@ -17708,9 +18588,6 @@ inherit_rpath=$inherit_rpath 12636@@ -17764,9 +18644,6 @@ inherit_rpath=$inherit_rpath
12680 # Whether libtool must link a program against all its dependency libraries. 12637 # Whether libtool must link a program against all its dependency libraries.
12681 link_all_deplibs=$link_all_deplibs 12638 link_all_deplibs=$link_all_deplibs
12682 12639
@@ -12686,7 +12643,7 @@ index 865ddb3d91d..31533528ee2 100755
12686 # Set to "yes" if exported symbols are required. 12643 # Set to "yes" if exported symbols are required.
12687 always_export_symbols=$always_export_symbols 12644 always_export_symbols=$always_export_symbols
12688 12645
12689@@ -17726,6 +18603,9 @@ include_expsyms=$lt_include_expsyms 12646@@ -17782,6 +18659,9 @@ include_expsyms=$lt_include_expsyms
12690 # Commands necessary for linking programs (against libraries) with templates. 12647 # Commands necessary for linking programs (against libraries) with templates.
12691 prelink_cmds=$lt_prelink_cmds 12648 prelink_cmds=$lt_prelink_cmds
12692 12649
@@ -12696,7 +12653,7 @@ index 865ddb3d91d..31533528ee2 100755
12696 # Specify filename containing input files. 12653 # Specify filename containing input files.
12697 file_list_spec=$lt_file_list_spec 12654 file_list_spec=$lt_file_list_spec
12698 12655
12699@@ -17772,210 +18652,169 @@ ltmain="$ac_aux_dir/ltmain.sh" 12656@@ -17828,210 +18708,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
12700 # if finds mixed CR/LF and LF-only lines. Since sed operates in 12657 # if finds mixed CR/LF and LF-only lines. Since sed operates in
12701 # text mode, it properly converts lines to CR/LF. This bash problem 12658 # text mode, it properly converts lines to CR/LF. This bash problem
12702 # is reportedly fixed, but why not run on old versions too? 12659 # is reportedly fixed, but why not run on old versions too?
@@ -13070,7 +13027,7 @@ index 865ddb3d91d..31533528ee2 100755
13070 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") 13027 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
13071 chmod +x "$ofile" 13028 chmod +x "$ofile"
13072 13029
13073@@ -18003,12 +18842,12 @@ with_gcc=$GCC_CXX 13030@@ -18059,12 +18898,12 @@ with_gcc=$GCC_CXX
13074 # Compiler flag to turn off builtin functions. 13031 # Compiler flag to turn off builtin functions.
13075 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX 13032 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX
13076 13033
@@ -13086,7 +13043,7 @@ index 865ddb3d91d..31533528ee2 100755
13086 # Compiler flag to prevent dynamic linking. 13043 # Compiler flag to prevent dynamic linking.
13087 link_static_flag=$lt_lt_prog_compiler_static_CXX 13044 link_static_flag=$lt_lt_prog_compiler_static_CXX
13088 13045
13089@@ -18095,9 +18934,6 @@ inherit_rpath=$inherit_rpath_CXX 13046@@ -18151,9 +18990,6 @@ inherit_rpath=$inherit_rpath_CXX
13090 # Whether libtool must link a program against all its dependency libraries. 13047 # Whether libtool must link a program against all its dependency libraries.
13091 link_all_deplibs=$link_all_deplibs_CXX 13048 link_all_deplibs=$link_all_deplibs_CXX
13092 13049
@@ -13096,7 +13053,7 @@ index 865ddb3d91d..31533528ee2 100755
13096 # Set to "yes" if exported symbols are required. 13053 # Set to "yes" if exported symbols are required.
13097 always_export_symbols=$always_export_symbols_CXX 13054 always_export_symbols=$always_export_symbols_CXX
13098 13055
13099@@ -18113,6 +18949,9 @@ include_expsyms=$lt_include_expsyms_CXX 13056@@ -18169,6 +19005,9 @@ include_expsyms=$lt_include_expsyms_CXX
13100 # Commands necessary for linking programs (against libraries) with templates. 13057 # Commands necessary for linking programs (against libraries) with templates.
13101 prelink_cmds=$lt_prelink_cmds_CXX 13058 prelink_cmds=$lt_prelink_cmds_CXX
13102 13059
@@ -13107,7 +13064,7 @@ index 865ddb3d91d..31533528ee2 100755
13107 file_list_spec=$lt_file_list_spec_CXX 13064 file_list_spec=$lt_file_list_spec_CXX
13108 13065
13109diff --git a/gprofng/src/Makefile.in b/gprofng/src/Makefile.in 13066diff --git a/gprofng/src/Makefile.in b/gprofng/src/Makefile.in
13110index b881268b0d9..cfc98458e79 100644 13067index db763ef71b2..726dc69bf85 100644
13111--- a/gprofng/src/Makefile.in 13068--- a/gprofng/src/Makefile.in
13112+++ b/gprofng/src/Makefile.in 13069+++ b/gprofng/src/Makefile.in
13113@@ -321,6 +321,7 @@ CXXFLAGS = @CXXFLAGS@ 13070@@ -321,6 +321,7 @@ CXXFLAGS = @CXXFLAGS@
@@ -13118,7 +13075,7 @@ index b881268b0d9..cfc98458e79 100644
13118 DSYMUTIL = @DSYMUTIL@ 13075 DSYMUTIL = @DSYMUTIL@
13119 DUMPBIN = @DUMPBIN@ 13076 DUMPBIN = @DUMPBIN@
13120 ECHO_C = @ECHO_C@ 13077 ECHO_C = @ECHO_C@
13121@@ -356,6 +357,7 @@ LN_S = @LN_S@ 13078@@ -355,6 +356,7 @@ LN_S = @LN_S@
13122 LTLIBOBJS = @LTLIBOBJS@ 13079 LTLIBOBJS = @LTLIBOBJS@
13123 MAINT = @MAINT@ 13080 MAINT = @MAINT@
13124 MAKEINFO = @MAKEINFO@ 13081 MAKEINFO = @MAKEINFO@
@@ -13127,10 +13084,10 @@ index b881268b0d9..cfc98458e79 100644
13127 NM = @NM@ 13084 NM = @NM@
13128 NMEDIT = @NMEDIT@ 13085 NMEDIT = @NMEDIT@
13129diff --git a/ld/Makefile.in b/ld/Makefile.in 13086diff --git a/ld/Makefile.in b/ld/Makefile.in
13130index c21c554e432..729e1f47e85 100644 13087index 15311048855..71b39ee9311 100644
13131--- a/ld/Makefile.in 13088--- a/ld/Makefile.in
13132+++ b/ld/Makefile.in 13089+++ b/ld/Makefile.in
13133@@ -384,6 +384,7 @@ CYGPATH_W = @CYGPATH_W@ 13090@@ -390,6 +390,7 @@ CYGPATH_W = @CYGPATH_W@
13134 DATADIRNAME = @DATADIRNAME@ 13091 DATADIRNAME = @DATADIRNAME@
13135 DEFS = @DEFS@ 13092 DEFS = @DEFS@
13136 DEPDIR = @DEPDIR@ 13093 DEPDIR = @DEPDIR@
@@ -13138,7 +13095,7 @@ index c21c554e432..729e1f47e85 100644
13138 DSYMUTIL = @DSYMUTIL@ 13095 DSYMUTIL = @DSYMUTIL@
13139 DUMPBIN = @DUMPBIN@ 13096 DUMPBIN = @DUMPBIN@
13140 ECHO_C = @ECHO_C@ 13097 ECHO_C = @ECHO_C@
13141@@ -434,6 +435,7 @@ LN_S = @LN_S@ 13098@@ -445,6 +446,7 @@ LTLIBINTL = @LTLIBINTL@
13142 LTLIBOBJS = @LTLIBOBJS@ 13099 LTLIBOBJS = @LTLIBOBJS@
13143 MAINT = @MAINT@ 13100 MAINT = @MAINT@
13144 MAKEINFO = @MAKEINFO@ 13101 MAKEINFO = @MAKEINFO@
@@ -13146,7 +13103,7 @@ index c21c554e432..729e1f47e85 100644
13146 MKDIR_P = @MKDIR_P@ 13103 MKDIR_P = @MKDIR_P@
13147 MKINSTALLDIRS = @MKINSTALLDIRS@ 13104 MKINSTALLDIRS = @MKINSTALLDIRS@
13148 MSGFMT = @MSGFMT@ 13105 MSGFMT = @MSGFMT@
13149@@ -485,6 +487,7 @@ abs_builddir = @abs_builddir@ 13106@@ -495,6 +497,7 @@ abs_builddir = @abs_builddir@
13150 abs_srcdir = @abs_srcdir@ 13107 abs_srcdir = @abs_srcdir@
13151 abs_top_builddir = @abs_top_builddir@ 13108 abs_top_builddir = @abs_top_builddir@
13152 abs_top_srcdir = @abs_top_srcdir@ 13109 abs_top_srcdir = @abs_top_srcdir@
@@ -13155,10 +13112,10 @@ index c21c554e432..729e1f47e85 100644
13155 ac_ct_CXX = @ac_ct_CXX@ 13112 ac_ct_CXX = @ac_ct_CXX@
13156 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ 13113 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
13157diff --git a/ld/configure b/ld/configure 13114diff --git a/ld/configure b/ld/configure
13158index 29896853a90..9e93585f94e 100755 13115index 867f3f62c88..60fbf749e61 100755
13159--- a/ld/configure 13116--- a/ld/configure
13160+++ b/ld/configure 13117+++ b/ld/configure
13161@@ -700,8 +700,11 @@ OTOOL 13118@@ -705,8 +705,11 @@ OTOOL
13162 LIPO 13119 LIPO
13163 NMEDIT 13120 NMEDIT
13164 DSYMUTIL 13121 DSYMUTIL
@@ -13170,7 +13127,7 @@ index 29896853a90..9e93585f94e 100755
13170 OBJDUMP 13127 OBJDUMP
13171 LN_S 13128 LN_S
13172 NM 13129 NM
13173@@ -831,6 +834,7 @@ enable_static 13130@@ -836,6 +839,7 @@ enable_static
13174 with_pic 13131 with_pic
13175 enable_fast_install 13132 enable_fast_install
13176 with_gnu_ld 13133 with_gnu_ld
@@ -13178,7 +13135,7 @@ index 29896853a90..9e93585f94e 100755
13178 enable_libtool_lock 13135 enable_libtool_lock
13179 enable_plugins 13136 enable_plugins
13180 enable_largefile 13137 enable_largefile
13181@@ -1562,6 +1566,8 @@ Optional Packages: 13138@@ -1581,6 +1585,8 @@ Optional Packages:
13182 --with-pic try to use only PIC/non-PIC objects [default=use 13139 --with-pic try to use only PIC/non-PIC objects [default=use
13183 both] 13140 both]
13184 --with-gnu-ld assume the C compiler uses GNU ld [default=no] 13141 --with-gnu-ld assume the C compiler uses GNU ld [default=no]
@@ -13186,8 +13143,8 @@ index 29896853a90..9e93585f94e 100755
13186+ (or the compiler's sysroot if not specified). 13143+ (or the compiler's sysroot if not specified).
13187 --with-lib-path=dir1:dir2... set default LIB_PATH 13144 --with-lib-path=dir1:dir2... set default LIB_PATH
13188 --with-sysroot=DIR Search for usr/lib et al within DIR. 13145 --with-sysroot=DIR Search for usr/lib et al within DIR.
13189 --with-system-zlib use installed libz 13146 --with-gnu-ld assume the C compiler uses GNU ld default=no
13190@@ -5533,8 +5539,8 @@ esac 13147@@ -5560,8 +5566,8 @@ esac
13191 13148
13192 13149
13193 13150
@@ -13198,7 +13155,7 @@ index 29896853a90..9e93585f94e 100755
13198 13155
13199 13156
13200 13157
13201@@ -5574,7 +5580,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO 13158@@ -5601,7 +5607,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
13202 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 13159 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
13203 $as_echo_n "checking how to print strings... " >&6; } 13160 $as_echo_n "checking how to print strings... " >&6; }
13204 # Test print first, because it will be a builtin if present. 13161 # Test print first, because it will be a builtin if present.
@@ -13207,7 +13164,7 @@ index 29896853a90..9e93585f94e 100755
13207 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then 13164 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
13208 ECHO='print -r --' 13165 ECHO='print -r --'
13209 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then 13166 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
13210@@ -6267,8 +6273,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; 13167@@ -6294,8 +6300,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6;
13211 # Try some XSI features 13168 # Try some XSI features
13212 xsi_shell=no 13169 xsi_shell=no
13213 ( _lt_dummy="a/b/c" 13170 ( _lt_dummy="a/b/c"
@@ -13218,7 +13175,7 @@ index 29896853a90..9e93585f94e 100755
13218 && eval 'test $(( 1 + 1 )) -eq 2 \ 13175 && eval 'test $(( 1 + 1 )) -eq 2 \
13219 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ 13176 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
13220 && xsi_shell=yes 13177 && xsi_shell=yes
13221@@ -6317,6 +6323,80 @@ esac 13178@@ -6344,6 +6350,80 @@ esac
13222 13179
13223 13180
13224 13181
@@ -13299,7 +13256,7 @@ index 29896853a90..9e93585f94e 100755
13299 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 13256 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
13300 $as_echo_n "checking for $LD option to reload object files... " >&6; } 13257 $as_echo_n "checking for $LD option to reload object files... " >&6; }
13301 if ${lt_cv_ld_reload_flag+:} false; then : 13258 if ${lt_cv_ld_reload_flag+:} false; then :
13302@@ -6333,6 +6413,11 @@ case $reload_flag in 13259@@ -6360,6 +6440,11 @@ case $reload_flag in
13303 esac 13260 esac
13304 reload_cmds='$LD$reload_flag -o $output$reload_objs' 13261 reload_cmds='$LD$reload_flag -o $output$reload_objs'
13305 case $host_os in 13262 case $host_os in
@@ -13311,7 +13268,7 @@ index 29896853a90..9e93585f94e 100755
13311 darwin*) 13268 darwin*)
13312 if test "$GCC" = yes; then 13269 if test "$GCC" = yes; then
13313 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' 13270 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
13314@@ -6501,7 +6586,8 @@ mingw* | pw32*) 13271@@ -6528,7 +6613,8 @@ mingw* | pw32*)
13315 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' 13272 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
13316 lt_cv_file_magic_cmd='func_win32_libid' 13273 lt_cv_file_magic_cmd='func_win32_libid'
13317 else 13274 else
@@ -13321,7 +13278,7 @@ index 29896853a90..9e93585f94e 100755
13321 lt_cv_file_magic_cmd='$OBJDUMP -f' 13278 lt_cv_file_magic_cmd='$OBJDUMP -f'
13322 fi 13279 fi
13323 ;; 13280 ;;
13324@@ -6655,6 +6741,21 @@ esac 13281@@ -6687,6 +6773,21 @@ esac
13325 fi 13282 fi
13326 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 13283 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
13327 $as_echo "$lt_cv_deplibs_check_method" >&6; } 13284 $as_echo "$lt_cv_deplibs_check_method" >&6; }
@@ -13343,7 +13300,7 @@ index 29896853a90..9e93585f94e 100755
13343 file_magic_cmd=$lt_cv_file_magic_cmd 13300 file_magic_cmd=$lt_cv_file_magic_cmd
13344 deplibs_check_method=$lt_cv_deplibs_check_method 13301 deplibs_check_method=$lt_cv_deplibs_check_method
13345 test -z "$deplibs_check_method" && deplibs_check_method=unknown 13302 test -z "$deplibs_check_method" && deplibs_check_method=unknown
13346@@ -6670,6 +6771,157 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown 13303@@ -6702,6 +6803,157 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
13347 13304
13348 13305
13349 13306
@@ -13501,7 +13458,7 @@ index 29896853a90..9e93585f94e 100755
13501 plugin_option= 13458 plugin_option=
13502 plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll" 13459 plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll"
13503 for plugin in $plugin_names; do 13460 for plugin in $plugin_names; do
13504@@ -6684,8 +6936,10 @@ for plugin in $plugin_names; do 13461@@ -6716,8 +6968,10 @@ for plugin in $plugin_names; do
13505 done 13462 done
13506 13463
13507 if test -n "$ac_tool_prefix"; then 13464 if test -n "$ac_tool_prefix"; then
@@ -13514,7 +13471,7 @@ index 29896853a90..9e93585f94e 100755
13514 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 13471 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
13515 $as_echo_n "checking for $ac_word... " >&6; } 13472 $as_echo_n "checking for $ac_word... " >&6; }
13516 if ${ac_cv_prog_AR+:} false; then : 13473 if ${ac_cv_prog_AR+:} false; then :
13517@@ -6701,7 +6955,7 @@ do 13474@@ -6733,7 +6987,7 @@ do
13518 test -z "$as_dir" && as_dir=. 13475 test -z "$as_dir" && as_dir=.
13519 for ac_exec_ext in '' $ac_executable_extensions; do 13476 for ac_exec_ext in '' $ac_executable_extensions; do
13520 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 13477 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
@@ -13523,7 +13480,7 @@ index 29896853a90..9e93585f94e 100755
13523 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 13480 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
13524 break 2 13481 break 2
13525 fi 13482 fi
13526@@ -6721,11 +6975,15 @@ $as_echo "no" >&6; } 13483@@ -6753,11 +7007,15 @@ $as_echo "no" >&6; }
13527 fi 13484 fi
13528 13485
13529 13486
@@ -13542,7 +13499,7 @@ index 29896853a90..9e93585f94e 100755
13542 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 13499 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
13543 $as_echo_n "checking for $ac_word... " >&6; } 13500 $as_echo_n "checking for $ac_word... " >&6; }
13544 if ${ac_cv_prog_ac_ct_AR+:} false; then : 13501 if ${ac_cv_prog_ac_ct_AR+:} false; then :
13545@@ -6741,7 +6999,7 @@ do 13502@@ -6773,7 +7031,7 @@ do
13546 test -z "$as_dir" && as_dir=. 13503 test -z "$as_dir" && as_dir=.
13547 for ac_exec_ext in '' $ac_executable_extensions; do 13504 for ac_exec_ext in '' $ac_executable_extensions; do
13548 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 13505 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
@@ -13551,7 +13508,7 @@ index 29896853a90..9e93585f94e 100755
13551 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 13508 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
13552 break 2 13509 break 2
13553 fi 13510 fi
13554@@ -6760,6 +7018,10 @@ else 13511@@ -6792,6 +7050,10 @@ else
13555 $as_echo "no" >&6; } 13512 $as_echo "no" >&6; }
13556 fi 13513 fi
13557 13514
@@ -13562,7 +13519,7 @@ index 29896853a90..9e93585f94e 100755
13562 if test "x$ac_ct_AR" = x; then 13519 if test "x$ac_ct_AR" = x; then
13563 AR="false" 13520 AR="false"
13564 else 13521 else
13565@@ -6771,25 +7033,19 @@ ac_tool_warned=yes ;; 13522@@ -6803,29 +7065,81 @@ ac_tool_warned=yes ;;
13566 esac 13523 esac
13567 AR=$ac_ct_AR 13524 AR=$ac_ct_AR
13568 fi 13525 fi
@@ -13594,12 +13551,16 @@ index 29896853a90..9e93585f94e 100755
13594+ rm -f conftest.* 13551+ rm -f conftest.*
13595+: ${AR=ar} 13552+: ${AR=ar}
13596+: ${AR_FLAGS=cru} 13553+: ${AR_FLAGS=cru}
13597 13554+
13598 13555+
13599 13556+
13600@@ -6801,6 +7057,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru 13557+
13601 13558+
13602 13559+
13560+
13561+
13562+
13563+
13603 13564
13604+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 13565+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
13605+$as_echo_n "checking for archiver @FILE support... " >&6; } 13566+$as_echo_n "checking for archiver @FILE support... " >&6; }
@@ -13613,7 +13574,7 @@ index 29896853a90..9e93585f94e 100755
13613+int 13574+int
13614+main () 13575+main ()
13615+{ 13576+{
13616+ 13577
13617+ ; 13578+ ;
13618+ return 0; 13579+ return 0;
13619+} 13580+}
@@ -13642,27 +13603,20 @@ index 29896853a90..9e93585f94e 100755
13642+ 13603+
13643+fi 13604+fi
13644+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext 13605+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
13645+ 13606
13646+fi 13607+fi
13647+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 13608+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
13648+$as_echo "$lt_cv_ar_at_file" >&6; } 13609+$as_echo "$lt_cv_ar_at_file" >&6; }
13649+ 13610
13650+if test "x$lt_cv_ar_at_file" = xno; then 13611+if test "x$lt_cv_ar_at_file" = xno; then
13651+ archiver_list_spec= 13612+ archiver_list_spec=
13652+else 13613+else
13653+ archiver_list_spec=$lt_cv_ar_at_file 13614+ archiver_list_spec=$lt_cv_ar_at_file
13654+fi 13615+fi
13655+ 13616
13656+ 13617
13657+ 13618
13658+ 13619@@ -7172,8 +7486,8 @@ esac
13659+
13660+
13661+
13662 if test -n "$ac_tool_prefix"; then
13663 # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
13664 set dummy ${ac_tool_prefix}strip; ac_word=$2
13665@@ -7140,8 +7454,8 @@ esac
13666 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" 13620 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
13667 13621
13668 # Transform an extracted symbol line into symbol name and symbol address 13622 # Transform an extracted symbol line into symbol name and symbol address
@@ -13673,7 +13627,7 @@ index 29896853a90..9e93585f94e 100755
13673 13627
13674 # Handle CRLF in mingw tool chain 13628 # Handle CRLF in mingw tool chain
13675 opt_cr= 13629 opt_cr=
13676@@ -7177,6 +7491,7 @@ for ac_symprfx in "" "_"; do 13630@@ -7209,6 +7523,7 @@ for ac_symprfx in "" "_"; do
13677 else 13631 else
13678 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" 13632 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
13679 fi 13633 fi
@@ -13681,7 +13635,7 @@ index 29896853a90..9e93585f94e 100755
13681 13635
13682 # Check to see that the pipe works correctly. 13636 # Check to see that the pipe works correctly.
13683 pipe_works=no 13637 pipe_works=no
13684@@ -7218,6 +7533,18 @@ _LT_EOF 13638@@ -7250,6 +7565,18 @@ _LT_EOF
13685 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then 13639 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
13686 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then 13640 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
13687 cat <<_LT_EOF > conftest.$ac_ext 13641 cat <<_LT_EOF > conftest.$ac_ext
@@ -13700,7 +13654,7 @@ index 29896853a90..9e93585f94e 100755
13700 #ifdef __cplusplus 13654 #ifdef __cplusplus
13701 extern "C" { 13655 extern "C" {
13702 #endif 13656 #endif
13703@@ -7229,7 +7556,7 @@ _LT_EOF 13657@@ -7261,7 +7588,7 @@ _LT_EOF
13704 cat <<_LT_EOF >> conftest.$ac_ext 13658 cat <<_LT_EOF >> conftest.$ac_ext
13705 13659
13706 /* The mapping between symbol names and symbols. */ 13660 /* The mapping between symbol names and symbols. */
@@ -13709,7 +13663,7 @@ index 29896853a90..9e93585f94e 100755
13709 const char *name; 13663 const char *name;
13710 void *address; 13664 void *address;
13711 } 13665 }
13712@@ -7255,8 +7582,8 @@ static const void *lt_preloaded_setup() { 13666@@ -7287,8 +7614,8 @@ static const void *lt_preloaded_setup() {
13713 _LT_EOF 13667 _LT_EOF
13714 # Now try linking the two files. 13668 # Now try linking the two files.
13715 mv conftest.$ac_objext conftstm.$ac_objext 13669 mv conftest.$ac_objext conftstm.$ac_objext
@@ -13720,7 +13674,7 @@ index 29896853a90..9e93585f94e 100755
13720 LIBS="conftstm.$ac_objext" 13674 LIBS="conftstm.$ac_objext"
13721 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" 13675 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
13722 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 13676 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
13723@@ -7266,8 +7593,8 @@ _LT_EOF 13677@@ -7298,8 +7625,8 @@ _LT_EOF
13724 test $ac_status = 0; } && test -s conftest${ac_exeext}; then 13678 test $ac_status = 0; } && test -s conftest${ac_exeext}; then
13725 pipe_works=yes 13679 pipe_works=yes
13726 fi 13680 fi
@@ -13731,7 +13685,7 @@ index 29896853a90..9e93585f94e 100755
13731 else 13685 else
13732 echo "cannot find nm_test_func in $nlist" >&5 13686 echo "cannot find nm_test_func in $nlist" >&5
13733 fi 13687 fi
13734@@ -7304,6 +7631,17 @@ else 13688@@ -7336,6 +7663,27 @@ else
13735 $as_echo "ok" >&6; } 13689 $as_echo "ok" >&6; }
13736 fi 13690 fi
13737 13691
@@ -13746,30 +13700,34 @@ index 29896853a90..9e93585f94e 100755
13746+ 13700+
13747+ 13701+
13748+ 13702+
13749
13750
13751
13752@@ -7320,6 +7658,44 @@ fi
13753
13754
13755
13756+ 13703+
13757+ 13704+
13758+ 13705+
13759+ 13706+
13760+ 13707+
13761+ 13708+
13709+
13710+
13711+
13712+
13713
13714
13715
13716@@ -7348,10 +7696,38 @@ fi
13717
13718
13719
13762+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 13720+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
13763+$as_echo_n "checking for sysroot... " >&6; } 13721+$as_echo_n "checking for sysroot... " >&6; }
13764+ 13722
13765+# Check whether --with-libtool-sysroot was given. 13723+# Check whether --with-libtool-sysroot was given.
13766+if test "${with_libtool_sysroot+set}" = set; then : 13724+if test "${with_libtool_sysroot+set}" = set; then :
13767+ withval=$with_libtool_sysroot; 13725+ withval=$with_libtool_sysroot;
13768+else 13726+else
13769+ with_libtool_sysroot=no 13727+ with_libtool_sysroot=no
13770+fi 13728+fi
13771+ 13729
13772+ 13730
13773+lt_sysroot= 13731+lt_sysroot=
13774+case ${with_libtool_sysroot} in #( 13732+case ${with_libtool_sysroot} in #(
13775+ yes) 13733+ yes)
@@ -13788,13 +13746,13 @@ index 29896853a90..9e93585f94e 100755
13788+ as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 13746+ as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5
13789+ ;; 13747+ ;;
13790+esac 13748+esac
13791+ 13749
13792+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 13750+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
13793+$as_echo "${lt_sysroot:-no}" >&6; } 13751+$as_echo "${lt_sysroot:-no}" >&6; }
13794 13752
13795 13753
13796 13754
13797@@ -7531,6 +7907,123 @@ esac 13755@@ -7563,6 +7939,123 @@ esac
13798 13756
13799 need_locks="$enable_libtool_lock" 13757 need_locks="$enable_libtool_lock"
13800 13758
@@ -13918,7 +13876,7 @@ index 29896853a90..9e93585f94e 100755
13918 13876
13919 case $host_os in 13877 case $host_os in
13920 rhapsody* | darwin*) 13878 rhapsody* | darwin*)
13921@@ -8094,6 +8587,8 @@ _LT_EOF 13879@@ -8126,6 +8619,8 @@ _LT_EOF
13922 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 13880 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
13923 echo "$AR cru libconftest.a conftest.o" >&5 13881 echo "$AR cru libconftest.a conftest.o" >&5
13924 $AR cru libconftest.a conftest.o 2>&5 13882 $AR cru libconftest.a conftest.o 2>&5
@@ -13927,7 +13885,7 @@ index 29896853a90..9e93585f94e 100755
13927 cat > conftest.c << _LT_EOF 13885 cat > conftest.c << _LT_EOF
13928 int main() { return 0;} 13886 int main() { return 0;}
13929 _LT_EOF 13887 _LT_EOF
13930@@ -8162,6 +8657,16 @@ done 13888@@ -8196,6 +8691,16 @@ done
13931 13889
13932 13890
13933 13891
@@ -13944,7 +13902,7 @@ index 29896853a90..9e93585f94e 100755
13944 13902
13945 13903
13946 # Set options 13904 # Set options
13947@@ -8677,8 +9182,6 @@ fi 13905@@ -8711,8 +9216,6 @@ fi
13948 lt_prog_compiler_pic= 13906 lt_prog_compiler_pic=
13949 lt_prog_compiler_static= 13907 lt_prog_compiler_static=
13950 13908
@@ -13953,7 +13911,7 @@ index 29896853a90..9e93585f94e 100755
13953 13911
13954 if test "$GCC" = yes; then 13912 if test "$GCC" = yes; then
13955 lt_prog_compiler_wl='-Wl,' 13913 lt_prog_compiler_wl='-Wl,'
13956@@ -8844,6 +9347,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 13914@@ -8878,6 +9381,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
13957 lt_prog_compiler_pic='--shared' 13915 lt_prog_compiler_pic='--shared'
13958 lt_prog_compiler_static='--static' 13916 lt_prog_compiler_static='--static'
13959 ;; 13917 ;;
@@ -13966,7 +13924,7 @@ index 29896853a90..9e93585f94e 100755
13966 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) 13924 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
13967 # Portland Group compilers (*not* the Pentium gcc compiler, 13925 # Portland Group compilers (*not* the Pentium gcc compiler,
13968 # which looks to be a dead project) 13926 # which looks to be a dead project)
13969@@ -8906,7 +9415,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 13927@@ -8940,7 +9449,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
13970 lt_prog_compiler_pic='-KPIC' 13928 lt_prog_compiler_pic='-KPIC'
13971 lt_prog_compiler_static='-Bstatic' 13929 lt_prog_compiler_static='-Bstatic'
13972 case $cc_basename in 13930 case $cc_basename in
@@ -13975,7 +13933,7 @@ index 29896853a90..9e93585f94e 100755
13975 lt_prog_compiler_wl='-Qoption ld ';; 13933 lt_prog_compiler_wl='-Qoption ld ';;
13976 *) 13934 *)
13977 lt_prog_compiler_wl='-Wl,';; 13935 lt_prog_compiler_wl='-Wl,';;
13978@@ -8963,13 +9472,17 @@ case $host_os in 13936@@ -8997,13 +9506,17 @@ case $host_os in
13979 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" 13937 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
13980 ;; 13938 ;;
13981 esac 13939 esac
@@ -13999,7 +13957,7 @@ index 29896853a90..9e93585f94e 100755
13999 13957
14000 # 13958 #
14001 # Check to make sure the PIC flag actually works. 13959 # Check to make sure the PIC flag actually works.
14002@@ -9030,6 +9543,11 @@ fi 13960@@ -9064,6 +9577,11 @@ fi
14003 13961
14004 13962
14005 13963
@@ -14011,7 +13969,7 @@ index 29896853a90..9e93585f94e 100755
14011 # 13969 #
14012 # Check to make sure the static flag actually works. 13970 # Check to make sure the static flag actually works.
14013 # 13971 #
14014@@ -9380,7 +9898,8 @@ _LT_EOF 13972@@ -9414,7 +9932,8 @@ _LT_EOF
14015 allow_undefined_flag=unsupported 13973 allow_undefined_flag=unsupported
14016 always_export_symbols=no 13974 always_export_symbols=no
14017 enable_shared_with_static_runtimes=yes 13975 enable_shared_with_static_runtimes=yes
@@ -14021,7 +13979,7 @@ index 29896853a90..9e93585f94e 100755
14021 13979
14022 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then 13980 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
14023 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' 13981 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
14024@@ -9479,12 +9998,12 @@ _LT_EOF 13982@@ -9513,12 +10032,12 @@ _LT_EOF
14025 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' 13983 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
14026 hardcode_libdir_flag_spec= 13984 hardcode_libdir_flag_spec=
14027 hardcode_libdir_flag_spec_ld='-rpath $libdir' 13985 hardcode_libdir_flag_spec_ld='-rpath $libdir'
@@ -14036,7 +13994,7 @@ index 29896853a90..9e93585f94e 100755
14036 fi 13994 fi
14037 ;; 13995 ;;
14038 esac 13996 esac
14039@@ -9498,8 +10017,8 @@ _LT_EOF 13997@@ -9532,8 +10051,8 @@ _LT_EOF
14040 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' 13998 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
14041 wlarc= 13999 wlarc=
14042 else 14000 else
@@ -14047,7 +14005,7 @@ index 29896853a90..9e93585f94e 100755
14047 fi 14005 fi
14048 ;; 14006 ;;
14049 14007
14050@@ -9517,8 +10036,8 @@ _LT_EOF 14008@@ -9551,8 +10070,8 @@ _LT_EOF
14051 14009
14052 _LT_EOF 14010 _LT_EOF
14053 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 14011 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -14058,7 +14016,7 @@ index 29896853a90..9e93585f94e 100755
14058 else 14016 else
14059 ld_shlibs=no 14017 ld_shlibs=no
14060 fi 14018 fi
14061@@ -9564,8 +10083,8 @@ _LT_EOF 14019@@ -9598,8 +10117,8 @@ _LT_EOF
14062 14020
14063 *) 14021 *)
14064 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 14022 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -14069,7 +14027,7 @@ index 29896853a90..9e93585f94e 100755
14069 else 14027 else
14070 ld_shlibs=no 14028 ld_shlibs=no
14071 fi 14029 fi
14072@@ -9695,7 +10214,13 @@ _LT_EOF 14030@@ -9729,7 +10248,13 @@ _LT_EOF
14073 allow_undefined_flag='-berok' 14031 allow_undefined_flag='-berok'
14074 # Determine the default libpath from the value encoded in an 14032 # Determine the default libpath from the value encoded in an
14075 # empty executable. 14033 # empty executable.
@@ -14084,7 +14042,7 @@ index 29896853a90..9e93585f94e 100755
14084 /* end confdefs.h. */ 14042 /* end confdefs.h. */
14085 14043
14086 int 14044 int
14087@@ -9708,22 +10233,29 @@ main () 14045@@ -9742,22 +10267,29 @@ main ()
14088 _ACEOF 14046 _ACEOF
14089 if ac_fn_c_try_link "$LINENO"; then : 14047 if ac_fn_c_try_link "$LINENO"; then :
14090 14048
@@ -14127,7 +14085,7 @@ index 29896853a90..9e93585f94e 100755
14127 14085
14128 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 14086 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
14129 archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" 14087 archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
14130@@ -9735,7 +10267,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 14088@@ -9769,7 +10301,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
14131 else 14089 else
14132 # Determine the default libpath from the value encoded in an 14090 # Determine the default libpath from the value encoded in an
14133 # empty executable. 14091 # empty executable.
@@ -14142,7 +14100,7 @@ index 29896853a90..9e93585f94e 100755
14142 /* end confdefs.h. */ 14100 /* end confdefs.h. */
14143 14101
14144 int 14102 int
14145@@ -9748,22 +10286,29 @@ main () 14103@@ -9782,22 +10320,29 @@ main ()
14146 _ACEOF 14104 _ACEOF
14147 if ac_fn_c_try_link "$LINENO"; then : 14105 if ac_fn_c_try_link "$LINENO"; then :
14148 14106
@@ -14185,11 +14143,10 @@ index 29896853a90..9e93585f94e 100755
14185 14143
14186 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 14144 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
14187 # Warning - without using the other run time loading flags, 14145 # Warning - without using the other run time loading flags,
14188@@ -9807,21 +10352,64 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 14146@@ -9842,20 +10387,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
14189 # When not using gcc, we currently assume that we are using
14190 # Microsoft Visual C++. 14147 # Microsoft Visual C++.
14191 # hardcode_libdir_flag_spec is actually meaningless, as there is 14148 # hardcode_libdir_flag_spec is actually meaningless, as there is
14192- # no search path for DLLs. 14149 # no search path for DLLs.
14193- hardcode_libdir_flag_spec=' ' 14150- hardcode_libdir_flag_spec=' '
14194- allow_undefined_flag=unsupported 14151- allow_undefined_flag=unsupported
14195- # Tell ltmain to make .lib files, not .a files. 14152- # Tell ltmain to make .lib files, not .a files.
@@ -14204,7 +14161,6 @@ index 29896853a90..9e93585f94e 100755
14204- old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' 14161- old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
14205- fix_srcfile_path='`cygpath -w "$srcfile"`' 14162- fix_srcfile_path='`cygpath -w "$srcfile"`'
14206- enable_shared_with_static_runtimes=yes 14163- enable_shared_with_static_runtimes=yes
14207+ # no search path for DLLs.
14208+ case $cc_basename in 14164+ case $cc_basename in
14209+ cl*) 14165+ cl*)
14210+ # Native MSVC 14166+ # Native MSVC
@@ -14265,7 +14221,7 @@ index 29896853a90..9e93585f94e 100755
14265 ;; 14221 ;;
14266 14222
14267 darwin* | rhapsody*) 14223 darwin* | rhapsody*)
14268@@ -9882,7 +10470,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 14224@@ -9916,7 +10504,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
14269 14225
14270 # FreeBSD 3 and greater uses gcc -shared to do shared libraries. 14226 # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
14271 freebsd* | dragonfly*) 14227 freebsd* | dragonfly*)
@@ -14274,7 +14230,7 @@ index 29896853a90..9e93585f94e 100755
14274 hardcode_libdir_flag_spec='-R$libdir' 14230 hardcode_libdir_flag_spec='-R$libdir'
14275 hardcode_direct=yes 14231 hardcode_direct=yes
14276 hardcode_shlibpath_var=no 14232 hardcode_shlibpath_var=no
14277@@ -9890,7 +10478,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 14233@@ -9924,7 +10512,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
14278 14234
14279 hpux9*) 14235 hpux9*)
14280 if test "$GCC" = yes; then 14236 if test "$GCC" = yes; then
@@ -14283,7 +14239,7 @@ index 29896853a90..9e93585f94e 100755
14283 else 14239 else
14284 archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' 14240 archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
14285 fi 14241 fi
14286@@ -9906,7 +10494,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 14242@@ -9940,7 +10528,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
14287 14243
14288 hpux10*) 14244 hpux10*)
14289 if test "$GCC" = yes && test "$with_gnu_ld" = no; then 14245 if test "$GCC" = yes && test "$with_gnu_ld" = no; then
@@ -14292,8 +14248,8 @@ index 29896853a90..9e93585f94e 100755
14292 else 14248 else
14293 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' 14249 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
14294 fi 14250 fi
14295@@ -9930,10 +10518,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 14251@@ -9964,10 +10552,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
14296 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' 14252 archive_cmds='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
14297 ;; 14253 ;;
14298 ia64*) 14254 ia64*)
14299- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' 14255- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
@@ -14305,7 +14261,7 @@ index 29896853a90..9e93585f94e 100755
14305 ;; 14261 ;;
14306 esac 14262 esac
14307 else 14263 else
14308@@ -10012,23 +10600,36 @@ fi 14264@@ -10046,23 +10634,36 @@ fi
14309 14265
14310 irix5* | irix6* | nonstopux*) 14266 irix5* | irix6* | nonstopux*)
14311 if test "$GCC" = yes; then 14267 if test "$GCC" = yes; then
@@ -14350,7 +14306,7 @@ index 29896853a90..9e93585f94e 100755
14350 else 14306 else
14351 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' 14307 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
14352 archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' 14308 archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
14353@@ -10113,7 +10714,7 @@ rm -f core conftest.err conftest.$ac_objext \ 14309@@ -10147,7 +10748,7 @@ rm -f core conftest.err conftest.$ac_objext \
14354 osf4* | osf5*) # as osf3* with the addition of -msym flag 14310 osf4* | osf5*) # as osf3* with the addition of -msym flag
14355 if test "$GCC" = yes; then 14311 if test "$GCC" = yes; then
14356 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' 14312 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
@@ -14359,7 +14315,7 @@ index 29896853a90..9e93585f94e 100755
14359 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' 14315 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
14360 else 14316 else
14361 allow_undefined_flag=' -expect_unresolved \*' 14317 allow_undefined_flag=' -expect_unresolved \*'
14362@@ -10132,9 +10733,9 @@ rm -f core conftest.err conftest.$ac_objext \ 14318@@ -10166,9 +10767,9 @@ rm -f core conftest.err conftest.$ac_objext \
14363 no_undefined_flag=' -z defs' 14319 no_undefined_flag=' -z defs'
14364 if test "$GCC" = yes; then 14320 if test "$GCC" = yes; then
14365 wlarc='${wl}' 14321 wlarc='${wl}'
@@ -14371,7 +14327,7 @@ index 29896853a90..9e93585f94e 100755
14371 else 14327 else
14372 case `$CC -V 2>&1` in 14328 case `$CC -V 2>&1` in
14373 *"Compilers 5.0"*) 14329 *"Compilers 5.0"*)
14374@@ -10710,8 +11311,9 @@ cygwin* | mingw* | pw32* | cegcc*) 14330@@ -10744,8 +11345,9 @@ cygwin* | mingw* | pw32* | cegcc*)
14375 need_version=no 14331 need_version=no
14376 need_lib_prefix=no 14332 need_lib_prefix=no
14377 14333
@@ -14383,7 +14339,7 @@ index 29896853a90..9e93585f94e 100755
14383 library_names_spec='$libname.dll.a' 14339 library_names_spec='$libname.dll.a'
14384 # DLL is installed to $(libdir)/../bin by postinstall_cmds 14340 # DLL is installed to $(libdir)/../bin by postinstall_cmds
14385 postinstall_cmds='base_file=`basename \${file}`~ 14341 postinstall_cmds='base_file=`basename \${file}`~
14386@@ -10744,13 +11346,71 @@ cygwin* | mingw* | pw32* | cegcc*) 14342@@ -10778,13 +11380,71 @@ cygwin* | mingw* | pw32* | cegcc*)
14387 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' 14343 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
14388 ;; 14344 ;;
14389 esac 14345 esac
@@ -14456,16 +14412,16 @@ index 29896853a90..9e93585f94e 100755
14456 # FIXME: first we should search . and the directory the executable is in 14412 # FIXME: first we should search . and the directory the executable is in
14457 shlibpath_var=PATH 14413 shlibpath_var=PATH
14458 ;; 14414 ;;
14459@@ -11628,7 +12288,7 @@ else 14415@@ -11686,7 +12346,7 @@ else
14460 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 14416 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
14461 lt_status=$lt_dlunknown 14417 lt_status=$lt_dlunknown
14462 cat > conftest.$ac_ext <<_LT_EOF 14418 cat > conftest.$ac_ext <<_LT_EOF
14463-#line 11628 "configure" 14419-#line 11686 "configure"
14464+#line $LINENO "configure" 14420+#line $LINENO "configure"
14465 #include "confdefs.h" 14421 #include "confdefs.h"
14466 14422
14467 #if HAVE_DLFCN_H 14423 #if HAVE_DLFCN_H
14468@@ -11672,10 +12332,10 @@ else 14424@@ -11730,10 +12390,10 @@ else
14469 /* When -fvisbility=hidden is used, assume the code has been annotated 14425 /* When -fvisbility=hidden is used, assume the code has been annotated
14470 correspondingly for the symbols needed. */ 14426 correspondingly for the symbols needed. */
14471 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 14427 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
@@ -14478,16 +14434,16 @@ index 29896853a90..9e93585f94e 100755
14478 int main () 14434 int main ()
14479 { 14435 {
14480 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 14436 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
14481@@ -11734,7 +12394,7 @@ else 14437@@ -11792,7 +12452,7 @@ else
14482 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 14438 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
14483 lt_status=$lt_dlunknown 14439 lt_status=$lt_dlunknown
14484 cat > conftest.$ac_ext <<_LT_EOF 14440 cat > conftest.$ac_ext <<_LT_EOF
14485-#line 11734 "configure" 14441-#line 11792 "configure"
14486+#line $LINENO "configure" 14442+#line $LINENO "configure"
14487 #include "confdefs.h" 14443 #include "confdefs.h"
14488 14444
14489 #if HAVE_DLFCN_H 14445 #if HAVE_DLFCN_H
14490@@ -11778,10 +12438,10 @@ else 14446@@ -11836,10 +12496,10 @@ else
14491 /* When -fvisbility=hidden is used, assume the code has been annotated 14447 /* When -fvisbility=hidden is used, assume the code has been annotated
14492 correspondingly for the symbols needed. */ 14448 correspondingly for the symbols needed. */
14493 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 14449 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
@@ -14500,7 +14456,7 @@ index 29896853a90..9e93585f94e 100755
14500 int main () 14456 int main ()
14501 { 14457 {
14502 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 14458 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
14503@@ -12173,6 +12833,7 @@ $RM -r conftest* 14459@@ -12231,6 +12891,7 @@ $RM -r conftest*
14504 14460
14505 # Allow CC to be a program name with arguments. 14461 # Allow CC to be a program name with arguments.
14506 lt_save_CC=$CC 14462 lt_save_CC=$CC
@@ -14508,7 +14464,7 @@ index 29896853a90..9e93585f94e 100755
14508 lt_save_LD=$LD 14464 lt_save_LD=$LD
14509 lt_save_GCC=$GCC 14465 lt_save_GCC=$GCC
14510 GCC=$GXX 14466 GCC=$GXX
14511@@ -12190,6 +12851,7 @@ $RM -r conftest* 14467@@ -12248,6 +12909,7 @@ $RM -r conftest*
14512 fi 14468 fi
14513 test -z "${LDCXX+set}" || LD=$LDCXX 14469 test -z "${LDCXX+set}" || LD=$LDCXX
14514 CC=${CXX-"c++"} 14470 CC=${CXX-"c++"}
@@ -14516,7 +14472,7 @@ index 29896853a90..9e93585f94e 100755
14516 compiler=$CC 14472 compiler=$CC
14517 compiler_CXX=$CC 14473 compiler_CXX=$CC
14518 for cc_temp in $compiler""; do 14474 for cc_temp in $compiler""; do
14519@@ -12472,7 +13134,13 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie 14475@@ -12530,7 +13192,13 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
14520 allow_undefined_flag_CXX='-berok' 14476 allow_undefined_flag_CXX='-berok'
14521 # Determine the default libpath from the value encoded in an empty 14477 # Determine the default libpath from the value encoded in an empty
14522 # executable. 14478 # executable.
@@ -14531,7 +14487,7 @@ index 29896853a90..9e93585f94e 100755
14531 /* end confdefs.h. */ 14487 /* end confdefs.h. */
14532 14488
14533 int 14489 int
14534@@ -12485,22 +13153,29 @@ main () 14490@@ -12543,22 +13211,29 @@ main ()
14535 _ACEOF 14491 _ACEOF
14536 if ac_fn_cxx_try_link "$LINENO"; then : 14492 if ac_fn_cxx_try_link "$LINENO"; then :
14537 14493
@@ -14574,7 +14530,7 @@ index 29896853a90..9e93585f94e 100755
14574 14530
14575 hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" 14531 hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
14576 14532
14577@@ -12513,7 +13188,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 14533@@ -12571,7 +13246,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
14578 else 14534 else
14579 # Determine the default libpath from the value encoded in an 14535 # Determine the default libpath from the value encoded in an
14580 # empty executable. 14536 # empty executable.
@@ -14589,7 +14545,7 @@ index 29896853a90..9e93585f94e 100755
14589 /* end confdefs.h. */ 14545 /* end confdefs.h. */
14590 14546
14591 int 14547 int
14592@@ -12526,22 +13207,29 @@ main () 14548@@ -12584,22 +13265,29 @@ main ()
14593 _ACEOF 14549 _ACEOF
14594 if ac_fn_cxx_try_link "$LINENO"; then : 14550 if ac_fn_cxx_try_link "$LINENO"; then :
14595 14551
@@ -14632,7 +14588,7 @@ index 29896853a90..9e93585f94e 100755
14632 14588
14633 hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" 14589 hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
14634 # Warning - without using the other run time loading flags, 14590 # Warning - without using the other run time loading flags,
14635@@ -12584,29 +13272,75 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 14591@@ -12642,29 +13330,75 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
14636 ;; 14592 ;;
14637 14593
14638 cygwin* | mingw* | pw32* | cegcc*) 14594 cygwin* | mingw* | pw32* | cegcc*)
@@ -14731,7 +14687,7 @@ index 29896853a90..9e93585f94e 100755
14731 darwin* | rhapsody*) 14687 darwin* | rhapsody*)
14732 14688
14733 14689
14734@@ -12712,7 +13446,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 14690@@ -12770,7 +13504,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
14735 ;; 14691 ;;
14736 *) 14692 *)
14737 if test "$GXX" = yes; then 14693 if test "$GXX" = yes; then
@@ -14740,8 +14696,8 @@ index 29896853a90..9e93585f94e 100755
14740 else 14696 else
14741 # FIXME: insert proper C++ library support 14697 # FIXME: insert proper C++ library support
14742 ld_shlibs_CXX=no 14698 ld_shlibs_CXX=no
14743@@ -12783,10 +13517,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 14699@@ -12841,10 +13575,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
14744 archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' 14700 archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
14745 ;; 14701 ;;
14746 ia64*) 14702 ia64*)
14747- archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' 14703- archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
@@ -14753,7 +14709,7 @@ index 29896853a90..9e93585f94e 100755
14753 ;; 14709 ;;
14754 esac 14710 esac
14755 fi 14711 fi
14756@@ -12827,9 +13561,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 14712@@ -12885,9 +13619,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
14757 *) 14713 *)
14758 if test "$GXX" = yes; then 14714 if test "$GXX" = yes; then
14759 if test "$with_gnu_ld" = no; then 14715 if test "$with_gnu_ld" = no; then
@@ -14765,32 +14721,7 @@ index 29896853a90..9e93585f94e 100755
14765 fi 14721 fi
14766 fi 14722 fi
14767 link_all_deplibs_CXX=yes 14723 link_all_deplibs_CXX=yes
14768@@ -12899,20 +13633,20 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 14724@@ -13165,7 +13899,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
14769 prelink_cmds_CXX='tpldir=Template.dir~
14770 rm -rf $tpldir~
14771 $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
14772- compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"'
14773+ compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"'
14774 old_archive_cmds_CXX='tpldir=Template.dir~
14775 rm -rf $tpldir~
14776 $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
14777- $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~
14778+ $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~
14779 $RANLIB $oldlib'
14780 archive_cmds_CXX='tpldir=Template.dir~
14781 rm -rf $tpldir~
14782 $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
14783- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
14784+ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
14785 archive_expsym_cmds_CXX='tpldir=Template.dir~
14786 rm -rf $tpldir~
14787 $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
14788- $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'
14789+ $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'
14790 ;;
14791 *) # Version 6 and above use weak symbols
14792 archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
14793@@ -13107,7 +13841,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
14794 archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' 14725 archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
14795 ;; 14726 ;;
14796 *) 14727 *)
@@ -14799,7 +14730,7 @@ index 29896853a90..9e93585f94e 100755
14799 ;; 14730 ;;
14800 esac 14731 esac
14801 14732
14802@@ -13153,7 +13887,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 14733@@ -13211,7 +13945,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
14803 14734
14804 solaris*) 14735 solaris*)
14805 case $cc_basename in 14736 case $cc_basename in
@@ -14808,7 +14739,7 @@ index 29896853a90..9e93585f94e 100755
14808 # Sun C++ 4.2, 5.x and Centerline C++ 14739 # Sun C++ 4.2, 5.x and Centerline C++
14809 archive_cmds_need_lc_CXX=yes 14740 archive_cmds_need_lc_CXX=yes
14810 no_undefined_flag_CXX=' -zdefs' 14741 no_undefined_flag_CXX=' -zdefs'
14811@@ -13194,9 +13928,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 14742@@ -13252,9 +13986,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
14812 if test "$GXX" = yes && test "$with_gnu_ld" = no; then 14743 if test "$GXX" = yes && test "$with_gnu_ld" = no; then
14813 no_undefined_flag_CXX=' ${wl}-z ${wl}defs' 14744 no_undefined_flag_CXX=' ${wl}-z ${wl}defs'
14814 if $CC --version | $GREP -v '^2\.7' > /dev/null; then 14745 if $CC --version | $GREP -v '^2\.7' > /dev/null; then
@@ -14820,7 +14751,7 @@ index 29896853a90..9e93585f94e 100755
14820 14751
14821 # Commands to make compiler produce verbose output that lists 14752 # Commands to make compiler produce verbose output that lists
14822 # what "hidden" libraries, object files and flags are used when 14753 # what "hidden" libraries, object files and flags are used when
14823@@ -13331,6 +14065,13 @@ private: 14754@@ -13390,6 +14124,13 @@ private:
14824 }; 14755 };
14825 _LT_EOF 14756 _LT_EOF
14826 14757
@@ -14834,7 +14765,7 @@ index 29896853a90..9e93585f94e 100755
14834 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 14765 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
14835 (eval $ac_compile) 2>&5 14766 (eval $ac_compile) 2>&5
14836 ac_status=$? 14767 ac_status=$?
14837@@ -13344,7 +14085,7 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 14768@@ -13403,7 +14144,7 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
14838 pre_test_object_deps_done=no 14769 pre_test_object_deps_done=no
14839 14770
14840 for p in `eval "$output_verbose_link_cmd"`; do 14771 for p in `eval "$output_verbose_link_cmd"`; do
@@ -14843,7 +14774,7 @@ index 29896853a90..9e93585f94e 100755
14843 14774
14844 -L* | -R* | -l*) 14775 -L* | -R* | -l*)
14845 # Some compilers place space between "-{L,R}" and the path. 14776 # Some compilers place space between "-{L,R}" and the path.
14846@@ -13353,13 +14094,22 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 14777@@ -13412,13 +14153,22 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
14847 test $p = "-R"; then 14778 test $p = "-R"; then
14848 prev=$p 14779 prev=$p
14849 continue 14780 continue
@@ -14870,7 +14801,7 @@ index 29896853a90..9e93585f94e 100755
14870 # Internal compiler library paths should come after those 14801 # Internal compiler library paths should come after those
14871 # provided the user. The postdeps already come after the 14802 # provided the user. The postdeps already come after the
14872 # user supplied libs so there is no need to process them. 14803 # user supplied libs so there is no need to process them.
14873@@ -13379,8 +14129,10 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 14804@@ -13438,8 +14188,10 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
14874 postdeps_CXX="${postdeps_CXX} ${prev}${p}" 14805 postdeps_CXX="${postdeps_CXX} ${prev}${p}"
14875 fi 14806 fi
14876 fi 14807 fi
@@ -14881,7 +14812,7 @@ index 29896853a90..9e93585f94e 100755
14881 *.$objext) 14812 *.$objext)
14882 # This assumes that the test object file only shows up 14813 # This assumes that the test object file only shows up
14883 # once in the compiler output. 14814 # once in the compiler output.
14884@@ -13416,6 +14168,7 @@ else 14815@@ -13475,6 +14227,7 @@ else
14885 fi 14816 fi
14886 14817
14887 $RM -f confest.$objext 14818 $RM -f confest.$objext
@@ -14889,7 +14820,7 @@ index 29896853a90..9e93585f94e 100755
14889 14820
14890 # PORTME: override above test on systems where it is broken 14821 # PORTME: override above test on systems where it is broken
14891 case $host_os in 14822 case $host_os in
14892@@ -13451,7 +14204,7 @@ linux*) 14823@@ -13510,7 +14263,7 @@ linux*)
14893 14824
14894 solaris*) 14825 solaris*)
14895 case $cc_basename in 14826 case $cc_basename in
@@ -14898,7 +14829,7 @@ index 29896853a90..9e93585f94e 100755
14898 # The more standards-conforming stlport4 library is 14829 # The more standards-conforming stlport4 library is
14899 # incompatible with the Cstd library. Avoid specifying 14830 # incompatible with the Cstd library. Avoid specifying
14900 # it if it's in CXXFLAGS. Ignore libCrun as 14831 # it if it's in CXXFLAGS. Ignore libCrun as
14901@@ -13516,8 +14269,6 @@ fi 14832@@ -13575,8 +14328,6 @@ fi
14902 lt_prog_compiler_pic_CXX= 14833 lt_prog_compiler_pic_CXX=
14903 lt_prog_compiler_static_CXX= 14834 lt_prog_compiler_static_CXX=
14904 14835
@@ -14907,7 +14838,7 @@ index 29896853a90..9e93585f94e 100755
14907 14838
14908 # C++ specific cases for pic, static, wl, etc. 14839 # C++ specific cases for pic, static, wl, etc.
14909 if test "$GXX" = yes; then 14840 if test "$GXX" = yes; then
14910@@ -13622,6 +14373,11 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 14841@@ -13681,6 +14432,11 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
14911 ;; 14842 ;;
14912 esac 14843 esac
14913 ;; 14844 ;;
@@ -14919,7 +14850,7 @@ index 29896853a90..9e93585f94e 100755
14919 dgux*) 14850 dgux*)
14920 case $cc_basename in 14851 case $cc_basename in
14921 ec++*) 14852 ec++*)
14922@@ -13774,7 +14530,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 14853@@ -13833,7 +14589,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
14923 ;; 14854 ;;
14924 solaris*) 14855 solaris*)
14925 case $cc_basename in 14856 case $cc_basename in
@@ -14928,7 +14859,7 @@ index 29896853a90..9e93585f94e 100755
14928 # Sun C++ 4.2, 5.x and Centerline C++ 14859 # Sun C++ 4.2, 5.x and Centerline C++
14929 lt_prog_compiler_pic_CXX='-KPIC' 14860 lt_prog_compiler_pic_CXX='-KPIC'
14930 lt_prog_compiler_static_CXX='-Bstatic' 14861 lt_prog_compiler_static_CXX='-Bstatic'
14931@@ -13839,10 +14595,17 @@ case $host_os in 14862@@ -13898,10 +14654,17 @@ case $host_os in
14932 lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC" 14863 lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC"
14933 ;; 14864 ;;
14934 esac 14865 esac
@@ -14949,7 +14880,7 @@ index 29896853a90..9e93585f94e 100755
14949 14880
14950 # 14881 #
14951 # Check to make sure the PIC flag actually works. 14882 # Check to make sure the PIC flag actually works.
14952@@ -13900,6 +14663,8 @@ fi 14883@@ -13959,6 +14722,8 @@ fi
14953 14884
14954 14885
14955 14886
@@ -14958,7 +14889,7 @@ index 29896853a90..9e93585f94e 100755
14958 # 14889 #
14959 # Check to make sure the static flag actually works. 14890 # Check to make sure the static flag actually works.
14960 # 14891 #
14961@@ -14077,6 +14842,7 @@ fi 14892@@ -14136,6 +14901,7 @@ fi
14962 $as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } 14893 $as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
14963 14894
14964 export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' 14895 export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
@@ -14966,7 +14897,7 @@ index 29896853a90..9e93585f94e 100755
14966 case $host_os in 14897 case $host_os in
14967 aix[4-9]*) 14898 aix[4-9]*)
14968 # If we're using GNU nm, then we don't want the "-C" option. 14899 # If we're using GNU nm, then we don't want the "-C" option.
14969@@ -14091,15 +14857,20 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie 14900@@ -14150,15 +14916,20 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
14970 ;; 14901 ;;
14971 pw32*) 14902 pw32*)
14972 export_symbols_cmds_CXX="$ltdll_cmds" 14903 export_symbols_cmds_CXX="$ltdll_cmds"
@@ -14992,7 +14923,7 @@ index 29896853a90..9e93585f94e 100755
14992 14923
14993 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5 14924 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5
14994 $as_echo "$ld_shlibs_CXX" >&6; } 14925 $as_echo "$ld_shlibs_CXX" >&6; }
14995@@ -14362,8 +15133,9 @@ cygwin* | mingw* | pw32* | cegcc*) 14926@@ -14421,8 +15192,9 @@ cygwin* | mingw* | pw32* | cegcc*)
14996 need_version=no 14927 need_version=no
14997 need_lib_prefix=no 14928 need_lib_prefix=no
14998 14929
@@ -15004,7 +14935,7 @@ index 29896853a90..9e93585f94e 100755
15004 library_names_spec='$libname.dll.a' 14935 library_names_spec='$libname.dll.a'
15005 # DLL is installed to $(libdir)/../bin by postinstall_cmds 14936 # DLL is installed to $(libdir)/../bin by postinstall_cmds
15006 postinstall_cmds='base_file=`basename \${file}`~ 14937 postinstall_cmds='base_file=`basename \${file}`~
15007@@ -14395,13 +15167,71 @@ cygwin* | mingw* | pw32* | cegcc*) 14938@@ -14454,13 +15226,71 @@ cygwin* | mingw* | pw32* | cegcc*)
15008 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' 14939 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
15009 ;; 14940 ;;
15010 esac 14941 esac
@@ -15077,7 +15008,7 @@ index 29896853a90..9e93585f94e 100755
15077 # FIXME: first we should search . and the directory the executable is in 15008 # FIXME: first we should search . and the directory the executable is in
15078 shlibpath_var=PATH 15009 shlibpath_var=PATH
15079 ;; 15010 ;;
15080@@ -14941,6 +15771,7 @@ fi 15011@@ -15024,6 +15854,7 @@ fi
15081 fi # test -n "$compiler" 15012 fi # test -n "$compiler"
15082 15013
15083 CC=$lt_save_CC 15014 CC=$lt_save_CC
@@ -15085,7 +15016,7 @@ index 29896853a90..9e93585f94e 100755
15085 LDCXX=$LD 15016 LDCXX=$LD
15086 LD=$lt_save_LD 15017 LD=$lt_save_LD
15087 GCC=$lt_save_GCC 15018 GCC=$lt_save_GCC
15088@@ -18322,13 +19153,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' 15019@@ -20310,13 +21141,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
15089 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' 15020 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
15090 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' 15021 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
15091 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' 15022 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
@@ -15106,7 +15037,7 @@ index 29896853a90..9e93585f94e 100755
15106 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' 15037 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
15107 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' 15038 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
15108 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' 15039 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
15109@@ -18343,14 +19181,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de 15040@@ -20331,14 +21169,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de
15110 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' 15041 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
15111 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' 15042 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
15112 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`' 15043 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`'
@@ -15125,7 +15056,7 @@ index 29896853a90..9e93585f94e 100755
15125 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' 15056 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
15126 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' 15057 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
15127 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' 15058 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
15128@@ -18383,12 +19224,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q 15059@@ -20371,12 +21212,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q
15129 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' 15060 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
15130 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' 15061 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
15131 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' 15062 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
@@ -15139,7 +15070,7 @@ index 29896853a90..9e93585f94e 100755
15139 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' 15070 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
15140 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' 15071 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
15141 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' 15072 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
15142@@ -18427,8 +19268,8 @@ old_archive_cmds_CXX='`$ECHO "$old_archive_cmds_CXX" | $SED "$delay_single_quote 15073@@ -20415,8 +21256,8 @@ old_archive_cmds_CXX='`$ECHO "$old_archive_cmds_CXX" | $SED "$delay_single_quote
15143 compiler_CXX='`$ECHO "$compiler_CXX" | $SED "$delay_single_quote_subst"`' 15074 compiler_CXX='`$ECHO "$compiler_CXX" | $SED "$delay_single_quote_subst"`'
15144 GCC_CXX='`$ECHO "$GCC_CXX" | $SED "$delay_single_quote_subst"`' 15075 GCC_CXX='`$ECHO "$GCC_CXX" | $SED "$delay_single_quote_subst"`'
15145 lt_prog_compiler_no_builtin_flag_CXX='`$ECHO "$lt_prog_compiler_no_builtin_flag_CXX" | $SED "$delay_single_quote_subst"`' 15076 lt_prog_compiler_no_builtin_flag_CXX='`$ECHO "$lt_prog_compiler_no_builtin_flag_CXX" | $SED "$delay_single_quote_subst"`'
@@ -15149,7 +15080,7 @@ index 29896853a90..9e93585f94e 100755
15149 lt_prog_compiler_static_CXX='`$ECHO "$lt_prog_compiler_static_CXX" | $SED "$delay_single_quote_subst"`' 15080 lt_prog_compiler_static_CXX='`$ECHO "$lt_prog_compiler_static_CXX" | $SED "$delay_single_quote_subst"`'
15150 lt_cv_prog_compiler_c_o_CXX='`$ECHO "$lt_cv_prog_compiler_c_o_CXX" | $SED "$delay_single_quote_subst"`' 15081 lt_cv_prog_compiler_c_o_CXX='`$ECHO "$lt_cv_prog_compiler_c_o_CXX" | $SED "$delay_single_quote_subst"`'
15151 archive_cmds_need_lc_CXX='`$ECHO "$archive_cmds_need_lc_CXX" | $SED "$delay_single_quote_subst"`' 15082 archive_cmds_need_lc_CXX='`$ECHO "$archive_cmds_need_lc_CXX" | $SED "$delay_single_quote_subst"`'
15152@@ -18455,12 +19296,12 @@ hardcode_shlibpath_var_CXX='`$ECHO "$hardcode_shlibpath_var_CXX" | $SED "$delay_ 15083@@ -20443,12 +21284,12 @@ hardcode_shlibpath_var_CXX='`$ECHO "$hardcode_shlibpath_var_CXX" | $SED "$delay_
15153 hardcode_automatic_CXX='`$ECHO "$hardcode_automatic_CXX" | $SED "$delay_single_quote_subst"`' 15084 hardcode_automatic_CXX='`$ECHO "$hardcode_automatic_CXX" | $SED "$delay_single_quote_subst"`'
15154 inherit_rpath_CXX='`$ECHO "$inherit_rpath_CXX" | $SED "$delay_single_quote_subst"`' 15085 inherit_rpath_CXX='`$ECHO "$inherit_rpath_CXX" | $SED "$delay_single_quote_subst"`'
15155 link_all_deplibs_CXX='`$ECHO "$link_all_deplibs_CXX" | $SED "$delay_single_quote_subst"`' 15086 link_all_deplibs_CXX='`$ECHO "$link_all_deplibs_CXX" | $SED "$delay_single_quote_subst"`'
@@ -15163,7 +15094,7 @@ index 29896853a90..9e93585f94e 100755
15163 file_list_spec_CXX='`$ECHO "$file_list_spec_CXX" | $SED "$delay_single_quote_subst"`' 15094 file_list_spec_CXX='`$ECHO "$file_list_spec_CXX" | $SED "$delay_single_quote_subst"`'
15164 hardcode_action_CXX='`$ECHO "$hardcode_action_CXX" | $SED "$delay_single_quote_subst"`' 15095 hardcode_action_CXX='`$ECHO "$hardcode_action_CXX" | $SED "$delay_single_quote_subst"`'
15165 compiler_lib_search_dirs_CXX='`$ECHO "$compiler_lib_search_dirs_CXX" | $SED "$delay_single_quote_subst"`' 15096 compiler_lib_search_dirs_CXX='`$ECHO "$compiler_lib_search_dirs_CXX" | $SED "$delay_single_quote_subst"`'
15166@@ -18498,8 +19339,13 @@ reload_flag \ 15097@@ -20486,8 +21327,13 @@ reload_flag \
15167 OBJDUMP \ 15098 OBJDUMP \
15168 deplibs_check_method \ 15099 deplibs_check_method \
15169 file_magic_cmd \ 15100 file_magic_cmd \
@@ -15177,7 +15108,7 @@ index 29896853a90..9e93585f94e 100755
15177 STRIP \ 15108 STRIP \
15178 RANLIB \ 15109 RANLIB \
15179 CC \ 15110 CC \
15180@@ -18509,12 +19355,14 @@ lt_cv_sys_global_symbol_pipe \ 15111@@ -20497,12 +21343,14 @@ lt_cv_sys_global_symbol_pipe \
15181 lt_cv_sys_global_symbol_to_cdecl \ 15112 lt_cv_sys_global_symbol_to_cdecl \
15182 lt_cv_sys_global_symbol_to_c_name_address \ 15113 lt_cv_sys_global_symbol_to_c_name_address \
15183 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ 15114 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
@@ -15193,7 +15124,7 @@ index 29896853a90..9e93585f94e 100755
15193 DSYMUTIL \ 15124 DSYMUTIL \
15194 NMEDIT \ 15125 NMEDIT \
15195 LIPO \ 15126 LIPO \
15196@@ -18530,7 +19378,6 @@ no_undefined_flag \ 15127@@ -20518,7 +21366,6 @@ no_undefined_flag \
15197 hardcode_libdir_flag_spec \ 15128 hardcode_libdir_flag_spec \
15198 hardcode_libdir_flag_spec_ld \ 15129 hardcode_libdir_flag_spec_ld \
15199 hardcode_libdir_separator \ 15130 hardcode_libdir_separator \
@@ -15201,7 +15132,7 @@ index 29896853a90..9e93585f94e 100755
15201 exclude_expsyms \ 15132 exclude_expsyms \
15202 include_expsyms \ 15133 include_expsyms \
15203 file_list_spec \ 15134 file_list_spec \
15204@@ -18552,8 +19399,8 @@ LD_CXX \ 15135@@ -20540,8 +21387,8 @@ LD_CXX \
15205 reload_flag_CXX \ 15136 reload_flag_CXX \
15206 compiler_CXX \ 15137 compiler_CXX \
15207 lt_prog_compiler_no_builtin_flag_CXX \ 15138 lt_prog_compiler_no_builtin_flag_CXX \
@@ -15211,7 +15142,7 @@ index 29896853a90..9e93585f94e 100755
15211 lt_prog_compiler_static_CXX \ 15142 lt_prog_compiler_static_CXX \
15212 lt_cv_prog_compiler_c_o_CXX \ 15143 lt_cv_prog_compiler_c_o_CXX \
15213 export_dynamic_flag_spec_CXX \ 15144 export_dynamic_flag_spec_CXX \
15214@@ -18565,7 +19412,6 @@ no_undefined_flag_CXX \ 15145@@ -20553,7 +21400,6 @@ no_undefined_flag_CXX \
15215 hardcode_libdir_flag_spec_CXX \ 15146 hardcode_libdir_flag_spec_CXX \
15216 hardcode_libdir_flag_spec_ld_CXX \ 15147 hardcode_libdir_flag_spec_ld_CXX \
15217 hardcode_libdir_separator_CXX \ 15148 hardcode_libdir_separator_CXX \
@@ -15219,7 +15150,7 @@ index 29896853a90..9e93585f94e 100755
15219 exclude_expsyms_CXX \ 15150 exclude_expsyms_CXX \
15220 include_expsyms_CXX \ 15151 include_expsyms_CXX \
15221 file_list_spec_CXX \ 15152 file_list_spec_CXX \
15222@@ -18599,6 +19445,7 @@ module_cmds \ 15153@@ -20587,6 +21433,7 @@ module_cmds \
15223 module_expsym_cmds \ 15154 module_expsym_cmds \
15224 export_symbols_cmds \ 15155 export_symbols_cmds \
15225 prelink_cmds \ 15156 prelink_cmds \
@@ -15227,7 +15158,7 @@ index 29896853a90..9e93585f94e 100755
15227 postinstall_cmds \ 15158 postinstall_cmds \
15228 postuninstall_cmds \ 15159 postuninstall_cmds \
15229 finish_cmds \ 15160 finish_cmds \
15230@@ -18613,7 +19460,8 @@ archive_expsym_cmds_CXX \ 15161@@ -20601,7 +21448,8 @@ archive_expsym_cmds_CXX \
15231 module_cmds_CXX \ 15162 module_cmds_CXX \
15232 module_expsym_cmds_CXX \ 15163 module_expsym_cmds_CXX \
15233 export_symbols_cmds_CXX \ 15164 export_symbols_cmds_CXX \
@@ -15237,7 +15168,7 @@ index 29896853a90..9e93585f94e 100755
15237 case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in 15168 case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
15238 *[\\\\\\\`\\"\\\$]*) 15169 *[\\\\\\\`\\"\\\$]*)
15239 eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" 15170 eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
15240@@ -19378,7 +20226,8 @@ $as_echo X"$file" | 15171@@ -21374,7 +22222,8 @@ $as_echo X"$file" |
15241 # NOTE: Changes made to this file will be lost: look at ltmain.sh. 15172 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
15242 # 15173 #
15243 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 15174 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
@@ -15247,7 +15178,7 @@ index 29896853a90..9e93585f94e 100755
15247 # Written by Gordon Matzigkeit, 1996 15178 # Written by Gordon Matzigkeit, 1996
15248 # 15179 #
15249 # This file is part of GNU Libtool. 15180 # This file is part of GNU Libtool.
15250@@ -19481,19 +20330,42 @@ SP2NL=$lt_lt_SP2NL 15181@@ -21477,19 +22326,42 @@ SP2NL=$lt_lt_SP2NL
15251 # turn newlines into spaces. 15182 # turn newlines into spaces.
15252 NL2SP=$lt_lt_NL2SP 15183 NL2SP=$lt_lt_NL2SP
15253 15184
@@ -15291,7 +15222,7 @@ index 29896853a90..9e93585f94e 100755
15291 # A symbol stripping program. 15222 # A symbol stripping program.
15292 STRIP=$lt_STRIP 15223 STRIP=$lt_STRIP
15293 15224
15294@@ -19523,6 +20395,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address 15225@@ -21519,6 +22391,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
15295 # Transform the output of nm in a C name address pair when lib prefix is needed. 15226 # Transform the output of nm in a C name address pair when lib prefix is needed.
15296 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix 15227 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
15297 15228
@@ -15304,7 +15235,7 @@ index 29896853a90..9e93585f94e 100755
15304 # The name of the directory that contains temporary libtool files. 15235 # The name of the directory that contains temporary libtool files.
15305 objdir=$objdir 15236 objdir=$objdir
15306 15237
15307@@ -19532,6 +20410,9 @@ MAGIC_CMD=$MAGIC_CMD 15238@@ -21528,6 +22406,9 @@ MAGIC_CMD=$MAGIC_CMD
15308 # Must we lock files when doing compilation? 15239 # Must we lock files when doing compilation?
15309 need_locks=$lt_need_locks 15240 need_locks=$lt_need_locks
15310 15241
@@ -15314,7 +15245,7 @@ index 29896853a90..9e93585f94e 100755
15314 # Tool to manipulate archived DWARF debug symbol files on Mac OS X. 15245 # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
15315 DSYMUTIL=$lt_DSYMUTIL 15246 DSYMUTIL=$lt_DSYMUTIL
15316 15247
15317@@ -19646,12 +20527,12 @@ with_gcc=$GCC 15248@@ -21642,12 +22523,12 @@ with_gcc=$GCC
15318 # Compiler flag to turn off builtin functions. 15249 # Compiler flag to turn off builtin functions.
15319 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag 15250 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
15320 15251
@@ -15330,7 +15261,7 @@ index 29896853a90..9e93585f94e 100755
15330 # Compiler flag to prevent dynamic linking. 15261 # Compiler flag to prevent dynamic linking.
15331 link_static_flag=$lt_lt_prog_compiler_static 15262 link_static_flag=$lt_lt_prog_compiler_static
15332 15263
15333@@ -19738,9 +20619,6 @@ inherit_rpath=$inherit_rpath 15264@@ -21734,9 +22615,6 @@ inherit_rpath=$inherit_rpath
15334 # Whether libtool must link a program against all its dependency libraries. 15265 # Whether libtool must link a program against all its dependency libraries.
15335 link_all_deplibs=$link_all_deplibs 15266 link_all_deplibs=$link_all_deplibs
15336 15267
@@ -15340,7 +15271,7 @@ index 29896853a90..9e93585f94e 100755
15340 # Set to "yes" if exported symbols are required. 15271 # Set to "yes" if exported symbols are required.
15341 always_export_symbols=$always_export_symbols 15272 always_export_symbols=$always_export_symbols
15342 15273
15343@@ -19756,6 +20634,9 @@ include_expsyms=$lt_include_expsyms 15274@@ -21752,6 +22630,9 @@ include_expsyms=$lt_include_expsyms
15344 # Commands necessary for linking programs (against libraries) with templates. 15275 # Commands necessary for linking programs (against libraries) with templates.
15345 prelink_cmds=$lt_prelink_cmds 15276 prelink_cmds=$lt_prelink_cmds
15346 15277
@@ -15350,7 +15281,7 @@ index 29896853a90..9e93585f94e 100755
15350 # Specify filename containing input files. 15281 # Specify filename containing input files.
15351 file_list_spec=$lt_file_list_spec 15282 file_list_spec=$lt_file_list_spec
15352 15283
15353@@ -19802,210 +20683,169 @@ ltmain="$ac_aux_dir/ltmain.sh" 15284@@ -21798,210 +22679,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
15354 # if finds mixed CR/LF and LF-only lines. Since sed operates in 15285 # if finds mixed CR/LF and LF-only lines. Since sed operates in
15355 # text mode, it properly converts lines to CR/LF. This bash problem 15286 # text mode, it properly converts lines to CR/LF. This bash problem
15356 # is reportedly fixed, but why not run on old versions too? 15287 # is reportedly fixed, but why not run on old versions too?
@@ -15724,7 +15655,7 @@ index 29896853a90..9e93585f94e 100755
15724 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") 15655 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
15725 chmod +x "$ofile" 15656 chmod +x "$ofile"
15726 15657
15727@@ -20033,12 +20873,12 @@ with_gcc=$GCC_CXX 15658@@ -22029,12 +22869,12 @@ with_gcc=$GCC_CXX
15728 # Compiler flag to turn off builtin functions. 15659 # Compiler flag to turn off builtin functions.
15729 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX 15660 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX
15730 15661
@@ -15740,7 +15671,7 @@ index 29896853a90..9e93585f94e 100755
15740 # Compiler flag to prevent dynamic linking. 15671 # Compiler flag to prevent dynamic linking.
15741 link_static_flag=$lt_lt_prog_compiler_static_CXX 15672 link_static_flag=$lt_lt_prog_compiler_static_CXX
15742 15673
15743@@ -20125,9 +20965,6 @@ inherit_rpath=$inherit_rpath_CXX 15674@@ -22121,9 +22961,6 @@ inherit_rpath=$inherit_rpath_CXX
15744 # Whether libtool must link a program against all its dependency libraries. 15675 # Whether libtool must link a program against all its dependency libraries.
15745 link_all_deplibs=$link_all_deplibs_CXX 15676 link_all_deplibs=$link_all_deplibs_CXX
15746 15677
@@ -15750,7 +15681,7 @@ index 29896853a90..9e93585f94e 100755
15750 # Set to "yes" if exported symbols are required. 15681 # Set to "yes" if exported symbols are required.
15751 always_export_symbols=$always_export_symbols_CXX 15682 always_export_symbols=$always_export_symbols_CXX
15752 15683
15753@@ -20143,6 +20980,9 @@ include_expsyms=$lt_include_expsyms_CXX 15684@@ -22139,6 +22976,9 @@ include_expsyms=$lt_include_expsyms_CXX
15754 # Commands necessary for linking programs (against libraries) with templates. 15685 # Commands necessary for linking programs (against libraries) with templates.
15755 prelink_cmds=$lt_prelink_cmds_CXX 15686 prelink_cmds=$lt_prelink_cmds_CXX
15756 15687
@@ -16244,7 +16175,7 @@ index 528e6173930..d88a5ec84f2 100644
16244 # This file is free software; the Free Software Foundation 16175 # This file is free software; the Free Software Foundation
16245 # gives unlimited permission to copy and/or distribute it, 16176 # gives unlimited permission to copy and/or distribute it,
16246diff --git a/libbacktrace/configure b/libbacktrace/configure 16177diff --git a/libbacktrace/configure b/libbacktrace/configure
16247index 406b67b8cbc..51f0a264cb7 100755 16178index e5ca8ad9379..b7c4c4be78d 100755
16248--- a/libbacktrace/configure 16179--- a/libbacktrace/configure
16249+++ b/libbacktrace/configure 16180+++ b/libbacktrace/configure
16250@@ -680,7 +680,10 @@ OTOOL 16181@@ -680,7 +680,10 @@ OTOOL
@@ -16483,7 +16414,7 @@ index 406b67b8cbc..51f0a264cb7 100755
16483 lt_cv_file_magic_cmd='$OBJDUMP -f' 16414 lt_cv_file_magic_cmd='$OBJDUMP -f'
16484 fi 16415 fi
16485 ;; 16416 ;;
16486@@ -6568,6 +6666,21 @@ esac 16417@@ -6573,6 +6671,21 @@ esac
16487 fi 16418 fi
16488 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 16419 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
16489 $as_echo "$lt_cv_deplibs_check_method" >&6; } 16420 $as_echo "$lt_cv_deplibs_check_method" >&6; }
@@ -16505,7 +16436,7 @@ index 406b67b8cbc..51f0a264cb7 100755
16505 file_magic_cmd=$lt_cv_file_magic_cmd 16436 file_magic_cmd=$lt_cv_file_magic_cmd
16506 deplibs_check_method=$lt_cv_deplibs_check_method 16437 deplibs_check_method=$lt_cv_deplibs_check_method
16507 test -z "$deplibs_check_method" && deplibs_check_method=unknown 16438 test -z "$deplibs_check_method" && deplibs_check_method=unknown
16508@@ -6583,6 +6696,157 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown 16439@@ -6588,6 +6701,157 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
16509 16440
16510 16441
16511 16442
@@ -16663,7 +16594,7 @@ index 406b67b8cbc..51f0a264cb7 100755
16663 plugin_option= 16594 plugin_option=
16664 plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll" 16595 plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll"
16665 for plugin in $plugin_names; do 16596 for plugin in $plugin_names; do
16666@@ -6597,8 +6861,10 @@ for plugin in $plugin_names; do 16597@@ -6602,8 +6866,10 @@ for plugin in $plugin_names; do
16667 done 16598 done
16668 16599
16669 if test -n "$ac_tool_prefix"; then 16600 if test -n "$ac_tool_prefix"; then
@@ -16676,7 +16607,7 @@ index 406b67b8cbc..51f0a264cb7 100755
16676 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 16607 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
16677 $as_echo_n "checking for $ac_word... " >&6; } 16608 $as_echo_n "checking for $ac_word... " >&6; }
16678 if ${ac_cv_prog_AR+:} false; then : 16609 if ${ac_cv_prog_AR+:} false; then :
16679@@ -6614,7 +6880,7 @@ do 16610@@ -6619,7 +6885,7 @@ do
16680 test -z "$as_dir" && as_dir=. 16611 test -z "$as_dir" && as_dir=.
16681 for ac_exec_ext in '' $ac_executable_extensions; do 16612 for ac_exec_ext in '' $ac_executable_extensions; do
16682 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 16613 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
@@ -16685,7 +16616,7 @@ index 406b67b8cbc..51f0a264cb7 100755
16685 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 16616 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
16686 break 2 16617 break 2
16687 fi 16618 fi
16688@@ -6634,11 +6900,15 @@ $as_echo "no" >&6; } 16619@@ -6639,11 +6905,15 @@ $as_echo "no" >&6; }
16689 fi 16620 fi
16690 16621
16691 16622
@@ -16704,7 +16635,7 @@ index 406b67b8cbc..51f0a264cb7 100755
16704 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 16635 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
16705 $as_echo_n "checking for $ac_word... " >&6; } 16636 $as_echo_n "checking for $ac_word... " >&6; }
16706 if ${ac_cv_prog_ac_ct_AR+:} false; then : 16637 if ${ac_cv_prog_ac_ct_AR+:} false; then :
16707@@ -6654,7 +6924,7 @@ do 16638@@ -6659,7 +6929,7 @@ do
16708 test -z "$as_dir" && as_dir=. 16639 test -z "$as_dir" && as_dir=.
16709 for ac_exec_ext in '' $ac_executable_extensions; do 16640 for ac_exec_ext in '' $ac_executable_extensions; do
16710 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 16641 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
@@ -16713,7 +16644,7 @@ index 406b67b8cbc..51f0a264cb7 100755
16713 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 16644 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
16714 break 2 16645 break 2
16715 fi 16646 fi
16716@@ -6673,6 +6943,10 @@ else 16647@@ -6678,6 +6948,10 @@ else
16717 $as_echo "no" >&6; } 16648 $as_echo "no" >&6; }
16718 fi 16649 fi
16719 16650
@@ -16724,7 +16655,7 @@ index 406b67b8cbc..51f0a264cb7 100755
16724 if test "x$ac_ct_AR" = x; then 16655 if test "x$ac_ct_AR" = x; then
16725 AR="false" 16656 AR="false"
16726 else 16657 else
16727@@ -6684,31 +6958,83 @@ ac_tool_warned=yes ;; 16658@@ -6689,31 +6963,83 @@ ac_tool_warned=yes ;;
16728 esac 16659 esac
16729 AR=$ac_ct_AR 16660 AR=$ac_ct_AR
16730 fi 16661 fi
@@ -16823,7 +16754,7 @@ index 406b67b8cbc..51f0a264cb7 100755
16823 16754
16824 16755
16825 16756
16826@@ -7053,8 +7379,8 @@ esac 16757@@ -7058,8 +7384,8 @@ esac
16827 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" 16758 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
16828 16759
16829 # Transform an extracted symbol line into symbol name and symbol address 16760 # Transform an extracted symbol line into symbol name and symbol address
@@ -16834,7 +16765,7 @@ index 406b67b8cbc..51f0a264cb7 100755
16834 16765
16835 # Handle CRLF in mingw tool chain 16766 # Handle CRLF in mingw tool chain
16836 opt_cr= 16767 opt_cr=
16837@@ -7090,6 +7416,7 @@ for ac_symprfx in "" "_"; do 16768@@ -7095,6 +7421,7 @@ for ac_symprfx in "" "_"; do
16838 else 16769 else
16839 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" 16770 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
16840 fi 16771 fi
@@ -16842,7 +16773,7 @@ index 406b67b8cbc..51f0a264cb7 100755
16842 16773
16843 # Check to see that the pipe works correctly. 16774 # Check to see that the pipe works correctly.
16844 pipe_works=no 16775 pipe_works=no
16845@@ -7131,6 +7458,18 @@ _LT_EOF 16776@@ -7136,6 +7463,18 @@ _LT_EOF
16846 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then 16777 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
16847 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then 16778 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
16848 cat <<_LT_EOF > conftest.$ac_ext 16779 cat <<_LT_EOF > conftest.$ac_ext
@@ -16861,7 +16792,7 @@ index 406b67b8cbc..51f0a264cb7 100755
16861 #ifdef __cplusplus 16792 #ifdef __cplusplus
16862 extern "C" { 16793 extern "C" {
16863 #endif 16794 #endif
16864@@ -7142,7 +7481,7 @@ _LT_EOF 16795@@ -7147,7 +7486,7 @@ _LT_EOF
16865 cat <<_LT_EOF >> conftest.$ac_ext 16796 cat <<_LT_EOF >> conftest.$ac_ext
16866 16797
16867 /* The mapping between symbol names and symbols. */ 16798 /* The mapping between symbol names and symbols. */
@@ -16870,7 +16801,7 @@ index 406b67b8cbc..51f0a264cb7 100755
16870 const char *name; 16801 const char *name;
16871 void *address; 16802 void *address;
16872 } 16803 }
16873@@ -7168,8 +7507,8 @@ static const void *lt_preloaded_setup() { 16804@@ -7173,8 +7512,8 @@ static const void *lt_preloaded_setup() {
16874 _LT_EOF 16805 _LT_EOF
16875 # Now try linking the two files. 16806 # Now try linking the two files.
16876 mv conftest.$ac_objext conftstm.$ac_objext 16807 mv conftest.$ac_objext conftstm.$ac_objext
@@ -16881,7 +16812,7 @@ index 406b67b8cbc..51f0a264cb7 100755
16881 LIBS="conftstm.$ac_objext" 16812 LIBS="conftstm.$ac_objext"
16882 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" 16813 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
16883 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 16814 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
16884@@ -7179,8 +7518,8 @@ _LT_EOF 16815@@ -7184,8 +7523,8 @@ _LT_EOF
16885 test $ac_status = 0; } && test -s conftest${ac_exeext}; then 16816 test $ac_status = 0; } && test -s conftest${ac_exeext}; then
16886 pipe_works=yes 16817 pipe_works=yes
16887 fi 16818 fi
@@ -16892,7 +16823,7 @@ index 406b67b8cbc..51f0a264cb7 100755
16892 else 16823 else
16893 echo "cannot find nm_test_func in $nlist" >&5 16824 echo "cannot find nm_test_func in $nlist" >&5
16894 fi 16825 fi
16895@@ -7217,6 +7556,18 @@ else 16826@@ -7222,6 +7561,18 @@ else
16896 $as_echo "ok" >&6; } 16827 $as_echo "ok" >&6; }
16897 fi 16828 fi
16898 16829
@@ -16911,7 +16842,7 @@ index 406b67b8cbc..51f0a264cb7 100755
16911 16842
16912 16843
16913 16844
16914@@ -7233,6 +7584,43 @@ fi 16845@@ -7238,6 +7589,43 @@ fi
16915 16846
16916 16847
16917 16848
@@ -16955,7 +16886,7 @@ index 406b67b8cbc..51f0a264cb7 100755
16955 16886
16956 16887
16957 16888
16958@@ -7399,50 +7787,167 @@ _ACEOF 16889@@ -7404,50 +7792,167 @@ _ACEOF
16959 if ac_fn_c_try_link "$LINENO"; then : 16890 if ac_fn_c_try_link "$LINENO"; then :
16960 lt_cv_cc_needs_belf=yes 16891 lt_cv_cc_needs_belf=yes
16961 else 16892 else
@@ -17162,7 +17093,7 @@ index 406b67b8cbc..51f0a264cb7 100755
17162 17093
17163 17094
17164 case $host_os in 17095 case $host_os in
17165@@ -8007,6 +8512,8 @@ _LT_EOF 17096@@ -8012,6 +8517,8 @@ _LT_EOF
17166 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 17097 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
17167 echo "$AR cru libconftest.a conftest.o" >&5 17098 echo "$AR cru libconftest.a conftest.o" >&5
17168 $AR cru libconftest.a conftest.o 2>&5 17099 $AR cru libconftest.a conftest.o 2>&5
@@ -17171,7 +17102,7 @@ index 406b67b8cbc..51f0a264cb7 100755
17171 cat > conftest.c << _LT_EOF 17102 cat > conftest.c << _LT_EOF
17172 int main() { return 0;} 17103 int main() { return 0;}
17173 _LT_EOF 17104 _LT_EOF
17174@@ -8589,8 +9096,6 @@ fi 17105@@ -8596,8 +9103,6 @@ fi
17175 lt_prog_compiler_pic= 17106 lt_prog_compiler_pic=
17176 lt_prog_compiler_static= 17107 lt_prog_compiler_static=
17177 17108
@@ -17180,7 +17111,7 @@ index 406b67b8cbc..51f0a264cb7 100755
17180 17111
17181 if test "$GCC" = yes; then 17112 if test "$GCC" = yes; then
17182 lt_prog_compiler_wl='-Wl,' 17113 lt_prog_compiler_wl='-Wl,'
17183@@ -8756,6 +9261,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 17114@@ -8763,6 +9268,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
17184 lt_prog_compiler_pic='--shared' 17115 lt_prog_compiler_pic='--shared'
17185 lt_prog_compiler_static='--static' 17116 lt_prog_compiler_static='--static'
17186 ;; 17117 ;;
@@ -17193,7 +17124,7 @@ index 406b67b8cbc..51f0a264cb7 100755
17193 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) 17124 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
17194 # Portland Group compilers (*not* the Pentium gcc compiler, 17125 # Portland Group compilers (*not* the Pentium gcc compiler,
17195 # which looks to be a dead project) 17126 # which looks to be a dead project)
17196@@ -8818,7 +9329,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 17127@@ -8825,7 +9336,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
17197 lt_prog_compiler_pic='-KPIC' 17128 lt_prog_compiler_pic='-KPIC'
17198 lt_prog_compiler_static='-Bstatic' 17129 lt_prog_compiler_static='-Bstatic'
17199 case $cc_basename in 17130 case $cc_basename in
@@ -17202,7 +17133,7 @@ index 406b67b8cbc..51f0a264cb7 100755
17202 lt_prog_compiler_wl='-Qoption ld ';; 17133 lt_prog_compiler_wl='-Qoption ld ';;
17203 *) 17134 *)
17204 lt_prog_compiler_wl='-Wl,';; 17135 lt_prog_compiler_wl='-Wl,';;
17205@@ -8875,13 +9386,17 @@ case $host_os in 17136@@ -8882,13 +9393,17 @@ case $host_os in
17206 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" 17137 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
17207 ;; 17138 ;;
17208 esac 17139 esac
@@ -17226,7 +17157,7 @@ index 406b67b8cbc..51f0a264cb7 100755
17226 17157
17227 # 17158 #
17228 # Check to make sure the PIC flag actually works. 17159 # Check to make sure the PIC flag actually works.
17229@@ -8942,6 +9457,11 @@ fi 17160@@ -8949,6 +9464,11 @@ fi
17230 17161
17231 17162
17232 17163
@@ -17238,7 +17169,7 @@ index 406b67b8cbc..51f0a264cb7 100755
17238 # 17169 #
17239 # Check to make sure the static flag actually works. 17170 # Check to make sure the static flag actually works.
17240 # 17171 #
17241@@ -9292,7 +9812,8 @@ _LT_EOF 17172@@ -9299,7 +9819,8 @@ _LT_EOF
17242 allow_undefined_flag=unsupported 17173 allow_undefined_flag=unsupported
17243 always_export_symbols=no 17174 always_export_symbols=no
17244 enable_shared_with_static_runtimes=yes 17175 enable_shared_with_static_runtimes=yes
@@ -17248,7 +17179,7 @@ index 406b67b8cbc..51f0a264cb7 100755
17248 17179
17249 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then 17180 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
17250 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' 17181 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
17251@@ -9391,12 +9912,12 @@ _LT_EOF 17182@@ -9398,12 +9919,12 @@ _LT_EOF
17252 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' 17183 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
17253 hardcode_libdir_flag_spec= 17184 hardcode_libdir_flag_spec=
17254 hardcode_libdir_flag_spec_ld='-rpath $libdir' 17185 hardcode_libdir_flag_spec_ld='-rpath $libdir'
@@ -17263,7 +17194,7 @@ index 406b67b8cbc..51f0a264cb7 100755
17263 fi 17194 fi
17264 ;; 17195 ;;
17265 esac 17196 esac
17266@@ -9410,8 +9931,8 @@ _LT_EOF 17197@@ -9417,8 +9938,8 @@ _LT_EOF
17267 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' 17198 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
17268 wlarc= 17199 wlarc=
17269 else 17200 else
@@ -17274,7 +17205,7 @@ index 406b67b8cbc..51f0a264cb7 100755
17274 fi 17205 fi
17275 ;; 17206 ;;
17276 17207
17277@@ -9429,8 +9950,8 @@ _LT_EOF 17208@@ -9436,8 +9957,8 @@ _LT_EOF
17278 17209
17279 _LT_EOF 17210 _LT_EOF
17280 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 17211 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -17285,7 +17216,7 @@ index 406b67b8cbc..51f0a264cb7 100755
17285 else 17216 else
17286 ld_shlibs=no 17217 ld_shlibs=no
17287 fi 17218 fi
17288@@ -9476,8 +9997,8 @@ _LT_EOF 17219@@ -9483,8 +10004,8 @@ _LT_EOF
17289 17220
17290 *) 17221 *)
17291 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 17222 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -17296,7 +17227,7 @@ index 406b67b8cbc..51f0a264cb7 100755
17296 else 17227 else
17297 ld_shlibs=no 17228 ld_shlibs=no
17298 fi 17229 fi
17299@@ -9607,7 +10128,13 @@ _LT_EOF 17230@@ -9614,7 +10135,13 @@ _LT_EOF
17300 allow_undefined_flag='-berok' 17231 allow_undefined_flag='-berok'
17301 # Determine the default libpath from the value encoded in an 17232 # Determine the default libpath from the value encoded in an
17302 # empty executable. 17233 # empty executable.
@@ -17311,7 +17242,7 @@ index 406b67b8cbc..51f0a264cb7 100755
17311 /* end confdefs.h. */ 17242 /* end confdefs.h. */
17312 17243
17313 int 17244 int
17314@@ -9620,22 +10147,29 @@ main () 17245@@ -9627,22 +10154,29 @@ main ()
17315 _ACEOF 17246 _ACEOF
17316 if ac_fn_c_try_link "$LINENO"; then : 17247 if ac_fn_c_try_link "$LINENO"; then :
17317 17248
@@ -17354,7 +17285,7 @@ index 406b67b8cbc..51f0a264cb7 100755
17354 17285
17355 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 17286 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
17356 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" 17287 archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
17357@@ -9647,7 +10181,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 17288@@ -9654,7 +10188,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
17358 else 17289 else
17359 # Determine the default libpath from the value encoded in an 17290 # Determine the default libpath from the value encoded in an
17360 # empty executable. 17291 # empty executable.
@@ -17369,7 +17300,7 @@ index 406b67b8cbc..51f0a264cb7 100755
17369 /* end confdefs.h. */ 17300 /* end confdefs.h. */
17370 17301
17371 int 17302 int
17372@@ -9660,22 +10200,29 @@ main () 17303@@ -9667,22 +10207,29 @@ main ()
17373 _ACEOF 17304 _ACEOF
17374 if ac_fn_c_try_link "$LINENO"; then : 17305 if ac_fn_c_try_link "$LINENO"; then :
17375 17306
@@ -17412,7 +17343,7 @@ index 406b67b8cbc..51f0a264cb7 100755
17412 17343
17413 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 17344 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
17414 # Warning - without using the other run time loading flags, 17345 # Warning - without using the other run time loading flags,
17415@@ -9720,20 +10267,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 17346@@ -9727,20 +10274,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
17416 # Microsoft Visual C++. 17347 # Microsoft Visual C++.
17417 # hardcode_libdir_flag_spec is actually meaningless, as there is 17348 # hardcode_libdir_flag_spec is actually meaningless, as there is
17418 # no search path for DLLs. 17349 # no search path for DLLs.
@@ -17490,7 +17421,7 @@ index 406b67b8cbc..51f0a264cb7 100755
17490 ;; 17421 ;;
17491 17422
17492 darwin* | rhapsody*) 17423 darwin* | rhapsody*)
17493@@ -9794,7 +10384,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 17424@@ -9801,7 +10391,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
17494 17425
17495 # FreeBSD 3 and greater uses gcc -shared to do shared libraries. 17426 # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
17496 freebsd* | dragonfly*) 17427 freebsd* | dragonfly*)
@@ -17499,7 +17430,7 @@ index 406b67b8cbc..51f0a264cb7 100755
17499 hardcode_libdir_flag_spec='-R$libdir' 17430 hardcode_libdir_flag_spec='-R$libdir'
17500 hardcode_direct=yes 17431 hardcode_direct=yes
17501 hardcode_shlibpath_var=no 17432 hardcode_shlibpath_var=no
17502@@ -9802,7 +10392,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 17433@@ -9809,7 +10399,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
17503 17434
17504 hpux9*) 17435 hpux9*)
17505 if test "$GCC" = yes; then 17436 if test "$GCC" = yes; then
@@ -17508,7 +17439,7 @@ index 406b67b8cbc..51f0a264cb7 100755
17508 else 17439 else
17509 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' 17440 archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
17510 fi 17441 fi
17511@@ -9818,7 +10408,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 17442@@ -9825,7 +10415,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
17512 17443
17513 hpux10*) 17444 hpux10*)
17514 if test "$GCC" = yes && test "$with_gnu_ld" = no; then 17445 if test "$GCC" = yes && test "$with_gnu_ld" = no; then
@@ -17517,8 +17448,8 @@ index 406b67b8cbc..51f0a264cb7 100755
17517 else 17448 else
17518 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' 17449 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
17519 fi 17450 fi
17520@@ -9842,10 +10432,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 17451@@ -9849,10 +10439,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
17521 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' 17452 archive_cmds='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
17522 ;; 17453 ;;
17523 ia64*) 17454 ia64*)
17524- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' 17455- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
@@ -17530,7 +17461,7 @@ index 406b67b8cbc..51f0a264cb7 100755
17530 ;; 17461 ;;
17531 esac 17462 esac
17532 else 17463 else
17533@@ -9924,23 +10514,36 @@ fi 17464@@ -9931,23 +10521,36 @@ fi
17534 17465
17535 irix5* | irix6* | nonstopux*) 17466 irix5* | irix6* | nonstopux*)
17536 if test "$GCC" = yes; then 17467 if test "$GCC" = yes; then
@@ -17575,7 +17506,7 @@ index 406b67b8cbc..51f0a264cb7 100755
17575 else 17506 else
17576 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' 17507 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
17577 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' 17508 archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
17578@@ -10025,7 +10628,7 @@ rm -f core conftest.err conftest.$ac_objext \ 17509@@ -10032,7 +10635,7 @@ rm -f core conftest.err conftest.$ac_objext \
17579 osf4* | osf5*) # as osf3* with the addition of -msym flag 17510 osf4* | osf5*) # as osf3* with the addition of -msym flag
17580 if test "$GCC" = yes; then 17511 if test "$GCC" = yes; then
17581 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' 17512 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
@@ -17584,7 +17515,7 @@ index 406b67b8cbc..51f0a264cb7 100755
17584 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' 17515 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
17585 else 17516 else
17586 allow_undefined_flag=' -expect_unresolved \*' 17517 allow_undefined_flag=' -expect_unresolved \*'
17587@@ -10044,9 +10647,9 @@ rm -f core conftest.err conftest.$ac_objext \ 17518@@ -10051,9 +10654,9 @@ rm -f core conftest.err conftest.$ac_objext \
17588 no_undefined_flag=' -z defs' 17519 no_undefined_flag=' -z defs'
17589 if test "$GCC" = yes; then 17520 if test "$GCC" = yes; then
17590 wlarc='${wl}' 17521 wlarc='${wl}'
@@ -17596,7 +17527,7 @@ index 406b67b8cbc..51f0a264cb7 100755
17596 else 17527 else
17597 case `$CC -V 2>&1` in 17528 case `$CC -V 2>&1` in
17598 *"Compilers 5.0"*) 17529 *"Compilers 5.0"*)
17599@@ -10622,8 +11225,9 @@ cygwin* | mingw* | pw32* | cegcc*) 17530@@ -10629,8 +11232,9 @@ cygwin* | mingw* | pw32* | cegcc*)
17600 need_version=no 17531 need_version=no
17601 need_lib_prefix=no 17532 need_lib_prefix=no
17602 17533
@@ -17608,7 +17539,7 @@ index 406b67b8cbc..51f0a264cb7 100755
17608 library_names_spec='$libname.dll.a' 17539 library_names_spec='$libname.dll.a'
17609 # DLL is installed to $(libdir)/../bin by postinstall_cmds 17540 # DLL is installed to $(libdir)/../bin by postinstall_cmds
17610 postinstall_cmds='base_file=`basename \${file}`~ 17541 postinstall_cmds='base_file=`basename \${file}`~
17611@@ -10656,13 +11260,71 @@ cygwin* | mingw* | pw32* | cegcc*) 17542@@ -10663,13 +11267,71 @@ cygwin* | mingw* | pw32* | cegcc*)
17612 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' 17543 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
17613 ;; 17544 ;;
17614 esac 17545 esac
@@ -17681,16 +17612,16 @@ index 406b67b8cbc..51f0a264cb7 100755
17681 # FIXME: first we should search . and the directory the executable is in 17612 # FIXME: first we should search . and the directory the executable is in
17682 shlibpath_var=PATH 17613 shlibpath_var=PATH
17683 ;; 17614 ;;
17684@@ -11540,7 +12202,7 @@ else 17615@@ -11571,7 +12233,7 @@ else
17685 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 17616 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
17686 lt_status=$lt_dlunknown 17617 lt_status=$lt_dlunknown
17687 cat > conftest.$ac_ext <<_LT_EOF 17618 cat > conftest.$ac_ext <<_LT_EOF
17688-#line 11543 "configure" 17619-#line 11574 "configure"
17689+#line $LINENO "configure" 17620+#line $LINENO "configure"
17690 #include "confdefs.h" 17621 #include "confdefs.h"
17691 17622
17692 #if HAVE_DLFCN_H 17623 #if HAVE_DLFCN_H
17693@@ -11584,10 +12246,10 @@ else 17624@@ -11615,10 +12277,10 @@ else
17694 /* When -fvisbility=hidden is used, assume the code has been annotated 17625 /* When -fvisbility=hidden is used, assume the code has been annotated
17695 correspondingly for the symbols needed. */ 17626 correspondingly for the symbols needed. */
17696 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 17627 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
@@ -17703,16 +17634,16 @@ index 406b67b8cbc..51f0a264cb7 100755
17703 int main () 17634 int main ()
17704 { 17635 {
17705 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 17636 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
17706@@ -11646,7 +12308,7 @@ else 17637@@ -11677,7 +12339,7 @@ else
17707 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 17638 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
17708 lt_status=$lt_dlunknown 17639 lt_status=$lt_dlunknown
17709 cat > conftest.$ac_ext <<_LT_EOF 17640 cat > conftest.$ac_ext <<_LT_EOF
17710-#line 11649 "configure" 17641-#line 11680 "configure"
17711+#line $LINENO "configure" 17642+#line $LINENO "configure"
17712 #include "confdefs.h" 17643 #include "confdefs.h"
17713 17644
17714 #if HAVE_DLFCN_H 17645 #if HAVE_DLFCN_H
17715@@ -11690,10 +12352,10 @@ else 17646@@ -11721,10 +12383,10 @@ else
17716 /* When -fvisbility=hidden is used, assume the code has been annotated 17647 /* When -fvisbility=hidden is used, assume the code has been annotated
17717 correspondingly for the symbols needed. */ 17648 correspondingly for the symbols needed. */
17718 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 17649 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
@@ -17725,7 +17656,7 @@ index 406b67b8cbc..51f0a264cb7 100755
17725 int main () 17656 int main ()
17726 { 17657 {
17727 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 17658 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
17728@@ -14979,13 +15641,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' 17659@@ -15010,13 +15672,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
17729 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' 17660 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
17730 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' 17661 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
17731 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' 17662 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
@@ -17746,7 +17677,7 @@ index 406b67b8cbc..51f0a264cb7 100755
17746 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' 17677 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
17747 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' 17678 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
17748 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' 17679 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
17749@@ -15000,14 +15669,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de 17680@@ -15031,14 +15700,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de
17750 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' 17681 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
17751 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' 17682 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
17752 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"`' 17683 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`'
@@ -17765,7 +17696,7 @@ index 406b67b8cbc..51f0a264cb7 100755
17765 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' 17696 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
17766 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' 17697 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
17767 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' 17698 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
17768@@ -15040,12 +15712,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q 17699@@ -15071,12 +15743,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q
17769 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' 17700 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
17770 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' 17701 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
17771 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' 17702 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
@@ -17779,7 +17710,7 @@ index 406b67b8cbc..51f0a264cb7 100755
17779 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' 17710 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
17780 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' 17711 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
17781 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' 17712 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
17782@@ -15100,8 +15772,13 @@ reload_flag \ 17713@@ -15131,8 +15803,13 @@ reload_flag \
17783 OBJDUMP \ 17714 OBJDUMP \
17784 deplibs_check_method \ 17715 deplibs_check_method \
17785 file_magic_cmd \ 17716 file_magic_cmd \
@@ -17793,7 +17724,7 @@ index 406b67b8cbc..51f0a264cb7 100755
17793 STRIP \ 17724 STRIP \
17794 RANLIB \ 17725 RANLIB \
17795 CC \ 17726 CC \
17796@@ -15111,12 +15788,14 @@ lt_cv_sys_global_symbol_pipe \ 17727@@ -15142,12 +15819,14 @@ lt_cv_sys_global_symbol_pipe \
17797 lt_cv_sys_global_symbol_to_cdecl \ 17728 lt_cv_sys_global_symbol_to_cdecl \
17798 lt_cv_sys_global_symbol_to_c_name_address \ 17729 lt_cv_sys_global_symbol_to_c_name_address \
17799 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ 17730 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
@@ -17809,7 +17740,7 @@ index 406b67b8cbc..51f0a264cb7 100755
17809 DSYMUTIL \ 17740 DSYMUTIL \
17810 NMEDIT \ 17741 NMEDIT \
17811 LIPO \ 17742 LIPO \
17812@@ -15132,7 +15811,6 @@ no_undefined_flag \ 17743@@ -15163,7 +15842,6 @@ no_undefined_flag \
17813 hardcode_libdir_flag_spec \ 17744 hardcode_libdir_flag_spec \
17814 hardcode_libdir_flag_spec_ld \ 17745 hardcode_libdir_flag_spec_ld \
17815 hardcode_libdir_separator \ 17746 hardcode_libdir_separator \
@@ -17817,7 +17748,7 @@ index 406b67b8cbc..51f0a264cb7 100755
17817 exclude_expsyms \ 17748 exclude_expsyms \
17818 include_expsyms \ 17749 include_expsyms \
17819 file_list_spec \ 17750 file_list_spec \
17820@@ -15168,6 +15846,7 @@ module_cmds \ 17751@@ -15199,6 +15877,7 @@ module_cmds \
17821 module_expsym_cmds \ 17752 module_expsym_cmds \
17822 export_symbols_cmds \ 17753 export_symbols_cmds \
17823 prelink_cmds \ 17754 prelink_cmds \
@@ -17825,7 +17756,7 @@ index 406b67b8cbc..51f0a264cb7 100755
17825 postinstall_cmds \ 17756 postinstall_cmds \
17826 postuninstall_cmds \ 17757 postuninstall_cmds \
17827 finish_cmds \ 17758 finish_cmds \
17828@@ -15866,7 +16545,8 @@ esac ;; 17759@@ -15897,7 +16576,8 @@ esac ;;
17829 # NOTE: Changes made to this file will be lost: look at ltmain.sh. 17760 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
17830 # 17761 #
17831 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 17762 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
@@ -17835,7 +17766,7 @@ index 406b67b8cbc..51f0a264cb7 100755
17835 # Written by Gordon Matzigkeit, 1996 17766 # Written by Gordon Matzigkeit, 1996
17836 # 17767 #
17837 # This file is part of GNU Libtool. 17768 # This file is part of GNU Libtool.
17838@@ -15969,19 +16649,42 @@ SP2NL=$lt_lt_SP2NL 17769@@ -16000,19 +16680,42 @@ SP2NL=$lt_lt_SP2NL
17839 # turn newlines into spaces. 17770 # turn newlines into spaces.
17840 NL2SP=$lt_lt_NL2SP 17771 NL2SP=$lt_lt_NL2SP
17841 17772
@@ -17879,7 +17810,7 @@ index 406b67b8cbc..51f0a264cb7 100755
17879 # A symbol stripping program. 17810 # A symbol stripping program.
17880 STRIP=$lt_STRIP 17811 STRIP=$lt_STRIP
17881 17812
17882@@ -16011,6 +16714,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address 17813@@ -16042,6 +16745,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
17883 # Transform the output of nm in a C name address pair when lib prefix is needed. 17814 # Transform the output of nm in a C name address pair when lib prefix is needed.
17884 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix 17815 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
17885 17816
@@ -17892,7 +17823,7 @@ index 406b67b8cbc..51f0a264cb7 100755
17892 # The name of the directory that contains temporary libtool files. 17823 # The name of the directory that contains temporary libtool files.
17893 objdir=$objdir 17824 objdir=$objdir
17894 17825
17895@@ -16020,6 +16729,9 @@ MAGIC_CMD=$MAGIC_CMD 17826@@ -16051,6 +16760,9 @@ MAGIC_CMD=$MAGIC_CMD
17896 # Must we lock files when doing compilation? 17827 # Must we lock files when doing compilation?
17897 need_locks=$lt_need_locks 17828 need_locks=$lt_need_locks
17898 17829
@@ -17902,7 +17833,7 @@ index 406b67b8cbc..51f0a264cb7 100755
17902 # Tool to manipulate archived DWARF debug symbol files on Mac OS X. 17833 # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
17903 DSYMUTIL=$lt_DSYMUTIL 17834 DSYMUTIL=$lt_DSYMUTIL
17904 17835
17905@@ -16134,12 +16846,12 @@ with_gcc=$GCC 17836@@ -16165,12 +16877,12 @@ with_gcc=$GCC
17906 # Compiler flag to turn off builtin functions. 17837 # Compiler flag to turn off builtin functions.
17907 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag 17838 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
17908 17839
@@ -17918,7 +17849,7 @@ index 406b67b8cbc..51f0a264cb7 100755
17918 # Compiler flag to prevent dynamic linking. 17849 # Compiler flag to prevent dynamic linking.
17919 link_static_flag=$lt_lt_prog_compiler_static 17850 link_static_flag=$lt_lt_prog_compiler_static
17920 17851
17921@@ -16226,9 +16938,6 @@ inherit_rpath=$inherit_rpath 17852@@ -16257,9 +16969,6 @@ inherit_rpath=$inherit_rpath
17922 # Whether libtool must link a program against all its dependency libraries. 17853 # Whether libtool must link a program against all its dependency libraries.
17923 link_all_deplibs=$link_all_deplibs 17854 link_all_deplibs=$link_all_deplibs
17924 17855
@@ -17928,7 +17859,7 @@ index 406b67b8cbc..51f0a264cb7 100755
17928 # Set to "yes" if exported symbols are required. 17859 # Set to "yes" if exported symbols are required.
17929 always_export_symbols=$always_export_symbols 17860 always_export_symbols=$always_export_symbols
17930 17861
17931@@ -16244,6 +16953,9 @@ include_expsyms=$lt_include_expsyms 17862@@ -16275,6 +16984,9 @@ include_expsyms=$lt_include_expsyms
17932 # Commands necessary for linking programs (against libraries) with templates. 17863 # Commands necessary for linking programs (against libraries) with templates.
17933 prelink_cmds=$lt_prelink_cmds 17864 prelink_cmds=$lt_prelink_cmds
17934 17865
@@ -17938,7 +17869,7 @@ index 406b67b8cbc..51f0a264cb7 100755
17938 # Specify filename containing input files. 17869 # Specify filename containing input files.
17939 file_list_spec=$lt_file_list_spec 17870 file_list_spec=$lt_file_list_spec
17940 17871
17941@@ -16276,210 +16988,169 @@ ltmain="$ac_aux_dir/ltmain.sh" 17872@@ -16307,210 +17019,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
17942 # if finds mixed CR/LF and LF-only lines. Since sed operates in 17873 # if finds mixed CR/LF and LF-only lines. Since sed operates in
17943 # text mode, it properly converts lines to CR/LF. This bash problem 17874 # text mode, it properly converts lines to CR/LF. This bash problem
17944 # is reportedly fixed, but why not run on old versions too? 17875 # is reportedly fixed, but why not run on old versions too?
@@ -18313,10 +18244,10 @@ index 406b67b8cbc..51f0a264cb7 100755
18313 chmod +x "$ofile" 18244 chmod +x "$ofile"
18314 18245
18315diff --git a/libctf/Makefile.in b/libctf/Makefile.in 18246diff --git a/libctf/Makefile.in b/libctf/Makefile.in
18316index 3d2696bcc47..3bad01c3c9b 100644 18247index 1cdf105a323..b69d6472e86 100644
18317--- a/libctf/Makefile.in 18248--- a/libctf/Makefile.in
18318+++ b/libctf/Makefile.in 18249+++ b/libctf/Makefile.in
18319@@ -392,6 +392,7 @@ CYGPATH_W = @CYGPATH_W@ 18250@@ -442,6 +442,7 @@ CYGPATH_W = @CYGPATH_W@
18320 DATADIRNAME = @DATADIRNAME@ 18251 DATADIRNAME = @DATADIRNAME@
18321 DEFS = @DEFS@ 18252 DEFS = @DEFS@
18322 DEPDIR = @DEPDIR@ 18253 DEPDIR = @DEPDIR@
@@ -18324,19 +18255,19 @@ index 3d2696bcc47..3bad01c3c9b 100644
18324 DSYMUTIL = @DSYMUTIL@ 18255 DSYMUTIL = @DSYMUTIL@
18325 DUMPBIN = @DUMPBIN@ 18256 DUMPBIN = @DUMPBIN@
18326 ECHO_C = @ECHO_C@ 18257 ECHO_C = @ECHO_C@
18327@@ -426,6 +427,7 @@ LN_S = @LN_S@ 18258@@ -481,6 +482,7 @@ LTLIBINTL = @LTLIBINTL@
18328 LTLIBOBJS = @LTLIBOBJS@ 18259 LTLIBOBJS = @LTLIBOBJS@
18329 MAINT = @MAINT@ 18260 MAINT = @MAINT@
18330 MAKEINFO = @MAKEINFO@ 18261 MAKEINFO = @MAKEINFO@
18331+MANIFEST_TOOL = @MANIFEST_TOOL@ 18262+MANIFEST_TOOL = @MANIFEST_TOOL@
18332 MKDIR_P = @MKDIR_P@ 18263 MKDIR_P = @MKDIR_P@
18333 NM = @NM@ 18264 MKINSTALLDIRS = @MKINSTALLDIRS@
18334 NMEDIT = @NMEDIT@ 18265 MSGFMT = @MSGFMT@
18335diff --git a/libctf/configure b/libctf/configure 18266diff --git a/libctf/configure b/libctf/configure
18336index a0e40f49a80..42bc002c2b9 100755 18267index 3701bd8e796..9e36ae7c51c 100755
18337--- a/libctf/configure 18268--- a/libctf/configure
18338+++ b/libctf/configure 18269+++ b/libctf/configure
18339@@ -668,6 +668,8 @@ OTOOL 18270@@ -669,6 +669,8 @@ OTOOL
18340 LIPO 18271 LIPO
18341 NMEDIT 18272 NMEDIT
18342 DSYMUTIL 18273 DSYMUTIL
@@ -18345,15 +18276,15 @@ index a0e40f49a80..42bc002c2b9 100755
18345 OBJDUMP 18276 OBJDUMP
18346 LN_S 18277 LN_S
18347 NM 18278 NM
18348@@ -799,6 +801,7 @@ enable_static 18279@@ -814,6 +816,7 @@ enable_shared
18280 enable_static
18349 with_pic 18281 with_pic
18350 enable_fast_install 18282 enable_fast_install
18351 with_gnu_ld
18352+with_libtool_sysroot 18283+with_libtool_sysroot
18353 enable_libtool_lock 18284 enable_libtool_lock
18354 enable_largefile 18285 enable_largefile
18355 enable_werror_always 18286 enable_werror_always
18356@@ -1462,6 +1465,8 @@ Optional Packages: 18287@@ -1486,6 +1489,8 @@ Optional Packages:
18357 --with-pic try to use only PIC/non-PIC objects [default=use 18288 --with-pic try to use only PIC/non-PIC objects [default=use
18358 both] 18289 both]
18359 --with-gnu-ld assume the C compiler uses GNU ld [default=no] 18290 --with-gnu-ld assume the C compiler uses GNU ld [default=no]
@@ -18362,7 +18293,7 @@ index a0e40f49a80..42bc002c2b9 100755
18362 --with-system-zlib use installed libz 18293 --with-system-zlib use installed libz
18363 18294
18364 Some influential environment variables: 18295 Some influential environment variables:
18365@@ -5567,8 +5572,8 @@ esac 18296@@ -7501,8 +7506,8 @@ esac
18366 18297
18367 18298
18368 18299
@@ -18373,7 +18304,7 @@ index a0e40f49a80..42bc002c2b9 100755
18373 18304
18374 18305
18375 18306
18376@@ -5608,7 +5613,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO 18307@@ -7542,7 +7547,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
18377 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 18308 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
18378 $as_echo_n "checking how to print strings... " >&6; } 18309 $as_echo_n "checking how to print strings... " >&6; }
18379 # Test print first, because it will be a builtin if present. 18310 # Test print first, because it will be a builtin if present.
@@ -18382,7 +18313,7 @@ index a0e40f49a80..42bc002c2b9 100755
18382 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then 18313 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
18383 ECHO='print -r --' 18314 ECHO='print -r --'
18384 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then 18315 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
18385@@ -6301,8 +6306,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; 18316@@ -8235,8 +8240,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6;
18386 # Try some XSI features 18317 # Try some XSI features
18387 xsi_shell=no 18318 xsi_shell=no
18388 ( _lt_dummy="a/b/c" 18319 ( _lt_dummy="a/b/c"
@@ -18393,7 +18324,7 @@ index a0e40f49a80..42bc002c2b9 100755
18393 && eval 'test $(( 1 + 1 )) -eq 2 \ 18324 && eval 'test $(( 1 + 1 )) -eq 2 \
18394 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ 18325 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
18395 && xsi_shell=yes 18326 && xsi_shell=yes
18396@@ -6351,6 +6356,80 @@ esac 18327@@ -8285,6 +8290,80 @@ esac
18397 18328
18398 18329
18399 18330
@@ -18474,7 +18405,7 @@ index a0e40f49a80..42bc002c2b9 100755
18474 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 18405 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
18475 $as_echo_n "checking for $LD option to reload object files... " >&6; } 18406 $as_echo_n "checking for $LD option to reload object files... " >&6; }
18476 if ${lt_cv_ld_reload_flag+:} false; then : 18407 if ${lt_cv_ld_reload_flag+:} false; then :
18477@@ -6367,6 +6446,11 @@ case $reload_flag in 18408@@ -8301,6 +8380,11 @@ case $reload_flag in
18478 esac 18409 esac
18479 reload_cmds='$LD$reload_flag -o $output$reload_objs' 18410 reload_cmds='$LD$reload_flag -o $output$reload_objs'
18480 case $host_os in 18411 case $host_os in
@@ -18486,7 +18417,7 @@ index a0e40f49a80..42bc002c2b9 100755
18486 darwin*) 18417 darwin*)
18487 if test "$GCC" = yes; then 18418 if test "$GCC" = yes; then
18488 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' 18419 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
18489@@ -6535,7 +6619,8 @@ mingw* | pw32*) 18420@@ -8469,7 +8553,8 @@ mingw* | pw32*)
18490 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' 18421 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
18491 lt_cv_file_magic_cmd='func_win32_libid' 18422 lt_cv_file_magic_cmd='func_win32_libid'
18492 else 18423 else
@@ -18496,7 +18427,7 @@ index a0e40f49a80..42bc002c2b9 100755
18496 lt_cv_file_magic_cmd='$OBJDUMP -f' 18427 lt_cv_file_magic_cmd='$OBJDUMP -f'
18497 fi 18428 fi
18498 ;; 18429 ;;
18499@@ -6689,6 +6774,21 @@ esac 18430@@ -8628,6 +8713,21 @@ esac
18500 fi 18431 fi
18501 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 18432 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
18502 $as_echo "$lt_cv_deplibs_check_method" >&6; } 18433 $as_echo "$lt_cv_deplibs_check_method" >&6; }
@@ -18518,7 +18449,7 @@ index a0e40f49a80..42bc002c2b9 100755
18518 file_magic_cmd=$lt_cv_file_magic_cmd 18449 file_magic_cmd=$lt_cv_file_magic_cmd
18519 deplibs_check_method=$lt_cv_deplibs_check_method 18450 deplibs_check_method=$lt_cv_deplibs_check_method
18520 test -z "$deplibs_check_method" && deplibs_check_method=unknown 18451 test -z "$deplibs_check_method" && deplibs_check_method=unknown
18521@@ -6704,6 +6804,157 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown 18452@@ -8643,6 +8743,157 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
18522 18453
18523 18454
18524 18455
@@ -18676,7 +18607,7 @@ index a0e40f49a80..42bc002c2b9 100755
18676 plugin_option= 18607 plugin_option=
18677 plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll" 18608 plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll"
18678 for plugin in $plugin_names; do 18609 for plugin in $plugin_names; do
18679@@ -6718,8 +6969,10 @@ for plugin in $plugin_names; do 18610@@ -8657,8 +8908,10 @@ for plugin in $plugin_names; do
18680 done 18611 done
18681 18612
18682 if test -n "$ac_tool_prefix"; then 18613 if test -n "$ac_tool_prefix"; then
@@ -18689,7 +18620,7 @@ index a0e40f49a80..42bc002c2b9 100755
18689 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 18620 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
18690 $as_echo_n "checking for $ac_word... " >&6; } 18621 $as_echo_n "checking for $ac_word... " >&6; }
18691 if ${ac_cv_prog_AR+:} false; then : 18622 if ${ac_cv_prog_AR+:} false; then :
18692@@ -6735,7 +6988,7 @@ do 18623@@ -8674,7 +8927,7 @@ do
18693 test -z "$as_dir" && as_dir=. 18624 test -z "$as_dir" && as_dir=.
18694 for ac_exec_ext in '' $ac_executable_extensions; do 18625 for ac_exec_ext in '' $ac_executable_extensions; do
18695 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 18626 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
@@ -18698,7 +18629,7 @@ index a0e40f49a80..42bc002c2b9 100755
18698 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 18629 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
18699 break 2 18630 break 2
18700 fi 18631 fi
18701@@ -6755,11 +7008,15 @@ $as_echo "no" >&6; } 18632@@ -8694,11 +8947,15 @@ $as_echo "no" >&6; }
18702 fi 18633 fi
18703 18634
18704 18635
@@ -18717,7 +18648,7 @@ index a0e40f49a80..42bc002c2b9 100755
18717 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 18648 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
18718 $as_echo_n "checking for $ac_word... " >&6; } 18649 $as_echo_n "checking for $ac_word... " >&6; }
18719 if ${ac_cv_prog_ac_ct_AR+:} false; then : 18650 if ${ac_cv_prog_ac_ct_AR+:} false; then :
18720@@ -6775,7 +7032,7 @@ do 18651@@ -8714,7 +8971,7 @@ do
18721 test -z "$as_dir" && as_dir=. 18652 test -z "$as_dir" && as_dir=.
18722 for ac_exec_ext in '' $ac_executable_extensions; do 18653 for ac_exec_ext in '' $ac_executable_extensions; do
18723 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 18654 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
@@ -18726,7 +18657,7 @@ index a0e40f49a80..42bc002c2b9 100755
18726 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 18657 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
18727 break 2 18658 break 2
18728 fi 18659 fi
18729@@ -6794,6 +7051,10 @@ else 18660@@ -8733,6 +8990,10 @@ else
18730 $as_echo "no" >&6; } 18661 $as_echo "no" >&6; }
18731 fi 18662 fi
18732 18663
@@ -18737,7 +18668,7 @@ index a0e40f49a80..42bc002c2b9 100755
18737 if test "x$ac_ct_AR" = x; then 18668 if test "x$ac_ct_AR" = x; then
18738 AR="false" 18669 AR="false"
18739 else 18670 else
18740@@ -6805,25 +7066,19 @@ ac_tool_warned=yes ;; 18671@@ -8744,25 +9005,19 @@ ac_tool_warned=yes ;;
18741 esac 18672 esac
18742 AR=$ac_ct_AR 18673 AR=$ac_ct_AR
18743 fi 18674 fi
@@ -18772,7 +18703,7 @@ index a0e40f49a80..42bc002c2b9 100755
18772 18703
18773 18704
18774 18705
18775@@ -6835,6 +7090,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru 18706@@ -8774,6 +9029,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru
18776 18707
18777 18708
18778 18709
@@ -18837,7 +18768,7 @@ index a0e40f49a80..42bc002c2b9 100755
18837 if test -n "$ac_tool_prefix"; then 18768 if test -n "$ac_tool_prefix"; then
18838 # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. 18769 # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
18839 set dummy ${ac_tool_prefix}strip; ac_word=$2 18770 set dummy ${ac_tool_prefix}strip; ac_word=$2
18840@@ -7174,8 +7487,8 @@ esac 18771@@ -9113,8 +9426,8 @@ esac
18841 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" 18772 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
18842 18773
18843 # Transform an extracted symbol line into symbol name and symbol address 18774 # Transform an extracted symbol line into symbol name and symbol address
@@ -18848,7 +18779,7 @@ index a0e40f49a80..42bc002c2b9 100755
18848 18779
18849 # Handle CRLF in mingw tool chain 18780 # Handle CRLF in mingw tool chain
18850 opt_cr= 18781 opt_cr=
18851@@ -7211,6 +7524,7 @@ for ac_symprfx in "" "_"; do 18782@@ -9150,6 +9463,7 @@ for ac_symprfx in "" "_"; do
18852 else 18783 else
18853 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" 18784 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
18854 fi 18785 fi
@@ -18856,7 +18787,7 @@ index a0e40f49a80..42bc002c2b9 100755
18856 18787
18857 # Check to see that the pipe works correctly. 18788 # Check to see that the pipe works correctly.
18858 pipe_works=no 18789 pipe_works=no
18859@@ -7252,6 +7566,18 @@ _LT_EOF 18790@@ -9191,6 +9505,18 @@ _LT_EOF
18860 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then 18791 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
18861 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then 18792 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
18862 cat <<_LT_EOF > conftest.$ac_ext 18793 cat <<_LT_EOF > conftest.$ac_ext
@@ -18875,7 +18806,7 @@ index a0e40f49a80..42bc002c2b9 100755
18875 #ifdef __cplusplus 18806 #ifdef __cplusplus
18876 extern "C" { 18807 extern "C" {
18877 #endif 18808 #endif
18878@@ -7263,7 +7589,7 @@ _LT_EOF 18809@@ -9202,7 +9528,7 @@ _LT_EOF
18879 cat <<_LT_EOF >> conftest.$ac_ext 18810 cat <<_LT_EOF >> conftest.$ac_ext
18880 18811
18881 /* The mapping between symbol names and symbols. */ 18812 /* The mapping between symbol names and symbols. */
@@ -18884,7 +18815,7 @@ index a0e40f49a80..42bc002c2b9 100755
18884 const char *name; 18815 const char *name;
18885 void *address; 18816 void *address;
18886 } 18817 }
18887@@ -7289,8 +7615,8 @@ static const void *lt_preloaded_setup() { 18818@@ -9228,8 +9554,8 @@ static const void *lt_preloaded_setup() {
18888 _LT_EOF 18819 _LT_EOF
18889 # Now try linking the two files. 18820 # Now try linking the two files.
18890 mv conftest.$ac_objext conftstm.$ac_objext 18821 mv conftest.$ac_objext conftstm.$ac_objext
@@ -18895,7 +18826,7 @@ index a0e40f49a80..42bc002c2b9 100755
18895 LIBS="conftstm.$ac_objext" 18826 LIBS="conftstm.$ac_objext"
18896 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" 18827 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
18897 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 18828 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
18898@@ -7300,8 +7626,8 @@ _LT_EOF 18829@@ -9239,8 +9565,8 @@ _LT_EOF
18899 test $ac_status = 0; } && test -s conftest${ac_exeext}; then 18830 test $ac_status = 0; } && test -s conftest${ac_exeext}; then
18900 pipe_works=yes 18831 pipe_works=yes
18901 fi 18832 fi
@@ -18906,7 +18837,7 @@ index a0e40f49a80..42bc002c2b9 100755
18906 else 18837 else
18907 echo "cannot find nm_test_func in $nlist" >&5 18838 echo "cannot find nm_test_func in $nlist" >&5
18908 fi 18839 fi
18909@@ -7338,6 +7664,17 @@ else 18840@@ -9277,6 +9603,17 @@ else
18910 $as_echo "ok" >&6; } 18841 $as_echo "ok" >&6; }
18911 fi 18842 fi
18912 18843
@@ -18924,7 +18855,7 @@ index a0e40f49a80..42bc002c2b9 100755
18924 18855
18925 18856
18926 18857
18927@@ -7354,6 +7691,44 @@ fi 18858@@ -9293,6 +9630,44 @@ fi
18928 18859
18929 18860
18930 18861
@@ -18969,7 +18900,7 @@ index a0e40f49a80..42bc002c2b9 100755
18969 18900
18970 18901
18971 18902
18972@@ -7565,6 +7940,123 @@ esac 18903@@ -9504,6 +9879,123 @@ esac
18973 18904
18974 need_locks="$enable_libtool_lock" 18905 need_locks="$enable_libtool_lock"
18975 18906
@@ -19093,7 +19024,7 @@ index a0e40f49a80..42bc002c2b9 100755
19093 19024
19094 case $host_os in 19025 case $host_os in
19095 rhapsody* | darwin*) 19026 rhapsody* | darwin*)
19096@@ -8128,6 +8620,8 @@ _LT_EOF 19027@@ -10067,6 +10559,8 @@ _LT_EOF
19097 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 19028 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
19098 echo "$AR cru libconftest.a conftest.o" >&5 19029 echo "$AR cru libconftest.a conftest.o" >&5
19099 $AR cru libconftest.a conftest.o 2>&5 19030 $AR cru libconftest.a conftest.o 2>&5
@@ -19102,7 +19033,7 @@ index a0e40f49a80..42bc002c2b9 100755
19102 cat > conftest.c << _LT_EOF 19033 cat > conftest.c << _LT_EOF
19103 int main() { return 0;} 19034 int main() { return 0;}
19104 _LT_EOF 19035 _LT_EOF
19105@@ -8680,8 +9174,6 @@ fi 19036@@ -10621,8 +11115,6 @@ fi
19106 lt_prog_compiler_pic= 19037 lt_prog_compiler_pic=
19107 lt_prog_compiler_static= 19038 lt_prog_compiler_static=
19108 19039
@@ -19111,7 +19042,7 @@ index a0e40f49a80..42bc002c2b9 100755
19111 19042
19112 if test "$GCC" = yes; then 19043 if test "$GCC" = yes; then
19113 lt_prog_compiler_wl='-Wl,' 19044 lt_prog_compiler_wl='-Wl,'
19114@@ -8847,6 +9339,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 19045@@ -10788,6 +11280,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
19115 lt_prog_compiler_pic='--shared' 19046 lt_prog_compiler_pic='--shared'
19116 lt_prog_compiler_static='--static' 19047 lt_prog_compiler_static='--static'
19117 ;; 19048 ;;
@@ -19124,7 +19055,7 @@ index a0e40f49a80..42bc002c2b9 100755
19124 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) 19055 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
19125 # Portland Group compilers (*not* the Pentium gcc compiler, 19056 # Portland Group compilers (*not* the Pentium gcc compiler,
19126 # which looks to be a dead project) 19057 # which looks to be a dead project)
19127@@ -8909,7 +9407,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 19058@@ -10850,7 +11348,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
19128 lt_prog_compiler_pic='-KPIC' 19059 lt_prog_compiler_pic='-KPIC'
19129 lt_prog_compiler_static='-Bstatic' 19060 lt_prog_compiler_static='-Bstatic'
19130 case $cc_basename in 19061 case $cc_basename in
@@ -19133,7 +19064,7 @@ index a0e40f49a80..42bc002c2b9 100755
19133 lt_prog_compiler_wl='-Qoption ld ';; 19064 lt_prog_compiler_wl='-Qoption ld ';;
19134 *) 19065 *)
19135 lt_prog_compiler_wl='-Wl,';; 19066 lt_prog_compiler_wl='-Wl,';;
19136@@ -8966,13 +9464,17 @@ case $host_os in 19067@@ -10907,13 +11405,17 @@ case $host_os in
19137 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" 19068 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
19138 ;; 19069 ;;
19139 esac 19070 esac
@@ -19157,7 +19088,7 @@ index a0e40f49a80..42bc002c2b9 100755
19157 19088
19158 # 19089 #
19159 # Check to make sure the PIC flag actually works. 19090 # Check to make sure the PIC flag actually works.
19160@@ -9033,6 +9535,11 @@ fi 19091@@ -10974,6 +11476,11 @@ fi
19161 19092
19162 19093
19163 19094
@@ -19169,7 +19100,7 @@ index a0e40f49a80..42bc002c2b9 100755
19169 # 19100 #
19170 # Check to make sure the static flag actually works. 19101 # Check to make sure the static flag actually works.
19171 # 19102 #
19172@@ -9383,7 +9890,8 @@ _LT_EOF 19103@@ -11324,7 +11831,8 @@ _LT_EOF
19173 allow_undefined_flag=unsupported 19104 allow_undefined_flag=unsupported
19174 always_export_symbols=no 19105 always_export_symbols=no
19175 enable_shared_with_static_runtimes=yes 19106 enable_shared_with_static_runtimes=yes
@@ -19179,7 +19110,7 @@ index a0e40f49a80..42bc002c2b9 100755
19179 19110
19180 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then 19111 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
19181 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' 19112 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
19182@@ -9482,12 +9990,12 @@ _LT_EOF 19113@@ -11423,12 +11931,12 @@ _LT_EOF
19183 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' 19114 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
19184 hardcode_libdir_flag_spec= 19115 hardcode_libdir_flag_spec=
19185 hardcode_libdir_flag_spec_ld='-rpath $libdir' 19116 hardcode_libdir_flag_spec_ld='-rpath $libdir'
@@ -19194,7 +19125,7 @@ index a0e40f49a80..42bc002c2b9 100755
19194 fi 19125 fi
19195 ;; 19126 ;;
19196 esac 19127 esac
19197@@ -9501,8 +10009,8 @@ _LT_EOF 19128@@ -11442,8 +11950,8 @@ _LT_EOF
19198 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' 19129 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
19199 wlarc= 19130 wlarc=
19200 else 19131 else
@@ -19205,7 +19136,7 @@ index a0e40f49a80..42bc002c2b9 100755
19205 fi 19136 fi
19206 ;; 19137 ;;
19207 19138
19208@@ -9520,8 +10028,8 @@ _LT_EOF 19139@@ -11461,8 +11969,8 @@ _LT_EOF
19209 19140
19210 _LT_EOF 19141 _LT_EOF
19211 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 19142 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -19216,7 +19147,7 @@ index a0e40f49a80..42bc002c2b9 100755
19216 else 19147 else
19217 ld_shlibs=no 19148 ld_shlibs=no
19218 fi 19149 fi
19219@@ -9567,8 +10075,8 @@ _LT_EOF 19150@@ -11508,8 +12016,8 @@ _LT_EOF
19220 19151
19221 *) 19152 *)
19222 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 19153 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -19227,7 +19158,7 @@ index a0e40f49a80..42bc002c2b9 100755
19227 else 19158 else
19228 ld_shlibs=no 19159 ld_shlibs=no
19229 fi 19160 fi
19230@@ -9698,7 +10206,13 @@ _LT_EOF 19161@@ -11639,7 +12147,13 @@ _LT_EOF
19231 allow_undefined_flag='-berok' 19162 allow_undefined_flag='-berok'
19232 # Determine the default libpath from the value encoded in an 19163 # Determine the default libpath from the value encoded in an
19233 # empty executable. 19164 # empty executable.
@@ -19242,7 +19173,7 @@ index a0e40f49a80..42bc002c2b9 100755
19242 /* end confdefs.h. */ 19173 /* end confdefs.h. */
19243 19174
19244 int 19175 int
19245@@ -9711,22 +10225,29 @@ main () 19176@@ -11652,22 +12166,29 @@ main ()
19246 _ACEOF 19177 _ACEOF
19247 if ac_fn_c_try_link "$LINENO"; then : 19178 if ac_fn_c_try_link "$LINENO"; then :
19248 19179
@@ -19285,7 +19216,7 @@ index a0e40f49a80..42bc002c2b9 100755
19285 19216
19286 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 19217 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
19287 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" 19218 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"
19288@@ -9738,7 +10259,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 19219@@ -11679,7 +12200,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
19289 else 19220 else
19290 # Determine the default libpath from the value encoded in an 19221 # Determine the default libpath from the value encoded in an
19291 # empty executable. 19222 # empty executable.
@@ -19300,7 +19231,7 @@ index a0e40f49a80..42bc002c2b9 100755
19300 /* end confdefs.h. */ 19231 /* end confdefs.h. */
19301 19232
19302 int 19233 int
19303@@ -9751,22 +10278,29 @@ main () 19234@@ -11692,22 +12219,29 @@ main ()
19304 _ACEOF 19235 _ACEOF
19305 if ac_fn_c_try_link "$LINENO"; then : 19236 if ac_fn_c_try_link "$LINENO"; then :
19306 19237
@@ -19343,7 +19274,7 @@ index a0e40f49a80..42bc002c2b9 100755
19343 19274
19344 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 19275 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
19345 # Warning - without using the other run time loading flags, 19276 # Warning - without using the other run time loading flags,
19346@@ -9811,20 +10345,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 19277@@ -11752,20 +12286,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
19347 # Microsoft Visual C++. 19278 # Microsoft Visual C++.
19348 # hardcode_libdir_flag_spec is actually meaningless, as there is 19279 # hardcode_libdir_flag_spec is actually meaningless, as there is
19349 # no search path for DLLs. 19280 # no search path for DLLs.
@@ -19421,7 +19352,7 @@ index a0e40f49a80..42bc002c2b9 100755
19421 ;; 19352 ;;
19422 19353
19423 darwin* | rhapsody*) 19354 darwin* | rhapsody*)
19424@@ -9885,7 +10462,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 19355@@ -11826,7 +12403,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
19425 19356
19426 # FreeBSD 3 and greater uses gcc -shared to do shared libraries. 19357 # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
19427 freebsd* | dragonfly*) 19358 freebsd* | dragonfly*)
@@ -19430,7 +19361,7 @@ index a0e40f49a80..42bc002c2b9 100755
19430 hardcode_libdir_flag_spec='-R$libdir' 19361 hardcode_libdir_flag_spec='-R$libdir'
19431 hardcode_direct=yes 19362 hardcode_direct=yes
19432 hardcode_shlibpath_var=no 19363 hardcode_shlibpath_var=no
19433@@ -9893,7 +10470,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 19364@@ -11834,7 +12411,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
19434 19365
19435 hpux9*) 19366 hpux9*)
19436 if test "$GCC" = yes; then 19367 if test "$GCC" = yes; then
@@ -19439,7 +19370,7 @@ index a0e40f49a80..42bc002c2b9 100755
19439 else 19370 else
19440 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' 19371 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'
19441 fi 19372 fi
19442@@ -9909,7 +10486,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 19373@@ -11850,7 +12427,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
19443 19374
19444 hpux10*) 19375 hpux10*)
19445 if test "$GCC" = yes && test "$with_gnu_ld" = no; then 19376 if test "$GCC" = yes && test "$with_gnu_ld" = no; then
@@ -19448,8 +19379,8 @@ index a0e40f49a80..42bc002c2b9 100755
19448 else 19379 else
19449 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' 19380 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
19450 fi 19381 fi
19451@@ -9933,10 +10510,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 19382@@ -11874,10 +12451,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
19452 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' 19383 archive_cmds='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
19453 ;; 19384 ;;
19454 ia64*) 19385 ia64*)
19455- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' 19386- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
@@ -19461,7 +19392,7 @@ index a0e40f49a80..42bc002c2b9 100755
19461 ;; 19392 ;;
19462 esac 19393 esac
19463 else 19394 else
19464@@ -10015,23 +10592,36 @@ fi 19395@@ -11956,23 +12533,36 @@ fi
19465 19396
19466 irix5* | irix6* | nonstopux*) 19397 irix5* | irix6* | nonstopux*)
19467 if test "$GCC" = yes; then 19398 if test "$GCC" = yes; then
@@ -19506,7 +19437,7 @@ index a0e40f49a80..42bc002c2b9 100755
19506 else 19437 else
19507 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' 19438 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'
19508 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' 19439 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'
19509@@ -10116,7 +10706,7 @@ rm -f core conftest.err conftest.$ac_objext \ 19440@@ -12057,7 +12647,7 @@ rm -f core conftest.err conftest.$ac_objext \
19510 osf4* | osf5*) # as osf3* with the addition of -msym flag 19441 osf4* | osf5*) # as osf3* with the addition of -msym flag
19511 if test "$GCC" = yes; then 19442 if test "$GCC" = yes; then
19512 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' 19443 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
@@ -19515,7 +19446,7 @@ index a0e40f49a80..42bc002c2b9 100755
19515 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' 19446 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
19516 else 19447 else
19517 allow_undefined_flag=' -expect_unresolved \*' 19448 allow_undefined_flag=' -expect_unresolved \*'
19518@@ -10135,9 +10725,9 @@ rm -f core conftest.err conftest.$ac_objext \ 19449@@ -12076,9 +12666,9 @@ rm -f core conftest.err conftest.$ac_objext \
19519 no_undefined_flag=' -z defs' 19450 no_undefined_flag=' -z defs'
19520 if test "$GCC" = yes; then 19451 if test "$GCC" = yes; then
19521 wlarc='${wl}' 19452 wlarc='${wl}'
@@ -19527,7 +19458,7 @@ index a0e40f49a80..42bc002c2b9 100755
19527 else 19458 else
19528 case `$CC -V 2>&1` in 19459 case `$CC -V 2>&1` in
19529 *"Compilers 5.0"*) 19460 *"Compilers 5.0"*)
19530@@ -10713,8 +11303,9 @@ cygwin* | mingw* | pw32* | cegcc*) 19461@@ -12654,8 +13244,9 @@ cygwin* | mingw* | pw32* | cegcc*)
19531 need_version=no 19462 need_version=no
19532 need_lib_prefix=no 19463 need_lib_prefix=no
19533 19464
@@ -19539,7 +19470,7 @@ index a0e40f49a80..42bc002c2b9 100755
19539 library_names_spec='$libname.dll.a' 19470 library_names_spec='$libname.dll.a'
19540 # DLL is installed to $(libdir)/../bin by postinstall_cmds 19471 # DLL is installed to $(libdir)/../bin by postinstall_cmds
19541 postinstall_cmds='base_file=`basename \${file}`~ 19472 postinstall_cmds='base_file=`basename \${file}`~
19542@@ -10747,13 +11338,71 @@ cygwin* | mingw* | pw32* | cegcc*) 19473@@ -12688,13 +13279,71 @@ cygwin* | mingw* | pw32* | cegcc*)
19543 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' 19474 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
19544 ;; 19475 ;;
19545 esac 19476 esac
@@ -19612,16 +19543,19 @@ index a0e40f49a80..42bc002c2b9 100755
19612 # FIXME: first we should search . and the directory the executable is in 19543 # FIXME: first we should search . and the directory the executable is in
19613 shlibpath_var=PATH 19544 shlibpath_var=PATH
19614 ;; 19545 ;;
19615@@ -11631,7 +12280,7 @@ else 19546@@ -13596,7 +14245,11 @@ else
19616 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 19547 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
19617 lt_status=$lt_dlunknown 19548 lt_status=$lt_dlunknown
19618 cat > conftest.$ac_ext <<_LT_EOF 19549 cat > conftest.$ac_ext <<_LT_EOF
19619-#line 11634 "configure" 19550+<<<<<<< HEAD
19551 #line 13599 "configure"
19552+=======
19620+#line $LINENO "configure" 19553+#line $LINENO "configure"
19554+>>>>>>> b932158cf4c (Use libtool 2.4)
19621 #include "confdefs.h" 19555 #include "confdefs.h"
19622 19556
19623 #if HAVE_DLFCN_H 19557 #if HAVE_DLFCN_H
19624@@ -11675,10 +12324,10 @@ else 19558@@ -13640,10 +14293,10 @@ else
19625 /* When -fvisbility=hidden is used, assume the code has been annotated 19559 /* When -fvisbility=hidden is used, assume the code has been annotated
19626 correspondingly for the symbols needed. */ 19560 correspondingly for the symbols needed. */
19627 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 19561 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
@@ -19634,16 +19568,19 @@ index a0e40f49a80..42bc002c2b9 100755
19634 int main () 19568 int main ()
19635 { 19569 {
19636 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 19570 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
19637@@ -11737,7 +12386,7 @@ else 19571@@ -13702,7 +14355,11 @@ else
19638 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 19572 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
19639 lt_status=$lt_dlunknown 19573 lt_status=$lt_dlunknown
19640 cat > conftest.$ac_ext <<_LT_EOF 19574 cat > conftest.$ac_ext <<_LT_EOF
19641-#line 11740 "configure" 19575+<<<<<<< HEAD
19576 #line 13705 "configure"
19577+=======
19642+#line $LINENO "configure" 19578+#line $LINENO "configure"
19579+>>>>>>> b932158cf4c (Use libtool 2.4)
19643 #include "confdefs.h" 19580 #include "confdefs.h"
19644 19581
19645 #if HAVE_DLFCN_H 19582 #if HAVE_DLFCN_H
19646@@ -11781,10 +12430,10 @@ else 19583@@ -13746,10 +14403,10 @@ else
19647 /* When -fvisbility=hidden is used, assume the code has been annotated 19584 /* When -fvisbility=hidden is used, assume the code has been annotated
19648 correspondingly for the symbols needed. */ 19585 correspondingly for the symbols needed. */
19649 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 19586 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
@@ -19656,7 +19593,7 @@ index a0e40f49a80..42bc002c2b9 100755
19656 int main () 19593 int main ()
19657 { 19594 {
19658 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 19595 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
19659@@ -15825,13 +16474,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' 19596@@ -17797,13 +18454,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
19660 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' 19597 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
19661 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' 19598 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
19662 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' 19599 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
@@ -19677,7 +19614,7 @@ index a0e40f49a80..42bc002c2b9 100755
19677 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' 19614 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
19678 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' 19615 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
19679 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' 19616 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
19680@@ -15846,14 +16502,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de 19617@@ -17818,14 +18482,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de
19681 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' 19618 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
19682 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' 19619 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
19683 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"`' 19620 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"`'
@@ -19696,7 +19633,7 @@ index a0e40f49a80..42bc002c2b9 100755
19696 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' 19633 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
19697 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' 19634 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
19698 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' 19635 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
19699@@ -15886,12 +16545,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q 19636@@ -17858,12 +18525,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q
19700 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' 19637 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
19701 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' 19638 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
19702 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' 19639 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
@@ -19710,7 +19647,7 @@ index a0e40f49a80..42bc002c2b9 100755
19710 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' 19647 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
19711 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' 19648 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
19712 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' 19649 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
19713@@ -15946,8 +16605,13 @@ reload_flag \ 19650@@ -17918,8 +18585,13 @@ reload_flag \
19714 OBJDUMP \ 19651 OBJDUMP \
19715 deplibs_check_method \ 19652 deplibs_check_method \
19716 file_magic_cmd \ 19653 file_magic_cmd \
@@ -19724,7 +19661,7 @@ index a0e40f49a80..42bc002c2b9 100755
19724 STRIP \ 19661 STRIP \
19725 RANLIB \ 19662 RANLIB \
19726 CC \ 19663 CC \
19727@@ -15957,12 +16621,14 @@ lt_cv_sys_global_symbol_pipe \ 19664@@ -17929,12 +18601,14 @@ lt_cv_sys_global_symbol_pipe \
19728 lt_cv_sys_global_symbol_to_cdecl \ 19665 lt_cv_sys_global_symbol_to_cdecl \
19729 lt_cv_sys_global_symbol_to_c_name_address \ 19666 lt_cv_sys_global_symbol_to_c_name_address \
19730 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ 19667 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
@@ -19740,7 +19677,7 @@ index a0e40f49a80..42bc002c2b9 100755
19740 DSYMUTIL \ 19677 DSYMUTIL \
19741 NMEDIT \ 19678 NMEDIT \
19742 LIPO \ 19679 LIPO \
19743@@ -15978,7 +16644,6 @@ no_undefined_flag \ 19680@@ -17950,7 +18624,6 @@ no_undefined_flag \
19744 hardcode_libdir_flag_spec \ 19681 hardcode_libdir_flag_spec \
19745 hardcode_libdir_flag_spec_ld \ 19682 hardcode_libdir_flag_spec_ld \
19746 hardcode_libdir_separator \ 19683 hardcode_libdir_separator \
@@ -19748,7 +19685,7 @@ index a0e40f49a80..42bc002c2b9 100755
19748 exclude_expsyms \ 19685 exclude_expsyms \
19749 include_expsyms \ 19686 include_expsyms \
19750 file_list_spec \ 19687 file_list_spec \
19751@@ -16014,6 +16679,7 @@ module_cmds \ 19688@@ -17986,6 +18659,7 @@ module_cmds \
19752 module_expsym_cmds \ 19689 module_expsym_cmds \
19753 export_symbols_cmds \ 19690 export_symbols_cmds \
19754 prelink_cmds \ 19691 prelink_cmds \
@@ -19756,7 +19693,7 @@ index a0e40f49a80..42bc002c2b9 100755
19756 postinstall_cmds \ 19693 postinstall_cmds \
19757 postuninstall_cmds \ 19694 postuninstall_cmds \
19758 finish_cmds \ 19695 finish_cmds \
19759@@ -16771,7 +17437,8 @@ $as_echo X"$file" | 19696@@ -18845,7 +19519,8 @@ $as_echo X"$file" |
19760 # NOTE: Changes made to this file will be lost: look at ltmain.sh. 19697 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
19761 # 19698 #
19762 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 19699 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
@@ -19766,7 +19703,7 @@ index a0e40f49a80..42bc002c2b9 100755
19766 # Written by Gordon Matzigkeit, 1996 19703 # Written by Gordon Matzigkeit, 1996
19767 # 19704 #
19768 # This file is part of GNU Libtool. 19705 # This file is part of GNU Libtool.
19769@@ -16874,19 +17541,42 @@ SP2NL=$lt_lt_SP2NL 19706@@ -18948,19 +19623,42 @@ SP2NL=$lt_lt_SP2NL
19770 # turn newlines into spaces. 19707 # turn newlines into spaces.
19771 NL2SP=$lt_lt_NL2SP 19708 NL2SP=$lt_lt_NL2SP
19772 19709
@@ -19810,7 +19747,7 @@ index a0e40f49a80..42bc002c2b9 100755
19810 # A symbol stripping program. 19747 # A symbol stripping program.
19811 STRIP=$lt_STRIP 19748 STRIP=$lt_STRIP
19812 19749
19813@@ -16916,6 +17606,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address 19750@@ -18990,6 +19688,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
19814 # Transform the output of nm in a C name address pair when lib prefix is needed. 19751 # Transform the output of nm in a C name address pair when lib prefix is needed.
19815 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix 19752 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
19816 19753
@@ -19823,7 +19760,7 @@ index a0e40f49a80..42bc002c2b9 100755
19823 # The name of the directory that contains temporary libtool files. 19760 # The name of the directory that contains temporary libtool files.
19824 objdir=$objdir 19761 objdir=$objdir
19825 19762
19826@@ -16925,6 +17621,9 @@ MAGIC_CMD=$MAGIC_CMD 19763@@ -18999,6 +19703,9 @@ MAGIC_CMD=$MAGIC_CMD
19827 # Must we lock files when doing compilation? 19764 # Must we lock files when doing compilation?
19828 need_locks=$lt_need_locks 19765 need_locks=$lt_need_locks
19829 19766
@@ -19833,7 +19770,7 @@ index a0e40f49a80..42bc002c2b9 100755
19833 # Tool to manipulate archived DWARF debug symbol files on Mac OS X. 19770 # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
19834 DSYMUTIL=$lt_DSYMUTIL 19771 DSYMUTIL=$lt_DSYMUTIL
19835 19772
19836@@ -17039,12 +17738,12 @@ with_gcc=$GCC 19773@@ -19113,12 +19820,12 @@ with_gcc=$GCC
19837 # Compiler flag to turn off builtin functions. 19774 # Compiler flag to turn off builtin functions.
19838 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag 19775 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
19839 19776
@@ -19849,7 +19786,7 @@ index a0e40f49a80..42bc002c2b9 100755
19849 # Compiler flag to prevent dynamic linking. 19786 # Compiler flag to prevent dynamic linking.
19850 link_static_flag=$lt_lt_prog_compiler_static 19787 link_static_flag=$lt_lt_prog_compiler_static
19851 19788
19852@@ -17131,9 +17830,6 @@ inherit_rpath=$inherit_rpath 19789@@ -19205,9 +19912,6 @@ inherit_rpath=$inherit_rpath
19853 # Whether libtool must link a program against all its dependency libraries. 19790 # Whether libtool must link a program against all its dependency libraries.
19854 link_all_deplibs=$link_all_deplibs 19791 link_all_deplibs=$link_all_deplibs
19855 19792
@@ -19859,7 +19796,7 @@ index a0e40f49a80..42bc002c2b9 100755
19859 # Set to "yes" if exported symbols are required. 19796 # Set to "yes" if exported symbols are required.
19860 always_export_symbols=$always_export_symbols 19797 always_export_symbols=$always_export_symbols
19861 19798
19862@@ -17149,6 +17845,9 @@ include_expsyms=$lt_include_expsyms 19799@@ -19223,6 +19927,9 @@ include_expsyms=$lt_include_expsyms
19863 # Commands necessary for linking programs (against libraries) with templates. 19800 # Commands necessary for linking programs (against libraries) with templates.
19864 prelink_cmds=$lt_prelink_cmds 19801 prelink_cmds=$lt_prelink_cmds
19865 19802
@@ -19869,7 +19806,7 @@ index a0e40f49a80..42bc002c2b9 100755
19869 # Specify filename containing input files. 19806 # Specify filename containing input files.
19870 file_list_spec=$lt_file_list_spec 19807 file_list_spec=$lt_file_list_spec
19871 19808
19872@@ -17181,210 +17880,169 @@ ltmain="$ac_aux_dir/ltmain.sh" 19809@@ -19255,210 +19962,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
19873 # if finds mixed CR/LF and LF-only lines. Since sed operates in 19810 # if finds mixed CR/LF and LF-only lines. Since sed operates in
19874 # text mode, it properly converts lines to CR/LF. This bash problem 19811 # text mode, it properly converts lines to CR/LF. This bash problem
19875 # is reportedly fixed, but why not run on old versions too? 19812 # is reportedly fixed, but why not run on old versions too?
@@ -20244,7 +20181,7 @@ index a0e40f49a80..42bc002c2b9 100755
20244 chmod +x "$ofile" 20181 chmod +x "$ofile"
20245 20182
20246diff --git a/libsframe/Makefile.in b/libsframe/Makefile.in 20183diff --git a/libsframe/Makefile.in b/libsframe/Makefile.in
20247index 08c780caa4a..7ea9c94c2af 100644 20184index 9e3d268902b..c22ed33460a 100644
20248--- a/libsframe/Makefile.in 20185--- a/libsframe/Makefile.in
20249+++ b/libsframe/Makefile.in 20186+++ b/libsframe/Makefile.in
20250@@ -1,7 +1,7 @@ 20187@@ -1,7 +1,7 @@
@@ -21309,7 +21246,7 @@ index b0cdd6b184d..c83d4f62ece 100644
21309 # This file is free software; the Free Software Foundation 21246 # This file is free software; the Free Software Foundation
21310 # gives unlimited permission to copy and/or distribute it, 21247 # gives unlimited permission to copy and/or distribute it,
21311diff --git a/libsframe/configure b/libsframe/configure 21248diff --git a/libsframe/configure b/libsframe/configure
21312index f7ad9c5e29a..78e875956ae 100755 21249index 1d9e5e10695..a234c4815b1 100755
21313--- a/libsframe/configure 21250--- a/libsframe/configure
21314+++ b/libsframe/configure 21251+++ b/libsframe/configure
21315@@ -658,6 +658,8 @@ OTOOL 21252@@ -658,6 +658,8 @@ OTOOL
@@ -21643,7 +21580,7 @@ index f7ad9c5e29a..78e875956ae 100755
21643 lt_cv_file_magic_cmd='$OBJDUMP -f' 21580 lt_cv_file_magic_cmd='$OBJDUMP -f'
21644 fi 21581 fi
21645 ;; 21582 ;;
21646@@ -6544,6 +6641,21 @@ esac 21583@@ -6549,6 +6646,21 @@ esac
21647 fi 21584 fi
21648 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 21585 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
21649 $as_echo "$lt_cv_deplibs_check_method" >&6; } 21586 $as_echo "$lt_cv_deplibs_check_method" >&6; }
@@ -21665,7 +21602,7 @@ index f7ad9c5e29a..78e875956ae 100755
21665 file_magic_cmd=$lt_cv_file_magic_cmd 21602 file_magic_cmd=$lt_cv_file_magic_cmd
21666 deplibs_check_method=$lt_cv_deplibs_check_method 21603 deplibs_check_method=$lt_cv_deplibs_check_method
21667 test -z "$deplibs_check_method" && deplibs_check_method=unknown 21604 test -z "$deplibs_check_method" && deplibs_check_method=unknown
21668@@ -6559,6 +6671,157 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown 21605@@ -6564,6 +6676,157 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
21669 21606
21670 21607
21671 21608
@@ -21823,7 +21760,7 @@ index f7ad9c5e29a..78e875956ae 100755
21823 plugin_option= 21760 plugin_option=
21824 plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll" 21761 plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll"
21825 for plugin in $plugin_names; do 21762 for plugin in $plugin_names; do
21826@@ -6573,8 +6836,10 @@ for plugin in $plugin_names; do 21763@@ -6578,8 +6841,10 @@ for plugin in $plugin_names; do
21827 done 21764 done
21828 21765
21829 if test -n "$ac_tool_prefix"; then 21766 if test -n "$ac_tool_prefix"; then
@@ -21836,7 +21773,7 @@ index f7ad9c5e29a..78e875956ae 100755
21836 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 21773 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
21837 $as_echo_n "checking for $ac_word... " >&6; } 21774 $as_echo_n "checking for $ac_word... " >&6; }
21838 if ${ac_cv_prog_AR+:} false; then : 21775 if ${ac_cv_prog_AR+:} false; then :
21839@@ -6590,7 +6855,7 @@ do 21776@@ -6595,7 +6860,7 @@ do
21840 test -z "$as_dir" && as_dir=. 21777 test -z "$as_dir" && as_dir=.
21841 for ac_exec_ext in '' $ac_executable_extensions; do 21778 for ac_exec_ext in '' $ac_executable_extensions; do
21842 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 21779 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
@@ -21845,7 +21782,7 @@ index f7ad9c5e29a..78e875956ae 100755
21845 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 21782 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
21846 break 2 21783 break 2
21847 fi 21784 fi
21848@@ -6610,11 +6875,15 @@ $as_echo "no" >&6; } 21785@@ -6615,11 +6880,15 @@ $as_echo "no" >&6; }
21849 fi 21786 fi
21850 21787
21851 21788
@@ -21864,7 +21801,7 @@ index f7ad9c5e29a..78e875956ae 100755
21864 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 21801 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
21865 $as_echo_n "checking for $ac_word... " >&6; } 21802 $as_echo_n "checking for $ac_word... " >&6; }
21866 if ${ac_cv_prog_ac_ct_AR+:} false; then : 21803 if ${ac_cv_prog_ac_ct_AR+:} false; then :
21867@@ -6630,7 +6899,7 @@ do 21804@@ -6635,7 +6904,7 @@ do
21868 test -z "$as_dir" && as_dir=. 21805 test -z "$as_dir" && as_dir=.
21869 for ac_exec_ext in '' $ac_executable_extensions; do 21806 for ac_exec_ext in '' $ac_executable_extensions; do
21870 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 21807 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
@@ -21873,7 +21810,7 @@ index f7ad9c5e29a..78e875956ae 100755
21873 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 21810 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
21874 break 2 21811 break 2
21875 fi 21812 fi
21876@@ -6649,6 +6918,10 @@ else 21813@@ -6654,6 +6923,10 @@ else
21877 $as_echo "no" >&6; } 21814 $as_echo "no" >&6; }
21878 fi 21815 fi
21879 21816
@@ -21884,7 +21821,7 @@ index f7ad9c5e29a..78e875956ae 100755
21884 if test "x$ac_ct_AR" = x; then 21821 if test "x$ac_ct_AR" = x; then
21885 AR="false" 21822 AR="false"
21886 else 21823 else
21887@@ -6660,29 +6933,81 @@ ac_tool_warned=yes ;; 21824@@ -6665,29 +6938,81 @@ ac_tool_warned=yes ;;
21888 esac 21825 esac
21889 AR=$ac_ct_AR 21826 AR=$ac_ct_AR
21890 fi 21827 fi
@@ -21981,7 +21918,7 @@ index f7ad9c5e29a..78e875956ae 100755
21981 21918
21982 21919
21983 21920
21984@@ -7029,8 +7354,8 @@ esac 21921@@ -7034,8 +7359,8 @@ esac
21985 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" 21922 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
21986 21923
21987 # Transform an extracted symbol line into symbol name and symbol address 21924 # Transform an extracted symbol line into symbol name and symbol address
@@ -21992,7 +21929,7 @@ index f7ad9c5e29a..78e875956ae 100755
21992 21929
21993 # Handle CRLF in mingw tool chain 21930 # Handle CRLF in mingw tool chain
21994 opt_cr= 21931 opt_cr=
21995@@ -7066,6 +7391,7 @@ for ac_symprfx in "" "_"; do 21932@@ -7071,6 +7396,7 @@ for ac_symprfx in "" "_"; do
21996 else 21933 else
21997 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" 21934 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
21998 fi 21935 fi
@@ -22000,7 +21937,7 @@ index f7ad9c5e29a..78e875956ae 100755
22000 21937
22001 # Check to see that the pipe works correctly. 21938 # Check to see that the pipe works correctly.
22002 pipe_works=no 21939 pipe_works=no
22003@@ -7107,6 +7433,18 @@ _LT_EOF 21940@@ -7112,6 +7438,18 @@ _LT_EOF
22004 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then 21941 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
22005 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then 21942 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
22006 cat <<_LT_EOF > conftest.$ac_ext 21943 cat <<_LT_EOF > conftest.$ac_ext
@@ -22019,7 +21956,7 @@ index f7ad9c5e29a..78e875956ae 100755
22019 #ifdef __cplusplus 21956 #ifdef __cplusplus
22020 extern "C" { 21957 extern "C" {
22021 #endif 21958 #endif
22022@@ -7118,7 +7456,7 @@ _LT_EOF 21959@@ -7123,7 +7461,7 @@ _LT_EOF
22023 cat <<_LT_EOF >> conftest.$ac_ext 21960 cat <<_LT_EOF >> conftest.$ac_ext
22024 21961
22025 /* The mapping between symbol names and symbols. */ 21962 /* The mapping between symbol names and symbols. */
@@ -22028,7 +21965,7 @@ index f7ad9c5e29a..78e875956ae 100755
22028 const char *name; 21965 const char *name;
22029 void *address; 21966 void *address;
22030 } 21967 }
22031@@ -7144,8 +7482,8 @@ static const void *lt_preloaded_setup() { 21968@@ -7149,8 +7487,8 @@ static const void *lt_preloaded_setup() {
22032 _LT_EOF 21969 _LT_EOF
22033 # Now try linking the two files. 21970 # Now try linking the two files.
22034 mv conftest.$ac_objext conftstm.$ac_objext 21971 mv conftest.$ac_objext conftstm.$ac_objext
@@ -22039,7 +21976,7 @@ index f7ad9c5e29a..78e875956ae 100755
22039 LIBS="conftstm.$ac_objext" 21976 LIBS="conftstm.$ac_objext"
22040 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" 21977 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
22041 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 21978 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
22042@@ -7155,8 +7493,8 @@ _LT_EOF 21979@@ -7160,8 +7498,8 @@ _LT_EOF
22043 test $ac_status = 0; } && test -s conftest${ac_exeext}; then 21980 test $ac_status = 0; } && test -s conftest${ac_exeext}; then
22044 pipe_works=yes 21981 pipe_works=yes
22045 fi 21982 fi
@@ -22050,7 +21987,7 @@ index f7ad9c5e29a..78e875956ae 100755
22050 else 21987 else
22051 echo "cannot find nm_test_func in $nlist" >&5 21988 echo "cannot find nm_test_func in $nlist" >&5
22052 fi 21989 fi
22053@@ -7193,6 +7531,16 @@ else 21990@@ -7198,6 +7536,16 @@ else
22054 $as_echo "ok" >&6; } 21991 $as_echo "ok" >&6; }
22055 fi 21992 fi
22056 21993
@@ -22067,7 +22004,7 @@ index f7ad9c5e29a..78e875956ae 100755
22067 22004
22068 22005
22069 22006
22070@@ -7209,6 +7557,45 @@ fi 22007@@ -7214,6 +7562,45 @@ fi
22071 22008
22072 22009
22073 22010
@@ -22113,7 +22050,7 @@ index f7ad9c5e29a..78e875956ae 100755
22113 22050
22114 22051
22115 22052
22116@@ -7414,11 +7801,128 @@ sparc*-*solaris*) 22053@@ -7419,11 +7806,128 @@ sparc*-*solaris*)
22117 ;; 22054 ;;
22118 esac 22055 esac
22119 fi 22056 fi
@@ -22245,7 +22182,7 @@ index f7ad9c5e29a..78e875956ae 100755
22245 22182
22246 22183
22247 case $host_os in 22184 case $host_os in
22248@@ -7983,6 +8487,8 @@ _LT_EOF 22185@@ -7988,6 +8492,8 @@ _LT_EOF
22249 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 22186 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
22250 echo "$AR cru libconftest.a conftest.o" >&5 22187 echo "$AR cru libconftest.a conftest.o" >&5
22251 $AR cru libconftest.a conftest.o 2>&5 22188 $AR cru libconftest.a conftest.o 2>&5
@@ -22254,7 +22191,7 @@ index f7ad9c5e29a..78e875956ae 100755
22254 cat > conftest.c << _LT_EOF 22191 cat > conftest.c << _LT_EOF
22255 int main() { return 0;} 22192 int main() { return 0;}
22256 _LT_EOF 22193 _LT_EOF
22257@@ -8535,8 +9041,6 @@ fi 22194@@ -8542,8 +9048,6 @@ fi
22258 lt_prog_compiler_pic= 22195 lt_prog_compiler_pic=
22259 lt_prog_compiler_static= 22196 lt_prog_compiler_static=
22260 22197
@@ -22263,7 +22200,7 @@ index f7ad9c5e29a..78e875956ae 100755
22263 22200
22264 if test "$GCC" = yes; then 22201 if test "$GCC" = yes; then
22265 lt_prog_compiler_wl='-Wl,' 22202 lt_prog_compiler_wl='-Wl,'
22266@@ -8702,6 +9206,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 22203@@ -8709,6 +9213,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
22267 lt_prog_compiler_pic='--shared' 22204 lt_prog_compiler_pic='--shared'
22268 lt_prog_compiler_static='--static' 22205 lt_prog_compiler_static='--static'
22269 ;; 22206 ;;
@@ -22276,7 +22213,7 @@ index f7ad9c5e29a..78e875956ae 100755
22276 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) 22213 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
22277 # Portland Group compilers (*not* the Pentium gcc compiler, 22214 # Portland Group compilers (*not* the Pentium gcc compiler,
22278 # which looks to be a dead project) 22215 # which looks to be a dead project)
22279@@ -8764,7 +9274,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 22216@@ -8771,7 +9281,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
22280 lt_prog_compiler_pic='-KPIC' 22217 lt_prog_compiler_pic='-KPIC'
22281 lt_prog_compiler_static='-Bstatic' 22218 lt_prog_compiler_static='-Bstatic'
22282 case $cc_basename in 22219 case $cc_basename in
@@ -22285,7 +22222,7 @@ index f7ad9c5e29a..78e875956ae 100755
22285 lt_prog_compiler_wl='-Qoption ld ';; 22222 lt_prog_compiler_wl='-Qoption ld ';;
22286 *) 22223 *)
22287 lt_prog_compiler_wl='-Wl,';; 22224 lt_prog_compiler_wl='-Wl,';;
22288@@ -8821,13 +9331,17 @@ case $host_os in 22225@@ -8828,13 +9338,17 @@ case $host_os in
22289 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" 22226 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
22290 ;; 22227 ;;
22291 esac 22228 esac
@@ -22309,7 +22246,7 @@ index f7ad9c5e29a..78e875956ae 100755
22309 22246
22310 # 22247 #
22311 # Check to make sure the PIC flag actually works. 22248 # Check to make sure the PIC flag actually works.
22312@@ -8888,6 +9402,11 @@ fi 22249@@ -8895,6 +9409,11 @@ fi
22313 22250
22314 22251
22315 22252
@@ -22321,7 +22258,7 @@ index f7ad9c5e29a..78e875956ae 100755
22321 # 22258 #
22322 # Check to make sure the static flag actually works. 22259 # Check to make sure the static flag actually works.
22323 # 22260 #
22324@@ -9238,7 +9757,8 @@ _LT_EOF 22261@@ -9245,7 +9764,8 @@ _LT_EOF
22325 allow_undefined_flag=unsupported 22262 allow_undefined_flag=unsupported
22326 always_export_symbols=no 22263 always_export_symbols=no
22327 enable_shared_with_static_runtimes=yes 22264 enable_shared_with_static_runtimes=yes
@@ -22331,7 +22268,7 @@ index f7ad9c5e29a..78e875956ae 100755
22331 22268
22332 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then 22269 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
22333 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' 22270 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
22334@@ -9337,12 +9857,12 @@ _LT_EOF 22271@@ -9344,12 +9864,12 @@ _LT_EOF
22335 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' 22272 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
22336 hardcode_libdir_flag_spec= 22273 hardcode_libdir_flag_spec=
22337 hardcode_libdir_flag_spec_ld='-rpath $libdir' 22274 hardcode_libdir_flag_spec_ld='-rpath $libdir'
@@ -22346,7 +22283,7 @@ index f7ad9c5e29a..78e875956ae 100755
22346 fi 22283 fi
22347 ;; 22284 ;;
22348 esac 22285 esac
22349@@ -9356,8 +9876,8 @@ _LT_EOF 22286@@ -9363,8 +9883,8 @@ _LT_EOF
22350 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' 22287 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
22351 wlarc= 22288 wlarc=
22352 else 22289 else
@@ -22357,7 +22294,7 @@ index f7ad9c5e29a..78e875956ae 100755
22357 fi 22294 fi
22358 ;; 22295 ;;
22359 22296
22360@@ -9375,8 +9895,8 @@ _LT_EOF 22297@@ -9382,8 +9902,8 @@ _LT_EOF
22361 22298
22362 _LT_EOF 22299 _LT_EOF
22363 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 22300 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -22368,7 +22305,7 @@ index f7ad9c5e29a..78e875956ae 100755
22368 else 22305 else
22369 ld_shlibs=no 22306 ld_shlibs=no
22370 fi 22307 fi
22371@@ -9422,8 +9942,8 @@ _LT_EOF 22308@@ -9429,8 +9949,8 @@ _LT_EOF
22372 22309
22373 *) 22310 *)
22374 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 22311 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -22379,7 +22316,7 @@ index f7ad9c5e29a..78e875956ae 100755
22379 else 22316 else
22380 ld_shlibs=no 22317 ld_shlibs=no
22381 fi 22318 fi
22382@@ -9553,7 +10073,13 @@ _LT_EOF 22319@@ -9560,7 +10080,13 @@ _LT_EOF
22383 allow_undefined_flag='-berok' 22320 allow_undefined_flag='-berok'
22384 # Determine the default libpath from the value encoded in an 22321 # Determine the default libpath from the value encoded in an
22385 # empty executable. 22322 # empty executable.
@@ -22394,7 +22331,7 @@ index f7ad9c5e29a..78e875956ae 100755
22394 /* end confdefs.h. */ 22331 /* end confdefs.h. */
22395 22332
22396 int 22333 int
22397@@ -9566,22 +10092,29 @@ main () 22334@@ -9573,22 +10099,29 @@ main ()
22398 _ACEOF 22335 _ACEOF
22399 if ac_fn_c_try_link "$LINENO"; then : 22336 if ac_fn_c_try_link "$LINENO"; then :
22400 22337
@@ -22437,7 +22374,7 @@ index f7ad9c5e29a..78e875956ae 100755
22437 22374
22438 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 22375 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
22439 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" 22376 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"
22440@@ -9593,7 +10126,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 22377@@ -9600,7 +10133,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
22441 else 22378 else
22442 # Determine the default libpath from the value encoded in an 22379 # Determine the default libpath from the value encoded in an
22443 # empty executable. 22380 # empty executable.
@@ -22452,7 +22389,7 @@ index f7ad9c5e29a..78e875956ae 100755
22452 /* end confdefs.h. */ 22389 /* end confdefs.h. */
22453 22390
22454 int 22391 int
22455@@ -9606,22 +10145,29 @@ main () 22392@@ -9613,22 +10152,29 @@ main ()
22456 _ACEOF 22393 _ACEOF
22457 if ac_fn_c_try_link "$LINENO"; then : 22394 if ac_fn_c_try_link "$LINENO"; then :
22458 22395
@@ -22495,7 +22432,7 @@ index f7ad9c5e29a..78e875956ae 100755
22495 22432
22496 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 22433 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
22497 # Warning - without using the other run time loading flags, 22434 # Warning - without using the other run time loading flags,
22498@@ -9666,20 +10212,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 22435@@ -9673,20 +10219,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
22499 # Microsoft Visual C++. 22436 # Microsoft Visual C++.
22500 # hardcode_libdir_flag_spec is actually meaningless, as there is 22437 # hardcode_libdir_flag_spec is actually meaningless, as there is
22501 # no search path for DLLs. 22438 # no search path for DLLs.
@@ -22573,7 +22510,7 @@ index f7ad9c5e29a..78e875956ae 100755
22573 ;; 22510 ;;
22574 22511
22575 darwin* | rhapsody*) 22512 darwin* | rhapsody*)
22576@@ -9740,7 +10329,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 22513@@ -9747,7 +10336,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
22577 22514
22578 # FreeBSD 3 and greater uses gcc -shared to do shared libraries. 22515 # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
22579 freebsd* | dragonfly*) 22516 freebsd* | dragonfly*)
@@ -22582,7 +22519,7 @@ index f7ad9c5e29a..78e875956ae 100755
22582 hardcode_libdir_flag_spec='-R$libdir' 22519 hardcode_libdir_flag_spec='-R$libdir'
22583 hardcode_direct=yes 22520 hardcode_direct=yes
22584 hardcode_shlibpath_var=no 22521 hardcode_shlibpath_var=no
22585@@ -9748,7 +10337,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 22522@@ -9755,7 +10344,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
22586 22523
22587 hpux9*) 22524 hpux9*)
22588 if test "$GCC" = yes; then 22525 if test "$GCC" = yes; then
@@ -22591,7 +22528,7 @@ index f7ad9c5e29a..78e875956ae 100755
22591 else 22528 else
22592 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' 22529 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'
22593 fi 22530 fi
22594@@ -9764,7 +10353,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 22531@@ -9771,7 +10360,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
22595 22532
22596 hpux10*) 22533 hpux10*)
22597 if test "$GCC" = yes && test "$with_gnu_ld" = no; then 22534 if test "$GCC" = yes && test "$with_gnu_ld" = no; then
@@ -22600,8 +22537,8 @@ index f7ad9c5e29a..78e875956ae 100755
22600 else 22537 else
22601 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' 22538 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
22602 fi 22539 fi
22603@@ -9788,10 +10377,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 22540@@ -9795,10 +10384,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
22604 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' 22541 archive_cmds='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
22605 ;; 22542 ;;
22606 ia64*) 22543 ia64*)
22607- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' 22544- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
@@ -22613,7 +22550,7 @@ index f7ad9c5e29a..78e875956ae 100755
22613 ;; 22550 ;;
22614 esac 22551 esac
22615 else 22552 else
22616@@ -9870,23 +10459,36 @@ fi 22553@@ -9877,23 +10466,36 @@ fi
22617 22554
22618 irix5* | irix6* | nonstopux*) 22555 irix5* | irix6* | nonstopux*)
22619 if test "$GCC" = yes; then 22556 if test "$GCC" = yes; then
@@ -22658,7 +22595,7 @@ index f7ad9c5e29a..78e875956ae 100755
22658 else 22595 else
22659 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' 22596 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'
22660 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' 22597 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'
22661@@ -9971,7 +10573,7 @@ rm -f core conftest.err conftest.$ac_objext \ 22598@@ -9978,7 +10580,7 @@ rm -f core conftest.err conftest.$ac_objext \
22662 osf4* | osf5*) # as osf3* with the addition of -msym flag 22599 osf4* | osf5*) # as osf3* with the addition of -msym flag
22663 if test "$GCC" = yes; then 22600 if test "$GCC" = yes; then
22664 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' 22601 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
@@ -22667,7 +22604,7 @@ index f7ad9c5e29a..78e875956ae 100755
22667 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' 22604 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
22668 else 22605 else
22669 allow_undefined_flag=' -expect_unresolved \*' 22606 allow_undefined_flag=' -expect_unresolved \*'
22670@@ -9990,9 +10592,9 @@ rm -f core conftest.err conftest.$ac_objext \ 22607@@ -9997,9 +10599,9 @@ rm -f core conftest.err conftest.$ac_objext \
22671 no_undefined_flag=' -z defs' 22608 no_undefined_flag=' -z defs'
22672 if test "$GCC" = yes; then 22609 if test "$GCC" = yes; then
22673 wlarc='${wl}' 22610 wlarc='${wl}'
@@ -22679,7 +22616,7 @@ index f7ad9c5e29a..78e875956ae 100755
22679 else 22616 else
22680 case `$CC -V 2>&1` in 22617 case `$CC -V 2>&1` in
22681 *"Compilers 5.0"*) 22618 *"Compilers 5.0"*)
22682@@ -10568,8 +11170,9 @@ cygwin* | mingw* | pw32* | cegcc*) 22619@@ -10575,8 +11177,9 @@ cygwin* | mingw* | pw32* | cegcc*)
22683 need_version=no 22620 need_version=no
22684 need_lib_prefix=no 22621 need_lib_prefix=no
22685 22622
@@ -22691,7 +22628,7 @@ index f7ad9c5e29a..78e875956ae 100755
22691 library_names_spec='$libname.dll.a' 22628 library_names_spec='$libname.dll.a'
22692 # DLL is installed to $(libdir)/../bin by postinstall_cmds 22629 # DLL is installed to $(libdir)/../bin by postinstall_cmds
22693 postinstall_cmds='base_file=`basename \${file}`~ 22630 postinstall_cmds='base_file=`basename \${file}`~
22694@@ -10602,13 +11205,71 @@ cygwin* | mingw* | pw32* | cegcc*) 22631@@ -10609,13 +11212,71 @@ cygwin* | mingw* | pw32* | cegcc*)
22695 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' 22632 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
22696 ;; 22633 ;;
22697 esac 22634 esac
@@ -22764,16 +22701,16 @@ index f7ad9c5e29a..78e875956ae 100755
22764 # FIXME: first we should search . and the directory the executable is in 22701 # FIXME: first we should search . and the directory the executable is in
22765 shlibpath_var=PATH 22702 shlibpath_var=PATH
22766 ;; 22703 ;;
22767@@ -11486,7 +12147,7 @@ else 22704@@ -11517,7 +12178,7 @@ else
22768 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 22705 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
22769 lt_status=$lt_dlunknown 22706 lt_status=$lt_dlunknown
22770 cat > conftest.$ac_ext <<_LT_EOF 22707 cat > conftest.$ac_ext <<_LT_EOF
22771-#line 11489 "configure" 22708-#line 11520 "configure"
22772+#line $LINENO "configure" 22709+#line $LINENO "configure"
22773 #include "confdefs.h" 22710 #include "confdefs.h"
22774 22711
22775 #if HAVE_DLFCN_H 22712 #if HAVE_DLFCN_H
22776@@ -11530,10 +12191,10 @@ else 22713@@ -11561,10 +12222,10 @@ else
22777 /* When -fvisbility=hidden is used, assume the code has been annotated 22714 /* When -fvisbility=hidden is used, assume the code has been annotated
22778 correspondingly for the symbols needed. */ 22715 correspondingly for the symbols needed. */
22779 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 22716 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
@@ -22786,16 +22723,16 @@ index f7ad9c5e29a..78e875956ae 100755
22786 int main () 22723 int main ()
22787 { 22724 {
22788 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 22725 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
22789@@ -11592,7 +12253,7 @@ else 22726@@ -11623,7 +12284,7 @@ else
22790 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 22727 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
22791 lt_status=$lt_dlunknown 22728 lt_status=$lt_dlunknown
22792 cat > conftest.$ac_ext <<_LT_EOF 22729 cat > conftest.$ac_ext <<_LT_EOF
22793-#line 11595 "configure" 22730-#line 11626 "configure"
22794+#line $LINENO "configure" 22731+#line $LINENO "configure"
22795 #include "confdefs.h" 22732 #include "confdefs.h"
22796 22733
22797 #if HAVE_DLFCN_H 22734 #if HAVE_DLFCN_H
22798@@ -11636,10 +12297,10 @@ else 22735@@ -11667,10 +12328,10 @@ else
22799 /* When -fvisbility=hidden is used, assume the code has been annotated 22736 /* When -fvisbility=hidden is used, assume the code has been annotated
22800 correspondingly for the symbols needed. */ 22737 correspondingly for the symbols needed. */
22801 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 22738 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
@@ -22808,7 +22745,7 @@ index f7ad9c5e29a..78e875956ae 100755
22808 int main () 22745 int main ()
22809 { 22746 {
22810 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 22747 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
22811@@ -13459,7 +14120,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 22748@@ -13490,7 +14151,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
22812 # 22749 #
22813 # INIT-COMMANDS 22750 # INIT-COMMANDS
22814 # 22751 #
@@ -22817,7 +22754,7 @@ index f7ad9c5e29a..78e875956ae 100755
22817 22754
22818 22755
22819 # The HP-UX ksh and POSIX shell print the target directory to stdout 22756 # The HP-UX ksh and POSIX shell print the target directory to stdout
22820@@ -13497,13 +14158,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' 22757@@ -13528,13 +14189,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
22821 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' 22758 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
22822 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' 22759 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
22823 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' 22760 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
@@ -22838,7 +22775,7 @@ index f7ad9c5e29a..78e875956ae 100755
22838 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' 22775 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
22839 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' 22776 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
22840 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' 22777 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
22841@@ -13518,14 +14186,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de 22778@@ -13549,14 +14217,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de
22842 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' 22779 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
22843 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' 22780 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
22844 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"`' 22781 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"`'
@@ -22857,7 +22794,7 @@ index f7ad9c5e29a..78e875956ae 100755
22857 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' 22794 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
22858 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' 22795 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
22859 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' 22796 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
22860@@ -13558,12 +14229,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q 22797@@ -13589,12 +14260,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q
22861 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' 22798 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
22862 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' 22799 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
22863 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' 22800 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
@@ -22871,7 +22808,7 @@ index f7ad9c5e29a..78e875956ae 100755
22871 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' 22808 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
22872 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' 22809 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
22873 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' 22810 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
22874@@ -13618,8 +14289,13 @@ reload_flag \ 22811@@ -13649,8 +14320,13 @@ reload_flag \
22875 OBJDUMP \ 22812 OBJDUMP \
22876 deplibs_check_method \ 22813 deplibs_check_method \
22877 file_magic_cmd \ 22814 file_magic_cmd \
@@ -22885,7 +22822,7 @@ index f7ad9c5e29a..78e875956ae 100755
22885 STRIP \ 22822 STRIP \
22886 RANLIB \ 22823 RANLIB \
22887 CC \ 22824 CC \
22888@@ -13629,12 +14305,14 @@ lt_cv_sys_global_symbol_pipe \ 22825@@ -13660,12 +14336,14 @@ lt_cv_sys_global_symbol_pipe \
22889 lt_cv_sys_global_symbol_to_cdecl \ 22826 lt_cv_sys_global_symbol_to_cdecl \
22890 lt_cv_sys_global_symbol_to_c_name_address \ 22827 lt_cv_sys_global_symbol_to_c_name_address \
22891 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ 22828 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
@@ -22901,7 +22838,7 @@ index f7ad9c5e29a..78e875956ae 100755
22901 DSYMUTIL \ 22838 DSYMUTIL \
22902 NMEDIT \ 22839 NMEDIT \
22903 LIPO \ 22840 LIPO \
22904@@ -13650,7 +14328,6 @@ no_undefined_flag \ 22841@@ -13681,7 +14359,6 @@ no_undefined_flag \
22905 hardcode_libdir_flag_spec \ 22842 hardcode_libdir_flag_spec \
22906 hardcode_libdir_flag_spec_ld \ 22843 hardcode_libdir_flag_spec_ld \
22907 hardcode_libdir_separator \ 22844 hardcode_libdir_separator \
@@ -22909,7 +22846,7 @@ index f7ad9c5e29a..78e875956ae 100755
22909 exclude_expsyms \ 22846 exclude_expsyms \
22910 include_expsyms \ 22847 include_expsyms \
22911 file_list_spec \ 22848 file_list_spec \
22912@@ -13686,6 +14363,7 @@ module_cmds \ 22849@@ -13717,6 +14394,7 @@ module_cmds \
22913 module_expsym_cmds \ 22850 module_expsym_cmds \
22914 export_symbols_cmds \ 22851 export_symbols_cmds \
22915 prelink_cmds \ 22852 prelink_cmds \
@@ -22917,7 +22854,7 @@ index f7ad9c5e29a..78e875956ae 100755
22917 postinstall_cmds \ 22854 postinstall_cmds \
22918 postuninstall_cmds \ 22855 postuninstall_cmds \
22919 finish_cmds \ 22856 finish_cmds \
22920@@ -14332,29 +15010,35 @@ $as_echo "$as_me: executing $ac_file commands" >&6;} 22857@@ -14363,29 +15041,35 @@ $as_echo "$as_me: executing $ac_file commands" >&6;}
22921 # Older Autoconf quotes --file arguments for eval, but not when files 22858 # Older Autoconf quotes --file arguments for eval, but not when files
22922 # are listed without --file. Let's play safe and only enable the eval 22859 # are listed without --file. Let's play safe and only enable the eval
22923 # if we detect the quoting. 22860 # if we detect the quoting.
@@ -22972,7 +22909,7 @@ index f7ad9c5e29a..78e875956ae 100755
22972 sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ 22909 sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
22973 s//\1/ 22910 s//\1/
22974 q 22911 q
22975@@ -14372,53 +15056,50 @@ $as_echo X"$mf" | 22912@@ -14403,53 +15087,50 @@ $as_echo X"$mf" |
22976 q 22913 q
22977 } 22914 }
22978 s/.*/./; q'` 22915 s/.*/./; q'`
@@ -23059,7 +22996,7 @@ index f7ad9c5e29a..78e875956ae 100755
23059 } 22996 }
23060 ;; 22997 ;;
23061 "libtool":C) 22998 "libtool":C)
23062@@ -14442,7 +15123,8 @@ $as_echo X"$file" | 22999@@ -14473,7 +15154,8 @@ $as_echo X"$file" |
23063 # NOTE: Changes made to this file will be lost: look at ltmain.sh. 23000 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
23064 # 23001 #
23065 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 23002 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
@@ -23069,7 +23006,7 @@ index f7ad9c5e29a..78e875956ae 100755
23069 # Written by Gordon Matzigkeit, 1996 23006 # Written by Gordon Matzigkeit, 1996
23070 # 23007 #
23071 # This file is part of GNU Libtool. 23008 # This file is part of GNU Libtool.
23072@@ -14545,19 +15227,42 @@ SP2NL=$lt_lt_SP2NL 23009@@ -14576,19 +15258,42 @@ SP2NL=$lt_lt_SP2NL
23073 # turn newlines into spaces. 23010 # turn newlines into spaces.
23074 NL2SP=$lt_lt_NL2SP 23011 NL2SP=$lt_lt_NL2SP
23075 23012
@@ -23113,7 +23050,7 @@ index f7ad9c5e29a..78e875956ae 100755
23113 # A symbol stripping program. 23050 # A symbol stripping program.
23114 STRIP=$lt_STRIP 23051 STRIP=$lt_STRIP
23115 23052
23116@@ -14587,6 +15292,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address 23053@@ -14618,6 +15323,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
23117 # Transform the output of nm in a C name address pair when lib prefix is needed. 23054 # Transform the output of nm in a C name address pair when lib prefix is needed.
23118 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix 23055 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
23119 23056
@@ -23126,7 +23063,7 @@ index f7ad9c5e29a..78e875956ae 100755
23126 # The name of the directory that contains temporary libtool files. 23063 # The name of the directory that contains temporary libtool files.
23127 objdir=$objdir 23064 objdir=$objdir
23128 23065
23129@@ -14596,6 +15307,9 @@ MAGIC_CMD=$MAGIC_CMD 23066@@ -14627,6 +15338,9 @@ MAGIC_CMD=$MAGIC_CMD
23130 # Must we lock files when doing compilation? 23067 # Must we lock files when doing compilation?
23131 need_locks=$lt_need_locks 23068 need_locks=$lt_need_locks
23132 23069
@@ -23136,7 +23073,7 @@ index f7ad9c5e29a..78e875956ae 100755
23136 # Tool to manipulate archived DWARF debug symbol files on Mac OS X. 23073 # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
23137 DSYMUTIL=$lt_DSYMUTIL 23074 DSYMUTIL=$lt_DSYMUTIL
23138 23075
23139@@ -14710,12 +15424,12 @@ with_gcc=$GCC 23076@@ -14741,12 +15455,12 @@ with_gcc=$GCC
23140 # Compiler flag to turn off builtin functions. 23077 # Compiler flag to turn off builtin functions.
23141 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag 23078 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
23142 23079
@@ -23152,7 +23089,7 @@ index f7ad9c5e29a..78e875956ae 100755
23152 # Compiler flag to prevent dynamic linking. 23089 # Compiler flag to prevent dynamic linking.
23153 link_static_flag=$lt_lt_prog_compiler_static 23090 link_static_flag=$lt_lt_prog_compiler_static
23154 23091
23155@@ -14802,9 +15516,6 @@ inherit_rpath=$inherit_rpath 23092@@ -14833,9 +15547,6 @@ inherit_rpath=$inherit_rpath
23156 # Whether libtool must link a program against all its dependency libraries. 23093 # Whether libtool must link a program against all its dependency libraries.
23157 link_all_deplibs=$link_all_deplibs 23094 link_all_deplibs=$link_all_deplibs
23158 23095
@@ -23162,7 +23099,7 @@ index f7ad9c5e29a..78e875956ae 100755
23162 # Set to "yes" if exported symbols are required. 23099 # Set to "yes" if exported symbols are required.
23163 always_export_symbols=$always_export_symbols 23100 always_export_symbols=$always_export_symbols
23164 23101
23165@@ -14820,6 +15531,9 @@ include_expsyms=$lt_include_expsyms 23102@@ -14851,6 +15562,9 @@ include_expsyms=$lt_include_expsyms
23166 # Commands necessary for linking programs (against libraries) with templates. 23103 # Commands necessary for linking programs (against libraries) with templates.
23167 prelink_cmds=$lt_prelink_cmds 23104 prelink_cmds=$lt_prelink_cmds
23168 23105
@@ -23172,7 +23109,7 @@ index f7ad9c5e29a..78e875956ae 100755
23172 # Specify filename containing input files. 23109 # Specify filename containing input files.
23173 file_list_spec=$lt_file_list_spec 23110 file_list_spec=$lt_file_list_spec
23174 23111
23175@@ -14852,210 +15566,169 @@ ltmain="$ac_aux_dir/ltmain.sh" 23112@@ -14883,210 +15597,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
23176 # if finds mixed CR/LF and LF-only lines. Since sed operates in 23113 # if finds mixed CR/LF and LF-only lines. Since sed operates in
23177 # text mode, it properly converts lines to CR/LF. This bash problem 23114 # text mode, it properly converts lines to CR/LF. This bash problem
23178 # is reportedly fixed, but why not run on old versions too? 23115 # is reportedly fixed, but why not run on old versions too?
@@ -23547,7 +23484,7 @@ index f7ad9c5e29a..78e875956ae 100755
23547 chmod +x "$ofile" 23484 chmod +x "$ofile"
23548 23485
23549diff --git a/libtool.m4 b/libtool.m4 23486diff --git a/libtool.m4 b/libtool.m4
23550index ad63ebbb385..b65c22bf80d 100644 23487index e36fdd3c0e2..4acf9d67956 100644
23551--- a/libtool.m4 23488--- a/libtool.m4
23552+++ b/libtool.m4 23489+++ b/libtool.m4
23553@@ -1,7 +1,8 @@ 23490@@ -1,7 +1,8 @@
@@ -23631,7 +23568,7 @@ index ad63ebbb385..b65c22bf80d 100644
23631 cat > conftest.c << _LT_EOF 23568 cat > conftest.c << _LT_EOF
23632 int main() { return 0;} 23569 int main() { return 0;}
23633 _LT_EOF 23570 _LT_EOF
23634@@ -1069,30 +1073,41 @@ m4_defun([_LT_DARWIN_LINKER_FEATURES], 23571@@ -1071,30 +1075,41 @@ m4_defun([_LT_DARWIN_LINKER_FEATURES],
23635 fi 23572 fi
23636 ]) 23573 ])
23637 23574
@@ -23689,7 +23626,7 @@ index ad63ebbb385..b65c22bf80d 100644
23689 ])# _LT_SYS_MODULE_PATH_AIX 23626 ])# _LT_SYS_MODULE_PATH_AIX
23690 23627
23691 23628
23692@@ -1117,7 +1132,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO 23629@@ -1119,7 +1134,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
23693 23630
23694 AC_MSG_CHECKING([how to print strings]) 23631 AC_MSG_CHECKING([how to print strings])
23695 # Test print first, because it will be a builtin if present. 23632 # Test print first, because it will be a builtin if present.
@@ -23698,7 +23635,7 @@ index ad63ebbb385..b65c22bf80d 100644
23698 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then 23635 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
23699 ECHO='print -r --' 23636 ECHO='print -r --'
23700 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then 23637 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
23701@@ -1161,6 +1176,39 @@ _LT_DECL([], [ECHO], [1], [An echo program that protects backslashes]) 23638@@ -1163,6 +1178,39 @@ _LT_DECL([], [ECHO], [1], [An echo program that protects backslashes])
23702 ])# _LT_PROG_ECHO_BACKSLASH 23639 ])# _LT_PROG_ECHO_BACKSLASH
23703 23640
23704 23641
@@ -23738,7 +23675,7 @@ index ad63ebbb385..b65c22bf80d 100644
23738 # _LT_ENABLE_LOCK 23675 # _LT_ENABLE_LOCK
23739 # --------------- 23676 # ---------------
23740 m4_defun([_LT_ENABLE_LOCK], 23677 m4_defun([_LT_ENABLE_LOCK],
23741@@ -1320,6 +1368,51 @@ need_locks="$enable_libtool_lock" 23678@@ -1322,6 +1370,51 @@ need_locks="$enable_libtool_lock"
23742 ])# _LT_ENABLE_LOCK 23679 ])# _LT_ENABLE_LOCK
23743 23680
23744 23681
@@ -23790,7 +23727,7 @@ index ad63ebbb385..b65c22bf80d 100644
23790 # _LT_CMD_OLD_ARCHIVE 23727 # _LT_CMD_OLD_ARCHIVE
23791 # ------------------- 23728 # -------------------
23792 m4_defun([_LT_CMD_OLD_ARCHIVE], 23729 m4_defun([_LT_CMD_OLD_ARCHIVE],
23793@@ -1336,23 +1429,7 @@ for plugin in $plugin_names; do 23730@@ -1338,23 +1431,7 @@ for plugin in $plugin_names; do
23794 fi 23731 fi
23795 done 23732 done
23796 23733
@@ -23815,7 +23752,7 @@ index ad63ebbb385..b65c22bf80d 100644
23815 23752
23816 AC_CHECK_TOOL(STRIP, strip, :) 23753 AC_CHECK_TOOL(STRIP, strip, :)
23817 test -z "$STRIP" && STRIP=: 23754 test -z "$STRIP" && STRIP=:
23818@@ -1653,7 +1730,7 @@ else 23755@@ -1655,7 +1732,7 @@ else
23819 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 23756 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
23820 lt_status=$lt_dlunknown 23757 lt_status=$lt_dlunknown
23821 cat > conftest.$ac_ext <<_LT_EOF 23758 cat > conftest.$ac_ext <<_LT_EOF
@@ -23824,7 +23761,7 @@ index ad63ebbb385..b65c22bf80d 100644
23824 #include "confdefs.h" 23761 #include "confdefs.h"
23825 23762
23826 #if HAVE_DLFCN_H 23763 #if HAVE_DLFCN_H
23827@@ -1697,10 +1774,10 @@ else 23764@@ -1699,10 +1776,10 @@ else
23828 /* When -fvisbility=hidden is used, assume the code has been annotated 23765 /* When -fvisbility=hidden is used, assume the code has been annotated
23829 correspondingly for the symbols needed. */ 23766 correspondingly for the symbols needed. */
23830 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 23767 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
@@ -23837,7 +23774,7 @@ index ad63ebbb385..b65c22bf80d 100644
23837 int main () 23774 int main ()
23838 { 23775 {
23839 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 23776 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
23840@@ -2240,8 +2317,9 @@ cygwin* | mingw* | pw32* | cegcc*) 23777@@ -2242,8 +2319,9 @@ cygwin* | mingw* | pw32* | cegcc*)
23841 need_version=no 23778 need_version=no
23842 need_lib_prefix=no 23779 need_lib_prefix=no
23843 23780
@@ -23849,7 +23786,7 @@ index ad63ebbb385..b65c22bf80d 100644
23849 library_names_spec='$libname.dll.a' 23786 library_names_spec='$libname.dll.a'
23850 # DLL is installed to $(libdir)/../bin by postinstall_cmds 23787 # DLL is installed to $(libdir)/../bin by postinstall_cmds
23851 postinstall_cmds='base_file=`basename \${file}`~ 23788 postinstall_cmds='base_file=`basename \${file}`~
23852@@ -2274,13 +2352,71 @@ m4_if([$1], [],[ 23789@@ -2276,13 +2354,71 @@ m4_if([$1], [],[
23853 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' 23790 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
23854 ;; 23791 ;;
23855 esac 23792 esac
@@ -23922,7 +23859,7 @@ index ad63ebbb385..b65c22bf80d 100644
23922 # FIXME: first we should search . and the directory the executable is in 23859 # FIXME: first we should search . and the directory the executable is in
23923 shlibpath_var=PATH 23860 shlibpath_var=PATH
23924 ;; 23861 ;;
23925@@ -2970,6 +3106,11 @@ case $reload_flag in 23862@@ -2996,6 +3132,11 @@ case $reload_flag in
23926 esac 23863 esac
23927 reload_cmds='$LD$reload_flag -o $output$reload_objs' 23864 reload_cmds='$LD$reload_flag -o $output$reload_objs'
23928 case $host_os in 23865 case $host_os in
@@ -23934,7 +23871,7 @@ index ad63ebbb385..b65c22bf80d 100644
23934 darwin*) 23871 darwin*)
23935 if test "$GCC" = yes; then 23872 if test "$GCC" = yes; then
23936 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' 23873 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
23937@@ -3036,7 +3177,8 @@ mingw* | pw32*) 23874@@ -3062,7 +3203,8 @@ mingw* | pw32*)
23938 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' 23875 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
23939 lt_cv_file_magic_cmd='func_win32_libid' 23876 lt_cv_file_magic_cmd='func_win32_libid'
23940 else 23877 else
@@ -23944,7 +23881,7 @@ index ad63ebbb385..b65c22bf80d 100644
23944 lt_cv_file_magic_cmd='$OBJDUMP -f' 23881 lt_cv_file_magic_cmd='$OBJDUMP -f'
23945 fi 23882 fi
23946 ;; 23883 ;;
23947@@ -3187,6 +3329,21 @@ tpf*) 23884@@ -3218,6 +3360,21 @@ vxworks*)
23948 ;; 23885 ;;
23949 esac 23886 esac
23950 ]) 23887 ])
@@ -23966,7 +23903,7 @@ index ad63ebbb385..b65c22bf80d 100644
23966 file_magic_cmd=$lt_cv_file_magic_cmd 23903 file_magic_cmd=$lt_cv_file_magic_cmd
23967 deplibs_check_method=$lt_cv_deplibs_check_method 23904 deplibs_check_method=$lt_cv_deplibs_check_method
23968 test -z "$deplibs_check_method" && deplibs_check_method=unknown 23905 test -z "$deplibs_check_method" && deplibs_check_method=unknown
23969@@ -3194,7 +3351,11 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown 23906@@ -3225,7 +3382,11 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
23970 _LT_DECL([], [deplibs_check_method], [1], 23907 _LT_DECL([], [deplibs_check_method], [1],
23971 [Method to check whether dependent libraries are shared objects]) 23908 [Method to check whether dependent libraries are shared objects])
23972 _LT_DECL([], [file_magic_cmd], [1], 23909 _LT_DECL([], [file_magic_cmd], [1],
@@ -23979,7 +23916,7 @@ index ad63ebbb385..b65c22bf80d 100644
23979 ])# _LT_CHECK_MAGIC_METHOD 23916 ])# _LT_CHECK_MAGIC_METHOD
23980 23917
23981 23918
23982@@ -3305,6 +3466,67 @@ dnl aclocal-1.4 backwards compatibility: 23919@@ -3336,6 +3497,67 @@ dnl aclocal-1.4 backwards compatibility:
23983 dnl AC_DEFUN([AM_PROG_NM], []) 23920 dnl AC_DEFUN([AM_PROG_NM], [])
23984 dnl AC_DEFUN([AC_PROG_NM], []) 23921 dnl AC_DEFUN([AC_PROG_NM], [])
23985 23922
@@ -24047,7 +23984,7 @@ index ad63ebbb385..b65c22bf80d 100644
24047 23984
24048 # LT_LIB_M 23985 # LT_LIB_M
24049 # -------- 23986 # --------
24050@@ -3431,8 +3653,8 @@ esac 23987@@ -3462,8 +3684,8 @@ esac
24051 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" 23988 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
24052 23989
24053 # Transform an extracted symbol line into symbol name and symbol address 23990 # Transform an extracted symbol line into symbol name and symbol address
@@ -24058,7 +23995,7 @@ index ad63ebbb385..b65c22bf80d 100644
24058 23995
24059 # Handle CRLF in mingw tool chain 23996 # Handle CRLF in mingw tool chain
24060 opt_cr= 23997 opt_cr=
24061@@ -3468,6 +3690,7 @@ for ac_symprfx in "" "_"; do 23998@@ -3499,6 +3721,7 @@ for ac_symprfx in "" "_"; do
24062 else 23999 else
24063 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" 24000 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
24064 fi 24001 fi
@@ -24066,7 +24003,7 @@ index ad63ebbb385..b65c22bf80d 100644
24066 24003
24067 # Check to see that the pipe works correctly. 24004 # Check to see that the pipe works correctly.
24068 pipe_works=no 24005 pipe_works=no
24069@@ -3501,6 +3724,18 @@ _LT_EOF 24006@@ -3532,6 +3755,18 @@ _LT_EOF
24070 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then 24007 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
24071 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then 24008 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
24072 cat <<_LT_EOF > conftest.$ac_ext 24009 cat <<_LT_EOF > conftest.$ac_ext
@@ -24085,7 +24022,7 @@ index ad63ebbb385..b65c22bf80d 100644
24085 #ifdef __cplusplus 24022 #ifdef __cplusplus
24086 extern "C" { 24023 extern "C" {
24087 #endif 24024 #endif
24088@@ -3512,7 +3747,7 @@ _LT_EOF 24025@@ -3543,7 +3778,7 @@ _LT_EOF
24089 cat <<_LT_EOF >> conftest.$ac_ext 24026 cat <<_LT_EOF >> conftest.$ac_ext
24090 24027
24091 /* The mapping between symbol names and symbols. */ 24028 /* The mapping between symbol names and symbols. */
@@ -24094,7 +24031,7 @@ index ad63ebbb385..b65c22bf80d 100644
24094 const char *name; 24031 const char *name;
24095 void *address; 24032 void *address;
24096 } 24033 }
24097@@ -3538,15 +3773,15 @@ static const void *lt_preloaded_setup() { 24034@@ -3569,15 +3804,15 @@ static const void *lt_preloaded_setup() {
24098 _LT_EOF 24035 _LT_EOF
24099 # Now try linking the two files. 24036 # Now try linking the two files.
24100 mv conftest.$ac_objext conftstm.$ac_objext 24037 mv conftest.$ac_objext conftstm.$ac_objext
@@ -24114,7 +24051,7 @@ index ad63ebbb385..b65c22bf80d 100644
24114 else 24051 else
24115 echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD 24052 echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD
24116 fi 24053 fi
24117@@ -3579,6 +3814,13 @@ else 24054@@ -3610,6 +3845,13 @@ else
24118 AC_MSG_RESULT(ok) 24055 AC_MSG_RESULT(ok)
24119 fi 24056 fi
24120 24057
@@ -24128,7 +24065,7 @@ index ad63ebbb385..b65c22bf80d 100644
24128 _LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1], 24065 _LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1],
24129 [Take the output of nm and produce a listing of raw symbols and C names]) 24066 [Take the output of nm and produce a listing of raw symbols and C names])
24130 _LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1], 24067 _LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1],
24131@@ -3589,6 +3831,8 @@ _LT_DECL([global_symbol_to_c_name_address], 24068@@ -3620,6 +3862,8 @@ _LT_DECL([global_symbol_to_c_name_address],
24132 _LT_DECL([global_symbol_to_c_name_address_lib_prefix], 24069 _LT_DECL([global_symbol_to_c_name_address_lib_prefix],
24133 [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1], 24070 [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1],
24134 [Transform the output of nm in a C name address pair when lib prefix is needed]) 24071 [Transform the output of nm in a C name address pair when lib prefix is needed])
@@ -24137,7 +24074,7 @@ index ad63ebbb385..b65c22bf80d 100644
24137 ]) # _LT_CMD_GLOBAL_SYMBOLS 24074 ]) # _LT_CMD_GLOBAL_SYMBOLS
24138 24075
24139 24076
24140@@ -3600,7 +3844,6 @@ _LT_TAGVAR(lt_prog_compiler_wl, $1)= 24077@@ -3631,7 +3875,6 @@ _LT_TAGVAR(lt_prog_compiler_wl, $1)=
24141 _LT_TAGVAR(lt_prog_compiler_pic, $1)= 24078 _LT_TAGVAR(lt_prog_compiler_pic, $1)=
24142 _LT_TAGVAR(lt_prog_compiler_static, $1)= 24079 _LT_TAGVAR(lt_prog_compiler_static, $1)=
24143 24080
@@ -24145,7 +24082,7 @@ index ad63ebbb385..b65c22bf80d 100644
24145 m4_if([$1], [CXX], [ 24082 m4_if([$1], [CXX], [
24146 # C++ specific cases for pic, static, wl, etc. 24083 # C++ specific cases for pic, static, wl, etc.
24147 if test "$GXX" = yes; then 24084 if test "$GXX" = yes; then
24148@@ -3706,6 +3949,12 @@ m4_if([$1], [CXX], [ 24085@@ -3737,6 +3980,12 @@ m4_if([$1], [CXX], [
24149 ;; 24086 ;;
24150 esac 24087 esac
24151 ;; 24088 ;;
@@ -24158,7 +24095,7 @@ index ad63ebbb385..b65c22bf80d 100644
24158 dgux*) 24095 dgux*)
24159 case $cc_basename in 24096 case $cc_basename in
24160 ec++*) 24097 ec++*)
24161@@ -3858,7 +4107,7 @@ m4_if([$1], [CXX], [ 24098@@ -3889,7 +4138,7 @@ m4_if([$1], [CXX], [
24162 ;; 24099 ;;
24163 solaris*) 24100 solaris*)
24164 case $cc_basename in 24101 case $cc_basename in
@@ -24167,7 +24104,7 @@ index ad63ebbb385..b65c22bf80d 100644
24167 # Sun C++ 4.2, 5.x and Centerline C++ 24104 # Sun C++ 4.2, 5.x and Centerline C++
24168 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' 24105 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
24169 _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' 24106 _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
24170@@ -4081,6 +4330,12 @@ m4_if([$1], [CXX], [ 24107@@ -4112,6 +4361,12 @@ m4_if([$1], [CXX], [
24171 _LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared' 24108 _LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared'
24172 _LT_TAGVAR(lt_prog_compiler_static, $1)='--static' 24109 _LT_TAGVAR(lt_prog_compiler_static, $1)='--static'
24173 ;; 24110 ;;
@@ -24180,7 +24117,7 @@ index ad63ebbb385..b65c22bf80d 100644
24180 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) 24117 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
24181 # Portland Group compilers (*not* the Pentium gcc compiler, 24118 # Portland Group compilers (*not* the Pentium gcc compiler,
24182 # which looks to be a dead project) 24119 # which looks to be a dead project)
24183@@ -4143,7 +4398,7 @@ m4_if([$1], [CXX], [ 24120@@ -4174,7 +4429,7 @@ m4_if([$1], [CXX], [
24184 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' 24121 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
24185 _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' 24122 _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
24186 case $cc_basename in 24123 case $cc_basename in
@@ -24189,7 +24126,7 @@ index ad63ebbb385..b65c22bf80d 100644
24189 _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';; 24126 _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';;
24190 *) 24127 *)
24191 _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';; 24128 _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';;
24192@@ -4200,9 +4455,11 @@ case $host_os in 24129@@ -4231,9 +4486,11 @@ case $host_os in
24193 _LT_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])" 24130 _LT_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])"
24194 ;; 24131 ;;
24195 esac 24132 esac
@@ -24204,7 +24141,7 @@ index ad63ebbb385..b65c22bf80d 100644
24204 24141
24205 # 24142 #
24206 # Check to make sure the PIC flag actually works. 24143 # Check to make sure the PIC flag actually works.
24207@@ -4221,6 +4478,8 @@ fi 24144@@ -4252,6 +4509,8 @@ fi
24208 _LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1], 24145 _LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1],
24209 [Additional compiler flags for building library objects]) 24146 [Additional compiler flags for building library objects])
24210 24147
@@ -24213,7 +24150,7 @@ index ad63ebbb385..b65c22bf80d 100644
24213 # 24150 #
24214 # Check to make sure the static flag actually works. 24151 # Check to make sure the static flag actually works.
24215 # 24152 #
24216@@ -4241,6 +4500,7 @@ _LT_TAGDECL([link_static_flag], [lt_prog_compiler_static], [1], 24153@@ -4272,6 +4531,7 @@ _LT_TAGDECL([link_static_flag], [lt_prog_compiler_static], [1],
24217 m4_defun([_LT_LINKER_SHLIBS], 24154 m4_defun([_LT_LINKER_SHLIBS],
24218 [AC_REQUIRE([LT_PATH_LD])dnl 24155 [AC_REQUIRE([LT_PATH_LD])dnl
24219 AC_REQUIRE([LT_PATH_NM])dnl 24156 AC_REQUIRE([LT_PATH_NM])dnl
@@ -24221,7 +24158,7 @@ index ad63ebbb385..b65c22bf80d 100644
24221 m4_require([_LT_FILEUTILS_DEFAULTS])dnl 24158 m4_require([_LT_FILEUTILS_DEFAULTS])dnl
24222 m4_require([_LT_DECL_EGREP])dnl 24159 m4_require([_LT_DECL_EGREP])dnl
24223 m4_require([_LT_DECL_SED])dnl 24160 m4_require([_LT_DECL_SED])dnl
24224@@ -4249,6 +4509,7 @@ m4_require([_LT_TAG_COMPILER])dnl 24161@@ -4280,6 +4540,7 @@ m4_require([_LT_TAG_COMPILER])dnl
24225 AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) 24162 AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
24226 m4_if([$1], [CXX], [ 24163 m4_if([$1], [CXX], [
24227 _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' 24164 _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
@@ -24229,7 +24166,7 @@ index ad63ebbb385..b65c22bf80d 100644
24229 case $host_os in 24166 case $host_os in
24230 aix[[4-9]]*) 24167 aix[[4-9]]*)
24231 # If we're using GNU nm, then we don't want the "-C" option. 24168 # If we're using GNU nm, then we don't want the "-C" option.
24232@@ -4263,15 +4524,20 @@ m4_if([$1], [CXX], [ 24169@@ -4294,15 +4555,20 @@ m4_if([$1], [CXX], [
24233 ;; 24170 ;;
24234 pw32*) 24171 pw32*)
24235 _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds" 24172 _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
@@ -24255,7 +24192,7 @@ index ad63ebbb385..b65c22bf80d 100644
24255 ], [ 24192 ], [
24256 runpath_var= 24193 runpath_var=
24257 _LT_TAGVAR(allow_undefined_flag, $1)= 24194 _LT_TAGVAR(allow_undefined_flag, $1)=
24258@@ -4439,7 +4705,8 @@ _LT_EOF 24195@@ -4470,7 +4736,8 @@ _LT_EOF
24259 _LT_TAGVAR(allow_undefined_flag, $1)=unsupported 24196 _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
24260 _LT_TAGVAR(always_export_symbols, $1)=no 24197 _LT_TAGVAR(always_export_symbols, $1)=no
24261 _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes 24198 _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
@@ -24265,7 +24202,7 @@ index ad63ebbb385..b65c22bf80d 100644
24265 24202
24266 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then 24203 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
24267 _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' 24204 _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'
24268@@ -4538,12 +4805,12 @@ _LT_EOF 24205@@ -4569,12 +4836,12 @@ _LT_EOF
24269 _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive' 24206 _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive'
24270 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= 24207 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
24271 _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir' 24208 _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
@@ -24280,7 +24217,7 @@ index ad63ebbb385..b65c22bf80d 100644
24280 fi 24217 fi
24281 ;; 24218 ;;
24282 esac 24219 esac
24283@@ -4557,8 +4824,8 @@ _LT_EOF 24220@@ -4588,8 +4855,8 @@ _LT_EOF
24284 _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' 24221 _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
24285 wlarc= 24222 wlarc=
24286 else 24223 else
@@ -24291,7 +24228,7 @@ index ad63ebbb385..b65c22bf80d 100644
24291 fi 24228 fi
24292 ;; 24229 ;;
24293 24230
24294@@ -4576,8 +4843,8 @@ _LT_EOF 24231@@ -4607,8 +4874,8 @@ _LT_EOF
24295 24232
24296 _LT_EOF 24233 _LT_EOF
24297 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 24234 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -24302,7 +24239,7 @@ index ad63ebbb385..b65c22bf80d 100644
24302 else 24239 else
24303 _LT_TAGVAR(ld_shlibs, $1)=no 24240 _LT_TAGVAR(ld_shlibs, $1)=no
24304 fi 24241 fi
24305@@ -4623,8 +4890,8 @@ _LT_EOF 24242@@ -4654,8 +4921,8 @@ _LT_EOF
24306 24243
24307 *) 24244 *)
24308 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 24245 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -24313,7 +24250,7 @@ index ad63ebbb385..b65c22bf80d 100644
24313 else 24250 else
24314 _LT_TAGVAR(ld_shlibs, $1)=no 24251 _LT_TAGVAR(ld_shlibs, $1)=no
24315 fi 24252 fi
24316@@ -4754,7 +5021,7 @@ _LT_EOF 24253@@ -4785,7 +5052,7 @@ _LT_EOF
24317 _LT_TAGVAR(allow_undefined_flag, $1)='-berok' 24254 _LT_TAGVAR(allow_undefined_flag, $1)='-berok'
24318 # Determine the default libpath from the value encoded in an 24255 # Determine the default libpath from the value encoded in an
24319 # empty executable. 24256 # empty executable.
@@ -24322,7 +24259,7 @@ index ad63ebbb385..b65c22bf80d 100644
24322 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" 24259 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
24323 _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" 24260 _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"
24324 else 24261 else
24325@@ -4765,7 +5032,7 @@ _LT_EOF 24262@@ -4796,7 +5063,7 @@ _LT_EOF
24326 else 24263 else
24327 # Determine the default libpath from the value encoded in an 24264 # Determine the default libpath from the value encoded in an
24328 # empty executable. 24265 # empty executable.
@@ -24331,7 +24268,7 @@ index ad63ebbb385..b65c22bf80d 100644
24331 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" 24268 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
24332 # Warning - without using the other run time loading flags, 24269 # Warning - without using the other run time loading flags,
24333 # -berok will link without error, but may produce a broken library. 24270 # -berok will link without error, but may produce a broken library.
24334@@ -4809,20 +5076,63 @@ _LT_EOF 24271@@ -4840,20 +5107,63 @@ _LT_EOF
24335 # Microsoft Visual C++. 24272 # Microsoft Visual C++.
24336 # hardcode_libdir_flag_spec is actually meaningless, as there is 24273 # hardcode_libdir_flag_spec is actually meaningless, as there is
24337 # no search path for DLLs. 24274 # no search path for DLLs.
@@ -24409,7 +24346,7 @@ index ad63ebbb385..b65c22bf80d 100644
24409 ;; 24346 ;;
24410 24347
24411 darwin* | rhapsody*) 24348 darwin* | rhapsody*)
24412@@ -4856,7 +5166,7 @@ _LT_EOF 24349@@ -4887,7 +5197,7 @@ _LT_EOF
24413 24350
24414 # FreeBSD 3 and greater uses gcc -shared to do shared libraries. 24351 # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
24415 freebsd* | dragonfly*) 24352 freebsd* | dragonfly*)
@@ -24418,7 +24355,7 @@ index ad63ebbb385..b65c22bf80d 100644
24418 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' 24355 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
24419 _LT_TAGVAR(hardcode_direct, $1)=yes 24356 _LT_TAGVAR(hardcode_direct, $1)=yes
24420 _LT_TAGVAR(hardcode_shlibpath_var, $1)=no 24357 _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
24421@@ -4864,7 +5174,7 @@ _LT_EOF 24358@@ -4895,7 +5205,7 @@ _LT_EOF
24422 24359
24423 hpux9*) 24360 hpux9*)
24424 if test "$GCC" = yes; then 24361 if test "$GCC" = yes; then
@@ -24427,7 +24364,7 @@ index ad63ebbb385..b65c22bf80d 100644
24427 else 24364 else
24428 _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' 24365 _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'
24429 fi 24366 fi
24430@@ -4880,7 +5190,7 @@ _LT_EOF 24367@@ -4911,7 +5221,7 @@ _LT_EOF
24431 24368
24432 hpux10*) 24369 hpux10*)
24433 if test "$GCC" = yes && test "$with_gnu_ld" = no; then 24370 if test "$GCC" = yes && test "$with_gnu_ld" = no; then
@@ -24436,8 +24373,8 @@ index ad63ebbb385..b65c22bf80d 100644
24436 else 24373 else
24437 _LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' 24374 _LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
24438 fi 24375 fi
24439@@ -4904,10 +5214,10 @@ _LT_EOF 24376@@ -4935,10 +5245,10 @@ _LT_EOF
24440 _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' 24377 _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
24441 ;; 24378 ;;
24442 ia64*) 24379 ia64*)
24443- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' 24380- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
@@ -24449,7 +24386,7 @@ index ad63ebbb385..b65c22bf80d 100644
24449 ;; 24386 ;;
24450 esac 24387 esac
24451 else 24388 else
24452@@ -4954,16 +5264,31 @@ _LT_EOF 24389@@ -4985,16 +5295,31 @@ _LT_EOF
24453 24390
24454 irix5* | irix6* | nonstopux*) 24391 irix5* | irix6* | nonstopux*)
24455 if test "$GCC" = yes; then 24392 if test "$GCC" = yes; then
@@ -24488,7 +24425,7 @@ index ad63ebbb385..b65c22bf80d 100644
24488 else 24425 else
24489 _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' 24426 _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'
24490 _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' 24427 _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'
24491@@ -5048,7 +5373,7 @@ _LT_EOF 24428@@ -5079,7 +5404,7 @@ _LT_EOF
24492 osf4* | osf5*) # as osf3* with the addition of -msym flag 24429 osf4* | osf5*) # as osf3* with the addition of -msym flag
24493 if test "$GCC" = yes; then 24430 if test "$GCC" = yes; then
24494 _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' 24431 _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
@@ -24497,7 +24434,7 @@ index ad63ebbb385..b65c22bf80d 100644
24497 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' 24434 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
24498 else 24435 else
24499 _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' 24436 _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
24500@@ -5067,9 +5392,9 @@ _LT_EOF 24437@@ -5098,9 +5423,9 @@ _LT_EOF
24501 _LT_TAGVAR(no_undefined_flag, $1)=' -z defs' 24438 _LT_TAGVAR(no_undefined_flag, $1)=' -z defs'
24502 if test "$GCC" = yes; then 24439 if test "$GCC" = yes; then
24503 wlarc='${wl}' 24440 wlarc='${wl}'
@@ -24509,7 +24446,7 @@ index ad63ebbb385..b65c22bf80d 100644
24509 else 24446 else
24510 case `$CC -V 2>&1` in 24447 case `$CC -V 2>&1` in
24511 *"Compilers 5.0"*) 24448 *"Compilers 5.0"*)
24512@@ -5341,8 +5666,6 @@ _LT_TAGDECL([], [inherit_rpath], [0], 24449@@ -5372,8 +5697,6 @@ _LT_TAGDECL([], [inherit_rpath], [0],
24513 to runtime path list]) 24450 to runtime path list])
24514 _LT_TAGDECL([], [link_all_deplibs], [0], 24451 _LT_TAGDECL([], [link_all_deplibs], [0],
24515 [Whether libtool must link a program against all its dependency libraries]) 24452 [Whether libtool must link a program against all its dependency libraries])
@@ -24518,7 +24455,7 @@ index ad63ebbb385..b65c22bf80d 100644
24518 _LT_TAGDECL([], [always_export_symbols], [0], 24455 _LT_TAGDECL([], [always_export_symbols], [0],
24519 [Set to "yes" if exported symbols are required]) 24456 [Set to "yes" if exported symbols are required])
24520 _LT_TAGDECL([], [export_symbols_cmds], [2], 24457 _LT_TAGDECL([], [export_symbols_cmds], [2],
24521@@ -5353,6 +5676,8 @@ _LT_TAGDECL([], [include_expsyms], [1], 24458@@ -5384,6 +5707,8 @@ _LT_TAGDECL([], [include_expsyms], [1],
24522 [Symbols that must always be exported]) 24459 [Symbols that must always be exported])
24523 _LT_TAGDECL([], [prelink_cmds], [2], 24460 _LT_TAGDECL([], [prelink_cmds], [2],
24524 [Commands necessary for linking programs (against libraries) with templates]) 24461 [Commands necessary for linking programs (against libraries) with templates])
@@ -24527,7 +24464,7 @@ index ad63ebbb385..b65c22bf80d 100644
24527 _LT_TAGDECL([], [file_list_spec], [1], 24464 _LT_TAGDECL([], [file_list_spec], [1],
24528 [Specify filename containing input files]) 24465 [Specify filename containing input files])
24529 dnl FIXME: Not yet implemented 24466 dnl FIXME: Not yet implemented
24530@@ -5454,6 +5779,7 @@ CC="$lt_save_CC" 24467@@ -5485,6 +5810,7 @@ CC="$lt_save_CC"
24531 m4_defun([_LT_LANG_CXX_CONFIG], 24468 m4_defun([_LT_LANG_CXX_CONFIG],
24532 [m4_require([_LT_FILEUTILS_DEFAULTS])dnl 24469 [m4_require([_LT_FILEUTILS_DEFAULTS])dnl
24533 m4_require([_LT_DECL_EGREP])dnl 24470 m4_require([_LT_DECL_EGREP])dnl
@@ -24535,7 +24472,7 @@ index ad63ebbb385..b65c22bf80d 100644
24535 if test -n "$CXX" && ( test "X$CXX" != "Xno" && 24472 if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
24536 ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || 24473 ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
24537 (test "X$CXX" != "Xg++"))) ; then 24474 (test "X$CXX" != "Xg++"))) ; then
24538@@ -5515,6 +5841,7 @@ if test "$_lt_caught_CXX_error" != yes; then 24475@@ -5546,6 +5872,7 @@ if test "$_lt_caught_CXX_error" != yes; then
24539 24476
24540 # Allow CC to be a program name with arguments. 24477 # Allow CC to be a program name with arguments.
24541 lt_save_CC=$CC 24478 lt_save_CC=$CC
@@ -24543,7 +24480,7 @@ index ad63ebbb385..b65c22bf80d 100644
24543 lt_save_LD=$LD 24480 lt_save_LD=$LD
24544 lt_save_GCC=$GCC 24481 lt_save_GCC=$GCC
24545 GCC=$GXX 24482 GCC=$GXX
24546@@ -5532,6 +5859,7 @@ if test "$_lt_caught_CXX_error" != yes; then 24483@@ -5563,6 +5890,7 @@ if test "$_lt_caught_CXX_error" != yes; then
24547 fi 24484 fi
24548 test -z "${LDCXX+set}" || LD=$LDCXX 24485 test -z "${LDCXX+set}" || LD=$LDCXX
24549 CC=${CXX-"c++"} 24486 CC=${CXX-"c++"}
@@ -24551,7 +24488,7 @@ index ad63ebbb385..b65c22bf80d 100644
24551 compiler=$CC 24488 compiler=$CC
24552 _LT_TAGVAR(compiler, $1)=$CC 24489 _LT_TAGVAR(compiler, $1)=$CC
24553 _LT_CC_BASENAME([$compiler]) 24490 _LT_CC_BASENAME([$compiler])
24554@@ -5695,7 +6023,7 @@ if test "$_lt_caught_CXX_error" != yes; then 24491@@ -5726,7 +6054,7 @@ if test "$_lt_caught_CXX_error" != yes; then
24555 _LT_TAGVAR(allow_undefined_flag, $1)='-berok' 24492 _LT_TAGVAR(allow_undefined_flag, $1)='-berok'
24556 # Determine the default libpath from the value encoded in an empty 24493 # Determine the default libpath from the value encoded in an empty
24557 # executable. 24494 # executable.
@@ -24560,7 +24497,7 @@ index ad63ebbb385..b65c22bf80d 100644
24560 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" 24497 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
24561 24498
24562 _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" 24499 _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"
24563@@ -5707,7 +6035,7 @@ if test "$_lt_caught_CXX_error" != yes; then 24500@@ -5738,7 +6066,7 @@ if test "$_lt_caught_CXX_error" != yes; then
24564 else 24501 else
24565 # Determine the default libpath from the value encoded in an 24502 # Determine the default libpath from the value encoded in an
24566 # empty executable. 24503 # empty executable.
@@ -24569,7 +24506,7 @@ index ad63ebbb385..b65c22bf80d 100644
24569 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" 24506 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
24570 # Warning - without using the other run time loading flags, 24507 # Warning - without using the other run time loading flags,
24571 # -berok will link without error, but may produce a broken library. 24508 # -berok will link without error, but may produce a broken library.
24572@@ -5749,29 +6077,75 @@ if test "$_lt_caught_CXX_error" != yes; then 24509@@ -5780,29 +6108,75 @@ if test "$_lt_caught_CXX_error" != yes; then
24573 ;; 24510 ;;
24574 24511
24575 cygwin* | mingw* | pw32* | cegcc*) 24512 cygwin* | mingw* | pw32* | cegcc*)
@@ -24668,7 +24605,7 @@ index ad63ebbb385..b65c22bf80d 100644
24668 darwin* | rhapsody*) 24605 darwin* | rhapsody*)
24669 _LT_DARWIN_LINKER_FEATURES($1) 24606 _LT_DARWIN_LINKER_FEATURES($1)
24670 ;; 24607 ;;
24671@@ -5846,7 +6220,7 @@ if test "$_lt_caught_CXX_error" != yes; then 24608@@ -5877,7 +6251,7 @@ if test "$_lt_caught_CXX_error" != yes; then
24672 ;; 24609 ;;
24673 *) 24610 *)
24674 if test "$GXX" = yes; then 24611 if test "$GXX" = yes; then
@@ -24677,8 +24614,8 @@ index ad63ebbb385..b65c22bf80d 100644
24677 else 24614 else
24678 # FIXME: insert proper C++ library support 24615 # FIXME: insert proper C++ library support
24679 _LT_TAGVAR(ld_shlibs, $1)=no 24616 _LT_TAGVAR(ld_shlibs, $1)=no
24680@@ -5917,10 +6291,10 @@ if test "$_lt_caught_CXX_error" != yes; then 24617@@ -5948,10 +6322,10 @@ if test "$_lt_caught_CXX_error" != yes; then
24681 _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' 24618 _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
24682 ;; 24619 ;;
24683 ia64*) 24620 ia64*)
24684- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' 24621- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
@@ -24690,7 +24627,7 @@ index ad63ebbb385..b65c22bf80d 100644
24690 ;; 24627 ;;
24691 esac 24628 esac
24692 fi 24629 fi
24693@@ -5961,9 +6335,9 @@ if test "$_lt_caught_CXX_error" != yes; then 24630@@ -5992,9 +6366,9 @@ if test "$_lt_caught_CXX_error" != yes; then
24694 *) 24631 *)
24695 if test "$GXX" = yes; then 24632 if test "$GXX" = yes; then
24696 if test "$with_gnu_ld" = no; then 24633 if test "$with_gnu_ld" = no; then
@@ -24702,32 +24639,7 @@ index ad63ebbb385..b65c22bf80d 100644
24702 fi 24639 fi
24703 fi 24640 fi
24704 _LT_TAGVAR(link_all_deplibs, $1)=yes 24641 _LT_TAGVAR(link_all_deplibs, $1)=yes
24705@@ -6033,20 +6407,20 @@ if test "$_lt_caught_CXX_error" != yes; then 24642@@ -6272,7 +6646,7 @@ if test "$_lt_caught_CXX_error" != yes; then
24706 _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~
24707 rm -rf $tpldir~
24708 $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
24709- compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"'
24710+ compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"'
24711 _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~
24712 rm -rf $tpldir~
24713 $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
24714- $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~
24715+ $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~
24716 $RANLIB $oldlib'
24717 _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~
24718 rm -rf $tpldir~
24719 $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
24720- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
24721+ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
24722 _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~
24723 rm -rf $tpldir~
24724 $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
24725- $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'
24726+ $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'
24727 ;;
24728 *) # Version 6 and above use weak symbols
24729 _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
24730@@ -6241,7 +6615,7 @@ if test "$_lt_caught_CXX_error" != yes; then
24731 _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' 24643 _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'
24732 ;; 24644 ;;
24733 *) 24645 *)
@@ -24736,7 +24648,7 @@ index ad63ebbb385..b65c22bf80d 100644
24736 ;; 24648 ;;
24737 esac 24649 esac
24738 24650
24739@@ -6287,7 +6661,7 @@ if test "$_lt_caught_CXX_error" != yes; then 24651@@ -6318,7 +6692,7 @@ if test "$_lt_caught_CXX_error" != yes; then
24740 24652
24741 solaris*) 24653 solaris*)
24742 case $cc_basename in 24654 case $cc_basename in
@@ -24745,7 +24657,7 @@ index ad63ebbb385..b65c22bf80d 100644
24745 # Sun C++ 4.2, 5.x and Centerline C++ 24657 # Sun C++ 4.2, 5.x and Centerline C++
24746 _LT_TAGVAR(archive_cmds_need_lc,$1)=yes 24658 _LT_TAGVAR(archive_cmds_need_lc,$1)=yes
24747 _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs' 24659 _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
24748@@ -6328,9 +6702,9 @@ if test "$_lt_caught_CXX_error" != yes; then 24660@@ -6359,9 +6733,9 @@ if test "$_lt_caught_CXX_error" != yes; then
24749 if test "$GXX" = yes && test "$with_gnu_ld" = no; then 24661 if test "$GXX" = yes && test "$with_gnu_ld" = no; then
24750 _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs' 24662 _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
24751 if $CC --version | $GREP -v '^2\.7' > /dev/null; then 24663 if $CC --version | $GREP -v '^2\.7' > /dev/null; then
@@ -24757,7 +24669,7 @@ index ad63ebbb385..b65c22bf80d 100644
24757 24669
24758 # Commands to make compiler produce verbose output that lists 24670 # Commands to make compiler produce verbose output that lists
24759 # what "hidden" libraries, object files and flags are used when 24671 # what "hidden" libraries, object files and flags are used when
24760@@ -6459,6 +6833,7 @@ if test "$_lt_caught_CXX_error" != yes; then 24672@@ -6491,6 +6865,7 @@ if test "$_lt_caught_CXX_error" != yes; then
24761 fi # test -n "$compiler" 24673 fi # test -n "$compiler"
24762 24674
24763 CC=$lt_save_CC 24675 CC=$lt_save_CC
@@ -24765,7 +24677,7 @@ index ad63ebbb385..b65c22bf80d 100644
24765 LDCXX=$LD 24677 LDCXX=$LD
24766 LD=$lt_save_LD 24678 LD=$lt_save_LD
24767 GCC=$lt_save_GCC 24679 GCC=$lt_save_GCC
24768@@ -6473,6 +6848,29 @@ AC_LANG_POP 24680@@ -6505,6 +6880,29 @@ AC_LANG_POP
24769 ])# _LT_LANG_CXX_CONFIG 24681 ])# _LT_LANG_CXX_CONFIG
24770 24682
24771 24683
@@ -24795,7 +24707,7 @@ index ad63ebbb385..b65c22bf80d 100644
24795 # _LT_SYS_HIDDEN_LIBDEPS([TAGNAME]) 24707 # _LT_SYS_HIDDEN_LIBDEPS([TAGNAME])
24796 # --------------------------------- 24708 # ---------------------------------
24797 # Figure out "hidden" library dependencies from verbose 24709 # Figure out "hidden" library dependencies from verbose
24798@@ -6481,6 +6879,7 @@ AC_LANG_POP 24710@@ -6513,6 +6911,7 @@ AC_LANG_POP
24799 # objects, libraries and library flags. 24711 # objects, libraries and library flags.
24800 m4_defun([_LT_SYS_HIDDEN_LIBDEPS], 24712 m4_defun([_LT_SYS_HIDDEN_LIBDEPS],
24801 [m4_require([_LT_FILEUTILS_DEFAULTS])dnl 24713 [m4_require([_LT_FILEUTILS_DEFAULTS])dnl
@@ -24803,7 +24715,7 @@ index ad63ebbb385..b65c22bf80d 100644
24803 # Dependencies to place before and after the object being linked: 24715 # Dependencies to place before and after the object being linked:
24804 _LT_TAGVAR(predep_objects, $1)= 24716 _LT_TAGVAR(predep_objects, $1)=
24805 _LT_TAGVAR(postdep_objects, $1)= 24717 _LT_TAGVAR(postdep_objects, $1)=
24806@@ -6531,6 +6930,13 @@ public class foo { 24718@@ -6563,6 +6962,13 @@ public class foo {
24807 }; 24719 };
24808 _LT_EOF 24720 _LT_EOF
24809 ]) 24721 ])
@@ -24817,7 +24729,7 @@ index ad63ebbb385..b65c22bf80d 100644
24817 dnl Parse the compiler output and extract the necessary 24729 dnl Parse the compiler output and extract the necessary
24818 dnl objects, libraries and library flags. 24730 dnl objects, libraries and library flags.
24819 if AC_TRY_EVAL(ac_compile); then 24731 if AC_TRY_EVAL(ac_compile); then
24820@@ -6542,7 +6948,7 @@ if AC_TRY_EVAL(ac_compile); then 24732@@ -6574,7 +6980,7 @@ if AC_TRY_EVAL(ac_compile); then
24821 pre_test_object_deps_done=no 24733 pre_test_object_deps_done=no
24822 24734
24823 for p in `eval "$output_verbose_link_cmd"`; do 24735 for p in `eval "$output_verbose_link_cmd"`; do
@@ -24826,7 +24738,7 @@ index ad63ebbb385..b65c22bf80d 100644
24826 24738
24827 -L* | -R* | -l*) 24739 -L* | -R* | -l*)
24828 # Some compilers place space between "-{L,R}" and the path. 24740 # Some compilers place space between "-{L,R}" and the path.
24829@@ -6551,13 +6957,22 @@ if AC_TRY_EVAL(ac_compile); then 24741@@ -6583,13 +6989,22 @@ if AC_TRY_EVAL(ac_compile); then
24830 test $p = "-R"; then 24742 test $p = "-R"; then
24831 prev=$p 24743 prev=$p
24832 continue 24744 continue
@@ -24853,7 +24765,7 @@ index ad63ebbb385..b65c22bf80d 100644
24853 # Internal compiler library paths should come after those 24765 # Internal compiler library paths should come after those
24854 # provided the user. The postdeps already come after the 24766 # provided the user. The postdeps already come after the
24855 # user supplied libs so there is no need to process them. 24767 # user supplied libs so there is no need to process them.
24856@@ -6577,8 +6992,10 @@ if AC_TRY_EVAL(ac_compile); then 24768@@ -6609,8 +7024,10 @@ if AC_TRY_EVAL(ac_compile); then
24857 _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}" 24769 _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}"
24858 fi 24770 fi
24859 fi 24771 fi
@@ -24864,7 +24776,7 @@ index ad63ebbb385..b65c22bf80d 100644
24864 *.$objext) 24776 *.$objext)
24865 # This assumes that the test object file only shows up 24777 # This assumes that the test object file only shows up
24866 # once in the compiler output. 24778 # once in the compiler output.
24867@@ -6614,6 +7031,7 @@ else 24779@@ -6646,6 +7063,7 @@ else
24868 fi 24780 fi
24869 24781
24870 $RM -f confest.$objext 24782 $RM -f confest.$objext
@@ -24872,7 +24784,7 @@ index ad63ebbb385..b65c22bf80d 100644
24872 24784
24873 # PORTME: override above test on systems where it is broken 24785 # PORTME: override above test on systems where it is broken
24874 m4_if([$1], [CXX], 24786 m4_if([$1], [CXX],
24875@@ -6650,7 +7068,7 @@ linux*) 24787@@ -6682,7 +7100,7 @@ linux*)
24876 24788
24877 solaris*) 24789 solaris*)
24878 case $cc_basename in 24790 case $cc_basename in
@@ -24881,7 +24793,7 @@ index ad63ebbb385..b65c22bf80d 100644
24881 # The more standards-conforming stlport4 library is 24793 # The more standards-conforming stlport4 library is
24882 # incompatible with the Cstd library. Avoid specifying 24794 # incompatible with the Cstd library. Avoid specifying
24883 # it if it's in CXXFLAGS. Ignore libCrun as 24795 # it if it's in CXXFLAGS. Ignore libCrun as
24884@@ -6763,7 +7181,9 @@ if test "$_lt_disable_F77" != yes; then 24796@@ -6795,7 +7213,9 @@ if test "$_lt_disable_F77" != yes; then
24885 # Allow CC to be a program name with arguments. 24797 # Allow CC to be a program name with arguments.
24886 lt_save_CC="$CC" 24798 lt_save_CC="$CC"
24887 lt_save_GCC=$GCC 24799 lt_save_GCC=$GCC
@@ -24891,7 +24803,7 @@ index ad63ebbb385..b65c22bf80d 100644
24891 compiler=$CC 24803 compiler=$CC
24892 _LT_TAGVAR(compiler, $1)=$CC 24804 _LT_TAGVAR(compiler, $1)=$CC
24893 _LT_CC_BASENAME([$compiler]) 24805 _LT_CC_BASENAME([$compiler])
24894@@ -6817,6 +7237,7 @@ if test "$_lt_disable_F77" != yes; then 24806@@ -6849,6 +7269,7 @@ if test "$_lt_disable_F77" != yes; then
24895 24807
24896 GCC=$lt_save_GCC 24808 GCC=$lt_save_GCC
24897 CC="$lt_save_CC" 24809 CC="$lt_save_CC"
@@ -24899,7 +24811,7 @@ index ad63ebbb385..b65c22bf80d 100644
24899 fi # test "$_lt_disable_F77" != yes 24811 fi # test "$_lt_disable_F77" != yes
24900 24812
24901 AC_LANG_POP 24813 AC_LANG_POP
24902@@ -6893,7 +7314,9 @@ if test "$_lt_disable_FC" != yes; then 24814@@ -6925,7 +7346,9 @@ if test "$_lt_disable_FC" != yes; then
24903 # Allow CC to be a program name with arguments. 24815 # Allow CC to be a program name with arguments.
24904 lt_save_CC="$CC" 24816 lt_save_CC="$CC"
24905 lt_save_GCC=$GCC 24817 lt_save_GCC=$GCC
@@ -24909,7 +24821,7 @@ index ad63ebbb385..b65c22bf80d 100644
24909 compiler=$CC 24821 compiler=$CC
24910 GCC=$ac_cv_fc_compiler_gnu 24822 GCC=$ac_cv_fc_compiler_gnu
24911 24823
24912@@ -6949,7 +7372,8 @@ if test "$_lt_disable_FC" != yes; then 24824@@ -6981,7 +7404,8 @@ if test "$_lt_disable_FC" != yes; then
24913 fi # test -n "$compiler" 24825 fi # test -n "$compiler"
24914 24826
24915 GCC=$lt_save_GCC 24827 GCC=$lt_save_GCC
@@ -24919,7 +24831,7 @@ index ad63ebbb385..b65c22bf80d 100644
24919 fi # test "$_lt_disable_FC" != yes 24831 fi # test "$_lt_disable_FC" != yes
24920 24832
24921 AC_LANG_POP 24833 AC_LANG_POP
24922@@ -6986,10 +7410,12 @@ _LT_COMPILER_BOILERPLATE 24834@@ -7018,10 +7442,12 @@ _LT_COMPILER_BOILERPLATE
24923 _LT_LINKER_BOILERPLATE 24835 _LT_LINKER_BOILERPLATE
24924 24836
24925 # Allow CC to be a program name with arguments. 24837 # Allow CC to be a program name with arguments.
@@ -24933,7 +24845,7 @@ index ad63ebbb385..b65c22bf80d 100644
24933 compiler=$CC 24845 compiler=$CC
24934 _LT_TAGVAR(compiler, $1)=$CC 24846 _LT_TAGVAR(compiler, $1)=$CC
24935 _LT_TAGVAR(LD, $1)="$LD" 24847 _LT_TAGVAR(LD, $1)="$LD"
24936@@ -7020,7 +7446,8 @@ fi 24848@@ -7052,7 +7478,8 @@ fi
24937 AC_LANG_RESTORE 24849 AC_LANG_RESTORE
24938 24850
24939 GCC=$lt_save_GCC 24851 GCC=$lt_save_GCC
@@ -24943,7 +24855,7 @@ index ad63ebbb385..b65c22bf80d 100644
24943 ])# _LT_LANG_GCJ_CONFIG 24855 ])# _LT_LANG_GCJ_CONFIG
24944 24856
24945 24857
24946@@ -7055,9 +7482,11 @@ _LT_LINKER_BOILERPLATE 24858@@ -7087,9 +7514,11 @@ _LT_LINKER_BOILERPLATE
24947 24859
24948 # Allow CC to be a program name with arguments. 24860 # Allow CC to be a program name with arguments.
24949 lt_save_CC="$CC" 24861 lt_save_CC="$CC"
@@ -24955,7 +24867,7 @@ index ad63ebbb385..b65c22bf80d 100644
24955 compiler=$CC 24867 compiler=$CC
24956 _LT_TAGVAR(compiler, $1)=$CC 24868 _LT_TAGVAR(compiler, $1)=$CC
24957 _LT_CC_BASENAME([$compiler]) 24869 _LT_CC_BASENAME([$compiler])
24958@@ -7070,7 +7499,8 @@ fi 24870@@ -7102,7 +7531,8 @@ fi
24959 24871
24960 GCC=$lt_save_GCC 24872 GCC=$lt_save_GCC
24961 AC_LANG_RESTORE 24873 AC_LANG_RESTORE
@@ -24965,7 +24877,7 @@ index ad63ebbb385..b65c22bf80d 100644
24965 ])# _LT_LANG_RC_CONFIG 24877 ])# _LT_LANG_RC_CONFIG
24966 24878
24967 24879
24968@@ -7129,6 +7559,15 @@ _LT_DECL([], [OBJDUMP], [1], [An object symbol dumper]) 24880@@ -7161,6 +7591,15 @@ _LT_DECL([], [OBJDUMP], [1], [An object symbol dumper])
24969 AC_SUBST([OBJDUMP]) 24881 AC_SUBST([OBJDUMP])
24970 ]) 24882 ])
24971 24883
@@ -24981,7 +24893,7 @@ index ad63ebbb385..b65c22bf80d 100644
24981 24893
24982 # _LT_DECL_SED 24894 # _LT_DECL_SED
24983 # ------------ 24895 # ------------
24984@@ -7222,8 +7661,8 @@ m4_defun([_LT_CHECK_SHELL_FEATURES], 24896@@ -7254,8 +7693,8 @@ m4_defun([_LT_CHECK_SHELL_FEATURES],
24985 # Try some XSI features 24897 # Try some XSI features
24986 xsi_shell=no 24898 xsi_shell=no
24987 ( _lt_dummy="a/b/c" 24899 ( _lt_dummy="a/b/c"
@@ -24992,7 +24904,7 @@ index ad63ebbb385..b65c22bf80d 100644
24992 && eval 'test $(( 1 + 1 )) -eq 2 \ 24904 && eval 'test $(( 1 + 1 )) -eq 2 \
24993 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ 24905 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
24994 && xsi_shell=yes 24906 && xsi_shell=yes
24995@@ -7262,206 +7701,162 @@ _LT_DECL([NL2SP], [lt_NL2SP], [1], [turn newlines into spaces])dnl 24907@@ -7294,206 +7733,162 @@ _LT_DECL([NL2SP], [lt_NL2SP], [1], [turn newlines into spaces])dnl
24996 ])# _LT_CHECK_SHELL_FEATURES 24908 ])# _LT_CHECK_SHELL_FEATURES
24997 24909
24998 24910
@@ -25342,7 +25254,7 @@ index ad63ebbb385..b65c22bf80d 100644
25342+ [0], [convert $build files to toolchain format])dnl 25254+ [0], [convert $build files to toolchain format])dnl
25343+])# _LT_PATH_CONVERSION_FUNCTIONS 25255+])# _LT_PATH_CONVERSION_FUNCTIONS
25344diff --git a/ltmain.sh b/ltmain.sh 25256diff --git a/ltmain.sh b/ltmain.sh
25345index 9503ec85d70..70e856e0659 100644 25257index 70990740b6c..7f7104ffc82 100644
25346--- a/ltmain.sh 25258--- a/ltmain.sh
25347+++ b/ltmain.sh 25259+++ b/ltmain.sh
25348@@ -1,10 +1,9 @@ 25260@@ -1,10 +1,9 @@
@@ -27519,24 +27431,6 @@ index 9503ec85d70..70e856e0659 100644
27519 27431
27520 27432
27521 # func_extract_an_archive dir oldlib 27433 # func_extract_an_archive dir oldlib
27522@@ -2917,7 +3801,7 @@ func_extract_archives ()
27523 darwin_file=
27524 darwin_files=
27525 for darwin_file in $darwin_filelist; do
27526- darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP`
27527+ darwin_files=`find unfat-$$ -name $darwin_file -print | sort | $NL2SP`
27528 $LIPO -create -output "$darwin_file" $darwin_files
27529 done # $darwin_filelist
27530 $RM -rf unfat-$$
27531@@ -2932,7 +3816,7 @@ func_extract_archives ()
27532 func_extract_an_archive "$my_xdir" "$my_xabs"
27533 ;;
27534 esac
27535- my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
27536+ my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | sort | $NL2SP`
27537 done
27538
27539 func_extract_archives_result="$my_oldobjs"
27540@@ -3014,7 +3898,110 @@ func_fallback_echo () 27434@@ -3014,7 +3898,110 @@ func_fallback_echo ()
27541 _LTECHO_EOF' 27435 _LTECHO_EOF'
27542 } 27436 }
@@ -30626,10 +30520,10 @@ index bf92b5e0790..c573da90c5c 100644
30626 # These exist entirely to fool aclocal when bootstrapping libtool. 30520 # These exist entirely to fool aclocal when bootstrapping libtool.
30627 # 30521 #
30628diff --git a/opcodes/Makefile.in b/opcodes/Makefile.in 30522diff --git a/opcodes/Makefile.in b/opcodes/Makefile.in
30629index 2db307e8d7c..aa6e3e1b429 100644 30523index 245479140c9..bfed90449bf 100644
30630--- a/opcodes/Makefile.in 30524--- a/opcodes/Makefile.in
30631+++ b/opcodes/Makefile.in 30525+++ b/opcodes/Makefile.in
30632@@ -292,6 +292,7 @@ CYGPATH_W = @CYGPATH_W@ 30526@@ -298,6 +298,7 @@ CYGPATH_W = @CYGPATH_W@
30633 DATADIRNAME = @DATADIRNAME@ 30527 DATADIRNAME = @DATADIRNAME@
30634 DEFS = @DEFS@ 30528 DEFS = @DEFS@
30635 DEPDIR = @DEPDIR@ 30529 DEPDIR = @DEPDIR@
@@ -30637,7 +30531,7 @@ index 2db307e8d7c..aa6e3e1b429 100644
30637 DSYMUTIL = @DSYMUTIL@ 30531 DSYMUTIL = @DSYMUTIL@
30638 DUMPBIN = @DUMPBIN@ 30532 DUMPBIN = @DUMPBIN@
30639 ECHO_C = @ECHO_C@ 30533 ECHO_C = @ECHO_C@
30640@@ -325,6 +326,7 @@ LN_S = @LN_S@ 30534@@ -336,6 +337,7 @@ LTLIBINTL = @LTLIBINTL@
30641 LTLIBOBJS = @LTLIBOBJS@ 30535 LTLIBOBJS = @LTLIBOBJS@
30642 MAINT = @MAINT@ 30536 MAINT = @MAINT@
30643 MAKEINFO = @MAKEINFO@ 30537 MAKEINFO = @MAKEINFO@
@@ -30645,7 +30539,7 @@ index 2db307e8d7c..aa6e3e1b429 100644
30645 MKDIR_P = @MKDIR_P@ 30539 MKDIR_P = @MKDIR_P@
30646 MKINSTALLDIRS = @MKINSTALLDIRS@ 30540 MKINSTALLDIRS = @MKINSTALLDIRS@
30647 MSGFMT = @MSGFMT@ 30541 MSGFMT = @MSGFMT@
30648@@ -363,6 +365,7 @@ abs_builddir = @abs_builddir@ 30542@@ -374,6 +376,7 @@ abs_builddir = @abs_builddir@
30649 abs_srcdir = @abs_srcdir@ 30543 abs_srcdir = @abs_srcdir@
30650 abs_top_builddir = @abs_top_builddir@ 30544 abs_top_builddir = @abs_top_builddir@
30651 abs_top_srcdir = @abs_top_srcdir@ 30545 abs_top_srcdir = @abs_top_srcdir@
@@ -30654,10 +30548,10 @@ index 2db307e8d7c..aa6e3e1b429 100644
30654 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ 30548 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
30655 am__include = @am__include@ 30549 am__include = @am__include@
30656diff --git a/opcodes/configure b/opcodes/configure 30550diff --git a/opcodes/configure b/opcodes/configure
30657index fc4109a1a47..6c42352868c 100755 30551index 6cd3730c5a2..824f42ab20a 100755
30658--- a/opcodes/configure 30552--- a/opcodes/configure
30659+++ b/opcodes/configure 30553+++ b/opcodes/configure
30660@@ -682,6 +682,9 @@ OTOOL 30554@@ -688,6 +688,9 @@ OTOOL
30661 LIPO 30555 LIPO
30662 NMEDIT 30556 NMEDIT
30663 DSYMUTIL 30557 DSYMUTIL
@@ -30667,7 +30561,7 @@ index fc4109a1a47..6c42352868c 100755
30667 OBJDUMP 30561 OBJDUMP
30668 LN_S 30562 LN_S
30669 NM 30563 NM
30670@@ -800,6 +803,7 @@ enable_static 30564@@ -806,6 +809,7 @@ enable_static
30671 with_pic 30565 with_pic
30672 enable_fast_install 30566 enable_fast_install
30673 with_gnu_ld 30567 with_gnu_ld
@@ -30675,16 +30569,16 @@ index fc4109a1a47..6c42352868c 100755
30675 enable_libtool_lock 30569 enable_libtool_lock
30676 enable_checking 30570 enable_checking
30677 enable_targets 30571 enable_targets
30678@@ -1468,6 +1472,8 @@ Optional Packages: 30572@@ -1487,6 +1491,8 @@ Optional Packages:
30679 --with-pic try to use only PIC/non-PIC objects [default=use 30573 --with-libintl-prefix[=DIR] search for libintl in DIR/include and DIR/lib
30680 both] 30574 --without-libintl-prefix don't search for libintl in includedir and libdir
30681 --with-gnu-ld assume the C compiler uses GNU ld [default=no] 30575 --with-libintl-type=TYPE type of library to search for (auto/static/shared)
30682+ --with-libtool-sysroot=DIR Search for dependent libraries within DIR 30576+ --with-libtool-sysroot=DIR Search for dependent libraries within DIR
30683+ (or the compiler's sysroot if not specified). 30577+ (or the compiler's sysroot if not specified).
30684 30578
30685 Some influential environment variables: 30579 Some influential environment variables:
30686 CC C compiler command 30580 CC C compiler command
30687@@ -4977,8 +4983,8 @@ esac 30581@@ -4997,8 +5003,8 @@ esac
30688 30582
30689 30583
30690 30584
@@ -30695,7 +30589,7 @@ index fc4109a1a47..6c42352868c 100755
30695 30589
30696 30590
30697 30591
30698@@ -5018,7 +5024,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO 30592@@ -5038,7 +5044,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
30699 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 30593 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
30700 $as_echo_n "checking how to print strings... " >&6; } 30594 $as_echo_n "checking how to print strings... " >&6; }
30701 # Test print first, because it will be a builtin if present. 30595 # Test print first, because it will be a builtin if present.
@@ -30704,7 +30598,7 @@ index fc4109a1a47..6c42352868c 100755
30704 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then 30598 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
30705 ECHO='print -r --' 30599 ECHO='print -r --'
30706 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then 30600 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
30707@@ -5711,8 +5717,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; 30601@@ -5731,8 +5737,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6;
30708 # Try some XSI features 30602 # Try some XSI features
30709 xsi_shell=no 30603 xsi_shell=no
30710 ( _lt_dummy="a/b/c" 30604 ( _lt_dummy="a/b/c"
@@ -30715,7 +30609,7 @@ index fc4109a1a47..6c42352868c 100755
30715 && eval 'test $(( 1 + 1 )) -eq 2 \ 30609 && eval 'test $(( 1 + 1 )) -eq 2 \
30716 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ 30610 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
30717 && xsi_shell=yes 30611 && xsi_shell=yes
30718@@ -5761,6 +5767,80 @@ esac 30612@@ -5781,6 +5787,80 @@ esac
30719 30613
30720 30614
30721 30615
@@ -30796,7 +30690,7 @@ index fc4109a1a47..6c42352868c 100755
30796 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 30690 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
30797 $as_echo_n "checking for $LD option to reload object files... " >&6; } 30691 $as_echo_n "checking for $LD option to reload object files... " >&6; }
30798 if ${lt_cv_ld_reload_flag+:} false; then : 30692 if ${lt_cv_ld_reload_flag+:} false; then :
30799@@ -5777,6 +5857,11 @@ case $reload_flag in 30693@@ -5797,6 +5877,11 @@ case $reload_flag in
30800 esac 30694 esac
30801 reload_cmds='$LD$reload_flag -o $output$reload_objs' 30695 reload_cmds='$LD$reload_flag -o $output$reload_objs'
30802 case $host_os in 30696 case $host_os in
@@ -30808,7 +30702,7 @@ index fc4109a1a47..6c42352868c 100755
30808 darwin*) 30702 darwin*)
30809 if test "$GCC" = yes; then 30703 if test "$GCC" = yes; then
30810 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' 30704 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
30811@@ -5945,7 +6030,8 @@ mingw* | pw32*) 30705@@ -5965,7 +6050,8 @@ mingw* | pw32*)
30812 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' 30706 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
30813 lt_cv_file_magic_cmd='func_win32_libid' 30707 lt_cv_file_magic_cmd='func_win32_libid'
30814 else 30708 else
@@ -30818,7 +30712,7 @@ index fc4109a1a47..6c42352868c 100755
30818 lt_cv_file_magic_cmd='$OBJDUMP -f' 30712 lt_cv_file_magic_cmd='$OBJDUMP -f'
30819 fi 30713 fi
30820 ;; 30714 ;;
30821@@ -6099,6 +6185,21 @@ esac 30715@@ -6124,6 +6210,21 @@ esac
30822 fi 30716 fi
30823 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 30717 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
30824 $as_echo "$lt_cv_deplibs_check_method" >&6; } 30718 $as_echo "$lt_cv_deplibs_check_method" >&6; }
@@ -30840,7 +30734,7 @@ index fc4109a1a47..6c42352868c 100755
30840 file_magic_cmd=$lt_cv_file_magic_cmd 30734 file_magic_cmd=$lt_cv_file_magic_cmd
30841 deplibs_check_method=$lt_cv_deplibs_check_method 30735 deplibs_check_method=$lt_cv_deplibs_check_method
30842 test -z "$deplibs_check_method" && deplibs_check_method=unknown 30736 test -z "$deplibs_check_method" && deplibs_check_method=unknown
30843@@ -6114,6 +6215,157 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown 30737@@ -6139,6 +6240,157 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
30844 30738
30845 30739
30846 30740
@@ -30998,7 +30892,7 @@ index fc4109a1a47..6c42352868c 100755
30998 plugin_option= 30892 plugin_option=
30999 plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll" 30893 plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll"
31000 for plugin in $plugin_names; do 30894 for plugin in $plugin_names; do
31001@@ -6128,8 +6380,10 @@ for plugin in $plugin_names; do 30895@@ -6153,8 +6405,10 @@ for plugin in $plugin_names; do
31002 done 30896 done
31003 30897
31004 if test -n "$ac_tool_prefix"; then 30898 if test -n "$ac_tool_prefix"; then
@@ -31011,7 +30905,7 @@ index fc4109a1a47..6c42352868c 100755
31011 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 30905 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
31012 $as_echo_n "checking for $ac_word... " >&6; } 30906 $as_echo_n "checking for $ac_word... " >&6; }
31013 if ${ac_cv_prog_AR+:} false; then : 30907 if ${ac_cv_prog_AR+:} false; then :
31014@@ -6145,7 +6399,7 @@ do 30908@@ -6170,7 +6424,7 @@ do
31015 test -z "$as_dir" && as_dir=. 30909 test -z "$as_dir" && as_dir=.
31016 for ac_exec_ext in '' $ac_executable_extensions; do 30910 for ac_exec_ext in '' $ac_executable_extensions; do
31017 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 30911 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
@@ -31020,7 +30914,7 @@ index fc4109a1a47..6c42352868c 100755
31020 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 30914 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
31021 break 2 30915 break 2
31022 fi 30916 fi
31023@@ -6165,11 +6419,15 @@ $as_echo "no" >&6; } 30917@@ -6190,11 +6444,15 @@ $as_echo "no" >&6; }
31024 fi 30918 fi
31025 30919
31026 30920
@@ -31039,7 +30933,7 @@ index fc4109a1a47..6c42352868c 100755
31039 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 30933 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
31040 $as_echo_n "checking for $ac_word... " >&6; } 30934 $as_echo_n "checking for $ac_word... " >&6; }
31041 if ${ac_cv_prog_ac_ct_AR+:} false; then : 30935 if ${ac_cv_prog_ac_ct_AR+:} false; then :
31042@@ -6185,7 +6443,7 @@ do 30936@@ -6210,7 +6468,7 @@ do
31043 test -z "$as_dir" && as_dir=. 30937 test -z "$as_dir" && as_dir=.
31044 for ac_exec_ext in '' $ac_executable_extensions; do 30938 for ac_exec_ext in '' $ac_executable_extensions; do
31045 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 30939 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
@@ -31048,7 +30942,7 @@ index fc4109a1a47..6c42352868c 100755
31048 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 30942 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
31049 break 2 30943 break 2
31050 fi 30944 fi
31051@@ -6204,6 +6462,10 @@ else 30945@@ -6229,6 +6487,10 @@ else
31052 $as_echo "no" >&6; } 30946 $as_echo "no" >&6; }
31053 fi 30947 fi
31054 30948
@@ -31059,7 +30953,7 @@ index fc4109a1a47..6c42352868c 100755
31059 if test "x$ac_ct_AR" = x; then 30953 if test "x$ac_ct_AR" = x; then
31060 AR="false" 30954 AR="false"
31061 else 30955 else
31062@@ -6215,25 +6477,20 @@ ac_tool_warned=yes ;; 30956@@ -6240,25 +6502,20 @@ ac_tool_warned=yes ;;
31063 esac 30957 esac
31064 AR=$ac_ct_AR 30958 AR=$ac_ct_AR
31065 fi 30959 fi
@@ -31095,7 +30989,7 @@ index fc4109a1a47..6c42352868c 100755
31095 30989
31096 30990
31097 30991
31098@@ -6244,6 +6501,63 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru 30992@@ -6269,6 +6526,63 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru
31099 30993
31100 30994
31101 30995
@@ -31159,7 +31053,7 @@ index fc4109a1a47..6c42352868c 100755
31159 31053
31160 if test -n "$ac_tool_prefix"; then 31054 if test -n "$ac_tool_prefix"; then
31161 # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. 31055 # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
31162@@ -6584,8 +6898,8 @@ esac 31056@@ -6609,8 +6923,8 @@ esac
31163 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" 31057 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
31164 31058
31165 # Transform an extracted symbol line into symbol name and symbol address 31059 # Transform an extracted symbol line into symbol name and symbol address
@@ -31170,7 +31064,7 @@ index fc4109a1a47..6c42352868c 100755
31170 31064
31171 # Handle CRLF in mingw tool chain 31065 # Handle CRLF in mingw tool chain
31172 opt_cr= 31066 opt_cr=
31173@@ -6621,6 +6935,7 @@ for ac_symprfx in "" "_"; do 31067@@ -6646,6 +6960,7 @@ for ac_symprfx in "" "_"; do
31174 else 31068 else
31175 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" 31069 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
31176 fi 31070 fi
@@ -31178,7 +31072,7 @@ index fc4109a1a47..6c42352868c 100755
31178 31072
31179 # Check to see that the pipe works correctly. 31073 # Check to see that the pipe works correctly.
31180 pipe_works=no 31074 pipe_works=no
31181@@ -6662,6 +6977,18 @@ _LT_EOF 31075@@ -6687,6 +7002,18 @@ _LT_EOF
31182 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then 31076 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
31183 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then 31077 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
31184 cat <<_LT_EOF > conftest.$ac_ext 31078 cat <<_LT_EOF > conftest.$ac_ext
@@ -31197,7 +31091,7 @@ index fc4109a1a47..6c42352868c 100755
31197 #ifdef __cplusplus 31091 #ifdef __cplusplus
31198 extern "C" { 31092 extern "C" {
31199 #endif 31093 #endif
31200@@ -6673,7 +7000,7 @@ _LT_EOF 31094@@ -6698,7 +7025,7 @@ _LT_EOF
31201 cat <<_LT_EOF >> conftest.$ac_ext 31095 cat <<_LT_EOF >> conftest.$ac_ext
31202 31096
31203 /* The mapping between symbol names and symbols. */ 31097 /* The mapping between symbol names and symbols. */
@@ -31206,7 +31100,7 @@ index fc4109a1a47..6c42352868c 100755
31206 const char *name; 31100 const char *name;
31207 void *address; 31101 void *address;
31208 } 31102 }
31209@@ -6699,8 +7026,8 @@ static const void *lt_preloaded_setup() { 31103@@ -6724,8 +7051,8 @@ static const void *lt_preloaded_setup() {
31210 _LT_EOF 31104 _LT_EOF
31211 # Now try linking the two files. 31105 # Now try linking the two files.
31212 mv conftest.$ac_objext conftstm.$ac_objext 31106 mv conftest.$ac_objext conftstm.$ac_objext
@@ -31217,7 +31111,7 @@ index fc4109a1a47..6c42352868c 100755
31217 LIBS="conftstm.$ac_objext" 31111 LIBS="conftstm.$ac_objext"
31218 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" 31112 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
31219 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 31113 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
31220@@ -6710,8 +7037,8 @@ _LT_EOF 31114@@ -6735,8 +7062,8 @@ _LT_EOF
31221 test $ac_status = 0; } && test -s conftest${ac_exeext}; then 31115 test $ac_status = 0; } && test -s conftest${ac_exeext}; then
31222 pipe_works=yes 31116 pipe_works=yes
31223 fi 31117 fi
@@ -31228,7 +31122,7 @@ index fc4109a1a47..6c42352868c 100755
31228 else 31122 else
31229 echo "cannot find nm_test_func in $nlist" >&5 31123 echo "cannot find nm_test_func in $nlist" >&5
31230 fi 31124 fi
31231@@ -6748,6 +7075,14 @@ else 31125@@ -6773,6 +7100,14 @@ else
31232 $as_echo "ok" >&6; } 31126 $as_echo "ok" >&6; }
31233 fi 31127 fi
31234 31128
@@ -31243,7 +31137,7 @@ index fc4109a1a47..6c42352868c 100755
31243 31137
31244 31138
31245 31139
31246@@ -6766,6 +7101,47 @@ fi 31140@@ -6791,6 +7126,47 @@ fi
31247 31141
31248 31142
31249 31143
@@ -31291,7 +31185,7 @@ index fc4109a1a47..6c42352868c 100755
31291 31185
31292 31186
31293 31187
31294@@ -6975,6 +7351,123 @@ esac 31188@@ -7000,6 +7376,123 @@ esac
31295 31189
31296 need_locks="$enable_libtool_lock" 31190 need_locks="$enable_libtool_lock"
31297 31191
@@ -31415,7 +31309,7 @@ index fc4109a1a47..6c42352868c 100755
31415 31309
31416 case $host_os in 31310 case $host_os in
31417 rhapsody* | darwin*) 31311 rhapsody* | darwin*)
31418@@ -7538,6 +8031,8 @@ _LT_EOF 31312@@ -7563,6 +8056,8 @@ _LT_EOF
31419 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 31313 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
31420 echo "$AR cru libconftest.a conftest.o" >&5 31314 echo "$AR cru libconftest.a conftest.o" >&5
31421 $AR cru libconftest.a conftest.o 2>&5 31315 $AR cru libconftest.a conftest.o 2>&5
@@ -31424,7 +31318,7 @@ index fc4109a1a47..6c42352868c 100755
31424 cat > conftest.c << _LT_EOF 31318 cat > conftest.c << _LT_EOF
31425 int main() { return 0;} 31319 int main() { return 0;}
31426 _LT_EOF 31320 _LT_EOF
31427@@ -8090,8 +8585,6 @@ fi 31321@@ -8117,8 +8612,6 @@ fi
31428 lt_prog_compiler_pic= 31322 lt_prog_compiler_pic=
31429 lt_prog_compiler_static= 31323 lt_prog_compiler_static=
31430 31324
@@ -31433,7 +31327,7 @@ index fc4109a1a47..6c42352868c 100755
31433 31327
31434 if test "$GCC" = yes; then 31328 if test "$GCC" = yes; then
31435 lt_prog_compiler_wl='-Wl,' 31329 lt_prog_compiler_wl='-Wl,'
31436@@ -8257,6 +8750,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 31330@@ -8284,6 +8777,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
31437 lt_prog_compiler_pic='--shared' 31331 lt_prog_compiler_pic='--shared'
31438 lt_prog_compiler_static='--static' 31332 lt_prog_compiler_static='--static'
31439 ;; 31333 ;;
@@ -31446,7 +31340,7 @@ index fc4109a1a47..6c42352868c 100755
31446 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) 31340 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
31447 # Portland Group compilers (*not* the Pentium gcc compiler, 31341 # Portland Group compilers (*not* the Pentium gcc compiler,
31448 # which looks to be a dead project) 31342 # which looks to be a dead project)
31449@@ -8319,7 +8818,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 31343@@ -8346,7 +8845,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
31450 lt_prog_compiler_pic='-KPIC' 31344 lt_prog_compiler_pic='-KPIC'
31451 lt_prog_compiler_static='-Bstatic' 31345 lt_prog_compiler_static='-Bstatic'
31452 case $cc_basename in 31346 case $cc_basename in
@@ -31455,7 +31349,7 @@ index fc4109a1a47..6c42352868c 100755
31455 lt_prog_compiler_wl='-Qoption ld ';; 31349 lt_prog_compiler_wl='-Qoption ld ';;
31456 *) 31350 *)
31457 lt_prog_compiler_wl='-Wl,';; 31351 lt_prog_compiler_wl='-Wl,';;
31458@@ -8376,13 +8875,17 @@ case $host_os in 31352@@ -8403,13 +8902,17 @@ case $host_os in
31459 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" 31353 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
31460 ;; 31354 ;;
31461 esac 31355 esac
@@ -31479,7 +31373,7 @@ index fc4109a1a47..6c42352868c 100755
31479 31373
31480 # 31374 #
31481 # Check to make sure the PIC flag actually works. 31375 # Check to make sure the PIC flag actually works.
31482@@ -8443,6 +8946,11 @@ fi 31376@@ -8470,6 +8973,11 @@ fi
31483 31377
31484 31378
31485 31379
@@ -31491,7 +31385,7 @@ index fc4109a1a47..6c42352868c 100755
31491 # 31385 #
31492 # Check to make sure the static flag actually works. 31386 # Check to make sure the static flag actually works.
31493 # 31387 #
31494@@ -8793,7 +9301,8 @@ _LT_EOF 31388@@ -8820,7 +9328,8 @@ _LT_EOF
31495 allow_undefined_flag=unsupported 31389 allow_undefined_flag=unsupported
31496 always_export_symbols=no 31390 always_export_symbols=no
31497 enable_shared_with_static_runtimes=yes 31391 enable_shared_with_static_runtimes=yes
@@ -31501,7 +31395,7 @@ index fc4109a1a47..6c42352868c 100755
31501 31395
31502 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then 31396 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
31503 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' 31397 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
31504@@ -8892,12 +9401,12 @@ _LT_EOF 31398@@ -8919,12 +9428,12 @@ _LT_EOF
31505 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' 31399 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
31506 hardcode_libdir_flag_spec= 31400 hardcode_libdir_flag_spec=
31507 hardcode_libdir_flag_spec_ld='-rpath $libdir' 31401 hardcode_libdir_flag_spec_ld='-rpath $libdir'
@@ -31516,7 +31410,7 @@ index fc4109a1a47..6c42352868c 100755
31516 fi 31410 fi
31517 ;; 31411 ;;
31518 esac 31412 esac
31519@@ -8911,8 +9420,8 @@ _LT_EOF 31413@@ -8938,8 +9447,8 @@ _LT_EOF
31520 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' 31414 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
31521 wlarc= 31415 wlarc=
31522 else 31416 else
@@ -31527,7 +31421,7 @@ index fc4109a1a47..6c42352868c 100755
31527 fi 31421 fi
31528 ;; 31422 ;;
31529 31423
31530@@ -8930,8 +9439,8 @@ _LT_EOF 31424@@ -8957,8 +9466,8 @@ _LT_EOF
31531 31425
31532 _LT_EOF 31426 _LT_EOF
31533 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 31427 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -31538,7 +31432,7 @@ index fc4109a1a47..6c42352868c 100755
31538 else 31432 else
31539 ld_shlibs=no 31433 ld_shlibs=no
31540 fi 31434 fi
31541@@ -8977,8 +9486,8 @@ _LT_EOF 31435@@ -9004,8 +9513,8 @@ _LT_EOF
31542 31436
31543 *) 31437 *)
31544 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 31438 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -31549,7 +31443,7 @@ index fc4109a1a47..6c42352868c 100755
31549 else 31443 else
31550 ld_shlibs=no 31444 ld_shlibs=no
31551 fi 31445 fi
31552@@ -9108,7 +9617,13 @@ _LT_EOF 31446@@ -9135,7 +9644,13 @@ _LT_EOF
31553 allow_undefined_flag='-berok' 31447 allow_undefined_flag='-berok'
31554 # Determine the default libpath from the value encoded in an 31448 # Determine the default libpath from the value encoded in an
31555 # empty executable. 31449 # empty executable.
@@ -31564,7 +31458,7 @@ index fc4109a1a47..6c42352868c 100755
31564 /* end confdefs.h. */ 31458 /* end confdefs.h. */
31565 31459
31566 int 31460 int
31567@@ -9121,22 +9636,29 @@ main () 31461@@ -9148,22 +9663,29 @@ main ()
31568 _ACEOF 31462 _ACEOF
31569 if ac_fn_c_try_link "$LINENO"; then : 31463 if ac_fn_c_try_link "$LINENO"; then :
31570 31464
@@ -31607,7 +31501,7 @@ index fc4109a1a47..6c42352868c 100755
31607 31501
31608 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 31502 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
31609 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" 31503 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"
31610@@ -9148,7 +9670,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 31504@@ -9175,7 +9697,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
31611 else 31505 else
31612 # Determine the default libpath from the value encoded in an 31506 # Determine the default libpath from the value encoded in an
31613 # empty executable. 31507 # empty executable.
@@ -31622,7 +31516,7 @@ index fc4109a1a47..6c42352868c 100755
31622 /* end confdefs.h. */ 31516 /* end confdefs.h. */
31623 31517
31624 int 31518 int
31625@@ -9161,22 +9689,29 @@ main () 31519@@ -9188,22 +9716,29 @@ main ()
31626 _ACEOF 31520 _ACEOF
31627 if ac_fn_c_try_link "$LINENO"; then : 31521 if ac_fn_c_try_link "$LINENO"; then :
31628 31522
@@ -31665,7 +31559,7 @@ index fc4109a1a47..6c42352868c 100755
31665 31559
31666 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 31560 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
31667 # Warning - without using the other run time loading flags, 31561 # Warning - without using the other run time loading flags,
31668@@ -9221,20 +9756,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 31562@@ -9248,20 +9783,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
31669 # Microsoft Visual C++. 31563 # Microsoft Visual C++.
31670 # hardcode_libdir_flag_spec is actually meaningless, as there is 31564 # hardcode_libdir_flag_spec is actually meaningless, as there is
31671 # no search path for DLLs. 31565 # no search path for DLLs.
@@ -31743,7 +31637,7 @@ index fc4109a1a47..6c42352868c 100755
31743 ;; 31637 ;;
31744 31638
31745 darwin* | rhapsody*) 31639 darwin* | rhapsody*)
31746@@ -9295,7 +9873,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 31640@@ -9322,7 +9900,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
31747 31641
31748 # FreeBSD 3 and greater uses gcc -shared to do shared libraries. 31642 # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
31749 freebsd* | dragonfly*) 31643 freebsd* | dragonfly*)
@@ -31752,7 +31646,7 @@ index fc4109a1a47..6c42352868c 100755
31752 hardcode_libdir_flag_spec='-R$libdir' 31646 hardcode_libdir_flag_spec='-R$libdir'
31753 hardcode_direct=yes 31647 hardcode_direct=yes
31754 hardcode_shlibpath_var=no 31648 hardcode_shlibpath_var=no
31755@@ -9303,7 +9881,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 31649@@ -9330,7 +9908,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
31756 31650
31757 hpux9*) 31651 hpux9*)
31758 if test "$GCC" = yes; then 31652 if test "$GCC" = yes; then
@@ -31761,7 +31655,7 @@ index fc4109a1a47..6c42352868c 100755
31761 else 31655 else
31762 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' 31656 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'
31763 fi 31657 fi
31764@@ -9319,7 +9897,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 31658@@ -9346,7 +9924,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
31765 31659
31766 hpux10*) 31660 hpux10*)
31767 if test "$GCC" = yes && test "$with_gnu_ld" = no; then 31661 if test "$GCC" = yes && test "$with_gnu_ld" = no; then
@@ -31770,8 +31664,8 @@ index fc4109a1a47..6c42352868c 100755
31770 else 31664 else
31771 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' 31665 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
31772 fi 31666 fi
31773@@ -9343,10 +9921,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 31667@@ -9370,10 +9948,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
31774 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' 31668 archive_cmds='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
31775 ;; 31669 ;;
31776 ia64*) 31670 ia64*)
31777- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' 31671- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
@@ -31783,7 +31677,7 @@ index fc4109a1a47..6c42352868c 100755
31783 ;; 31677 ;;
31784 esac 31678 esac
31785 else 31679 else
31786@@ -9425,23 +10003,36 @@ fi 31680@@ -9452,23 +10030,36 @@ fi
31787 31681
31788 irix5* | irix6* | nonstopux*) 31682 irix5* | irix6* | nonstopux*)
31789 if test "$GCC" = yes; then 31683 if test "$GCC" = yes; then
@@ -31828,7 +31722,7 @@ index fc4109a1a47..6c42352868c 100755
31828 else 31722 else
31829 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' 31723 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'
31830 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' 31724 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'
31831@@ -9526,7 +10117,7 @@ rm -f core conftest.err conftest.$ac_objext \ 31725@@ -9553,7 +10144,7 @@ rm -f core conftest.err conftest.$ac_objext \
31832 osf4* | osf5*) # as osf3* with the addition of -msym flag 31726 osf4* | osf5*) # as osf3* with the addition of -msym flag
31833 if test "$GCC" = yes; then 31727 if test "$GCC" = yes; then
31834 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' 31728 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
@@ -31837,7 +31731,7 @@ index fc4109a1a47..6c42352868c 100755
31837 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' 31731 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
31838 else 31732 else
31839 allow_undefined_flag=' -expect_unresolved \*' 31733 allow_undefined_flag=' -expect_unresolved \*'
31840@@ -9545,9 +10136,9 @@ rm -f core conftest.err conftest.$ac_objext \ 31734@@ -9572,9 +10163,9 @@ rm -f core conftest.err conftest.$ac_objext \
31841 no_undefined_flag=' -z defs' 31735 no_undefined_flag=' -z defs'
31842 if test "$GCC" = yes; then 31736 if test "$GCC" = yes; then
31843 wlarc='${wl}' 31737 wlarc='${wl}'
@@ -31849,7 +31743,7 @@ index fc4109a1a47..6c42352868c 100755
31849 else 31743 else
31850 case `$CC -V 2>&1` in 31744 case `$CC -V 2>&1` in
31851 *"Compilers 5.0"*) 31745 *"Compilers 5.0"*)
31852@@ -10123,8 +10714,9 @@ cygwin* | mingw* | pw32* | cegcc*) 31746@@ -10150,8 +10741,9 @@ cygwin* | mingw* | pw32* | cegcc*)
31853 need_version=no 31747 need_version=no
31854 need_lib_prefix=no 31748 need_lib_prefix=no
31855 31749
@@ -31861,7 +31755,7 @@ index fc4109a1a47..6c42352868c 100755
31861 library_names_spec='$libname.dll.a' 31755 library_names_spec='$libname.dll.a'
31862 # DLL is installed to $(libdir)/../bin by postinstall_cmds 31756 # DLL is installed to $(libdir)/../bin by postinstall_cmds
31863 postinstall_cmds='base_file=`basename \${file}`~ 31757 postinstall_cmds='base_file=`basename \${file}`~
31864@@ -10157,13 +10749,71 @@ cygwin* | mingw* | pw32* | cegcc*) 31758@@ -10184,13 +10776,71 @@ cygwin* | mingw* | pw32* | cegcc*)
31865 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' 31759 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
31866 ;; 31760 ;;
31867 esac 31761 esac
@@ -31934,16 +31828,16 @@ index fc4109a1a47..6c42352868c 100755
31934 # FIXME: first we should search . and the directory the executable is in 31828 # FIXME: first we should search . and the directory the executable is in
31935 shlibpath_var=PATH 31829 shlibpath_var=PATH
31936 ;; 31830 ;;
31937@@ -11041,7 +11691,7 @@ else 31831@@ -11092,7 +11742,7 @@ else
31938 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 31832 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
31939 lt_status=$lt_dlunknown 31833 lt_status=$lt_dlunknown
31940 cat > conftest.$ac_ext <<_LT_EOF 31834 cat > conftest.$ac_ext <<_LT_EOF
31941-#line 11044 "configure" 31835-#line 11095 "configure"
31942+#line $LINENO "configure" 31836+#line $LINENO "configure"
31943 #include "confdefs.h" 31837 #include "confdefs.h"
31944 31838
31945 #if HAVE_DLFCN_H 31839 #if HAVE_DLFCN_H
31946@@ -11085,10 +11735,10 @@ else 31840@@ -11136,10 +11786,10 @@ else
31947 /* When -fvisbility=hidden is used, assume the code has been annotated 31841 /* When -fvisbility=hidden is used, assume the code has been annotated
31948 correspondingly for the symbols needed. */ 31842 correspondingly for the symbols needed. */
31949 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 31843 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
@@ -31956,16 +31850,16 @@ index fc4109a1a47..6c42352868c 100755
31956 int main () 31850 int main ()
31957 { 31851 {
31958 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 31852 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
31959@@ -11147,7 +11797,7 @@ else 31853@@ -11198,7 +11848,7 @@ else
31960 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 31854 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
31961 lt_status=$lt_dlunknown 31855 lt_status=$lt_dlunknown
31962 cat > conftest.$ac_ext <<_LT_EOF 31856 cat > conftest.$ac_ext <<_LT_EOF
31963-#line 11150 "configure" 31857-#line 11201 "configure"
31964+#line $LINENO "configure" 31858+#line $LINENO "configure"
31965 #include "confdefs.h" 31859 #include "confdefs.h"
31966 31860
31967 #if HAVE_DLFCN_H 31861 #if HAVE_DLFCN_H
31968@@ -11191,10 +11841,10 @@ else 31862@@ -11242,10 +11892,10 @@ else
31969 /* When -fvisbility=hidden is used, assume the code has been annotated 31863 /* When -fvisbility=hidden is used, assume the code has been annotated
31970 correspondingly for the symbols needed. */ 31864 correspondingly for the symbols needed. */
31971 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 31865 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
@@ -31978,7 +31872,7 @@ index fc4109a1a47..6c42352868c 100755
31978 int main () 31872 int main ()
31979 { 31873 {
31980 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 31874 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
31981@@ -13414,13 +14064,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' 31875@@ -15351,13 +16001,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
31982 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' 31876 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
31983 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' 31877 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
31984 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' 31878 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
@@ -31999,7 +31893,7 @@ index fc4109a1a47..6c42352868c 100755
31999 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' 31893 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
32000 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' 31894 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
32001 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' 31895 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
32002@@ -13435,14 +14092,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de 31896@@ -15372,14 +16029,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de
32003 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' 31897 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
32004 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' 31898 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
32005 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"`' 31899 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"`'
@@ -32018,7 +31912,7 @@ index fc4109a1a47..6c42352868c 100755
32018 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' 31912 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
32019 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' 31913 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
32020 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' 31914 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
32021@@ -13475,12 +14135,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q 31915@@ -15412,12 +16072,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q
32022 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' 31916 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
32023 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' 31917 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
32024 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' 31918 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
@@ -32032,7 +31926,7 @@ index fc4109a1a47..6c42352868c 100755
32032 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' 31926 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
32033 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' 31927 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
32034 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' 31928 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
32035@@ -13535,8 +14195,13 @@ reload_flag \ 31929@@ -15472,8 +16132,13 @@ reload_flag \
32036 OBJDUMP \ 31930 OBJDUMP \
32037 deplibs_check_method \ 31931 deplibs_check_method \
32038 file_magic_cmd \ 31932 file_magic_cmd \
@@ -32046,7 +31940,7 @@ index fc4109a1a47..6c42352868c 100755
32046 STRIP \ 31940 STRIP \
32047 RANLIB \ 31941 RANLIB \
32048 CC \ 31942 CC \
32049@@ -13546,12 +14211,14 @@ lt_cv_sys_global_symbol_pipe \ 31943@@ -15483,12 +16148,14 @@ lt_cv_sys_global_symbol_pipe \
32050 lt_cv_sys_global_symbol_to_cdecl \ 31944 lt_cv_sys_global_symbol_to_cdecl \
32051 lt_cv_sys_global_symbol_to_c_name_address \ 31945 lt_cv_sys_global_symbol_to_c_name_address \
32052 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ 31946 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
@@ -32062,7 +31956,7 @@ index fc4109a1a47..6c42352868c 100755
32062 DSYMUTIL \ 31956 DSYMUTIL \
32063 NMEDIT \ 31957 NMEDIT \
32064 LIPO \ 31958 LIPO \
32065@@ -13567,7 +14234,6 @@ no_undefined_flag \ 31959@@ -15504,7 +16171,6 @@ no_undefined_flag \
32066 hardcode_libdir_flag_spec \ 31960 hardcode_libdir_flag_spec \
32067 hardcode_libdir_flag_spec_ld \ 31961 hardcode_libdir_flag_spec_ld \
32068 hardcode_libdir_separator \ 31962 hardcode_libdir_separator \
@@ -32070,7 +31964,7 @@ index fc4109a1a47..6c42352868c 100755
32070 exclude_expsyms \ 31964 exclude_expsyms \
32071 include_expsyms \ 31965 include_expsyms \
32072 file_list_spec \ 31966 file_list_spec \
32073@@ -13603,6 +14269,7 @@ module_cmds \ 31967@@ -15540,6 +16206,7 @@ module_cmds \
32074 module_expsym_cmds \ 31968 module_expsym_cmds \
32075 export_symbols_cmds \ 31969 export_symbols_cmds \
32076 prelink_cmds \ 31970 prelink_cmds \
@@ -32078,7 +31972,7 @@ index fc4109a1a47..6c42352868c 100755
32078 postinstall_cmds \ 31972 postinstall_cmds \
32079 postuninstall_cmds \ 31973 postuninstall_cmds \
32080 finish_cmds \ 31974 finish_cmds \
32081@@ -14368,7 +15035,8 @@ $as_echo X"$file" | 31975@@ -16313,7 +16980,8 @@ $as_echo X"$file" |
32082 # NOTE: Changes made to this file will be lost: look at ltmain.sh. 31976 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
32083 # 31977 #
32084 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 31978 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
@@ -32088,7 +31982,7 @@ index fc4109a1a47..6c42352868c 100755
32088 # Written by Gordon Matzigkeit, 1996 31982 # Written by Gordon Matzigkeit, 1996
32089 # 31983 #
32090 # This file is part of GNU Libtool. 31984 # This file is part of GNU Libtool.
32091@@ -14471,19 +15139,42 @@ SP2NL=$lt_lt_SP2NL 31985@@ -16416,19 +17084,42 @@ SP2NL=$lt_lt_SP2NL
32092 # turn newlines into spaces. 31986 # turn newlines into spaces.
32093 NL2SP=$lt_lt_NL2SP 31987 NL2SP=$lt_lt_NL2SP
32094 31988
@@ -32132,7 +32026,7 @@ index fc4109a1a47..6c42352868c 100755
32132 # A symbol stripping program. 32026 # A symbol stripping program.
32133 STRIP=$lt_STRIP 32027 STRIP=$lt_STRIP
32134 32028
32135@@ -14513,6 +15204,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address 32029@@ -16458,6 +17149,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
32136 # Transform the output of nm in a C name address pair when lib prefix is needed. 32030 # Transform the output of nm in a C name address pair when lib prefix is needed.
32137 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix 32031 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
32138 32032
@@ -32145,7 +32039,7 @@ index fc4109a1a47..6c42352868c 100755
32145 # The name of the directory that contains temporary libtool files. 32039 # The name of the directory that contains temporary libtool files.
32146 objdir=$objdir 32040 objdir=$objdir
32147 32041
32148@@ -14522,6 +15219,9 @@ MAGIC_CMD=$MAGIC_CMD 32042@@ -16467,6 +17164,9 @@ MAGIC_CMD=$MAGIC_CMD
32149 # Must we lock files when doing compilation? 32043 # Must we lock files when doing compilation?
32150 need_locks=$lt_need_locks 32044 need_locks=$lt_need_locks
32151 32045
@@ -32155,7 +32049,7 @@ index fc4109a1a47..6c42352868c 100755
32155 # Tool to manipulate archived DWARF debug symbol files on Mac OS X. 32049 # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
32156 DSYMUTIL=$lt_DSYMUTIL 32050 DSYMUTIL=$lt_DSYMUTIL
32157 32051
32158@@ -14636,12 +15336,12 @@ with_gcc=$GCC 32052@@ -16581,12 +17281,12 @@ with_gcc=$GCC
32159 # Compiler flag to turn off builtin functions. 32053 # Compiler flag to turn off builtin functions.
32160 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag 32054 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
32161 32055
@@ -32171,7 +32065,7 @@ index fc4109a1a47..6c42352868c 100755
32171 # Compiler flag to prevent dynamic linking. 32065 # Compiler flag to prevent dynamic linking.
32172 link_static_flag=$lt_lt_prog_compiler_static 32066 link_static_flag=$lt_lt_prog_compiler_static
32173 32067
32174@@ -14728,9 +15428,6 @@ inherit_rpath=$inherit_rpath 32068@@ -16673,9 +17373,6 @@ inherit_rpath=$inherit_rpath
32175 # Whether libtool must link a program against all its dependency libraries. 32069 # Whether libtool must link a program against all its dependency libraries.
32176 link_all_deplibs=$link_all_deplibs 32070 link_all_deplibs=$link_all_deplibs
32177 32071
@@ -32181,7 +32075,7 @@ index fc4109a1a47..6c42352868c 100755
32181 # Set to "yes" if exported symbols are required. 32075 # Set to "yes" if exported symbols are required.
32182 always_export_symbols=$always_export_symbols 32076 always_export_symbols=$always_export_symbols
32183 32077
32184@@ -14746,6 +15443,9 @@ include_expsyms=$lt_include_expsyms 32078@@ -16691,6 +17388,9 @@ include_expsyms=$lt_include_expsyms
32185 # Commands necessary for linking programs (against libraries) with templates. 32079 # Commands necessary for linking programs (against libraries) with templates.
32186 prelink_cmds=$lt_prelink_cmds 32080 prelink_cmds=$lt_prelink_cmds
32187 32081
@@ -32191,7 +32085,7 @@ index fc4109a1a47..6c42352868c 100755
32191 # Specify filename containing input files. 32085 # Specify filename containing input files.
32192 file_list_spec=$lt_file_list_spec 32086 file_list_spec=$lt_file_list_spec
32193 32087
32194@@ -14778,210 +15478,169 @@ ltmain="$ac_aux_dir/ltmain.sh" 32088@@ -16723,210 +17423,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
32195 # if finds mixed CR/LF and LF-only lines. Since sed operates in 32089 # if finds mixed CR/LF and LF-only lines. Since sed operates in
32196 # text mode, it properly converts lines to CR/LF. This bash problem 32090 # text mode, it properly converts lines to CR/LF. This bash problem
32197 # is reportedly fixed, but why not run on old versions too? 32091 # is reportedly fixed, but why not run on old versions too?
@@ -32566,7 +32460,7 @@ index fc4109a1a47..6c42352868c 100755
32566 chmod +x "$ofile" 32460 chmod +x "$ofile"
32567 32461
32568diff --git a/zlib/Makefile.in b/zlib/Makefile.in 32462diff --git a/zlib/Makefile.in b/zlib/Makefile.in
32569index 855c23eea23..0605835c14f 100644 32463index dd8a21deba1..28628282c56 100644
32570--- a/zlib/Makefile.in 32464--- a/zlib/Makefile.in
32571+++ b/zlib/Makefile.in 32465+++ b/zlib/Makefile.in
32572@@ -281,6 +281,7 @@ CPPFLAGS = @CPPFLAGS@ 32466@@ -281,6 +281,7 @@ CPPFLAGS = @CPPFLAGS@
@@ -32594,10 +32488,10 @@ index 855c23eea23..0605835c14f 100644
32594 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ 32488 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
32595 am__include = @am__include@ 32489 am__include = @am__include@
32596diff --git a/zlib/configure b/zlib/configure 32490diff --git a/zlib/configure b/zlib/configure
32597index e65ade3badd..35b44e2819c 100755 32491index 2d551360683..e01d0a70438 100755
32598--- a/zlib/configure 32492--- a/zlib/configure
32599+++ b/zlib/configure 32493+++ b/zlib/configure
32600@@ -646,8 +646,11 @@ OTOOL 32494@@ -648,8 +648,11 @@ OTOOL
32601 LIPO 32495 LIPO
32602 NMEDIT 32496 NMEDIT
32603 DSYMUTIL 32497 DSYMUTIL
@@ -32609,15 +32503,15 @@ index e65ade3badd..35b44e2819c 100755
32609 OBJDUMP 32503 OBJDUMP
32610 LN_S 32504 LN_S
32611 NM 32505 NM
32612@@ -774,6 +777,7 @@ enable_static 32506@@ -776,6 +779,7 @@ enable_static
32613 with_pic 32507 with_pic
32614 enable_fast_install 32508 enable_fast_install
32615 with_gnu_ld 32509 with_gnu_ld
32616+with_libtool_sysroot 32510+with_libtool_sysroot
32617 enable_libtool_lock 32511 enable_libtool_lock
32618 enable_host_shared 32512 enable_host_shared
32619 ' 32513 enable_host_pie
32620@@ -1428,6 +1432,8 @@ Optional Packages: 32514@@ -1432,6 +1436,8 @@ Optional Packages:
32621 --with-pic try to use only PIC/non-PIC objects [default=use 32515 --with-pic try to use only PIC/non-PIC objects [default=use
32622 both] 32516 both]
32623 --with-gnu-ld assume the C compiler uses GNU ld [default=no] 32517 --with-gnu-ld assume the C compiler uses GNU ld [default=no]
@@ -32626,7 +32520,7 @@ index e65ade3badd..35b44e2819c 100755
32626 32520
32627 Some influential environment variables: 32521 Some influential environment variables:
32628 CC C compiler command 32522 CC C compiler command
32629@@ -4186,8 +4192,8 @@ esac 32523@@ -4190,8 +4196,8 @@ esac
32630 32524
32631 32525
32632 32526
@@ -32637,7 +32531,7 @@ index e65ade3badd..35b44e2819c 100755
32637 32531
32638 32532
32639 32533
32640@@ -4227,7 +4233,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO 32534@@ -4231,7 +4237,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
32641 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 32535 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
32642 $as_echo_n "checking how to print strings... " >&6; } 32536 $as_echo_n "checking how to print strings... " >&6; }
32643 # Test print first, because it will be a builtin if present. 32537 # Test print first, because it will be a builtin if present.
@@ -32646,7 +32540,7 @@ index e65ade3badd..35b44e2819c 100755
32646 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then 32540 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
32647 ECHO='print -r --' 32541 ECHO='print -r --'
32648 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then 32542 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
32649@@ -5050,8 +5056,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; 32543@@ -5054,8 +5060,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6;
32650 # Try some XSI features 32544 # Try some XSI features
32651 xsi_shell=no 32545 xsi_shell=no
32652 ( _lt_dummy="a/b/c" 32546 ( _lt_dummy="a/b/c"
@@ -32657,7 +32551,7 @@ index e65ade3badd..35b44e2819c 100755
32657 && eval 'test $(( 1 + 1 )) -eq 2 \ 32551 && eval 'test $(( 1 + 1 )) -eq 2 \
32658 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ 32552 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
32659 && xsi_shell=yes 32553 && xsi_shell=yes
32660@@ -5100,6 +5106,80 @@ esac 32554@@ -5104,6 +5110,80 @@ esac
32661 32555
32662 32556
32663 32557
@@ -32738,7 +32632,7 @@ index e65ade3badd..35b44e2819c 100755
32738 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 32632 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
32739 $as_echo_n "checking for $LD option to reload object files... " >&6; } 32633 $as_echo_n "checking for $LD option to reload object files... " >&6; }
32740 if ${lt_cv_ld_reload_flag+:} false; then : 32634 if ${lt_cv_ld_reload_flag+:} false; then :
32741@@ -5116,6 +5196,11 @@ case $reload_flag in 32635@@ -5120,6 +5200,11 @@ case $reload_flag in
32742 esac 32636 esac
32743 reload_cmds='$LD$reload_flag -o $output$reload_objs' 32637 reload_cmds='$LD$reload_flag -o $output$reload_objs'
32744 case $host_os in 32638 case $host_os in
@@ -32750,7 +32644,7 @@ index e65ade3badd..35b44e2819c 100755
32750 darwin*) 32644 darwin*)
32751 if test "$GCC" = yes; then 32645 if test "$GCC" = yes; then
32752 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' 32646 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
32753@@ -5284,7 +5369,8 @@ mingw* | pw32*) 32647@@ -5288,7 +5373,8 @@ mingw* | pw32*)
32754 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' 32648 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
32755 lt_cv_file_magic_cmd='func_win32_libid' 32649 lt_cv_file_magic_cmd='func_win32_libid'
32756 else 32650 else
@@ -32760,7 +32654,7 @@ index e65ade3badd..35b44e2819c 100755
32760 lt_cv_file_magic_cmd='$OBJDUMP -f' 32654 lt_cv_file_magic_cmd='$OBJDUMP -f'
32761 fi 32655 fi
32762 ;; 32656 ;;
32763@@ -5438,6 +5524,21 @@ esac 32657@@ -5447,6 +5533,21 @@ esac
32764 fi 32658 fi
32765 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 32659 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
32766 $as_echo "$lt_cv_deplibs_check_method" >&6; } 32660 $as_echo "$lt_cv_deplibs_check_method" >&6; }
@@ -32782,7 +32676,7 @@ index e65ade3badd..35b44e2819c 100755
32782 file_magic_cmd=$lt_cv_file_magic_cmd 32676 file_magic_cmd=$lt_cv_file_magic_cmd
32783 deplibs_check_method=$lt_cv_deplibs_check_method 32677 deplibs_check_method=$lt_cv_deplibs_check_method
32784 test -z "$deplibs_check_method" && deplibs_check_method=unknown 32678 test -z "$deplibs_check_method" && deplibs_check_method=unknown
32785@@ -5453,6 +5554,158 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown 32679@@ -5462,6 +5563,158 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
32786 32680
32787 32681
32788 32682
@@ -32941,7 +32835,7 @@ index e65ade3badd..35b44e2819c 100755
32941 plugin_option= 32835 plugin_option=
32942 plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll" 32836 plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll"
32943 for plugin in $plugin_names; do 32837 for plugin in $plugin_names; do
32944@@ -5467,8 +5720,10 @@ for plugin in $plugin_names; do 32838@@ -5476,8 +5729,10 @@ for plugin in $plugin_names; do
32945 done 32839 done
32946 32840
32947 if test -n "$ac_tool_prefix"; then 32841 if test -n "$ac_tool_prefix"; then
@@ -32954,7 +32848,7 @@ index e65ade3badd..35b44e2819c 100755
32954 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 32848 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
32955 $as_echo_n "checking for $ac_word... " >&6; } 32849 $as_echo_n "checking for $ac_word... " >&6; }
32956 if ${ac_cv_prog_AR+:} false; then : 32850 if ${ac_cv_prog_AR+:} false; then :
32957@@ -5484,7 +5739,7 @@ do 32851@@ -5493,7 +5748,7 @@ do
32958 test -z "$as_dir" && as_dir=. 32852 test -z "$as_dir" && as_dir=.
32959 for ac_exec_ext in '' $ac_executable_extensions; do 32853 for ac_exec_ext in '' $ac_executable_extensions; do
32960 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 32854 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
@@ -32963,7 +32857,7 @@ index e65ade3badd..35b44e2819c 100755
32963 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 32857 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
32964 break 2 32858 break 2
32965 fi 32859 fi
32966@@ -5504,11 +5759,15 @@ $as_echo "no" >&6; } 32860@@ -5513,11 +5768,15 @@ $as_echo "no" >&6; }
32967 fi 32861 fi
32968 32862
32969 32863
@@ -32982,7 +32876,7 @@ index e65ade3badd..35b44e2819c 100755
32982 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 32876 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
32983 $as_echo_n "checking for $ac_word... " >&6; } 32877 $as_echo_n "checking for $ac_word... " >&6; }
32984 if ${ac_cv_prog_ac_ct_AR+:} false; then : 32878 if ${ac_cv_prog_ac_ct_AR+:} false; then :
32985@@ -5524,7 +5783,7 @@ do 32879@@ -5533,7 +5792,7 @@ do
32986 test -z "$as_dir" && as_dir=. 32880 test -z "$as_dir" && as_dir=.
32987 for ac_exec_ext in '' $ac_executable_extensions; do 32881 for ac_exec_ext in '' $ac_executable_extensions; do
32988 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 32882 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
@@ -32991,7 +32885,7 @@ index e65ade3badd..35b44e2819c 100755
32991 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 32885 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
32992 break 2 32886 break 2
32993 fi 32887 fi
32994@@ -5543,6 +5802,10 @@ else 32888@@ -5552,6 +5811,10 @@ else
32995 $as_echo "no" >&6; } 32889 $as_echo "no" >&6; }
32996 fi 32890 fi
32997 32891
@@ -33002,7 +32896,7 @@ index e65ade3badd..35b44e2819c 100755
33002 if test "x$ac_ct_AR" = x; then 32896 if test "x$ac_ct_AR" = x; then
33003 AR="false" 32897 AR="false"
33004 else 32898 else
33005@@ -5554,25 +5817,19 @@ ac_tool_warned=yes ;; 32899@@ -5563,25 +5826,19 @@ ac_tool_warned=yes ;;
33006 esac 32900 esac
33007 AR=$ac_ct_AR 32901 AR=$ac_ct_AR
33008 fi 32902 fi
@@ -33037,7 +32931,7 @@ index e65ade3badd..35b44e2819c 100755
33037 32931
33038 32932
33039 32933
33040@@ -5584,6 +5841,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru 32934@@ -5593,6 +5850,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru
33041 32935
33042 32936
33043 32937
@@ -33102,7 +32996,7 @@ index e65ade3badd..35b44e2819c 100755
33102 if test -n "$ac_tool_prefix"; then 32996 if test -n "$ac_tool_prefix"; then
33103 # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. 32997 # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
33104 set dummy ${ac_tool_prefix}strip; ac_word=$2 32998 set dummy ${ac_tool_prefix}strip; ac_word=$2
33105@@ -5923,8 +6238,8 @@ esac 32999@@ -5932,8 +6247,8 @@ esac
33106 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" 33000 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
33107 33001
33108 # Transform an extracted symbol line into symbol name and symbol address 33002 # Transform an extracted symbol line into symbol name and symbol address
@@ -33113,7 +33007,7 @@ index e65ade3badd..35b44e2819c 100755
33113 33007
33114 # Handle CRLF in mingw tool chain 33008 # Handle CRLF in mingw tool chain
33115 opt_cr= 33009 opt_cr=
33116@@ -5960,6 +6275,7 @@ for ac_symprfx in "" "_"; do 33010@@ -5969,6 +6284,7 @@ for ac_symprfx in "" "_"; do
33117 else 33011 else
33118 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" 33012 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
33119 fi 33013 fi
@@ -33121,7 +33015,7 @@ index e65ade3badd..35b44e2819c 100755
33121 33015
33122 # Check to see that the pipe works correctly. 33016 # Check to see that the pipe works correctly.
33123 pipe_works=no 33017 pipe_works=no
33124@@ -6001,6 +6317,18 @@ _LT_EOF 33018@@ -6010,6 +6326,18 @@ _LT_EOF
33125 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then 33019 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
33126 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then 33020 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
33127 cat <<_LT_EOF > conftest.$ac_ext 33021 cat <<_LT_EOF > conftest.$ac_ext
@@ -33140,7 +33034,7 @@ index e65ade3badd..35b44e2819c 100755
33140 #ifdef __cplusplus 33034 #ifdef __cplusplus
33141 extern "C" { 33035 extern "C" {
33142 #endif 33036 #endif
33143@@ -6012,7 +6340,7 @@ _LT_EOF 33037@@ -6021,7 +6349,7 @@ _LT_EOF
33144 cat <<_LT_EOF >> conftest.$ac_ext 33038 cat <<_LT_EOF >> conftest.$ac_ext
33145 33039
33146 /* The mapping between symbol names and symbols. */ 33040 /* The mapping between symbol names and symbols. */
@@ -33149,7 +33043,7 @@ index e65ade3badd..35b44e2819c 100755
33149 const char *name; 33043 const char *name;
33150 void *address; 33044 void *address;
33151 } 33045 }
33152@@ -6038,8 +6366,8 @@ static const void *lt_preloaded_setup() { 33046@@ -6047,8 +6375,8 @@ static const void *lt_preloaded_setup() {
33153 _LT_EOF 33047 _LT_EOF
33154 # Now try linking the two files. 33048 # Now try linking the two files.
33155 mv conftest.$ac_objext conftstm.$ac_objext 33049 mv conftest.$ac_objext conftstm.$ac_objext
@@ -33160,7 +33054,7 @@ index e65ade3badd..35b44e2819c 100755
33160 LIBS="conftstm.$ac_objext" 33054 LIBS="conftstm.$ac_objext"
33161 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" 33055 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
33162 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 33056 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
33163@@ -6049,8 +6377,8 @@ _LT_EOF 33057@@ -6058,8 +6386,8 @@ _LT_EOF
33164 test $ac_status = 0; } && test -s conftest${ac_exeext}; then 33058 test $ac_status = 0; } && test -s conftest${ac_exeext}; then
33165 pipe_works=yes 33059 pipe_works=yes
33166 fi 33060 fi
@@ -33171,7 +33065,7 @@ index e65ade3badd..35b44e2819c 100755
33171 else 33065 else
33172 echo "cannot find nm_test_func in $nlist" >&5 33066 echo "cannot find nm_test_func in $nlist" >&5
33173 fi 33067 fi
33174@@ -6087,6 +6415,17 @@ else 33068@@ -6096,6 +6424,17 @@ else
33175 $as_echo "ok" >&6; } 33069 $as_echo "ok" >&6; }
33176 fi 33070 fi
33177 33071
@@ -33189,7 +33083,7 @@ index e65ade3badd..35b44e2819c 100755
33189 33083
33190 33084
33191 33085
33192@@ -6104,6 +6443,43 @@ fi 33086@@ -6113,6 +6452,43 @@ fi
33193 33087
33194 33088
33195 33089
@@ -33233,7 +33127,7 @@ index e65ade3badd..35b44e2819c 100755
33233 33127
33234 33128
33235 33129
33236@@ -6318,6 +6694,123 @@ esac 33130@@ -6327,6 +6703,123 @@ esac
33237 33131
33238 need_locks="$enable_libtool_lock" 33132 need_locks="$enable_libtool_lock"
33239 33133
@@ -33357,7 +33251,7 @@ index e65ade3badd..35b44e2819c 100755
33357 33251
33358 case $host_os in 33252 case $host_os in
33359 rhapsody* | darwin*) 33253 rhapsody* | darwin*)
33360@@ -6884,6 +7377,8 @@ _LT_EOF 33254@@ -6893,6 +7386,8 @@ _LT_EOF
33361 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 33255 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
33362 echo "$AR cru libconftest.a conftest.o" >&5 33256 echo "$AR cru libconftest.a conftest.o" >&5
33363 $AR cru libconftest.a conftest.o 2>&5 33257 $AR cru libconftest.a conftest.o 2>&5
@@ -33366,7 +33260,7 @@ index e65ade3badd..35b44e2819c 100755
33366 cat > conftest.c << _LT_EOF 33260 cat > conftest.c << _LT_EOF
33367 int main() { return 0;} 33261 int main() { return 0;}
33368 _LT_EOF 33262 _LT_EOF
33369@@ -7733,8 +8228,6 @@ fi 33263@@ -7744,8 +8239,6 @@ fi
33370 lt_prog_compiler_pic= 33264 lt_prog_compiler_pic=
33371 lt_prog_compiler_static= 33265 lt_prog_compiler_static=
33372 33266
@@ -33375,7 +33269,7 @@ index e65ade3badd..35b44e2819c 100755
33375 33269
33376 if test "$GCC" = yes; then 33270 if test "$GCC" = yes; then
33377 lt_prog_compiler_wl='-Wl,' 33271 lt_prog_compiler_wl='-Wl,'
33378@@ -7900,6 +8393,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 33272@@ -7911,6 +8404,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
33379 lt_prog_compiler_pic='--shared' 33273 lt_prog_compiler_pic='--shared'
33380 lt_prog_compiler_static='--static' 33274 lt_prog_compiler_static='--static'
33381 ;; 33275 ;;
@@ -33388,7 +33282,7 @@ index e65ade3badd..35b44e2819c 100755
33388 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) 33282 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
33389 # Portland Group compilers (*not* the Pentium gcc compiler, 33283 # Portland Group compilers (*not* the Pentium gcc compiler,
33390 # which looks to be a dead project) 33284 # which looks to be a dead project)
33391@@ -7962,7 +8461,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 33285@@ -7973,7 +8472,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
33392 lt_prog_compiler_pic='-KPIC' 33286 lt_prog_compiler_pic='-KPIC'
33393 lt_prog_compiler_static='-Bstatic' 33287 lt_prog_compiler_static='-Bstatic'
33394 case $cc_basename in 33288 case $cc_basename in
@@ -33397,7 +33291,7 @@ index e65ade3badd..35b44e2819c 100755
33397 lt_prog_compiler_wl='-Qoption ld ';; 33291 lt_prog_compiler_wl='-Qoption ld ';;
33398 *) 33292 *)
33399 lt_prog_compiler_wl='-Wl,';; 33293 lt_prog_compiler_wl='-Wl,';;
33400@@ -8019,13 +8518,17 @@ case $host_os in 33294@@ -8030,13 +8529,17 @@ case $host_os in
33401 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" 33295 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
33402 ;; 33296 ;;
33403 esac 33297 esac
@@ -33421,7 +33315,7 @@ index e65ade3badd..35b44e2819c 100755
33421 33315
33422 # 33316 #
33423 # Check to make sure the PIC flag actually works. 33317 # Check to make sure the PIC flag actually works.
33424@@ -8086,6 +8589,11 @@ fi 33318@@ -8097,6 +8600,11 @@ fi
33425 33319
33426 33320
33427 33321
@@ -33433,7 +33327,7 @@ index e65ade3badd..35b44e2819c 100755
33433 # 33327 #
33434 # Check to make sure the static flag actually works. 33328 # Check to make sure the static flag actually works.
33435 # 33329 #
33436@@ -8436,7 +8944,8 @@ _LT_EOF 33330@@ -8447,7 +8955,8 @@ _LT_EOF
33437 allow_undefined_flag=unsupported 33331 allow_undefined_flag=unsupported
33438 always_export_symbols=no 33332 always_export_symbols=no
33439 enable_shared_with_static_runtimes=yes 33333 enable_shared_with_static_runtimes=yes
@@ -33443,7 +33337,7 @@ index e65ade3badd..35b44e2819c 100755
33443 33337
33444 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then 33338 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
33445 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' 33339 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
33446@@ -8535,12 +9044,12 @@ _LT_EOF 33340@@ -8546,12 +9055,12 @@ _LT_EOF
33447 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' 33341 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
33448 hardcode_libdir_flag_spec= 33342 hardcode_libdir_flag_spec=
33449 hardcode_libdir_flag_spec_ld='-rpath $libdir' 33343 hardcode_libdir_flag_spec_ld='-rpath $libdir'
@@ -33458,7 +33352,7 @@ index e65ade3badd..35b44e2819c 100755
33458 fi 33352 fi
33459 ;; 33353 ;;
33460 esac 33354 esac
33461@@ -8554,8 +9063,8 @@ _LT_EOF 33355@@ -8565,8 +9074,8 @@ _LT_EOF
33462 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' 33356 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
33463 wlarc= 33357 wlarc=
33464 else 33358 else
@@ -33469,7 +33363,7 @@ index e65ade3badd..35b44e2819c 100755
33469 fi 33363 fi
33470 ;; 33364 ;;
33471 33365
33472@@ -8573,8 +9082,8 @@ _LT_EOF 33366@@ -8584,8 +9093,8 @@ _LT_EOF
33473 33367
33474 _LT_EOF 33368 _LT_EOF
33475 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 33369 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -33480,7 +33374,7 @@ index e65ade3badd..35b44e2819c 100755
33480 else 33374 else
33481 ld_shlibs=no 33375 ld_shlibs=no
33482 fi 33376 fi
33483@@ -8620,8 +9129,8 @@ _LT_EOF 33377@@ -8631,8 +9140,8 @@ _LT_EOF
33484 33378
33485 *) 33379 *)
33486 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 33380 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -33491,7 +33385,7 @@ index e65ade3badd..35b44e2819c 100755
33491 else 33385 else
33492 ld_shlibs=no 33386 ld_shlibs=no
33493 fi 33387 fi
33494@@ -8751,7 +9260,13 @@ _LT_EOF 33388@@ -8762,7 +9271,13 @@ _LT_EOF
33495 allow_undefined_flag='-berok' 33389 allow_undefined_flag='-berok'
33496 # Determine the default libpath from the value encoded in an 33390 # Determine the default libpath from the value encoded in an
33497 # empty executable. 33391 # empty executable.
@@ -33506,7 +33400,7 @@ index e65ade3badd..35b44e2819c 100755
33506 as_fn_error $? "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5 33400 as_fn_error $? "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5
33507 fi 33401 fi
33508 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 33402 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
33509@@ -8767,22 +9282,29 @@ main () 33403@@ -8778,22 +9293,29 @@ main ()
33510 _ACEOF 33404 _ACEOF
33511 if ac_fn_c_try_link "$LINENO"; then : 33405 if ac_fn_c_try_link "$LINENO"; then :
33512 33406
@@ -33549,7 +33443,7 @@ index e65ade3badd..35b44e2819c 100755
33549 33443
33550 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 33444 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
33551 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" 33445 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"
33552@@ -8794,7 +9316,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 33446@@ -8805,7 +9327,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
33553 else 33447 else
33554 # Determine the default libpath from the value encoded in an 33448 # Determine the default libpath from the value encoded in an
33555 # empty executable. 33449 # empty executable.
@@ -33564,7 +33458,7 @@ index e65ade3badd..35b44e2819c 100755
33564 as_fn_error $? "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5 33458 as_fn_error $? "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5
33565 fi 33459 fi
33566 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 33460 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
33567@@ -8810,22 +9338,29 @@ main () 33461@@ -8821,22 +9349,29 @@ main ()
33568 _ACEOF 33462 _ACEOF
33569 if ac_fn_c_try_link "$LINENO"; then : 33463 if ac_fn_c_try_link "$LINENO"; then :
33570 33464
@@ -33607,7 +33501,7 @@ index e65ade3badd..35b44e2819c 100755
33607 33501
33608 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 33502 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
33609 # Warning - without using the other run time loading flags, 33503 # Warning - without using the other run time loading flags,
33610@@ -8870,20 +9405,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 33504@@ -8881,20 +9416,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
33611 # Microsoft Visual C++. 33505 # Microsoft Visual C++.
33612 # hardcode_libdir_flag_spec is actually meaningless, as there is 33506 # hardcode_libdir_flag_spec is actually meaningless, as there is
33613 # no search path for DLLs. 33507 # no search path for DLLs.
@@ -33685,7 +33579,7 @@ index e65ade3badd..35b44e2819c 100755
33685 ;; 33579 ;;
33686 33580
33687 darwin* | rhapsody*) 33581 darwin* | rhapsody*)
33688@@ -8944,7 +9522,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 33582@@ -8955,7 +9533,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
33689 33583
33690 # FreeBSD 3 and greater uses gcc -shared to do shared libraries. 33584 # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
33691 freebsd* | dragonfly*) 33585 freebsd* | dragonfly*)
@@ -33694,7 +33588,7 @@ index e65ade3badd..35b44e2819c 100755
33694 hardcode_libdir_flag_spec='-R$libdir' 33588 hardcode_libdir_flag_spec='-R$libdir'
33695 hardcode_direct=yes 33589 hardcode_direct=yes
33696 hardcode_shlibpath_var=no 33590 hardcode_shlibpath_var=no
33697@@ -8952,7 +9530,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 33591@@ -8963,7 +9541,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
33698 33592
33699 hpux9*) 33593 hpux9*)
33700 if test "$GCC" = yes; then 33594 if test "$GCC" = yes; then
@@ -33703,7 +33597,7 @@ index e65ade3badd..35b44e2819c 100755
33703 else 33597 else
33704 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' 33598 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'
33705 fi 33599 fi
33706@@ -8968,7 +9546,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 33600@@ -8979,7 +9557,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
33707 33601
33708 hpux10*) 33602 hpux10*)
33709 if test "$GCC" = yes && test "$with_gnu_ld" = no; then 33603 if test "$GCC" = yes && test "$with_gnu_ld" = no; then
@@ -33712,8 +33606,8 @@ index e65ade3badd..35b44e2819c 100755
33712 else 33606 else
33713 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' 33607 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
33714 fi 33608 fi
33715@@ -8992,10 +9570,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 33609@@ -9003,10 +9581,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
33716 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' 33610 archive_cmds='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
33717 ;; 33611 ;;
33718 ia64*) 33612 ia64*)
33719- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' 33613- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
@@ -33725,7 +33619,7 @@ index e65ade3badd..35b44e2819c 100755
33725 ;; 33619 ;;
33726 esac 33620 esac
33727 else 33621 else
33728@@ -9074,26 +9652,39 @@ fi 33622@@ -9085,26 +9663,39 @@ fi
33729 33623
33730 irix5* | irix6* | nonstopux*) 33624 irix5* | irix6* | nonstopux*)
33731 if test "$GCC" = yes; then 33625 if test "$GCC" = yes; then
@@ -33773,7 +33667,7 @@ index e65ade3badd..35b44e2819c 100755
33773 else 33667 else
33774 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' 33668 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'
33775 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' 33669 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'
33776@@ -9178,7 +9769,7 @@ rm -f core conftest.err conftest.$ac_objext \ 33670@@ -9189,7 +9780,7 @@ rm -f core conftest.err conftest.$ac_objext \
33777 osf4* | osf5*) # as osf3* with the addition of -msym flag 33671 osf4* | osf5*) # as osf3* with the addition of -msym flag
33778 if test "$GCC" = yes; then 33672 if test "$GCC" = yes; then
33779 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' 33673 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
@@ -33782,7 +33676,7 @@ index e65ade3badd..35b44e2819c 100755
33782 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' 33676 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
33783 else 33677 else
33784 allow_undefined_flag=' -expect_unresolved \*' 33678 allow_undefined_flag=' -expect_unresolved \*'
33785@@ -9197,9 +9788,9 @@ rm -f core conftest.err conftest.$ac_objext \ 33679@@ -9208,9 +9799,9 @@ rm -f core conftest.err conftest.$ac_objext \
33786 no_undefined_flag=' -z defs' 33680 no_undefined_flag=' -z defs'
33787 if test "$GCC" = yes; then 33681 if test "$GCC" = yes; then
33788 wlarc='${wl}' 33682 wlarc='${wl}'
@@ -33794,7 +33688,7 @@ index e65ade3badd..35b44e2819c 100755
33794 else 33688 else
33795 case `$CC -V 2>&1` in 33689 case `$CC -V 2>&1` in
33796 *"Compilers 5.0"*) 33690 *"Compilers 5.0"*)
33797@@ -9775,8 +10366,9 @@ cygwin* | mingw* | pw32* | cegcc*) 33691@@ -9786,8 +10377,9 @@ cygwin* | mingw* | pw32* | cegcc*)
33798 need_version=no 33692 need_version=no
33799 need_lib_prefix=no 33693 need_lib_prefix=no
33800 33694
@@ -33806,7 +33700,7 @@ index e65ade3badd..35b44e2819c 100755
33806 library_names_spec='$libname.dll.a' 33700 library_names_spec='$libname.dll.a'
33807 # DLL is installed to $(libdir)/../bin by postinstall_cmds 33701 # DLL is installed to $(libdir)/../bin by postinstall_cmds
33808 postinstall_cmds='base_file=`basename \${file}`~ 33702 postinstall_cmds='base_file=`basename \${file}`~
33809@@ -9809,13 +10401,71 @@ cygwin* | mingw* | pw32* | cegcc*) 33703@@ -9820,13 +10412,71 @@ cygwin* | mingw* | pw32* | cegcc*)
33810 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' 33704 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
33811 ;; 33705 ;;
33812 esac 33706 esac
@@ -33879,16 +33773,16 @@ index e65ade3badd..35b44e2819c 100755
33879 # FIXME: first we should search . and the directory the executable is in 33773 # FIXME: first we should search . and the directory the executable is in
33880 shlibpath_var=PATH 33774 shlibpath_var=PATH
33881 ;; 33775 ;;
33882@@ -10711,7 +11361,7 @@ else 33776@@ -10746,7 +11396,7 @@ else
33883 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 33777 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
33884 lt_status=$lt_dlunknown 33778 lt_status=$lt_dlunknown
33885 cat > conftest.$ac_ext <<_LT_EOF 33779 cat > conftest.$ac_ext <<_LT_EOF
33886-#line 10714 "configure" 33780-#line 10749 "configure"
33887+#line $LINENO "configure" 33781+#line $LINENO "configure"
33888 #include "confdefs.h" 33782 #include "confdefs.h"
33889 33783
33890 #if HAVE_DLFCN_H 33784 #if HAVE_DLFCN_H
33891@@ -10755,10 +11405,10 @@ else 33785@@ -10790,10 +11440,10 @@ else
33892 /* When -fvisbility=hidden is used, assume the code has been annotated 33786 /* When -fvisbility=hidden is used, assume the code has been annotated
33893 correspondingly for the symbols needed. */ 33787 correspondingly for the symbols needed. */
33894 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 33788 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
@@ -33901,16 +33795,16 @@ index e65ade3badd..35b44e2819c 100755
33901 int main () 33795 int main ()
33902 { 33796 {
33903 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 33797 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
33904@@ -10817,7 +11467,7 @@ else 33798@@ -10852,7 +11502,7 @@ else
33905 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 33799 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
33906 lt_status=$lt_dlunknown 33800 lt_status=$lt_dlunknown
33907 cat > conftest.$ac_ext <<_LT_EOF 33801 cat > conftest.$ac_ext <<_LT_EOF
33908-#line 10820 "configure" 33802-#line 10855 "configure"
33909+#line $LINENO "configure" 33803+#line $LINENO "configure"
33910 #include "confdefs.h" 33804 #include "confdefs.h"
33911 33805
33912 #if HAVE_DLFCN_H 33806 #if HAVE_DLFCN_H
33913@@ -10861,10 +11511,10 @@ else 33807@@ -10896,10 +11546,10 @@ else
33914 /* When -fvisbility=hidden is used, assume the code has been annotated 33808 /* When -fvisbility=hidden is used, assume the code has been annotated
33915 correspondingly for the symbols needed. */ 33809 correspondingly for the symbols needed. */
33916 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 33810 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
@@ -33923,7 +33817,7 @@ index e65ade3badd..35b44e2819c 100755
33923 int main () 33817 int main ()
33924 { 33818 {
33925 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 33819 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
33926@@ -12334,13 +12984,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' 33820@@ -12385,13 +13035,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
33927 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' 33821 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
33928 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' 33822 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
33929 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' 33823 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
@@ -33944,7 +33838,7 @@ index e65ade3badd..35b44e2819c 100755
33944 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' 33838 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
33945 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' 33839 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
33946 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' 33840 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
33947@@ -12355,14 +13012,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de 33841@@ -12406,14 +13063,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de
33948 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' 33842 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
33949 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' 33843 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
33950 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"`' 33844 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"`'
@@ -33963,7 +33857,7 @@ index e65ade3badd..35b44e2819c 100755
33963 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' 33857 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
33964 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' 33858 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
33965 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' 33859 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
33966@@ -12395,12 +13055,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q 33860@@ -12446,12 +13106,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q
33967 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' 33861 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
33968 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' 33862 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
33969 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' 33863 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
@@ -33977,7 +33871,7 @@ index e65ade3badd..35b44e2819c 100755
33977 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' 33871 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
33978 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' 33872 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
33979 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' 33873 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
33980@@ -12455,8 +13115,13 @@ reload_flag \ 33874@@ -12506,8 +13166,13 @@ reload_flag \
33981 OBJDUMP \ 33875 OBJDUMP \
33982 deplibs_check_method \ 33876 deplibs_check_method \
33983 file_magic_cmd \ 33877 file_magic_cmd \
@@ -33991,7 +33885,7 @@ index e65ade3badd..35b44e2819c 100755
33991 STRIP \ 33885 STRIP \
33992 RANLIB \ 33886 RANLIB \
33993 CC \ 33887 CC \
33994@@ -12466,12 +13131,14 @@ lt_cv_sys_global_symbol_pipe \ 33888@@ -12517,12 +13182,14 @@ lt_cv_sys_global_symbol_pipe \
33995 lt_cv_sys_global_symbol_to_cdecl \ 33889 lt_cv_sys_global_symbol_to_cdecl \
33996 lt_cv_sys_global_symbol_to_c_name_address \ 33890 lt_cv_sys_global_symbol_to_c_name_address \
33997 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ 33891 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
@@ -34007,7 +33901,7 @@ index e65ade3badd..35b44e2819c 100755
34007 DSYMUTIL \ 33901 DSYMUTIL \
34008 NMEDIT \ 33902 NMEDIT \
34009 LIPO \ 33903 LIPO \
34010@@ -12487,7 +13154,6 @@ no_undefined_flag \ 33904@@ -12538,7 +13205,6 @@ no_undefined_flag \
34011 hardcode_libdir_flag_spec \ 33905 hardcode_libdir_flag_spec \
34012 hardcode_libdir_flag_spec_ld \ 33906 hardcode_libdir_flag_spec_ld \
34013 hardcode_libdir_separator \ 33907 hardcode_libdir_separator \
@@ -34015,7 +33909,7 @@ index e65ade3badd..35b44e2819c 100755
34015 exclude_expsyms \ 33909 exclude_expsyms \
34016 include_expsyms \ 33910 include_expsyms \
34017 file_list_spec \ 33911 file_list_spec \
34018@@ -12523,6 +13189,7 @@ module_cmds \ 33912@@ -12574,6 +13240,7 @@ module_cmds \
34019 module_expsym_cmds \ 33913 module_expsym_cmds \
34020 export_symbols_cmds \ 33914 export_symbols_cmds \
34021 prelink_cmds \ 33915 prelink_cmds \
@@ -34023,7 +33917,7 @@ index e65ade3badd..35b44e2819c 100755
34023 postinstall_cmds \ 33917 postinstall_cmds \
34024 postuninstall_cmds \ 33918 postuninstall_cmds \
34025 finish_cmds \ 33919 finish_cmds \
34026@@ -13121,7 +13788,8 @@ $as_echo X"$file" | 33920@@ -13172,7 +13839,8 @@ $as_echo X"$file" |
34027 # NOTE: Changes made to this file will be lost: look at ltmain.sh. 33921 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
34028 # 33922 #
34029 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 33923 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
@@ -34033,7 +33927,7 @@ index e65ade3badd..35b44e2819c 100755
34033 # Written by Gordon Matzigkeit, 1996 33927 # Written by Gordon Matzigkeit, 1996
34034 # 33928 #
34035 # This file is part of GNU Libtool. 33929 # This file is part of GNU Libtool.
34036@@ -13224,19 +13892,42 @@ SP2NL=$lt_lt_SP2NL 33930@@ -13275,19 +13943,42 @@ SP2NL=$lt_lt_SP2NL
34037 # turn newlines into spaces. 33931 # turn newlines into spaces.
34038 NL2SP=$lt_lt_NL2SP 33932 NL2SP=$lt_lt_NL2SP
34039 33933
@@ -34077,7 +33971,7 @@ index e65ade3badd..35b44e2819c 100755
34077 # A symbol stripping program. 33971 # A symbol stripping program.
34078 STRIP=$lt_STRIP 33972 STRIP=$lt_STRIP
34079 33973
34080@@ -13266,6 +13957,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address 33974@@ -13317,6 +14008,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
34081 # Transform the output of nm in a C name address pair when lib prefix is needed. 33975 # Transform the output of nm in a C name address pair when lib prefix is needed.
34082 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix 33976 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
34083 33977
@@ -34090,7 +33984,7 @@ index e65ade3badd..35b44e2819c 100755
34090 # The name of the directory that contains temporary libtool files. 33984 # The name of the directory that contains temporary libtool files.
34091 objdir=$objdir 33985 objdir=$objdir
34092 33986
34093@@ -13275,6 +13972,9 @@ MAGIC_CMD=$MAGIC_CMD 33987@@ -13326,6 +14023,9 @@ MAGIC_CMD=$MAGIC_CMD
34094 # Must we lock files when doing compilation? 33988 # Must we lock files when doing compilation?
34095 need_locks=$lt_need_locks 33989 need_locks=$lt_need_locks
34096 33990
@@ -34100,7 +33994,7 @@ index e65ade3badd..35b44e2819c 100755
34100 # Tool to manipulate archived DWARF debug symbol files on Mac OS X. 33994 # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
34101 DSYMUTIL=$lt_DSYMUTIL 33995 DSYMUTIL=$lt_DSYMUTIL
34102 33996
34103@@ -13389,12 +14089,12 @@ with_gcc=$GCC 33997@@ -13440,12 +14140,12 @@ with_gcc=$GCC
34104 # Compiler flag to turn off builtin functions. 33998 # Compiler flag to turn off builtin functions.
34105 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag 33999 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
34106 34000
@@ -34116,7 +34010,7 @@ index e65ade3badd..35b44e2819c 100755
34116 # Compiler flag to prevent dynamic linking. 34010 # Compiler flag to prevent dynamic linking.
34117 link_static_flag=$lt_lt_prog_compiler_static 34011 link_static_flag=$lt_lt_prog_compiler_static
34118 34012
34119@@ -13481,9 +14181,6 @@ inherit_rpath=$inherit_rpath 34013@@ -13532,9 +14232,6 @@ inherit_rpath=$inherit_rpath
34120 # Whether libtool must link a program against all its dependency libraries. 34014 # Whether libtool must link a program against all its dependency libraries.
34121 link_all_deplibs=$link_all_deplibs 34015 link_all_deplibs=$link_all_deplibs
34122 34016
@@ -34126,7 +34020,7 @@ index e65ade3badd..35b44e2819c 100755
34126 # Set to "yes" if exported symbols are required. 34020 # Set to "yes" if exported symbols are required.
34127 always_export_symbols=$always_export_symbols 34021 always_export_symbols=$always_export_symbols
34128 34022
34129@@ -13499,6 +14196,9 @@ include_expsyms=$lt_include_expsyms 34023@@ -13550,6 +14247,9 @@ include_expsyms=$lt_include_expsyms
34130 # Commands necessary for linking programs (against libraries) with templates. 34024 # Commands necessary for linking programs (against libraries) with templates.
34131 prelink_cmds=$lt_prelink_cmds 34025 prelink_cmds=$lt_prelink_cmds
34132 34026
@@ -34136,7 +34030,7 @@ index e65ade3badd..35b44e2819c 100755
34136 # Specify filename containing input files. 34030 # Specify filename containing input files.
34137 file_list_spec=$lt_file_list_spec 34031 file_list_spec=$lt_file_list_spec
34138 34032
34139@@ -13531,210 +14231,169 @@ ltmain="$ac_aux_dir/ltmain.sh" 34033@@ -13582,210 +14282,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
34140 # if finds mixed CR/LF and LF-only lines. Since sed operates in 34034 # if finds mixed CR/LF and LF-only lines. Since sed operates in
34141 # text mode, it properly converts lines to CR/LF. This bash problem 34035 # text mode, it properly converts lines to CR/LF. This bash problem
34142 # is reportedly fixed, but why not run on old versions too? 34036 # is reportedly fixed, but why not run on old versions too?
diff --git a/meta/recipes-devtools/binutils/binutils/0009-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch b/meta/recipes-devtools/binutils/binutils/0009-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch
index acd827143a..5f87c2ebf0 100644
--- a/meta/recipes-devtools/binutils/binutils/0009-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch
+++ b/meta/recipes-devtools/binutils/binutils/0009-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch
@@ -1,4 +1,4 @@
1From 73d1af65ccfed87662342274d9ec33900786beb3 Mon Sep 17 00:00:00 2001 1From 37a395151679d74c98a23ad5c39ed02009487f9c Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 2 Mar 2015 01:42:38 +0000 3Date: Mon, 2 Mar 2015 01:42:38 +0000
4Subject: [PATCH] Fix rpath in libtool when sysroot is enabled 4Subject: [PATCH] Fix rpath in libtool when sysroot is enabled
@@ -19,7 +19,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
19 1 file changed, 8 insertions(+), 2 deletions(-) 19 1 file changed, 8 insertions(+), 2 deletions(-)
20 20
21diff --git a/ltmain.sh b/ltmain.sh 21diff --git a/ltmain.sh b/ltmain.sh
22index 70e856e0659..11ee684cccf 100644 22index 7f7104ffc82..f59eb4aa631 100644
23--- a/ltmain.sh 23--- a/ltmain.sh
24+++ b/ltmain.sh 24+++ b/ltmain.sh
25@@ -8035,9 +8035,11 @@ EOF 25@@ -8035,9 +8035,11 @@ EOF
diff --git a/meta/recipes-devtools/binutils/binutils/0010-sync-with-OE-libtool-changes.patch b/meta/recipes-devtools/binutils/binutils/0010-sync-with-OE-libtool-changes.patch
index faf5f2c0b8..5f6708896d 100644
--- a/meta/recipes-devtools/binutils/binutils/0010-sync-with-OE-libtool-changes.patch
+++ b/meta/recipes-devtools/binutils/binutils/0010-sync-with-OE-libtool-changes.patch
@@ -1,4 +1,4 @@
1From da9dc36e90c6cf7d3d3bf6f4e337261a93d63428 Mon Sep 17 00:00:00 2001 1From 8c2788cee8eb69c8bde5778129a6b66287868c3b Mon Sep 17 00:00:00 2001
2From: Ross Burton <ross.burton@intel.com> 2From: Ross Burton <ross.burton@intel.com>
3Date: Mon, 6 Mar 2017 23:33:27 -0800 3Date: Mon, 6 Mar 2017 23:33:27 -0800
4Subject: [PATCH] sync with OE libtool changes 4Subject: [PATCH] sync with OE libtool changes
@@ -26,7 +26,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
26 1 file changed, 28 insertions(+), 6 deletions(-) 26 1 file changed, 28 insertions(+), 6 deletions(-)
27 27
28diff --git a/ltmain.sh b/ltmain.sh 28diff --git a/ltmain.sh b/ltmain.sh
29index 11ee684cccf..3b19ac15328 100644 29index f59eb4aa631..ce97db42ce7 100644
30--- a/ltmain.sh 30--- a/ltmain.sh
31+++ b/ltmain.sh 31+++ b/ltmain.sh
32@@ -8053,8 +8053,16 @@ EOF 32@@ -8053,8 +8053,16 @@ EOF
diff --git a/meta/recipes-devtools/binutils/binutils/0011-Check-for-clang-before-checking-gcc-version.patch b/meta/recipes-devtools/binutils/binutils/0011-Check-for-clang-before-checking-gcc-version.patch
index 05c73171f5..e753627a24 100644
--- a/meta/recipes-devtools/binutils/binutils/0011-Check-for-clang-before-checking-gcc-version.patch
+++ b/meta/recipes-devtools/binutils/binutils/0011-Check-for-clang-before-checking-gcc-version.patch
@@ -1,4 +1,4 @@
1From f6105e5202180627e9690884d483fd5b7dc28652 Mon Sep 17 00:00:00 2001 1From 11bbb4f62b0f914f59f3f01a9d835930f9eb1122 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 9cb953a197e..b63b5cd3de0 100755 21index 670684d83d1..f9ba1c0a4f7 100755
22--- a/configure 22--- a/configure
23+++ b/configure 23+++ b/configure
24@@ -5460,7 +5460,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu 24@@ -5432,7 +5432,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 9cb953a197e..b63b5cd3de0 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 e95a9ed116e..2df870b86af 100644 34index 88b4800e298..6cd4530db56 100644
35--- a/configure.ac 35--- a/configure.ac
36+++ b/configure.ac 36+++ b/configure.ac
37@@ -1444,7 +1444,7 @@ if test "$GCC" = yes; then 37@@ -1410,7 +1410,7 @@ if test "$GCC" = yes; then
38 AC_MSG_CHECKING([whether g++ accepts -static-libstdc++ -static-libgcc]) 38 AC_MSG_CHECKING([whether g++ accepts -static-libstdc++ -static-libgcc])
39 AC_LANG_PUSH(C++) 39 AC_LANG_PUSH(C++)
40 AC_LINK_IFELSE([AC_LANG_SOURCE([ 40 AC_LINK_IFELSE([AC_LANG_SOURCE([
diff --git a/meta/recipes-devtools/binutils/binutils/0012-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch b/meta/recipes-devtools/binutils/binutils/0012-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch
index 20eb943d65..7059eb467c 100644
--- a/meta/recipes-devtools/binutils/binutils/0012-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch
+++ b/meta/recipes-devtools/binutils/binutils/0012-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch
@@ -1,4 +1,4 @@
1From 13cbec5bc5c75dd4c3e1d5f3ca80e5b64f7116d1 Mon Sep 17 00:00:00 2001 1From 65c8ea481cda572b60d0949648df912e616d3884 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Thu, 10 Mar 2022 21:21:33 -0800 3Date: Thu, 10 Mar 2022 21:21:33 -0800
4Subject: [PATCH] Only generate an RPATH entry if LD_RUN_PATH is not empty 4Subject: [PATCH] Only generate an RPATH entry if LD_RUN_PATH is not empty
@@ -14,10 +14,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
14 1 file changed, 5 insertions(+) 14 1 file changed, 5 insertions(+)
15 15
16diff --git a/ld/ldelf.c b/ld/ldelf.c 16diff --git a/ld/ldelf.c b/ld/ldelf.c
17index 1519f8ac4e5..2a7c76dc29c 100644 17index 187b359af86..ad792f02d63 100644
18--- a/ld/ldelf.c 18--- a/ld/ldelf.c
19+++ b/ld/ldelf.c 19+++ b/ld/ldelf.c
20@@ -1127,6 +1127,9 @@ ldelf_handle_dt_needed (struct elf_link_hash_table *htab, 20@@ -1130,6 +1130,9 @@ ldelf_handle_dt_needed (struct elf_link_hash_table *htab,
21 && command_line.rpath == NULL) 21 && command_line.rpath == NULL)
22 { 22 {
23 path = (const char *) getenv ("LD_RUN_PATH"); 23 path = (const char *) getenv ("LD_RUN_PATH");
@@ -27,7 +27,7 @@ index 1519f8ac4e5..2a7c76dc29c 100644
27 if (path 27 if (path
28 && ldelf_search_needed (path, &n, force, 28 && ldelf_search_needed (path, &n, force,
29 is_linux, elfsize)) 29 is_linux, elfsize))
30@@ -1802,6 +1805,8 @@ ldelf_before_allocation (char *audit, char *depaudit, 30@@ -1805,6 +1808,8 @@ ldelf_before_allocation (char *audit, char *depaudit,
31 rpath = command_line.rpath; 31 rpath = command_line.rpath;
32 if (rpath == NULL) 32 if (rpath == NULL)
33 rpath = (const char *) getenv ("LD_RUN_PATH"); 33 rpath = (const char *) getenv ("LD_RUN_PATH");
diff --git a/meta/recipes-devtools/binutils/binutils/0013-Define-alignof-using-_Alignof-when-using-C11-or-newe.patch b/meta/recipes-devtools/binutils/binutils/0013-Define-alignof-using-_Alignof-when-using-C11-or-newe.patch
index a6892e8af6..0b6065b60f 100644
--- a/meta/recipes-devtools/binutils/binutils/0013-Define-alignof-using-_Alignof-when-using-C11-or-newe.patch
+++ b/meta/recipes-devtools/binutils/binutils/0013-Define-alignof-using-_Alignof-when-using-C11-or-newe.patch
@@ -1,4 +1,4 @@
1From 9d451ca9ca6bf34b43a089033565ae7570db2065 Mon Sep 17 00:00:00 2001 1From ad6942752570199d3959e344c432bc92d9fc43ad Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Sun, 15 Jan 2023 00:16:25 -0800 3Date: Sun, 15 Jan 2023 00:16:25 -0800
4Subject: [PATCH] Define alignof using _Alignof when using C11 or newer 4Subject: [PATCH] Define alignof using _Alignof when using C11 or newer
@@ -25,10 +25,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
25 1 file changed, 10 insertions(+) 25 1 file changed, 10 insertions(+)
26 26
27diff --git a/libiberty/sha1.c b/libiberty/sha1.c 27diff --git a/libiberty/sha1.c b/libiberty/sha1.c
28index 6c71e3ebb41..a2caf947d31 100644 28index 49e8e0b6c2b..72de5cc8ad6 100644
29--- a/libiberty/sha1.c 29--- a/libiberty/sha1.c
30+++ b/libiberty/sha1.c 30+++ b/libiberty/sha1.c
31@@ -229,7 +229,17 @@ sha1_process_bytes (const void *buffer, size_t len, struct sha1_ctx *ctx) 31@@ -234,7 +234,17 @@ sha1_process_bytes (const void *buffer, size_t len, struct sha1_ctx *ctx)
32 if (len >= 64) 32 if (len >= 64)
33 { 33 {
34 #if !_STRING_ARCH_unaligned 34 #if !_STRING_ARCH_unaligned
diff --git a/meta/recipes-devtools/binutils/binutils/0014-Remove-duplicate-pe-dll.o-entry-deom-targ_extra_ofil.patch b/meta/recipes-devtools/binutils/binutils/0014-Remove-duplicate-pe-dll.o-entry-deom-targ_extra_ofil.patch
index 818d646ffe..de1a6271d7 100644
--- a/meta/recipes-devtools/binutils/binutils/0014-Remove-duplicate-pe-dll.o-entry-deom-targ_extra_ofil.patch
+++ b/meta/recipes-devtools/binutils/binutils/0014-Remove-duplicate-pe-dll.o-entry-deom-targ_extra_ofil.patch
@@ -1,4 +1,4 @@
1From f0c39effd46d4dec0813276b1903d6deddcd82dc Mon Sep 17 00:00:00 2001 1From 6a21059fb86423304358693a200f1ad568cd6699 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Wed, 18 Jan 2023 19:35:07 -0800 3Date: Wed, 18 Jan 2023 19:35:07 -0800
4Subject: [PATCH] Remove duplicate pe-dll.o entry deom targ_extra_ofiles 4Subject: [PATCH] Remove duplicate pe-dll.o entry deom targ_extra_ofiles
@@ -18,10 +18,10 @@ Cc: Zac Walker <zac.walker@linaro.org>
18 1 file changed, 1 insertion(+), 1 deletion(-) 18 1 file changed, 1 insertion(+), 1 deletion(-)
19 19
20diff --git a/ld/configure.tgt b/ld/configure.tgt 20diff --git a/ld/configure.tgt b/ld/configure.tgt
21index c62b9581d9b..e78644d04e2 100644 21index f937f78b876..830613744c2 100644
22--- a/ld/configure.tgt 22--- a/ld/configure.tgt
23+++ b/ld/configure.tgt 23+++ b/ld/configure.tgt
24@@ -1055,7 +1055,7 @@ x86_64-*-cygwin) targ_emul=i386pep ; 24@@ -1067,7 +1067,7 @@ x86_64-*-cygwin) targ_emul=i386pep ;
25 ;; 25 ;;
26 x86_64-*-mingw*) targ_emul=i386pep ; 26 x86_64-*-mingw*) targ_emul=i386pep ;
27 targ_extra_emuls=i386pe 27 targ_extra_emuls=i386pe
diff --git a/meta/recipes-devtools/binutils/binutils/0015-gprofng-Fix-build-with-64bit-file-offset-on-32bit-ma.patch b/meta/recipes-devtools/binutils/binutils/0015-gprofng-Fix-build-with-64bit-file-offset-on-32bit-ma.patch
deleted file mode 100644
index 3bb083819b..0000000000
--- a/meta/recipes-devtools/binutils/binutils/0015-gprofng-Fix-build-with-64bit-file-offset-on-32bit-ma.patch
+++ /dev/null
@@ -1,55 +0,0 @@
1From 15936ae7cdfd6814654eff367b5cfb2565ea6af8 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 31 Jul 2023 15:23:38 -0700
4Subject: [PATCH] gprofng: Fix build with 64bit file offset on 32bit machines
5
6gprofng/ChangeLog
72023-07-31 Khem Raj <raj.khem@gmail.com>
8
9* libcollector/iotrace.c: Define open64, fgetpos64, and fsetpos64
10 only when __USE_LARGEFILE64 and __USE_FILE_OFFSET64 are not
11 defined.
12
13Upstream-Status: Submitted [https://sourceware.org/pipermail/binutils/2023-July/128741.html]
14Signed-off-by: Khem Raj <raj.khem@gmail.com>
15---
16 gprofng/libcollector/iotrace.c | 9 ++++++---
17 1 file changed, 6 insertions(+), 3 deletions(-)
18
19diff --git a/gprofng/libcollector/iotrace.c b/gprofng/libcollector/iotrace.c
20index c0ea7497b09..81c844048d9 100644
21--- a/gprofng/libcollector/iotrace.c
22+++ b/gprofng/libcollector/iotrace.c
23@@ -1030,8 +1030,9 @@ gprofng_open64 (int(real_open64) (const char *, int, ...),
24 }
25
26 DCL_FUNC_VER (DCL_OPEN64, open64_2_2, open64@GLIBC_2.2)
27+#if !defined(__USE_LARGEFILE64)
28 DCL_OPEN64 (open64)
29-
30+#endif
31
32 #define F_ERROR_ARG 0
33 #define F_INT_ARG 1
34@@ -2989,8 +2990,9 @@ DCL_FUNC_VER (DCL_FGETPOS64, fgetpos64_2_17, fgetpos64@GLIBC_2.17)
35 DCL_FUNC_VER (DCL_FGETPOS64, fgetpos64_2_2_5, fgetpos64@GLIBC_2.2.5)
36 DCL_FUNC_VER (DCL_FGETPOS64, fgetpos64_2_2, fgetpos64@GLIBC_2.2)
37 DCL_FUNC_VER (DCL_FGETPOS64, fgetpos64_2_1, fgetpos64@GLIBC_2.1)
38+#if !defined(__USE_LARGEFILE64)
39 DCL_FGETPOS64 (fgetpos64)
40-
41+#endif
42 /*------------------------------------------------------------- fsetpos */
43 static int
44 gprofng_fsetpos (int(real_fsetpos) (FILE *, const fpos_t *),
45@@ -3087,8 +3089,9 @@ DCL_FUNC_VER (DCL_FSETPOS64, fsetpos64_2_17, fsetpos64@GLIBC_2.17)
46 DCL_FUNC_VER (DCL_FSETPOS64, fsetpos64_2_2_5, fsetpos64@GLIBC_2.2.5)
47 DCL_FUNC_VER (DCL_FSETPOS64, fsetpos64_2_2, fsetpos64@GLIBC_2.2)
48 DCL_FUNC_VER (DCL_FSETPOS64, fsetpos64_2_1, fsetpos64@GLIBC_2.1)
49+#if !defined(__USE_LARGEFILE64)
50 DCL_FSETPOS64 (fsetpos64)
51-
52+#endif
53 /*------------------------------------------------------------- fsync */
54 int
55 fsync (int fildes)
diff --git a/meta/recipes-devtools/binutils/binutils_2.41.bb b/meta/recipes-devtools/binutils/binutils_2.42.bb
index 2cce40f1ef..2cce40f1ef 100644
--- a/meta/recipes-devtools/binutils/binutils_2.41.bb
+++ b/meta/recipes-devtools/binutils/binutils_2.42.bb
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-05-10 21:25:13 +0000