diff options
author | Khem Raj <raj.khem@gmail.com> | 2023-01-18 20:27:22 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-01-26 21:06:57 +0000 |
commit | 918ba17f5888fda81956564630aad1031a3645df (patch) | |
tree | 422e39c75c242302b98e5c5099384424d47ff91b /meta/recipes-devtools/binutils | |
parent | 1afadc7e0971a7239ba21ecb5adfc76f80542247 (diff) | |
download | poky-918ba17f5888fda81956564630aad1031a3645df.tar.gz |
binutils: Upgrade to 2.40 release
(From OE-Core rev: ae2b71ca2c73111a21845c2e1329ff973558991a)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/binutils')
26 files changed, 5846 insertions, 2808 deletions
diff --git a/meta/recipes-devtools/binutils/binutils-2.39.inc b/meta/recipes-devtools/binutils/binutils-2.40.inc index 419571d56c..c2b926bb32 100644 --- a/meta/recipes-devtools/binutils/binutils-2.39.inc +++ b/meta/recipes-devtools/binutils/binutils-2.40.inc | |||
@@ -10,15 +10,15 @@ LIC_FILES_CHKSUM="\ | |||
10 | file://bfd/COPYING;md5=d32239bcb673463ab874e80d47fae504\ | 10 | file://bfd/COPYING;md5=d32239bcb673463ab874e80d47fae504\ |
11 | " | 11 | " |
12 | 12 | ||
13 | # When upgrading to 2.39, please make sure there is no trailing .0, so | 13 | # When upgrading to 2.41, 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. |
15 | PV = "2.39" | 15 | PV = "2.40" |
16 | CVE_VERSION = "2.39" | 16 | CVE_VERSION = "2.40" |
17 | SRCBRANCH ?= "binutils-2_39-branch" | 17 | SRCBRANCH ?= "binutils-2_40-branch" |
18 | 18 | ||
19 | UPSTREAM_CHECK_GITTAGREGEX = "binutils-(?P<pver>\d+_(\d_?)*)" | 19 | UPSTREAM_CHECK_GITTAGREGEX = "binutils-(?P<pver>\d+_(\d_?)*)" |
20 | 20 | ||
21 | SRCREV ?= "f89058434f13382c85b8729464192bc7763d88a4" | 21 | SRCREV ?= "ffb83e32fc11f36b7b82b876c14888f82cd983b3" |
22 | BINUTILS_GIT_URI ?= "git://sourceware.org/git/binutils-gdb.git;branch=${SRCBRANCH};protocol=git" | 22 | BINUTILS_GIT_URI ?= "git://sourceware.org/git/binutils-gdb.git;branch=${SRCBRANCH};protocol=git" |
23 | SRC_URI = "\ | 23 | SRC_URI = "\ |
24 | ${BINUTILS_GIT_URI} \ | 24 | ${BINUTILS_GIT_URI} \ |
@@ -31,14 +31,8 @@ SRC_URI = "\ | |||
31 | file://0010-sync-with-OE-libtool-changes.patch \ | 31 | file://0010-sync-with-OE-libtool-changes.patch \ |
32 | file://0011-Check-for-clang-before-checking-gcc-version.patch \ | 32 | file://0011-Check-for-clang-before-checking-gcc-version.patch \ |
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-CVE-2022-38533.patch \ | 34 | file://0013-Define-alignof-using-_Alignof-when-using-C11-or-newe.patch \ |
35 | file://0014-CVE-2022-38128-1.patch \ | 35 | file://0014-configure-remove-dependencies-on-gmp-and-mpfr-when-g.patch \ |
36 | file://0014-CVE-2022-38128-2.patch \ | 36 | file://0015-Remove-duplicate-pe-dll.o-entry-deom-targ_extra_ofil.patch \ |
37 | file://0014-CVE-2022-38128-3.patch \ | ||
38 | file://0015-CVE-2022-4285.patch \ | ||
39 | " | 37 | " |
40 | S = "${WORKDIR}/git" | 38 | S = "${WORKDIR}/git" |
41 | # Already in 2.39 branch | ||
42 | # - https://sourceware.org/bugzilla/show_bug.cgi?id=29289 | ||
43 | # - https://sourceware.org/bugzilla/show_bug.cgi?id=29290 | ||
44 | CVE_CHECK_IGNORE += "CVE-2022-38126 CVE-2022-38127" | ||
diff --git a/meta/recipes-devtools/binutils/binutils-cross-canadian_2.39.bb b/meta/recipes-devtools/binutils/binutils-cross-canadian_2.40.bb index 5dbaa03017..5dbaa03017 100644 --- a/meta/recipes-devtools/binutils/binutils-cross-canadian_2.39.bb +++ b/meta/recipes-devtools/binutils/binutils-cross-canadian_2.40.bb | |||
diff --git a/meta/recipes-devtools/binutils/binutils-cross-testsuite_2.39.bb b/meta/recipes-devtools/binutils/binutils-cross-testsuite_2.40.bb index ca99e91130..ca99e91130 100644 --- a/meta/recipes-devtools/binutils/binutils-cross-testsuite_2.39.bb +++ b/meta/recipes-devtools/binutils/binutils-cross-testsuite_2.40.bb | |||
diff --git a/meta/recipes-devtools/binutils/binutils-cross_2.39.bb b/meta/recipes-devtools/binutils/binutils-cross_2.40.bb index fbd1f7d25a..fbd1f7d25a 100644 --- a/meta/recipes-devtools/binutils/binutils-cross_2.39.bb +++ b/meta/recipes-devtools/binutils/binutils-cross_2.40.bb | |||
diff --git a/meta/recipes-devtools/binutils/binutils-crosssdk_2.39.bb b/meta/recipes-devtools/binutils/binutils-crosssdk_2.40.bb index 5bd036fd46..5bd036fd46 100644 --- a/meta/recipes-devtools/binutils/binutils-crosssdk_2.39.bb +++ b/meta/recipes-devtools/binutils/binutils-crosssdk_2.40.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 9a7ee494c8..7fffa81724 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 @@ | |||
1 | From a0ac147aec127c66c9e38292faa50bb56d3c2a19 Mon Sep 17 00:00:00 2001 | 1 | From 25e715730ddcca37021fa4876aed4fa91d5dea25 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Mon, 2 Mar 2015 01:58:54 +0000 | 3 | Date: Mon, 2 Mar 2015 01:58:54 +0000 |
4 | Subject: [PATCH] binutils-crosssdk: Generate relocatable SDKs | 4 | Subject: [PATCH] binutils-crosssdk: Generate relocatable SDKs |
@@ -21,10 +21,10 @@ 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 | ||
23 | diff --git a/gold/layout.cc b/gold/layout.cc | 23 | diff --git a/gold/layout.cc b/gold/layout.cc |
24 | index 3efe8d98ae9..9cc389664a6 100644 | 24 | index 899d4af0707..7c31b1bef6e 100644 |
25 | --- a/gold/layout.cc | 25 | --- a/gold/layout.cc |
26 | +++ b/gold/layout.cc | 26 | +++ b/gold/layout.cc |
27 | @@ -5033,7 +5033,7 @@ Layout::create_interp(const Target* target) | 27 | @@ -5083,7 +5083,7 @@ Layout::create_interp(const Target* target) |
28 | gold_assert(interp != NULL); | 28 | gold_assert(interp != NULL); |
29 | } | 29 | } |
30 | 30 | ||
@@ -34,7 +34,7 @@ index 3efe8d98ae9..9cc389664a6 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 | ||
36 | diff --git a/ld/genscripts.sh b/ld/genscripts.sh | 36 | diff --git a/ld/genscripts.sh b/ld/genscripts.sh |
37 | index 278f212bdad..0c52ebee4d0 100755 | 37 | index 382bd07ffe2..9fbd0c4cb8a 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 | @@ -304,6 +304,7 @@ DATA_ALIGNMENT_u="${DATA_ALIGNMENT_u-${DATA_ALIGNMENT_r}}" |
@@ -59,7 +59,7 @@ index 278f212bdad..0c52ebee4d0 100755 | |||
59 | DATA_ALIGNMENT=${DATA_ALIGNMENT_} | 59 | DATA_ALIGNMENT=${DATA_ALIGNMENT_} |
60 | RELOCATING=" " | 60 | RELOCATING=" " |
61 | diff --git a/ld/scripttempl/elf.sc b/ld/scripttempl/elf.sc | 61 | diff --git a/ld/scripttempl/elf.sc b/ld/scripttempl/elf.sc |
62 | index bf2268bb0ad..b1811ef130f 100644 | 62 | index 5d3b0d31b1b..2163909cd56 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 | @@ -148,8 +148,8 @@ if test -z "$DATA_SEGMENT_ALIGN"; then |
diff --git a/meta/recipes-devtools/binutils/binutils/0002-binutils-cross-Do-not-generate-linker-script-directo.patch b/meta/recipes-devtools/binutils/binutils/0002-binutils-cross-Do-not-generate-linker-script-directo.patch index cab9c0ed89..87a19c9ec3 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 @@ | |||
1 | From fd7065bfd20364679e3c3f329b19059bbc51ab02 Mon Sep 17 00:00:00 2001 | 1 | From 080a8eafc5961f78222d84aaa816d0933441b7ab Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Mon, 6 Mar 2017 23:37:05 -0800 | 3 | Date: Mon, 6 Mar 2017 23:37:05 -0800 |
4 | Subject: [PATCH] binutils-cross: Do not generate linker script directories | 4 | Subject: [PATCH] binutils-cross: Do not generate linker script directories |
@@ -22,7 +22,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
22 | 1 file changed, 25 deletions(-) | 22 | 1 file changed, 25 deletions(-) |
23 | 23 | ||
24 | diff --git a/ld/genscripts.sh b/ld/genscripts.sh | 24 | diff --git a/ld/genscripts.sh b/ld/genscripts.sh |
25 | index 0c52ebee4d0..1acbe66bd2e 100755 | 25 | index 9fbd0c4cb8a..6be07038c9b 100755 |
26 | --- a/ld/genscripts.sh | 26 | --- a/ld/genscripts.sh |
27 | +++ b/ld/genscripts.sh | 27 | +++ b/ld/genscripts.sh |
28 | @@ -235,31 +235,6 @@ append_to_lib_path() | 28 | @@ -235,31 +235,6 @@ append_to_lib_path() |
diff --git a/meta/recipes-devtools/binutils/binutils/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 4fe5520010..8e5e2be81d 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 @@ | |||
1 | From 67735b3647f98ce0f010ff8b4f9b5c5da576cb17 Mon Sep 17 00:00:00 2001 | 1 | From 90d1bb804033a74b54f64cd5d3127c004c266af8 Mon Sep 17 00:00:00 2001 |
2 | From: Richard Purdie <richard.purdie@linuxfoundation.org> | 2 | From: Richard Purdie <richard.purdie@linuxfoundation.org> |
3 | Date: Wed, 19 Feb 2020 09:51:16 -0800 | 3 | Date: Wed, 19 Feb 2020 09:51:16 -0800 |
4 | Subject: [PATCH] binutils-nativesdk: Search for alternative ld.so.conf in SDK | 4 | Subject: [PATCH] binutils-nativesdk: Search for alternative ld.so.conf in SDK |
@@ -29,7 +29,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
29 | 5 files changed, 7 insertions(+), 3 deletions(-) | 29 | 5 files changed, 7 insertions(+), 3 deletions(-) |
30 | 30 | ||
31 | diff --git a/ld/Makefile.am b/ld/Makefile.am | 31 | diff --git a/ld/Makefile.am b/ld/Makefile.am |
32 | index d31021c13e2..29782385ca4 100644 | 32 | index 12b2c3c453f..0590b7055d0 100644 |
33 | --- a/ld/Makefile.am | 33 | --- a/ld/Makefile.am |
34 | +++ b/ld/Makefile.am | 34 | +++ b/ld/Makefile.am |
35 | @@ -42,7 +42,8 @@ ZLIBINC = @zlibinc@ | 35 | @@ -42,7 +42,8 @@ ZLIBINC = @zlibinc@ |
@@ -41,12 +41,12 @@ index d31021c13e2..29782385ca4 100644 | |||
41 | + -DSYSCONFDIR="\"$(sysconfdir)\"" | 41 | + -DSYSCONFDIR="\"$(sysconfdir)\"" |
42 | WARN_CFLAGS = @WARN_CFLAGS@ | 42 | WARN_CFLAGS = @WARN_CFLAGS@ |
43 | NO_WERROR = @NO_WERROR@ | 43 | NO_WERROR = @NO_WERROR@ |
44 | AM_CFLAGS = $(WARN_CFLAGS) $(ELF_CLFAGS) $(JANSSON_CFLAGS) | 44 | AM_CFLAGS = $(WARN_CFLAGS) $(ELF_CLFAGS) $(JANSSON_CFLAGS) $(ZSTD_CFLAGS) |
45 | diff --git a/ld/Makefile.in b/ld/Makefile.in | 45 | diff --git a/ld/Makefile.in b/ld/Makefile.in |
46 | index ee0c98f65b0..04ee68a2c67 100644 | 46 | index 3d5685d6bae..70643b1ce46 100644 |
47 | --- a/ld/Makefile.in | 47 | --- a/ld/Makefile.in |
48 | +++ b/ld/Makefile.in | 48 | +++ b/ld/Makefile.in |
49 | @@ -562,7 +562,8 @@ ZLIB = @zlibdir@ -lz | 49 | @@ -566,7 +566,8 @@ ZLIB = @zlibdir@ -lz |
50 | ZLIBINC = @zlibinc@ | 50 | ZLIBINC = @zlibinc@ |
51 | ELF_CLFAGS = -DELF_LIST_OPTIONS=@elf_list_options@ \ | 51 | ELF_CLFAGS = -DELF_LIST_OPTIONS=@elf_list_options@ \ |
52 | -DELF_SHLIB_LIST_OPTIONS=@elf_shlib_list_options@ \ | 52 | -DELF_SHLIB_LIST_OPTIONS=@elf_shlib_list_options@ \ |
@@ -54,10 +54,10 @@ index ee0c98f65b0..04ee68a2c67 100644 | |||
54 | + -DELF_PLT_UNWIND_LIST_OPTIONS=@elf_plt_unwind_list_options@ \ | 54 | + -DELF_PLT_UNWIND_LIST_OPTIONS=@elf_plt_unwind_list_options@ \ |
55 | + -DSYSCONFDIR="\"$(sysconfdir)\"" | 55 | + -DSYSCONFDIR="\"$(sysconfdir)\"" |
56 | 56 | ||
57 | AM_CFLAGS = $(WARN_CFLAGS) $(ELF_CLFAGS) $(JANSSON_CFLAGS) | 57 | AM_CFLAGS = $(WARN_CFLAGS) $(ELF_CLFAGS) $(JANSSON_CFLAGS) $(ZSTD_CFLAGS) |
58 | 58 | ||
59 | diff --git a/ld/ldelf.c b/ld/ldelf.c | 59 | diff --git a/ld/ldelf.c b/ld/ldelf.c |
60 | index bfa0d54753a..0d61a3209ec 100644 | 60 | index eff6693e052..95787012b89 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 | @@ -936,7 +936,7 @@ ldelf_check_ld_so_conf (const struct bfd_link_needed_list *l, int force, |
@@ -70,7 +70,7 @@ index bfa0d54753a..0d61a3209ec 100644 | |||
70 | if (!ldelf_parse_ld_so_conf (&info, tmppath)) | 70 | if (!ldelf_parse_ld_so_conf (&info, tmppath)) |
71 | { | 71 | { |
72 | diff --git a/ld/ldmain.c b/ld/ldmain.c | 72 | diff --git a/ld/ldmain.c b/ld/ldmain.c |
73 | index ea72b14a301..1ae90a77749 100644 | 73 | index 9290a189b0d..ceaca2d85d0 100644 |
74 | --- a/ld/ldmain.c | 74 | --- a/ld/ldmain.c |
75 | +++ b/ld/ldmain.c | 75 | +++ b/ld/ldmain.c |
76 | @@ -70,6 +70,7 @@ char *program_name; | 76 | @@ -70,6 +70,7 @@ char *program_name; |
@@ -82,7 +82,7 @@ index ea72b14a301..1ae90a77749 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; |
84 | diff --git a/ld/ldmain.h b/ld/ldmain.h | 84 | diff --git a/ld/ldmain.h b/ld/ldmain.h |
85 | index f6d05a02f59..e60292cd522 100644 | 85 | index dda124b96e8..ba06a7d7be2 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 5b0f2ee308..90abd50498 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 @@ | |||
1 | From 2158e5bd4c6ea4db89e33d46ef25428e37bfc3a6 Mon Sep 17 00:00:00 2001 | 1 | From a7c988d60f11c8279453c2d9edeede001cce7c9e Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Mon, 2 Mar 2015 01:09:58 +0000 | 3 | Date: Mon, 2 Mar 2015 01:09:58 +0000 |
4 | Subject: [PATCH] Point scripts location to libdir | 4 | Subject: [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 | ||
14 | diff --git a/ld/Makefile.am b/ld/Makefile.am | 14 | diff --git a/ld/Makefile.am b/ld/Makefile.am |
15 | index 29782385ca4..062e6b6814b 100644 | 15 | index 0590b7055d0..c30db94ee3c 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) | 18 | @@ -51,7 +51,7 @@ AM_CFLAGS = $(WARN_CFLAGS) $(ELF_CLFAGS) $(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 29782385ca4..062e6b6814b 100644 | |||
25 | EMUL = @EMUL@ | 25 | EMUL = @EMUL@ |
26 | EMULATION_OFILES = @EMULATION_OFILES@ | 26 | EMULATION_OFILES = @EMULATION_OFILES@ |
27 | diff --git a/ld/Makefile.in b/ld/Makefile.in | 27 | diff --git a/ld/Makefile.in b/ld/Makefile.in |
28 | index 04ee68a2c67..782d4017a60 100644 | 28 | index 70643b1ce46..0405028e02f 100644 |
29 | --- a/ld/Makefile.in | 29 | --- a/ld/Makefile.in |
30 | +++ b/ld/Makefile.in | 30 | +++ b/ld/Makefile.in |
31 | @@ -570,7 +570,7 @@ AM_CFLAGS = $(WARN_CFLAGS) $(ELF_CLFAGS) $(JANSSON_CFLAGS) | 31 | @@ -574,7 +574,7 @@ AM_CFLAGS = $(WARN_CFLAGS) $(ELF_CLFAGS) $(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 2495079508..9557e871db 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 @@ | |||
1 | From e74d765a1a95253c9247228bd7ccbcabecdd8f7e Mon Sep 17 00:00:00 2001 | 1 | From fc39b9c332a346910695817274d55d0c20dc717a Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Mon, 2 Mar 2015 01:39:01 +0000 | 3 | Date: Mon, 2 Mar 2015 01:39:01 +0000 |
4 | Subject: [PATCH] don't let the distro compiler point to the wrong installation | 4 | Subject: [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 | ||
19 | diff --git a/libiberty/Makefile.in b/libiberty/Makefile.in | 19 | diff --git a/libiberty/Makefile.in b/libiberty/Makefile.in |
20 | index abef3c4601b..880c8826482 100644 | 20 | index f9fbba23e2c..93495e45d6f 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 00fb5aad1b..0ca55d4095 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 @@ | |||
1 | From 2c43b1357db6b09d1645704afd3f45be6de0cf4d Mon Sep 17 00:00:00 2001 | 1 | From b9af05e87ac8eb4fa18a75939edb661056246c30 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Fri, 15 Jan 2016 06:31:09 +0000 | 3 | Date: Fri, 15 Jan 2016 06:31:09 +0000 |
4 | Subject: [PATCH] warn for uses of system directories when cross linking | 4 | Subject: [PATCH] warn for uses of system directories when cross linking |
@@ -63,10 +63,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
63 | 9 files changed, 88 insertions(+), 2 deletions(-) | 63 | 9 files changed, 88 insertions(+), 2 deletions(-) |
64 | 64 | ||
65 | diff --git a/ld/config.in b/ld/config.in | 65 | diff --git a/ld/config.in b/ld/config.in |
66 | index d4c1fc420b5..1aece0b2c29 100644 | 66 | index ad0dc6a106c..d21edaddce7 100644 |
67 | --- a/ld/config.in | 67 | --- a/ld/config.in |
68 | +++ b/ld/config.in | 68 | +++ b/ld/config.in |
69 | @@ -55,6 +55,9 @@ | 69 | @@ -58,6 +58,9 @@ |
70 | language is requested. */ | 70 | language is requested. */ |
71 | #undef ENABLE_NLS | 71 | #undef ENABLE_NLS |
72 | 72 | ||
@@ -77,10 +77,10 @@ index d4c1fc420b5..1aece0b2c29 100644 | |||
77 | #undef EXTRA_SHLIB_EXTENSION | 77 | #undef EXTRA_SHLIB_EXTENSION |
78 | 78 | ||
79 | diff --git a/ld/configure b/ld/configure | 79 | diff --git a/ld/configure b/ld/configure |
80 | index e58fb7f3a35..d0a467ac101 100755 | 80 | index 49936a0cb2a..5f5dad6d67c 100755 |
81 | --- a/ld/configure | 81 | --- a/ld/configure |
82 | +++ b/ld/configure | 82 | +++ b/ld/configure |
83 | @@ -836,6 +836,7 @@ with_lib_path | 83 | @@ -839,6 +839,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 e58fb7f3a35..d0a467ac101 100755 | |||
88 | enable_gold | 88 | enable_gold |
89 | enable_got | 89 | enable_got |
90 | enable_compressed_debug_sections | 90 | enable_compressed_debug_sections |
91 | @@ -1514,6 +1515,8 @@ Optional Features: | 91 | @@ -1521,6 +1522,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 e58fb7f3a35..d0a467ac101 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 | @@ -15349,6 +15352,19 @@ fi | 100 | @@ -15483,6 +15486,19 @@ fi |
101 | 101 | ||
102 | 102 | ||
103 | 103 | ||
@@ -118,10 +118,10 @@ index e58fb7f3a35..d0a467ac101 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 |
120 | diff --git a/ld/configure.ac b/ld/configure.ac | 120 | diff --git a/ld/configure.ac b/ld/configure.ac |
121 | index 4331d6b1302..e2976bc2926 100644 | 121 | index 77edac3258c..a74dac63038 100644 |
122 | --- a/ld/configure.ac | 122 | --- a/ld/configure.ac |
123 | +++ b/ld/configure.ac | 123 | +++ b/ld/configure.ac |
124 | @@ -102,6 +102,16 @@ AC_SUBST(use_sysroot) | 124 | @@ -103,6 +103,16 @@ AC_SUBST(use_sysroot) |
125 | AC_SUBST(TARGET_SYSTEM_ROOT) | 125 | AC_SUBST(TARGET_SYSTEM_ROOT) |
126 | AC_SUBST(TARGET_SYSTEM_ROOT_DEFINE) | 126 | AC_SUBST(TARGET_SYSTEM_ROOT_DEFINE) |
127 | 127 | ||
@@ -139,10 +139,10 @@ index 4331d6b1302..e2976bc2926 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. |
141 | diff --git a/ld/ld.h b/ld/ld.h | 141 | diff --git a/ld/ld.h b/ld/ld.h |
142 | index f3086bf30de..db5064243c7 100644 | 142 | index 05649ff61b8..1818c227473 100644 |
143 | --- a/ld/ld.h | 143 | --- a/ld/ld.h |
144 | +++ b/ld/ld.h | 144 | +++ b/ld/ld.h |
145 | @@ -162,6 +162,14 @@ typedef struct | 145 | @@ -163,6 +163,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,10 +158,10 @@ index f3086bf30de..db5064243c7 100644 | |||
158 | enum endian_enum endian; | 158 | enum endian_enum endian; |
159 | 159 | ||
160 | diff --git a/ld/ld.texi b/ld/ld.texi | 160 | diff --git a/ld/ld.texi b/ld/ld.texi |
161 | index eabbec8faa9..c4680e4947e 100644 | 161 | index db3a9f09b45..77037399cb9 100644 |
162 | --- a/ld/ld.texi | 162 | --- a/ld/ld.texi |
163 | +++ b/ld/ld.texi | 163 | +++ b/ld/ld.texi |
164 | @@ -2947,6 +2947,18 @@ creation of the metadata note, if one had been enabled by an earlier | 164 | @@ -2960,6 +2960,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-metdata option. |
166 | If the linker has been built with libjansson, then the JSON string | 166 | If the linker has been built with libjansson, then the JSON string |
167 | will be validated. | 167 | will be validated. |
@@ -181,7 +181,7 @@ index eabbec8faa9..c4680e4947e 100644 | |||
181 | 181 | ||
182 | @c man end | 182 | @c man end |
183 | diff --git a/ld/ldfile.c b/ld/ldfile.c | 183 | diff --git a/ld/ldfile.c b/ld/ldfile.c |
184 | index 731ae5f7aed..dd8f03fd960 100644 | 184 | index b8fd4e5d8e0..1f1d8e23bc9 100644 |
185 | --- a/ld/ldfile.c | 185 | --- a/ld/ldfile.c |
186 | +++ b/ld/ldfile.c | 186 | +++ b/ld/ldfile.c |
187 | @@ -117,6 +117,23 @@ ldfile_add_library_path (const char *name, bool cmdline) | 187 | @@ -117,6 +117,23 @@ ldfile_add_library_path (const char *name, bool cmdline) |
@@ -209,10 +209,10 @@ index 731ae5f7aed..dd8f03fd960 100644 | |||
209 | 209 | ||
210 | /* Try to open a BFD for a lang_input_statement. */ | 210 | /* Try to open a BFD for a lang_input_statement. */ |
211 | diff --git a/ld/ldlex.h b/ld/ldlex.h | 211 | diff --git a/ld/ldlex.h b/ld/ldlex.h |
212 | index 57ade1f754b..64007ff8684 100644 | 212 | index 0538f0a06a1..f94a71875d8 100644 |
213 | --- a/ld/ldlex.h | 213 | --- a/ld/ldlex.h |
214 | +++ b/ld/ldlex.h | 214 | +++ b/ld/ldlex.h |
215 | @@ -168,6 +168,8 @@ enum option_values | 215 | @@ -170,6 +170,8 @@ enum option_values |
216 | OPTION_NO_WARN_EXECSTACK, | 216 | OPTION_NO_WARN_EXECSTACK, |
217 | OPTION_WARN_RWX_SEGMENTS, | 217 | OPTION_WARN_RWX_SEGMENTS, |
218 | OPTION_NO_WARN_RWX_SEGMENTS, | 218 | OPTION_NO_WARN_RWX_SEGMENTS, |
@@ -222,7 +222,7 @@ index 57ade1f754b..64007ff8684 100644 | |||
222 | 222 | ||
223 | /* The initial parser states. */ | 223 | /* The initial parser states. */ |
224 | diff --git a/ld/ldmain.c b/ld/ldmain.c | 224 | diff --git a/ld/ldmain.c b/ld/ldmain.c |
225 | index 1ae90a77749..f40750fd816 100644 | 225 | index ceaca2d85d0..62e7b4e5341 100644 |
226 | --- a/ld/ldmain.c | 226 | --- a/ld/ldmain.c |
227 | +++ b/ld/ldmain.c | 227 | +++ b/ld/ldmain.c |
228 | @@ -322,6 +322,8 @@ main (int argc, char **argv) | 228 | @@ -322,6 +322,8 @@ main (int argc, char **argv) |
@@ -234,7 +234,7 @@ index 1ae90a77749..f40750fd816 100644 | |||
234 | 234 | ||
235 | /* We initialize DEMANGLING based on the environment variable | 235 | /* We initialize DEMANGLING based on the environment variable |
236 | COLLECT_NO_DEMANGLE. The gcc collect2 program will demangle the | 236 | COLLECT_NO_DEMANGLE. The gcc collect2 program will demangle the |
237 | @@ -1447,7 +1449,7 @@ undefined_symbol (struct bfd_link_info *info, | 237 | @@ -1454,7 +1456,7 @@ undefined_symbol (struct bfd_link_info *info, |
238 | argv[1] = "undefined-symbol"; | 238 | argv[1] = "undefined-symbol"; |
239 | argv[2] = (char *) name; | 239 | argv[2] = (char *) name; |
240 | argv[3] = NULL; | 240 | argv[3] = NULL; |
@@ -243,7 +243,7 @@ index 1ae90a77749..f40750fd816 100644 | |||
243 | if (verbose) | 243 | if (verbose) |
244 | einfo (_("%P: About to run error handling script '%s' with arguments: '%s' '%s'\n"), | 244 | einfo (_("%P: About to run error handling script '%s' with arguments: '%s' '%s'\n"), |
245 | argv[0], argv[1], argv[2]); | 245 | argv[0], argv[1], argv[2]); |
246 | @@ -1468,7 +1470,7 @@ undefined_symbol (struct bfd_link_info *info, | 246 | @@ -1475,7 +1477,7 @@ undefined_symbol (struct bfd_link_info *info, |
247 | carry on to issue the normal error message. */ | 247 | carry on to issue the normal error message. */ |
248 | } | 248 | } |
249 | #endif /* SUPPORT_ERROR_HANDLING_SCRIPT */ | 249 | #endif /* SUPPORT_ERROR_HANDLING_SCRIPT */ |
@@ -253,10 +253,10 @@ index 1ae90a77749..f40750fd816 100644 | |||
253 | { | 253 | { |
254 | if (error_count < MAX_ERRORS_IN_A_ROW) | 254 | if (error_count < MAX_ERRORS_IN_A_ROW) |
255 | diff --git a/ld/lexsup.c b/ld/lexsup.c | 255 | diff --git a/ld/lexsup.c b/ld/lexsup.c |
256 | index 9225f71b3ce..92fb66f1fa2 100644 | 256 | index c5960385572..eb54627fb71 100644 |
257 | --- a/ld/lexsup.c | 257 | --- a/ld/lexsup.c |
258 | +++ b/ld/lexsup.c | 258 | +++ b/ld/lexsup.c |
259 | @@ -608,6 +608,14 @@ static const struct ld_option ld_options[] = | 259 | @@ -613,6 +613,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 9225f71b3ce..92fb66f1fa2 100644 | |||
271 | }; | 271 | }; |
272 | 272 | ||
273 | #define OPTION_COUNT ARRAY_SIZE (ld_options) | 273 | #define OPTION_COUNT ARRAY_SIZE (ld_options) |
274 | @@ -1722,6 +1730,14 @@ parse_args (unsigned argc, char **argv) | 274 | @@ -1735,6 +1743,14 @@ parse_args (unsigned argc, char **argv) |
275 | config.print_map_discarded = true; | 275 | config.print_map_discarded = true; |
276 | break; | 276 | break; |
277 | 277 | ||
diff --git a/meta/recipes-devtools/binutils/binutils/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 4ae1580102..502ce82928 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 @@ | |||
1 | From 883b6c0930410f8553b3bce0dd98131bc1694fa6 Mon Sep 17 00:00:00 2001 | 1 | From ef9aa69324a209e546956a2f674462717ec5af0f Mon Sep 17 00:00:00 2001 |
2 | From: Zhenhua Luo <zhenhua.luo@nxp.com> | 2 | From: Zhenhua Luo <zhenhua.luo@nxp.com> |
3 | Date: Sat, 11 Jun 2016 22:08:29 -0500 | 3 | Date: Sat, 11 Jun 2016 22:08:29 -0500 |
4 | Subject: [PATCH] fix the incorrect assembling for ppc wait mnemonic | 4 | Subject: [PATCH] fix the incorrect assembling for ppc wait mnemonic |
@@ -14,10 +14,10 @@ Signed-off-by: Zhenhua Luo <zhenhua.luo@nxp.com> | |||
14 | 1 file changed, 1 insertion(+), 3 deletions(-) | 14 | 1 file changed, 1 insertion(+), 3 deletions(-) |
15 | 15 | ||
16 | diff --git a/opcodes/ppc-opc.c b/opcodes/ppc-opc.c | 16 | diff --git a/opcodes/ppc-opc.c b/opcodes/ppc-opc.c |
17 | index 7637d3e349e..8e074e13208 100644 | 17 | index 37f1aeb780c..45774c7cf79 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 | @@ -6947,8 +6947,6 @@ const struct powerpc_opcode powerpc_opcodes[] = { | 20 | @@ -7138,8 +7138,6 @@ const struct powerpc_opcode powerpc_opcodes[] = { |
21 | {"waitasec", X(31,30), XRTRARB_MASK, POWER8, POWER9, {0}}, | 21 | {"waitasec", X(31,30), XRTRARB_MASK, POWER8, POWER9, {0}}, |
22 | {"waitrsv", XWCPL(31,30,1,0),0xffffffff, POWER10, EXT, {0}}, | 22 | {"waitrsv", XWCPL(31,30,1,0),0xffffffff, POWER10, EXT, {0}}, |
23 | {"pause_short", XWCPL(31,30,2,0),0xffffffff, POWER10, EXT, {0}}, | 23 | {"pause_short", XWCPL(31,30,2,0),0xffffffff, POWER10, EXT, {0}}, |
@@ -26,7 +26,7 @@ index 7637d3e349e..8e074e13208 100644 | |||
26 | 26 | ||
27 | {"lwepx", X(31,31), X_MASK, E500MC|PPCA2, 0, {RT, RA0, RB}}, | 27 | {"lwepx", X(31,31), X_MASK, E500MC|PPCA2, 0, {RT, RA0, RB}}, |
28 | 28 | ||
29 | @@ -7002,7 +7000,7 @@ const struct powerpc_opcode powerpc_opcodes[] = { | 29 | @@ -7193,7 +7191,7 @@ const struct powerpc_opcode powerpc_opcodes[] = { |
30 | 30 | ||
31 | {"waitrsv", X(31,62)|(1<<21), 0xffffffff, E500MC|PPCA2, EXT, {0}}, | 31 | {"waitrsv", X(31,62)|(1<<21), 0xffffffff, E500MC|PPCA2, EXT, {0}}, |
32 | {"waitimpl", X(31,62)|(2<<21), 0xffffffff, E500MC|PPCA2, EXT, {0}}, | 32 | {"waitimpl", X(31,62)|(2<<21), 0xffffffff, E500MC|PPCA2, EXT, {0}}, |
diff --git a/meta/recipes-devtools/binutils/binutils/0008-Use-libtool-2.4.patch b/meta/recipes-devtools/binutils/binutils/0008-Use-libtool-2.4.patch index 21e2c4fd70..7e7c2579b3 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 @@ | |||
1 | From 0f45262ef0d656c576adbb0b0f42b8f417895008 Mon Sep 17 00:00:00 2001 | 1 | From 0ad92af822bb6f58de3f3889d0adc0b2ef9d477f Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Sun, 14 Feb 2016 17:04:07 +0000 | 3 | Date: Sun, 14 Feb 2016 17:04:07 +0000 |
4 | Subject: [PATCH] Use libtool 2.4 | 4 | Subject: [PATCH] Use libtool 2.4 |
@@ -16,7 +16,6 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
16 | binutils/configure | 1331 +++++++++--- | 16 | binutils/configure | 1331 +++++++++--- |
17 | gas/Makefile.in | 3 + | 17 | gas/Makefile.in | 3 + |
18 | gas/configure | 1331 +++++++++--- | 18 | gas/configure | 1331 +++++++++--- |
19 | gdbsupport/Makefile.in | 1 + | ||
20 | gprof/Makefile.in | 3 + | 19 | gprof/Makefile.in | 3 + |
21 | gprof/configure | 1331 +++++++++--- | 20 | gprof/configure | 1331 +++++++++--- |
22 | gprofng/Makefile.in | 2 + | 21 | gprofng/Makefile.in | 2 + |
@@ -32,6 +31,9 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
32 | libbacktrace/configure | 1331 +++++++++--- | 31 | libbacktrace/configure | 1331 +++++++++--- |
33 | libctf/Makefile.in | 2 + | 32 | libctf/Makefile.in | 2 + |
34 | libctf/configure | 1330 +++++++++--- | 33 | libctf/configure | 1330 +++++++++--- |
34 | libsframe/Makefile.in | 249 ++- | ||
35 | libsframe/aclocal.m4 | 220 +- | ||
36 | libsframe/configure | 1553 ++++++++++---- | ||
35 | libtool.m4 | 1093 ++++++---- | 37 | libtool.m4 | 1093 ++++++---- |
36 | ltmain.sh | 2925 ++++++++++++++++++--------- | 38 | ltmain.sh | 2925 ++++++++++++++++++--------- |
37 | ltoptions.m4 | 2 +- | 39 | ltoptions.m4 | 2 +- |
@@ -40,16 +42,16 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
40 | opcodes/Makefile.in | 3 + | 42 | opcodes/Makefile.in | 3 + |
41 | opcodes/configure | 1331 +++++++++--- | 43 | opcodes/configure | 1331 +++++++++--- |
42 | sim/Makefile.in | 3 + | 44 | sim/Makefile.in | 3 + |
43 | zlib/Makefile.in | 204 +- | 45 | sim/configure | 1331 +++++++++--- |
44 | zlib/aclocal.m4 | 218 +- | 46 | zlib/Makefile.in | 3 + |
45 | zlib/configure | 1554 +++++++++----- | 47 | zlib/configure | 1331 +++++++++--- |
46 | 34 files changed, 14804 insertions(+), 5671 deletions(-) | 48 | 36 files changed, 16896 insertions(+), 6289 deletions(-) |
47 | 49 | ||
48 | diff --git a/bfd/Makefile.in b/bfd/Makefile.in | 50 | diff --git a/bfd/Makefile.in b/bfd/Makefile.in |
49 | index a26f74d7199..6edacdfeb0e 100644 | 51 | index 80aed657643..106ec256a79 100644 |
50 | --- a/bfd/Makefile.in | 52 | --- a/bfd/Makefile.in |
51 | +++ b/bfd/Makefile.in | 53 | +++ b/bfd/Makefile.in |
52 | @@ -346,6 +346,7 @@ DATADIRNAME = @DATADIRNAME@ | 54 | @@ -347,6 +347,7 @@ DATADIRNAME = @DATADIRNAME@ |
53 | DEBUGDIR = @DEBUGDIR@ | 55 | DEBUGDIR = @DEBUGDIR@ |
54 | DEFS = @DEFS@ | 56 | DEFS = @DEFS@ |
55 | DEPDIR = @DEPDIR@ | 57 | DEPDIR = @DEPDIR@ |
@@ -57,7 +59,7 @@ index a26f74d7199..6edacdfeb0e 100644 | |||
57 | DSYMUTIL = @DSYMUTIL@ | 59 | DSYMUTIL = @DSYMUTIL@ |
58 | DUMPBIN = @DUMPBIN@ | 60 | DUMPBIN = @DUMPBIN@ |
59 | ECHO_C = @ECHO_C@ | 61 | ECHO_C = @ECHO_C@ |
60 | @@ -380,6 +381,7 @@ LN_S = @LN_S@ | 62 | @@ -381,6 +382,7 @@ LN_S = @LN_S@ |
61 | LTLIBOBJS = @LTLIBOBJS@ | 63 | LTLIBOBJS = @LTLIBOBJS@ |
62 | MAINT = @MAINT@ | 64 | MAINT = @MAINT@ |
63 | MAKEINFO = @MAKEINFO@ | 65 | MAKEINFO = @MAKEINFO@ |
@@ -65,7 +67,7 @@ index a26f74d7199..6edacdfeb0e 100644 | |||
65 | MKDIR_P = @MKDIR_P@ | 67 | MKDIR_P = @MKDIR_P@ |
66 | MKINSTALLDIRS = @MKINSTALLDIRS@ | 68 | MKINSTALLDIRS = @MKINSTALLDIRS@ |
67 | MSGFMT = @MSGFMT@ | 69 | MSGFMT = @MSGFMT@ |
68 | @@ -421,6 +423,7 @@ abs_builddir = @abs_builddir@ | 70 | @@ -427,6 +429,7 @@ abs_builddir = @abs_builddir@ |
69 | abs_srcdir = @abs_srcdir@ | 71 | abs_srcdir = @abs_srcdir@ |
70 | abs_top_builddir = @abs_top_builddir@ | 72 | abs_top_builddir = @abs_top_builddir@ |
71 | abs_top_srcdir = @abs_top_srcdir@ | 73 | abs_top_srcdir = @abs_top_srcdir@ |
@@ -74,10 +76,10 @@ index a26f74d7199..6edacdfeb0e 100644 | |||
74 | ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ | 76 | ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ |
75 | all_backends = @all_backends@ | 77 | all_backends = @all_backends@ |
76 | diff --git a/bfd/configure b/bfd/configure | 78 | diff --git a/bfd/configure b/bfd/configure |
77 | index 4f591b750d8..d90db11744b 100755 | 79 | index e5d464378f8..ee8ea251479 100755 |
78 | --- a/bfd/configure | 80 | --- a/bfd/configure |
79 | +++ b/bfd/configure | 81 | +++ b/bfd/configure |
80 | @@ -702,6 +702,9 @@ OTOOL | 82 | @@ -706,6 +706,9 @@ OTOOL |
81 | LIPO | 83 | LIPO |
82 | NMEDIT | 84 | NMEDIT |
83 | DSYMUTIL | 85 | DSYMUTIL |
@@ -87,7 +89,7 @@ index 4f591b750d8..d90db11744b 100755 | |||
87 | OBJDUMP | 89 | OBJDUMP |
88 | LN_S | 90 | LN_S |
89 | NM | 91 | NM |
90 | @@ -820,6 +823,7 @@ enable_static | 92 | @@ -824,6 +827,7 @@ enable_static |
91 | with_pic | 93 | with_pic |
92 | enable_fast_install | 94 | enable_fast_install |
93 | with_gnu_ld | 95 | with_gnu_ld |
@@ -95,7 +97,7 @@ index 4f591b750d8..d90db11744b 100755 | |||
95 | enable_libtool_lock | 97 | enable_libtool_lock |
96 | enable_plugins | 98 | enable_plugins |
97 | enable_largefile | 99 | enable_largefile |
98 | @@ -1504,6 +1508,8 @@ Optional Packages: | 100 | @@ -1514,6 +1518,8 @@ Optional Packages: |
99 | --with-pic try to use only PIC/non-PIC objects [default=use | 101 | --with-pic try to use only PIC/non-PIC objects [default=use |
100 | both] | 102 | both] |
101 | --with-gnu-ld assume the C compiler uses GNU ld [default=no] | 103 | --with-gnu-ld assume the C compiler uses GNU ld [default=no] |
@@ -104,7 +106,7 @@ index 4f591b750d8..d90db11744b 100755 | |||
104 | --with-mmap try using mmap for BFD input files if available | 106 | --with-mmap try using mmap for BFD input files if available |
105 | --with-separate-debug-dir=DIR | 107 | --with-separate-debug-dir=DIR |
106 | Look for global separate debug info in DIR | 108 | Look for global separate debug info in DIR |
107 | @@ -5024,8 +5030,8 @@ esac | 109 | @@ -5043,8 +5049,8 @@ esac |
108 | 110 | ||
109 | 111 | ||
110 | 112 | ||
@@ -115,7 +117,7 @@ index 4f591b750d8..d90db11744b 100755 | |||
115 | 117 | ||
116 | 118 | ||
117 | 119 | ||
118 | @@ -5065,7 +5071,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO | 120 | @@ -5084,7 +5090,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO |
119 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 | 121 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 |
120 | $as_echo_n "checking how to print strings... " >&6; } | 122 | $as_echo_n "checking how to print strings... " >&6; } |
121 | # Test print first, because it will be a builtin if present. | 123 | # Test print first, because it will be a builtin if present. |
@@ -124,7 +126,7 @@ index 4f591b750d8..d90db11744b 100755 | |||
124 | test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then | 126 | test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then |
125 | ECHO='print -r --' | 127 | ECHO='print -r --' |
126 | elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then | 128 | elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then |
127 | @@ -5758,8 +5764,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; | 129 | @@ -5777,8 +5783,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; |
128 | # Try some XSI features | 130 | # Try some XSI features |
129 | xsi_shell=no | 131 | xsi_shell=no |
130 | ( _lt_dummy="a/b/c" | 132 | ( _lt_dummy="a/b/c" |
@@ -135,7 +137,7 @@ index 4f591b750d8..d90db11744b 100755 | |||
135 | && eval 'test $(( 1 + 1 )) -eq 2 \ | 137 | && eval 'test $(( 1 + 1 )) -eq 2 \ |
136 | && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ | 138 | && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ |
137 | && xsi_shell=yes | 139 | && xsi_shell=yes |
138 | @@ -5808,6 +5814,80 @@ esac | 140 | @@ -5827,6 +5833,80 @@ esac |
139 | 141 | ||
140 | 142 | ||
141 | 143 | ||
@@ -216,7 +218,7 @@ index 4f591b750d8..d90db11744b 100755 | |||
216 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 | 218 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 |
217 | $as_echo_n "checking for $LD option to reload object files... " >&6; } | 219 | $as_echo_n "checking for $LD option to reload object files... " >&6; } |
218 | if ${lt_cv_ld_reload_flag+:} false; then : | 220 | if ${lt_cv_ld_reload_flag+:} false; then : |
219 | @@ -5824,6 +5904,11 @@ case $reload_flag in | 221 | @@ -5843,6 +5923,11 @@ case $reload_flag in |
220 | esac | 222 | esac |
221 | reload_cmds='$LD$reload_flag -o $output$reload_objs' | 223 | reload_cmds='$LD$reload_flag -o $output$reload_objs' |
222 | case $host_os in | 224 | case $host_os in |
@@ -228,7 +230,7 @@ index 4f591b750d8..d90db11744b 100755 | |||
228 | darwin*) | 230 | darwin*) |
229 | if test "$GCC" = yes; then | 231 | if test "$GCC" = yes; then |
230 | reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' | 232 | reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' |
231 | @@ -5992,7 +6077,8 @@ mingw* | pw32*) | 233 | @@ -6011,7 +6096,8 @@ mingw* | pw32*) |
232 | lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' | 234 | lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' |
233 | lt_cv_file_magic_cmd='func_win32_libid' | 235 | lt_cv_file_magic_cmd='func_win32_libid' |
234 | else | 236 | else |
@@ -238,7 +240,7 @@ index 4f591b750d8..d90db11744b 100755 | |||
238 | lt_cv_file_magic_cmd='$OBJDUMP -f' | 240 | lt_cv_file_magic_cmd='$OBJDUMP -f' |
239 | fi | 241 | fi |
240 | ;; | 242 | ;; |
241 | @@ -6146,6 +6232,21 @@ esac | 243 | @@ -6165,6 +6251,21 @@ esac |
242 | fi | 244 | fi |
243 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 | 245 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 |
244 | $as_echo "$lt_cv_deplibs_check_method" >&6; } | 246 | $as_echo "$lt_cv_deplibs_check_method" >&6; } |
@@ -260,7 +262,7 @@ index 4f591b750d8..d90db11744b 100755 | |||
260 | file_magic_cmd=$lt_cv_file_magic_cmd | 262 | file_magic_cmd=$lt_cv_file_magic_cmd |
261 | deplibs_check_method=$lt_cv_deplibs_check_method | 263 | deplibs_check_method=$lt_cv_deplibs_check_method |
262 | test -z "$deplibs_check_method" && deplibs_check_method=unknown | 264 | test -z "$deplibs_check_method" && deplibs_check_method=unknown |
263 | @@ -6161,6 +6262,157 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown | 265 | @@ -6180,6 +6281,157 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown |
264 | 266 | ||
265 | 267 | ||
266 | 268 | ||
@@ -418,7 +420,7 @@ index 4f591b750d8..d90db11744b 100755 | |||
418 | plugin_option= | 420 | plugin_option= |
419 | plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll" | 421 | plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll" |
420 | for plugin in $plugin_names; do | 422 | for plugin in $plugin_names; do |
421 | @@ -6175,8 +6427,10 @@ for plugin in $plugin_names; do | 423 | @@ -6194,8 +6446,10 @@ for plugin in $plugin_names; do |
422 | done | 424 | done |
423 | 425 | ||
424 | if test -n "$ac_tool_prefix"; then | 426 | if test -n "$ac_tool_prefix"; then |
@@ -431,7 +433,7 @@ index 4f591b750d8..d90db11744b 100755 | |||
431 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | 433 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
432 | $as_echo_n "checking for $ac_word... " >&6; } | 434 | $as_echo_n "checking for $ac_word... " >&6; } |
433 | if ${ac_cv_prog_AR+:} false; then : | 435 | if ${ac_cv_prog_AR+:} false; then : |
434 | @@ -6192,7 +6446,7 @@ do | 436 | @@ -6211,7 +6465,7 @@ do |
435 | test -z "$as_dir" && as_dir=. | 437 | test -z "$as_dir" && as_dir=. |
436 | for ac_exec_ext in '' $ac_executable_extensions; do | 438 | for ac_exec_ext in '' $ac_executable_extensions; do |
437 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | 439 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
@@ -440,7 +442,7 @@ index 4f591b750d8..d90db11744b 100755 | |||
440 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | 442 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
441 | break 2 | 443 | break 2 |
442 | fi | 444 | fi |
443 | @@ -6212,11 +6466,15 @@ $as_echo "no" >&6; } | 445 | @@ -6231,11 +6485,15 @@ $as_echo "no" >&6; } |
444 | fi | 446 | fi |
445 | 447 | ||
446 | 448 | ||
@@ -459,7 +461,7 @@ index 4f591b750d8..d90db11744b 100755 | |||
459 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | 461 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
460 | $as_echo_n "checking for $ac_word... " >&6; } | 462 | $as_echo_n "checking for $ac_word... " >&6; } |
461 | if ${ac_cv_prog_ac_ct_AR+:} false; then : | 463 | if ${ac_cv_prog_ac_ct_AR+:} false; then : |
462 | @@ -6232,7 +6490,7 @@ do | 464 | @@ -6251,7 +6509,7 @@ do |
463 | test -z "$as_dir" && as_dir=. | 465 | test -z "$as_dir" && as_dir=. |
464 | for ac_exec_ext in '' $ac_executable_extensions; do | 466 | for ac_exec_ext in '' $ac_executable_extensions; do |
465 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | 467 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
@@ -468,7 +470,7 @@ index 4f591b750d8..d90db11744b 100755 | |||
468 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | 470 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
469 | break 2 | 471 | break 2 |
470 | fi | 472 | fi |
471 | @@ -6251,6 +6509,10 @@ else | 473 | @@ -6270,6 +6528,10 @@ else |
472 | $as_echo "no" >&6; } | 474 | $as_echo "no" >&6; } |
473 | fi | 475 | fi |
474 | 476 | ||
@@ -479,7 +481,7 @@ index 4f591b750d8..d90db11744b 100755 | |||
479 | if test "x$ac_ct_AR" = x; then | 481 | if test "x$ac_ct_AR" = x; then |
480 | AR="false" | 482 | AR="false" |
481 | else | 483 | else |
482 | @@ -6262,25 +6524,20 @@ ac_tool_warned=yes ;; | 484 | @@ -6281,25 +6543,20 @@ ac_tool_warned=yes ;; |
483 | esac | 485 | esac |
484 | AR=$ac_ct_AR | 486 | AR=$ac_ct_AR |
485 | fi | 487 | fi |
@@ -515,7 +517,7 @@ index 4f591b750d8..d90db11744b 100755 | |||
515 | 517 | ||
516 | 518 | ||
517 | 519 | ||
518 | @@ -6291,6 +6548,63 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru | 520 | @@ -6310,6 +6567,63 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru |
519 | 521 | ||
520 | 522 | ||
521 | 523 | ||
@@ -579,7 +581,7 @@ index 4f591b750d8..d90db11744b 100755 | |||
579 | 581 | ||
580 | if test -n "$ac_tool_prefix"; then | 582 | if test -n "$ac_tool_prefix"; then |
581 | # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. | 583 | # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. |
582 | @@ -6631,8 +6945,8 @@ esac | 584 | @@ -6650,8 +6964,8 @@ esac |
583 | lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" | 585 | lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" |
584 | 586 | ||
585 | # Transform an extracted symbol line into symbol name and symbol address | 587 | # Transform an extracted symbol line into symbol name and symbol address |
@@ -590,7 +592,7 @@ index 4f591b750d8..d90db11744b 100755 | |||
590 | 592 | ||
591 | # Handle CRLF in mingw tool chain | 593 | # Handle CRLF in mingw tool chain |
592 | opt_cr= | 594 | opt_cr= |
593 | @@ -6668,6 +6982,7 @@ for ac_symprfx in "" "_"; do | 595 | @@ -6687,6 +7001,7 @@ for ac_symprfx in "" "_"; do |
594 | else | 596 | else |
595 | lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" | 597 | lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" |
596 | fi | 598 | fi |
@@ -598,7 +600,7 @@ index 4f591b750d8..d90db11744b 100755 | |||
598 | 600 | ||
599 | # Check to see that the pipe works correctly. | 601 | # Check to see that the pipe works correctly. |
600 | pipe_works=no | 602 | pipe_works=no |
601 | @@ -6709,6 +7024,18 @@ _LT_EOF | 603 | @@ -6728,6 +7043,18 @@ _LT_EOF |
602 | if $GREP ' nm_test_var$' "$nlist" >/dev/null; then | 604 | if $GREP ' nm_test_var$' "$nlist" >/dev/null; then |
603 | if $GREP ' nm_test_func$' "$nlist" >/dev/null; then | 605 | if $GREP ' nm_test_func$' "$nlist" >/dev/null; then |
604 | cat <<_LT_EOF > conftest.$ac_ext | 606 | cat <<_LT_EOF > conftest.$ac_ext |
@@ -617,7 +619,7 @@ index 4f591b750d8..d90db11744b 100755 | |||
617 | #ifdef __cplusplus | 619 | #ifdef __cplusplus |
618 | extern "C" { | 620 | extern "C" { |
619 | #endif | 621 | #endif |
620 | @@ -6720,7 +7047,7 @@ _LT_EOF | 622 | @@ -6739,7 +7066,7 @@ _LT_EOF |
621 | cat <<_LT_EOF >> conftest.$ac_ext | 623 | cat <<_LT_EOF >> conftest.$ac_ext |
622 | 624 | ||
623 | /* The mapping between symbol names and symbols. */ | 625 | /* The mapping between symbol names and symbols. */ |
@@ -626,7 +628,7 @@ index 4f591b750d8..d90db11744b 100755 | |||
626 | const char *name; | 628 | const char *name; |
627 | void *address; | 629 | void *address; |
628 | } | 630 | } |
629 | @@ -6746,8 +7073,8 @@ static const void *lt_preloaded_setup() { | 631 | @@ -6765,8 +7092,8 @@ static const void *lt_preloaded_setup() { |
630 | _LT_EOF | 632 | _LT_EOF |
631 | # Now try linking the two files. | 633 | # Now try linking the two files. |
632 | mv conftest.$ac_objext conftstm.$ac_objext | 634 | mv conftest.$ac_objext conftstm.$ac_objext |
@@ -637,7 +639,7 @@ index 4f591b750d8..d90db11744b 100755 | |||
637 | LIBS="conftstm.$ac_objext" | 639 | LIBS="conftstm.$ac_objext" |
638 | CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" | 640 | CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" |
639 | if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 | 641 | if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 |
640 | @@ -6757,8 +7084,8 @@ _LT_EOF | 642 | @@ -6776,8 +7103,8 @@ _LT_EOF |
641 | test $ac_status = 0; } && test -s conftest${ac_exeext}; then | 643 | test $ac_status = 0; } && test -s conftest${ac_exeext}; then |
642 | pipe_works=yes | 644 | pipe_works=yes |
643 | fi | 645 | fi |
@@ -648,7 +650,7 @@ index 4f591b750d8..d90db11744b 100755 | |||
648 | else | 650 | else |
649 | echo "cannot find nm_test_func in $nlist" >&5 | 651 | echo "cannot find nm_test_func in $nlist" >&5 |
650 | fi | 652 | fi |
651 | @@ -6795,6 +7122,14 @@ else | 653 | @@ -6814,6 +7141,14 @@ else |
652 | $as_echo "ok" >&6; } | 654 | $as_echo "ok" >&6; } |
653 | fi | 655 | fi |
654 | 656 | ||
@@ -663,7 +665,7 @@ index 4f591b750d8..d90db11744b 100755 | |||
663 | 665 | ||
664 | 666 | ||
665 | 667 | ||
666 | @@ -6813,6 +7148,47 @@ fi | 668 | @@ -6832,6 +7167,47 @@ fi |
667 | 669 | ||
668 | 670 | ||
669 | 671 | ||
@@ -711,7 +713,7 @@ index 4f591b750d8..d90db11744b 100755 | |||
711 | 713 | ||
712 | 714 | ||
713 | 715 | ||
714 | @@ -7022,6 +7398,123 @@ esac | 716 | @@ -7041,6 +7417,123 @@ esac |
715 | 717 | ||
716 | need_locks="$enable_libtool_lock" | 718 | need_locks="$enable_libtool_lock" |
717 | 719 | ||
@@ -835,7 +837,7 @@ index 4f591b750d8..d90db11744b 100755 | |||
835 | 837 | ||
836 | case $host_os in | 838 | case $host_os in |
837 | rhapsody* | darwin*) | 839 | rhapsody* | darwin*) |
838 | @@ -7585,6 +8078,8 @@ _LT_EOF | 840 | @@ -7604,6 +8097,8 @@ _LT_EOF |
839 | $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 | 841 | $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 |
840 | echo "$AR cru libconftest.a conftest.o" >&5 | 842 | echo "$AR cru libconftest.a conftest.o" >&5 |
841 | $AR cru libconftest.a conftest.o 2>&5 | 843 | $AR cru libconftest.a conftest.o 2>&5 |
@@ -844,7 +846,7 @@ index 4f591b750d8..d90db11744b 100755 | |||
844 | cat > conftest.c << _LT_EOF | 846 | cat > conftest.c << _LT_EOF |
845 | int main() { return 0;} | 847 | int main() { return 0;} |
846 | _LT_EOF | 848 | _LT_EOF |
847 | @@ -8136,8 +8631,6 @@ fi | 849 | @@ -8155,8 +8650,6 @@ fi |
848 | lt_prog_compiler_pic= | 850 | lt_prog_compiler_pic= |
849 | lt_prog_compiler_static= | 851 | lt_prog_compiler_static= |
850 | 852 | ||
@@ -853,7 +855,7 @@ index 4f591b750d8..d90db11744b 100755 | |||
853 | 855 | ||
854 | if test "$GCC" = yes; then | 856 | if test "$GCC" = yes; then |
855 | lt_prog_compiler_wl='-Wl,' | 857 | lt_prog_compiler_wl='-Wl,' |
856 | @@ -8303,6 +8796,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } | 858 | @@ -8322,6 +8815,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } |
857 | lt_prog_compiler_pic='--shared' | 859 | lt_prog_compiler_pic='--shared' |
858 | lt_prog_compiler_static='--static' | 860 | lt_prog_compiler_static='--static' |
859 | ;; | 861 | ;; |
@@ -866,7 +868,7 @@ index 4f591b750d8..d90db11744b 100755 | |||
866 | pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) | 868 | pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) |
867 | # Portland Group compilers (*not* the Pentium gcc compiler, | 869 | # Portland Group compilers (*not* the Pentium gcc compiler, |
868 | # which looks to be a dead project) | 870 | # which looks to be a dead project) |
869 | @@ -8365,7 +8864,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } | 871 | @@ -8384,7 +8883,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } |
870 | lt_prog_compiler_pic='-KPIC' | 872 | lt_prog_compiler_pic='-KPIC' |
871 | lt_prog_compiler_static='-Bstatic' | 873 | lt_prog_compiler_static='-Bstatic' |
872 | case $cc_basename in | 874 | case $cc_basename in |
@@ -875,7 +877,7 @@ index 4f591b750d8..d90db11744b 100755 | |||
875 | lt_prog_compiler_wl='-Qoption ld ';; | 877 | lt_prog_compiler_wl='-Qoption ld ';; |
876 | *) | 878 | *) |
877 | lt_prog_compiler_wl='-Wl,';; | 879 | lt_prog_compiler_wl='-Wl,';; |
878 | @@ -8422,13 +8921,17 @@ case $host_os in | 880 | @@ -8441,13 +8940,17 @@ case $host_os in |
879 | lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" | 881 | lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" |
880 | ;; | 882 | ;; |
881 | esac | 883 | esac |
@@ -899,7 +901,7 @@ index 4f591b750d8..d90db11744b 100755 | |||
899 | 901 | ||
900 | # | 902 | # |
901 | # Check to make sure the PIC flag actually works. | 903 | # Check to make sure the PIC flag actually works. |
902 | @@ -8489,6 +8992,11 @@ fi | 904 | @@ -8508,6 +9011,11 @@ fi |
903 | 905 | ||
904 | 906 | ||
905 | 907 | ||
@@ -911,7 +913,7 @@ index 4f591b750d8..d90db11744b 100755 | |||
911 | # | 913 | # |
912 | # Check to make sure the static flag actually works. | 914 | # Check to make sure the static flag actually works. |
913 | # | 915 | # |
914 | @@ -8839,7 +9347,8 @@ _LT_EOF | 916 | @@ -8858,7 +9366,8 @@ _LT_EOF |
915 | allow_undefined_flag=unsupported | 917 | allow_undefined_flag=unsupported |
916 | always_export_symbols=no | 918 | always_export_symbols=no |
917 | enable_shared_with_static_runtimes=yes | 919 | enable_shared_with_static_runtimes=yes |
@@ -921,7 +923,7 @@ index 4f591b750d8..d90db11744b 100755 | |||
921 | 923 | ||
922 | if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then | 924 | if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then |
923 | archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' | 925 | archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' |
924 | @@ -8938,12 +9447,12 @@ _LT_EOF | 926 | @@ -8957,12 +9466,12 @@ _LT_EOF |
925 | whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' | 927 | whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' |
926 | hardcode_libdir_flag_spec= | 928 | hardcode_libdir_flag_spec= |
927 | hardcode_libdir_flag_spec_ld='-rpath $libdir' | 929 | hardcode_libdir_flag_spec_ld='-rpath $libdir' |
@@ -936,7 +938,7 @@ index 4f591b750d8..d90db11744b 100755 | |||
936 | fi | 938 | fi |
937 | ;; | 939 | ;; |
938 | esac | 940 | esac |
939 | @@ -8957,8 +9466,8 @@ _LT_EOF | 941 | @@ -8976,8 +9485,8 @@ _LT_EOF |
940 | archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' | 942 | archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' |
941 | wlarc= | 943 | wlarc= |
942 | else | 944 | else |
@@ -947,7 +949,7 @@ index 4f591b750d8..d90db11744b 100755 | |||
947 | fi | 949 | fi |
948 | ;; | 950 | ;; |
949 | 951 | ||
950 | @@ -8976,8 +9485,8 @@ _LT_EOF | 952 | @@ -8995,8 +9504,8 @@ _LT_EOF |
951 | 953 | ||
952 | _LT_EOF | 954 | _LT_EOF |
953 | elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then | 955 | elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then |
@@ -958,7 +960,7 @@ index 4f591b750d8..d90db11744b 100755 | |||
958 | else | 960 | else |
959 | ld_shlibs=no | 961 | ld_shlibs=no |
960 | fi | 962 | fi |
961 | @@ -9023,8 +9532,8 @@ _LT_EOF | 963 | @@ -9042,8 +9551,8 @@ _LT_EOF |
962 | 964 | ||
963 | *) | 965 | *) |
964 | if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then | 966 | if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then |
@@ -969,7 +971,7 @@ index 4f591b750d8..d90db11744b 100755 | |||
969 | else | 971 | else |
970 | ld_shlibs=no | 972 | ld_shlibs=no |
971 | fi | 973 | fi |
972 | @@ -9154,7 +9663,13 @@ _LT_EOF | 974 | @@ -9173,7 +9682,13 @@ _LT_EOF |
973 | allow_undefined_flag='-berok' | 975 | allow_undefined_flag='-berok' |
974 | # Determine the default libpath from the value encoded in an | 976 | # Determine the default libpath from the value encoded in an |
975 | # empty executable. | 977 | # empty executable. |
@@ -984,7 +986,7 @@ index 4f591b750d8..d90db11744b 100755 | |||
984 | /* end confdefs.h. */ | 986 | /* end confdefs.h. */ |
985 | 987 | ||
986 | int | 988 | int |
987 | @@ -9167,22 +9682,29 @@ main () | 989 | @@ -9186,22 +9701,29 @@ main () |
988 | _ACEOF | 990 | _ACEOF |
989 | if ac_fn_c_try_link "$LINENO"; then : | 991 | if ac_fn_c_try_link "$LINENO"; then : |
990 | 992 | ||
@@ -1027,7 +1029,7 @@ index 4f591b750d8..d90db11744b 100755 | |||
1027 | 1029 | ||
1028 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" | 1030 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" |
1029 | archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" | 1031 | 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 | @@ -9194,7 +9716,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | 1032 | @@ -9213,7 +9735,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
1031 | else | 1033 | else |
1032 | # Determine the default libpath from the value encoded in an | 1034 | # Determine the default libpath from the value encoded in an |
1033 | # empty executable. | 1035 | # empty executable. |
@@ -1042,7 +1044,7 @@ index 4f591b750d8..d90db11744b 100755 | |||
1042 | /* end confdefs.h. */ | 1044 | /* end confdefs.h. */ |
1043 | 1045 | ||
1044 | int | 1046 | int |
1045 | @@ -9207,22 +9735,29 @@ main () | 1047 | @@ -9226,22 +9754,29 @@ main () |
1046 | _ACEOF | 1048 | _ACEOF |
1047 | if ac_fn_c_try_link "$LINENO"; then : | 1049 | if ac_fn_c_try_link "$LINENO"; then : |
1048 | 1050 | ||
@@ -1085,7 +1087,7 @@ index 4f591b750d8..d90db11744b 100755 | |||
1085 | 1087 | ||
1086 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" | 1088 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" |
1087 | # Warning - without using the other run time loading flags, | 1089 | # Warning - without using the other run time loading flags, |
1088 | @@ -9267,20 +9802,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | 1090 | @@ -9286,20 +9821,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
1089 | # Microsoft Visual C++. | 1091 | # Microsoft Visual C++. |
1090 | # hardcode_libdir_flag_spec is actually meaningless, as there is | 1092 | # hardcode_libdir_flag_spec is actually meaningless, as there is |
1091 | # no search path for DLLs. | 1093 | # no search path for DLLs. |
@@ -1163,7 +1165,7 @@ index 4f591b750d8..d90db11744b 100755 | |||
1163 | ;; | 1165 | ;; |
1164 | 1166 | ||
1165 | darwin* | rhapsody*) | 1167 | darwin* | rhapsody*) |
1166 | @@ -9341,7 +9919,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | 1168 | @@ -9360,7 +9938,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
1167 | 1169 | ||
1168 | # FreeBSD 3 and greater uses gcc -shared to do shared libraries. | 1170 | # FreeBSD 3 and greater uses gcc -shared to do shared libraries. |
1169 | freebsd* | dragonfly*) | 1171 | freebsd* | dragonfly*) |
@@ -1172,7 +1174,7 @@ index 4f591b750d8..d90db11744b 100755 | |||
1172 | hardcode_libdir_flag_spec='-R$libdir' | 1174 | hardcode_libdir_flag_spec='-R$libdir' |
1173 | hardcode_direct=yes | 1175 | hardcode_direct=yes |
1174 | hardcode_shlibpath_var=no | 1176 | hardcode_shlibpath_var=no |
1175 | @@ -9349,7 +9927,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | 1177 | @@ -9368,7 +9946,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
1176 | 1178 | ||
1177 | hpux9*) | 1179 | hpux9*) |
1178 | if test "$GCC" = yes; then | 1180 | if test "$GCC" = yes; then |
@@ -1181,7 +1183,7 @@ index 4f591b750d8..d90db11744b 100755 | |||
1181 | else | 1183 | else |
1182 | archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' | 1184 | 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 | fi | 1185 | fi |
1184 | @@ -9365,7 +9943,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | 1186 | @@ -9384,7 +9962,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
1185 | 1187 | ||
1186 | hpux10*) | 1188 | hpux10*) |
1187 | if test "$GCC" = yes && test "$with_gnu_ld" = no; then | 1189 | if test "$GCC" = yes && test "$with_gnu_ld" = no; then |
@@ -1190,7 +1192,7 @@ index 4f591b750d8..d90db11744b 100755 | |||
1190 | else | 1192 | else |
1191 | archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' | 1193 | archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' |
1192 | fi | 1194 | fi |
1193 | @@ -9389,10 +9967,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | 1195 | @@ -9408,10 +9986,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
1194 | archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' | 1196 | archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' |
1195 | ;; | 1197 | ;; |
1196 | ia64*) | 1198 | ia64*) |
@@ -1203,7 +1205,7 @@ index 4f591b750d8..d90db11744b 100755 | |||
1203 | ;; | 1205 | ;; |
1204 | esac | 1206 | esac |
1205 | else | 1207 | else |
1206 | @@ -9471,23 +10049,36 @@ fi | 1208 | @@ -9490,23 +10068,36 @@ fi |
1207 | 1209 | ||
1208 | irix5* | irix6* | nonstopux*) | 1210 | irix5* | irix6* | nonstopux*) |
1209 | if test "$GCC" = yes; then | 1211 | if test "$GCC" = yes; then |
@@ -1248,7 +1250,7 @@ index 4f591b750d8..d90db11744b 100755 | |||
1248 | else | 1250 | else |
1249 | archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' | 1251 | 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_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 | 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 | @@ -9572,7 +10163,7 @@ rm -f core conftest.err conftest.$ac_objext \ | 1253 | @@ -9591,7 +10182,7 @@ rm -f core conftest.err conftest.$ac_objext \ |
1252 | osf4* | osf5*) # as osf3* with the addition of -msym flag | 1254 | osf4* | osf5*) # as osf3* with the addition of -msym flag |
1253 | if test "$GCC" = yes; then | 1255 | if test "$GCC" = yes; then |
1254 | allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' | 1256 | allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' |
@@ -1257,7 +1259,7 @@ index 4f591b750d8..d90db11744b 100755 | |||
1257 | hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' | 1259 | hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' |
1258 | else | 1260 | else |
1259 | allow_undefined_flag=' -expect_unresolved \*' | 1261 | allow_undefined_flag=' -expect_unresolved \*' |
1260 | @@ -9591,9 +10182,9 @@ rm -f core conftest.err conftest.$ac_objext \ | 1262 | @@ -9610,9 +10201,9 @@ rm -f core conftest.err conftest.$ac_objext \ |
1261 | no_undefined_flag=' -z defs' | 1263 | no_undefined_flag=' -z defs' |
1262 | if test "$GCC" = yes; then | 1264 | if test "$GCC" = yes; then |
1263 | wlarc='${wl}' | 1265 | wlarc='${wl}' |
@@ -1269,7 +1271,7 @@ index 4f591b750d8..d90db11744b 100755 | |||
1269 | else | 1271 | else |
1270 | case `$CC -V 2>&1` in | 1272 | case `$CC -V 2>&1` in |
1271 | *"Compilers 5.0"*) | 1273 | *"Compilers 5.0"*) |
1272 | @@ -10169,8 +10760,9 @@ cygwin* | mingw* | pw32* | cegcc*) | 1274 | @@ -10188,8 +10779,9 @@ cygwin* | mingw* | pw32* | cegcc*) |
1273 | need_version=no | 1275 | need_version=no |
1274 | need_lib_prefix=no | 1276 | need_lib_prefix=no |
1275 | 1277 | ||
@@ -1281,7 +1283,7 @@ index 4f591b750d8..d90db11744b 100755 | |||
1281 | library_names_spec='$libname.dll.a' | 1283 | library_names_spec='$libname.dll.a' |
1282 | # DLL is installed to $(libdir)/../bin by postinstall_cmds | 1284 | # DLL is installed to $(libdir)/../bin by postinstall_cmds |
1283 | postinstall_cmds='base_file=`basename \${file}`~ | 1285 | postinstall_cmds='base_file=`basename \${file}`~ |
1284 | @@ -10203,13 +10795,71 @@ cygwin* | mingw* | pw32* | cegcc*) | 1286 | @@ -10222,13 +10814,71 @@ cygwin* | mingw* | pw32* | cegcc*) |
1285 | library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' | 1287 | library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' |
1286 | ;; | 1288 | ;; |
1287 | esac | 1289 | esac |
@@ -1354,16 +1356,16 @@ index 4f591b750d8..d90db11744b 100755 | |||
1354 | # FIXME: first we should search . and the directory the executable is in | 1356 | # FIXME: first we should search . and the directory the executable is in |
1355 | shlibpath_var=PATH | 1357 | shlibpath_var=PATH |
1356 | ;; | 1358 | ;; |
1357 | @@ -11087,7 +11737,7 @@ else | 1359 | @@ -11106,7 +11756,7 @@ else |
1358 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 | 1360 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 |
1359 | lt_status=$lt_dlunknown | 1361 | lt_status=$lt_dlunknown |
1360 | cat > conftest.$ac_ext <<_LT_EOF | 1362 | cat > conftest.$ac_ext <<_LT_EOF |
1361 | -#line 11090 "configure" | 1363 | -#line 11109 "configure" |
1362 | +#line $LINENO "configure" | 1364 | +#line $LINENO "configure" |
1363 | #include "confdefs.h" | 1365 | #include "confdefs.h" |
1364 | 1366 | ||
1365 | #if HAVE_DLFCN_H | 1367 | #if HAVE_DLFCN_H |
1366 | @@ -11131,10 +11781,10 @@ else | 1368 | @@ -11150,10 +11800,10 @@ else |
1367 | /* When -fvisbility=hidden is used, assume the code has been annotated | 1369 | /* When -fvisbility=hidden is used, assume the code has been annotated |
1368 | correspondingly for the symbols needed. */ | 1370 | correspondingly for the symbols needed. */ |
1369 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) | 1371 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) |
@@ -1376,16 +1378,16 @@ index 4f591b750d8..d90db11744b 100755 | |||
1376 | int main () | 1378 | int main () |
1377 | { | 1379 | { |
1378 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); | 1380 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); |
1379 | @@ -11193,7 +11843,7 @@ else | 1381 | @@ -11212,7 +11862,7 @@ else |
1380 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 | 1382 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 |
1381 | lt_status=$lt_dlunknown | 1383 | lt_status=$lt_dlunknown |
1382 | cat > conftest.$ac_ext <<_LT_EOF | 1384 | cat > conftest.$ac_ext <<_LT_EOF |
1383 | -#line 11196 "configure" | 1385 | -#line 11215 "configure" |
1384 | +#line $LINENO "configure" | 1386 | +#line $LINENO "configure" |
1385 | #include "confdefs.h" | 1387 | #include "confdefs.h" |
1386 | 1388 | ||
1387 | #if HAVE_DLFCN_H | 1389 | #if HAVE_DLFCN_H |
1388 | @@ -11237,10 +11887,10 @@ else | 1390 | @@ -11256,10 +11906,10 @@ else |
1389 | /* When -fvisbility=hidden is used, assume the code has been annotated | 1391 | /* When -fvisbility=hidden is used, assume the code has been annotated |
1390 | correspondingly for the symbols needed. */ | 1392 | correspondingly for the symbols needed. */ |
1391 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) | 1393 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) |
@@ -1398,7 +1400,7 @@ index 4f591b750d8..d90db11744b 100755 | |||
1398 | int main () | 1400 | int main () |
1399 | { | 1401 | { |
1400 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); | 1402 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); |
1401 | @@ -13225,7 +13875,7 @@ SHARED_LDFLAGS= | 1403 | @@ -13482,7 +14132,7 @@ SHARED_LDFLAGS= |
1402 | if test "$enable_shared" = "yes"; then | 1404 | if test "$enable_shared" = "yes"; then |
1403 | x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'` | 1405 | x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'` |
1404 | if test -n "$x"; then | 1406 | if test -n "$x"; then |
@@ -1407,7 +1409,7 @@ index 4f591b750d8..d90db11744b 100755 | |||
1407 | fi | 1409 | fi |
1408 | fi | 1410 | fi |
1409 | 1411 | ||
1410 | @@ -15869,13 +16519,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' | 1412 | @@ -16129,13 +16779,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' |
1411 | lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' | 1413 | lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' |
1412 | lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' | 1414 | lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' |
1413 | lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' | 1415 | lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' |
@@ -1428,7 +1430,7 @@ index 4f591b750d8..d90db11744b 100755 | |||
1428 | STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' | 1430 | STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' |
1429 | RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' | 1431 | RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' |
1430 | old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' | 1432 | old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' |
1431 | @@ -15890,14 +16547,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de | 1433 | @@ -16150,14 +16807,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de |
1432 | 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_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' |
1433 | lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' | 1435 | 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_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`' | 1436 | 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"`' |
@@ -1447,7 +1449,7 @@ index 4f591b750d8..d90db11744b 100755 | |||
1447 | DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' | 1449 | DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' |
1448 | NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' | 1450 | NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' |
1449 | LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' | 1451 | LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' |
1450 | @@ -15930,12 +16590,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q | 1452 | @@ -16190,12 +16850,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q |
1451 | hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' | 1453 | hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' |
1452 | inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' | 1454 | inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' |
1453 | link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' | 1455 | link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' |
@@ -1461,7 +1463,7 @@ index 4f591b750d8..d90db11744b 100755 | |||
1461 | file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' | 1463 | file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' |
1462 | variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' | 1464 | variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' |
1463 | need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' | 1465 | need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' |
1464 | @@ -15990,8 +16650,13 @@ reload_flag \ | 1466 | @@ -16250,8 +16910,13 @@ reload_flag \ |
1465 | OBJDUMP \ | 1467 | OBJDUMP \ |
1466 | deplibs_check_method \ | 1468 | deplibs_check_method \ |
1467 | file_magic_cmd \ | 1469 | file_magic_cmd \ |
@@ -1475,7 +1477,7 @@ index 4f591b750d8..d90db11744b 100755 | |||
1475 | STRIP \ | 1477 | STRIP \ |
1476 | RANLIB \ | 1478 | RANLIB \ |
1477 | CC \ | 1479 | CC \ |
1478 | @@ -16001,12 +16666,14 @@ lt_cv_sys_global_symbol_pipe \ | 1480 | @@ -16261,12 +16926,14 @@ lt_cv_sys_global_symbol_pipe \ |
1479 | lt_cv_sys_global_symbol_to_cdecl \ | 1481 | lt_cv_sys_global_symbol_to_cdecl \ |
1480 | lt_cv_sys_global_symbol_to_c_name_address \ | 1482 | lt_cv_sys_global_symbol_to_c_name_address \ |
1481 | lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ | 1483 | lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ |
@@ -1491,7 +1493,7 @@ index 4f591b750d8..d90db11744b 100755 | |||
1491 | DSYMUTIL \ | 1493 | DSYMUTIL \ |
1492 | NMEDIT \ | 1494 | NMEDIT \ |
1493 | LIPO \ | 1495 | LIPO \ |
1494 | @@ -16022,7 +16689,6 @@ no_undefined_flag \ | 1496 | @@ -16282,7 +16949,6 @@ no_undefined_flag \ |
1495 | hardcode_libdir_flag_spec \ | 1497 | hardcode_libdir_flag_spec \ |
1496 | hardcode_libdir_flag_spec_ld \ | 1498 | hardcode_libdir_flag_spec_ld \ |
1497 | hardcode_libdir_separator \ | 1499 | hardcode_libdir_separator \ |
@@ -1499,7 +1501,7 @@ index 4f591b750d8..d90db11744b 100755 | |||
1499 | exclude_expsyms \ | 1501 | exclude_expsyms \ |
1500 | include_expsyms \ | 1502 | include_expsyms \ |
1501 | file_list_spec \ | 1503 | file_list_spec \ |
1502 | @@ -16058,6 +16724,7 @@ module_cmds \ | 1504 | @@ -16318,6 +16984,7 @@ module_cmds \ |
1503 | module_expsym_cmds \ | 1505 | module_expsym_cmds \ |
1504 | export_symbols_cmds \ | 1506 | export_symbols_cmds \ |
1505 | prelink_cmds \ | 1507 | prelink_cmds \ |
@@ -1507,7 +1509,7 @@ index 4f591b750d8..d90db11744b 100755 | |||
1507 | postinstall_cmds \ | 1509 | postinstall_cmds \ |
1508 | postuninstall_cmds \ | 1510 | postuninstall_cmds \ |
1509 | finish_cmds \ | 1511 | finish_cmds \ |
1510 | @@ -16826,7 +17493,8 @@ $as_echo X"$file" | | 1512 | @@ -17086,7 +17753,8 @@ $as_echo X"$file" | |
1511 | # NOTE: Changes made to this file will be lost: look at ltmain.sh. | 1513 | # NOTE: Changes made to this file will be lost: look at ltmain.sh. |
1512 | # | 1514 | # |
1513 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, | 1515 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, |
@@ -1517,7 +1519,7 @@ index 4f591b750d8..d90db11744b 100755 | |||
1517 | # Written by Gordon Matzigkeit, 1996 | 1519 | # Written by Gordon Matzigkeit, 1996 |
1518 | # | 1520 | # |
1519 | # This file is part of GNU Libtool. | 1521 | # This file is part of GNU Libtool. |
1520 | @@ -16929,19 +17597,42 @@ SP2NL=$lt_lt_SP2NL | 1522 | @@ -17189,19 +17857,42 @@ SP2NL=$lt_lt_SP2NL |
1521 | # turn newlines into spaces. | 1523 | # turn newlines into spaces. |
1522 | NL2SP=$lt_lt_NL2SP | 1524 | NL2SP=$lt_lt_NL2SP |
1523 | 1525 | ||
@@ -1561,7 +1563,7 @@ index 4f591b750d8..d90db11744b 100755 | |||
1561 | # A symbol stripping program. | 1563 | # A symbol stripping program. |
1562 | STRIP=$lt_STRIP | 1564 | STRIP=$lt_STRIP |
1563 | 1565 | ||
1564 | @@ -16971,6 +17662,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address | 1566 | @@ -17231,6 +17922,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address |
1565 | # Transform the output of nm in a C name address pair when lib prefix is needed. | 1567 | # Transform the output of nm in a C name address pair when lib prefix is needed. |
1566 | global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix | 1568 | global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix |
1567 | 1569 | ||
@@ -1574,7 +1576,7 @@ index 4f591b750d8..d90db11744b 100755 | |||
1574 | # The name of the directory that contains temporary libtool files. | 1576 | # The name of the directory that contains temporary libtool files. |
1575 | objdir=$objdir | 1577 | objdir=$objdir |
1576 | 1578 | ||
1577 | @@ -16980,6 +17677,9 @@ MAGIC_CMD=$MAGIC_CMD | 1579 | @@ -17240,6 +17937,9 @@ MAGIC_CMD=$MAGIC_CMD |
1578 | # Must we lock files when doing compilation? | 1580 | # Must we lock files when doing compilation? |
1579 | need_locks=$lt_need_locks | 1581 | need_locks=$lt_need_locks |
1580 | 1582 | ||
@@ -1584,7 +1586,7 @@ index 4f591b750d8..d90db11744b 100755 | |||
1584 | # Tool to manipulate archived DWARF debug symbol files on Mac OS X. | 1586 | # Tool to manipulate archived DWARF debug symbol files on Mac OS X. |
1585 | DSYMUTIL=$lt_DSYMUTIL | 1587 | DSYMUTIL=$lt_DSYMUTIL |
1586 | 1588 | ||
1587 | @@ -17094,12 +17794,12 @@ with_gcc=$GCC | 1589 | @@ -17354,12 +18054,12 @@ with_gcc=$GCC |
1588 | # Compiler flag to turn off builtin functions. | 1590 | # Compiler flag to turn off builtin functions. |
1589 | no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag | 1591 | no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag |
1590 | 1592 | ||
@@ -1600,7 +1602,7 @@ index 4f591b750d8..d90db11744b 100755 | |||
1600 | # Compiler flag to prevent dynamic linking. | 1602 | # Compiler flag to prevent dynamic linking. |
1601 | link_static_flag=$lt_lt_prog_compiler_static | 1603 | link_static_flag=$lt_lt_prog_compiler_static |
1602 | 1604 | ||
1603 | @@ -17186,9 +17886,6 @@ inherit_rpath=$inherit_rpath | 1605 | @@ -17446,9 +18146,6 @@ inherit_rpath=$inherit_rpath |
1604 | # Whether libtool must link a program against all its dependency libraries. | 1606 | # Whether libtool must link a program against all its dependency libraries. |
1605 | link_all_deplibs=$link_all_deplibs | 1607 | link_all_deplibs=$link_all_deplibs |
1606 | 1608 | ||
@@ -1610,7 +1612,7 @@ index 4f591b750d8..d90db11744b 100755 | |||
1610 | # Set to "yes" if exported symbols are required. | 1612 | # Set to "yes" if exported symbols are required. |
1611 | always_export_symbols=$always_export_symbols | 1613 | always_export_symbols=$always_export_symbols |
1612 | 1614 | ||
1613 | @@ -17204,6 +17901,9 @@ include_expsyms=$lt_include_expsyms | 1615 | @@ -17464,6 +18161,9 @@ include_expsyms=$lt_include_expsyms |
1614 | # Commands necessary for linking programs (against libraries) with templates. | 1616 | # Commands necessary for linking programs (against libraries) with templates. |
1615 | prelink_cmds=$lt_prelink_cmds | 1617 | prelink_cmds=$lt_prelink_cmds |
1616 | 1618 | ||
@@ -1620,7 +1622,7 @@ index 4f591b750d8..d90db11744b 100755 | |||
1620 | # Specify filename containing input files. | 1622 | # Specify filename containing input files. |
1621 | file_list_spec=$lt_file_list_spec | 1623 | file_list_spec=$lt_file_list_spec |
1622 | 1624 | ||
1623 | @@ -17236,210 +17936,169 @@ ltmain="$ac_aux_dir/ltmain.sh" | 1625 | @@ -17496,210 +18196,169 @@ ltmain="$ac_aux_dir/ltmain.sh" |
1624 | # if finds mixed CR/LF and LF-only lines. Since sed operates in | 1626 | # if finds mixed CR/LF and LF-only lines. Since sed operates in |
1625 | # text mode, it properly converts lines to CR/LF. This bash problem | 1627 | # text mode, it properly converts lines to CR/LF. This bash problem |
1626 | # is reportedly fixed, but why not run on old versions too? | 1628 | # is reportedly fixed, but why not run on old versions too? |
@@ -1995,10 +1997,10 @@ index 4f591b750d8..d90db11744b 100755 | |||
1995 | chmod +x "$ofile" | 1997 | chmod +x "$ofile" |
1996 | 1998 | ||
1997 | diff --git a/bfd/configure.ac b/bfd/configure.ac | 1999 | diff --git a/bfd/configure.ac b/bfd/configure.ac |
1998 | index 6146efb5ae3..73e5e03d016 100644 | 2000 | index 015fd011893..58f73ec709c 100644 |
1999 | --- a/bfd/configure.ac | 2001 | --- a/bfd/configure.ac |
2000 | +++ b/bfd/configure.ac | 2002 | +++ b/bfd/configure.ac |
2001 | @@ -282,7 +282,7 @@ changequote(,)dnl | 2003 | @@ -272,7 +272,7 @@ changequote(,)dnl |
2002 | x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'` | 2004 | x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'` |
2003 | changequote([,])dnl | 2005 | changequote([,])dnl |
2004 | if test -n "$x"; then | 2006 | if test -n "$x"; then |
@@ -2008,10 +2010,10 @@ index 6146efb5ae3..73e5e03d016 100644 | |||
2008 | fi | 2010 | fi |
2009 | 2011 | ||
2010 | diff --git a/binutils/Makefile.in b/binutils/Makefile.in | 2012 | diff --git a/binutils/Makefile.in b/binutils/Makefile.in |
2011 | index 78d32b350e3..ad4f2de7358 100644 | 2013 | index 27315addc0f..5ddd5a42a7d 100644 |
2012 | --- a/binutils/Makefile.in | 2014 | --- a/binutils/Makefile.in |
2013 | +++ b/binutils/Makefile.in | 2015 | +++ b/binutils/Makefile.in |
2014 | @@ -492,6 +492,7 @@ DEBUGINFOD_LIBS = @DEBUGINFOD_LIBS@ | 2016 | @@ -493,6 +493,7 @@ DEBUGINFOD_LIBS = @DEBUGINFOD_LIBS@ |
2015 | DEFS = @DEFS@ | 2017 | DEFS = @DEFS@ |
2016 | DEMANGLER_NAME = @DEMANGLER_NAME@ | 2018 | DEMANGLER_NAME = @DEMANGLER_NAME@ |
2017 | DEPDIR = @DEPDIR@ | 2019 | DEPDIR = @DEPDIR@ |
@@ -2019,7 +2021,7 @@ index 78d32b350e3..ad4f2de7358 100644 | |||
2019 | DLLTOOL_DEFS = @DLLTOOL_DEFS@ | 2021 | DLLTOOL_DEFS = @DLLTOOL_DEFS@ |
2020 | DSYMUTIL = @DSYMUTIL@ | 2022 | DSYMUTIL = @DSYMUTIL@ |
2021 | DUMPBIN = @DUMPBIN@ | 2023 | DUMPBIN = @DUMPBIN@ |
2022 | @@ -533,6 +534,7 @@ LTLIBICONV = @LTLIBICONV@ | 2024 | @@ -534,6 +535,7 @@ LTLIBICONV = @LTLIBICONV@ |
2023 | LTLIBOBJS = @LTLIBOBJS@ | 2025 | LTLIBOBJS = @LTLIBOBJS@ |
2024 | MAINT = @MAINT@ | 2026 | MAINT = @MAINT@ |
2025 | MAKEINFO = @MAKEINFO@ | 2027 | MAKEINFO = @MAKEINFO@ |
@@ -2027,7 +2029,7 @@ index 78d32b350e3..ad4f2de7358 100644 | |||
2027 | MKDIR_P = @MKDIR_P@ | 2029 | MKDIR_P = @MKDIR_P@ |
2028 | MKINSTALLDIRS = @MKINSTALLDIRS@ | 2030 | MKINSTALLDIRS = @MKINSTALLDIRS@ |
2029 | MSGFMT = @MSGFMT@ | 2031 | MSGFMT = @MSGFMT@ |
2030 | @@ -579,6 +581,7 @@ abs_builddir = @abs_builddir@ | 2032 | @@ -582,6 +584,7 @@ abs_builddir = @abs_builddir@ |
2031 | abs_srcdir = @abs_srcdir@ | 2033 | abs_srcdir = @abs_srcdir@ |
2032 | abs_top_builddir = @abs_top_builddir@ | 2034 | abs_top_builddir = @abs_top_builddir@ |
2033 | abs_top_srcdir = @abs_top_srcdir@ | 2035 | abs_top_srcdir = @abs_top_srcdir@ |
@@ -2036,10 +2038,10 @@ index 78d32b350e3..ad4f2de7358 100644 | |||
2036 | ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ | 2038 | ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ |
2037 | am__include = @am__include@ | 2039 | am__include = @am__include@ |
2038 | diff --git a/binutils/configure b/binutils/configure | 2040 | diff --git a/binutils/configure b/binutils/configure |
2039 | index 149815542f9..43952bde405 100755 | 2041 | index 3cb797c2b8d..5578150c1d9 100755 |
2040 | --- a/binutils/configure | 2042 | --- a/binutils/configure |
2041 | +++ b/binutils/configure | 2043 | +++ b/binutils/configure |
2042 | @@ -698,8 +698,11 @@ OTOOL | 2044 | @@ -700,8 +700,11 @@ OTOOL |
2043 | LIPO | 2045 | LIPO |
2044 | NMEDIT | 2046 | NMEDIT |
2045 | DSYMUTIL | 2047 | DSYMUTIL |
@@ -2051,7 +2053,7 @@ index 149815542f9..43952bde405 100755 | |||
2051 | OBJDUMP | 2053 | OBJDUMP |
2052 | LN_S | 2054 | LN_S |
2053 | NM | 2055 | NM |
2054 | @@ -816,6 +819,7 @@ enable_static | 2056 | @@ -818,6 +821,7 @@ enable_static |
2055 | with_pic | 2057 | with_pic |
2056 | enable_fast_install | 2058 | enable_fast_install |
2057 | with_gnu_ld | 2059 | with_gnu_ld |
@@ -2059,7 +2061,7 @@ index 149815542f9..43952bde405 100755 | |||
2059 | enable_libtool_lock | 2061 | enable_libtool_lock |
2060 | enable_plugins | 2062 | enable_plugins |
2061 | enable_largefile | 2063 | enable_largefile |
2062 | @@ -1514,6 +1518,8 @@ Optional Packages: | 2064 | @@ -1523,6 +1527,8 @@ Optional Packages: |
2063 | --with-pic try to use only PIC/non-PIC objects [default=use | 2065 | --with-pic try to use only PIC/non-PIC objects [default=use |
2064 | both] | 2066 | both] |
2065 | --with-gnu-ld assume the C compiler uses GNU ld [default=no] | 2067 | --with-gnu-ld assume the C compiler uses GNU ld [default=no] |
@@ -2068,7 +2070,7 @@ index 149815542f9..43952bde405 100755 | |||
2068 | --with-debuginfod Enable debuginfo lookups with debuginfod | 2070 | --with-debuginfod Enable debuginfo lookups with debuginfod |
2069 | (auto/yes/no) | 2071 | (auto/yes/no) |
2070 | --with-system-zlib use installed libz | 2072 | --with-system-zlib use installed libz |
2071 | @@ -4893,8 +4899,8 @@ esac | 2073 | @@ -4723,8 +4729,8 @@ esac |
2072 | 2074 | ||
2073 | 2075 | ||
2074 | 2076 | ||
@@ -2079,7 +2081,7 @@ index 149815542f9..43952bde405 100755 | |||
2079 | 2081 | ||
2080 | 2082 | ||
2081 | 2083 | ||
2082 | @@ -4934,7 +4940,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO | 2084 | @@ -4764,7 +4770,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO |
2083 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 | 2085 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 |
2084 | $as_echo_n "checking how to print strings... " >&6; } | 2086 | $as_echo_n "checking how to print strings... " >&6; } |
2085 | # Test print first, because it will be a builtin if present. | 2087 | # Test print first, because it will be a builtin if present. |
@@ -2088,7 +2090,7 @@ index 149815542f9..43952bde405 100755 | |||
2088 | test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then | 2090 | test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then |
2089 | ECHO='print -r --' | 2091 | ECHO='print -r --' |
2090 | elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then | 2092 | elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then |
2091 | @@ -5627,8 +5633,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; | 2093 | @@ -5457,8 +5463,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; |
2092 | # Try some XSI features | 2094 | # Try some XSI features |
2093 | xsi_shell=no | 2095 | xsi_shell=no |
2094 | ( _lt_dummy="a/b/c" | 2096 | ( _lt_dummy="a/b/c" |
@@ -2099,7 +2101,7 @@ index 149815542f9..43952bde405 100755 | |||
2099 | && eval 'test $(( 1 + 1 )) -eq 2 \ | 2101 | && eval 'test $(( 1 + 1 )) -eq 2 \ |
2100 | && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ | 2102 | && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ |
2101 | && xsi_shell=yes | 2103 | && xsi_shell=yes |
2102 | @@ -5677,6 +5683,80 @@ esac | 2104 | @@ -5507,6 +5513,80 @@ esac |
2103 | 2105 | ||
2104 | 2106 | ||
2105 | 2107 | ||
@@ -2180,7 +2182,7 @@ index 149815542f9..43952bde405 100755 | |||
2180 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 | 2182 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 |
2181 | $as_echo_n "checking for $LD option to reload object files... " >&6; } | 2183 | $as_echo_n "checking for $LD option to reload object files... " >&6; } |
2182 | if ${lt_cv_ld_reload_flag+:} false; then : | 2184 | if ${lt_cv_ld_reload_flag+:} false; then : |
2183 | @@ -5693,6 +5773,11 @@ case $reload_flag in | 2185 | @@ -5523,6 +5603,11 @@ case $reload_flag in |
2184 | esac | 2186 | esac |
2185 | reload_cmds='$LD$reload_flag -o $output$reload_objs' | 2187 | reload_cmds='$LD$reload_flag -o $output$reload_objs' |
2186 | case $host_os in | 2188 | case $host_os in |
@@ -2192,7 +2194,7 @@ index 149815542f9..43952bde405 100755 | |||
2192 | darwin*) | 2194 | darwin*) |
2193 | if test "$GCC" = yes; then | 2195 | if test "$GCC" = yes; then |
2194 | reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' | 2196 | reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' |
2195 | @@ -5861,7 +5946,8 @@ mingw* | pw32*) | 2197 | @@ -5691,7 +5776,8 @@ mingw* | pw32*) |
2196 | lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' | 2198 | lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' |
2197 | lt_cv_file_magic_cmd='func_win32_libid' | 2199 | lt_cv_file_magic_cmd='func_win32_libid' |
2198 | else | 2200 | else |
@@ -2202,7 +2204,7 @@ index 149815542f9..43952bde405 100755 | |||
2202 | lt_cv_file_magic_cmd='$OBJDUMP -f' | 2204 | lt_cv_file_magic_cmd='$OBJDUMP -f' |
2203 | fi | 2205 | fi |
2204 | ;; | 2206 | ;; |
2205 | @@ -6015,6 +6101,21 @@ esac | 2207 | @@ -5845,6 +5931,21 @@ esac |
2206 | fi | 2208 | fi |
2207 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 | 2209 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 |
2208 | $as_echo "$lt_cv_deplibs_check_method" >&6; } | 2210 | $as_echo "$lt_cv_deplibs_check_method" >&6; } |
@@ -2224,7 +2226,7 @@ index 149815542f9..43952bde405 100755 | |||
2224 | file_magic_cmd=$lt_cv_file_magic_cmd | 2226 | file_magic_cmd=$lt_cv_file_magic_cmd |
2225 | deplibs_check_method=$lt_cv_deplibs_check_method | 2227 | deplibs_check_method=$lt_cv_deplibs_check_method |
2226 | test -z "$deplibs_check_method" && deplibs_check_method=unknown | 2228 | test -z "$deplibs_check_method" && deplibs_check_method=unknown |
2227 | @@ -6030,6 +6131,157 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown | 2229 | @@ -5860,6 +5961,157 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown |
2228 | 2230 | ||
2229 | 2231 | ||
2230 | 2232 | ||
@@ -2382,7 +2384,7 @@ index 149815542f9..43952bde405 100755 | |||
2382 | plugin_option= | 2384 | plugin_option= |
2383 | plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll" | 2385 | plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll" |
2384 | for plugin in $plugin_names; do | 2386 | for plugin in $plugin_names; do |
2385 | @@ -6044,8 +6296,10 @@ for plugin in $plugin_names; do | 2387 | @@ -5874,8 +6126,10 @@ for plugin in $plugin_names; do |
2386 | done | 2388 | done |
2387 | 2389 | ||
2388 | if test -n "$ac_tool_prefix"; then | 2390 | if test -n "$ac_tool_prefix"; then |
@@ -2395,7 +2397,7 @@ index 149815542f9..43952bde405 100755 | |||
2395 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | 2397 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
2396 | $as_echo_n "checking for $ac_word... " >&6; } | 2398 | $as_echo_n "checking for $ac_word... " >&6; } |
2397 | if ${ac_cv_prog_AR+:} false; then : | 2399 | if ${ac_cv_prog_AR+:} false; then : |
2398 | @@ -6061,7 +6315,7 @@ do | 2400 | @@ -5891,7 +6145,7 @@ do |
2399 | test -z "$as_dir" && as_dir=. | 2401 | test -z "$as_dir" && as_dir=. |
2400 | for ac_exec_ext in '' $ac_executable_extensions; do | 2402 | for ac_exec_ext in '' $ac_executable_extensions; do |
2401 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | 2403 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
@@ -2404,7 +2406,7 @@ index 149815542f9..43952bde405 100755 | |||
2404 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | 2406 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
2405 | break 2 | 2407 | break 2 |
2406 | fi | 2408 | fi |
2407 | @@ -6081,11 +6335,15 @@ $as_echo "no" >&6; } | 2409 | @@ -5911,11 +6165,15 @@ $as_echo "no" >&6; } |
2408 | fi | 2410 | fi |
2409 | 2411 | ||
2410 | 2412 | ||
@@ -2423,7 +2425,7 @@ index 149815542f9..43952bde405 100755 | |||
2423 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | 2425 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
2424 | $as_echo_n "checking for $ac_word... " >&6; } | 2426 | $as_echo_n "checking for $ac_word... " >&6; } |
2425 | if ${ac_cv_prog_ac_ct_AR+:} false; then : | 2427 | if ${ac_cv_prog_ac_ct_AR+:} false; then : |
2426 | @@ -6101,7 +6359,7 @@ do | 2428 | @@ -5931,7 +6189,7 @@ do |
2427 | test -z "$as_dir" && as_dir=. | 2429 | test -z "$as_dir" && as_dir=. |
2428 | for ac_exec_ext in '' $ac_executable_extensions; do | 2430 | for ac_exec_ext in '' $ac_executable_extensions; do |
2429 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | 2431 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
@@ -2432,7 +2434,7 @@ index 149815542f9..43952bde405 100755 | |||
2432 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | 2434 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
2433 | break 2 | 2435 | break 2 |
2434 | fi | 2436 | fi |
2435 | @@ -6120,6 +6378,10 @@ else | 2437 | @@ -5950,6 +6208,10 @@ else |
2436 | $as_echo "no" >&6; } | 2438 | $as_echo "no" >&6; } |
2437 | fi | 2439 | fi |
2438 | 2440 | ||
@@ -2443,7 +2445,7 @@ index 149815542f9..43952bde405 100755 | |||
2443 | if test "x$ac_ct_AR" = x; then | 2445 | if test "x$ac_ct_AR" = x; then |
2444 | AR="false" | 2446 | AR="false" |
2445 | else | 2447 | else |
2446 | @@ -6131,29 +6393,81 @@ ac_tool_warned=yes ;; | 2448 | @@ -5961,29 +6223,81 @@ ac_tool_warned=yes ;; |
2447 | esac | 2449 | esac |
2448 | AR=$ac_ct_AR | 2450 | AR=$ac_ct_AR |
2449 | fi | 2451 | fi |
@@ -2540,7 +2542,7 @@ index 149815542f9..43952bde405 100755 | |||
2540 | 2542 | ||
2541 | 2543 | ||
2542 | 2544 | ||
2543 | @@ -6500,8 +6814,8 @@ esac | 2545 | @@ -6330,8 +6644,8 @@ esac |
2544 | lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" | 2546 | lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" |
2545 | 2547 | ||
2546 | # Transform an extracted symbol line into symbol name and symbol address | 2548 | # Transform an extracted symbol line into symbol name and symbol address |
@@ -2551,7 +2553,7 @@ index 149815542f9..43952bde405 100755 | |||
2551 | 2553 | ||
2552 | # Handle CRLF in mingw tool chain | 2554 | # Handle CRLF in mingw tool chain |
2553 | opt_cr= | 2555 | opt_cr= |
2554 | @@ -6537,6 +6851,7 @@ for ac_symprfx in "" "_"; do | 2556 | @@ -6367,6 +6681,7 @@ for ac_symprfx in "" "_"; do |
2555 | else | 2557 | else |
2556 | lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" | 2558 | lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" |
2557 | fi | 2559 | fi |
@@ -2559,7 +2561,7 @@ index 149815542f9..43952bde405 100755 | |||
2559 | 2561 | ||
2560 | # Check to see that the pipe works correctly. | 2562 | # Check to see that the pipe works correctly. |
2561 | pipe_works=no | 2563 | pipe_works=no |
2562 | @@ -6578,6 +6893,18 @@ _LT_EOF | 2564 | @@ -6408,6 +6723,18 @@ _LT_EOF |
2563 | if $GREP ' nm_test_var$' "$nlist" >/dev/null; then | 2565 | if $GREP ' nm_test_var$' "$nlist" >/dev/null; then |
2564 | if $GREP ' nm_test_func$' "$nlist" >/dev/null; then | 2566 | if $GREP ' nm_test_func$' "$nlist" >/dev/null; then |
2565 | cat <<_LT_EOF > conftest.$ac_ext | 2567 | cat <<_LT_EOF > conftest.$ac_ext |
@@ -2578,7 +2580,7 @@ index 149815542f9..43952bde405 100755 | |||
2578 | #ifdef __cplusplus | 2580 | #ifdef __cplusplus |
2579 | extern "C" { | 2581 | extern "C" { |
2580 | #endif | 2582 | #endif |
2581 | @@ -6589,7 +6916,7 @@ _LT_EOF | 2583 | @@ -6419,7 +6746,7 @@ _LT_EOF |
2582 | cat <<_LT_EOF >> conftest.$ac_ext | 2584 | cat <<_LT_EOF >> conftest.$ac_ext |
2583 | 2585 | ||
2584 | /* The mapping between symbol names and symbols. */ | 2586 | /* The mapping between symbol names and symbols. */ |
@@ -2587,7 +2589,7 @@ index 149815542f9..43952bde405 100755 | |||
2587 | const char *name; | 2589 | const char *name; |
2588 | void *address; | 2590 | void *address; |
2589 | } | 2591 | } |
2590 | @@ -6615,8 +6942,8 @@ static const void *lt_preloaded_setup() { | 2592 | @@ -6445,8 +6772,8 @@ static const void *lt_preloaded_setup() { |
2591 | _LT_EOF | 2593 | _LT_EOF |
2592 | # Now try linking the two files. | 2594 | # Now try linking the two files. |
2593 | mv conftest.$ac_objext conftstm.$ac_objext | 2595 | mv conftest.$ac_objext conftstm.$ac_objext |
@@ -2598,7 +2600,7 @@ index 149815542f9..43952bde405 100755 | |||
2598 | LIBS="conftstm.$ac_objext" | 2600 | LIBS="conftstm.$ac_objext" |
2599 | CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" | 2601 | CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" |
2600 | if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 | 2602 | if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 |
2601 | @@ -6626,8 +6953,8 @@ _LT_EOF | 2603 | @@ -6456,8 +6783,8 @@ _LT_EOF |
2602 | test $ac_status = 0; } && test -s conftest${ac_exeext}; then | 2604 | test $ac_status = 0; } && test -s conftest${ac_exeext}; then |
2603 | pipe_works=yes | 2605 | pipe_works=yes |
2604 | fi | 2606 | fi |
@@ -2609,7 +2611,7 @@ index 149815542f9..43952bde405 100755 | |||
2609 | else | 2611 | else |
2610 | echo "cannot find nm_test_func in $nlist" >&5 | 2612 | echo "cannot find nm_test_func in $nlist" >&5 |
2611 | fi | 2613 | fi |
2612 | @@ -6664,6 +6991,19 @@ else | 2614 | @@ -6494,6 +6821,19 @@ else |
2613 | $as_echo "ok" >&6; } | 2615 | $as_echo "ok" >&6; } |
2614 | fi | 2616 | fi |
2615 | 2617 | ||
@@ -2629,7 +2631,7 @@ index 149815542f9..43952bde405 100755 | |||
2629 | 2631 | ||
2630 | 2632 | ||
2631 | 2633 | ||
2632 | @@ -6680,6 +7020,42 @@ fi | 2634 | @@ -6510,6 +6850,42 @@ fi |
2633 | 2635 | ||
2634 | 2636 | ||
2635 | 2637 | ||
@@ -2672,7 +2674,7 @@ index 149815542f9..43952bde405 100755 | |||
2672 | 2674 | ||
2673 | 2675 | ||
2674 | 2676 | ||
2675 | @@ -6891,6 +7267,123 @@ esac | 2677 | @@ -6721,6 +7097,123 @@ esac |
2676 | 2678 | ||
2677 | need_locks="$enable_libtool_lock" | 2679 | need_locks="$enable_libtool_lock" |
2678 | 2680 | ||
@@ -2796,7 +2798,7 @@ index 149815542f9..43952bde405 100755 | |||
2796 | 2798 | ||
2797 | case $host_os in | 2799 | case $host_os in |
2798 | rhapsody* | darwin*) | 2800 | rhapsody* | darwin*) |
2799 | @@ -7454,6 +7947,8 @@ _LT_EOF | 2801 | @@ -7284,6 +7777,8 @@ _LT_EOF |
2800 | $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 | 2802 | $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 |
2801 | echo "$AR cru libconftest.a conftest.o" >&5 | 2803 | echo "$AR cru libconftest.a conftest.o" >&5 |
2802 | $AR cru libconftest.a conftest.o 2>&5 | 2804 | $AR cru libconftest.a conftest.o 2>&5 |
@@ -2805,7 +2807,7 @@ index 149815542f9..43952bde405 100755 | |||
2805 | cat > conftest.c << _LT_EOF | 2807 | cat > conftest.c << _LT_EOF |
2806 | int main() { return 0;} | 2808 | int main() { return 0;} |
2807 | _LT_EOF | 2809 | _LT_EOF |
2808 | @@ -8036,8 +8531,6 @@ fi | 2810 | @@ -7866,8 +8361,6 @@ fi |
2809 | lt_prog_compiler_pic= | 2811 | lt_prog_compiler_pic= |
2810 | lt_prog_compiler_static= | 2812 | lt_prog_compiler_static= |
2811 | 2813 | ||
@@ -2814,7 +2816,7 @@ index 149815542f9..43952bde405 100755 | |||
2814 | 2816 | ||
2815 | if test "$GCC" = yes; then | 2817 | if test "$GCC" = yes; then |
2816 | lt_prog_compiler_wl='-Wl,' | 2818 | lt_prog_compiler_wl='-Wl,' |
2817 | @@ -8203,6 +8696,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } | 2819 | @@ -8033,6 +8526,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } |
2818 | lt_prog_compiler_pic='--shared' | 2820 | lt_prog_compiler_pic='--shared' |
2819 | lt_prog_compiler_static='--static' | 2821 | lt_prog_compiler_static='--static' |
2820 | ;; | 2822 | ;; |
@@ -2827,7 +2829,7 @@ index 149815542f9..43952bde405 100755 | |||
2827 | pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) | 2829 | pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) |
2828 | # Portland Group compilers (*not* the Pentium gcc compiler, | 2830 | # Portland Group compilers (*not* the Pentium gcc compiler, |
2829 | # which looks to be a dead project) | 2831 | # which looks to be a dead project) |
2830 | @@ -8265,7 +8764,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } | 2832 | @@ -8095,7 +8594,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } |
2831 | lt_prog_compiler_pic='-KPIC' | 2833 | lt_prog_compiler_pic='-KPIC' |
2832 | lt_prog_compiler_static='-Bstatic' | 2834 | lt_prog_compiler_static='-Bstatic' |
2833 | case $cc_basename in | 2835 | case $cc_basename in |
@@ -2836,7 +2838,7 @@ index 149815542f9..43952bde405 100755 | |||
2836 | lt_prog_compiler_wl='-Qoption ld ';; | 2838 | lt_prog_compiler_wl='-Qoption ld ';; |
2837 | *) | 2839 | *) |
2838 | lt_prog_compiler_wl='-Wl,';; | 2840 | lt_prog_compiler_wl='-Wl,';; |
2839 | @@ -8322,13 +8821,17 @@ case $host_os in | 2841 | @@ -8152,13 +8651,17 @@ case $host_os in |
2840 | lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" | 2842 | lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" |
2841 | ;; | 2843 | ;; |
2842 | esac | 2844 | esac |
@@ -2860,7 +2862,7 @@ index 149815542f9..43952bde405 100755 | |||
2860 | 2862 | ||
2861 | # | 2863 | # |
2862 | # Check to make sure the PIC flag actually works. | 2864 | # Check to make sure the PIC flag actually works. |
2863 | @@ -8389,6 +8892,11 @@ fi | 2865 | @@ -8219,6 +8722,11 @@ fi |
2864 | 2866 | ||
2865 | 2867 | ||
2866 | 2868 | ||
@@ -2872,7 +2874,7 @@ index 149815542f9..43952bde405 100755 | |||
2872 | # | 2874 | # |
2873 | # Check to make sure the static flag actually works. | 2875 | # Check to make sure the static flag actually works. |
2874 | # | 2876 | # |
2875 | @@ -8739,7 +9247,8 @@ _LT_EOF | 2877 | @@ -8569,7 +9077,8 @@ _LT_EOF |
2876 | allow_undefined_flag=unsupported | 2878 | allow_undefined_flag=unsupported |
2877 | always_export_symbols=no | 2879 | always_export_symbols=no |
2878 | enable_shared_with_static_runtimes=yes | 2880 | enable_shared_with_static_runtimes=yes |
@@ -2882,7 +2884,7 @@ index 149815542f9..43952bde405 100755 | |||
2882 | 2884 | ||
2883 | if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then | 2885 | if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then |
2884 | archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' | 2886 | archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' |
2885 | @@ -8838,12 +9347,12 @@ _LT_EOF | 2887 | @@ -8668,12 +9177,12 @@ _LT_EOF |
2886 | whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' | 2888 | whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' |
2887 | hardcode_libdir_flag_spec= | 2889 | hardcode_libdir_flag_spec= |
2888 | hardcode_libdir_flag_spec_ld='-rpath $libdir' | 2890 | hardcode_libdir_flag_spec_ld='-rpath $libdir' |
@@ -2897,7 +2899,7 @@ index 149815542f9..43952bde405 100755 | |||
2897 | fi | 2899 | fi |
2898 | ;; | 2900 | ;; |
2899 | esac | 2901 | esac |
2900 | @@ -8857,8 +9366,8 @@ _LT_EOF | 2902 | @@ -8687,8 +9196,8 @@ _LT_EOF |
2901 | archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' | 2903 | archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' |
2902 | wlarc= | 2904 | wlarc= |
2903 | else | 2905 | else |
@@ -2908,7 +2910,7 @@ index 149815542f9..43952bde405 100755 | |||
2908 | fi | 2910 | fi |
2909 | ;; | 2911 | ;; |
2910 | 2912 | ||
2911 | @@ -8876,8 +9385,8 @@ _LT_EOF | 2913 | @@ -8706,8 +9215,8 @@ _LT_EOF |
2912 | 2914 | ||
2913 | _LT_EOF | 2915 | _LT_EOF |
2914 | elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then | 2916 | elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then |
@@ -2919,7 +2921,7 @@ index 149815542f9..43952bde405 100755 | |||
2919 | else | 2921 | else |
2920 | ld_shlibs=no | 2922 | ld_shlibs=no |
2921 | fi | 2923 | fi |
2922 | @@ -8923,8 +9432,8 @@ _LT_EOF | 2924 | @@ -8753,8 +9262,8 @@ _LT_EOF |
2923 | 2925 | ||
2924 | *) | 2926 | *) |
2925 | if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then | 2927 | if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then |
@@ -2930,7 +2932,7 @@ index 149815542f9..43952bde405 100755 | |||
2930 | else | 2932 | else |
2931 | ld_shlibs=no | 2933 | ld_shlibs=no |
2932 | fi | 2934 | fi |
2933 | @@ -9054,7 +9563,13 @@ _LT_EOF | 2935 | @@ -8884,7 +9393,13 @@ _LT_EOF |
2934 | allow_undefined_flag='-berok' | 2936 | allow_undefined_flag='-berok' |
2935 | # Determine the default libpath from the value encoded in an | 2937 | # Determine the default libpath from the value encoded in an |
2936 | # empty executable. | 2938 | # empty executable. |
@@ -2945,7 +2947,7 @@ index 149815542f9..43952bde405 100755 | |||
2945 | /* end confdefs.h. */ | 2947 | /* end confdefs.h. */ |
2946 | 2948 | ||
2947 | int | 2949 | int |
2948 | @@ -9067,22 +9582,29 @@ main () | 2950 | @@ -8897,22 +9412,29 @@ main () |
2949 | _ACEOF | 2951 | _ACEOF |
2950 | if ac_fn_c_try_link "$LINENO"; then : | 2952 | if ac_fn_c_try_link "$LINENO"; then : |
2951 | 2953 | ||
@@ -2988,7 +2990,7 @@ index 149815542f9..43952bde405 100755 | |||
2988 | 2990 | ||
2989 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" | 2991 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" |
2990 | archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" | 2992 | 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" |
2991 | @@ -9094,7 +9616,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | 2993 | @@ -8924,7 +9446,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
2992 | else | 2994 | else |
2993 | # Determine the default libpath from the value encoded in an | 2995 | # Determine the default libpath from the value encoded in an |
2994 | # empty executable. | 2996 | # empty executable. |
@@ -3003,7 +3005,7 @@ index 149815542f9..43952bde405 100755 | |||
3003 | /* end confdefs.h. */ | 3005 | /* end confdefs.h. */ |
3004 | 3006 | ||
3005 | int | 3007 | int |
3006 | @@ -9107,22 +9635,29 @@ main () | 3008 | @@ -8937,22 +9465,29 @@ main () |
3007 | _ACEOF | 3009 | _ACEOF |
3008 | if ac_fn_c_try_link "$LINENO"; then : | 3010 | if ac_fn_c_try_link "$LINENO"; then : |
3009 | 3011 | ||
@@ -3046,7 +3048,7 @@ index 149815542f9..43952bde405 100755 | |||
3046 | 3048 | ||
3047 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" | 3049 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" |
3048 | # Warning - without using the other run time loading flags, | 3050 | # Warning - without using the other run time loading flags, |
3049 | @@ -9167,20 +9702,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | 3051 | @@ -8997,20 +9532,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
3050 | # Microsoft Visual C++. | 3052 | # Microsoft Visual C++. |
3051 | # hardcode_libdir_flag_spec is actually meaningless, as there is | 3053 | # hardcode_libdir_flag_spec is actually meaningless, as there is |
3052 | # no search path for DLLs. | 3054 | # no search path for DLLs. |
@@ -3124,7 +3126,7 @@ index 149815542f9..43952bde405 100755 | |||
3124 | ;; | 3126 | ;; |
3125 | 3127 | ||
3126 | darwin* | rhapsody*) | 3128 | darwin* | rhapsody*) |
3127 | @@ -9241,7 +9819,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | 3129 | @@ -9071,7 +9649,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
3128 | 3130 | ||
3129 | # FreeBSD 3 and greater uses gcc -shared to do shared libraries. | 3131 | # FreeBSD 3 and greater uses gcc -shared to do shared libraries. |
3130 | freebsd* | dragonfly*) | 3132 | freebsd* | dragonfly*) |
@@ -3133,7 +3135,7 @@ index 149815542f9..43952bde405 100755 | |||
3133 | hardcode_libdir_flag_spec='-R$libdir' | 3135 | hardcode_libdir_flag_spec='-R$libdir' |
3134 | hardcode_direct=yes | 3136 | hardcode_direct=yes |
3135 | hardcode_shlibpath_var=no | 3137 | hardcode_shlibpath_var=no |
3136 | @@ -9249,7 +9827,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | 3138 | @@ -9079,7 +9657,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
3137 | 3139 | ||
3138 | hpux9*) | 3140 | hpux9*) |
3139 | if test "$GCC" = yes; then | 3141 | if test "$GCC" = yes; then |
@@ -3142,7 +3144,7 @@ index 149815542f9..43952bde405 100755 | |||
3142 | else | 3144 | else |
3143 | archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' | 3145 | 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' |
3144 | fi | 3146 | fi |
3145 | @@ -9265,7 +9843,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | 3147 | @@ -9095,7 +9673,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
3146 | 3148 | ||
3147 | hpux10*) | 3149 | hpux10*) |
3148 | if test "$GCC" = yes && test "$with_gnu_ld" = no; then | 3150 | if test "$GCC" = yes && test "$with_gnu_ld" = no; then |
@@ -3151,7 +3153,7 @@ index 149815542f9..43952bde405 100755 | |||
3151 | else | 3153 | else |
3152 | archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' | 3154 | archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' |
3153 | fi | 3155 | fi |
3154 | @@ -9289,10 +9867,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | 3156 | @@ -9119,10 +9697,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
3155 | archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' | 3157 | archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' |
3156 | ;; | 3158 | ;; |
3157 | ia64*) | 3159 | ia64*) |
@@ -3164,7 +3166,7 @@ index 149815542f9..43952bde405 100755 | |||
3164 | ;; | 3166 | ;; |
3165 | esac | 3167 | esac |
3166 | else | 3168 | else |
3167 | @@ -9371,23 +9949,36 @@ fi | 3169 | @@ -9201,23 +9779,36 @@ fi |
3168 | 3170 | ||
3169 | irix5* | irix6* | nonstopux*) | 3171 | irix5* | irix6* | nonstopux*) |
3170 | if test "$GCC" = yes; then | 3172 | if test "$GCC" = yes; then |
@@ -3209,7 +3211,7 @@ index 149815542f9..43952bde405 100755 | |||
3209 | else | 3211 | else |
3210 | archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' | 3212 | 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' |
3211 | archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' | 3213 | 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' |
3212 | @@ -9472,7 +10063,7 @@ rm -f core conftest.err conftest.$ac_objext \ | 3214 | @@ -9302,7 +9893,7 @@ rm -f core conftest.err conftest.$ac_objext \ |
3213 | osf4* | osf5*) # as osf3* with the addition of -msym flag | 3215 | osf4* | osf5*) # as osf3* with the addition of -msym flag |
3214 | if test "$GCC" = yes; then | 3216 | if test "$GCC" = yes; then |
3215 | allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' | 3217 | allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' |
@@ -3218,7 +3220,7 @@ index 149815542f9..43952bde405 100755 | |||
3218 | hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' | 3220 | hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' |
3219 | else | 3221 | else |
3220 | allow_undefined_flag=' -expect_unresolved \*' | 3222 | allow_undefined_flag=' -expect_unresolved \*' |
3221 | @@ -9491,9 +10082,9 @@ rm -f core conftest.err conftest.$ac_objext \ | 3223 | @@ -9321,9 +9912,9 @@ rm -f core conftest.err conftest.$ac_objext \ |
3222 | no_undefined_flag=' -z defs' | 3224 | no_undefined_flag=' -z defs' |
3223 | if test "$GCC" = yes; then | 3225 | if test "$GCC" = yes; then |
3224 | wlarc='${wl}' | 3226 | wlarc='${wl}' |
@@ -3230,7 +3232,7 @@ index 149815542f9..43952bde405 100755 | |||
3230 | else | 3232 | else |
3231 | case `$CC -V 2>&1` in | 3233 | case `$CC -V 2>&1` in |
3232 | *"Compilers 5.0"*) | 3234 | *"Compilers 5.0"*) |
3233 | @@ -10069,8 +10660,9 @@ cygwin* | mingw* | pw32* | cegcc*) | 3235 | @@ -9899,8 +10490,9 @@ cygwin* | mingw* | pw32* | cegcc*) |
3234 | need_version=no | 3236 | need_version=no |
3235 | need_lib_prefix=no | 3237 | need_lib_prefix=no |
3236 | 3238 | ||
@@ -3242,7 +3244,7 @@ index 149815542f9..43952bde405 100755 | |||
3242 | library_names_spec='$libname.dll.a' | 3244 | library_names_spec='$libname.dll.a' |
3243 | # DLL is installed to $(libdir)/../bin by postinstall_cmds | 3245 | # DLL is installed to $(libdir)/../bin by postinstall_cmds |
3244 | postinstall_cmds='base_file=`basename \${file}`~ | 3246 | postinstall_cmds='base_file=`basename \${file}`~ |
3245 | @@ -10103,13 +10695,71 @@ cygwin* | mingw* | pw32* | cegcc*) | 3247 | @@ -9933,13 +10525,71 @@ cygwin* | mingw* | pw32* | cegcc*) |
3246 | library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' | 3248 | library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' |
3247 | ;; | 3249 | ;; |
3248 | esac | 3250 | esac |
@@ -3315,16 +3317,16 @@ index 149815542f9..43952bde405 100755 | |||
3315 | # FIXME: first we should search . and the directory the executable is in | 3317 | # FIXME: first we should search . and the directory the executable is in |
3316 | shlibpath_var=PATH | 3318 | shlibpath_var=PATH |
3317 | ;; | 3319 | ;; |
3318 | @@ -10987,7 +11637,7 @@ else | 3320 | @@ -10817,7 +11467,7 @@ else |
3319 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 | 3321 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 |
3320 | lt_status=$lt_dlunknown | 3322 | lt_status=$lt_dlunknown |
3321 | cat > conftest.$ac_ext <<_LT_EOF | 3323 | cat > conftest.$ac_ext <<_LT_EOF |
3322 | -#line 10990 "configure" | 3324 | -#line 10820 "configure" |
3323 | +#line $LINENO "configure" | 3325 | +#line $LINENO "configure" |
3324 | #include "confdefs.h" | 3326 | #include "confdefs.h" |
3325 | 3327 | ||
3326 | #if HAVE_DLFCN_H | 3328 | #if HAVE_DLFCN_H |
3327 | @@ -11031,10 +11681,10 @@ else | 3329 | @@ -10861,10 +11511,10 @@ else |
3328 | /* When -fvisbility=hidden is used, assume the code has been annotated | 3330 | /* When -fvisbility=hidden is used, assume the code has been annotated |
3329 | correspondingly for the symbols needed. */ | 3331 | correspondingly for the symbols needed. */ |
3330 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) | 3332 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) |
@@ -3337,16 +3339,16 @@ index 149815542f9..43952bde405 100755 | |||
3337 | int main () | 3339 | int main () |
3338 | { | 3340 | { |
3339 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); | 3341 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); |
3340 | @@ -11093,7 +11743,7 @@ else | 3342 | @@ -10923,7 +11573,7 @@ else |
3341 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 | 3343 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 |
3342 | lt_status=$lt_dlunknown | 3344 | lt_status=$lt_dlunknown |
3343 | cat > conftest.$ac_ext <<_LT_EOF | 3345 | cat > conftest.$ac_ext <<_LT_EOF |
3344 | -#line 11096 "configure" | 3346 | -#line 10926 "configure" |
3345 | +#line $LINENO "configure" | 3347 | +#line $LINENO "configure" |
3346 | #include "confdefs.h" | 3348 | #include "confdefs.h" |
3347 | 3349 | ||
3348 | #if HAVE_DLFCN_H | 3350 | #if HAVE_DLFCN_H |
3349 | @@ -11137,10 +11787,10 @@ else | 3351 | @@ -10967,10 +11617,10 @@ else |
3350 | /* When -fvisbility=hidden is used, assume the code has been annotated | 3352 | /* When -fvisbility=hidden is used, assume the code has been annotated |
3351 | correspondingly for the symbols needed. */ | 3353 | correspondingly for the symbols needed. */ |
3352 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) | 3354 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) |
@@ -3359,7 +3361,7 @@ index 149815542f9..43952bde405 100755 | |||
3359 | int main () | 3361 | int main () |
3360 | { | 3362 | { |
3361 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); | 3363 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); |
3362 | @@ -15642,13 +16292,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' | 3364 | @@ -15549,13 +16199,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' |
3363 | lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' | 3365 | lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' |
3364 | lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' | 3366 | lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' |
3365 | lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' | 3367 | lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' |
@@ -3380,7 +3382,7 @@ index 149815542f9..43952bde405 100755 | |||
3380 | STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' | 3382 | STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' |
3381 | RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' | 3383 | RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' |
3382 | old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' | 3384 | old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' |
3383 | @@ -15663,14 +16320,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de | 3385 | @@ -15570,14 +16227,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de |
3384 | 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_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' |
3385 | lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' | 3387 | lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' |
3386 | lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`' | 3388 | 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"`' |
@@ -3399,7 +3401,7 @@ index 149815542f9..43952bde405 100755 | |||
3399 | DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' | 3401 | DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' |
3400 | NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' | 3402 | NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' |
3401 | LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' | 3403 | LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' |
3402 | @@ -15703,12 +16363,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q | 3404 | @@ -15610,12 +16270,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q |
3403 | hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' | 3405 | hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' |
3404 | inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' | 3406 | inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' |
3405 | link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' | 3407 | link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' |
@@ -3413,7 +3415,7 @@ index 149815542f9..43952bde405 100755 | |||
3413 | file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' | 3415 | file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' |
3414 | variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' | 3416 | variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' |
3415 | need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' | 3417 | need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' |
3416 | @@ -15763,8 +16423,13 @@ reload_flag \ | 3418 | @@ -15670,8 +16330,13 @@ reload_flag \ |
3417 | OBJDUMP \ | 3419 | OBJDUMP \ |
3418 | deplibs_check_method \ | 3420 | deplibs_check_method \ |
3419 | file_magic_cmd \ | 3421 | file_magic_cmd \ |
@@ -3427,7 +3429,7 @@ index 149815542f9..43952bde405 100755 | |||
3427 | STRIP \ | 3429 | STRIP \ |
3428 | RANLIB \ | 3430 | RANLIB \ |
3429 | CC \ | 3431 | CC \ |
3430 | @@ -15774,12 +16439,14 @@ lt_cv_sys_global_symbol_pipe \ | 3432 | @@ -15681,12 +16346,14 @@ lt_cv_sys_global_symbol_pipe \ |
3431 | lt_cv_sys_global_symbol_to_cdecl \ | 3433 | lt_cv_sys_global_symbol_to_cdecl \ |
3432 | lt_cv_sys_global_symbol_to_c_name_address \ | 3434 | lt_cv_sys_global_symbol_to_c_name_address \ |
3433 | lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ | 3435 | lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ |
@@ -3443,7 +3445,7 @@ index 149815542f9..43952bde405 100755 | |||
3443 | DSYMUTIL \ | 3445 | DSYMUTIL \ |
3444 | NMEDIT \ | 3446 | NMEDIT \ |
3445 | LIPO \ | 3447 | LIPO \ |
3446 | @@ -15795,7 +16462,6 @@ no_undefined_flag \ | 3448 | @@ -15702,7 +16369,6 @@ no_undefined_flag \ |
3447 | hardcode_libdir_flag_spec \ | 3449 | hardcode_libdir_flag_spec \ |
3448 | hardcode_libdir_flag_spec_ld \ | 3450 | hardcode_libdir_flag_spec_ld \ |
3449 | hardcode_libdir_separator \ | 3451 | hardcode_libdir_separator \ |
@@ -3451,7 +3453,7 @@ index 149815542f9..43952bde405 100755 | |||
3451 | exclude_expsyms \ | 3453 | exclude_expsyms \ |
3452 | include_expsyms \ | 3454 | include_expsyms \ |
3453 | file_list_spec \ | 3455 | file_list_spec \ |
3454 | @@ -15831,6 +16497,7 @@ module_cmds \ | 3456 | @@ -15738,6 +16404,7 @@ module_cmds \ |
3455 | module_expsym_cmds \ | 3457 | module_expsym_cmds \ |
3456 | export_symbols_cmds \ | 3458 | export_symbols_cmds \ |
3457 | prelink_cmds \ | 3459 | prelink_cmds \ |
@@ -3459,7 +3461,7 @@ index 149815542f9..43952bde405 100755 | |||
3459 | postinstall_cmds \ | 3461 | postinstall_cmds \ |
3460 | postuninstall_cmds \ | 3462 | postuninstall_cmds \ |
3461 | finish_cmds \ | 3463 | finish_cmds \ |
3462 | @@ -16596,7 +17263,8 @@ $as_echo X"$file" | | 3464 | @@ -16503,7 +17170,8 @@ $as_echo X"$file" | |
3463 | # NOTE: Changes made to this file will be lost: look at ltmain.sh. | 3465 | # NOTE: Changes made to this file will be lost: look at ltmain.sh. |
3464 | # | 3466 | # |
3465 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, | 3467 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, |
@@ -3469,7 +3471,7 @@ index 149815542f9..43952bde405 100755 | |||
3469 | # Written by Gordon Matzigkeit, 1996 | 3471 | # Written by Gordon Matzigkeit, 1996 |
3470 | # | 3472 | # |
3471 | # This file is part of GNU Libtool. | 3473 | # This file is part of GNU Libtool. |
3472 | @@ -16699,19 +17367,42 @@ SP2NL=$lt_lt_SP2NL | 3474 | @@ -16606,19 +17274,42 @@ SP2NL=$lt_lt_SP2NL |
3473 | # turn newlines into spaces. | 3475 | # turn newlines into spaces. |
3474 | NL2SP=$lt_lt_NL2SP | 3476 | NL2SP=$lt_lt_NL2SP |
3475 | 3477 | ||
@@ -3513,7 +3515,7 @@ index 149815542f9..43952bde405 100755 | |||
3513 | # A symbol stripping program. | 3515 | # A symbol stripping program. |
3514 | STRIP=$lt_STRIP | 3516 | STRIP=$lt_STRIP |
3515 | 3517 | ||
3516 | @@ -16741,6 +17432,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address | 3518 | @@ -16648,6 +17339,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address |
3517 | # Transform the output of nm in a C name address pair when lib prefix is needed. | 3519 | # Transform the output of nm in a C name address pair when lib prefix is needed. |
3518 | global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix | 3520 | global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix |
3519 | 3521 | ||
@@ -3526,7 +3528,7 @@ index 149815542f9..43952bde405 100755 | |||
3526 | # The name of the directory that contains temporary libtool files. | 3528 | # The name of the directory that contains temporary libtool files. |
3527 | objdir=$objdir | 3529 | objdir=$objdir |
3528 | 3530 | ||
3529 | @@ -16750,6 +17447,9 @@ MAGIC_CMD=$MAGIC_CMD | 3531 | @@ -16657,6 +17354,9 @@ MAGIC_CMD=$MAGIC_CMD |
3530 | # Must we lock files when doing compilation? | 3532 | # Must we lock files when doing compilation? |
3531 | need_locks=$lt_need_locks | 3533 | need_locks=$lt_need_locks |
3532 | 3534 | ||
@@ -3536,7 +3538,7 @@ index 149815542f9..43952bde405 100755 | |||
3536 | # Tool to manipulate archived DWARF debug symbol files on Mac OS X. | 3538 | # Tool to manipulate archived DWARF debug symbol files on Mac OS X. |
3537 | DSYMUTIL=$lt_DSYMUTIL | 3539 | DSYMUTIL=$lt_DSYMUTIL |
3538 | 3540 | ||
3539 | @@ -16864,12 +17564,12 @@ with_gcc=$GCC | 3541 | @@ -16771,12 +17471,12 @@ with_gcc=$GCC |
3540 | # Compiler flag to turn off builtin functions. | 3542 | # Compiler flag to turn off builtin functions. |
3541 | no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag | 3543 | no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag |
3542 | 3544 | ||
@@ -3552,7 +3554,7 @@ index 149815542f9..43952bde405 100755 | |||
3552 | # Compiler flag to prevent dynamic linking. | 3554 | # Compiler flag to prevent dynamic linking. |
3553 | link_static_flag=$lt_lt_prog_compiler_static | 3555 | link_static_flag=$lt_lt_prog_compiler_static |
3554 | 3556 | ||
3555 | @@ -16956,9 +17656,6 @@ inherit_rpath=$inherit_rpath | 3557 | @@ -16863,9 +17563,6 @@ inherit_rpath=$inherit_rpath |
3556 | # Whether libtool must link a program against all its dependency libraries. | 3558 | # Whether libtool must link a program against all its dependency libraries. |
3557 | link_all_deplibs=$link_all_deplibs | 3559 | link_all_deplibs=$link_all_deplibs |
3558 | 3560 | ||
@@ -3562,7 +3564,7 @@ index 149815542f9..43952bde405 100755 | |||
3562 | # Set to "yes" if exported symbols are required. | 3564 | # Set to "yes" if exported symbols are required. |
3563 | always_export_symbols=$always_export_symbols | 3565 | always_export_symbols=$always_export_symbols |
3564 | 3566 | ||
3565 | @@ -16974,6 +17671,9 @@ include_expsyms=$lt_include_expsyms | 3567 | @@ -16881,6 +17578,9 @@ include_expsyms=$lt_include_expsyms |
3566 | # Commands necessary for linking programs (against libraries) with templates. | 3568 | # Commands necessary for linking programs (against libraries) with templates. |
3567 | prelink_cmds=$lt_prelink_cmds | 3569 | prelink_cmds=$lt_prelink_cmds |
3568 | 3570 | ||
@@ -3572,7 +3574,7 @@ index 149815542f9..43952bde405 100755 | |||
3572 | # Specify filename containing input files. | 3574 | # Specify filename containing input files. |
3573 | file_list_spec=$lt_file_list_spec | 3575 | file_list_spec=$lt_file_list_spec |
3574 | 3576 | ||
3575 | @@ -17006,210 +17706,169 @@ ltmain="$ac_aux_dir/ltmain.sh" | 3577 | @@ -16913,210 +17613,169 @@ ltmain="$ac_aux_dir/ltmain.sh" |
3576 | # if finds mixed CR/LF and LF-only lines. Since sed operates in | 3578 | # if finds mixed CR/LF and LF-only lines. Since sed operates in |
3577 | # text mode, it properly converts lines to CR/LF. This bash problem | 3579 | # text mode, it properly converts lines to CR/LF. This bash problem |
3578 | # is reportedly fixed, but why not run on old versions too? | 3580 | # is reportedly fixed, but why not run on old versions too? |
@@ -3947,10 +3949,10 @@ index 149815542f9..43952bde405 100755 | |||
3947 | chmod +x "$ofile" | 3949 | chmod +x "$ofile" |
3948 | 3950 | ||
3949 | diff --git a/gas/Makefile.in b/gas/Makefile.in | 3951 | diff --git a/gas/Makefile.in b/gas/Makefile.in |
3950 | index c57d78f82c4..da370b21855 100644 | 3952 | index 8319181b472..3425e414c1c 100644 |
3951 | --- a/gas/Makefile.in | 3953 | --- a/gas/Makefile.in |
3952 | +++ b/gas/Makefile.in | 3954 | +++ b/gas/Makefile.in |
3953 | @@ -373,6 +373,7 @@ CYGPATH_W = @CYGPATH_W@ | 3955 | @@ -377,6 +377,7 @@ CYGPATH_W = @CYGPATH_W@ |
3954 | DATADIRNAME = @DATADIRNAME@ | 3956 | DATADIRNAME = @DATADIRNAME@ |
3955 | DEFS = @DEFS@ | 3957 | DEFS = @DEFS@ |
3956 | DEPDIR = @DEPDIR@ | 3958 | DEPDIR = @DEPDIR@ |
@@ -3958,7 +3960,7 @@ index c57d78f82c4..da370b21855 100644 | |||
3958 | DSYMUTIL = @DSYMUTIL@ | 3960 | DSYMUTIL = @DSYMUTIL@ |
3959 | DUMPBIN = @DUMPBIN@ | 3961 | DUMPBIN = @DUMPBIN@ |
3960 | ECHO_C = @ECHO_C@ | 3962 | ECHO_C = @ECHO_C@ |
3961 | @@ -409,6 +410,7 @@ LN_S = @LN_S@ | 3963 | @@ -413,6 +414,7 @@ LN_S = @LN_S@ |
3962 | LTLIBOBJS = @LTLIBOBJS@ | 3964 | LTLIBOBJS = @LTLIBOBJS@ |
3963 | MAINT = @MAINT@ | 3965 | MAINT = @MAINT@ |
3964 | MAKEINFO = @MAKEINFO@ | 3966 | MAKEINFO = @MAKEINFO@ |
@@ -3966,7 +3968,7 @@ index c57d78f82c4..da370b21855 100644 | |||
3966 | MKDIR_P = @MKDIR_P@ | 3968 | MKDIR_P = @MKDIR_P@ |
3967 | MKINSTALLDIRS = @MKINSTALLDIRS@ | 3969 | MKINSTALLDIRS = @MKINSTALLDIRS@ |
3968 | MSGFMT = @MSGFMT@ | 3970 | MSGFMT = @MSGFMT@ |
3969 | @@ -447,6 +449,7 @@ abs_builddir = @abs_builddir@ | 3971 | @@ -456,6 +458,7 @@ abs_builddir = @abs_builddir@ |
3970 | abs_srcdir = @abs_srcdir@ | 3972 | abs_srcdir = @abs_srcdir@ |
3971 | abs_top_builddir = @abs_top_builddir@ | 3973 | abs_top_builddir = @abs_top_builddir@ |
3972 | abs_top_srcdir = @abs_top_srcdir@ | 3974 | abs_top_srcdir = @abs_top_srcdir@ |
@@ -3975,10 +3977,10 @@ index c57d78f82c4..da370b21855 100644 | |||
3975 | ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ | 3977 | ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ |
3976 | am__include = @am__include@ | 3978 | am__include = @am__include@ |
3977 | diff --git a/gas/configure b/gas/configure | 3979 | diff --git a/gas/configure b/gas/configure |
3978 | index 12c16faefd9..11b5127bf3a 100755 | 3980 | index 684e68e0ea2..ba35172965e 100755 |
3979 | --- a/gas/configure | 3981 | --- a/gas/configure |
3980 | +++ b/gas/configure | 3982 | +++ b/gas/configure |
3981 | @@ -681,8 +681,11 @@ OTOOL | 3983 | @@ -686,8 +686,11 @@ OTOOL |
3982 | LIPO | 3984 | LIPO |
3983 | NMEDIT | 3985 | NMEDIT |
3984 | DSYMUTIL | 3986 | DSYMUTIL |
@@ -3990,7 +3992,7 @@ index 12c16faefd9..11b5127bf3a 100755 | |||
3990 | OBJDUMP | 3992 | OBJDUMP |
3991 | LN_S | 3993 | LN_S |
3992 | NM | 3994 | NM |
3993 | @@ -799,6 +802,7 @@ enable_static | 3995 | @@ -804,6 +807,7 @@ enable_static |
3994 | with_pic | 3996 | with_pic |
3995 | enable_fast_install | 3997 | enable_fast_install |
3996 | with_gnu_ld | 3998 | with_gnu_ld |
@@ -3998,7 +4000,7 @@ index 12c16faefd9..11b5127bf3a 100755 | |||
3998 | enable_libtool_lock | 4000 | enable_libtool_lock |
3999 | enable_plugins | 4001 | enable_plugins |
4000 | enable_largefile | 4002 | enable_largefile |
4001 | @@ -1490,6 +1494,8 @@ Optional Packages: | 4003 | @@ -1505,6 +1509,8 @@ Optional Packages: |
4002 | --with-pic try to use only PIC/non-PIC objects [default=use | 4004 | --with-pic try to use only PIC/non-PIC objects [default=use |
4003 | both] | 4005 | both] |
4004 | --with-gnu-ld assume the C compiler uses GNU ld [default=no] | 4006 | --with-gnu-ld assume the C compiler uses GNU ld [default=no] |
@@ -4007,7 +4009,7 @@ index 12c16faefd9..11b5127bf3a 100755 | |||
4007 | --with-cpu=CPU default cpu variant is CPU (currently only supported | 4009 | --with-cpu=CPU default cpu variant is CPU (currently only supported |
4008 | on ARC) | 4010 | on ARC) |
4009 | --with-system-zlib use installed libz | 4011 | --with-system-zlib use installed libz |
4010 | @@ -4608,8 +4614,8 @@ esac | 4012 | @@ -4632,8 +4638,8 @@ esac |
4011 | 4013 | ||
4012 | 4014 | ||
4013 | 4015 | ||
@@ -4018,7 +4020,7 @@ index 12c16faefd9..11b5127bf3a 100755 | |||
4018 | 4020 | ||
4019 | 4021 | ||
4020 | 4022 | ||
4021 | @@ -4649,7 +4655,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO | 4023 | @@ -4673,7 +4679,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO |
4022 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 | 4024 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 |
4023 | $as_echo_n "checking how to print strings... " >&6; } | 4025 | $as_echo_n "checking how to print strings... " >&6; } |
4024 | # Test print first, because it will be a builtin if present. | 4026 | # Test print first, because it will be a builtin if present. |
@@ -4027,7 +4029,7 @@ index 12c16faefd9..11b5127bf3a 100755 | |||
4027 | test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then | 4029 | test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then |
4028 | ECHO='print -r --' | 4030 | ECHO='print -r --' |
4029 | elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then | 4031 | elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then |
4030 | @@ -5342,8 +5348,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; | 4032 | @@ -5366,8 +5372,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; |
4031 | # Try some XSI features | 4033 | # Try some XSI features |
4032 | xsi_shell=no | 4034 | xsi_shell=no |
4033 | ( _lt_dummy="a/b/c" | 4035 | ( _lt_dummy="a/b/c" |
@@ -4038,7 +4040,7 @@ index 12c16faefd9..11b5127bf3a 100755 | |||
4038 | && eval 'test $(( 1 + 1 )) -eq 2 \ | 4040 | && eval 'test $(( 1 + 1 )) -eq 2 \ |
4039 | && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ | 4041 | && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ |
4040 | && xsi_shell=yes | 4042 | && xsi_shell=yes |
4041 | @@ -5392,6 +5398,80 @@ esac | 4043 | @@ -5416,6 +5422,80 @@ esac |
4042 | 4044 | ||
4043 | 4045 | ||
4044 | 4046 | ||
@@ -4119,7 +4121,7 @@ index 12c16faefd9..11b5127bf3a 100755 | |||
4119 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 | 4121 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 |
4120 | $as_echo_n "checking for $LD option to reload object files... " >&6; } | 4122 | $as_echo_n "checking for $LD option to reload object files... " >&6; } |
4121 | if ${lt_cv_ld_reload_flag+:} false; then : | 4123 | if ${lt_cv_ld_reload_flag+:} false; then : |
4122 | @@ -5408,6 +5488,11 @@ case $reload_flag in | 4124 | @@ -5432,6 +5512,11 @@ case $reload_flag in |
4123 | esac | 4125 | esac |
4124 | reload_cmds='$LD$reload_flag -o $output$reload_objs' | 4126 | reload_cmds='$LD$reload_flag -o $output$reload_objs' |
4125 | case $host_os in | 4127 | case $host_os in |
@@ -4131,7 +4133,7 @@ index 12c16faefd9..11b5127bf3a 100755 | |||
4131 | darwin*) | 4133 | darwin*) |
4132 | if test "$GCC" = yes; then | 4134 | if test "$GCC" = yes; then |
4133 | reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' | 4135 | reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' |
4134 | @@ -5576,7 +5661,8 @@ mingw* | pw32*) | 4136 | @@ -5600,7 +5685,8 @@ mingw* | pw32*) |
4135 | lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' | 4137 | lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' |
4136 | lt_cv_file_magic_cmd='func_win32_libid' | 4138 | lt_cv_file_magic_cmd='func_win32_libid' |
4137 | else | 4139 | else |
@@ -4141,7 +4143,7 @@ index 12c16faefd9..11b5127bf3a 100755 | |||
4141 | lt_cv_file_magic_cmd='$OBJDUMP -f' | 4143 | lt_cv_file_magic_cmd='$OBJDUMP -f' |
4142 | fi | 4144 | fi |
4143 | ;; | 4145 | ;; |
4144 | @@ -5730,6 +5816,21 @@ esac | 4146 | @@ -5754,6 +5840,21 @@ esac |
4145 | fi | 4147 | fi |
4146 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 | 4148 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 |
4147 | $as_echo "$lt_cv_deplibs_check_method" >&6; } | 4149 | $as_echo "$lt_cv_deplibs_check_method" >&6; } |
@@ -4163,7 +4165,7 @@ index 12c16faefd9..11b5127bf3a 100755 | |||
4163 | file_magic_cmd=$lt_cv_file_magic_cmd | 4165 | file_magic_cmd=$lt_cv_file_magic_cmd |
4164 | deplibs_check_method=$lt_cv_deplibs_check_method | 4166 | deplibs_check_method=$lt_cv_deplibs_check_method |
4165 | test -z "$deplibs_check_method" && deplibs_check_method=unknown | 4167 | test -z "$deplibs_check_method" && deplibs_check_method=unknown |
4166 | @@ -5745,6 +5846,157 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown | 4168 | @@ -5769,6 +5870,157 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown |
4167 | 4169 | ||
4168 | 4170 | ||
4169 | 4171 | ||
@@ -4321,7 +4323,7 @@ index 12c16faefd9..11b5127bf3a 100755 | |||
4321 | plugin_option= | 4323 | plugin_option= |
4322 | plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll" | 4324 | plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll" |
4323 | for plugin in $plugin_names; do | 4325 | for plugin in $plugin_names; do |
4324 | @@ -5759,8 +6011,10 @@ for plugin in $plugin_names; do | 4326 | @@ -5783,8 +6035,10 @@ for plugin in $plugin_names; do |
4325 | done | 4327 | done |
4326 | 4328 | ||
4327 | if test -n "$ac_tool_prefix"; then | 4329 | if test -n "$ac_tool_prefix"; then |
@@ -4334,7 +4336,7 @@ index 12c16faefd9..11b5127bf3a 100755 | |||
4334 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | 4336 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
4335 | $as_echo_n "checking for $ac_word... " >&6; } | 4337 | $as_echo_n "checking for $ac_word... " >&6; } |
4336 | if ${ac_cv_prog_AR+:} false; then : | 4338 | if ${ac_cv_prog_AR+:} false; then : |
4337 | @@ -5776,7 +6030,7 @@ do | 4339 | @@ -5800,7 +6054,7 @@ do |
4338 | test -z "$as_dir" && as_dir=. | 4340 | test -z "$as_dir" && as_dir=. |
4339 | for ac_exec_ext in '' $ac_executable_extensions; do | 4341 | for ac_exec_ext in '' $ac_executable_extensions; do |
4340 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | 4342 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
@@ -4343,7 +4345,7 @@ index 12c16faefd9..11b5127bf3a 100755 | |||
4343 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | 4345 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
4344 | break 2 | 4346 | break 2 |
4345 | fi | 4347 | fi |
4346 | @@ -5796,11 +6050,15 @@ $as_echo "no" >&6; } | 4348 | @@ -5820,11 +6074,15 @@ $as_echo "no" >&6; } |
4347 | fi | 4349 | fi |
4348 | 4350 | ||
4349 | 4351 | ||
@@ -4362,7 +4364,7 @@ index 12c16faefd9..11b5127bf3a 100755 | |||
4362 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | 4364 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
4363 | $as_echo_n "checking for $ac_word... " >&6; } | 4365 | $as_echo_n "checking for $ac_word... " >&6; } |
4364 | if ${ac_cv_prog_ac_ct_AR+:} false; then : | 4366 | if ${ac_cv_prog_ac_ct_AR+:} false; then : |
4365 | @@ -5816,7 +6074,7 @@ do | 4367 | @@ -5840,7 +6098,7 @@ do |
4366 | test -z "$as_dir" && as_dir=. | 4368 | test -z "$as_dir" && as_dir=. |
4367 | for ac_exec_ext in '' $ac_executable_extensions; do | 4369 | for ac_exec_ext in '' $ac_executable_extensions; do |
4368 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | 4370 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
@@ -4371,7 +4373,7 @@ index 12c16faefd9..11b5127bf3a 100755 | |||
4371 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | 4373 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
4372 | break 2 | 4374 | break 2 |
4373 | fi | 4375 | fi |
4374 | @@ -5835,6 +6093,10 @@ else | 4376 | @@ -5859,6 +6117,10 @@ else |
4375 | $as_echo "no" >&6; } | 4377 | $as_echo "no" >&6; } |
4376 | fi | 4378 | fi |
4377 | 4379 | ||
@@ -4382,7 +4384,7 @@ index 12c16faefd9..11b5127bf3a 100755 | |||
4382 | if test "x$ac_ct_AR" = x; then | 4384 | if test "x$ac_ct_AR" = x; then |
4383 | AR="false" | 4385 | AR="false" |
4384 | else | 4386 | else |
4385 | @@ -5846,29 +6108,81 @@ ac_tool_warned=yes ;; | 4387 | @@ -5870,29 +6132,81 @@ ac_tool_warned=yes ;; |
4386 | esac | 4388 | esac |
4387 | AR=$ac_ct_AR | 4389 | AR=$ac_ct_AR |
4388 | fi | 4390 | fi |
@@ -4479,7 +4481,7 @@ index 12c16faefd9..11b5127bf3a 100755 | |||
4479 | 4481 | ||
4480 | 4482 | ||
4481 | 4483 | ||
4482 | @@ -6215,8 +6529,8 @@ esac | 4484 | @@ -6239,8 +6553,8 @@ esac |
4483 | lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" | 4485 | lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" |
4484 | 4486 | ||
4485 | # Transform an extracted symbol line into symbol name and symbol address | 4487 | # Transform an extracted symbol line into symbol name and symbol address |
@@ -4490,7 +4492,7 @@ index 12c16faefd9..11b5127bf3a 100755 | |||
4490 | 4492 | ||
4491 | # Handle CRLF in mingw tool chain | 4493 | # Handle CRLF in mingw tool chain |
4492 | opt_cr= | 4494 | opt_cr= |
4493 | @@ -6252,6 +6566,7 @@ for ac_symprfx in "" "_"; do | 4495 | @@ -6276,6 +6590,7 @@ for ac_symprfx in "" "_"; do |
4494 | else | 4496 | else |
4495 | lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" | 4497 | lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" |
4496 | fi | 4498 | fi |
@@ -4498,7 +4500,7 @@ index 12c16faefd9..11b5127bf3a 100755 | |||
4498 | 4500 | ||
4499 | # Check to see that the pipe works correctly. | 4501 | # Check to see that the pipe works correctly. |
4500 | pipe_works=no | 4502 | pipe_works=no |
4501 | @@ -6293,6 +6608,18 @@ _LT_EOF | 4503 | @@ -6317,6 +6632,18 @@ _LT_EOF |
4502 | if $GREP ' nm_test_var$' "$nlist" >/dev/null; then | 4504 | if $GREP ' nm_test_var$' "$nlist" >/dev/null; then |
4503 | if $GREP ' nm_test_func$' "$nlist" >/dev/null; then | 4505 | if $GREP ' nm_test_func$' "$nlist" >/dev/null; then |
4504 | cat <<_LT_EOF > conftest.$ac_ext | 4506 | cat <<_LT_EOF > conftest.$ac_ext |
@@ -4517,7 +4519,7 @@ index 12c16faefd9..11b5127bf3a 100755 | |||
4517 | #ifdef __cplusplus | 4519 | #ifdef __cplusplus |
4518 | extern "C" { | 4520 | extern "C" { |
4519 | #endif | 4521 | #endif |
4520 | @@ -6304,7 +6631,7 @@ _LT_EOF | 4522 | @@ -6328,7 +6655,7 @@ _LT_EOF |
4521 | cat <<_LT_EOF >> conftest.$ac_ext | 4523 | cat <<_LT_EOF >> conftest.$ac_ext |
4522 | 4524 | ||
4523 | /* The mapping between symbol names and symbols. */ | 4525 | /* The mapping between symbol names and symbols. */ |
@@ -4526,7 +4528,7 @@ index 12c16faefd9..11b5127bf3a 100755 | |||
4526 | const char *name; | 4528 | const char *name; |
4527 | void *address; | 4529 | void *address; |
4528 | } | 4530 | } |
4529 | @@ -6330,8 +6657,8 @@ static const void *lt_preloaded_setup() { | 4531 | @@ -6354,8 +6681,8 @@ static const void *lt_preloaded_setup() { |
4530 | _LT_EOF | 4532 | _LT_EOF |
4531 | # Now try linking the two files. | 4533 | # Now try linking the two files. |
4532 | mv conftest.$ac_objext conftstm.$ac_objext | 4534 | mv conftest.$ac_objext conftstm.$ac_objext |
@@ -4537,7 +4539,7 @@ index 12c16faefd9..11b5127bf3a 100755 | |||
4537 | LIBS="conftstm.$ac_objext" | 4539 | LIBS="conftstm.$ac_objext" |
4538 | CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" | 4540 | CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" |
4539 | if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 | 4541 | if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 |
4540 | @@ -6341,8 +6668,8 @@ _LT_EOF | 4542 | @@ -6365,8 +6692,8 @@ _LT_EOF |
4541 | test $ac_status = 0; } && test -s conftest${ac_exeext}; then | 4543 | test $ac_status = 0; } && test -s conftest${ac_exeext}; then |
4542 | pipe_works=yes | 4544 | pipe_works=yes |
4543 | fi | 4545 | fi |
@@ -4548,7 +4550,7 @@ index 12c16faefd9..11b5127bf3a 100755 | |||
4548 | else | 4550 | else |
4549 | echo "cannot find nm_test_func in $nlist" >&5 | 4551 | echo "cannot find nm_test_func in $nlist" >&5 |
4550 | fi | 4552 | fi |
4551 | @@ -6379,6 +6706,19 @@ else | 4553 | @@ -6403,6 +6730,19 @@ else |
4552 | $as_echo "ok" >&6; } | 4554 | $as_echo "ok" >&6; } |
4553 | fi | 4555 | fi |
4554 | 4556 | ||
@@ -4568,7 +4570,7 @@ index 12c16faefd9..11b5127bf3a 100755 | |||
4568 | 4570 | ||
4569 | 4571 | ||
4570 | 4572 | ||
4571 | @@ -6395,6 +6735,42 @@ fi | 4573 | @@ -6419,6 +6759,42 @@ fi |
4572 | 4574 | ||
4573 | 4575 | ||
4574 | 4576 | ||
@@ -4611,7 +4613,7 @@ index 12c16faefd9..11b5127bf3a 100755 | |||
4611 | 4613 | ||
4612 | 4614 | ||
4613 | 4615 | ||
4614 | @@ -6606,6 +6982,123 @@ esac | 4616 | @@ -6630,6 +7006,123 @@ esac |
4615 | 4617 | ||
4616 | need_locks="$enable_libtool_lock" | 4618 | need_locks="$enable_libtool_lock" |
4617 | 4619 | ||
@@ -4735,7 +4737,7 @@ index 12c16faefd9..11b5127bf3a 100755 | |||
4735 | 4737 | ||
4736 | case $host_os in | 4738 | case $host_os in |
4737 | rhapsody* | darwin*) | 4739 | rhapsody* | darwin*) |
4738 | @@ -7169,6 +7662,8 @@ _LT_EOF | 4740 | @@ -7193,6 +7686,8 @@ _LT_EOF |
4739 | $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 | 4741 | $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 |
4740 | echo "$AR cru libconftest.a conftest.o" >&5 | 4742 | echo "$AR cru libconftest.a conftest.o" >&5 |
4741 | $AR cru libconftest.a conftest.o 2>&5 | 4743 | $AR cru libconftest.a conftest.o 2>&5 |
@@ -4744,7 +4746,7 @@ index 12c16faefd9..11b5127bf3a 100755 | |||
4744 | cat > conftest.c << _LT_EOF | 4746 | cat > conftest.c << _LT_EOF |
4745 | int main() { return 0;} | 4747 | int main() { return 0;} |
4746 | _LT_EOF | 4748 | _LT_EOF |
4747 | @@ -7751,8 +8246,6 @@ fi | 4749 | @@ -7775,8 +8270,6 @@ fi |
4748 | lt_prog_compiler_pic= | 4750 | lt_prog_compiler_pic= |
4749 | lt_prog_compiler_static= | 4751 | lt_prog_compiler_static= |
4750 | 4752 | ||
@@ -4753,7 +4755,7 @@ index 12c16faefd9..11b5127bf3a 100755 | |||
4753 | 4755 | ||
4754 | if test "$GCC" = yes; then | 4756 | if test "$GCC" = yes; then |
4755 | lt_prog_compiler_wl='-Wl,' | 4757 | lt_prog_compiler_wl='-Wl,' |
4756 | @@ -7918,6 +8411,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } | 4758 | @@ -7942,6 +8435,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } |
4757 | lt_prog_compiler_pic='--shared' | 4759 | lt_prog_compiler_pic='--shared' |
4758 | lt_prog_compiler_static='--static' | 4760 | lt_prog_compiler_static='--static' |
4759 | ;; | 4761 | ;; |
@@ -4766,7 +4768,7 @@ index 12c16faefd9..11b5127bf3a 100755 | |||
4766 | pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) | 4768 | pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) |
4767 | # Portland Group compilers (*not* the Pentium gcc compiler, | 4769 | # Portland Group compilers (*not* the Pentium gcc compiler, |
4768 | # which looks to be a dead project) | 4770 | # which looks to be a dead project) |
4769 | @@ -7980,7 +8479,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } | 4771 | @@ -8004,7 +8503,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } |
4770 | lt_prog_compiler_pic='-KPIC' | 4772 | lt_prog_compiler_pic='-KPIC' |
4771 | lt_prog_compiler_static='-Bstatic' | 4773 | lt_prog_compiler_static='-Bstatic' |
4772 | case $cc_basename in | 4774 | case $cc_basename in |
@@ -4775,7 +4777,7 @@ index 12c16faefd9..11b5127bf3a 100755 | |||
4775 | lt_prog_compiler_wl='-Qoption ld ';; | 4777 | lt_prog_compiler_wl='-Qoption ld ';; |
4776 | *) | 4778 | *) |
4777 | lt_prog_compiler_wl='-Wl,';; | 4779 | lt_prog_compiler_wl='-Wl,';; |
4778 | @@ -8037,13 +8536,17 @@ case $host_os in | 4780 | @@ -8061,13 +8560,17 @@ case $host_os in |
4779 | lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" | 4781 | lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" |
4780 | ;; | 4782 | ;; |
4781 | esac | 4783 | esac |
@@ -4799,7 +4801,7 @@ index 12c16faefd9..11b5127bf3a 100755 | |||
4799 | 4801 | ||
4800 | # | 4802 | # |
4801 | # Check to make sure the PIC flag actually works. | 4803 | # Check to make sure the PIC flag actually works. |
4802 | @@ -8104,6 +8607,11 @@ fi | 4804 | @@ -8128,6 +8631,11 @@ fi |
4803 | 4805 | ||
4804 | 4806 | ||
4805 | 4807 | ||
@@ -4811,7 +4813,7 @@ index 12c16faefd9..11b5127bf3a 100755 | |||
4811 | # | 4813 | # |
4812 | # Check to make sure the static flag actually works. | 4814 | # Check to make sure the static flag actually works. |
4813 | # | 4815 | # |
4814 | @@ -8454,7 +8962,8 @@ _LT_EOF | 4816 | @@ -8478,7 +8986,8 @@ _LT_EOF |
4815 | allow_undefined_flag=unsupported | 4817 | allow_undefined_flag=unsupported |
4816 | always_export_symbols=no | 4818 | always_export_symbols=no |
4817 | enable_shared_with_static_runtimes=yes | 4819 | enable_shared_with_static_runtimes=yes |
@@ -4821,7 +4823,7 @@ index 12c16faefd9..11b5127bf3a 100755 | |||
4821 | 4823 | ||
4822 | if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then | 4824 | if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then |
4823 | archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' | 4825 | archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' |
4824 | @@ -8553,12 +9062,12 @@ _LT_EOF | 4826 | @@ -8577,12 +9086,12 @@ _LT_EOF |
4825 | whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' | 4827 | whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' |
4826 | hardcode_libdir_flag_spec= | 4828 | hardcode_libdir_flag_spec= |
4827 | hardcode_libdir_flag_spec_ld='-rpath $libdir' | 4829 | hardcode_libdir_flag_spec_ld='-rpath $libdir' |
@@ -4836,7 +4838,7 @@ index 12c16faefd9..11b5127bf3a 100755 | |||
4836 | fi | 4838 | fi |
4837 | ;; | 4839 | ;; |
4838 | esac | 4840 | esac |
4839 | @@ -8572,8 +9081,8 @@ _LT_EOF | 4841 | @@ -8596,8 +9105,8 @@ _LT_EOF |
4840 | archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' | 4842 | archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' |
4841 | wlarc= | 4843 | wlarc= |
4842 | else | 4844 | else |
@@ -4847,7 +4849,7 @@ index 12c16faefd9..11b5127bf3a 100755 | |||
4847 | fi | 4849 | fi |
4848 | ;; | 4850 | ;; |
4849 | 4851 | ||
4850 | @@ -8591,8 +9100,8 @@ _LT_EOF | 4852 | @@ -8615,8 +9124,8 @@ _LT_EOF |
4851 | 4853 | ||
4852 | _LT_EOF | 4854 | _LT_EOF |
4853 | elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then | 4855 | elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then |
@@ -4858,7 +4860,7 @@ index 12c16faefd9..11b5127bf3a 100755 | |||
4858 | else | 4860 | else |
4859 | ld_shlibs=no | 4861 | ld_shlibs=no |
4860 | fi | 4862 | fi |
4861 | @@ -8638,8 +9147,8 @@ _LT_EOF | 4863 | @@ -8662,8 +9171,8 @@ _LT_EOF |
4862 | 4864 | ||
4863 | *) | 4865 | *) |
4864 | if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then | 4866 | if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then |
@@ -4869,7 +4871,7 @@ index 12c16faefd9..11b5127bf3a 100755 | |||
4869 | else | 4871 | else |
4870 | ld_shlibs=no | 4872 | ld_shlibs=no |
4871 | fi | 4873 | fi |
4872 | @@ -8769,7 +9278,13 @@ _LT_EOF | 4874 | @@ -8793,7 +9302,13 @@ _LT_EOF |
4873 | allow_undefined_flag='-berok' | 4875 | allow_undefined_flag='-berok' |
4874 | # Determine the default libpath from the value encoded in an | 4876 | # Determine the default libpath from the value encoded in an |
4875 | # empty executable. | 4877 | # empty executable. |
@@ -4884,7 +4886,7 @@ index 12c16faefd9..11b5127bf3a 100755 | |||
4884 | /* end confdefs.h. */ | 4886 | /* end confdefs.h. */ |
4885 | 4887 | ||
4886 | int | 4888 | int |
4887 | @@ -8782,22 +9297,29 @@ main () | 4889 | @@ -8806,22 +9321,29 @@ main () |
4888 | _ACEOF | 4890 | _ACEOF |
4889 | if ac_fn_c_try_link "$LINENO"; then : | 4891 | if ac_fn_c_try_link "$LINENO"; then : |
4890 | 4892 | ||
@@ -4927,7 +4929,7 @@ index 12c16faefd9..11b5127bf3a 100755 | |||
4927 | 4929 | ||
4928 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" | 4930 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" |
4929 | archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" | 4931 | 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" |
4930 | @@ -8809,7 +9331,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | 4932 | @@ -8833,7 +9355,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
4931 | else | 4933 | else |
4932 | # Determine the default libpath from the value encoded in an | 4934 | # Determine the default libpath from the value encoded in an |
4933 | # empty executable. | 4935 | # empty executable. |
@@ -4942,7 +4944,7 @@ index 12c16faefd9..11b5127bf3a 100755 | |||
4942 | /* end confdefs.h. */ | 4944 | /* end confdefs.h. */ |
4943 | 4945 | ||
4944 | int | 4946 | int |
4945 | @@ -8822,22 +9350,29 @@ main () | 4947 | @@ -8846,22 +9374,29 @@ main () |
4946 | _ACEOF | 4948 | _ACEOF |
4947 | if ac_fn_c_try_link "$LINENO"; then : | 4949 | if ac_fn_c_try_link "$LINENO"; then : |
4948 | 4950 | ||
@@ -4985,7 +4987,7 @@ index 12c16faefd9..11b5127bf3a 100755 | |||
4985 | 4987 | ||
4986 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" | 4988 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" |
4987 | # Warning - without using the other run time loading flags, | 4989 | # Warning - without using the other run time loading flags, |
4988 | @@ -8882,20 +9417,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | 4990 | @@ -8906,20 +9441,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
4989 | # Microsoft Visual C++. | 4991 | # Microsoft Visual C++. |
4990 | # hardcode_libdir_flag_spec is actually meaningless, as there is | 4992 | # hardcode_libdir_flag_spec is actually meaningless, as there is |
4991 | # no search path for DLLs. | 4993 | # no search path for DLLs. |
@@ -5063,7 +5065,7 @@ index 12c16faefd9..11b5127bf3a 100755 | |||
5063 | ;; | 5065 | ;; |
5064 | 5066 | ||
5065 | darwin* | rhapsody*) | 5067 | darwin* | rhapsody*) |
5066 | @@ -8956,7 +9534,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | 5068 | @@ -8980,7 +9558,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
5067 | 5069 | ||
5068 | # FreeBSD 3 and greater uses gcc -shared to do shared libraries. | 5070 | # FreeBSD 3 and greater uses gcc -shared to do shared libraries. |
5069 | freebsd* | dragonfly*) | 5071 | freebsd* | dragonfly*) |
@@ -5072,7 +5074,7 @@ index 12c16faefd9..11b5127bf3a 100755 | |||
5072 | hardcode_libdir_flag_spec='-R$libdir' | 5074 | hardcode_libdir_flag_spec='-R$libdir' |
5073 | hardcode_direct=yes | 5075 | hardcode_direct=yes |
5074 | hardcode_shlibpath_var=no | 5076 | hardcode_shlibpath_var=no |
5075 | @@ -8964,7 +9542,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | 5077 | @@ -8988,7 +9566,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
5076 | 5078 | ||
5077 | hpux9*) | 5079 | hpux9*) |
5078 | if test "$GCC" = yes; then | 5080 | if test "$GCC" = yes; then |
@@ -5081,7 +5083,7 @@ index 12c16faefd9..11b5127bf3a 100755 | |||
5081 | else | 5083 | else |
5082 | archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' | 5084 | 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' |
5083 | fi | 5085 | fi |
5084 | @@ -8980,7 +9558,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | 5086 | @@ -9004,7 +9582,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
5085 | 5087 | ||
5086 | hpux10*) | 5088 | hpux10*) |
5087 | if test "$GCC" = yes && test "$with_gnu_ld" = no; then | 5089 | if test "$GCC" = yes && test "$with_gnu_ld" = no; then |
@@ -5090,7 +5092,7 @@ index 12c16faefd9..11b5127bf3a 100755 | |||
5090 | else | 5092 | else |
5091 | archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' | 5093 | archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' |
5092 | fi | 5094 | fi |
5093 | @@ -9004,10 +9582,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | 5095 | @@ -9028,10 +9606,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
5094 | archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' | 5096 | archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' |
5095 | ;; | 5097 | ;; |
5096 | ia64*) | 5098 | ia64*) |
@@ -5103,7 +5105,7 @@ index 12c16faefd9..11b5127bf3a 100755 | |||
5103 | ;; | 5105 | ;; |
5104 | esac | 5106 | esac |
5105 | else | 5107 | else |
5106 | @@ -9086,23 +9664,36 @@ fi | 5108 | @@ -9110,23 +9688,36 @@ fi |
5107 | 5109 | ||
5108 | irix5* | irix6* | nonstopux*) | 5110 | irix5* | irix6* | nonstopux*) |
5109 | if test "$GCC" = yes; then | 5111 | if test "$GCC" = yes; then |
@@ -5148,7 +5150,7 @@ index 12c16faefd9..11b5127bf3a 100755 | |||
5148 | else | 5150 | else |
5149 | archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' | 5151 | 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' |
5150 | archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' | 5152 | 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' |
5151 | @@ -9187,7 +9778,7 @@ rm -f core conftest.err conftest.$ac_objext \ | 5153 | @@ -9211,7 +9802,7 @@ rm -f core conftest.err conftest.$ac_objext \ |
5152 | osf4* | osf5*) # as osf3* with the addition of -msym flag | 5154 | osf4* | osf5*) # as osf3* with the addition of -msym flag |
5153 | if test "$GCC" = yes; then | 5155 | if test "$GCC" = yes; then |
5154 | allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' | 5156 | allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' |
@@ -5157,7 +5159,7 @@ index 12c16faefd9..11b5127bf3a 100755 | |||
5157 | hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' | 5159 | hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' |
5158 | else | 5160 | else |
5159 | allow_undefined_flag=' -expect_unresolved \*' | 5161 | allow_undefined_flag=' -expect_unresolved \*' |
5160 | @@ -9206,9 +9797,9 @@ rm -f core conftest.err conftest.$ac_objext \ | 5162 | @@ -9230,9 +9821,9 @@ rm -f core conftest.err conftest.$ac_objext \ |
5161 | no_undefined_flag=' -z defs' | 5163 | no_undefined_flag=' -z defs' |
5162 | if test "$GCC" = yes; then | 5164 | if test "$GCC" = yes; then |
5163 | wlarc='${wl}' | 5165 | wlarc='${wl}' |
@@ -5169,7 +5171,7 @@ index 12c16faefd9..11b5127bf3a 100755 | |||
5169 | else | 5171 | else |
5170 | case `$CC -V 2>&1` in | 5172 | case `$CC -V 2>&1` in |
5171 | *"Compilers 5.0"*) | 5173 | *"Compilers 5.0"*) |
5172 | @@ -9784,8 +10375,9 @@ cygwin* | mingw* | pw32* | cegcc*) | 5174 | @@ -9808,8 +10399,9 @@ cygwin* | mingw* | pw32* | cegcc*) |
5173 | need_version=no | 5175 | need_version=no |
5174 | need_lib_prefix=no | 5176 | need_lib_prefix=no |
5175 | 5177 | ||
@@ -5181,7 +5183,7 @@ index 12c16faefd9..11b5127bf3a 100755 | |||
5181 | library_names_spec='$libname.dll.a' | 5183 | library_names_spec='$libname.dll.a' |
5182 | # DLL is installed to $(libdir)/../bin by postinstall_cmds | 5184 | # DLL is installed to $(libdir)/../bin by postinstall_cmds |
5183 | postinstall_cmds='base_file=`basename \${file}`~ | 5185 | postinstall_cmds='base_file=`basename \${file}`~ |
5184 | @@ -9818,13 +10410,71 @@ cygwin* | mingw* | pw32* | cegcc*) | 5186 | @@ -9842,13 +10434,71 @@ cygwin* | mingw* | pw32* | cegcc*) |
5185 | library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' | 5187 | library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' |
5186 | ;; | 5188 | ;; |
5187 | esac | 5189 | esac |
@@ -5254,16 +5256,16 @@ index 12c16faefd9..11b5127bf3a 100755 | |||
5254 | # FIXME: first we should search . and the directory the executable is in | 5256 | # FIXME: first we should search . and the directory the executable is in |
5255 | shlibpath_var=PATH | 5257 | shlibpath_var=PATH |
5256 | ;; | 5258 | ;; |
5257 | @@ -10702,7 +11352,7 @@ else | 5259 | @@ -10726,7 +11376,7 @@ else |
5258 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 | 5260 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 |
5259 | lt_status=$lt_dlunknown | 5261 | lt_status=$lt_dlunknown |
5260 | cat > conftest.$ac_ext <<_LT_EOF | 5262 | cat > conftest.$ac_ext <<_LT_EOF |
5261 | -#line 10705 "configure" | 5263 | -#line 10729 "configure" |
5262 | +#line $LINENO "configure" | 5264 | +#line $LINENO "configure" |
5263 | #include "confdefs.h" | 5265 | #include "confdefs.h" |
5264 | 5266 | ||
5265 | #if HAVE_DLFCN_H | 5267 | #if HAVE_DLFCN_H |
5266 | @@ -10746,10 +11396,10 @@ else | 5268 | @@ -10770,10 +11420,10 @@ else |
5267 | /* When -fvisbility=hidden is used, assume the code has been annotated | 5269 | /* When -fvisbility=hidden is used, assume the code has been annotated |
5268 | correspondingly for the symbols needed. */ | 5270 | correspondingly for the symbols needed. */ |
5269 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) | 5271 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) |
@@ -5276,16 +5278,16 @@ index 12c16faefd9..11b5127bf3a 100755 | |||
5276 | int main () | 5278 | int main () |
5277 | { | 5279 | { |
5278 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); | 5280 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); |
5279 | @@ -10808,7 +11458,7 @@ else | 5281 | @@ -10832,7 +11482,7 @@ else |
5280 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 | 5282 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 |
5281 | lt_status=$lt_dlunknown | 5283 | lt_status=$lt_dlunknown |
5282 | cat > conftest.$ac_ext <<_LT_EOF | 5284 | cat > conftest.$ac_ext <<_LT_EOF |
5283 | -#line 10811 "configure" | 5285 | -#line 10835 "configure" |
5284 | +#line $LINENO "configure" | 5286 | +#line $LINENO "configure" |
5285 | #include "confdefs.h" | 5287 | #include "confdefs.h" |
5286 | 5288 | ||
5287 | #if HAVE_DLFCN_H | 5289 | #if HAVE_DLFCN_H |
5288 | @@ -10852,10 +11502,10 @@ else | 5290 | @@ -10876,10 +11526,10 @@ else |
5289 | /* When -fvisbility=hidden is used, assume the code has been annotated | 5291 | /* When -fvisbility=hidden is used, assume the code has been annotated |
5290 | correspondingly for the symbols needed. */ | 5292 | correspondingly for the symbols needed. */ |
5291 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) | 5293 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) |
@@ -5298,7 +5300,7 @@ index 12c16faefd9..11b5127bf3a 100755 | |||
5298 | int main () | 5300 | int main () |
5299 | { | 5301 | { |
5300 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); | 5302 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); |
5301 | @@ -14834,13 +15484,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' | 5303 | @@ -15133,13 +15783,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' |
5302 | lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' | 5304 | lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' |
5303 | lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' | 5305 | lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' |
5304 | lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' | 5306 | lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' |
@@ -5319,7 +5321,7 @@ index 12c16faefd9..11b5127bf3a 100755 | |||
5319 | STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' | 5321 | STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' |
5320 | RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' | 5322 | RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' |
5321 | old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' | 5323 | old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' |
5322 | @@ -14855,14 +15512,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de | 5324 | @@ -15154,14 +15811,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de |
5323 | 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_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' |
5324 | lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' | 5326 | lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' |
5325 | lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`' | 5327 | 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"`' |
@@ -5338,7 +5340,7 @@ index 12c16faefd9..11b5127bf3a 100755 | |||
5338 | DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' | 5340 | DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' |
5339 | NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' | 5341 | NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' |
5340 | LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' | 5342 | LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' |
5341 | @@ -14895,12 +15555,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q | 5343 | @@ -15194,12 +15854,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q |
5342 | hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' | 5344 | hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' |
5343 | inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' | 5345 | inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' |
5344 | link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' | 5346 | link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' |
@@ -5352,7 +5354,7 @@ index 12c16faefd9..11b5127bf3a 100755 | |||
5352 | file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' | 5354 | file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' |
5353 | variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' | 5355 | variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' |
5354 | need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' | 5356 | need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' |
5355 | @@ -14955,8 +15615,13 @@ reload_flag \ | 5357 | @@ -15254,8 +15914,13 @@ reload_flag \ |
5356 | OBJDUMP \ | 5358 | OBJDUMP \ |
5357 | deplibs_check_method \ | 5359 | deplibs_check_method \ |
5358 | file_magic_cmd \ | 5360 | file_magic_cmd \ |
@@ -5366,7 +5368,7 @@ index 12c16faefd9..11b5127bf3a 100755 | |||
5366 | STRIP \ | 5368 | STRIP \ |
5367 | RANLIB \ | 5369 | RANLIB \ |
5368 | CC \ | 5370 | CC \ |
5369 | @@ -14966,12 +15631,14 @@ lt_cv_sys_global_symbol_pipe \ | 5371 | @@ -15265,12 +15930,14 @@ lt_cv_sys_global_symbol_pipe \ |
5370 | lt_cv_sys_global_symbol_to_cdecl \ | 5372 | lt_cv_sys_global_symbol_to_cdecl \ |
5371 | lt_cv_sys_global_symbol_to_c_name_address \ | 5373 | lt_cv_sys_global_symbol_to_c_name_address \ |
5372 | lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ | 5374 | lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ |
@@ -5382,7 +5384,7 @@ index 12c16faefd9..11b5127bf3a 100755 | |||
5382 | DSYMUTIL \ | 5384 | DSYMUTIL \ |
5383 | NMEDIT \ | 5385 | NMEDIT \ |
5384 | LIPO \ | 5386 | LIPO \ |
5385 | @@ -14987,7 +15654,6 @@ no_undefined_flag \ | 5387 | @@ -15286,7 +15953,6 @@ no_undefined_flag \ |
5386 | hardcode_libdir_flag_spec \ | 5388 | hardcode_libdir_flag_spec \ |
5387 | hardcode_libdir_flag_spec_ld \ | 5389 | hardcode_libdir_flag_spec_ld \ |
5388 | hardcode_libdir_separator \ | 5390 | hardcode_libdir_separator \ |
@@ -5390,7 +5392,7 @@ index 12c16faefd9..11b5127bf3a 100755 | |||
5390 | exclude_expsyms \ | 5392 | exclude_expsyms \ |
5391 | include_expsyms \ | 5393 | include_expsyms \ |
5392 | file_list_spec \ | 5394 | file_list_spec \ |
5393 | @@ -15023,6 +15689,7 @@ module_cmds \ | 5395 | @@ -15322,6 +15988,7 @@ module_cmds \ |
5394 | module_expsym_cmds \ | 5396 | module_expsym_cmds \ |
5395 | export_symbols_cmds \ | 5397 | export_symbols_cmds \ |
5396 | prelink_cmds \ | 5398 | prelink_cmds \ |
@@ -5398,7 +5400,7 @@ index 12c16faefd9..11b5127bf3a 100755 | |||
5398 | postinstall_cmds \ | 5400 | postinstall_cmds \ |
5399 | postuninstall_cmds \ | 5401 | postuninstall_cmds \ |
5400 | finish_cmds \ | 5402 | finish_cmds \ |
5401 | @@ -15795,7 +16462,8 @@ $as_echo X"$file" | | 5403 | @@ -16094,7 +16761,8 @@ $as_echo X"$file" | |
5402 | # NOTE: Changes made to this file will be lost: look at ltmain.sh. | 5404 | # NOTE: Changes made to this file will be lost: look at ltmain.sh. |
5403 | # | 5405 | # |
5404 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, | 5406 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, |
@@ -5408,7 +5410,7 @@ index 12c16faefd9..11b5127bf3a 100755 | |||
5408 | # Written by Gordon Matzigkeit, 1996 | 5410 | # Written by Gordon Matzigkeit, 1996 |
5409 | # | 5411 | # |
5410 | # This file is part of GNU Libtool. | 5412 | # This file is part of GNU Libtool. |
5411 | @@ -15898,19 +16566,42 @@ SP2NL=$lt_lt_SP2NL | 5413 | @@ -16197,19 +16865,42 @@ SP2NL=$lt_lt_SP2NL |
5412 | # turn newlines into spaces. | 5414 | # turn newlines into spaces. |
5413 | NL2SP=$lt_lt_NL2SP | 5415 | NL2SP=$lt_lt_NL2SP |
5414 | 5416 | ||
@@ -5452,7 +5454,7 @@ index 12c16faefd9..11b5127bf3a 100755 | |||
5452 | # A symbol stripping program. | 5454 | # A symbol stripping program. |
5453 | STRIP=$lt_STRIP | 5455 | STRIP=$lt_STRIP |
5454 | 5456 | ||
5455 | @@ -15940,6 +16631,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address | 5457 | @@ -16239,6 +16930,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address |
5456 | # Transform the output of nm in a C name address pair when lib prefix is needed. | 5458 | # Transform the output of nm in a C name address pair when lib prefix is needed. |
5457 | global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix | 5459 | global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix |
5458 | 5460 | ||
@@ -5465,7 +5467,7 @@ index 12c16faefd9..11b5127bf3a 100755 | |||
5465 | # The name of the directory that contains temporary libtool files. | 5467 | # The name of the directory that contains temporary libtool files. |
5466 | objdir=$objdir | 5468 | objdir=$objdir |
5467 | 5469 | ||
5468 | @@ -15949,6 +16646,9 @@ MAGIC_CMD=$MAGIC_CMD | 5470 | @@ -16248,6 +16945,9 @@ MAGIC_CMD=$MAGIC_CMD |
5469 | # Must we lock files when doing compilation? | 5471 | # Must we lock files when doing compilation? |
5470 | need_locks=$lt_need_locks | 5472 | need_locks=$lt_need_locks |
5471 | 5473 | ||
@@ -5475,7 +5477,7 @@ index 12c16faefd9..11b5127bf3a 100755 | |||
5475 | # Tool to manipulate archived DWARF debug symbol files on Mac OS X. | 5477 | # Tool to manipulate archived DWARF debug symbol files on Mac OS X. |
5476 | DSYMUTIL=$lt_DSYMUTIL | 5478 | DSYMUTIL=$lt_DSYMUTIL |
5477 | 5479 | ||
5478 | @@ -16063,12 +16763,12 @@ with_gcc=$GCC | 5480 | @@ -16362,12 +17062,12 @@ with_gcc=$GCC |
5479 | # Compiler flag to turn off builtin functions. | 5481 | # Compiler flag to turn off builtin functions. |
5480 | no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag | 5482 | no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag |
5481 | 5483 | ||
@@ -5491,7 +5493,7 @@ index 12c16faefd9..11b5127bf3a 100755 | |||
5491 | # Compiler flag to prevent dynamic linking. | 5493 | # Compiler flag to prevent dynamic linking. |
5492 | link_static_flag=$lt_lt_prog_compiler_static | 5494 | link_static_flag=$lt_lt_prog_compiler_static |
5493 | 5495 | ||
5494 | @@ -16155,9 +16855,6 @@ inherit_rpath=$inherit_rpath | 5496 | @@ -16454,9 +17154,6 @@ inherit_rpath=$inherit_rpath |
5495 | # Whether libtool must link a program against all its dependency libraries. | 5497 | # Whether libtool must link a program against all its dependency libraries. |
5496 | link_all_deplibs=$link_all_deplibs | 5498 | link_all_deplibs=$link_all_deplibs |
5497 | 5499 | ||
@@ -5501,7 +5503,7 @@ index 12c16faefd9..11b5127bf3a 100755 | |||
5501 | # Set to "yes" if exported symbols are required. | 5503 | # Set to "yes" if exported symbols are required. |
5502 | always_export_symbols=$always_export_symbols | 5504 | always_export_symbols=$always_export_symbols |
5503 | 5505 | ||
5504 | @@ -16173,6 +16870,9 @@ include_expsyms=$lt_include_expsyms | 5506 | @@ -16472,6 +17169,9 @@ include_expsyms=$lt_include_expsyms |
5505 | # Commands necessary for linking programs (against libraries) with templates. | 5507 | # Commands necessary for linking programs (against libraries) with templates. |
5506 | prelink_cmds=$lt_prelink_cmds | 5508 | prelink_cmds=$lt_prelink_cmds |
5507 | 5509 | ||
@@ -5511,7 +5513,7 @@ index 12c16faefd9..11b5127bf3a 100755 | |||
5511 | # Specify filename containing input files. | 5513 | # Specify filename containing input files. |
5512 | file_list_spec=$lt_file_list_spec | 5514 | file_list_spec=$lt_file_list_spec |
5513 | 5515 | ||
5514 | @@ -16205,210 +16905,169 @@ ltmain="$ac_aux_dir/ltmain.sh" | 5516 | @@ -16504,210 +17204,169 @@ ltmain="$ac_aux_dir/ltmain.sh" |
5515 | # if finds mixed CR/LF and LF-only lines. Since sed operates in | 5517 | # if finds mixed CR/LF and LF-only lines. Since sed operates in |
5516 | # text mode, it properly converts lines to CR/LF. This bash problem | 5518 | # text mode, it properly converts lines to CR/LF. This bash problem |
5517 | # is reportedly fixed, but why not run on old versions too? | 5519 | # is reportedly fixed, but why not run on old versions too? |
@@ -5885,20 +5887,8 @@ index 12c16faefd9..11b5127bf3a 100755 | |||
5885 | (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") | 5887 | (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") |
5886 | chmod +x "$ofile" | 5888 | chmod +x "$ofile" |
5887 | 5889 | ||
5888 | diff --git a/gdbsupport/Makefile.in b/gdbsupport/Makefile.in | ||
5889 | index bdceff3b56a..6aadae41031 100644 | ||
5890 | --- a/gdbsupport/Makefile.in | ||
5891 | +++ b/gdbsupport/Makefile.in | ||
5892 | @@ -233,6 +233,7 @@ CATOBJEXT = @CATOBJEXT@ | ||
5893 | CC = @CC@ | ||
5894 | CCDEPMODE = @CCDEPMODE@ | ||
5895 | CFLAGS = @CFLAGS@ | ||
5896 | +CONFIG_STATUS_DEPENDENCIES = @CONFIG_STATUS_DEPENDENCIES@ | ||
5897 | CPP = @CPP@ | ||
5898 | CPPFLAGS = @CPPFLAGS@ | ||
5899 | CXX = @CXX@ | ||
5900 | diff --git a/gprof/Makefile.in b/gprof/Makefile.in | 5890 | diff --git a/gprof/Makefile.in b/gprof/Makefile.in |
5901 | index 5ef5ece74a9..9d7ce8b62b2 100644 | 5891 | index c9914e46d7d..1857eb8b5a8 100644 |
5902 | --- a/gprof/Makefile.in | 5892 | --- a/gprof/Makefile.in |
5903 | +++ b/gprof/Makefile.in | 5893 | +++ b/gprof/Makefile.in |
5904 | @@ -321,6 +321,7 @@ CYGPATH_W = @CYGPATH_W@ | 5894 | @@ -321,6 +321,7 @@ CYGPATH_W = @CYGPATH_W@ |
@@ -5926,7 +5916,7 @@ index 5ef5ece74a9..9d7ce8b62b2 100644 | |||
5926 | ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ | 5916 | ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ |
5927 | am__include = @am__include@ | 5917 | am__include = @am__include@ |
5928 | diff --git a/gprof/configure b/gprof/configure | 5918 | diff --git a/gprof/configure b/gprof/configure |
5929 | index 5a59f1c1d0e..2506887d3b0 100755 | 5919 | index 3e8edd112cb..5b320c60f50 100755 |
5930 | --- a/gprof/configure | 5920 | --- a/gprof/configure |
5931 | +++ b/gprof/configure | 5921 | +++ b/gprof/configure |
5932 | @@ -663,8 +663,11 @@ OTOOL | 5922 | @@ -663,8 +663,11 @@ OTOOL |
@@ -7252,7 +7242,7 @@ index 5a59f1c1d0e..2506887d3b0 100755 | |||
7252 | int main () | 7242 | int main () |
7253 | { | 7243 | { |
7254 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); | 7244 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); |
7255 | @@ -12777,13 +13427,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' | 7245 | @@ -12795,13 +13445,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' |
7256 | lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' | 7246 | lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' |
7257 | lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' | 7247 | lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' |
7258 | lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' | 7248 | lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' |
@@ -7273,7 +7263,7 @@ index 5a59f1c1d0e..2506887d3b0 100755 | |||
7273 | STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' | 7263 | STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' |
7274 | RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' | 7264 | RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' |
7275 | old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' | 7265 | old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' |
7276 | @@ -12798,14 +13455,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de | 7266 | @@ -12816,14 +13473,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de |
7277 | lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' | 7267 | lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' |
7278 | lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' | 7268 | lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' |
7279 | lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`' | 7269 | 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"`' |
@@ -7292,7 +7282,7 @@ index 5a59f1c1d0e..2506887d3b0 100755 | |||
7292 | DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' | 7282 | DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' |
7293 | NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' | 7283 | NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' |
7294 | LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' | 7284 | LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' |
7295 | @@ -12838,12 +13498,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q | 7285 | @@ -12856,12 +13516,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q |
7296 | hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' | 7286 | hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' |
7297 | inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' | 7287 | inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' |
7298 | link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' | 7288 | link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' |
@@ -7306,7 +7296,7 @@ index 5a59f1c1d0e..2506887d3b0 100755 | |||
7306 | file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' | 7296 | file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' |
7307 | variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' | 7297 | variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' |
7308 | need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' | 7298 | need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' |
7309 | @@ -12898,8 +13558,13 @@ reload_flag \ | 7299 | @@ -12916,8 +13576,13 @@ reload_flag \ |
7310 | OBJDUMP \ | 7300 | OBJDUMP \ |
7311 | deplibs_check_method \ | 7301 | deplibs_check_method \ |
7312 | file_magic_cmd \ | 7302 | file_magic_cmd \ |
@@ -7320,7 +7310,7 @@ index 5a59f1c1d0e..2506887d3b0 100755 | |||
7320 | STRIP \ | 7310 | STRIP \ |
7321 | RANLIB \ | 7311 | RANLIB \ |
7322 | CC \ | 7312 | CC \ |
7323 | @@ -12909,12 +13574,14 @@ lt_cv_sys_global_symbol_pipe \ | 7313 | @@ -12927,12 +13592,14 @@ lt_cv_sys_global_symbol_pipe \ |
7324 | lt_cv_sys_global_symbol_to_cdecl \ | 7314 | lt_cv_sys_global_symbol_to_cdecl \ |
7325 | lt_cv_sys_global_symbol_to_c_name_address \ | 7315 | lt_cv_sys_global_symbol_to_c_name_address \ |
7326 | lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ | 7316 | lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ |
@@ -7336,7 +7326,7 @@ index 5a59f1c1d0e..2506887d3b0 100755 | |||
7336 | DSYMUTIL \ | 7326 | DSYMUTIL \ |
7337 | NMEDIT \ | 7327 | NMEDIT \ |
7338 | LIPO \ | 7328 | LIPO \ |
7339 | @@ -12930,7 +13597,6 @@ no_undefined_flag \ | 7329 | @@ -12948,7 +13615,6 @@ no_undefined_flag \ |
7340 | hardcode_libdir_flag_spec \ | 7330 | hardcode_libdir_flag_spec \ |
7341 | hardcode_libdir_flag_spec_ld \ | 7331 | hardcode_libdir_flag_spec_ld \ |
7342 | hardcode_libdir_separator \ | 7332 | hardcode_libdir_separator \ |
@@ -7344,7 +7334,7 @@ index 5a59f1c1d0e..2506887d3b0 100755 | |||
7344 | exclude_expsyms \ | 7334 | exclude_expsyms \ |
7345 | include_expsyms \ | 7335 | include_expsyms \ |
7346 | file_list_spec \ | 7336 | file_list_spec \ |
7347 | @@ -12966,6 +13632,7 @@ module_cmds \ | 7337 | @@ -12984,6 +13650,7 @@ module_cmds \ |
7348 | module_expsym_cmds \ | 7338 | module_expsym_cmds \ |
7349 | export_symbols_cmds \ | 7339 | export_symbols_cmds \ |
7350 | prelink_cmds \ | 7340 | prelink_cmds \ |
@@ -7352,7 +7342,7 @@ index 5a59f1c1d0e..2506887d3b0 100755 | |||
7352 | postinstall_cmds \ | 7342 | postinstall_cmds \ |
7353 | postuninstall_cmds \ | 7343 | postuninstall_cmds \ |
7354 | finish_cmds \ | 7344 | finish_cmds \ |
7355 | @@ -13731,7 +14398,8 @@ $as_echo X"$file" | | 7345 | @@ -13749,7 +14416,8 @@ $as_echo X"$file" | |
7356 | # NOTE: Changes made to this file will be lost: look at ltmain.sh. | 7346 | # NOTE: Changes made to this file will be lost: look at ltmain.sh. |
7357 | # | 7347 | # |
7358 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, | 7348 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, |
@@ -7362,7 +7352,7 @@ index 5a59f1c1d0e..2506887d3b0 100755 | |||
7362 | # Written by Gordon Matzigkeit, 1996 | 7352 | # Written by Gordon Matzigkeit, 1996 |
7363 | # | 7353 | # |
7364 | # This file is part of GNU Libtool. | 7354 | # This file is part of GNU Libtool. |
7365 | @@ -13834,19 +14502,42 @@ SP2NL=$lt_lt_SP2NL | 7355 | @@ -13852,19 +14520,42 @@ SP2NL=$lt_lt_SP2NL |
7366 | # turn newlines into spaces. | 7356 | # turn newlines into spaces. |
7367 | NL2SP=$lt_lt_NL2SP | 7357 | NL2SP=$lt_lt_NL2SP |
7368 | 7358 | ||
@@ -7406,7 +7396,7 @@ index 5a59f1c1d0e..2506887d3b0 100755 | |||
7406 | # A symbol stripping program. | 7396 | # A symbol stripping program. |
7407 | STRIP=$lt_STRIP | 7397 | STRIP=$lt_STRIP |
7408 | 7398 | ||
7409 | @@ -13876,6 +14567,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address | 7399 | @@ -13894,6 +14585,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address |
7410 | # Transform the output of nm in a C name address pair when lib prefix is needed. | 7400 | # Transform the output of nm in a C name address pair when lib prefix is needed. |
7411 | global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix | 7401 | global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix |
7412 | 7402 | ||
@@ -7419,7 +7409,7 @@ index 5a59f1c1d0e..2506887d3b0 100755 | |||
7419 | # The name of the directory that contains temporary libtool files. | 7409 | # The name of the directory that contains temporary libtool files. |
7420 | objdir=$objdir | 7410 | objdir=$objdir |
7421 | 7411 | ||
7422 | @@ -13885,6 +14582,9 @@ MAGIC_CMD=$MAGIC_CMD | 7412 | @@ -13903,6 +14600,9 @@ MAGIC_CMD=$MAGIC_CMD |
7423 | # Must we lock files when doing compilation? | 7413 | # Must we lock files when doing compilation? |
7424 | need_locks=$lt_need_locks | 7414 | need_locks=$lt_need_locks |
7425 | 7415 | ||
@@ -7429,7 +7419,7 @@ index 5a59f1c1d0e..2506887d3b0 100755 | |||
7429 | # Tool to manipulate archived DWARF debug symbol files on Mac OS X. | 7419 | # Tool to manipulate archived DWARF debug symbol files on Mac OS X. |
7430 | DSYMUTIL=$lt_DSYMUTIL | 7420 | DSYMUTIL=$lt_DSYMUTIL |
7431 | 7421 | ||
7432 | @@ -13999,12 +14699,12 @@ with_gcc=$GCC | 7422 | @@ -14017,12 +14717,12 @@ with_gcc=$GCC |
7433 | # Compiler flag to turn off builtin functions. | 7423 | # Compiler flag to turn off builtin functions. |
7434 | no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag | 7424 | no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag |
7435 | 7425 | ||
@@ -7445,7 +7435,7 @@ index 5a59f1c1d0e..2506887d3b0 100755 | |||
7445 | # Compiler flag to prevent dynamic linking. | 7435 | # Compiler flag to prevent dynamic linking. |
7446 | link_static_flag=$lt_lt_prog_compiler_static | 7436 | link_static_flag=$lt_lt_prog_compiler_static |
7447 | 7437 | ||
7448 | @@ -14091,9 +14791,6 @@ inherit_rpath=$inherit_rpath | 7438 | @@ -14109,9 +14809,6 @@ inherit_rpath=$inherit_rpath |
7449 | # Whether libtool must link a program against all its dependency libraries. | 7439 | # Whether libtool must link a program against all its dependency libraries. |
7450 | link_all_deplibs=$link_all_deplibs | 7440 | link_all_deplibs=$link_all_deplibs |
7451 | 7441 | ||
@@ -7455,7 +7445,7 @@ index 5a59f1c1d0e..2506887d3b0 100755 | |||
7455 | # Set to "yes" if exported symbols are required. | 7445 | # Set to "yes" if exported symbols are required. |
7456 | always_export_symbols=$always_export_symbols | 7446 | always_export_symbols=$always_export_symbols |
7457 | 7447 | ||
7458 | @@ -14109,6 +14806,9 @@ include_expsyms=$lt_include_expsyms | 7448 | @@ -14127,6 +14824,9 @@ include_expsyms=$lt_include_expsyms |
7459 | # Commands necessary for linking programs (against libraries) with templates. | 7449 | # Commands necessary for linking programs (against libraries) with templates. |
7460 | prelink_cmds=$lt_prelink_cmds | 7450 | prelink_cmds=$lt_prelink_cmds |
7461 | 7451 | ||
@@ -7465,7 +7455,7 @@ index 5a59f1c1d0e..2506887d3b0 100755 | |||
7465 | # Specify filename containing input files. | 7455 | # Specify filename containing input files. |
7466 | file_list_spec=$lt_file_list_spec | 7456 | file_list_spec=$lt_file_list_spec |
7467 | 7457 | ||
7468 | @@ -14141,210 +14841,169 @@ ltmain="$ac_aux_dir/ltmain.sh" | 7458 | @@ -14159,210 +14859,169 @@ ltmain="$ac_aux_dir/ltmain.sh" |
7469 | # if finds mixed CR/LF and LF-only lines. Since sed operates in | 7459 | # if finds mixed CR/LF and LF-only lines. Since sed operates in |
7470 | # text mode, it properly converts lines to CR/LF. This bash problem | 7460 | # text mode, it properly converts lines to CR/LF. This bash problem |
7471 | # is reportedly fixed, but why not run on old versions too? | 7461 | # is reportedly fixed, but why not run on old versions too? |
@@ -7840,7 +7830,7 @@ index 5a59f1c1d0e..2506887d3b0 100755 | |||
7840 | chmod +x "$ofile" | 7830 | chmod +x "$ofile" |
7841 | 7831 | ||
7842 | diff --git a/gprofng/Makefile.in b/gprofng/Makefile.in | 7832 | diff --git a/gprofng/Makefile.in b/gprofng/Makefile.in |
7843 | index fd5279b4df1..6e74c7b302a 100644 | 7833 | index 01f7dca3f2a..3db326271c9 100644 |
7844 | --- a/gprofng/Makefile.in | 7834 | --- a/gprofng/Makefile.in |
7845 | +++ b/gprofng/Makefile.in | 7835 | +++ b/gprofng/Makefile.in |
7846 | @@ -253,6 +253,7 @@ CXXFLAGS = @CXXFLAGS@ | 7836 | @@ -253,6 +253,7 @@ CXXFLAGS = @CXXFLAGS@ |
@@ -7860,7 +7850,7 @@ index fd5279b4df1..6e74c7b302a 100644 | |||
7860 | NM = @NM@ | 7850 | NM = @NM@ |
7861 | NMEDIT = @NMEDIT@ | 7851 | NMEDIT = @NMEDIT@ |
7862 | diff --git a/gprofng/configure b/gprofng/configure | 7852 | diff --git a/gprofng/configure b/gprofng/configure |
7863 | index ac14d126ac0..f8d7685a72e 100755 | 7853 | index 2afc9a381a6..1e57b41ffa4 100755 |
7864 | --- a/gprofng/configure | 7854 | --- a/gprofng/configure |
7865 | +++ b/gprofng/configure | 7855 | +++ b/gprofng/configure |
7866 | @@ -672,6 +672,8 @@ OTOOL | 7856 | @@ -672,6 +672,8 @@ OTOOL |
@@ -9782,7 +9772,7 @@ index ac14d126ac0..f8d7685a72e 100755 | |||
9782 | LDCXX=$LD | 9772 | LDCXX=$LD |
9783 | LD=$lt_save_LD | 9773 | LD=$lt_save_LD |
9784 | GCC=$lt_save_GCC | 9774 | GCC=$lt_save_GCC |
9785 | @@ -17663,13 +18493,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' | 9775 | @@ -17690,13 +18520,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' |
9786 | lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' | 9776 | lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' |
9787 | lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' | 9777 | lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' |
9788 | lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' | 9778 | lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' |
@@ -9803,7 +9793,7 @@ index ac14d126ac0..f8d7685a72e 100755 | |||
9803 | STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' | 9793 | STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' |
9804 | RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' | 9794 | RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' |
9805 | old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' | 9795 | old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' |
9806 | @@ -17684,14 +18521,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de | 9796 | @@ -17711,14 +18548,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de |
9807 | lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' | 9797 | lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' |
9808 | lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' | 9798 | lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' |
9809 | lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`' | 9799 | 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"`' |
@@ -9822,7 +9812,7 @@ index ac14d126ac0..f8d7685a72e 100755 | |||
9822 | DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' | 9812 | DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' |
9823 | NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' | 9813 | NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' |
9824 | LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' | 9814 | LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' |
9825 | @@ -17724,12 +18564,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q | 9815 | @@ -17751,12 +18591,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q |
9826 | hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' | 9816 | hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' |
9827 | inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' | 9817 | inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' |
9828 | link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' | 9818 | link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' |
@@ -9836,7 +9826,7 @@ index ac14d126ac0..f8d7685a72e 100755 | |||
9836 | file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' | 9826 | file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' |
9837 | variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' | 9827 | variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' |
9838 | need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' | 9828 | need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' |
9839 | @@ -17768,8 +18608,8 @@ old_archive_cmds_CXX='`$ECHO "$old_archive_cmds_CXX" | $SED "$delay_single_quote | 9829 | @@ -17795,8 +18635,8 @@ old_archive_cmds_CXX='`$ECHO "$old_archive_cmds_CXX" | $SED "$delay_single_quote |
9840 | compiler_CXX='`$ECHO "$compiler_CXX" | $SED "$delay_single_quote_subst"`' | 9830 | compiler_CXX='`$ECHO "$compiler_CXX" | $SED "$delay_single_quote_subst"`' |
9841 | GCC_CXX='`$ECHO "$GCC_CXX" | $SED "$delay_single_quote_subst"`' | 9831 | GCC_CXX='`$ECHO "$GCC_CXX" | $SED "$delay_single_quote_subst"`' |
9842 | lt_prog_compiler_no_builtin_flag_CXX='`$ECHO "$lt_prog_compiler_no_builtin_flag_CXX" | $SED "$delay_single_quote_subst"`' | 9832 | lt_prog_compiler_no_builtin_flag_CXX='`$ECHO "$lt_prog_compiler_no_builtin_flag_CXX" | $SED "$delay_single_quote_subst"`' |
@@ -9846,7 +9836,7 @@ index ac14d126ac0..f8d7685a72e 100755 | |||
9846 | lt_prog_compiler_static_CXX='`$ECHO "$lt_prog_compiler_static_CXX" | $SED "$delay_single_quote_subst"`' | 9836 | lt_prog_compiler_static_CXX='`$ECHO "$lt_prog_compiler_static_CXX" | $SED "$delay_single_quote_subst"`' |
9847 | lt_cv_prog_compiler_c_o_CXX='`$ECHO "$lt_cv_prog_compiler_c_o_CXX" | $SED "$delay_single_quote_subst"`' | 9837 | lt_cv_prog_compiler_c_o_CXX='`$ECHO "$lt_cv_prog_compiler_c_o_CXX" | $SED "$delay_single_quote_subst"`' |
9848 | archive_cmds_need_lc_CXX='`$ECHO "$archive_cmds_need_lc_CXX" | $SED "$delay_single_quote_subst"`' | 9838 | archive_cmds_need_lc_CXX='`$ECHO "$archive_cmds_need_lc_CXX" | $SED "$delay_single_quote_subst"`' |
9849 | @@ -17796,12 +18636,12 @@ hardcode_shlibpath_var_CXX='`$ECHO "$hardcode_shlibpath_var_CXX" | $SED "$delay_ | 9839 | @@ -17823,12 +18663,12 @@ hardcode_shlibpath_var_CXX='`$ECHO "$hardcode_shlibpath_var_CXX" | $SED "$delay_ |
9850 | hardcode_automatic_CXX='`$ECHO "$hardcode_automatic_CXX" | $SED "$delay_single_quote_subst"`' | 9840 | hardcode_automatic_CXX='`$ECHO "$hardcode_automatic_CXX" | $SED "$delay_single_quote_subst"`' |
9851 | inherit_rpath_CXX='`$ECHO "$inherit_rpath_CXX" | $SED "$delay_single_quote_subst"`' | 9841 | inherit_rpath_CXX='`$ECHO "$inherit_rpath_CXX" | $SED "$delay_single_quote_subst"`' |
9852 | link_all_deplibs_CXX='`$ECHO "$link_all_deplibs_CXX" | $SED "$delay_single_quote_subst"`' | 9842 | link_all_deplibs_CXX='`$ECHO "$link_all_deplibs_CXX" | $SED "$delay_single_quote_subst"`' |
@@ -9860,7 +9850,7 @@ index ac14d126ac0..f8d7685a72e 100755 | |||
9860 | file_list_spec_CXX='`$ECHO "$file_list_spec_CXX" | $SED "$delay_single_quote_subst"`' | 9850 | file_list_spec_CXX='`$ECHO "$file_list_spec_CXX" | $SED "$delay_single_quote_subst"`' |
9861 | hardcode_action_CXX='`$ECHO "$hardcode_action_CXX" | $SED "$delay_single_quote_subst"`' | 9851 | hardcode_action_CXX='`$ECHO "$hardcode_action_CXX" | $SED "$delay_single_quote_subst"`' |
9862 | compiler_lib_search_dirs_CXX='`$ECHO "$compiler_lib_search_dirs_CXX" | $SED "$delay_single_quote_subst"`' | 9852 | compiler_lib_search_dirs_CXX='`$ECHO "$compiler_lib_search_dirs_CXX" | $SED "$delay_single_quote_subst"`' |
9863 | @@ -17839,8 +18679,13 @@ reload_flag \ | 9853 | @@ -17866,8 +18706,13 @@ reload_flag \ |
9864 | OBJDUMP \ | 9854 | OBJDUMP \ |
9865 | deplibs_check_method \ | 9855 | deplibs_check_method \ |
9866 | file_magic_cmd \ | 9856 | file_magic_cmd \ |
@@ -9874,7 +9864,7 @@ index ac14d126ac0..f8d7685a72e 100755 | |||
9874 | STRIP \ | 9864 | STRIP \ |
9875 | RANLIB \ | 9865 | RANLIB \ |
9876 | CC \ | 9866 | CC \ |
9877 | @@ -17850,12 +18695,14 @@ lt_cv_sys_global_symbol_pipe \ | 9867 | @@ -17877,12 +18722,14 @@ lt_cv_sys_global_symbol_pipe \ |
9878 | lt_cv_sys_global_symbol_to_cdecl \ | 9868 | lt_cv_sys_global_symbol_to_cdecl \ |
9879 | lt_cv_sys_global_symbol_to_c_name_address \ | 9869 | lt_cv_sys_global_symbol_to_c_name_address \ |
9880 | lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ | 9870 | lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ |
@@ -9890,7 +9880,7 @@ index ac14d126ac0..f8d7685a72e 100755 | |||
9890 | DSYMUTIL \ | 9880 | DSYMUTIL \ |
9891 | NMEDIT \ | 9881 | NMEDIT \ |
9892 | LIPO \ | 9882 | LIPO \ |
9893 | @@ -17871,7 +18718,6 @@ no_undefined_flag \ | 9883 | @@ -17898,7 +18745,6 @@ no_undefined_flag \ |
9894 | hardcode_libdir_flag_spec \ | 9884 | hardcode_libdir_flag_spec \ |
9895 | hardcode_libdir_flag_spec_ld \ | 9885 | hardcode_libdir_flag_spec_ld \ |
9896 | hardcode_libdir_separator \ | 9886 | hardcode_libdir_separator \ |
@@ -9898,7 +9888,7 @@ index ac14d126ac0..f8d7685a72e 100755 | |||
9898 | exclude_expsyms \ | 9888 | exclude_expsyms \ |
9899 | include_expsyms \ | 9889 | include_expsyms \ |
9900 | file_list_spec \ | 9890 | file_list_spec \ |
9901 | @@ -17893,8 +18739,8 @@ LD_CXX \ | 9891 | @@ -17920,8 +18766,8 @@ LD_CXX \ |
9902 | reload_flag_CXX \ | 9892 | reload_flag_CXX \ |
9903 | compiler_CXX \ | 9893 | compiler_CXX \ |
9904 | lt_prog_compiler_no_builtin_flag_CXX \ | 9894 | lt_prog_compiler_no_builtin_flag_CXX \ |
@@ -9908,7 +9898,7 @@ index ac14d126ac0..f8d7685a72e 100755 | |||
9908 | lt_prog_compiler_static_CXX \ | 9898 | lt_prog_compiler_static_CXX \ |
9909 | lt_cv_prog_compiler_c_o_CXX \ | 9899 | lt_cv_prog_compiler_c_o_CXX \ |
9910 | export_dynamic_flag_spec_CXX \ | 9900 | export_dynamic_flag_spec_CXX \ |
9911 | @@ -17906,7 +18752,6 @@ no_undefined_flag_CXX \ | 9901 | @@ -17933,7 +18779,6 @@ no_undefined_flag_CXX \ |
9912 | hardcode_libdir_flag_spec_CXX \ | 9902 | hardcode_libdir_flag_spec_CXX \ |
9913 | hardcode_libdir_flag_spec_ld_CXX \ | 9903 | hardcode_libdir_flag_spec_ld_CXX \ |
9914 | hardcode_libdir_separator_CXX \ | 9904 | hardcode_libdir_separator_CXX \ |
@@ -9916,7 +9906,7 @@ index ac14d126ac0..f8d7685a72e 100755 | |||
9916 | exclude_expsyms_CXX \ | 9906 | exclude_expsyms_CXX \ |
9917 | include_expsyms_CXX \ | 9907 | include_expsyms_CXX \ |
9918 | file_list_spec_CXX \ | 9908 | file_list_spec_CXX \ |
9919 | @@ -17940,6 +18785,7 @@ module_cmds \ | 9909 | @@ -17967,6 +18812,7 @@ module_cmds \ |
9920 | module_expsym_cmds \ | 9910 | module_expsym_cmds \ |
9921 | export_symbols_cmds \ | 9911 | export_symbols_cmds \ |
9922 | prelink_cmds \ | 9912 | prelink_cmds \ |
@@ -9924,7 +9914,7 @@ index ac14d126ac0..f8d7685a72e 100755 | |||
9924 | postinstall_cmds \ | 9914 | postinstall_cmds \ |
9925 | postuninstall_cmds \ | 9915 | postuninstall_cmds \ |
9926 | finish_cmds \ | 9916 | finish_cmds \ |
9927 | @@ -17954,7 +18800,8 @@ archive_expsym_cmds_CXX \ | 9917 | @@ -17981,7 +18827,8 @@ archive_expsym_cmds_CXX \ |
9928 | module_cmds_CXX \ | 9918 | module_cmds_CXX \ |
9929 | module_expsym_cmds_CXX \ | 9919 | module_expsym_cmds_CXX \ |
9930 | export_symbols_cmds_CXX \ | 9920 | export_symbols_cmds_CXX \ |
@@ -9934,7 +9924,7 @@ index ac14d126ac0..f8d7685a72e 100755 | |||
9934 | case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in | 9924 | case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in |
9935 | *[\\\\\\\`\\"\\\$]*) | 9925 | *[\\\\\\\`\\"\\\$]*) |
9936 | eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" | 9926 | eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" |
9937 | @@ -18711,7 +19558,8 @@ $as_echo X"$file" | | 9927 | @@ -18738,7 +19585,8 @@ $as_echo X"$file" | |
9938 | # NOTE: Changes made to this file will be lost: look at ltmain.sh. | 9928 | # NOTE: Changes made to this file will be lost: look at ltmain.sh. |
9939 | # | 9929 | # |
9940 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, | 9930 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, |
@@ -9944,7 +9934,7 @@ index ac14d126ac0..f8d7685a72e 100755 | |||
9944 | # Written by Gordon Matzigkeit, 1996 | 9934 | # Written by Gordon Matzigkeit, 1996 |
9945 | # | 9935 | # |
9946 | # This file is part of GNU Libtool. | 9936 | # This file is part of GNU Libtool. |
9947 | @@ -18814,19 +19662,42 @@ SP2NL=$lt_lt_SP2NL | 9937 | @@ -18841,19 +19689,42 @@ SP2NL=$lt_lt_SP2NL |
9948 | # turn newlines into spaces. | 9938 | # turn newlines into spaces. |
9949 | NL2SP=$lt_lt_NL2SP | 9939 | NL2SP=$lt_lt_NL2SP |
9950 | 9940 | ||
@@ -9988,7 +9978,7 @@ index ac14d126ac0..f8d7685a72e 100755 | |||
9988 | # A symbol stripping program. | 9978 | # A symbol stripping program. |
9989 | STRIP=$lt_STRIP | 9979 | STRIP=$lt_STRIP |
9990 | 9980 | ||
9991 | @@ -18856,6 +19727,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address | 9981 | @@ -18883,6 +19754,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address |
9992 | # Transform the output of nm in a C name address pair when lib prefix is needed. | 9982 | # Transform the output of nm in a C name address pair when lib prefix is needed. |
9993 | global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix | 9983 | global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix |
9994 | 9984 | ||
@@ -10001,7 +9991,7 @@ index ac14d126ac0..f8d7685a72e 100755 | |||
10001 | # The name of the directory that contains temporary libtool files. | 9991 | # The name of the directory that contains temporary libtool files. |
10002 | objdir=$objdir | 9992 | objdir=$objdir |
10003 | 9993 | ||
10004 | @@ -18865,6 +19742,9 @@ MAGIC_CMD=$MAGIC_CMD | 9994 | @@ -18892,6 +19769,9 @@ MAGIC_CMD=$MAGIC_CMD |
10005 | # Must we lock files when doing compilation? | 9995 | # Must we lock files when doing compilation? |
10006 | need_locks=$lt_need_locks | 9996 | need_locks=$lt_need_locks |
10007 | 9997 | ||
@@ -10011,7 +10001,7 @@ index ac14d126ac0..f8d7685a72e 100755 | |||
10011 | # Tool to manipulate archived DWARF debug symbol files on Mac OS X. | 10001 | # Tool to manipulate archived DWARF debug symbol files on Mac OS X. |
10012 | DSYMUTIL=$lt_DSYMUTIL | 10002 | DSYMUTIL=$lt_DSYMUTIL |
10013 | 10003 | ||
10014 | @@ -18979,12 +19859,12 @@ with_gcc=$GCC | 10004 | @@ -19006,12 +19886,12 @@ with_gcc=$GCC |
10015 | # Compiler flag to turn off builtin functions. | 10005 | # Compiler flag to turn off builtin functions. |
10016 | no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag | 10006 | no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag |
10017 | 10007 | ||
@@ -10027,7 +10017,7 @@ index ac14d126ac0..f8d7685a72e 100755 | |||
10027 | # Compiler flag to prevent dynamic linking. | 10017 | # Compiler flag to prevent dynamic linking. |
10028 | link_static_flag=$lt_lt_prog_compiler_static | 10018 | link_static_flag=$lt_lt_prog_compiler_static |
10029 | 10019 | ||
10030 | @@ -19071,9 +19951,6 @@ inherit_rpath=$inherit_rpath | 10020 | @@ -19098,9 +19978,6 @@ inherit_rpath=$inherit_rpath |
10031 | # Whether libtool must link a program against all its dependency libraries. | 10021 | # Whether libtool must link a program against all its dependency libraries. |
10032 | link_all_deplibs=$link_all_deplibs | 10022 | link_all_deplibs=$link_all_deplibs |
10033 | 10023 | ||
@@ -10037,7 +10027,7 @@ index ac14d126ac0..f8d7685a72e 100755 | |||
10037 | # Set to "yes" if exported symbols are required. | 10027 | # Set to "yes" if exported symbols are required. |
10038 | always_export_symbols=$always_export_symbols | 10028 | always_export_symbols=$always_export_symbols |
10039 | 10029 | ||
10040 | @@ -19089,6 +19966,9 @@ include_expsyms=$lt_include_expsyms | 10030 | @@ -19116,6 +19993,9 @@ include_expsyms=$lt_include_expsyms |
10041 | # Commands necessary for linking programs (against libraries) with templates. | 10031 | # Commands necessary for linking programs (against libraries) with templates. |
10042 | prelink_cmds=$lt_prelink_cmds | 10032 | prelink_cmds=$lt_prelink_cmds |
10043 | 10033 | ||
@@ -10047,7 +10037,7 @@ index ac14d126ac0..f8d7685a72e 100755 | |||
10047 | # Specify filename containing input files. | 10037 | # Specify filename containing input files. |
10048 | file_list_spec=$lt_file_list_spec | 10038 | file_list_spec=$lt_file_list_spec |
10049 | 10039 | ||
10050 | @@ -19135,210 +20015,169 @@ ltmain="$ac_aux_dir/ltmain.sh" | 10040 | @@ -19162,210 +20042,169 @@ ltmain="$ac_aux_dir/ltmain.sh" |
10051 | # if finds mixed CR/LF and LF-only lines. Since sed operates in | 10041 | # if finds mixed CR/LF and LF-only lines. Since sed operates in |
10052 | # text mode, it properly converts lines to CR/LF. This bash problem | 10042 | # text mode, it properly converts lines to CR/LF. This bash problem |
10053 | # is reportedly fixed, but why not run on old versions too? | 10043 | # is reportedly fixed, but why not run on old versions too? |
@@ -10421,7 +10411,7 @@ index ac14d126ac0..f8d7685a72e 100755 | |||
10421 | (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") | 10411 | (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") |
10422 | chmod +x "$ofile" | 10412 | chmod +x "$ofile" |
10423 | 10413 | ||
10424 | @@ -19366,12 +20205,12 @@ with_gcc=$GCC_CXX | 10414 | @@ -19393,12 +20232,12 @@ with_gcc=$GCC_CXX |
10425 | # Compiler flag to turn off builtin functions. | 10415 | # Compiler flag to turn off builtin functions. |
10426 | no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX | 10416 | no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX |
10427 | 10417 | ||
@@ -10437,7 +10427,7 @@ index ac14d126ac0..f8d7685a72e 100755 | |||
10437 | # Compiler flag to prevent dynamic linking. | 10427 | # Compiler flag to prevent dynamic linking. |
10438 | link_static_flag=$lt_lt_prog_compiler_static_CXX | 10428 | link_static_flag=$lt_lt_prog_compiler_static_CXX |
10439 | 10429 | ||
10440 | @@ -19458,9 +20297,6 @@ inherit_rpath=$inherit_rpath_CXX | 10430 | @@ -19485,9 +20324,6 @@ inherit_rpath=$inherit_rpath_CXX |
10441 | # Whether libtool must link a program against all its dependency libraries. | 10431 | # Whether libtool must link a program against all its dependency libraries. |
10442 | link_all_deplibs=$link_all_deplibs_CXX | 10432 | link_all_deplibs=$link_all_deplibs_CXX |
10443 | 10433 | ||
@@ -10447,7 +10437,7 @@ index ac14d126ac0..f8d7685a72e 100755 | |||
10447 | # Set to "yes" if exported symbols are required. | 10437 | # Set to "yes" if exported symbols are required. |
10448 | always_export_symbols=$always_export_symbols_CXX | 10438 | always_export_symbols=$always_export_symbols_CXX |
10449 | 10439 | ||
10450 | @@ -19476,6 +20312,9 @@ include_expsyms=$lt_include_expsyms_CXX | 10440 | @@ -19503,6 +20339,9 @@ include_expsyms=$lt_include_expsyms_CXX |
10451 | # Commands necessary for linking programs (against libraries) with templates. | 10441 | # Commands necessary for linking programs (against libraries) with templates. |
10452 | prelink_cmds=$lt_prelink_cmds_CXX | 10442 | prelink_cmds=$lt_prelink_cmds_CXX |
10453 | 10443 | ||
@@ -10458,7 +10448,7 @@ index ac14d126ac0..f8d7685a72e 100755 | |||
10458 | file_list_spec=$lt_file_list_spec_CXX | 10448 | file_list_spec=$lt_file_list_spec_CXX |
10459 | 10449 | ||
10460 | diff --git a/gprofng/doc/Makefile.in b/gprofng/doc/Makefile.in | 10450 | diff --git a/gprofng/doc/Makefile.in b/gprofng/doc/Makefile.in |
10461 | index 4050586f6a8..394469e3768 100644 | 10451 | index a45018334e8..4c30941c6b6 100644 |
10462 | --- a/gprofng/doc/Makefile.in | 10452 | --- a/gprofng/doc/Makefile.in |
10463 | +++ b/gprofng/doc/Makefile.in | 10453 | +++ b/gprofng/doc/Makefile.in |
10464 | @@ -237,6 +237,7 @@ CXXFLAGS = @CXXFLAGS@ | 10454 | @@ -237,6 +237,7 @@ CXXFLAGS = @CXXFLAGS@ |
@@ -10478,7 +10468,7 @@ index 4050586f6a8..394469e3768 100644 | |||
10478 | NM = @NM@ | 10468 | NM = @NM@ |
10479 | NMEDIT = @NMEDIT@ | 10469 | NMEDIT = @NMEDIT@ |
10480 | diff --git a/gprofng/gp-display-html/Makefile.in b/gprofng/gp-display-html/Makefile.in | 10470 | diff --git a/gprofng/gp-display-html/Makefile.in b/gprofng/gp-display-html/Makefile.in |
10481 | index 1206a79d3f0..2f763e5f760 100644 | 10471 | index 42886f7c645..b7e31ded46a 100644 |
10482 | --- a/gprofng/gp-display-html/Makefile.in | 10472 | --- a/gprofng/gp-display-html/Makefile.in |
10483 | +++ b/gprofng/gp-display-html/Makefile.in | 10473 | +++ b/gprofng/gp-display-html/Makefile.in |
10484 | @@ -200,6 +200,7 @@ CXXFLAGS = @CXXFLAGS@ | 10474 | @@ -200,6 +200,7 @@ CXXFLAGS = @CXXFLAGS@ |
@@ -10498,7 +10488,7 @@ index 1206a79d3f0..2f763e5f760 100644 | |||
10498 | NM = @NM@ | 10488 | NM = @NM@ |
10499 | NMEDIT = @NMEDIT@ | 10489 | NMEDIT = @NMEDIT@ |
10500 | diff --git a/gprofng/libcollector/Makefile.in b/gprofng/libcollector/Makefile.in | 10490 | diff --git a/gprofng/libcollector/Makefile.in b/gprofng/libcollector/Makefile.in |
10501 | index 9372c6dea78..0cf4f58c0ec 100644 | 10491 | index eef61ba85f7..0eb1521b704 100644 |
10502 | --- a/gprofng/libcollector/Makefile.in | 10492 | --- a/gprofng/libcollector/Makefile.in |
10503 | +++ b/gprofng/libcollector/Makefile.in | 10493 | +++ b/gprofng/libcollector/Makefile.in |
10504 | @@ -316,6 +316,7 @@ CXXFLAGS = @CXXFLAGS@ | 10494 | @@ -316,6 +316,7 @@ CXXFLAGS = @CXXFLAGS@ |
@@ -10518,7 +10508,7 @@ index 9372c6dea78..0cf4f58c0ec 100644 | |||
10518 | NM = @NM@ | 10508 | NM = @NM@ |
10519 | NMEDIT = @NMEDIT@ | 10509 | NMEDIT = @NMEDIT@ |
10520 | diff --git a/gprofng/libcollector/configure b/gprofng/libcollector/configure | 10510 | diff --git a/gprofng/libcollector/configure b/gprofng/libcollector/configure |
10521 | index ec38721ced2..d9daed11e3f 100755 | 10511 | index e92fbfc2242..09e93f878ae 100755 |
10522 | --- a/gprofng/libcollector/configure | 10512 | --- a/gprofng/libcollector/configure |
10523 | +++ b/gprofng/libcollector/configure | 10513 | +++ b/gprofng/libcollector/configure |
10524 | @@ -641,6 +641,8 @@ OTOOL | 10514 | @@ -641,6 +641,8 @@ OTOOL |
@@ -13118,7 +13108,7 @@ index ec38721ced2..d9daed11e3f 100755 | |||
13118 | file_list_spec=$lt_file_list_spec_CXX | 13108 | file_list_spec=$lt_file_list_spec_CXX |
13119 | 13109 | ||
13120 | diff --git a/gprofng/src/Makefile.in b/gprofng/src/Makefile.in | 13110 | diff --git a/gprofng/src/Makefile.in b/gprofng/src/Makefile.in |
13121 | index ba7fdd6e8ad..3a0fc5dbbe7 100644 | 13111 | index 4274762334e..74ab09d7661 100644 |
13122 | --- a/gprofng/src/Makefile.in | 13112 | --- a/gprofng/src/Makefile.in |
13123 | +++ b/gprofng/src/Makefile.in | 13113 | +++ b/gprofng/src/Makefile.in |
13124 | @@ -324,6 +324,7 @@ CXXFLAGS = @CXXFLAGS@ | 13114 | @@ -324,6 +324,7 @@ CXXFLAGS = @CXXFLAGS@ |
@@ -13138,10 +13128,10 @@ index ba7fdd6e8ad..3a0fc5dbbe7 100644 | |||
13138 | NM = @NM@ | 13128 | NM = @NM@ |
13139 | NMEDIT = @NMEDIT@ | 13129 | NMEDIT = @NMEDIT@ |
13140 | diff --git a/ld/Makefile.in b/ld/Makefile.in | 13130 | diff --git a/ld/Makefile.in b/ld/Makefile.in |
13141 | index 782d4017a60..71bbe487aef 100644 | 13131 | index 0405028e02f..bd18a0a9e55 100644 |
13142 | --- a/ld/Makefile.in | 13132 | --- a/ld/Makefile.in |
13143 | +++ b/ld/Makefile.in | 13133 | +++ b/ld/Makefile.in |
13144 | @@ -383,6 +383,7 @@ CYGPATH_W = @CYGPATH_W@ | 13134 | @@ -384,6 +384,7 @@ CYGPATH_W = @CYGPATH_W@ |
13145 | DATADIRNAME = @DATADIRNAME@ | 13135 | DATADIRNAME = @DATADIRNAME@ |
13146 | DEFS = @DEFS@ | 13136 | DEFS = @DEFS@ |
13147 | DEPDIR = @DEPDIR@ | 13137 | DEPDIR = @DEPDIR@ |
@@ -13149,7 +13139,7 @@ index 782d4017a60..71bbe487aef 100644 | |||
13149 | DSYMUTIL = @DSYMUTIL@ | 13139 | DSYMUTIL = @DSYMUTIL@ |
13150 | DUMPBIN = @DUMPBIN@ | 13140 | DUMPBIN = @DUMPBIN@ |
13151 | ECHO_C = @ECHO_C@ | 13141 | ECHO_C = @ECHO_C@ |
13152 | @@ -433,6 +434,7 @@ LN_S = @LN_S@ | 13142 | @@ -434,6 +435,7 @@ LN_S = @LN_S@ |
13153 | LTLIBOBJS = @LTLIBOBJS@ | 13143 | LTLIBOBJS = @LTLIBOBJS@ |
13154 | MAINT = @MAINT@ | 13144 | MAINT = @MAINT@ |
13155 | MAKEINFO = @MAKEINFO@ | 13145 | MAKEINFO = @MAKEINFO@ |
@@ -13157,7 +13147,7 @@ index 782d4017a60..71bbe487aef 100644 | |||
13157 | MKDIR_P = @MKDIR_P@ | 13147 | MKDIR_P = @MKDIR_P@ |
13158 | MKINSTALLDIRS = @MKINSTALLDIRS@ | 13148 | MKINSTALLDIRS = @MKINSTALLDIRS@ |
13159 | MSGFMT = @MSGFMT@ | 13149 | MSGFMT = @MSGFMT@ |
13160 | @@ -481,6 +483,7 @@ abs_builddir = @abs_builddir@ | 13150 | @@ -485,6 +487,7 @@ abs_builddir = @abs_builddir@ |
13161 | abs_srcdir = @abs_srcdir@ | 13151 | abs_srcdir = @abs_srcdir@ |
13162 | abs_top_builddir = @abs_top_builddir@ | 13152 | abs_top_builddir = @abs_top_builddir@ |
13163 | abs_top_srcdir = @abs_top_srcdir@ | 13153 | abs_top_srcdir = @abs_top_srcdir@ |
@@ -13166,7 +13156,7 @@ index 782d4017a60..71bbe487aef 100644 | |||
13166 | ac_ct_CXX = @ac_ct_CXX@ | 13156 | ac_ct_CXX = @ac_ct_CXX@ |
13167 | ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ | 13157 | ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ |
13168 | diff --git a/ld/configure b/ld/configure | 13158 | diff --git a/ld/configure b/ld/configure |
13169 | index d0a467ac101..45b20013a45 100755 | 13159 | index 5f5dad6d67c..18150633570 100755 |
13170 | --- a/ld/configure | 13160 | --- a/ld/configure |
13171 | +++ b/ld/configure | 13161 | +++ b/ld/configure |
13172 | @@ -700,8 +700,11 @@ OTOOL | 13162 | @@ -700,8 +700,11 @@ OTOOL |
@@ -13181,7 +13171,7 @@ index d0a467ac101..45b20013a45 100755 | |||
13181 | OBJDUMP | 13171 | OBJDUMP |
13182 | LN_S | 13172 | LN_S |
13183 | NM | 13173 | NM |
13184 | @@ -828,6 +831,7 @@ enable_static | 13174 | @@ -831,6 +834,7 @@ enable_static |
13185 | with_pic | 13175 | with_pic |
13186 | enable_fast_install | 13176 | enable_fast_install |
13187 | with_gnu_ld | 13177 | with_gnu_ld |
@@ -13189,7 +13179,7 @@ index d0a467ac101..45b20013a45 100755 | |||
13189 | enable_libtool_lock | 13179 | enable_libtool_lock |
13190 | enable_plugins | 13180 | enable_plugins |
13191 | enable_largefile | 13181 | enable_largefile |
13192 | @@ -1552,6 +1556,8 @@ Optional Packages: | 13182 | @@ -1562,6 +1566,8 @@ Optional Packages: |
13193 | --with-pic try to use only PIC/non-PIC objects [default=use | 13183 | --with-pic try to use only PIC/non-PIC objects [default=use |
13194 | both] | 13184 | both] |
13195 | --with-gnu-ld assume the C compiler uses GNU ld [default=no] | 13185 | --with-gnu-ld assume the C compiler uses GNU ld [default=no] |
@@ -13198,7 +13188,7 @@ index d0a467ac101..45b20013a45 100755 | |||
13198 | --with-lib-path=dir1:dir2... set default LIB_PATH | 13188 | --with-lib-path=dir1:dir2... set default LIB_PATH |
13199 | --with-sysroot=DIR Search for usr/lib et al within DIR. | 13189 | --with-sysroot=DIR Search for usr/lib et al within DIR. |
13200 | --with-system-zlib use installed libz | 13190 | --with-system-zlib use installed libz |
13201 | @@ -5399,8 +5405,8 @@ esac | 13191 | @@ -5533,8 +5539,8 @@ esac |
13202 | 13192 | ||
13203 | 13193 | ||
13204 | 13194 | ||
@@ -13209,7 +13199,7 @@ index d0a467ac101..45b20013a45 100755 | |||
13209 | 13199 | ||
13210 | 13200 | ||
13211 | 13201 | ||
13212 | @@ -5440,7 +5446,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO | 13202 | @@ -5574,7 +5580,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO |
13213 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 | 13203 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 |
13214 | $as_echo_n "checking how to print strings... " >&6; } | 13204 | $as_echo_n "checking how to print strings... " >&6; } |
13215 | # Test print first, because it will be a builtin if present. | 13205 | # Test print first, because it will be a builtin if present. |
@@ -13218,7 +13208,7 @@ index d0a467ac101..45b20013a45 100755 | |||
13218 | test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then | 13208 | test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then |
13219 | ECHO='print -r --' | 13209 | ECHO='print -r --' |
13220 | elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then | 13210 | elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then |
13221 | @@ -6133,8 +6139,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; | 13211 | @@ -6267,8 +6273,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; |
13222 | # Try some XSI features | 13212 | # Try some XSI features |
13223 | xsi_shell=no | 13213 | xsi_shell=no |
13224 | ( _lt_dummy="a/b/c" | 13214 | ( _lt_dummy="a/b/c" |
@@ -13229,7 +13219,7 @@ index d0a467ac101..45b20013a45 100755 | |||
13229 | && eval 'test $(( 1 + 1 )) -eq 2 \ | 13219 | && eval 'test $(( 1 + 1 )) -eq 2 \ |
13230 | && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ | 13220 | && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ |
13231 | && xsi_shell=yes | 13221 | && xsi_shell=yes |
13232 | @@ -6183,6 +6189,80 @@ esac | 13222 | @@ -6317,6 +6323,80 @@ esac |
13233 | 13223 | ||
13234 | 13224 | ||
13235 | 13225 | ||
@@ -13310,7 +13300,7 @@ index d0a467ac101..45b20013a45 100755 | |||
13310 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 | 13300 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 |
13311 | $as_echo_n "checking for $LD option to reload object files... " >&6; } | 13301 | $as_echo_n "checking for $LD option to reload object files... " >&6; } |
13312 | if ${lt_cv_ld_reload_flag+:} false; then : | 13302 | if ${lt_cv_ld_reload_flag+:} false; then : |
13313 | @@ -6199,6 +6279,11 @@ case $reload_flag in | 13303 | @@ -6333,6 +6413,11 @@ case $reload_flag in |
13314 | esac | 13304 | esac |
13315 | reload_cmds='$LD$reload_flag -o $output$reload_objs' | 13305 | reload_cmds='$LD$reload_flag -o $output$reload_objs' |
13316 | case $host_os in | 13306 | case $host_os in |
@@ -13322,7 +13312,7 @@ index d0a467ac101..45b20013a45 100755 | |||
13322 | darwin*) | 13312 | darwin*) |
13323 | if test "$GCC" = yes; then | 13313 | if test "$GCC" = yes; then |
13324 | reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' | 13314 | reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' |
13325 | @@ -6367,7 +6452,8 @@ mingw* | pw32*) | 13315 | @@ -6501,7 +6586,8 @@ mingw* | pw32*) |
13326 | lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' | 13316 | lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' |
13327 | lt_cv_file_magic_cmd='func_win32_libid' | 13317 | lt_cv_file_magic_cmd='func_win32_libid' |
13328 | else | 13318 | else |
@@ -13332,7 +13322,7 @@ index d0a467ac101..45b20013a45 100755 | |||
13332 | lt_cv_file_magic_cmd='$OBJDUMP -f' | 13322 | lt_cv_file_magic_cmd='$OBJDUMP -f' |
13333 | fi | 13323 | fi |
13334 | ;; | 13324 | ;; |
13335 | @@ -6521,6 +6607,21 @@ esac | 13325 | @@ -6655,6 +6741,21 @@ esac |
13336 | fi | 13326 | fi |
13337 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 | 13327 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 |
13338 | $as_echo "$lt_cv_deplibs_check_method" >&6; } | 13328 | $as_echo "$lt_cv_deplibs_check_method" >&6; } |
@@ -13354,7 +13344,7 @@ index d0a467ac101..45b20013a45 100755 | |||
13354 | file_magic_cmd=$lt_cv_file_magic_cmd | 13344 | file_magic_cmd=$lt_cv_file_magic_cmd |
13355 | deplibs_check_method=$lt_cv_deplibs_check_method | 13345 | deplibs_check_method=$lt_cv_deplibs_check_method |
13356 | test -z "$deplibs_check_method" && deplibs_check_method=unknown | 13346 | test -z "$deplibs_check_method" && deplibs_check_method=unknown |
13357 | @@ -6536,6 +6637,157 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown | 13347 | @@ -6670,6 +6771,157 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown |
13358 | 13348 | ||
13359 | 13349 | ||
13360 | 13350 | ||
@@ -13512,7 +13502,7 @@ index d0a467ac101..45b20013a45 100755 | |||
13512 | plugin_option= | 13502 | plugin_option= |
13513 | plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll" | 13503 | plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll" |
13514 | for plugin in $plugin_names; do | 13504 | for plugin in $plugin_names; do |
13515 | @@ -6550,8 +6802,10 @@ for plugin in $plugin_names; do | 13505 | @@ -6684,8 +6936,10 @@ for plugin in $plugin_names; do |
13516 | done | 13506 | done |
13517 | 13507 | ||
13518 | if test -n "$ac_tool_prefix"; then | 13508 | if test -n "$ac_tool_prefix"; then |
@@ -13525,7 +13515,7 @@ index d0a467ac101..45b20013a45 100755 | |||
13525 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | 13515 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
13526 | $as_echo_n "checking for $ac_word... " >&6; } | 13516 | $as_echo_n "checking for $ac_word... " >&6; } |
13527 | if ${ac_cv_prog_AR+:} false; then : | 13517 | if ${ac_cv_prog_AR+:} false; then : |
13528 | @@ -6567,7 +6821,7 @@ do | 13518 | @@ -6701,7 +6955,7 @@ do |
13529 | test -z "$as_dir" && as_dir=. | 13519 | test -z "$as_dir" && as_dir=. |
13530 | for ac_exec_ext in '' $ac_executable_extensions; do | 13520 | for ac_exec_ext in '' $ac_executable_extensions; do |
13531 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | 13521 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
@@ -13534,7 +13524,7 @@ index d0a467ac101..45b20013a45 100755 | |||
13534 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | 13524 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
13535 | break 2 | 13525 | break 2 |
13536 | fi | 13526 | fi |
13537 | @@ -6587,11 +6841,15 @@ $as_echo "no" >&6; } | 13527 | @@ -6721,11 +6975,15 @@ $as_echo "no" >&6; } |
13538 | fi | 13528 | fi |
13539 | 13529 | ||
13540 | 13530 | ||
@@ -13553,7 +13543,7 @@ index d0a467ac101..45b20013a45 100755 | |||
13553 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | 13543 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
13554 | $as_echo_n "checking for $ac_word... " >&6; } | 13544 | $as_echo_n "checking for $ac_word... " >&6; } |
13555 | if ${ac_cv_prog_ac_ct_AR+:} false; then : | 13545 | if ${ac_cv_prog_ac_ct_AR+:} false; then : |
13556 | @@ -6607,7 +6865,7 @@ do | 13546 | @@ -6741,7 +6999,7 @@ do |
13557 | test -z "$as_dir" && as_dir=. | 13547 | test -z "$as_dir" && as_dir=. |
13558 | for ac_exec_ext in '' $ac_executable_extensions; do | 13548 | for ac_exec_ext in '' $ac_executable_extensions; do |
13559 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | 13549 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
@@ -13562,7 +13552,7 @@ index d0a467ac101..45b20013a45 100755 | |||
13562 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | 13552 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
13563 | break 2 | 13553 | break 2 |
13564 | fi | 13554 | fi |
13565 | @@ -6626,6 +6884,10 @@ else | 13555 | @@ -6760,6 +7018,10 @@ else |
13566 | $as_echo "no" >&6; } | 13556 | $as_echo "no" >&6; } |
13567 | fi | 13557 | fi |
13568 | 13558 | ||
@@ -13573,7 +13563,7 @@ index d0a467ac101..45b20013a45 100755 | |||
13573 | if test "x$ac_ct_AR" = x; then | 13563 | if test "x$ac_ct_AR" = x; then |
13574 | AR="false" | 13564 | AR="false" |
13575 | else | 13565 | else |
13576 | @@ -6637,25 +6899,19 @@ ac_tool_warned=yes ;; | 13566 | @@ -6771,25 +7033,19 @@ ac_tool_warned=yes ;; |
13577 | esac | 13567 | esac |
13578 | AR=$ac_ct_AR | 13568 | AR=$ac_ct_AR |
13579 | fi | 13569 | fi |
@@ -13608,7 +13598,7 @@ index d0a467ac101..45b20013a45 100755 | |||
13608 | 13598 | ||
13609 | 13599 | ||
13610 | 13600 | ||
13611 | @@ -6667,6 +6923,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru | 13601 | @@ -6801,6 +7057,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru |
13612 | 13602 | ||
13613 | 13603 | ||
13614 | 13604 | ||
@@ -13673,7 +13663,7 @@ index d0a467ac101..45b20013a45 100755 | |||
13673 | if test -n "$ac_tool_prefix"; then | 13663 | if test -n "$ac_tool_prefix"; then |
13674 | # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. | 13664 | # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. |
13675 | set dummy ${ac_tool_prefix}strip; ac_word=$2 | 13665 | set dummy ${ac_tool_prefix}strip; ac_word=$2 |
13676 | @@ -7006,8 +7320,8 @@ esac | 13666 | @@ -7140,8 +7454,8 @@ esac |
13677 | lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" | 13667 | lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" |
13678 | 13668 | ||
13679 | # Transform an extracted symbol line into symbol name and symbol address | 13669 | # Transform an extracted symbol line into symbol name and symbol address |
@@ -13684,7 +13674,7 @@ index d0a467ac101..45b20013a45 100755 | |||
13684 | 13674 | ||
13685 | # Handle CRLF in mingw tool chain | 13675 | # Handle CRLF in mingw tool chain |
13686 | opt_cr= | 13676 | opt_cr= |
13687 | @@ -7043,6 +7357,7 @@ for ac_symprfx in "" "_"; do | 13677 | @@ -7177,6 +7491,7 @@ for ac_symprfx in "" "_"; do |
13688 | else | 13678 | else |
13689 | lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" | 13679 | lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" |
13690 | fi | 13680 | fi |
@@ -13692,7 +13682,7 @@ index d0a467ac101..45b20013a45 100755 | |||
13692 | 13682 | ||
13693 | # Check to see that the pipe works correctly. | 13683 | # Check to see that the pipe works correctly. |
13694 | pipe_works=no | 13684 | pipe_works=no |
13695 | @@ -7084,6 +7399,18 @@ _LT_EOF | 13685 | @@ -7218,6 +7533,18 @@ _LT_EOF |
13696 | if $GREP ' nm_test_var$' "$nlist" >/dev/null; then | 13686 | if $GREP ' nm_test_var$' "$nlist" >/dev/null; then |
13697 | if $GREP ' nm_test_func$' "$nlist" >/dev/null; then | 13687 | if $GREP ' nm_test_func$' "$nlist" >/dev/null; then |
13698 | cat <<_LT_EOF > conftest.$ac_ext | 13688 | cat <<_LT_EOF > conftest.$ac_ext |
@@ -13711,7 +13701,7 @@ index d0a467ac101..45b20013a45 100755 | |||
13711 | #ifdef __cplusplus | 13701 | #ifdef __cplusplus |
13712 | extern "C" { | 13702 | extern "C" { |
13713 | #endif | 13703 | #endif |
13714 | @@ -7095,7 +7422,7 @@ _LT_EOF | 13704 | @@ -7229,7 +7556,7 @@ _LT_EOF |
13715 | cat <<_LT_EOF >> conftest.$ac_ext | 13705 | cat <<_LT_EOF >> conftest.$ac_ext |
13716 | 13706 | ||
13717 | /* The mapping between symbol names and symbols. */ | 13707 | /* The mapping between symbol names and symbols. */ |
@@ -13720,7 +13710,7 @@ index d0a467ac101..45b20013a45 100755 | |||
13720 | const char *name; | 13710 | const char *name; |
13721 | void *address; | 13711 | void *address; |
13722 | } | 13712 | } |
13723 | @@ -7121,8 +7448,8 @@ static const void *lt_preloaded_setup() { | 13713 | @@ -7255,8 +7582,8 @@ static const void *lt_preloaded_setup() { |
13724 | _LT_EOF | 13714 | _LT_EOF |
13725 | # Now try linking the two files. | 13715 | # Now try linking the two files. |
13726 | mv conftest.$ac_objext conftstm.$ac_objext | 13716 | mv conftest.$ac_objext conftstm.$ac_objext |
@@ -13731,7 +13721,7 @@ index d0a467ac101..45b20013a45 100755 | |||
13731 | LIBS="conftstm.$ac_objext" | 13721 | LIBS="conftstm.$ac_objext" |
13732 | CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" | 13722 | CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" |
13733 | if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 | 13723 | if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 |
13734 | @@ -7132,8 +7459,8 @@ _LT_EOF | 13724 | @@ -7266,8 +7593,8 @@ _LT_EOF |
13735 | test $ac_status = 0; } && test -s conftest${ac_exeext}; then | 13725 | test $ac_status = 0; } && test -s conftest${ac_exeext}; then |
13736 | pipe_works=yes | 13726 | pipe_works=yes |
13737 | fi | 13727 | fi |
@@ -13742,7 +13732,7 @@ index d0a467ac101..45b20013a45 100755 | |||
13742 | else | 13732 | else |
13743 | echo "cannot find nm_test_func in $nlist" >&5 | 13733 | echo "cannot find nm_test_func in $nlist" >&5 |
13744 | fi | 13734 | fi |
13745 | @@ -7170,6 +7497,17 @@ else | 13735 | @@ -7304,6 +7631,17 @@ else |
13746 | $as_echo "ok" >&6; } | 13736 | $as_echo "ok" >&6; } |
13747 | fi | 13737 | fi |
13748 | 13738 | ||
@@ -13760,7 +13750,7 @@ index d0a467ac101..45b20013a45 100755 | |||
13760 | 13750 | ||
13761 | 13751 | ||
13762 | 13752 | ||
13763 | @@ -7186,6 +7524,44 @@ fi | 13753 | @@ -7320,6 +7658,44 @@ fi |
13764 | 13754 | ||
13765 | 13755 | ||
13766 | 13756 | ||
@@ -13805,7 +13795,7 @@ index d0a467ac101..45b20013a45 100755 | |||
13805 | 13795 | ||
13806 | 13796 | ||
13807 | 13797 | ||
13808 | @@ -7397,6 +7773,123 @@ esac | 13798 | @@ -7531,6 +7907,123 @@ esac |
13809 | 13799 | ||
13810 | need_locks="$enable_libtool_lock" | 13800 | need_locks="$enable_libtool_lock" |
13811 | 13801 | ||
@@ -13929,7 +13919,7 @@ index d0a467ac101..45b20013a45 100755 | |||
13929 | 13919 | ||
13930 | case $host_os in | 13920 | case $host_os in |
13931 | rhapsody* | darwin*) | 13921 | rhapsody* | darwin*) |
13932 | @@ -7960,6 +8453,8 @@ _LT_EOF | 13922 | @@ -8094,6 +8587,8 @@ _LT_EOF |
13933 | $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 | 13923 | $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 |
13934 | echo "$AR cru libconftest.a conftest.o" >&5 | 13924 | echo "$AR cru libconftest.a conftest.o" >&5 |
13935 | $AR cru libconftest.a conftest.o 2>&5 | 13925 | $AR cru libconftest.a conftest.o 2>&5 |
@@ -13938,7 +13928,7 @@ index d0a467ac101..45b20013a45 100755 | |||
13938 | cat > conftest.c << _LT_EOF | 13928 | cat > conftest.c << _LT_EOF |
13939 | int main() { return 0;} | 13929 | int main() { return 0;} |
13940 | _LT_EOF | 13930 | _LT_EOF |
13941 | @@ -8028,6 +8523,16 @@ done | 13931 | @@ -8162,6 +8657,16 @@ done |
13942 | 13932 | ||
13943 | 13933 | ||
13944 | 13934 | ||
@@ -13955,7 +13945,7 @@ index d0a467ac101..45b20013a45 100755 | |||
13955 | 13945 | ||
13956 | 13946 | ||
13957 | # Set options | 13947 | # Set options |
13958 | @@ -8543,8 +9048,6 @@ fi | 13948 | @@ -8677,8 +9182,6 @@ fi |
13959 | lt_prog_compiler_pic= | 13949 | lt_prog_compiler_pic= |
13960 | lt_prog_compiler_static= | 13950 | lt_prog_compiler_static= |
13961 | 13951 | ||
@@ -13964,7 +13954,7 @@ index d0a467ac101..45b20013a45 100755 | |||
13964 | 13954 | ||
13965 | if test "$GCC" = yes; then | 13955 | if test "$GCC" = yes; then |
13966 | lt_prog_compiler_wl='-Wl,' | 13956 | lt_prog_compiler_wl='-Wl,' |
13967 | @@ -8710,6 +9213,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } | 13957 | @@ -8844,6 +9347,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } |
13968 | lt_prog_compiler_pic='--shared' | 13958 | lt_prog_compiler_pic='--shared' |
13969 | lt_prog_compiler_static='--static' | 13959 | lt_prog_compiler_static='--static' |
13970 | ;; | 13960 | ;; |
@@ -13977,7 +13967,7 @@ index d0a467ac101..45b20013a45 100755 | |||
13977 | pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) | 13967 | pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) |
13978 | # Portland Group compilers (*not* the Pentium gcc compiler, | 13968 | # Portland Group compilers (*not* the Pentium gcc compiler, |
13979 | # which looks to be a dead project) | 13969 | # which looks to be a dead project) |
13980 | @@ -8772,7 +9281,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } | 13970 | @@ -8906,7 +9415,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } |
13981 | lt_prog_compiler_pic='-KPIC' | 13971 | lt_prog_compiler_pic='-KPIC' |
13982 | lt_prog_compiler_static='-Bstatic' | 13972 | lt_prog_compiler_static='-Bstatic' |
13983 | case $cc_basename in | 13973 | case $cc_basename in |
@@ -13986,7 +13976,7 @@ index d0a467ac101..45b20013a45 100755 | |||
13986 | lt_prog_compiler_wl='-Qoption ld ';; | 13976 | lt_prog_compiler_wl='-Qoption ld ';; |
13987 | *) | 13977 | *) |
13988 | lt_prog_compiler_wl='-Wl,';; | 13978 | lt_prog_compiler_wl='-Wl,';; |
13989 | @@ -8829,13 +9338,17 @@ case $host_os in | 13979 | @@ -8963,13 +9472,17 @@ case $host_os in |
13990 | lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" | 13980 | lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" |
13991 | ;; | 13981 | ;; |
13992 | esac | 13982 | esac |
@@ -14010,7 +14000,7 @@ index d0a467ac101..45b20013a45 100755 | |||
14010 | 14000 | ||
14011 | # | 14001 | # |
14012 | # Check to make sure the PIC flag actually works. | 14002 | # Check to make sure the PIC flag actually works. |
14013 | @@ -8896,6 +9409,11 @@ fi | 14003 | @@ -9030,6 +9543,11 @@ fi |
14014 | 14004 | ||
14015 | 14005 | ||
14016 | 14006 | ||
@@ -14022,7 +14012,7 @@ index d0a467ac101..45b20013a45 100755 | |||
14022 | # | 14012 | # |
14023 | # Check to make sure the static flag actually works. | 14013 | # Check to make sure the static flag actually works. |
14024 | # | 14014 | # |
14025 | @@ -9246,7 +9764,8 @@ _LT_EOF | 14015 | @@ -9380,7 +9898,8 @@ _LT_EOF |
14026 | allow_undefined_flag=unsupported | 14016 | allow_undefined_flag=unsupported |
14027 | always_export_symbols=no | 14017 | always_export_symbols=no |
14028 | enable_shared_with_static_runtimes=yes | 14018 | enable_shared_with_static_runtimes=yes |
@@ -14032,7 +14022,7 @@ index d0a467ac101..45b20013a45 100755 | |||
14032 | 14022 | ||
14033 | if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then | 14023 | if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then |
14034 | archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' | 14024 | archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' |
14035 | @@ -9345,12 +9864,12 @@ _LT_EOF | 14025 | @@ -9479,12 +9998,12 @@ _LT_EOF |
14036 | whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' | 14026 | whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' |
14037 | hardcode_libdir_flag_spec= | 14027 | hardcode_libdir_flag_spec= |
14038 | hardcode_libdir_flag_spec_ld='-rpath $libdir' | 14028 | hardcode_libdir_flag_spec_ld='-rpath $libdir' |
@@ -14047,7 +14037,7 @@ index d0a467ac101..45b20013a45 100755 | |||
14047 | fi | 14037 | fi |
14048 | ;; | 14038 | ;; |
14049 | esac | 14039 | esac |
14050 | @@ -9364,8 +9883,8 @@ _LT_EOF | 14040 | @@ -9498,8 +10017,8 @@ _LT_EOF |
14051 | archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' | 14041 | archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' |
14052 | wlarc= | 14042 | wlarc= |
14053 | else | 14043 | else |
@@ -14058,7 +14048,7 @@ index d0a467ac101..45b20013a45 100755 | |||
14058 | fi | 14048 | fi |
14059 | ;; | 14049 | ;; |
14060 | 14050 | ||
14061 | @@ -9383,8 +9902,8 @@ _LT_EOF | 14051 | @@ -9517,8 +10036,8 @@ _LT_EOF |
14062 | 14052 | ||
14063 | _LT_EOF | 14053 | _LT_EOF |
14064 | elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then | 14054 | elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then |
@@ -14069,7 +14059,7 @@ index d0a467ac101..45b20013a45 100755 | |||
14069 | else | 14059 | else |
14070 | ld_shlibs=no | 14060 | ld_shlibs=no |
14071 | fi | 14061 | fi |
14072 | @@ -9430,8 +9949,8 @@ _LT_EOF | 14062 | @@ -9564,8 +10083,8 @@ _LT_EOF |
14073 | 14063 | ||
14074 | *) | 14064 | *) |
14075 | if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then | 14065 | if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then |
@@ -14080,7 +14070,7 @@ index d0a467ac101..45b20013a45 100755 | |||
14080 | else | 14070 | else |
14081 | ld_shlibs=no | 14071 | ld_shlibs=no |
14082 | fi | 14072 | fi |
14083 | @@ -9561,7 +10080,13 @@ _LT_EOF | 14073 | @@ -9695,7 +10214,13 @@ _LT_EOF |
14084 | allow_undefined_flag='-berok' | 14074 | allow_undefined_flag='-berok' |
14085 | # Determine the default libpath from the value encoded in an | 14075 | # Determine the default libpath from the value encoded in an |
14086 | # empty executable. | 14076 | # empty executable. |
@@ -14095,7 +14085,7 @@ index d0a467ac101..45b20013a45 100755 | |||
14095 | /* end confdefs.h. */ | 14085 | /* end confdefs.h. */ |
14096 | 14086 | ||
14097 | int | 14087 | int |
14098 | @@ -9574,22 +10099,29 @@ main () | 14088 | @@ -9708,22 +10233,29 @@ main () |
14099 | _ACEOF | 14089 | _ACEOF |
14100 | if ac_fn_c_try_link "$LINENO"; then : | 14090 | if ac_fn_c_try_link "$LINENO"; then : |
14101 | 14091 | ||
@@ -14138,7 +14128,7 @@ index d0a467ac101..45b20013a45 100755 | |||
14138 | 14128 | ||
14139 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" | 14129 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" |
14140 | archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" | 14130 | 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" |
14141 | @@ -9601,7 +10133,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | 14131 | @@ -9735,7 +10267,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
14142 | else | 14132 | else |
14143 | # Determine the default libpath from the value encoded in an | 14133 | # Determine the default libpath from the value encoded in an |
14144 | # empty executable. | 14134 | # empty executable. |
@@ -14153,7 +14143,7 @@ index d0a467ac101..45b20013a45 100755 | |||
14153 | /* end confdefs.h. */ | 14143 | /* end confdefs.h. */ |
14154 | 14144 | ||
14155 | int | 14145 | int |
14156 | @@ -9614,22 +10152,29 @@ main () | 14146 | @@ -9748,22 +10286,29 @@ main () |
14157 | _ACEOF | 14147 | _ACEOF |
14158 | if ac_fn_c_try_link "$LINENO"; then : | 14148 | if ac_fn_c_try_link "$LINENO"; then : |
14159 | 14149 | ||
@@ -14196,7 +14186,7 @@ index d0a467ac101..45b20013a45 100755 | |||
14196 | 14186 | ||
14197 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" | 14187 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" |
14198 | # Warning - without using the other run time loading flags, | 14188 | # Warning - without using the other run time loading flags, |
14199 | @@ -9673,21 +10218,64 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | 14189 | @@ -9807,21 +10352,64 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
14200 | # When not using gcc, we currently assume that we are using | 14190 | # When not using gcc, we currently assume that we are using |
14201 | # Microsoft Visual C++. | 14191 | # Microsoft Visual C++. |
14202 | # hardcode_libdir_flag_spec is actually meaningless, as there is | 14192 | # hardcode_libdir_flag_spec is actually meaningless, as there is |
@@ -14276,7 +14266,7 @@ index d0a467ac101..45b20013a45 100755 | |||
14276 | ;; | 14266 | ;; |
14277 | 14267 | ||
14278 | darwin* | rhapsody*) | 14268 | darwin* | rhapsody*) |
14279 | @@ -9748,7 +10336,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | 14269 | @@ -9882,7 +10470,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
14280 | 14270 | ||
14281 | # FreeBSD 3 and greater uses gcc -shared to do shared libraries. | 14271 | # FreeBSD 3 and greater uses gcc -shared to do shared libraries. |
14282 | freebsd* | dragonfly*) | 14272 | freebsd* | dragonfly*) |
@@ -14285,7 +14275,7 @@ index d0a467ac101..45b20013a45 100755 | |||
14285 | hardcode_libdir_flag_spec='-R$libdir' | 14275 | hardcode_libdir_flag_spec='-R$libdir' |
14286 | hardcode_direct=yes | 14276 | hardcode_direct=yes |
14287 | hardcode_shlibpath_var=no | 14277 | hardcode_shlibpath_var=no |
14288 | @@ -9756,7 +10344,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | 14278 | @@ -9890,7 +10478,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
14289 | 14279 | ||
14290 | hpux9*) | 14280 | hpux9*) |
14291 | if test "$GCC" = yes; then | 14281 | if test "$GCC" = yes; then |
@@ -14294,7 +14284,7 @@ index d0a467ac101..45b20013a45 100755 | |||
14294 | else | 14284 | else |
14295 | archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' | 14285 | 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' |
14296 | fi | 14286 | fi |
14297 | @@ -9772,7 +10360,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | 14287 | @@ -9906,7 +10494,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
14298 | 14288 | ||
14299 | hpux10*) | 14289 | hpux10*) |
14300 | if test "$GCC" = yes && test "$with_gnu_ld" = no; then | 14290 | if test "$GCC" = yes && test "$with_gnu_ld" = no; then |
@@ -14303,7 +14293,7 @@ index d0a467ac101..45b20013a45 100755 | |||
14303 | else | 14293 | else |
14304 | archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' | 14294 | archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' |
14305 | fi | 14295 | fi |
14306 | @@ -9796,10 +10384,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | 14296 | @@ -9930,10 +10518,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
14307 | archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' | 14297 | archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' |
14308 | ;; | 14298 | ;; |
14309 | ia64*) | 14299 | ia64*) |
@@ -14316,7 +14306,7 @@ index d0a467ac101..45b20013a45 100755 | |||
14316 | ;; | 14306 | ;; |
14317 | esac | 14307 | esac |
14318 | else | 14308 | else |
14319 | @@ -9878,23 +10466,36 @@ fi | 14309 | @@ -10012,23 +10600,36 @@ fi |
14320 | 14310 | ||
14321 | irix5* | irix6* | nonstopux*) | 14311 | irix5* | irix6* | nonstopux*) |
14322 | if test "$GCC" = yes; then | 14312 | if test "$GCC" = yes; then |
@@ -14361,7 +14351,7 @@ index d0a467ac101..45b20013a45 100755 | |||
14361 | else | 14351 | else |
14362 | archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' | 14352 | 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' |
14363 | archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' | 14353 | 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' |
14364 | @@ -9979,7 +10580,7 @@ rm -f core conftest.err conftest.$ac_objext \ | 14354 | @@ -10113,7 +10714,7 @@ rm -f core conftest.err conftest.$ac_objext \ |
14365 | osf4* | osf5*) # as osf3* with the addition of -msym flag | 14355 | osf4* | osf5*) # as osf3* with the addition of -msym flag |
14366 | if test "$GCC" = yes; then | 14356 | if test "$GCC" = yes; then |
14367 | allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' | 14357 | allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' |
@@ -14370,7 +14360,7 @@ index d0a467ac101..45b20013a45 100755 | |||
14370 | hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' | 14360 | hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' |
14371 | else | 14361 | else |
14372 | allow_undefined_flag=' -expect_unresolved \*' | 14362 | allow_undefined_flag=' -expect_unresolved \*' |
14373 | @@ -9998,9 +10599,9 @@ rm -f core conftest.err conftest.$ac_objext \ | 14363 | @@ -10132,9 +10733,9 @@ rm -f core conftest.err conftest.$ac_objext \ |
14374 | no_undefined_flag=' -z defs' | 14364 | no_undefined_flag=' -z defs' |
14375 | if test "$GCC" = yes; then | 14365 | if test "$GCC" = yes; then |
14376 | wlarc='${wl}' | 14366 | wlarc='${wl}' |
@@ -14382,7 +14372,7 @@ index d0a467ac101..45b20013a45 100755 | |||
14382 | else | 14372 | else |
14383 | case `$CC -V 2>&1` in | 14373 | case `$CC -V 2>&1` in |
14384 | *"Compilers 5.0"*) | 14374 | *"Compilers 5.0"*) |
14385 | @@ -10576,8 +11177,9 @@ cygwin* | mingw* | pw32* | cegcc*) | 14375 | @@ -10710,8 +11311,9 @@ cygwin* | mingw* | pw32* | cegcc*) |
14386 | need_version=no | 14376 | need_version=no |
14387 | need_lib_prefix=no | 14377 | need_lib_prefix=no |
14388 | 14378 | ||
@@ -14394,7 +14384,7 @@ index d0a467ac101..45b20013a45 100755 | |||
14394 | library_names_spec='$libname.dll.a' | 14384 | library_names_spec='$libname.dll.a' |
14395 | # DLL is installed to $(libdir)/../bin by postinstall_cmds | 14385 | # DLL is installed to $(libdir)/../bin by postinstall_cmds |
14396 | postinstall_cmds='base_file=`basename \${file}`~ | 14386 | postinstall_cmds='base_file=`basename \${file}`~ |
14397 | @@ -10610,13 +11212,71 @@ cygwin* | mingw* | pw32* | cegcc*) | 14387 | @@ -10744,13 +11346,71 @@ cygwin* | mingw* | pw32* | cegcc*) |
14398 | library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' | 14388 | library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' |
14399 | ;; | 14389 | ;; |
14400 | esac | 14390 | esac |
@@ -14467,16 +14457,16 @@ index d0a467ac101..45b20013a45 100755 | |||
14467 | # FIXME: first we should search . and the directory the executable is in | 14457 | # FIXME: first we should search . and the directory the executable is in |
14468 | shlibpath_var=PATH | 14458 | shlibpath_var=PATH |
14469 | ;; | 14459 | ;; |
14470 | @@ -11494,7 +12154,7 @@ else | 14460 | @@ -11628,7 +12288,7 @@ else |
14471 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 | 14461 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 |
14472 | lt_status=$lt_dlunknown | 14462 | lt_status=$lt_dlunknown |
14473 | cat > conftest.$ac_ext <<_LT_EOF | 14463 | cat > conftest.$ac_ext <<_LT_EOF |
14474 | -#line 11494 "configure" | 14464 | -#line 11628 "configure" |
14475 | +#line $LINENO "configure" | 14465 | +#line $LINENO "configure" |
14476 | #include "confdefs.h" | 14466 | #include "confdefs.h" |
14477 | 14467 | ||
14478 | #if HAVE_DLFCN_H | 14468 | #if HAVE_DLFCN_H |
14479 | @@ -11538,10 +12198,10 @@ else | 14469 | @@ -11672,10 +12332,10 @@ else |
14480 | /* When -fvisbility=hidden is used, assume the code has been annotated | 14470 | /* When -fvisbility=hidden is used, assume the code has been annotated |
14481 | correspondingly for the symbols needed. */ | 14471 | correspondingly for the symbols needed. */ |
14482 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) | 14472 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) |
@@ -14489,16 +14479,16 @@ index d0a467ac101..45b20013a45 100755 | |||
14489 | int main () | 14479 | int main () |
14490 | { | 14480 | { |
14491 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); | 14481 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); |
14492 | @@ -11600,7 +12260,7 @@ else | 14482 | @@ -11734,7 +12394,7 @@ else |
14493 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 | 14483 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 |
14494 | lt_status=$lt_dlunknown | 14484 | lt_status=$lt_dlunknown |
14495 | cat > conftest.$ac_ext <<_LT_EOF | 14485 | cat > conftest.$ac_ext <<_LT_EOF |
14496 | -#line 11600 "configure" | 14486 | -#line 11734 "configure" |
14497 | +#line $LINENO "configure" | 14487 | +#line $LINENO "configure" |
14498 | #include "confdefs.h" | 14488 | #include "confdefs.h" |
14499 | 14489 | ||
14500 | #if HAVE_DLFCN_H | 14490 | #if HAVE_DLFCN_H |
14501 | @@ -11644,10 +12304,10 @@ else | 14491 | @@ -11778,10 +12438,10 @@ else |
14502 | /* When -fvisbility=hidden is used, assume the code has been annotated | 14492 | /* When -fvisbility=hidden is used, assume the code has been annotated |
14503 | correspondingly for the symbols needed. */ | 14493 | correspondingly for the symbols needed. */ |
14504 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) | 14494 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) |
@@ -14511,7 +14501,7 @@ index d0a467ac101..45b20013a45 100755 | |||
14511 | int main () | 14501 | int main () |
14512 | { | 14502 | { |
14513 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); | 14503 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); |
14514 | @@ -12039,6 +12699,7 @@ $RM -r conftest* | 14504 | @@ -12173,6 +12833,7 @@ $RM -r conftest* |
14515 | 14505 | ||
14516 | # Allow CC to be a program name with arguments. | 14506 | # Allow CC to be a program name with arguments. |
14517 | lt_save_CC=$CC | 14507 | lt_save_CC=$CC |
@@ -14519,7 +14509,7 @@ index d0a467ac101..45b20013a45 100755 | |||
14519 | lt_save_LD=$LD | 14509 | lt_save_LD=$LD |
14520 | lt_save_GCC=$GCC | 14510 | lt_save_GCC=$GCC |
14521 | GCC=$GXX | 14511 | GCC=$GXX |
14522 | @@ -12056,6 +12717,7 @@ $RM -r conftest* | 14512 | @@ -12190,6 +12851,7 @@ $RM -r conftest* |
14523 | fi | 14513 | fi |
14524 | test -z "${LDCXX+set}" || LD=$LDCXX | 14514 | test -z "${LDCXX+set}" || LD=$LDCXX |
14525 | CC=${CXX-"c++"} | 14515 | CC=${CXX-"c++"} |
@@ -14527,7 +14517,7 @@ index d0a467ac101..45b20013a45 100755 | |||
14527 | compiler=$CC | 14517 | compiler=$CC |
14528 | compiler_CXX=$CC | 14518 | compiler_CXX=$CC |
14529 | for cc_temp in $compiler""; do | 14519 | for cc_temp in $compiler""; do |
14530 | @@ -12338,7 +13000,13 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie | 14520 | @@ -12472,7 +13134,13 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie |
14531 | allow_undefined_flag_CXX='-berok' | 14521 | allow_undefined_flag_CXX='-berok' |
14532 | # Determine the default libpath from the value encoded in an empty | 14522 | # Determine the default libpath from the value encoded in an empty |
14533 | # executable. | 14523 | # executable. |
@@ -14542,7 +14532,7 @@ index d0a467ac101..45b20013a45 100755 | |||
14542 | /* end confdefs.h. */ | 14532 | /* end confdefs.h. */ |
14543 | 14533 | ||
14544 | int | 14534 | int |
14545 | @@ -12351,22 +13019,29 @@ main () | 14535 | @@ -12485,22 +13153,29 @@ main () |
14546 | _ACEOF | 14536 | _ACEOF |
14547 | if ac_fn_cxx_try_link "$LINENO"; then : | 14537 | if ac_fn_cxx_try_link "$LINENO"; then : |
14548 | 14538 | ||
@@ -14585,7 +14575,7 @@ index d0a467ac101..45b20013a45 100755 | |||
14585 | 14575 | ||
14586 | hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" | 14576 | hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" |
14587 | 14577 | ||
14588 | @@ -12379,7 +13054,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | 14578 | @@ -12513,7 +13188,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
14589 | else | 14579 | else |
14590 | # Determine the default libpath from the value encoded in an | 14580 | # Determine the default libpath from the value encoded in an |
14591 | # empty executable. | 14581 | # empty executable. |
@@ -14600,7 +14590,7 @@ index d0a467ac101..45b20013a45 100755 | |||
14600 | /* end confdefs.h. */ | 14590 | /* end confdefs.h. */ |
14601 | 14591 | ||
14602 | int | 14592 | int |
14603 | @@ -12392,22 +13073,29 @@ main () | 14593 | @@ -12526,22 +13207,29 @@ main () |
14604 | _ACEOF | 14594 | _ACEOF |
14605 | if ac_fn_cxx_try_link "$LINENO"; then : | 14595 | if ac_fn_cxx_try_link "$LINENO"; then : |
14606 | 14596 | ||
@@ -14643,7 +14633,7 @@ index d0a467ac101..45b20013a45 100755 | |||
14643 | 14633 | ||
14644 | hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" | 14634 | hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" |
14645 | # Warning - without using the other run time loading flags, | 14635 | # Warning - without using the other run time loading flags, |
14646 | @@ -12450,29 +13138,75 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | 14636 | @@ -12584,29 +13272,75 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
14647 | ;; | 14637 | ;; |
14648 | 14638 | ||
14649 | cygwin* | mingw* | pw32* | cegcc*) | 14639 | cygwin* | mingw* | pw32* | cegcc*) |
@@ -14742,7 +14732,7 @@ index d0a467ac101..45b20013a45 100755 | |||
14742 | darwin* | rhapsody*) | 14732 | darwin* | rhapsody*) |
14743 | 14733 | ||
14744 | 14734 | ||
14745 | @@ -12578,7 +13312,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | 14735 | @@ -12712,7 +13446,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
14746 | ;; | 14736 | ;; |
14747 | *) | 14737 | *) |
14748 | if test "$GXX" = yes; then | 14738 | if test "$GXX" = yes; then |
@@ -14751,7 +14741,7 @@ index d0a467ac101..45b20013a45 100755 | |||
14751 | else | 14741 | else |
14752 | # FIXME: insert proper C++ library support | 14742 | # FIXME: insert proper C++ library support |
14753 | ld_shlibs_CXX=no | 14743 | ld_shlibs_CXX=no |
14754 | @@ -12649,10 +13383,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | 14744 | @@ -12783,10 +13517,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
14755 | archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' | 14745 | archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' |
14756 | ;; | 14746 | ;; |
14757 | ia64*) | 14747 | ia64*) |
@@ -14764,7 +14754,7 @@ index d0a467ac101..45b20013a45 100755 | |||
14764 | ;; | 14754 | ;; |
14765 | esac | 14755 | esac |
14766 | fi | 14756 | fi |
14767 | @@ -12693,9 +13427,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | 14757 | @@ -12827,9 +13561,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
14768 | *) | 14758 | *) |
14769 | if test "$GXX" = yes; then | 14759 | if test "$GXX" = yes; then |
14770 | if test "$with_gnu_ld" = no; then | 14760 | if test "$with_gnu_ld" = no; then |
@@ -14776,7 +14766,7 @@ index d0a467ac101..45b20013a45 100755 | |||
14776 | fi | 14766 | fi |
14777 | fi | 14767 | fi |
14778 | link_all_deplibs_CXX=yes | 14768 | link_all_deplibs_CXX=yes |
14779 | @@ -12765,20 +13499,20 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | 14769 | @@ -12899,20 +13633,20 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
14780 | prelink_cmds_CXX='tpldir=Template.dir~ | 14770 | prelink_cmds_CXX='tpldir=Template.dir~ |
14781 | rm -rf $tpldir~ | 14771 | rm -rf $tpldir~ |
14782 | $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ | 14772 | $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ |
@@ -14801,7 +14791,7 @@ index d0a467ac101..45b20013a45 100755 | |||
14801 | ;; | 14791 | ;; |
14802 | *) # Version 6 and above use weak symbols | 14792 | *) # Version 6 and above use weak symbols |
14803 | archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' | 14793 | archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' |
14804 | @@ -12973,7 +13707,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | 14794 | @@ -13107,7 +13841,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
14805 | archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' | 14795 | 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' |
14806 | ;; | 14796 | ;; |
14807 | *) | 14797 | *) |
@@ -14810,7 +14800,7 @@ index d0a467ac101..45b20013a45 100755 | |||
14810 | ;; | 14800 | ;; |
14811 | esac | 14801 | esac |
14812 | 14802 | ||
14813 | @@ -13019,7 +13753,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | 14803 | @@ -13153,7 +13887,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
14814 | 14804 | ||
14815 | solaris*) | 14805 | solaris*) |
14816 | case $cc_basename in | 14806 | case $cc_basename in |
@@ -14819,7 +14809,7 @@ index d0a467ac101..45b20013a45 100755 | |||
14819 | # Sun C++ 4.2, 5.x and Centerline C++ | 14809 | # Sun C++ 4.2, 5.x and Centerline C++ |
14820 | archive_cmds_need_lc_CXX=yes | 14810 | archive_cmds_need_lc_CXX=yes |
14821 | no_undefined_flag_CXX=' -zdefs' | 14811 | no_undefined_flag_CXX=' -zdefs' |
14822 | @@ -13060,9 +13794,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | 14812 | @@ -13194,9 +13928,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
14823 | if test "$GXX" = yes && test "$with_gnu_ld" = no; then | 14813 | if test "$GXX" = yes && test "$with_gnu_ld" = no; then |
14824 | no_undefined_flag_CXX=' ${wl}-z ${wl}defs' | 14814 | no_undefined_flag_CXX=' ${wl}-z ${wl}defs' |
14825 | if $CC --version | $GREP -v '^2\.7' > /dev/null; then | 14815 | if $CC --version | $GREP -v '^2\.7' > /dev/null; then |
@@ -14831,7 +14821,7 @@ index d0a467ac101..45b20013a45 100755 | |||
14831 | 14821 | ||
14832 | # Commands to make compiler produce verbose output that lists | 14822 | # Commands to make compiler produce verbose output that lists |
14833 | # what "hidden" libraries, object files and flags are used when | 14823 | # what "hidden" libraries, object files and flags are used when |
14834 | @@ -13197,6 +13931,13 @@ private: | 14824 | @@ -13331,6 +14065,13 @@ private: |
14835 | }; | 14825 | }; |
14836 | _LT_EOF | 14826 | _LT_EOF |
14837 | 14827 | ||
@@ -14845,7 +14835,7 @@ index d0a467ac101..45b20013a45 100755 | |||
14845 | if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 | 14835 | if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 |
14846 | (eval $ac_compile) 2>&5 | 14836 | (eval $ac_compile) 2>&5 |
14847 | ac_status=$? | 14837 | ac_status=$? |
14848 | @@ -13210,7 +13951,7 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 | 14838 | @@ -13344,7 +14085,7 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 |
14849 | pre_test_object_deps_done=no | 14839 | pre_test_object_deps_done=no |
14850 | 14840 | ||
14851 | for p in `eval "$output_verbose_link_cmd"`; do | 14841 | for p in `eval "$output_verbose_link_cmd"`; do |
@@ -14854,7 +14844,7 @@ index d0a467ac101..45b20013a45 100755 | |||
14854 | 14844 | ||
14855 | -L* | -R* | -l*) | 14845 | -L* | -R* | -l*) |
14856 | # Some compilers place space between "-{L,R}" and the path. | 14846 | # Some compilers place space between "-{L,R}" and the path. |
14857 | @@ -13219,13 +13960,22 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 | 14847 | @@ -13353,13 +14094,22 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 |
14858 | test $p = "-R"; then | 14848 | test $p = "-R"; then |
14859 | prev=$p | 14849 | prev=$p |
14860 | continue | 14850 | continue |
@@ -14881,7 +14871,7 @@ index d0a467ac101..45b20013a45 100755 | |||
14881 | # Internal compiler library paths should come after those | 14871 | # Internal compiler library paths should come after those |
14882 | # provided the user. The postdeps already come after the | 14872 | # provided the user. The postdeps already come after the |
14883 | # user supplied libs so there is no need to process them. | 14873 | # user supplied libs so there is no need to process them. |
14884 | @@ -13245,8 +13995,10 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 | 14874 | @@ -13379,8 +14129,10 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 |
14885 | postdeps_CXX="${postdeps_CXX} ${prev}${p}" | 14875 | postdeps_CXX="${postdeps_CXX} ${prev}${p}" |
14886 | fi | 14876 | fi |
14887 | fi | 14877 | fi |
@@ -14892,7 +14882,7 @@ index d0a467ac101..45b20013a45 100755 | |||
14892 | *.$objext) | 14882 | *.$objext) |
14893 | # This assumes that the test object file only shows up | 14883 | # This assumes that the test object file only shows up |
14894 | # once in the compiler output. | 14884 | # once in the compiler output. |
14895 | @@ -13282,6 +14034,7 @@ else | 14885 | @@ -13416,6 +14168,7 @@ else |
14896 | fi | 14886 | fi |
14897 | 14887 | ||
14898 | $RM -f confest.$objext | 14888 | $RM -f confest.$objext |
@@ -14900,7 +14890,7 @@ index d0a467ac101..45b20013a45 100755 | |||
14900 | 14890 | ||
14901 | # PORTME: override above test on systems where it is broken | 14891 | # PORTME: override above test on systems where it is broken |
14902 | case $host_os in | 14892 | case $host_os in |
14903 | @@ -13317,7 +14070,7 @@ linux*) | 14893 | @@ -13451,7 +14204,7 @@ linux*) |
14904 | 14894 | ||
14905 | solaris*) | 14895 | solaris*) |
14906 | case $cc_basename in | 14896 | case $cc_basename in |
@@ -14909,7 +14899,7 @@ index d0a467ac101..45b20013a45 100755 | |||
14909 | # The more standards-conforming stlport4 library is | 14899 | # The more standards-conforming stlport4 library is |
14910 | # incompatible with the Cstd library. Avoid specifying | 14900 | # incompatible with the Cstd library. Avoid specifying |
14911 | # it if it's in CXXFLAGS. Ignore libCrun as | 14901 | # it if it's in CXXFLAGS. Ignore libCrun as |
14912 | @@ -13382,8 +14135,6 @@ fi | 14902 | @@ -13516,8 +14269,6 @@ fi |
14913 | lt_prog_compiler_pic_CXX= | 14903 | lt_prog_compiler_pic_CXX= |
14914 | lt_prog_compiler_static_CXX= | 14904 | lt_prog_compiler_static_CXX= |
14915 | 14905 | ||
@@ -14918,7 +14908,7 @@ index d0a467ac101..45b20013a45 100755 | |||
14918 | 14908 | ||
14919 | # C++ specific cases for pic, static, wl, etc. | 14909 | # C++ specific cases for pic, static, wl, etc. |
14920 | if test "$GXX" = yes; then | 14910 | if test "$GXX" = yes; then |
14921 | @@ -13488,6 +14239,11 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } | 14911 | @@ -13622,6 +14373,11 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } |
14922 | ;; | 14912 | ;; |
14923 | esac | 14913 | esac |
14924 | ;; | 14914 | ;; |
@@ -14930,7 +14920,7 @@ index d0a467ac101..45b20013a45 100755 | |||
14930 | dgux*) | 14920 | dgux*) |
14931 | case $cc_basename in | 14921 | case $cc_basename in |
14932 | ec++*) | 14922 | ec++*) |
14933 | @@ -13640,7 +14396,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } | 14923 | @@ -13774,7 +14530,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } |
14934 | ;; | 14924 | ;; |
14935 | solaris*) | 14925 | solaris*) |
14936 | case $cc_basename in | 14926 | case $cc_basename in |
@@ -14939,7 +14929,7 @@ index d0a467ac101..45b20013a45 100755 | |||
14939 | # Sun C++ 4.2, 5.x and Centerline C++ | 14929 | # Sun C++ 4.2, 5.x and Centerline C++ |
14940 | lt_prog_compiler_pic_CXX='-KPIC' | 14930 | lt_prog_compiler_pic_CXX='-KPIC' |
14941 | lt_prog_compiler_static_CXX='-Bstatic' | 14931 | lt_prog_compiler_static_CXX='-Bstatic' |
14942 | @@ -13705,10 +14461,17 @@ case $host_os in | 14932 | @@ -13839,10 +14595,17 @@ case $host_os in |
14943 | lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC" | 14933 | lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC" |
14944 | ;; | 14934 | ;; |
14945 | esac | 14935 | esac |
@@ -14960,7 +14950,7 @@ index d0a467ac101..45b20013a45 100755 | |||
14960 | 14950 | ||
14961 | # | 14951 | # |
14962 | # Check to make sure the PIC flag actually works. | 14952 | # Check to make sure the PIC flag actually works. |
14963 | @@ -13766,6 +14529,8 @@ fi | 14953 | @@ -13900,6 +14663,8 @@ fi |
14964 | 14954 | ||
14965 | 14955 | ||
14966 | 14956 | ||
@@ -14969,7 +14959,7 @@ index d0a467ac101..45b20013a45 100755 | |||
14969 | # | 14959 | # |
14970 | # Check to make sure the static flag actually works. | 14960 | # Check to make sure the static flag actually works. |
14971 | # | 14961 | # |
14972 | @@ -13943,6 +14708,7 @@ fi | 14962 | @@ -14077,6 +14842,7 @@ fi |
14973 | $as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } | 14963 | $as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } |
14974 | 14964 | ||
14975 | export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' | 14965 | export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' |
@@ -14977,7 +14967,7 @@ index d0a467ac101..45b20013a45 100755 | |||
14977 | case $host_os in | 14967 | case $host_os in |
14978 | aix[4-9]*) | 14968 | aix[4-9]*) |
14979 | # If we're using GNU nm, then we don't want the "-C" option. | 14969 | # If we're using GNU nm, then we don't want the "-C" option. |
14980 | @@ -13957,15 +14723,20 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie | 14970 | @@ -14091,15 +14857,20 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie |
14981 | ;; | 14971 | ;; |
14982 | pw32*) | 14972 | pw32*) |
14983 | export_symbols_cmds_CXX="$ltdll_cmds" | 14973 | export_symbols_cmds_CXX="$ltdll_cmds" |
@@ -15003,7 +14993,7 @@ index d0a467ac101..45b20013a45 100755 | |||
15003 | 14993 | ||
15004 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5 | 14994 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5 |
15005 | $as_echo "$ld_shlibs_CXX" >&6; } | 14995 | $as_echo "$ld_shlibs_CXX" >&6; } |
15006 | @@ -14228,8 +14999,9 @@ cygwin* | mingw* | pw32* | cegcc*) | 14996 | @@ -14362,8 +15133,9 @@ cygwin* | mingw* | pw32* | cegcc*) |
15007 | need_version=no | 14997 | need_version=no |
15008 | need_lib_prefix=no | 14998 | need_lib_prefix=no |
15009 | 14999 | ||
@@ -15015,7 +15005,7 @@ index d0a467ac101..45b20013a45 100755 | |||
15015 | library_names_spec='$libname.dll.a' | 15005 | library_names_spec='$libname.dll.a' |
15016 | # DLL is installed to $(libdir)/../bin by postinstall_cmds | 15006 | # DLL is installed to $(libdir)/../bin by postinstall_cmds |
15017 | postinstall_cmds='base_file=`basename \${file}`~ | 15007 | postinstall_cmds='base_file=`basename \${file}`~ |
15018 | @@ -14261,13 +15033,71 @@ cygwin* | mingw* | pw32* | cegcc*) | 15008 | @@ -14395,13 +15167,71 @@ cygwin* | mingw* | pw32* | cegcc*) |
15019 | library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' | 15009 | library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' |
15020 | ;; | 15010 | ;; |
15021 | esac | 15011 | esac |
@@ -15088,7 +15078,7 @@ index d0a467ac101..45b20013a45 100755 | |||
15088 | # FIXME: first we should search . and the directory the executable is in | 15078 | # FIXME: first we should search . and the directory the executable is in |
15089 | shlibpath_var=PATH | 15079 | shlibpath_var=PATH |
15090 | ;; | 15080 | ;; |
15091 | @@ -14807,6 +15637,7 @@ fi | 15081 | @@ -14941,6 +15771,7 @@ fi |
15092 | fi # test -n "$compiler" | 15082 | fi # test -n "$compiler" |
15093 | 15083 | ||
15094 | CC=$lt_save_CC | 15084 | CC=$lt_save_CC |
@@ -15096,7 +15086,7 @@ index d0a467ac101..45b20013a45 100755 | |||
15096 | LDCXX=$LD | 15086 | LDCXX=$LD |
15097 | LD=$lt_save_LD | 15087 | LD=$lt_save_LD |
15098 | GCC=$lt_save_GCC | 15088 | GCC=$lt_save_GCC |
15099 | @@ -18172,13 +19003,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' | 15089 | @@ -18322,13 +19153,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' |
15100 | lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' | 15090 | lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' |
15101 | lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' | 15091 | lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' |
15102 | lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' | 15092 | lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' |
@@ -15117,7 +15107,7 @@ index d0a467ac101..45b20013a45 100755 | |||
15117 | STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' | 15107 | STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' |
15118 | RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' | 15108 | RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' |
15119 | old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' | 15109 | old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' |
15120 | @@ -18193,14 +19031,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de | 15110 | @@ -18343,14 +19181,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de |
15121 | 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_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' |
15122 | lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' | 15112 | lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' |
15123 | lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`' | 15113 | 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"`' |
@@ -15136,7 +15126,7 @@ index d0a467ac101..45b20013a45 100755 | |||
15136 | DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' | 15126 | DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' |
15137 | NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' | 15127 | NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' |
15138 | LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' | 15128 | LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' |
15139 | @@ -18233,12 +19074,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q | 15129 | @@ -18383,12 +19224,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q |
15140 | hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' | 15130 | hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' |
15141 | inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' | 15131 | inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' |
15142 | link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' | 15132 | link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' |
@@ -15150,7 +15140,7 @@ index d0a467ac101..45b20013a45 100755 | |||
15150 | file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' | 15140 | file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' |
15151 | variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' | 15141 | variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' |
15152 | need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' | 15142 | need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' |
15153 | @@ -18277,8 +19118,8 @@ old_archive_cmds_CXX='`$ECHO "$old_archive_cmds_CXX" | $SED "$delay_single_quote | 15143 | @@ -18427,8 +19268,8 @@ old_archive_cmds_CXX='`$ECHO "$old_archive_cmds_CXX" | $SED "$delay_single_quote |
15154 | compiler_CXX='`$ECHO "$compiler_CXX" | $SED "$delay_single_quote_subst"`' | 15144 | compiler_CXX='`$ECHO "$compiler_CXX" | $SED "$delay_single_quote_subst"`' |
15155 | GCC_CXX='`$ECHO "$GCC_CXX" | $SED "$delay_single_quote_subst"`' | 15145 | GCC_CXX='`$ECHO "$GCC_CXX" | $SED "$delay_single_quote_subst"`' |
15156 | lt_prog_compiler_no_builtin_flag_CXX='`$ECHO "$lt_prog_compiler_no_builtin_flag_CXX" | $SED "$delay_single_quote_subst"`' | 15146 | lt_prog_compiler_no_builtin_flag_CXX='`$ECHO "$lt_prog_compiler_no_builtin_flag_CXX" | $SED "$delay_single_quote_subst"`' |
@@ -15160,7 +15150,7 @@ index d0a467ac101..45b20013a45 100755 | |||
15160 | lt_prog_compiler_static_CXX='`$ECHO "$lt_prog_compiler_static_CXX" | $SED "$delay_single_quote_subst"`' | 15150 | lt_prog_compiler_static_CXX='`$ECHO "$lt_prog_compiler_static_CXX" | $SED "$delay_single_quote_subst"`' |
15161 | lt_cv_prog_compiler_c_o_CXX='`$ECHO "$lt_cv_prog_compiler_c_o_CXX" | $SED "$delay_single_quote_subst"`' | 15151 | lt_cv_prog_compiler_c_o_CXX='`$ECHO "$lt_cv_prog_compiler_c_o_CXX" | $SED "$delay_single_quote_subst"`' |
15162 | archive_cmds_need_lc_CXX='`$ECHO "$archive_cmds_need_lc_CXX" | $SED "$delay_single_quote_subst"`' | 15152 | archive_cmds_need_lc_CXX='`$ECHO "$archive_cmds_need_lc_CXX" | $SED "$delay_single_quote_subst"`' |
15163 | @@ -18305,12 +19146,12 @@ hardcode_shlibpath_var_CXX='`$ECHO "$hardcode_shlibpath_var_CXX" | $SED "$delay_ | 15153 | @@ -18455,12 +19296,12 @@ hardcode_shlibpath_var_CXX='`$ECHO "$hardcode_shlibpath_var_CXX" | $SED "$delay_ |
15164 | hardcode_automatic_CXX='`$ECHO "$hardcode_automatic_CXX" | $SED "$delay_single_quote_subst"`' | 15154 | hardcode_automatic_CXX='`$ECHO "$hardcode_automatic_CXX" | $SED "$delay_single_quote_subst"`' |
15165 | inherit_rpath_CXX='`$ECHO "$inherit_rpath_CXX" | $SED "$delay_single_quote_subst"`' | 15155 | inherit_rpath_CXX='`$ECHO "$inherit_rpath_CXX" | $SED "$delay_single_quote_subst"`' |
15166 | link_all_deplibs_CXX='`$ECHO "$link_all_deplibs_CXX" | $SED "$delay_single_quote_subst"`' | 15156 | link_all_deplibs_CXX='`$ECHO "$link_all_deplibs_CXX" | $SED "$delay_single_quote_subst"`' |
@@ -15174,7 +15164,7 @@ index d0a467ac101..45b20013a45 100755 | |||
15174 | file_list_spec_CXX='`$ECHO "$file_list_spec_CXX" | $SED "$delay_single_quote_subst"`' | 15164 | file_list_spec_CXX='`$ECHO "$file_list_spec_CXX" | $SED "$delay_single_quote_subst"`' |
15175 | hardcode_action_CXX='`$ECHO "$hardcode_action_CXX" | $SED "$delay_single_quote_subst"`' | 15165 | hardcode_action_CXX='`$ECHO "$hardcode_action_CXX" | $SED "$delay_single_quote_subst"`' |
15176 | compiler_lib_search_dirs_CXX='`$ECHO "$compiler_lib_search_dirs_CXX" | $SED "$delay_single_quote_subst"`' | 15166 | compiler_lib_search_dirs_CXX='`$ECHO "$compiler_lib_search_dirs_CXX" | $SED "$delay_single_quote_subst"`' |
15177 | @@ -18348,8 +19189,13 @@ reload_flag \ | 15167 | @@ -18498,8 +19339,13 @@ reload_flag \ |
15178 | OBJDUMP \ | 15168 | OBJDUMP \ |
15179 | deplibs_check_method \ | 15169 | deplibs_check_method \ |
15180 | file_magic_cmd \ | 15170 | file_magic_cmd \ |
@@ -15188,7 +15178,7 @@ index d0a467ac101..45b20013a45 100755 | |||
15188 | STRIP \ | 15178 | STRIP \ |
15189 | RANLIB \ | 15179 | RANLIB \ |
15190 | CC \ | 15180 | CC \ |
15191 | @@ -18359,12 +19205,14 @@ lt_cv_sys_global_symbol_pipe \ | 15181 | @@ -18509,12 +19355,14 @@ lt_cv_sys_global_symbol_pipe \ |
15192 | lt_cv_sys_global_symbol_to_cdecl \ | 15182 | lt_cv_sys_global_symbol_to_cdecl \ |
15193 | lt_cv_sys_global_symbol_to_c_name_address \ | 15183 | lt_cv_sys_global_symbol_to_c_name_address \ |
15194 | lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ | 15184 | lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ |
@@ -15204,7 +15194,7 @@ index d0a467ac101..45b20013a45 100755 | |||
15204 | DSYMUTIL \ | 15194 | DSYMUTIL \ |
15205 | NMEDIT \ | 15195 | NMEDIT \ |
15206 | LIPO \ | 15196 | LIPO \ |
15207 | @@ -18380,7 +19228,6 @@ no_undefined_flag \ | 15197 | @@ -18530,7 +19378,6 @@ no_undefined_flag \ |
15208 | hardcode_libdir_flag_spec \ | 15198 | hardcode_libdir_flag_spec \ |
15209 | hardcode_libdir_flag_spec_ld \ | 15199 | hardcode_libdir_flag_spec_ld \ |
15210 | hardcode_libdir_separator \ | 15200 | hardcode_libdir_separator \ |
@@ -15212,7 +15202,7 @@ index d0a467ac101..45b20013a45 100755 | |||
15212 | exclude_expsyms \ | 15202 | exclude_expsyms \ |
15213 | include_expsyms \ | 15203 | include_expsyms \ |
15214 | file_list_spec \ | 15204 | file_list_spec \ |
15215 | @@ -18402,8 +19249,8 @@ LD_CXX \ | 15205 | @@ -18552,8 +19399,8 @@ LD_CXX \ |
15216 | reload_flag_CXX \ | 15206 | reload_flag_CXX \ |
15217 | compiler_CXX \ | 15207 | compiler_CXX \ |
15218 | lt_prog_compiler_no_builtin_flag_CXX \ | 15208 | lt_prog_compiler_no_builtin_flag_CXX \ |
@@ -15222,7 +15212,7 @@ index d0a467ac101..45b20013a45 100755 | |||
15222 | lt_prog_compiler_static_CXX \ | 15212 | lt_prog_compiler_static_CXX \ |
15223 | lt_cv_prog_compiler_c_o_CXX \ | 15213 | lt_cv_prog_compiler_c_o_CXX \ |
15224 | export_dynamic_flag_spec_CXX \ | 15214 | export_dynamic_flag_spec_CXX \ |
15225 | @@ -18415,7 +19262,6 @@ no_undefined_flag_CXX \ | 15215 | @@ -18565,7 +19412,6 @@ no_undefined_flag_CXX \ |
15226 | hardcode_libdir_flag_spec_CXX \ | 15216 | hardcode_libdir_flag_spec_CXX \ |
15227 | hardcode_libdir_flag_spec_ld_CXX \ | 15217 | hardcode_libdir_flag_spec_ld_CXX \ |
15228 | hardcode_libdir_separator_CXX \ | 15218 | hardcode_libdir_separator_CXX \ |
@@ -15230,7 +15220,7 @@ index d0a467ac101..45b20013a45 100755 | |||
15230 | exclude_expsyms_CXX \ | 15220 | exclude_expsyms_CXX \ |
15231 | include_expsyms_CXX \ | 15221 | include_expsyms_CXX \ |
15232 | file_list_spec_CXX \ | 15222 | file_list_spec_CXX \ |
15233 | @@ -18449,6 +19295,7 @@ module_cmds \ | 15223 | @@ -18599,6 +19445,7 @@ module_cmds \ |
15234 | module_expsym_cmds \ | 15224 | module_expsym_cmds \ |
15235 | export_symbols_cmds \ | 15225 | export_symbols_cmds \ |
15236 | prelink_cmds \ | 15226 | prelink_cmds \ |
@@ -15238,7 +15228,7 @@ index d0a467ac101..45b20013a45 100755 | |||
15238 | postinstall_cmds \ | 15228 | postinstall_cmds \ |
15239 | postuninstall_cmds \ | 15229 | postuninstall_cmds \ |
15240 | finish_cmds \ | 15230 | finish_cmds \ |
15241 | @@ -18463,7 +19310,8 @@ archive_expsym_cmds_CXX \ | 15231 | @@ -18613,7 +19460,8 @@ archive_expsym_cmds_CXX \ |
15242 | module_cmds_CXX \ | 15232 | module_cmds_CXX \ |
15243 | module_expsym_cmds_CXX \ | 15233 | module_expsym_cmds_CXX \ |
15244 | export_symbols_cmds_CXX \ | 15234 | export_symbols_cmds_CXX \ |
@@ -15248,7 +15238,7 @@ index d0a467ac101..45b20013a45 100755 | |||
15248 | case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in | 15238 | case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in |
15249 | *[\\\\\\\`\\"\\\$]*) | 15239 | *[\\\\\\\`\\"\\\$]*) |
15250 | eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" | 15240 | eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" |
15251 | @@ -19228,7 +20076,8 @@ $as_echo X"$file" | | 15241 | @@ -19378,7 +20226,8 @@ $as_echo X"$file" | |
15252 | # NOTE: Changes made to this file will be lost: look at ltmain.sh. | 15242 | # NOTE: Changes made to this file will be lost: look at ltmain.sh. |
15253 | # | 15243 | # |
15254 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, | 15244 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, |
@@ -15258,7 +15248,7 @@ index d0a467ac101..45b20013a45 100755 | |||
15258 | # Written by Gordon Matzigkeit, 1996 | 15248 | # Written by Gordon Matzigkeit, 1996 |
15259 | # | 15249 | # |
15260 | # This file is part of GNU Libtool. | 15250 | # This file is part of GNU Libtool. |
15261 | @@ -19331,19 +20180,42 @@ SP2NL=$lt_lt_SP2NL | 15251 | @@ -19481,19 +20330,42 @@ SP2NL=$lt_lt_SP2NL |
15262 | # turn newlines into spaces. | 15252 | # turn newlines into spaces. |
15263 | NL2SP=$lt_lt_NL2SP | 15253 | NL2SP=$lt_lt_NL2SP |
15264 | 15254 | ||
@@ -15302,7 +15292,7 @@ index d0a467ac101..45b20013a45 100755 | |||
15302 | # A symbol stripping program. | 15292 | # A symbol stripping program. |
15303 | STRIP=$lt_STRIP | 15293 | STRIP=$lt_STRIP |
15304 | 15294 | ||
15305 | @@ -19373,6 +20245,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address | 15295 | @@ -19523,6 +20395,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address |
15306 | # Transform the output of nm in a C name address pair when lib prefix is needed. | 15296 | # Transform the output of nm in a C name address pair when lib prefix is needed. |
15307 | global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix | 15297 | global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix |
15308 | 15298 | ||
@@ -15315,7 +15305,7 @@ index d0a467ac101..45b20013a45 100755 | |||
15315 | # The name of the directory that contains temporary libtool files. | 15305 | # The name of the directory that contains temporary libtool files. |
15316 | objdir=$objdir | 15306 | objdir=$objdir |
15317 | 15307 | ||
15318 | @@ -19382,6 +20260,9 @@ MAGIC_CMD=$MAGIC_CMD | 15308 | @@ -19532,6 +20410,9 @@ MAGIC_CMD=$MAGIC_CMD |
15319 | # Must we lock files when doing compilation? | 15309 | # Must we lock files when doing compilation? |
15320 | need_locks=$lt_need_locks | 15310 | need_locks=$lt_need_locks |
15321 | 15311 | ||
@@ -15325,7 +15315,7 @@ index d0a467ac101..45b20013a45 100755 | |||
15325 | # Tool to manipulate archived DWARF debug symbol files on Mac OS X. | 15315 | # Tool to manipulate archived DWARF debug symbol files on Mac OS X. |
15326 | DSYMUTIL=$lt_DSYMUTIL | 15316 | DSYMUTIL=$lt_DSYMUTIL |
15327 | 15317 | ||
15328 | @@ -19496,12 +20377,12 @@ with_gcc=$GCC | 15318 | @@ -19646,12 +20527,12 @@ with_gcc=$GCC |
15329 | # Compiler flag to turn off builtin functions. | 15319 | # Compiler flag to turn off builtin functions. |
15330 | no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag | 15320 | no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag |
15331 | 15321 | ||
@@ -15341,7 +15331,7 @@ index d0a467ac101..45b20013a45 100755 | |||
15341 | # Compiler flag to prevent dynamic linking. | 15331 | # Compiler flag to prevent dynamic linking. |
15342 | link_static_flag=$lt_lt_prog_compiler_static | 15332 | link_static_flag=$lt_lt_prog_compiler_static |
15343 | 15333 | ||
15344 | @@ -19588,9 +20469,6 @@ inherit_rpath=$inherit_rpath | 15334 | @@ -19738,9 +20619,6 @@ inherit_rpath=$inherit_rpath |
15345 | # Whether libtool must link a program against all its dependency libraries. | 15335 | # Whether libtool must link a program against all its dependency libraries. |
15346 | link_all_deplibs=$link_all_deplibs | 15336 | link_all_deplibs=$link_all_deplibs |
15347 | 15337 | ||
@@ -15351,7 +15341,7 @@ index d0a467ac101..45b20013a45 100755 | |||
15351 | # Set to "yes" if exported symbols are required. | 15341 | # Set to "yes" if exported symbols are required. |
15352 | always_export_symbols=$always_export_symbols | 15342 | always_export_symbols=$always_export_symbols |
15353 | 15343 | ||
15354 | @@ -19606,6 +20484,9 @@ include_expsyms=$lt_include_expsyms | 15344 | @@ -19756,6 +20634,9 @@ include_expsyms=$lt_include_expsyms |
15355 | # Commands necessary for linking programs (against libraries) with templates. | 15345 | # Commands necessary for linking programs (against libraries) with templates. |
15356 | prelink_cmds=$lt_prelink_cmds | 15346 | prelink_cmds=$lt_prelink_cmds |
15357 | 15347 | ||
@@ -15361,7 +15351,7 @@ index d0a467ac101..45b20013a45 100755 | |||
15361 | # Specify filename containing input files. | 15351 | # Specify filename containing input files. |
15362 | file_list_spec=$lt_file_list_spec | 15352 | file_list_spec=$lt_file_list_spec |
15363 | 15353 | ||
15364 | @@ -19652,210 +20533,169 @@ ltmain="$ac_aux_dir/ltmain.sh" | 15354 | @@ -19802,210 +20683,169 @@ ltmain="$ac_aux_dir/ltmain.sh" |
15365 | # if finds mixed CR/LF and LF-only lines. Since sed operates in | 15355 | # if finds mixed CR/LF and LF-only lines. Since sed operates in |
15366 | # text mode, it properly converts lines to CR/LF. This bash problem | 15356 | # text mode, it properly converts lines to CR/LF. This bash problem |
15367 | # is reportedly fixed, but why not run on old versions too? | 15357 | # is reportedly fixed, but why not run on old versions too? |
@@ -15735,7 +15725,7 @@ index d0a467ac101..45b20013a45 100755 | |||
15735 | (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") | 15725 | (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") |
15736 | chmod +x "$ofile" | 15726 | chmod +x "$ofile" |
15737 | 15727 | ||
15738 | @@ -19883,12 +20723,12 @@ with_gcc=$GCC_CXX | 15728 | @@ -20033,12 +20873,12 @@ with_gcc=$GCC_CXX |
15739 | # Compiler flag to turn off builtin functions. | 15729 | # Compiler flag to turn off builtin functions. |
15740 | no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX | 15730 | no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX |
15741 | 15731 | ||
@@ -15751,7 +15741,7 @@ index d0a467ac101..45b20013a45 100755 | |||
15751 | # Compiler flag to prevent dynamic linking. | 15741 | # Compiler flag to prevent dynamic linking. |
15752 | link_static_flag=$lt_lt_prog_compiler_static_CXX | 15742 | link_static_flag=$lt_lt_prog_compiler_static_CXX |
15753 | 15743 | ||
15754 | @@ -19975,9 +20815,6 @@ inherit_rpath=$inherit_rpath_CXX | 15744 | @@ -20125,9 +20965,6 @@ inherit_rpath=$inherit_rpath_CXX |
15755 | # Whether libtool must link a program against all its dependency libraries. | 15745 | # Whether libtool must link a program against all its dependency libraries. |
15756 | link_all_deplibs=$link_all_deplibs_CXX | 15746 | link_all_deplibs=$link_all_deplibs_CXX |
15757 | 15747 | ||
@@ -15761,7 +15751,7 @@ index d0a467ac101..45b20013a45 100755 | |||
15761 | # Set to "yes" if exported symbols are required. | 15751 | # Set to "yes" if exported symbols are required. |
15762 | always_export_symbols=$always_export_symbols_CXX | 15752 | always_export_symbols=$always_export_symbols_CXX |
15763 | 15753 | ||
15764 | @@ -19993,6 +20830,9 @@ include_expsyms=$lt_include_expsyms_CXX | 15754 | @@ -20143,6 +20980,9 @@ include_expsyms=$lt_include_expsyms_CXX |
15765 | # Commands necessary for linking programs (against libraries) with templates. | 15755 | # Commands necessary for linking programs (against libraries) with templates. |
15766 | prelink_cmds=$lt_prelink_cmds_CXX | 15756 | prelink_cmds=$lt_prelink_cmds_CXX |
15767 | 15757 | ||
@@ -15772,7 +15762,7 @@ index d0a467ac101..45b20013a45 100755 | |||
15772 | file_list_spec=$lt_file_list_spec_CXX | 15762 | file_list_spec=$lt_file_list_spec_CXX |
15773 | 15763 | ||
15774 | diff --git a/libbacktrace/Makefile.in b/libbacktrace/Makefile.in | 15764 | diff --git a/libbacktrace/Makefile.in b/libbacktrace/Makefile.in |
15775 | index e6a4c8e2ef3..3547e3649b7 100644 | 15765 | index 0a61880ba67..5889b0477cd 100644 |
15776 | --- a/libbacktrace/Makefile.in | 15766 | --- a/libbacktrace/Makefile.in |
15777 | +++ b/libbacktrace/Makefile.in | 15767 | +++ b/libbacktrace/Makefile.in |
15778 | @@ -827,6 +827,7 @@ CPP = @CPP@ | 15768 | @@ -827,6 +827,7 @@ CPP = @CPP@ |
@@ -17713,7 +17703,7 @@ index 406b67b8cbc..b648da40aab 100755 | |||
17713 | chmod +x "$ofile" | 17703 | chmod +x "$ofile" |
17714 | 17704 | ||
17715 | diff --git a/libctf/Makefile.in b/libctf/Makefile.in | 17705 | diff --git a/libctf/Makefile.in b/libctf/Makefile.in |
17716 | index 1984f50867a..51a3dd26e87 100644 | 17706 | index f2b852e3fae..63e3b2e05ea 100644 |
17717 | --- a/libctf/Makefile.in | 17707 | --- a/libctf/Makefile.in |
17718 | +++ b/libctf/Makefile.in | 17708 | +++ b/libctf/Makefile.in |
17719 | @@ -393,6 +393,7 @@ CYGPATH_W = @CYGPATH_W@ | 17709 | @@ -393,6 +393,7 @@ CYGPATH_W = @CYGPATH_W@ |
@@ -17733,7 +17723,7 @@ index 1984f50867a..51a3dd26e87 100644 | |||
17733 | NM = @NM@ | 17723 | NM = @NM@ |
17734 | NMEDIT = @NMEDIT@ | 17724 | NMEDIT = @NMEDIT@ |
17735 | diff --git a/libctf/configure b/libctf/configure | 17725 | diff --git a/libctf/configure b/libctf/configure |
17736 | index 8704bc215f4..c1bf438bda6 100755 | 17726 | index b347b292195..d6d6e341887 100755 |
17737 | --- a/libctf/configure | 17727 | --- a/libctf/configure |
17738 | +++ b/libctf/configure | 17728 | +++ b/libctf/configure |
17739 | @@ -669,6 +669,8 @@ OTOOL | 17729 | @@ -669,6 +669,8 @@ OTOOL |
@@ -17762,7 +17752,7 @@ index 8704bc215f4..c1bf438bda6 100755 | |||
17762 | --with-system-zlib use installed libz | 17752 | --with-system-zlib use installed libz |
17763 | 17753 | ||
17764 | Some influential environment variables: | 17754 | Some influential environment variables: |
17765 | @@ -5571,8 +5576,8 @@ esac | 17755 | @@ -5568,8 +5573,8 @@ esac |
17766 | 17756 | ||
17767 | 17757 | ||
17768 | 17758 | ||
@@ -17773,7 +17763,7 @@ index 8704bc215f4..c1bf438bda6 100755 | |||
17773 | 17763 | ||
17774 | 17764 | ||
17775 | 17765 | ||
17776 | @@ -5612,7 +5617,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO | 17766 | @@ -5609,7 +5614,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO |
17777 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 | 17767 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 |
17778 | $as_echo_n "checking how to print strings... " >&6; } | 17768 | $as_echo_n "checking how to print strings... " >&6; } |
17779 | # Test print first, because it will be a builtin if present. | 17769 | # Test print first, because it will be a builtin if present. |
@@ -17782,7 +17772,7 @@ index 8704bc215f4..c1bf438bda6 100755 | |||
17782 | test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then | 17772 | test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then |
17783 | ECHO='print -r --' | 17773 | ECHO='print -r --' |
17784 | elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then | 17774 | elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then |
17785 | @@ -6305,8 +6310,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; | 17775 | @@ -6302,8 +6307,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; |
17786 | # Try some XSI features | 17776 | # Try some XSI features |
17787 | xsi_shell=no | 17777 | xsi_shell=no |
17788 | ( _lt_dummy="a/b/c" | 17778 | ( _lt_dummy="a/b/c" |
@@ -17793,7 +17783,7 @@ index 8704bc215f4..c1bf438bda6 100755 | |||
17793 | && eval 'test $(( 1 + 1 )) -eq 2 \ | 17783 | && eval 'test $(( 1 + 1 )) -eq 2 \ |
17794 | && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ | 17784 | && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ |
17795 | && xsi_shell=yes | 17785 | && xsi_shell=yes |
17796 | @@ -6355,6 +6360,80 @@ esac | 17786 | @@ -6352,6 +6357,80 @@ esac |
17797 | 17787 | ||
17798 | 17788 | ||
17799 | 17789 | ||
@@ -17874,7 +17864,7 @@ index 8704bc215f4..c1bf438bda6 100755 | |||
17874 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 | 17864 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 |
17875 | $as_echo_n "checking for $LD option to reload object files... " >&6; } | 17865 | $as_echo_n "checking for $LD option to reload object files... " >&6; } |
17876 | if ${lt_cv_ld_reload_flag+:} false; then : | 17866 | if ${lt_cv_ld_reload_flag+:} false; then : |
17877 | @@ -6371,6 +6450,11 @@ case $reload_flag in | 17867 | @@ -6368,6 +6447,11 @@ case $reload_flag in |
17878 | esac | 17868 | esac |
17879 | reload_cmds='$LD$reload_flag -o $output$reload_objs' | 17869 | reload_cmds='$LD$reload_flag -o $output$reload_objs' |
17880 | case $host_os in | 17870 | case $host_os in |
@@ -17886,7 +17876,7 @@ index 8704bc215f4..c1bf438bda6 100755 | |||
17886 | darwin*) | 17876 | darwin*) |
17887 | if test "$GCC" = yes; then | 17877 | if test "$GCC" = yes; then |
17888 | reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' | 17878 | reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' |
17889 | @@ -6539,7 +6623,8 @@ mingw* | pw32*) | 17879 | @@ -6536,7 +6620,8 @@ mingw* | pw32*) |
17890 | lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' | 17880 | lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' |
17891 | lt_cv_file_magic_cmd='func_win32_libid' | 17881 | lt_cv_file_magic_cmd='func_win32_libid' |
17892 | else | 17882 | else |
@@ -17896,7 +17886,7 @@ index 8704bc215f4..c1bf438bda6 100755 | |||
17896 | lt_cv_file_magic_cmd='$OBJDUMP -f' | 17886 | lt_cv_file_magic_cmd='$OBJDUMP -f' |
17897 | fi | 17887 | fi |
17898 | ;; | 17888 | ;; |
17899 | @@ -6693,6 +6778,21 @@ esac | 17889 | @@ -6690,6 +6775,21 @@ esac |
17900 | fi | 17890 | fi |
17901 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 | 17891 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 |
17902 | $as_echo "$lt_cv_deplibs_check_method" >&6; } | 17892 | $as_echo "$lt_cv_deplibs_check_method" >&6; } |
@@ -17918,7 +17908,7 @@ index 8704bc215f4..c1bf438bda6 100755 | |||
17918 | file_magic_cmd=$lt_cv_file_magic_cmd | 17908 | file_magic_cmd=$lt_cv_file_magic_cmd |
17919 | deplibs_check_method=$lt_cv_deplibs_check_method | 17909 | deplibs_check_method=$lt_cv_deplibs_check_method |
17920 | test -z "$deplibs_check_method" && deplibs_check_method=unknown | 17910 | test -z "$deplibs_check_method" && deplibs_check_method=unknown |
17921 | @@ -6708,6 +6808,157 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown | 17911 | @@ -6705,6 +6805,157 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown |
17922 | 17912 | ||
17923 | 17913 | ||
17924 | 17914 | ||
@@ -18076,7 +18066,7 @@ index 8704bc215f4..c1bf438bda6 100755 | |||
18076 | plugin_option= | 18066 | plugin_option= |
18077 | plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll" | 18067 | plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll" |
18078 | for plugin in $plugin_names; do | 18068 | for plugin in $plugin_names; do |
18079 | @@ -6722,8 +6973,10 @@ for plugin in $plugin_names; do | 18069 | @@ -6719,8 +6970,10 @@ for plugin in $plugin_names; do |
18080 | done | 18070 | done |
18081 | 18071 | ||
18082 | if test -n "$ac_tool_prefix"; then | 18072 | if test -n "$ac_tool_prefix"; then |
@@ -18089,7 +18079,7 @@ index 8704bc215f4..c1bf438bda6 100755 | |||
18089 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | 18079 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
18090 | $as_echo_n "checking for $ac_word... " >&6; } | 18080 | $as_echo_n "checking for $ac_word... " >&6; } |
18091 | if ${ac_cv_prog_AR+:} false; then : | 18081 | if ${ac_cv_prog_AR+:} false; then : |
18092 | @@ -6739,7 +6992,7 @@ do | 18082 | @@ -6736,7 +6989,7 @@ do |
18093 | test -z "$as_dir" && as_dir=. | 18083 | test -z "$as_dir" && as_dir=. |
18094 | for ac_exec_ext in '' $ac_executable_extensions; do | 18084 | for ac_exec_ext in '' $ac_executable_extensions; do |
18095 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | 18085 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
@@ -18098,7 +18088,7 @@ index 8704bc215f4..c1bf438bda6 100755 | |||
18098 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | 18088 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
18099 | break 2 | 18089 | break 2 |
18100 | fi | 18090 | fi |
18101 | @@ -6759,11 +7012,15 @@ $as_echo "no" >&6; } | 18091 | @@ -6756,11 +7009,15 @@ $as_echo "no" >&6; } |
18102 | fi | 18092 | fi |
18103 | 18093 | ||
18104 | 18094 | ||
@@ -18117,7 +18107,7 @@ index 8704bc215f4..c1bf438bda6 100755 | |||
18117 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | 18107 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
18118 | $as_echo_n "checking for $ac_word... " >&6; } | 18108 | $as_echo_n "checking for $ac_word... " >&6; } |
18119 | if ${ac_cv_prog_ac_ct_AR+:} false; then : | 18109 | if ${ac_cv_prog_ac_ct_AR+:} false; then : |
18120 | @@ -6779,7 +7036,7 @@ do | 18110 | @@ -6776,7 +7033,7 @@ do |
18121 | test -z "$as_dir" && as_dir=. | 18111 | test -z "$as_dir" && as_dir=. |
18122 | for ac_exec_ext in '' $ac_executable_extensions; do | 18112 | for ac_exec_ext in '' $ac_executable_extensions; do |
18123 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | 18113 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
@@ -18126,7 +18116,7 @@ index 8704bc215f4..c1bf438bda6 100755 | |||
18126 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | 18116 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
18127 | break 2 | 18117 | break 2 |
18128 | fi | 18118 | fi |
18129 | @@ -6798,6 +7055,10 @@ else | 18119 | @@ -6795,6 +7052,10 @@ else |
18130 | $as_echo "no" >&6; } | 18120 | $as_echo "no" >&6; } |
18131 | fi | 18121 | fi |
18132 | 18122 | ||
@@ -18137,7 +18127,7 @@ index 8704bc215f4..c1bf438bda6 100755 | |||
18137 | if test "x$ac_ct_AR" = x; then | 18127 | if test "x$ac_ct_AR" = x; then |
18138 | AR="false" | 18128 | AR="false" |
18139 | else | 18129 | else |
18140 | @@ -6809,25 +7070,19 @@ ac_tool_warned=yes ;; | 18130 | @@ -6806,25 +7067,19 @@ ac_tool_warned=yes ;; |
18141 | esac | 18131 | esac |
18142 | AR=$ac_ct_AR | 18132 | AR=$ac_ct_AR |
18143 | fi | 18133 | fi |
@@ -18172,7 +18162,7 @@ index 8704bc215f4..c1bf438bda6 100755 | |||
18172 | 18162 | ||
18173 | 18163 | ||
18174 | 18164 | ||
18175 | @@ -6839,6 +7094,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru | 18165 | @@ -6836,6 +7091,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru |
18176 | 18166 | ||
18177 | 18167 | ||
18178 | 18168 | ||
@@ -18237,7 +18227,7 @@ index 8704bc215f4..c1bf438bda6 100755 | |||
18237 | if test -n "$ac_tool_prefix"; then | 18227 | if test -n "$ac_tool_prefix"; then |
18238 | # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. | 18228 | # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. |
18239 | set dummy ${ac_tool_prefix}strip; ac_word=$2 | 18229 | set dummy ${ac_tool_prefix}strip; ac_word=$2 |
18240 | @@ -7178,8 +7491,8 @@ esac | 18230 | @@ -7175,8 +7488,8 @@ esac |
18241 | lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" | 18231 | lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" |
18242 | 18232 | ||
18243 | # Transform an extracted symbol line into symbol name and symbol address | 18233 | # Transform an extracted symbol line into symbol name and symbol address |
@@ -18248,7 +18238,7 @@ index 8704bc215f4..c1bf438bda6 100755 | |||
18248 | 18238 | ||
18249 | # Handle CRLF in mingw tool chain | 18239 | # Handle CRLF in mingw tool chain |
18250 | opt_cr= | 18240 | opt_cr= |
18251 | @@ -7215,6 +7528,7 @@ for ac_symprfx in "" "_"; do | 18241 | @@ -7212,6 +7525,7 @@ for ac_symprfx in "" "_"; do |
18252 | else | 18242 | else |
18253 | lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" | 18243 | lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" |
18254 | fi | 18244 | fi |
@@ -18256,7 +18246,7 @@ index 8704bc215f4..c1bf438bda6 100755 | |||
18256 | 18246 | ||
18257 | # Check to see that the pipe works correctly. | 18247 | # Check to see that the pipe works correctly. |
18258 | pipe_works=no | 18248 | pipe_works=no |
18259 | @@ -7256,6 +7570,18 @@ _LT_EOF | 18249 | @@ -7253,6 +7567,18 @@ _LT_EOF |
18260 | if $GREP ' nm_test_var$' "$nlist" >/dev/null; then | 18250 | if $GREP ' nm_test_var$' "$nlist" >/dev/null; then |
18261 | if $GREP ' nm_test_func$' "$nlist" >/dev/null; then | 18251 | if $GREP ' nm_test_func$' "$nlist" >/dev/null; then |
18262 | cat <<_LT_EOF > conftest.$ac_ext | 18252 | cat <<_LT_EOF > conftest.$ac_ext |
@@ -18275,7 +18265,7 @@ index 8704bc215f4..c1bf438bda6 100755 | |||
18275 | #ifdef __cplusplus | 18265 | #ifdef __cplusplus |
18276 | extern "C" { | 18266 | extern "C" { |
18277 | #endif | 18267 | #endif |
18278 | @@ -7267,7 +7593,7 @@ _LT_EOF | 18268 | @@ -7264,7 +7590,7 @@ _LT_EOF |
18279 | cat <<_LT_EOF >> conftest.$ac_ext | 18269 | cat <<_LT_EOF >> conftest.$ac_ext |
18280 | 18270 | ||
18281 | /* The mapping between symbol names and symbols. */ | 18271 | /* The mapping between symbol names and symbols. */ |
@@ -18284,7 +18274,7 @@ index 8704bc215f4..c1bf438bda6 100755 | |||
18284 | const char *name; | 18274 | const char *name; |
18285 | void *address; | 18275 | void *address; |
18286 | } | 18276 | } |
18287 | @@ -7293,8 +7619,8 @@ static const void *lt_preloaded_setup() { | 18277 | @@ -7290,8 +7616,8 @@ static const void *lt_preloaded_setup() { |
18288 | _LT_EOF | 18278 | _LT_EOF |
18289 | # Now try linking the two files. | 18279 | # Now try linking the two files. |
18290 | mv conftest.$ac_objext conftstm.$ac_objext | 18280 | mv conftest.$ac_objext conftstm.$ac_objext |
@@ -18295,7 +18285,7 @@ index 8704bc215f4..c1bf438bda6 100755 | |||
18295 | LIBS="conftstm.$ac_objext" | 18285 | LIBS="conftstm.$ac_objext" |
18296 | CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" | 18286 | CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" |
18297 | if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 | 18287 | if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 |
18298 | @@ -7304,8 +7630,8 @@ _LT_EOF | 18288 | @@ -7301,8 +7627,8 @@ _LT_EOF |
18299 | test $ac_status = 0; } && test -s conftest${ac_exeext}; then | 18289 | test $ac_status = 0; } && test -s conftest${ac_exeext}; then |
18300 | pipe_works=yes | 18290 | pipe_works=yes |
18301 | fi | 18291 | fi |
@@ -18306,7 +18296,7 @@ index 8704bc215f4..c1bf438bda6 100755 | |||
18306 | else | 18296 | else |
18307 | echo "cannot find nm_test_func in $nlist" >&5 | 18297 | echo "cannot find nm_test_func in $nlist" >&5 |
18308 | fi | 18298 | fi |
18309 | @@ -7342,6 +7668,14 @@ else | 18299 | @@ -7339,6 +7665,17 @@ else |
18310 | $as_echo "ok" >&6; } | 18300 | $as_echo "ok" >&6; } |
18311 | fi | 18301 | fi |
18312 | 18302 | ||
@@ -18318,10 +18308,13 @@ index 8704bc215f4..c1bf438bda6 100755 | |||
18318 | +fi | 18308 | +fi |
18319 | + | 18309 | + |
18320 | + | 18310 | + |
18311 | + | ||
18312 | + | ||
18313 | + | ||
18321 | 18314 | ||
18322 | 18315 | ||
18323 | 18316 | ||
18324 | @@ -7360,6 +7694,47 @@ fi | 18317 | @@ -7355,6 +7692,44 @@ fi |
18325 | 18318 | ||
18326 | 18319 | ||
18327 | 18320 | ||
@@ -18331,7 +18324,6 @@ index 8704bc215f4..c1bf438bda6 100755 | |||
18331 | + | 18324 | + |
18332 | + | 18325 | + |
18333 | + | 18326 | + |
18334 | + | ||
18335 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 | 18327 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 |
18336 | +$as_echo_n "checking for sysroot... " >&6; } | 18328 | +$as_echo_n "checking for sysroot... " >&6; } |
18337 | + | 18329 | + |
@@ -18364,12 +18356,10 @@ index 8704bc215f4..c1bf438bda6 100755 | |||
18364 | + | 18356 | + |
18365 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 | 18357 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 |
18366 | +$as_echo "${lt_sysroot:-no}" >&6; } | 18358 | +$as_echo "${lt_sysroot:-no}" >&6; } |
18367 | + | ||
18368 | + | ||
18369 | 18359 | ||
18370 | 18360 | ||
18371 | 18361 | ||
18372 | @@ -7569,6 +7944,123 @@ esac | 18362 | @@ -7566,6 +7941,123 @@ esac |
18373 | 18363 | ||
18374 | need_locks="$enable_libtool_lock" | 18364 | need_locks="$enable_libtool_lock" |
18375 | 18365 | ||
@@ -18493,7 +18483,7 @@ index 8704bc215f4..c1bf438bda6 100755 | |||
18493 | 18483 | ||
18494 | case $host_os in | 18484 | case $host_os in |
18495 | rhapsody* | darwin*) | 18485 | rhapsody* | darwin*) |
18496 | @@ -8132,6 +8624,8 @@ _LT_EOF | 18486 | @@ -8129,6 +8621,8 @@ _LT_EOF |
18497 | $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 | 18487 | $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 |
18498 | echo "$AR cru libconftest.a conftest.o" >&5 | 18488 | echo "$AR cru libconftest.a conftest.o" >&5 |
18499 | $AR cru libconftest.a conftest.o 2>&5 | 18489 | $AR cru libconftest.a conftest.o 2>&5 |
@@ -18502,7 +18492,7 @@ index 8704bc215f4..c1bf438bda6 100755 | |||
18502 | cat > conftest.c << _LT_EOF | 18492 | cat > conftest.c << _LT_EOF |
18503 | int main() { return 0;} | 18493 | int main() { return 0;} |
18504 | _LT_EOF | 18494 | _LT_EOF |
18505 | @@ -8684,8 +9178,6 @@ fi | 18495 | @@ -8681,8 +9175,6 @@ fi |
18506 | lt_prog_compiler_pic= | 18496 | lt_prog_compiler_pic= |
18507 | lt_prog_compiler_static= | 18497 | lt_prog_compiler_static= |
18508 | 18498 | ||
@@ -18511,7 +18501,7 @@ index 8704bc215f4..c1bf438bda6 100755 | |||
18511 | 18501 | ||
18512 | if test "$GCC" = yes; then | 18502 | if test "$GCC" = yes; then |
18513 | lt_prog_compiler_wl='-Wl,' | 18503 | lt_prog_compiler_wl='-Wl,' |
18514 | @@ -8851,6 +9343,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } | 18504 | @@ -8848,6 +9340,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } |
18515 | lt_prog_compiler_pic='--shared' | 18505 | lt_prog_compiler_pic='--shared' |
18516 | lt_prog_compiler_static='--static' | 18506 | lt_prog_compiler_static='--static' |
18517 | ;; | 18507 | ;; |
@@ -18524,7 +18514,7 @@ index 8704bc215f4..c1bf438bda6 100755 | |||
18524 | pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) | 18514 | pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) |
18525 | # Portland Group compilers (*not* the Pentium gcc compiler, | 18515 | # Portland Group compilers (*not* the Pentium gcc compiler, |
18526 | # which looks to be a dead project) | 18516 | # which looks to be a dead project) |
18527 | @@ -8913,7 +9411,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } | 18517 | @@ -8910,7 +9408,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } |
18528 | lt_prog_compiler_pic='-KPIC' | 18518 | lt_prog_compiler_pic='-KPIC' |
18529 | lt_prog_compiler_static='-Bstatic' | 18519 | lt_prog_compiler_static='-Bstatic' |
18530 | case $cc_basename in | 18520 | case $cc_basename in |
@@ -18533,7 +18523,7 @@ index 8704bc215f4..c1bf438bda6 100755 | |||
18533 | lt_prog_compiler_wl='-Qoption ld ';; | 18523 | lt_prog_compiler_wl='-Qoption ld ';; |
18534 | *) | 18524 | *) |
18535 | lt_prog_compiler_wl='-Wl,';; | 18525 | lt_prog_compiler_wl='-Wl,';; |
18536 | @@ -8970,13 +9468,17 @@ case $host_os in | 18526 | @@ -8967,13 +9465,17 @@ case $host_os in |
18537 | lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" | 18527 | lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" |
18538 | ;; | 18528 | ;; |
18539 | esac | 18529 | esac |
@@ -18557,7 +18547,7 @@ index 8704bc215f4..c1bf438bda6 100755 | |||
18557 | 18547 | ||
18558 | # | 18548 | # |
18559 | # Check to make sure the PIC flag actually works. | 18549 | # Check to make sure the PIC flag actually works. |
18560 | @@ -9037,6 +9539,11 @@ fi | 18550 | @@ -9034,6 +9536,11 @@ fi |
18561 | 18551 | ||
18562 | 18552 | ||
18563 | 18553 | ||
@@ -18569,7 +18559,7 @@ index 8704bc215f4..c1bf438bda6 100755 | |||
18569 | # | 18559 | # |
18570 | # Check to make sure the static flag actually works. | 18560 | # Check to make sure the static flag actually works. |
18571 | # | 18561 | # |
18572 | @@ -9387,7 +9894,8 @@ _LT_EOF | 18562 | @@ -9384,7 +9891,8 @@ _LT_EOF |
18573 | allow_undefined_flag=unsupported | 18563 | allow_undefined_flag=unsupported |
18574 | always_export_symbols=no | 18564 | always_export_symbols=no |
18575 | enable_shared_with_static_runtimes=yes | 18565 | enable_shared_with_static_runtimes=yes |
@@ -18579,7 +18569,7 @@ index 8704bc215f4..c1bf438bda6 100755 | |||
18579 | 18569 | ||
18580 | if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then | 18570 | if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then |
18581 | archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' | 18571 | archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' |
18582 | @@ -9486,12 +9994,12 @@ _LT_EOF | 18572 | @@ -9483,12 +9991,12 @@ _LT_EOF |
18583 | whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' | 18573 | whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' |
18584 | hardcode_libdir_flag_spec= | 18574 | hardcode_libdir_flag_spec= |
18585 | hardcode_libdir_flag_spec_ld='-rpath $libdir' | 18575 | hardcode_libdir_flag_spec_ld='-rpath $libdir' |
@@ -18594,7 +18584,7 @@ index 8704bc215f4..c1bf438bda6 100755 | |||
18594 | fi | 18584 | fi |
18595 | ;; | 18585 | ;; |
18596 | esac | 18586 | esac |
18597 | @@ -9505,8 +10013,8 @@ _LT_EOF | 18587 | @@ -9502,8 +10010,8 @@ _LT_EOF |
18598 | archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' | 18588 | archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' |
18599 | wlarc= | 18589 | wlarc= |
18600 | else | 18590 | else |
@@ -18605,7 +18595,7 @@ index 8704bc215f4..c1bf438bda6 100755 | |||
18605 | fi | 18595 | fi |
18606 | ;; | 18596 | ;; |
18607 | 18597 | ||
18608 | @@ -9524,8 +10032,8 @@ _LT_EOF | 18598 | @@ -9521,8 +10029,8 @@ _LT_EOF |
18609 | 18599 | ||
18610 | _LT_EOF | 18600 | _LT_EOF |
18611 | elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then | 18601 | elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then |
@@ -18616,7 +18606,7 @@ index 8704bc215f4..c1bf438bda6 100755 | |||
18616 | else | 18606 | else |
18617 | ld_shlibs=no | 18607 | ld_shlibs=no |
18618 | fi | 18608 | fi |
18619 | @@ -9571,8 +10079,8 @@ _LT_EOF | 18609 | @@ -9568,8 +10076,8 @@ _LT_EOF |
18620 | 18610 | ||
18621 | *) | 18611 | *) |
18622 | if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then | 18612 | if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then |
@@ -18627,7 +18617,7 @@ index 8704bc215f4..c1bf438bda6 100755 | |||
18627 | else | 18617 | else |
18628 | ld_shlibs=no | 18618 | ld_shlibs=no |
18629 | fi | 18619 | fi |
18630 | @@ -9702,7 +10210,13 @@ _LT_EOF | 18620 | @@ -9699,7 +10207,13 @@ _LT_EOF |
18631 | allow_undefined_flag='-berok' | 18621 | allow_undefined_flag='-berok' |
18632 | # Determine the default libpath from the value encoded in an | 18622 | # Determine the default libpath from the value encoded in an |
18633 | # empty executable. | 18623 | # empty executable. |
@@ -18642,7 +18632,7 @@ index 8704bc215f4..c1bf438bda6 100755 | |||
18642 | /* end confdefs.h. */ | 18632 | /* end confdefs.h. */ |
18643 | 18633 | ||
18644 | int | 18634 | int |
18645 | @@ -9715,22 +10229,29 @@ main () | 18635 | @@ -9712,22 +10226,29 @@ main () |
18646 | _ACEOF | 18636 | _ACEOF |
18647 | if ac_fn_c_try_link "$LINENO"; then : | 18637 | if ac_fn_c_try_link "$LINENO"; then : |
18648 | 18638 | ||
@@ -18685,7 +18675,7 @@ index 8704bc215f4..c1bf438bda6 100755 | |||
18685 | 18675 | ||
18686 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" | 18676 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" |
18687 | archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" | 18677 | 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" |
18688 | @@ -9742,7 +10263,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | 18678 | @@ -9739,7 +10260,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
18689 | else | 18679 | else |
18690 | # Determine the default libpath from the value encoded in an | 18680 | # Determine the default libpath from the value encoded in an |
18691 | # empty executable. | 18681 | # empty executable. |
@@ -18700,7 +18690,7 @@ index 8704bc215f4..c1bf438bda6 100755 | |||
18700 | /* end confdefs.h. */ | 18690 | /* end confdefs.h. */ |
18701 | 18691 | ||
18702 | int | 18692 | int |
18703 | @@ -9755,22 +10282,29 @@ main () | 18693 | @@ -9752,22 +10279,29 @@ main () |
18704 | _ACEOF | 18694 | _ACEOF |
18705 | if ac_fn_c_try_link "$LINENO"; then : | 18695 | if ac_fn_c_try_link "$LINENO"; then : |
18706 | 18696 | ||
@@ -18743,7 +18733,7 @@ index 8704bc215f4..c1bf438bda6 100755 | |||
18743 | 18733 | ||
18744 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" | 18734 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" |
18745 | # Warning - without using the other run time loading flags, | 18735 | # Warning - without using the other run time loading flags, |
18746 | @@ -9815,20 +10349,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | 18736 | @@ -9812,20 +10346,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
18747 | # Microsoft Visual C++. | 18737 | # Microsoft Visual C++. |
18748 | # hardcode_libdir_flag_spec is actually meaningless, as there is | 18738 | # hardcode_libdir_flag_spec is actually meaningless, as there is |
18749 | # no search path for DLLs. | 18739 | # no search path for DLLs. |
@@ -18821,7 +18811,7 @@ index 8704bc215f4..c1bf438bda6 100755 | |||
18821 | ;; | 18811 | ;; |
18822 | 18812 | ||
18823 | darwin* | rhapsody*) | 18813 | darwin* | rhapsody*) |
18824 | @@ -9889,7 +10466,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | 18814 | @@ -9886,7 +10463,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
18825 | 18815 | ||
18826 | # FreeBSD 3 and greater uses gcc -shared to do shared libraries. | 18816 | # FreeBSD 3 and greater uses gcc -shared to do shared libraries. |
18827 | freebsd* | dragonfly*) | 18817 | freebsd* | dragonfly*) |
@@ -18830,7 +18820,7 @@ index 8704bc215f4..c1bf438bda6 100755 | |||
18830 | hardcode_libdir_flag_spec='-R$libdir' | 18820 | hardcode_libdir_flag_spec='-R$libdir' |
18831 | hardcode_direct=yes | 18821 | hardcode_direct=yes |
18832 | hardcode_shlibpath_var=no | 18822 | hardcode_shlibpath_var=no |
18833 | @@ -9897,7 +10474,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | 18823 | @@ -9894,7 +10471,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
18834 | 18824 | ||
18835 | hpux9*) | 18825 | hpux9*) |
18836 | if test "$GCC" = yes; then | 18826 | if test "$GCC" = yes; then |
@@ -18839,7 +18829,7 @@ index 8704bc215f4..c1bf438bda6 100755 | |||
18839 | else | 18829 | else |
18840 | archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' | 18830 | 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' |
18841 | fi | 18831 | fi |
18842 | @@ -9913,7 +10490,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | 18832 | @@ -9910,7 +10487,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
18843 | 18833 | ||
18844 | hpux10*) | 18834 | hpux10*) |
18845 | if test "$GCC" = yes && test "$with_gnu_ld" = no; then | 18835 | if test "$GCC" = yes && test "$with_gnu_ld" = no; then |
@@ -18848,7 +18838,7 @@ index 8704bc215f4..c1bf438bda6 100755 | |||
18848 | else | 18838 | else |
18849 | archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' | 18839 | archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' |
18850 | fi | 18840 | fi |
18851 | @@ -9937,10 +10514,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | 18841 | @@ -9934,10 +10511,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
18852 | archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' | 18842 | archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' |
18853 | ;; | 18843 | ;; |
18854 | ia64*) | 18844 | ia64*) |
@@ -18861,7 +18851,7 @@ index 8704bc215f4..c1bf438bda6 100755 | |||
18861 | ;; | 18851 | ;; |
18862 | esac | 18852 | esac |
18863 | else | 18853 | else |
18864 | @@ -10019,23 +10596,36 @@ fi | 18854 | @@ -10016,23 +10593,36 @@ fi |
18865 | 18855 | ||
18866 | irix5* | irix6* | nonstopux*) | 18856 | irix5* | irix6* | nonstopux*) |
18867 | if test "$GCC" = yes; then | 18857 | if test "$GCC" = yes; then |
@@ -18906,7 +18896,7 @@ index 8704bc215f4..c1bf438bda6 100755 | |||
18906 | else | 18896 | else |
18907 | archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' | 18897 | 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' |
18908 | archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' | 18898 | 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' |
18909 | @@ -10120,7 +10710,7 @@ rm -f core conftest.err conftest.$ac_objext \ | 18899 | @@ -10117,7 +10707,7 @@ rm -f core conftest.err conftest.$ac_objext \ |
18910 | osf4* | osf5*) # as osf3* with the addition of -msym flag | 18900 | osf4* | osf5*) # as osf3* with the addition of -msym flag |
18911 | if test "$GCC" = yes; then | 18901 | if test "$GCC" = yes; then |
18912 | allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' | 18902 | allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' |
@@ -18915,7 +18905,7 @@ index 8704bc215f4..c1bf438bda6 100755 | |||
18915 | hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' | 18905 | hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' |
18916 | else | 18906 | else |
18917 | allow_undefined_flag=' -expect_unresolved \*' | 18907 | allow_undefined_flag=' -expect_unresolved \*' |
18918 | @@ -10139,9 +10729,9 @@ rm -f core conftest.err conftest.$ac_objext \ | 18908 | @@ -10136,9 +10726,9 @@ rm -f core conftest.err conftest.$ac_objext \ |
18919 | no_undefined_flag=' -z defs' | 18909 | no_undefined_flag=' -z defs' |
18920 | if test "$GCC" = yes; then | 18910 | if test "$GCC" = yes; then |
18921 | wlarc='${wl}' | 18911 | wlarc='${wl}' |
@@ -18927,7 +18917,7 @@ index 8704bc215f4..c1bf438bda6 100755 | |||
18927 | else | 18917 | else |
18928 | case `$CC -V 2>&1` in | 18918 | case `$CC -V 2>&1` in |
18929 | *"Compilers 5.0"*) | 18919 | *"Compilers 5.0"*) |
18930 | @@ -10717,8 +11307,9 @@ cygwin* | mingw* | pw32* | cegcc*) | 18920 | @@ -10714,8 +11304,9 @@ cygwin* | mingw* | pw32* | cegcc*) |
18931 | need_version=no | 18921 | need_version=no |
18932 | need_lib_prefix=no | 18922 | need_lib_prefix=no |
18933 | 18923 | ||
@@ -18939,7 +18929,7 @@ index 8704bc215f4..c1bf438bda6 100755 | |||
18939 | library_names_spec='$libname.dll.a' | 18929 | library_names_spec='$libname.dll.a' |
18940 | # DLL is installed to $(libdir)/../bin by postinstall_cmds | 18930 | # DLL is installed to $(libdir)/../bin by postinstall_cmds |
18941 | postinstall_cmds='base_file=`basename \${file}`~ | 18931 | postinstall_cmds='base_file=`basename \${file}`~ |
18942 | @@ -10751,13 +11342,71 @@ cygwin* | mingw* | pw32* | cegcc*) | 18932 | @@ -10748,13 +11339,71 @@ cygwin* | mingw* | pw32* | cegcc*) |
18943 | library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' | 18933 | library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' |
18944 | ;; | 18934 | ;; |
18945 | esac | 18935 | esac |
@@ -19012,16 +19002,16 @@ index 8704bc215f4..c1bf438bda6 100755 | |||
19012 | # FIXME: first we should search . and the directory the executable is in | 19002 | # FIXME: first we should search . and the directory the executable is in |
19013 | shlibpath_var=PATH | 19003 | shlibpath_var=PATH |
19014 | ;; | 19004 | ;; |
19015 | @@ -11635,7 +12284,7 @@ else | 19005 | @@ -11632,7 +12281,7 @@ else |
19016 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 | 19006 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 |
19017 | lt_status=$lt_dlunknown | 19007 | lt_status=$lt_dlunknown |
19018 | cat > conftest.$ac_ext <<_LT_EOF | 19008 | cat > conftest.$ac_ext <<_LT_EOF |
19019 | -#line 11638 "configure" | 19009 | -#line 11635 "configure" |
19020 | +#line $LINENO "configure" | 19010 | +#line $LINENO "configure" |
19021 | #include "confdefs.h" | 19011 | #include "confdefs.h" |
19022 | 19012 | ||
19023 | #if HAVE_DLFCN_H | 19013 | #if HAVE_DLFCN_H |
19024 | @@ -11679,10 +12328,10 @@ else | 19014 | @@ -11676,10 +12325,10 @@ else |
19025 | /* When -fvisbility=hidden is used, assume the code has been annotated | 19015 | /* When -fvisbility=hidden is used, assume the code has been annotated |
19026 | correspondingly for the symbols needed. */ | 19016 | correspondingly for the symbols needed. */ |
19027 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) | 19017 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) |
@@ -19034,16 +19024,16 @@ index 8704bc215f4..c1bf438bda6 100755 | |||
19034 | int main () | 19024 | int main () |
19035 | { | 19025 | { |
19036 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); | 19026 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); |
19037 | @@ -11741,7 +12390,7 @@ else | 19027 | @@ -11738,7 +12387,7 @@ else |
19038 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 | 19028 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 |
19039 | lt_status=$lt_dlunknown | 19029 | lt_status=$lt_dlunknown |
19040 | cat > conftest.$ac_ext <<_LT_EOF | 19030 | cat > conftest.$ac_ext <<_LT_EOF |
19041 | -#line 11744 "configure" | 19031 | -#line 11741 "configure" |
19042 | +#line $LINENO "configure" | 19032 | +#line $LINENO "configure" |
19043 | #include "confdefs.h" | 19033 | #include "confdefs.h" |
19044 | 19034 | ||
19045 | #if HAVE_DLFCN_H | 19035 | #if HAVE_DLFCN_H |
19046 | @@ -11785,10 +12434,10 @@ else | 19036 | @@ -11782,10 +12431,10 @@ else |
19047 | /* When -fvisbility=hidden is used, assume the code has been annotated | 19037 | /* When -fvisbility=hidden is used, assume the code has been annotated |
19048 | correspondingly for the symbols needed. */ | 19038 | correspondingly for the symbols needed. */ |
19049 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) | 19039 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) |
@@ -19056,7 +19046,7 @@ index 8704bc215f4..c1bf438bda6 100755 | |||
19056 | int main () | 19046 | int main () |
19057 | { | 19047 | { |
19058 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); | 19048 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); |
19059 | @@ -14473,13 +15122,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' | 19049 | @@ -15832,13 +16481,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' |
19060 | lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' | 19050 | lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' |
19061 | lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' | 19051 | lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' |
19062 | lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' | 19052 | lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' |
@@ -19077,7 +19067,7 @@ index 8704bc215f4..c1bf438bda6 100755 | |||
19077 | STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' | 19067 | STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' |
19078 | RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' | 19068 | RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' |
19079 | old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' | 19069 | old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' |
19080 | @@ -14494,14 +15150,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de | 19070 | @@ -15853,14 +16509,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de |
19081 | lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' | 19071 | lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' |
19082 | lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' | 19072 | lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' |
19083 | lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`' | 19073 | 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"`' |
@@ -19096,7 +19086,7 @@ index 8704bc215f4..c1bf438bda6 100755 | |||
19096 | DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' | 19086 | DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' |
19097 | NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' | 19087 | NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' |
19098 | LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' | 19088 | LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' |
19099 | @@ -14534,12 +15193,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q | 19089 | @@ -15893,12 +16552,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q |
19100 | hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' | 19090 | hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' |
19101 | inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' | 19091 | inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' |
19102 | link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' | 19092 | link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' |
@@ -19110,7 +19100,7 @@ index 8704bc215f4..c1bf438bda6 100755 | |||
19110 | file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' | 19100 | file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' |
19111 | variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' | 19101 | variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' |
19112 | need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' | 19102 | need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' |
19113 | @@ -14594,8 +15253,13 @@ reload_flag \ | 19103 | @@ -15953,8 +16612,13 @@ reload_flag \ |
19114 | OBJDUMP \ | 19104 | OBJDUMP \ |
19115 | deplibs_check_method \ | 19105 | deplibs_check_method \ |
19116 | file_magic_cmd \ | 19106 | file_magic_cmd \ |
@@ -19124,7 +19114,7 @@ index 8704bc215f4..c1bf438bda6 100755 | |||
19124 | STRIP \ | 19114 | STRIP \ |
19125 | RANLIB \ | 19115 | RANLIB \ |
19126 | CC \ | 19116 | CC \ |
19127 | @@ -14605,12 +15269,14 @@ lt_cv_sys_global_symbol_pipe \ | 19117 | @@ -15964,12 +16628,14 @@ lt_cv_sys_global_symbol_pipe \ |
19128 | lt_cv_sys_global_symbol_to_cdecl \ | 19118 | lt_cv_sys_global_symbol_to_cdecl \ |
19129 | lt_cv_sys_global_symbol_to_c_name_address \ | 19119 | lt_cv_sys_global_symbol_to_c_name_address \ |
19130 | lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ | 19120 | lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ |
@@ -19140,7 +19130,7 @@ index 8704bc215f4..c1bf438bda6 100755 | |||
19140 | DSYMUTIL \ | 19130 | DSYMUTIL \ |
19141 | NMEDIT \ | 19131 | NMEDIT \ |
19142 | LIPO \ | 19132 | LIPO \ |
19143 | @@ -14626,7 +15292,6 @@ no_undefined_flag \ | 19133 | @@ -15985,7 +16651,6 @@ no_undefined_flag \ |
19144 | hardcode_libdir_flag_spec \ | 19134 | hardcode_libdir_flag_spec \ |
19145 | hardcode_libdir_flag_spec_ld \ | 19135 | hardcode_libdir_flag_spec_ld \ |
19146 | hardcode_libdir_separator \ | 19136 | hardcode_libdir_separator \ |
@@ -19148,7 +19138,7 @@ index 8704bc215f4..c1bf438bda6 100755 | |||
19148 | exclude_expsyms \ | 19138 | exclude_expsyms \ |
19149 | include_expsyms \ | 19139 | include_expsyms \ |
19150 | file_list_spec \ | 19140 | file_list_spec \ |
19151 | @@ -14662,6 +15327,7 @@ module_cmds \ | 19141 | @@ -16021,6 +16686,7 @@ module_cmds \ |
19152 | module_expsym_cmds \ | 19142 | module_expsym_cmds \ |
19153 | export_symbols_cmds \ | 19143 | export_symbols_cmds \ |
19154 | prelink_cmds \ | 19144 | prelink_cmds \ |
@@ -19156,7 +19146,7 @@ index 8704bc215f4..c1bf438bda6 100755 | |||
19156 | postinstall_cmds \ | 19146 | postinstall_cmds \ |
19157 | postuninstall_cmds \ | 19147 | postuninstall_cmds \ |
19158 | finish_cmds \ | 19148 | finish_cmds \ |
19159 | @@ -15418,7 +16084,8 @@ $as_echo X"$file" | | 19149 | @@ -16778,7 +17444,8 @@ $as_echo X"$file" | |
19160 | # NOTE: Changes made to this file will be lost: look at ltmain.sh. | 19150 | # NOTE: Changes made to this file will be lost: look at ltmain.sh. |
19161 | # | 19151 | # |
19162 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, | 19152 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, |
@@ -19166,7 +19156,7 @@ index 8704bc215f4..c1bf438bda6 100755 | |||
19166 | # Written by Gordon Matzigkeit, 1996 | 19156 | # Written by Gordon Matzigkeit, 1996 |
19167 | # | 19157 | # |
19168 | # This file is part of GNU Libtool. | 19158 | # This file is part of GNU Libtool. |
19169 | @@ -15521,19 +16188,42 @@ SP2NL=$lt_lt_SP2NL | 19159 | @@ -16881,19 +17548,42 @@ SP2NL=$lt_lt_SP2NL |
19170 | # turn newlines into spaces. | 19160 | # turn newlines into spaces. |
19171 | NL2SP=$lt_lt_NL2SP | 19161 | NL2SP=$lt_lt_NL2SP |
19172 | 19162 | ||
@@ -19210,7 +19200,7 @@ index 8704bc215f4..c1bf438bda6 100755 | |||
19210 | # A symbol stripping program. | 19200 | # A symbol stripping program. |
19211 | STRIP=$lt_STRIP | 19201 | STRIP=$lt_STRIP |
19212 | 19202 | ||
19213 | @@ -15563,6 +16253,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address | 19203 | @@ -16923,6 +17613,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address |
19214 | # Transform the output of nm in a C name address pair when lib prefix is needed. | 19204 | # Transform the output of nm in a C name address pair when lib prefix is needed. |
19215 | global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix | 19205 | global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix |
19216 | 19206 | ||
@@ -19223,7 +19213,7 @@ index 8704bc215f4..c1bf438bda6 100755 | |||
19223 | # The name of the directory that contains temporary libtool files. | 19213 | # The name of the directory that contains temporary libtool files. |
19224 | objdir=$objdir | 19214 | objdir=$objdir |
19225 | 19215 | ||
19226 | @@ -15572,6 +16268,9 @@ MAGIC_CMD=$MAGIC_CMD | 19216 | @@ -16932,6 +17628,9 @@ MAGIC_CMD=$MAGIC_CMD |
19227 | # Must we lock files when doing compilation? | 19217 | # Must we lock files when doing compilation? |
19228 | need_locks=$lt_need_locks | 19218 | need_locks=$lt_need_locks |
19229 | 19219 | ||
@@ -19233,7 +19223,7 @@ index 8704bc215f4..c1bf438bda6 100755 | |||
19233 | # Tool to manipulate archived DWARF debug symbol files on Mac OS X. | 19223 | # Tool to manipulate archived DWARF debug symbol files on Mac OS X. |
19234 | DSYMUTIL=$lt_DSYMUTIL | 19224 | DSYMUTIL=$lt_DSYMUTIL |
19235 | 19225 | ||
19236 | @@ -15686,12 +16385,12 @@ with_gcc=$GCC | 19226 | @@ -17046,12 +17745,12 @@ with_gcc=$GCC |
19237 | # Compiler flag to turn off builtin functions. | 19227 | # Compiler flag to turn off builtin functions. |
19238 | no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag | 19228 | no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag |
19239 | 19229 | ||
@@ -19249,7 +19239,7 @@ index 8704bc215f4..c1bf438bda6 100755 | |||
19249 | # Compiler flag to prevent dynamic linking. | 19239 | # Compiler flag to prevent dynamic linking. |
19250 | link_static_flag=$lt_lt_prog_compiler_static | 19240 | link_static_flag=$lt_lt_prog_compiler_static |
19251 | 19241 | ||
19252 | @@ -15778,9 +16477,6 @@ inherit_rpath=$inherit_rpath | 19242 | @@ -17138,9 +17837,6 @@ inherit_rpath=$inherit_rpath |
19253 | # Whether libtool must link a program against all its dependency libraries. | 19243 | # Whether libtool must link a program against all its dependency libraries. |
19254 | link_all_deplibs=$link_all_deplibs | 19244 | link_all_deplibs=$link_all_deplibs |
19255 | 19245 | ||
@@ -19259,7 +19249,7 @@ index 8704bc215f4..c1bf438bda6 100755 | |||
19259 | # Set to "yes" if exported symbols are required. | 19249 | # Set to "yes" if exported symbols are required. |
19260 | always_export_symbols=$always_export_symbols | 19250 | always_export_symbols=$always_export_symbols |
19261 | 19251 | ||
19262 | @@ -15796,6 +16492,9 @@ include_expsyms=$lt_include_expsyms | 19252 | @@ -17156,6 +17852,9 @@ include_expsyms=$lt_include_expsyms |
19263 | # Commands necessary for linking programs (against libraries) with templates. | 19253 | # Commands necessary for linking programs (against libraries) with templates. |
19264 | prelink_cmds=$lt_prelink_cmds | 19254 | prelink_cmds=$lt_prelink_cmds |
19265 | 19255 | ||
@@ -19269,7 +19259,3172 @@ index 8704bc215f4..c1bf438bda6 100755 | |||
19269 | # Specify filename containing input files. | 19259 | # Specify filename containing input files. |
19270 | file_list_spec=$lt_file_list_spec | 19260 | file_list_spec=$lt_file_list_spec |
19271 | 19261 | ||
19272 | @@ -15828,210 +16527,169 @@ ltmain="$ac_aux_dir/ltmain.sh" | 19262 | @@ -17188,210 +17887,169 @@ ltmain="$ac_aux_dir/ltmain.sh" |
19263 | # if finds mixed CR/LF and LF-only lines. Since sed operates in | ||
19264 | # text mode, it properly converts lines to CR/LF. This bash problem | ||
19265 | # is reportedly fixed, but why not run on old versions too? | ||
19266 | - sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ | ||
19267 | - || (rm -f "$cfgfile"; exit 1) | ||
19268 | - | ||
19269 | - case $xsi_shell in | ||
19270 | - yes) | ||
19271 | - cat << \_LT_EOF >> "$cfgfile" | ||
19272 | - | ||
19273 | -# func_dirname file append nondir_replacement | ||
19274 | -# Compute the dirname of FILE. If nonempty, add APPEND to the result, | ||
19275 | -# otherwise set result to NONDIR_REPLACEMENT. | ||
19276 | -func_dirname () | ||
19277 | -{ | ||
19278 | - case ${1} in | ||
19279 | - */*) func_dirname_result="${1%/*}${2}" ;; | ||
19280 | - * ) func_dirname_result="${3}" ;; | ||
19281 | - esac | ||
19282 | -} | ||
19283 | - | ||
19284 | -# func_basename file | ||
19285 | -func_basename () | ||
19286 | -{ | ||
19287 | - func_basename_result="${1##*/}" | ||
19288 | -} | ||
19289 | - | ||
19290 | -# func_dirname_and_basename file append nondir_replacement | ||
19291 | -# perform func_basename and func_dirname in a single function | ||
19292 | -# call: | ||
19293 | -# dirname: Compute the dirname of FILE. If nonempty, | ||
19294 | -# add APPEND to the result, otherwise set result | ||
19295 | -# to NONDIR_REPLACEMENT. | ||
19296 | -# value returned in "$func_dirname_result" | ||
19297 | -# basename: Compute filename of FILE. | ||
19298 | -# value retuned in "$func_basename_result" | ||
19299 | -# Implementation must be kept synchronized with func_dirname | ||
19300 | -# and func_basename. For efficiency, we do not delegate to | ||
19301 | -# those functions but instead duplicate the functionality here. | ||
19302 | -func_dirname_and_basename () | ||
19303 | -{ | ||
19304 | - case ${1} in | ||
19305 | - */*) func_dirname_result="${1%/*}${2}" ;; | ||
19306 | - * ) func_dirname_result="${3}" ;; | ||
19307 | - esac | ||
19308 | - func_basename_result="${1##*/}" | ||
19309 | -} | ||
19310 | - | ||
19311 | -# func_stripname prefix suffix name | ||
19312 | -# strip PREFIX and SUFFIX off of NAME. | ||
19313 | -# PREFIX and SUFFIX must not contain globbing or regex special | ||
19314 | -# characters, hashes, percent signs, but SUFFIX may contain a leading | ||
19315 | -# dot (in which case that matches only a dot). | ||
19316 | -func_stripname () | ||
19317 | -{ | ||
19318 | - # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are | ||
19319 | - # positional parameters, so assign one to ordinary parameter first. | ||
19320 | - func_stripname_result=${3} | ||
19321 | - func_stripname_result=${func_stripname_result#"${1}"} | ||
19322 | - func_stripname_result=${func_stripname_result%"${2}"} | ||
19323 | -} | ||
19324 | - | ||
19325 | -# func_opt_split | ||
19326 | -func_opt_split () | ||
19327 | -{ | ||
19328 | - func_opt_split_opt=${1%%=*} | ||
19329 | - func_opt_split_arg=${1#*=} | ||
19330 | -} | ||
19331 | - | ||
19332 | -# func_lo2o object | ||
19333 | -func_lo2o () | ||
19334 | -{ | ||
19335 | - case ${1} in | ||
19336 | - *.lo) func_lo2o_result=${1%.lo}.${objext} ;; | ||
19337 | - *) func_lo2o_result=${1} ;; | ||
19338 | - esac | ||
19339 | -} | ||
19340 | - | ||
19341 | -# func_xform libobj-or-source | ||
19342 | -func_xform () | ||
19343 | -{ | ||
19344 | - func_xform_result=${1%.*}.lo | ||
19345 | -} | ||
19346 | - | ||
19347 | -# func_arith arithmetic-term... | ||
19348 | -func_arith () | ||
19349 | -{ | ||
19350 | - func_arith_result=$(( $* )) | ||
19351 | -} | ||
19352 | - | ||
19353 | -# func_len string | ||
19354 | -# STRING may not start with a hyphen. | ||
19355 | -func_len () | ||
19356 | -{ | ||
19357 | - func_len_result=${#1} | ||
19358 | -} | ||
19359 | - | ||
19360 | -_LT_EOF | ||
19361 | - ;; | ||
19362 | - *) # Bourne compatible functions. | ||
19363 | - cat << \_LT_EOF >> "$cfgfile" | ||
19364 | - | ||
19365 | -# func_dirname file append nondir_replacement | ||
19366 | -# Compute the dirname of FILE. If nonempty, add APPEND to the result, | ||
19367 | -# otherwise set result to NONDIR_REPLACEMENT. | ||
19368 | -func_dirname () | ||
19369 | -{ | ||
19370 | - # Extract subdirectory from the argument. | ||
19371 | - func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` | ||
19372 | - if test "X$func_dirname_result" = "X${1}"; then | ||
19373 | - func_dirname_result="${3}" | ||
19374 | - else | ||
19375 | - func_dirname_result="$func_dirname_result${2}" | ||
19376 | - fi | ||
19377 | -} | ||
19378 | - | ||
19379 | -# func_basename file | ||
19380 | -func_basename () | ||
19381 | -{ | ||
19382 | - func_basename_result=`$ECHO "${1}" | $SED "$basename"` | ||
19383 | -} | ||
19384 | - | ||
19385 | - | ||
19386 | -# func_stripname prefix suffix name | ||
19387 | -# strip PREFIX and SUFFIX off of NAME. | ||
19388 | -# PREFIX and SUFFIX must not contain globbing or regex special | ||
19389 | -# characters, hashes, percent signs, but SUFFIX may contain a leading | ||
19390 | -# dot (in which case that matches only a dot). | ||
19391 | -# func_strip_suffix prefix name | ||
19392 | -func_stripname () | ||
19393 | -{ | ||
19394 | - case ${2} in | ||
19395 | - .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; | ||
19396 | - *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; | ||
19397 | - esac | ||
19398 | -} | ||
19399 | - | ||
19400 | -# sed scripts: | ||
19401 | -my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q' | ||
19402 | -my_sed_long_arg='1s/^-[^=]*=//' | ||
19403 | - | ||
19404 | -# func_opt_split | ||
19405 | -func_opt_split () | ||
19406 | -{ | ||
19407 | - func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"` | ||
19408 | - func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"` | ||
19409 | -} | ||
19410 | - | ||
19411 | -# func_lo2o object | ||
19412 | -func_lo2o () | ||
19413 | -{ | ||
19414 | - func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` | ||
19415 | -} | ||
19416 | - | ||
19417 | -# func_xform libobj-or-source | ||
19418 | -func_xform () | ||
19419 | -{ | ||
19420 | - func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'` | ||
19421 | -} | ||
19422 | - | ||
19423 | -# func_arith arithmetic-term... | ||
19424 | -func_arith () | ||
19425 | -{ | ||
19426 | - func_arith_result=`expr "$@"` | ||
19427 | -} | ||
19428 | - | ||
19429 | -# func_len string | ||
19430 | -# STRING may not start with a hyphen. | ||
19431 | -func_len () | ||
19432 | -{ | ||
19433 | - func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len` | ||
19434 | -} | ||
19435 | - | ||
19436 | -_LT_EOF | ||
19437 | -esac | ||
19438 | - | ||
19439 | -case $lt_shell_append in | ||
19440 | - yes) | ||
19441 | - cat << \_LT_EOF >> "$cfgfile" | ||
19442 | - | ||
19443 | -# func_append var value | ||
19444 | -# Append VALUE to the end of shell variable VAR. | ||
19445 | -func_append () | ||
19446 | -{ | ||
19447 | - eval "$1+=\$2" | ||
19448 | -} | ||
19449 | -_LT_EOF | ||
19450 | - ;; | ||
19451 | - *) | ||
19452 | - cat << \_LT_EOF >> "$cfgfile" | ||
19453 | - | ||
19454 | -# func_append var value | ||
19455 | -# Append VALUE to the end of shell variable VAR. | ||
19456 | -func_append () | ||
19457 | -{ | ||
19458 | - eval "$1=\$$1\$2" | ||
19459 | -} | ||
19460 | - | ||
19461 | -_LT_EOF | ||
19462 | - ;; | ||
19463 | - esac | ||
19464 | - | ||
19465 | - | ||
19466 | - sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ | ||
19467 | - || (rm -f "$cfgfile"; exit 1) | ||
19468 | - | ||
19469 | - mv -f "$cfgfile" "$ofile" || | ||
19470 | + sed '$q' "$ltmain" >> "$cfgfile" \ | ||
19471 | + || (rm -f "$cfgfile"; exit 1) | ||
19472 | + | ||
19473 | + if test x"$xsi_shell" = xyes; then | ||
19474 | + sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ | ||
19475 | +func_dirname ()\ | ||
19476 | +{\ | ||
19477 | +\ case ${1} in\ | ||
19478 | +\ */*) func_dirname_result="${1%/*}${2}" ;;\ | ||
19479 | +\ * ) func_dirname_result="${3}" ;;\ | ||
19480 | +\ esac\ | ||
19481 | +} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \ | ||
19482 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
19483 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
19484 | +test 0 -eq $? || _lt_function_replace_fail=: | ||
19485 | + | ||
19486 | + | ||
19487 | + sed -e '/^func_basename ()$/,/^} # func_basename /c\ | ||
19488 | +func_basename ()\ | ||
19489 | +{\ | ||
19490 | +\ func_basename_result="${1##*/}"\ | ||
19491 | +} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \ | ||
19492 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
19493 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
19494 | +test 0 -eq $? || _lt_function_replace_fail=: | ||
19495 | + | ||
19496 | + | ||
19497 | + sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\ | ||
19498 | +func_dirname_and_basename ()\ | ||
19499 | +{\ | ||
19500 | +\ case ${1} in\ | ||
19501 | +\ */*) func_dirname_result="${1%/*}${2}" ;;\ | ||
19502 | +\ * ) func_dirname_result="${3}" ;;\ | ||
19503 | +\ esac\ | ||
19504 | +\ func_basename_result="${1##*/}"\ | ||
19505 | +} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \ | ||
19506 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
19507 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
19508 | +test 0 -eq $? || _lt_function_replace_fail=: | ||
19509 | + | ||
19510 | + | ||
19511 | + sed -e '/^func_stripname ()$/,/^} # func_stripname /c\ | ||
19512 | +func_stripname ()\ | ||
19513 | +{\ | ||
19514 | +\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\ | ||
19515 | +\ # positional parameters, so assign one to ordinary parameter first.\ | ||
19516 | +\ func_stripname_result=${3}\ | ||
19517 | +\ func_stripname_result=${func_stripname_result#"${1}"}\ | ||
19518 | +\ func_stripname_result=${func_stripname_result%"${2}"}\ | ||
19519 | +} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \ | ||
19520 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
19521 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
19522 | +test 0 -eq $? || _lt_function_replace_fail=: | ||
19523 | + | ||
19524 | + | ||
19525 | + sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\ | ||
19526 | +func_split_long_opt ()\ | ||
19527 | +{\ | ||
19528 | +\ func_split_long_opt_name=${1%%=*}\ | ||
19529 | +\ func_split_long_opt_arg=${1#*=}\ | ||
19530 | +} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \ | ||
19531 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
19532 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
19533 | +test 0 -eq $? || _lt_function_replace_fail=: | ||
19534 | + | ||
19535 | + | ||
19536 | + sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\ | ||
19537 | +func_split_short_opt ()\ | ||
19538 | +{\ | ||
19539 | +\ func_split_short_opt_arg=${1#??}\ | ||
19540 | +\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\ | ||
19541 | +} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \ | ||
19542 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
19543 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
19544 | +test 0 -eq $? || _lt_function_replace_fail=: | ||
19545 | + | ||
19546 | + | ||
19547 | + sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\ | ||
19548 | +func_lo2o ()\ | ||
19549 | +{\ | ||
19550 | +\ case ${1} in\ | ||
19551 | +\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\ | ||
19552 | +\ *) func_lo2o_result=${1} ;;\ | ||
19553 | +\ esac\ | ||
19554 | +} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \ | ||
19555 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
19556 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
19557 | +test 0 -eq $? || _lt_function_replace_fail=: | ||
19558 | + | ||
19559 | + | ||
19560 | + sed -e '/^func_xform ()$/,/^} # func_xform /c\ | ||
19561 | +func_xform ()\ | ||
19562 | +{\ | ||
19563 | + func_xform_result=${1%.*}.lo\ | ||
19564 | +} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \ | ||
19565 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
19566 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
19567 | +test 0 -eq $? || _lt_function_replace_fail=: | ||
19568 | + | ||
19569 | + | ||
19570 | + sed -e '/^func_arith ()$/,/^} # func_arith /c\ | ||
19571 | +func_arith ()\ | ||
19572 | +{\ | ||
19573 | + func_arith_result=$(( $* ))\ | ||
19574 | +} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \ | ||
19575 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
19576 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
19577 | +test 0 -eq $? || _lt_function_replace_fail=: | ||
19578 | + | ||
19579 | + | ||
19580 | + sed -e '/^func_len ()$/,/^} # func_len /c\ | ||
19581 | +func_len ()\ | ||
19582 | +{\ | ||
19583 | + func_len_result=${#1}\ | ||
19584 | +} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \ | ||
19585 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
19586 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
19587 | +test 0 -eq $? || _lt_function_replace_fail=: | ||
19588 | + | ||
19589 | +fi | ||
19590 | + | ||
19591 | +if test x"$lt_shell_append" = xyes; then | ||
19592 | + sed -e '/^func_append ()$/,/^} # func_append /c\ | ||
19593 | +func_append ()\ | ||
19594 | +{\ | ||
19595 | + eval "${1}+=\\${2}"\ | ||
19596 | +} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \ | ||
19597 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
19598 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
19599 | +test 0 -eq $? || _lt_function_replace_fail=: | ||
19600 | + | ||
19601 | + | ||
19602 | + sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\ | ||
19603 | +func_append_quoted ()\ | ||
19604 | +{\ | ||
19605 | +\ func_quote_for_eval "${2}"\ | ||
19606 | +\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\ | ||
19607 | +} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \ | ||
19608 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
19609 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
19610 | +test 0 -eq $? || _lt_function_replace_fail=: | ||
19611 | + | ||
19612 | + | ||
19613 | + # Save a `func_append' function call where possible by direct use of '+=' | ||
19614 | + sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ | ||
19615 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
19616 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
19617 | + test 0 -eq $? || _lt_function_replace_fail=: | ||
19618 | +else | ||
19619 | + # Save a `func_append' function call even when '+=' is not available | ||
19620 | + sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ | ||
19621 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
19622 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
19623 | + test 0 -eq $? || _lt_function_replace_fail=: | ||
19624 | +fi | ||
19625 | + | ||
19626 | +if test x"$_lt_function_replace_fail" = x":"; then | ||
19627 | + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 | ||
19628 | +$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} | ||
19629 | +fi | ||
19630 | + | ||
19631 | + | ||
19632 | + mv -f "$cfgfile" "$ofile" || | ||
19633 | (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") | ||
19634 | chmod +x "$ofile" | ||
19635 | |||
19636 | diff --git a/libsframe/Makefile.in b/libsframe/Makefile.in | ||
19637 | index 107b82ccfdc..4a4459bf5eb 100644 | ||
19638 | --- a/libsframe/Makefile.in | ||
19639 | +++ b/libsframe/Makefile.in | ||
19640 | @@ -1,7 +1,7 @@ | ||
19641 | -# Makefile.in generated by automake 1.15.1 from Makefile.am. | ||
19642 | +# Makefile.in generated by automake 1.16.5 from Makefile.am. | ||
19643 | # @configure_input@ | ||
19644 | |||
19645 | -# Copyright (C) 1994-2017 Free Software Foundation, Inc. | ||
19646 | +# Copyright (C) 1994-2021 Free Software Foundation, Inc. | ||
19647 | |||
19648 | # This Makefile.in is free software; the Free Software Foundation | ||
19649 | # gives unlimited permission to copy and/or distribute it, | ||
19650 | @@ -139,6 +139,10 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs | ||
19651 | CONFIG_HEADER = config.h | ||
19652 | CONFIG_CLEAN_FILES = | ||
19653 | CONFIG_CLEAN_VPATH_FILES = | ||
19654 | +@HAVE_COMPAT_DEJAGNU_TRUE@am__EXEEXT_1 = testsuite/libsframe.decode/be-flipping$(EXEEXT) \ | ||
19655 | +@HAVE_COMPAT_DEJAGNU_TRUE@ testsuite/libsframe.decode/frecnt-1$(EXEEXT) \ | ||
19656 | +@HAVE_COMPAT_DEJAGNU_TRUE@ testsuite/libsframe.decode/frecnt-2$(EXEEXT) \ | ||
19657 | +@HAVE_COMPAT_DEJAGNU_TRUE@ testsuite/libsframe.encode/encode-1$(EXEEXT) | ||
19658 | am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; | ||
19659 | am__vpath_adj = case $$p in \ | ||
19660 | $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ | ||
19661 | @@ -179,27 +183,27 @@ am__v_lt_0 = --silent | ||
19662 | am__v_lt_1 = | ||
19663 | @INSTALL_LIBBFD_FALSE@am_libsframe_la_rpath = | ||
19664 | @INSTALL_LIBBFD_TRUE@am_libsframe_la_rpath = -rpath $(libdir) | ||
19665 | -@HAVE_COMPAT_DEJAGNU_TRUE@am__EXEEXT_1 = testsuite/libsframe.decode/be-flipping$(EXEEXT) \ | ||
19666 | -@HAVE_COMPAT_DEJAGNU_TRUE@ testsuite/libsframe.decode/frecnt-1$(EXEEXT) \ | ||
19667 | -@HAVE_COMPAT_DEJAGNU_TRUE@ testsuite/libsframe.decode/frecnt-2$(EXEEXT) \ | ||
19668 | -@HAVE_COMPAT_DEJAGNU_TRUE@ testsuite/libsframe.encode/encode-1$(EXEEXT) | ||
19669 | am__dirstamp = $(am__leading_dot)dirstamp | ||
19670 | -am_testsuite_libsframe_decode_be_flipping_OBJECTS = testsuite/libsframe.decode/testsuite_libsframe_decode_be_flipping-be-flipping.$(OBJEXT) | ||
19671 | +am_testsuite_libsframe_decode_be_flipping_OBJECTS = \ | ||
19672 | + testsuite/libsframe.decode/be_flipping-be-flipping.$(OBJEXT) | ||
19673 | testsuite_libsframe_decode_be_flipping_OBJECTS = \ | ||
19674 | $(am_testsuite_libsframe_decode_be_flipping_OBJECTS) | ||
19675 | testsuite_libsframe_decode_be_flipping_DEPENDENCIES = \ | ||
19676 | ${top_builddir}/libsframe.la | ||
19677 | -am_testsuite_libsframe_decode_frecnt_1_OBJECTS = testsuite/libsframe.decode/testsuite_libsframe_decode_frecnt_1-frecnt-1.$(OBJEXT) | ||
19678 | +am_testsuite_libsframe_decode_frecnt_1_OBJECTS = \ | ||
19679 | + testsuite/libsframe.decode/frecnt_1-frecnt-1.$(OBJEXT) | ||
19680 | testsuite_libsframe_decode_frecnt_1_OBJECTS = \ | ||
19681 | $(am_testsuite_libsframe_decode_frecnt_1_OBJECTS) | ||
19682 | testsuite_libsframe_decode_frecnt_1_DEPENDENCIES = \ | ||
19683 | ${top_builddir}/libsframe.la | ||
19684 | -am_testsuite_libsframe_decode_frecnt_2_OBJECTS = testsuite/libsframe.decode/testsuite_libsframe_decode_frecnt_2-frecnt-2.$(OBJEXT) | ||
19685 | +am_testsuite_libsframe_decode_frecnt_2_OBJECTS = \ | ||
19686 | + testsuite/libsframe.decode/frecnt_2-frecnt-2.$(OBJEXT) | ||
19687 | testsuite_libsframe_decode_frecnt_2_OBJECTS = \ | ||
19688 | $(am_testsuite_libsframe_decode_frecnt_2_OBJECTS) | ||
19689 | testsuite_libsframe_decode_frecnt_2_DEPENDENCIES = \ | ||
19690 | ${top_builddir}/libsframe.la | ||
19691 | -am_testsuite_libsframe_encode_encode_1_OBJECTS = testsuite/libsframe.encode/testsuite_libsframe_encode_encode_1-encode-1.$(OBJEXT) | ||
19692 | +am_testsuite_libsframe_encode_encode_1_OBJECTS = \ | ||
19693 | + testsuite/libsframe.encode/encode_1-encode-1.$(OBJEXT) | ||
19694 | testsuite_libsframe_encode_encode_1_OBJECTS = \ | ||
19695 | $(am_testsuite_libsframe_encode_encode_1_OBJECTS) | ||
19696 | testsuite_libsframe_encode_encode_1_DEPENDENCIES = \ | ||
19697 | @@ -218,7 +222,14 @@ am__v_at_0 = @ | ||
19698 | am__v_at_1 = | ||
19699 | DEFAULT_INCLUDES = -I.@am__isrc@ | ||
19700 | depcomp = $(SHELL) $(top_srcdir)/../depcomp | ||
19701 | -am__depfiles_maybe = depfiles | ||
19702 | +am__maybe_remake_depfiles = depfiles | ||
19703 | +am__depfiles_remade = ./$(DEPDIR)/libsframe_la-sframe-dump.Plo \ | ||
19704 | + ./$(DEPDIR)/libsframe_la-sframe-error.Plo \ | ||
19705 | + ./$(DEPDIR)/libsframe_la-sframe.Plo \ | ||
19706 | + testsuite/libsframe.decode/$(DEPDIR)/be_flipping-be-flipping.Po \ | ||
19707 | + testsuite/libsframe.decode/$(DEPDIR)/frecnt_1-frecnt-1.Po \ | ||
19708 | + testsuite/libsframe.decode/$(DEPDIR)/frecnt_2-frecnt-2.Po \ | ||
19709 | + testsuite/libsframe.encode/$(DEPDIR)/encode_1-encode-1.Po | ||
19710 | am__mv = mv -f | ||
19711 | COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ | ||
19712 | $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) | ||
19713 | @@ -295,8 +306,8 @@ am__can_run_installinfo = \ | ||
19714 | esac | ||
19715 | am__include_HEADERS_DIST = $(INCDIR)/sframe.h $(INCDIR)/sframe-api.h | ||
19716 | HEADERS = $(include_HEADERS) | ||
19717 | -am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \ | ||
19718 | - $(LISP)config.h.in | ||
19719 | +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) \ | ||
19720 | + config.h.in | ||
19721 | # Read a list of newline-separated strings from the standard input, | ||
19722 | # and print each of them once, without duplicates. Input order is | ||
19723 | # *not* preserved. | ||
19724 | @@ -313,9 +324,6 @@ am__define_uniq_tagged_files = \ | ||
19725 | unique=`for i in $$list; do \ | ||
19726 | if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ | ||
19727 | done | $(am__uniquify_input)` | ||
19728 | -ETAGS = etags | ||
19729 | -CTAGS = ctags | ||
19730 | -CSCOPE = cscope | ||
19731 | AM_RECURSIVE_TARGETS = cscope | ||
19732 | DEJATOOL = $(PACKAGE) | ||
19733 | RUNTESTDEFAULTFLAGS = --tool $$tool --srcdir $$srcdir | ||
19734 | @@ -341,6 +349,8 @@ am__post_remove_distdir = $(am__remove_distdir) | ||
19735 | DIST_ARCHIVES = $(distdir).tar.gz | ||
19736 | GZIP_ENV = --best | ||
19737 | DIST_TARGETS = dist-gzip | ||
19738 | +# Exists only to be overridden by the user if desired. | ||
19739 | +AM_DISTCHECK_DVI_TARGET = dvi | ||
19740 | distuninstallcheck_listfiles = find . -type f -print | ||
19741 | am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \ | ||
19742 | | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$' | ||
19743 | @@ -359,15 +369,19 @@ CFLAGS = @CFLAGS@ | ||
19744 | COMPAT_DEJAGNU = @COMPAT_DEJAGNU@ | ||
19745 | CPP = @CPP@ | ||
19746 | CPPFLAGS = @CPPFLAGS@ | ||
19747 | +CSCOPE = @CSCOPE@ | ||
19748 | +CTAGS = @CTAGS@ | ||
19749 | CYGPATH_W = @CYGPATH_W@ | ||
19750 | DEFS = @DEFS@ | ||
19751 | DEPDIR = @DEPDIR@ | ||
19752 | +DLLTOOL = @DLLTOOL@ | ||
19753 | DSYMUTIL = @DSYMUTIL@ | ||
19754 | DUMPBIN = @DUMPBIN@ | ||
19755 | ECHO_C = @ECHO_C@ | ||
19756 | ECHO_N = @ECHO_N@ | ||
19757 | ECHO_T = @ECHO_T@ | ||
19758 | EGREP = @EGREP@ | ||
19759 | +ETAGS = @ETAGS@ | ||
19760 | EXEEXT = @EXEEXT@ | ||
19761 | FGREP = @FGREP@ | ||
19762 | GREP = @GREP@ | ||
19763 | @@ -386,6 +400,7 @@ LN_S = @LN_S@ | ||
19764 | LTLIBOBJS = @LTLIBOBJS@ | ||
19765 | MAINT = @MAINT@ | ||
19766 | MAKEINFO = @MAKEINFO@ | ||
19767 | +MANIFEST_TOOL = @MANIFEST_TOOL@ | ||
19768 | MKDIR_P = @MKDIR_P@ | ||
19769 | NM = @NM@ | ||
19770 | NMEDIT = @NMEDIT@ | ||
19771 | @@ -541,8 +556,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status | ||
19772 | echo ' $(SHELL) ./config.status'; \ | ||
19773 | $(SHELL) ./config.status;; \ | ||
19774 | *) \ | ||
19775 | - echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \ | ||
19776 | - cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \ | ||
19777 | + echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles)'; \ | ||
19778 | + cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles);; \ | ||
19779 | esac; | ||
19780 | $(srcdir)/doc/local.mk $(srcdir)/testsuite/local.mk $(srcdir)/testsuite/libsframe.decode/local.mk $(srcdir)/testsuite/libsframe.encode/local.mk $(am__empty): | ||
19781 | |||
19782 | @@ -570,6 +585,15 @@ $(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) | ||
19783 | distclean-hdr: | ||
19784 | -rm -f config.h stamp-h1 | ||
19785 | |||
19786 | +clean-checkPROGRAMS: | ||
19787 | + @list='$(check_PROGRAMS)'; test -n "$$list" || exit 0; \ | ||
19788 | + echo " rm -f" $$list; \ | ||
19789 | + rm -f $$list || exit $$?; \ | ||
19790 | + test -n "$(EXEEXT)" || exit 0; \ | ||
19791 | + list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ | ||
19792 | + echo " rm -f" $$list; \ | ||
19793 | + rm -f $$list | ||
19794 | + | ||
19795 | install-libLTLIBRARIES: $(lib_LTLIBRARIES) | ||
19796 | @$(NORMAL_INSTALL) | ||
19797 | @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ | ||
19798 | @@ -618,36 +642,27 @@ clean-noinstLTLIBRARIES: | ||
19799 | |||
19800 | libsframe.la: $(libsframe_la_OBJECTS) $(libsframe_la_DEPENDENCIES) $(EXTRA_libsframe_la_DEPENDENCIES) | ||
19801 | $(AM_V_CCLD)$(LINK) $(am_libsframe_la_rpath) $(libsframe_la_OBJECTS) $(libsframe_la_LIBADD) $(LIBS) | ||
19802 | - | ||
19803 | -clean-checkPROGRAMS: | ||
19804 | - @list='$(check_PROGRAMS)'; test -n "$$list" || exit 0; \ | ||
19805 | - echo " rm -f" $$list; \ | ||
19806 | - rm -f $$list || exit $$?; \ | ||
19807 | - test -n "$(EXEEXT)" || exit 0; \ | ||
19808 | - list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ | ||
19809 | - echo " rm -f" $$list; \ | ||
19810 | - rm -f $$list | ||
19811 | testsuite/libsframe.decode/$(am__dirstamp): | ||
19812 | @$(MKDIR_P) testsuite/libsframe.decode | ||
19813 | @: > testsuite/libsframe.decode/$(am__dirstamp) | ||
19814 | testsuite/libsframe.decode/$(DEPDIR)/$(am__dirstamp): | ||
19815 | @$(MKDIR_P) testsuite/libsframe.decode/$(DEPDIR) | ||
19816 | @: > testsuite/libsframe.decode/$(DEPDIR)/$(am__dirstamp) | ||
19817 | -testsuite/libsframe.decode/testsuite_libsframe_decode_be_flipping-be-flipping.$(OBJEXT): \ | ||
19818 | +testsuite/libsframe.decode/be_flipping-be-flipping.$(OBJEXT): \ | ||
19819 | testsuite/libsframe.decode/$(am__dirstamp) \ | ||
19820 | testsuite/libsframe.decode/$(DEPDIR)/$(am__dirstamp) | ||
19821 | |||
19822 | testsuite/libsframe.decode/be-flipping$(EXEEXT): $(testsuite_libsframe_decode_be_flipping_OBJECTS) $(testsuite_libsframe_decode_be_flipping_DEPENDENCIES) $(EXTRA_testsuite_libsframe_decode_be_flipping_DEPENDENCIES) testsuite/libsframe.decode/$(am__dirstamp) | ||
19823 | @rm -f testsuite/libsframe.decode/be-flipping$(EXEEXT) | ||
19824 | $(AM_V_CCLD)$(LINK) $(testsuite_libsframe_decode_be_flipping_OBJECTS) $(testsuite_libsframe_decode_be_flipping_LDADD) $(LIBS) | ||
19825 | -testsuite/libsframe.decode/testsuite_libsframe_decode_frecnt_1-frecnt-1.$(OBJEXT): \ | ||
19826 | +testsuite/libsframe.decode/frecnt_1-frecnt-1.$(OBJEXT): \ | ||
19827 | testsuite/libsframe.decode/$(am__dirstamp) \ | ||
19828 | testsuite/libsframe.decode/$(DEPDIR)/$(am__dirstamp) | ||
19829 | |||
19830 | testsuite/libsframe.decode/frecnt-1$(EXEEXT): $(testsuite_libsframe_decode_frecnt_1_OBJECTS) $(testsuite_libsframe_decode_frecnt_1_DEPENDENCIES) $(EXTRA_testsuite_libsframe_decode_frecnt_1_DEPENDENCIES) testsuite/libsframe.decode/$(am__dirstamp) | ||
19831 | @rm -f testsuite/libsframe.decode/frecnt-1$(EXEEXT) | ||
19832 | $(AM_V_CCLD)$(LINK) $(testsuite_libsframe_decode_frecnt_1_OBJECTS) $(testsuite_libsframe_decode_frecnt_1_LDADD) $(LIBS) | ||
19833 | -testsuite/libsframe.decode/testsuite_libsframe_decode_frecnt_2-frecnt-2.$(OBJEXT): \ | ||
19834 | +testsuite/libsframe.decode/frecnt_2-frecnt-2.$(OBJEXT): \ | ||
19835 | testsuite/libsframe.decode/$(am__dirstamp) \ | ||
19836 | testsuite/libsframe.decode/$(DEPDIR)/$(am__dirstamp) | ||
19837 | |||
19838 | @@ -660,7 +675,7 @@ testsuite/libsframe.encode/$(am__dirstamp): | ||
19839 | testsuite/libsframe.encode/$(DEPDIR)/$(am__dirstamp): | ||
19840 | @$(MKDIR_P) testsuite/libsframe.encode/$(DEPDIR) | ||
19841 | @: > testsuite/libsframe.encode/$(DEPDIR)/$(am__dirstamp) | ||
19842 | -testsuite/libsframe.encode/testsuite_libsframe_encode_encode_1-encode-1.$(OBJEXT): \ | ||
19843 | +testsuite/libsframe.encode/encode_1-encode-1.$(OBJEXT): \ | ||
19844 | testsuite/libsframe.encode/$(am__dirstamp) \ | ||
19845 | testsuite/libsframe.encode/$(DEPDIR)/$(am__dirstamp) | ||
19846 | |||
19847 | @@ -676,13 +691,19 @@ mostlyclean-compile: | ||
19848 | distclean-compile: | ||
19849 | -rm -f *.tab.c | ||
19850 | |||
19851 | -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsframe_la-sframe-dump.Plo@am__quote@ | ||
19852 | -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsframe_la-sframe-error.Plo@am__quote@ | ||
19853 | -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsframe_la-sframe.Plo@am__quote@ | ||
19854 | -@AMDEP_TRUE@@am__include@ @am__quote@testsuite/libsframe.decode/$(DEPDIR)/testsuite_libsframe_decode_be_flipping-be-flipping.Po@am__quote@ | ||
19855 | -@AMDEP_TRUE@@am__include@ @am__quote@testsuite/libsframe.decode/$(DEPDIR)/testsuite_libsframe_decode_frecnt_1-frecnt-1.Po@am__quote@ | ||
19856 | -@AMDEP_TRUE@@am__include@ @am__quote@testsuite/libsframe.decode/$(DEPDIR)/testsuite_libsframe_decode_frecnt_2-frecnt-2.Po@am__quote@ | ||
19857 | -@AMDEP_TRUE@@am__include@ @am__quote@testsuite/libsframe.encode/$(DEPDIR)/testsuite_libsframe_encode_encode_1-encode-1.Po@am__quote@ | ||
19858 | +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsframe_la-sframe-dump.Plo@am__quote@ # am--include-marker | ||
19859 | +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsframe_la-sframe-error.Plo@am__quote@ # am--include-marker | ||
19860 | +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsframe_la-sframe.Plo@am__quote@ # am--include-marker | ||
19861 | +@AMDEP_TRUE@@am__include@ @am__quote@testsuite/libsframe.decode/$(DEPDIR)/be_flipping-be-flipping.Po@am__quote@ # am--include-marker | ||
19862 | +@AMDEP_TRUE@@am__include@ @am__quote@testsuite/libsframe.decode/$(DEPDIR)/frecnt_1-frecnt-1.Po@am__quote@ # am--include-marker | ||
19863 | +@AMDEP_TRUE@@am__include@ @am__quote@testsuite/libsframe.decode/$(DEPDIR)/frecnt_2-frecnt-2.Po@am__quote@ # am--include-marker | ||
19864 | +@AMDEP_TRUE@@am__include@ @am__quote@testsuite/libsframe.encode/$(DEPDIR)/encode_1-encode-1.Po@am__quote@ # am--include-marker | ||
19865 | + | ||
19866 | +$(am__depfiles_remade): | ||
19867 | + @$(MKDIR_P) $(@D) | ||
19868 | + @echo '# dummy' >$@-t && $(am__mv) $@-t $@ | ||
19869 | + | ||
19870 | +am--depfiles: $(am__depfiles_remade) | ||
19871 | |||
19872 | .c.o: | ||
19873 | @am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ | ||
19874 | @@ -729,61 +750,61 @@ libsframe_la-sframe-error.lo: sframe-error.c | ||
19875 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
19876 | @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsframe_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libsframe_la-sframe-error.lo `test -f 'sframe-error.c' || echo '$(srcdir)/'`sframe-error.c | ||
19877 | |||
19878 | -testsuite/libsframe.decode/testsuite_libsframe_decode_be_flipping-be-flipping.o: testsuite/libsframe.decode/be-flipping.c | ||
19879 | -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_decode_be_flipping_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT testsuite/libsframe.decode/testsuite_libsframe_decode_be_flipping-be-flipping.o -MD -MP -MF testsuite/libsframe.decode/$(DEPDIR)/testsuite_libsframe_decode_be_flipping-be-flipping.Tpo -c -o testsuite/libsframe.decode/testsuite_libsframe_decode_be_flipping-be-flipping.o `test -f 'testsuite/libsframe.decode/be-flipping.c' || echo '$(srcdir)/'`testsuite/libsframe.decode/be-flipping.c | ||
19880 | -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) testsuite/libsframe.decode/$(DEPDIR)/testsuite_libsframe_decode_be_flipping-be-flipping.Tpo testsuite/libsframe.decode/$(DEPDIR)/testsuite_libsframe_decode_be_flipping-be-flipping.Po | ||
19881 | -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='testsuite/libsframe.decode/be-flipping.c' object='testsuite/libsframe.decode/testsuite_libsframe_decode_be_flipping-be-flipping.o' libtool=no @AMDEPBACKSLASH@ | ||
19882 | +testsuite/libsframe.decode/be_flipping-be-flipping.o: testsuite/libsframe.decode/be-flipping.c | ||
19883 | +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_decode_be_flipping_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT testsuite/libsframe.decode/be_flipping-be-flipping.o -MD -MP -MF testsuite/libsframe.decode/$(DEPDIR)/be_flipping-be-flipping.Tpo -c -o testsuite/libsframe.decode/be_flipping-be-flipping.o `test -f 'testsuite/libsframe.decode/be-flipping.c' || echo '$(srcdir)/'`testsuite/libsframe.decode/be-flipping.c | ||
19884 | +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) testsuite/libsframe.decode/$(DEPDIR)/be_flipping-be-flipping.Tpo testsuite/libsframe.decode/$(DEPDIR)/be_flipping-be-flipping.Po | ||
19885 | +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='testsuite/libsframe.decode/be-flipping.c' object='testsuite/libsframe.decode/be_flipping-be-flipping.o' libtool=no @AMDEPBACKSLASH@ | ||
19886 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
19887 | -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_decode_be_flipping_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o testsuite/libsframe.decode/testsuite_libsframe_decode_be_flipping-be-flipping.o `test -f 'testsuite/libsframe.decode/be-flipping.c' || echo '$(srcdir)/'`testsuite/libsframe.decode/be-flipping.c | ||
19888 | +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_decode_be_flipping_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o testsuite/libsframe.decode/be_flipping-be-flipping.o `test -f 'testsuite/libsframe.decode/be-flipping.c' || echo '$(srcdir)/'`testsuite/libsframe.decode/be-flipping.c | ||
19889 | |||
19890 | -testsuite/libsframe.decode/testsuite_libsframe_decode_be_flipping-be-flipping.obj: testsuite/libsframe.decode/be-flipping.c | ||
19891 | -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_decode_be_flipping_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT testsuite/libsframe.decode/testsuite_libsframe_decode_be_flipping-be-flipping.obj -MD -MP -MF testsuite/libsframe.decode/$(DEPDIR)/testsuite_libsframe_decode_be_flipping-be-flipping.Tpo -c -o testsuite/libsframe.decode/testsuite_libsframe_decode_be_flipping-be-flipping.obj `if test -f 'testsuite/libsframe.decode/be-flipping.c'; then $(CYGPATH_W) 'testsuite/libsframe.decode/be-flipping.c'; else $(CYGPATH_W) '$(srcdir)/testsuite/libsframe.decode/be-flipping.c'; fi` | ||
19892 | -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) testsuite/libsframe.decode/$(DEPDIR)/testsuite_libsframe_decode_be_flipping-be-flipping.Tpo testsuite/libsframe.decode/$(DEPDIR)/testsuite_libsframe_decode_be_flipping-be-flipping.Po | ||
19893 | -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='testsuite/libsframe.decode/be-flipping.c' object='testsuite/libsframe.decode/testsuite_libsframe_decode_be_flipping-be-flipping.obj' libtool=no @AMDEPBACKSLASH@ | ||
19894 | +testsuite/libsframe.decode/be_flipping-be-flipping.obj: testsuite/libsframe.decode/be-flipping.c | ||
19895 | +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_decode_be_flipping_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT testsuite/libsframe.decode/be_flipping-be-flipping.obj -MD -MP -MF testsuite/libsframe.decode/$(DEPDIR)/be_flipping-be-flipping.Tpo -c -o testsuite/libsframe.decode/be_flipping-be-flipping.obj `if test -f 'testsuite/libsframe.decode/be-flipping.c'; then $(CYGPATH_W) 'testsuite/libsframe.decode/be-flipping.c'; else $(CYGPATH_W) '$(srcdir)/testsuite/libsframe.decode/be-flipping.c'; fi` | ||
19896 | +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) testsuite/libsframe.decode/$(DEPDIR)/be_flipping-be-flipping.Tpo testsuite/libsframe.decode/$(DEPDIR)/be_flipping-be-flipping.Po | ||
19897 | +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='testsuite/libsframe.decode/be-flipping.c' object='testsuite/libsframe.decode/be_flipping-be-flipping.obj' libtool=no @AMDEPBACKSLASH@ | ||
19898 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
19899 | -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_decode_be_flipping_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o testsuite/libsframe.decode/testsuite_libsframe_decode_be_flipping-be-flipping.obj `if test -f 'testsuite/libsframe.decode/be-flipping.c'; then $(CYGPATH_W) 'testsuite/libsframe.decode/be-flipping.c'; else $(CYGPATH_W) '$(srcdir)/testsuite/libsframe.decode/be-flipping.c'; fi` | ||
19900 | +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_decode_be_flipping_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o testsuite/libsframe.decode/be_flipping-be-flipping.obj `if test -f 'testsuite/libsframe.decode/be-flipping.c'; then $(CYGPATH_W) 'testsuite/libsframe.decode/be-flipping.c'; else $(CYGPATH_W) '$(srcdir)/testsuite/libsframe.decode/be-flipping.c'; fi` | ||
19901 | |||
19902 | -testsuite/libsframe.decode/testsuite_libsframe_decode_frecnt_1-frecnt-1.o: testsuite/libsframe.decode/frecnt-1.c | ||
19903 | -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_decode_frecnt_1_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT testsuite/libsframe.decode/testsuite_libsframe_decode_frecnt_1-frecnt-1.o -MD -MP -MF testsuite/libsframe.decode/$(DEPDIR)/testsuite_libsframe_decode_frecnt_1-frecnt-1.Tpo -c -o testsuite/libsframe.decode/testsuite_libsframe_decode_frecnt_1-frecnt-1.o `test -f 'testsuite/libsframe.decode/frecnt-1.c' || echo '$(srcdir)/'`testsuite/libsframe.decode/frecnt-1.c | ||
19904 | -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) testsuite/libsframe.decode/$(DEPDIR)/testsuite_libsframe_decode_frecnt_1-frecnt-1.Tpo testsuite/libsframe.decode/$(DEPDIR)/testsuite_libsframe_decode_frecnt_1-frecnt-1.Po | ||
19905 | -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='testsuite/libsframe.decode/frecnt-1.c' object='testsuite/libsframe.decode/testsuite_libsframe_decode_frecnt_1-frecnt-1.o' libtool=no @AMDEPBACKSLASH@ | ||
19906 | +testsuite/libsframe.decode/frecnt_1-frecnt-1.o: testsuite/libsframe.decode/frecnt-1.c | ||
19907 | +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_decode_frecnt_1_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT testsuite/libsframe.decode/frecnt_1-frecnt-1.o -MD -MP -MF testsuite/libsframe.decode/$(DEPDIR)/frecnt_1-frecnt-1.Tpo -c -o testsuite/libsframe.decode/frecnt_1-frecnt-1.o `test -f 'testsuite/libsframe.decode/frecnt-1.c' || echo '$(srcdir)/'`testsuite/libsframe.decode/frecnt-1.c | ||
19908 | +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) testsuite/libsframe.decode/$(DEPDIR)/frecnt_1-frecnt-1.Tpo testsuite/libsframe.decode/$(DEPDIR)/frecnt_1-frecnt-1.Po | ||
19909 | +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='testsuite/libsframe.decode/frecnt-1.c' object='testsuite/libsframe.decode/frecnt_1-frecnt-1.o' libtool=no @AMDEPBACKSLASH@ | ||
19910 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
19911 | -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_decode_frecnt_1_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o testsuite/libsframe.decode/testsuite_libsframe_decode_frecnt_1-frecnt-1.o `test -f 'testsuite/libsframe.decode/frecnt-1.c' || echo '$(srcdir)/'`testsuite/libsframe.decode/frecnt-1.c | ||
19912 | +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_decode_frecnt_1_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o testsuite/libsframe.decode/frecnt_1-frecnt-1.o `test -f 'testsuite/libsframe.decode/frecnt-1.c' || echo '$(srcdir)/'`testsuite/libsframe.decode/frecnt-1.c | ||
19913 | |||
19914 | -testsuite/libsframe.decode/testsuite_libsframe_decode_frecnt_1-frecnt-1.obj: testsuite/libsframe.decode/frecnt-1.c | ||
19915 | -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_decode_frecnt_1_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT testsuite/libsframe.decode/testsuite_libsframe_decode_frecnt_1-frecnt-1.obj -MD -MP -MF testsuite/libsframe.decode/$(DEPDIR)/testsuite_libsframe_decode_frecnt_1-frecnt-1.Tpo -c -o testsuite/libsframe.decode/testsuite_libsframe_decode_frecnt_1-frecnt-1.obj `if test -f 'testsuite/libsframe.decode/frecnt-1.c'; then $(CYGPATH_W) 'testsuite/libsframe.decode/frecnt-1.c'; else $(CYGPATH_W) '$(srcdir)/testsuite/libsframe.decode/frecnt-1.c'; fi` | ||
19916 | -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) testsuite/libsframe.decode/$(DEPDIR)/testsuite_libsframe_decode_frecnt_1-frecnt-1.Tpo testsuite/libsframe.decode/$(DEPDIR)/testsuite_libsframe_decode_frecnt_1-frecnt-1.Po | ||
19917 | -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='testsuite/libsframe.decode/frecnt-1.c' object='testsuite/libsframe.decode/testsuite_libsframe_decode_frecnt_1-frecnt-1.obj' libtool=no @AMDEPBACKSLASH@ | ||
19918 | +testsuite/libsframe.decode/frecnt_1-frecnt-1.obj: testsuite/libsframe.decode/frecnt-1.c | ||
19919 | +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_decode_frecnt_1_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT testsuite/libsframe.decode/frecnt_1-frecnt-1.obj -MD -MP -MF testsuite/libsframe.decode/$(DEPDIR)/frecnt_1-frecnt-1.Tpo -c -o testsuite/libsframe.decode/frecnt_1-frecnt-1.obj `if test -f 'testsuite/libsframe.decode/frecnt-1.c'; then $(CYGPATH_W) 'testsuite/libsframe.decode/frecnt-1.c'; else $(CYGPATH_W) '$(srcdir)/testsuite/libsframe.decode/frecnt-1.c'; fi` | ||
19920 | +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) testsuite/libsframe.decode/$(DEPDIR)/frecnt_1-frecnt-1.Tpo testsuite/libsframe.decode/$(DEPDIR)/frecnt_1-frecnt-1.Po | ||
19921 | +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='testsuite/libsframe.decode/frecnt-1.c' object='testsuite/libsframe.decode/frecnt_1-frecnt-1.obj' libtool=no @AMDEPBACKSLASH@ | ||
19922 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
19923 | -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_decode_frecnt_1_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o testsuite/libsframe.decode/testsuite_libsframe_decode_frecnt_1-frecnt-1.obj `if test -f 'testsuite/libsframe.decode/frecnt-1.c'; then $(CYGPATH_W) 'testsuite/libsframe.decode/frecnt-1.c'; else $(CYGPATH_W) '$(srcdir)/testsuite/libsframe.decode/frecnt-1.c'; fi` | ||
19924 | +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_decode_frecnt_1_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o testsuite/libsframe.decode/frecnt_1-frecnt-1.obj `if test -f 'testsuite/libsframe.decode/frecnt-1.c'; then $(CYGPATH_W) 'testsuite/libsframe.decode/frecnt-1.c'; else $(CYGPATH_W) '$(srcdir)/testsuite/libsframe.decode/frecnt-1.c'; fi` | ||
19925 | |||
19926 | -testsuite/libsframe.decode/testsuite_libsframe_decode_frecnt_2-frecnt-2.o: testsuite/libsframe.decode/frecnt-2.c | ||
19927 | -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_decode_frecnt_2_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT testsuite/libsframe.decode/testsuite_libsframe_decode_frecnt_2-frecnt-2.o -MD -MP -MF testsuite/libsframe.decode/$(DEPDIR)/testsuite_libsframe_decode_frecnt_2-frecnt-2.Tpo -c -o testsuite/libsframe.decode/testsuite_libsframe_decode_frecnt_2-frecnt-2.o `test -f 'testsuite/libsframe.decode/frecnt-2.c' || echo '$(srcdir)/'`testsuite/libsframe.decode/frecnt-2.c | ||
19928 | -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) testsuite/libsframe.decode/$(DEPDIR)/testsuite_libsframe_decode_frecnt_2-frecnt-2.Tpo testsuite/libsframe.decode/$(DEPDIR)/testsuite_libsframe_decode_frecnt_2-frecnt-2.Po | ||
19929 | -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='testsuite/libsframe.decode/frecnt-2.c' object='testsuite/libsframe.decode/testsuite_libsframe_decode_frecnt_2-frecnt-2.o' libtool=no @AMDEPBACKSLASH@ | ||
19930 | +testsuite/libsframe.decode/frecnt_2-frecnt-2.o: testsuite/libsframe.decode/frecnt-2.c | ||
19931 | +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_decode_frecnt_2_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT testsuite/libsframe.decode/frecnt_2-frecnt-2.o -MD -MP -MF testsuite/libsframe.decode/$(DEPDIR)/frecnt_2-frecnt-2.Tpo -c -o testsuite/libsframe.decode/frecnt_2-frecnt-2.o `test -f 'testsuite/libsframe.decode/frecnt-2.c' || echo '$(srcdir)/'`testsuite/libsframe.decode/frecnt-2.c | ||
19932 | +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) testsuite/libsframe.decode/$(DEPDIR)/frecnt_2-frecnt-2.Tpo testsuite/libsframe.decode/$(DEPDIR)/frecnt_2-frecnt-2.Po | ||
19933 | +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='testsuite/libsframe.decode/frecnt-2.c' object='testsuite/libsframe.decode/frecnt_2-frecnt-2.o' libtool=no @AMDEPBACKSLASH@ | ||
19934 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
19935 | -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_decode_frecnt_2_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o testsuite/libsframe.decode/testsuite_libsframe_decode_frecnt_2-frecnt-2.o `test -f 'testsuite/libsframe.decode/frecnt-2.c' || echo '$(srcdir)/'`testsuite/libsframe.decode/frecnt-2.c | ||
19936 | +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_decode_frecnt_2_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o testsuite/libsframe.decode/frecnt_2-frecnt-2.o `test -f 'testsuite/libsframe.decode/frecnt-2.c' || echo '$(srcdir)/'`testsuite/libsframe.decode/frecnt-2.c | ||
19937 | |||
19938 | -testsuite/libsframe.decode/testsuite_libsframe_decode_frecnt_2-frecnt-2.obj: testsuite/libsframe.decode/frecnt-2.c | ||
19939 | -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_decode_frecnt_2_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT testsuite/libsframe.decode/testsuite_libsframe_decode_frecnt_2-frecnt-2.obj -MD -MP -MF testsuite/libsframe.decode/$(DEPDIR)/testsuite_libsframe_decode_frecnt_2-frecnt-2.Tpo -c -o testsuite/libsframe.decode/testsuite_libsframe_decode_frecnt_2-frecnt-2.obj `if test -f 'testsuite/libsframe.decode/frecnt-2.c'; then $(CYGPATH_W) 'testsuite/libsframe.decode/frecnt-2.c'; else $(CYGPATH_W) '$(srcdir)/testsuite/libsframe.decode/frecnt-2.c'; fi` | ||
19940 | -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) testsuite/libsframe.decode/$(DEPDIR)/testsuite_libsframe_decode_frecnt_2-frecnt-2.Tpo testsuite/libsframe.decode/$(DEPDIR)/testsuite_libsframe_decode_frecnt_2-frecnt-2.Po | ||
19941 | -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='testsuite/libsframe.decode/frecnt-2.c' object='testsuite/libsframe.decode/testsuite_libsframe_decode_frecnt_2-frecnt-2.obj' libtool=no @AMDEPBACKSLASH@ | ||
19942 | +testsuite/libsframe.decode/frecnt_2-frecnt-2.obj: testsuite/libsframe.decode/frecnt-2.c | ||
19943 | +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_decode_frecnt_2_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT testsuite/libsframe.decode/frecnt_2-frecnt-2.obj -MD -MP -MF testsuite/libsframe.decode/$(DEPDIR)/frecnt_2-frecnt-2.Tpo -c -o testsuite/libsframe.decode/frecnt_2-frecnt-2.obj `if test -f 'testsuite/libsframe.decode/frecnt-2.c'; then $(CYGPATH_W) 'testsuite/libsframe.decode/frecnt-2.c'; else $(CYGPATH_W) '$(srcdir)/testsuite/libsframe.decode/frecnt-2.c'; fi` | ||
19944 | +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) testsuite/libsframe.decode/$(DEPDIR)/frecnt_2-frecnt-2.Tpo testsuite/libsframe.decode/$(DEPDIR)/frecnt_2-frecnt-2.Po | ||
19945 | +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='testsuite/libsframe.decode/frecnt-2.c' object='testsuite/libsframe.decode/frecnt_2-frecnt-2.obj' libtool=no @AMDEPBACKSLASH@ | ||
19946 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
19947 | -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_decode_frecnt_2_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o testsuite/libsframe.decode/testsuite_libsframe_decode_frecnt_2-frecnt-2.obj `if test -f 'testsuite/libsframe.decode/frecnt-2.c'; then $(CYGPATH_W) 'testsuite/libsframe.decode/frecnt-2.c'; else $(CYGPATH_W) '$(srcdir)/testsuite/libsframe.decode/frecnt-2.c'; fi` | ||
19948 | +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_decode_frecnt_2_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o testsuite/libsframe.decode/frecnt_2-frecnt-2.obj `if test -f 'testsuite/libsframe.decode/frecnt-2.c'; then $(CYGPATH_W) 'testsuite/libsframe.decode/frecnt-2.c'; else $(CYGPATH_W) '$(srcdir)/testsuite/libsframe.decode/frecnt-2.c'; fi` | ||
19949 | |||
19950 | -testsuite/libsframe.encode/testsuite_libsframe_encode_encode_1-encode-1.o: testsuite/libsframe.encode/encode-1.c | ||
19951 | -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_encode_encode_1_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT testsuite/libsframe.encode/testsuite_libsframe_encode_encode_1-encode-1.o -MD -MP -MF testsuite/libsframe.encode/$(DEPDIR)/testsuite_libsframe_encode_encode_1-encode-1.Tpo -c -o testsuite/libsframe.encode/testsuite_libsframe_encode_encode_1-encode-1.o `test -f 'testsuite/libsframe.encode/encode-1.c' || echo '$(srcdir)/'`testsuite/libsframe.encode/encode-1.c | ||
19952 | -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) testsuite/libsframe.encode/$(DEPDIR)/testsuite_libsframe_encode_encode_1-encode-1.Tpo testsuite/libsframe.encode/$(DEPDIR)/testsuite_libsframe_encode_encode_1-encode-1.Po | ||
19953 | -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='testsuite/libsframe.encode/encode-1.c' object='testsuite/libsframe.encode/testsuite_libsframe_encode_encode_1-encode-1.o' libtool=no @AMDEPBACKSLASH@ | ||
19954 | +testsuite/libsframe.encode/encode_1-encode-1.o: testsuite/libsframe.encode/encode-1.c | ||
19955 | +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_encode_encode_1_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT testsuite/libsframe.encode/encode_1-encode-1.o -MD -MP -MF testsuite/libsframe.encode/$(DEPDIR)/encode_1-encode-1.Tpo -c -o testsuite/libsframe.encode/encode_1-encode-1.o `test -f 'testsuite/libsframe.encode/encode-1.c' || echo '$(srcdir)/'`testsuite/libsframe.encode/encode-1.c | ||
19956 | +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) testsuite/libsframe.encode/$(DEPDIR)/encode_1-encode-1.Tpo testsuite/libsframe.encode/$(DEPDIR)/encode_1-encode-1.Po | ||
19957 | +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='testsuite/libsframe.encode/encode-1.c' object='testsuite/libsframe.encode/encode_1-encode-1.o' libtool=no @AMDEPBACKSLASH@ | ||
19958 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
19959 | -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_encode_encode_1_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o testsuite/libsframe.encode/testsuite_libsframe_encode_encode_1-encode-1.o `test -f 'testsuite/libsframe.encode/encode-1.c' || echo '$(srcdir)/'`testsuite/libsframe.encode/encode-1.c | ||
19960 | +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_encode_encode_1_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o testsuite/libsframe.encode/encode_1-encode-1.o `test -f 'testsuite/libsframe.encode/encode-1.c' || echo '$(srcdir)/'`testsuite/libsframe.encode/encode-1.c | ||
19961 | |||
19962 | -testsuite/libsframe.encode/testsuite_libsframe_encode_encode_1-encode-1.obj: testsuite/libsframe.encode/encode-1.c | ||
19963 | -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_encode_encode_1_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT testsuite/libsframe.encode/testsuite_libsframe_encode_encode_1-encode-1.obj -MD -MP -MF testsuite/libsframe.encode/$(DEPDIR)/testsuite_libsframe_encode_encode_1-encode-1.Tpo -c -o testsuite/libsframe.encode/testsuite_libsframe_encode_encode_1-encode-1.obj `if test -f 'testsuite/libsframe.encode/encode-1.c'; then $(CYGPATH_W) 'testsuite/libsframe.encode/encode-1.c'; else $(CYGPATH_W) '$(srcdir)/testsuite/libsframe.encode/encode-1.c'; fi` | ||
19964 | -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) testsuite/libsframe.encode/$(DEPDIR)/testsuite_libsframe_encode_encode_1-encode-1.Tpo testsuite/libsframe.encode/$(DEPDIR)/testsuite_libsframe_encode_encode_1-encode-1.Po | ||
19965 | -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='testsuite/libsframe.encode/encode-1.c' object='testsuite/libsframe.encode/testsuite_libsframe_encode_encode_1-encode-1.obj' libtool=no @AMDEPBACKSLASH@ | ||
19966 | +testsuite/libsframe.encode/encode_1-encode-1.obj: testsuite/libsframe.encode/encode-1.c | ||
19967 | +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_encode_encode_1_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT testsuite/libsframe.encode/encode_1-encode-1.obj -MD -MP -MF testsuite/libsframe.encode/$(DEPDIR)/encode_1-encode-1.Tpo -c -o testsuite/libsframe.encode/encode_1-encode-1.obj `if test -f 'testsuite/libsframe.encode/encode-1.c'; then $(CYGPATH_W) 'testsuite/libsframe.encode/encode-1.c'; else $(CYGPATH_W) '$(srcdir)/testsuite/libsframe.encode/encode-1.c'; fi` | ||
19968 | +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) testsuite/libsframe.encode/$(DEPDIR)/encode_1-encode-1.Tpo testsuite/libsframe.encode/$(DEPDIR)/encode_1-encode-1.Po | ||
19969 | +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='testsuite/libsframe.encode/encode-1.c' object='testsuite/libsframe.encode/encode_1-encode-1.obj' libtool=no @AMDEPBACKSLASH@ | ||
19970 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
19971 | -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_encode_encode_1_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o testsuite/libsframe.encode/testsuite_libsframe_encode_encode_1-encode-1.obj `if test -f 'testsuite/libsframe.encode/encode-1.c'; then $(CYGPATH_W) 'testsuite/libsframe.encode/encode-1.c'; else $(CYGPATH_W) '$(srcdir)/testsuite/libsframe.encode/encode-1.c'; fi` | ||
19972 | +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_encode_encode_1_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o testsuite/libsframe.encode/encode_1-encode-1.obj `if test -f 'testsuite/libsframe.encode/encode-1.c'; then $(CYGPATH_W) 'testsuite/libsframe.encode/encode-1.c'; else $(CYGPATH_W) '$(srcdir)/testsuite/libsframe.encode/encode-1.c'; fi` | ||
19973 | |||
19974 | mostlyclean-libtool: | ||
19975 | -rm -f *.lo | ||
19976 | @@ -1020,7 +1041,7 @@ site.exp: Makefile $(EXTRA_DEJAGNU_SITE_CONFIG) | ||
19977 | @echo '# Do not edit here. If you wish to override these values' >>site.tmp | ||
19978 | @echo '# edit the last section' >>site.tmp | ||
19979 | @echo 'set srcdir "$(srcdir)"' >>site.tmp | ||
19980 | - @echo "set objdir `pwd`" >>site.tmp | ||
19981 | + @echo "set objdir \"`pwd`\"" >>site.tmp | ||
19982 | @echo 'set build_alias "$(build_alias)"' >>site.tmp | ||
19983 | @echo 'set build_triplet $(build_triplet)' >>site.tmp | ||
19984 | @echo 'set host_alias "$(host_alias)"' >>site.tmp | ||
19985 | @@ -1044,8 +1065,10 @@ distclean-DEJAGNU: | ||
19986 | -l='$(DEJATOOL)'; for tool in $$l; do \ | ||
19987 | rm -f $$tool.sum $$tool.log; \ | ||
19988 | done | ||
19989 | +distdir: $(BUILT_SOURCES) | ||
19990 | + $(MAKE) $(AM_MAKEFLAGS) distdir-am | ||
19991 | |||
19992 | -distdir: $(DISTFILES) | ||
19993 | +distdir-am: $(DISTFILES) | ||
19994 | $(am__remove_distdir) | ||
19995 | test -d "$(distdir)" || mkdir "$(distdir)" | ||
19996 | @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ | ||
19997 | @@ -1103,6 +1126,10 @@ dist-xz: distdir | ||
19998 | tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz | ||
19999 | $(am__post_remove_distdir) | ||
20000 | |||
20001 | +dist-zstd: distdir | ||
20002 | + tardir=$(distdir) && $(am__tar) | zstd -c $${ZSTD_CLEVEL-$${ZSTD_OPT--19}} >$(distdir).tar.zst | ||
20003 | + $(am__post_remove_distdir) | ||
20004 | + | ||
20005 | dist-tarZ: distdir | ||
20006 | @echo WARNING: "Support for distribution archives compressed with" \ | ||
20007 | "legacy program 'compress' is deprecated." >&2 | ||
20008 | @@ -1145,6 +1172,8 @@ distcheck: dist | ||
20009 | eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\ | ||
20010 | *.zip*) \ | ||
20011 | unzip $(distdir).zip ;;\ | ||
20012 | + *.tar.zst*) \ | ||
20013 | + zstd -dc $(distdir).tar.zst | $(am__untar) ;;\ | ||
20014 | esac | ||
20015 | chmod -R a-w $(distdir) | ||
20016 | chmod u+w $(distdir) | ||
20017 | @@ -1160,7 +1189,7 @@ distcheck: dist | ||
20018 | $(DISTCHECK_CONFIGURE_FLAGS) \ | ||
20019 | --srcdir=../.. --prefix="$$dc_install_base" \ | ||
20020 | && $(MAKE) $(AM_MAKEFLAGS) \ | ||
20021 | - && $(MAKE) $(AM_MAKEFLAGS) dvi \ | ||
20022 | + && $(MAKE) $(AM_MAKEFLAGS) $(AM_DISTCHECK_DVI_TARGET) \ | ||
20023 | && $(MAKE) $(AM_MAKEFLAGS) check \ | ||
20024 | && $(MAKE) $(AM_MAKEFLAGS) install \ | ||
20025 | && $(MAKE) $(AM_MAKEFLAGS) installcheck \ | ||
20026 | @@ -1216,6 +1245,8 @@ check-am: all-am | ||
20027 | $(MAKE) $(AM_MAKEFLAGS) check-DEJAGNU | ||
20028 | check: check-am | ||
20029 | all-am: Makefile $(INFO_DEPS) $(LTLIBRARIES) $(HEADERS) config.h | ||
20030 | +install-checkPROGRAMS: install-libLTLIBRARIES | ||
20031 | + | ||
20032 | installdirs: | ||
20033 | for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(infodir)" "$(DESTDIR)$(includedir)"; do \ | ||
20034 | test -z "$$dir" || $(MKDIR_P) "$$dir"; \ | ||
20035 | @@ -1266,7 +1297,13 @@ clean-am: clean-aminfo clean-checkPROGRAMS clean-generic \ | ||
20036 | |||
20037 | distclean: distclean-am | ||
20038 | -rm -f $(am__CONFIG_DISTCLEAN_FILES) | ||
20039 | - -rm -rf ./$(DEPDIR) testsuite/libsframe.decode/$(DEPDIR) testsuite/libsframe.encode/$(DEPDIR) | ||
20040 | + -rm -f ./$(DEPDIR)/libsframe_la-sframe-dump.Plo | ||
20041 | + -rm -f ./$(DEPDIR)/libsframe_la-sframe-error.Plo | ||
20042 | + -rm -f ./$(DEPDIR)/libsframe_la-sframe.Plo | ||
20043 | + -rm -f testsuite/libsframe.decode/$(DEPDIR)/be_flipping-be-flipping.Po | ||
20044 | + -rm -f testsuite/libsframe.decode/$(DEPDIR)/frecnt_1-frecnt-1.Po | ||
20045 | + -rm -f testsuite/libsframe.decode/$(DEPDIR)/frecnt_2-frecnt-2.Po | ||
20046 | + -rm -f testsuite/libsframe.encode/$(DEPDIR)/encode_1-encode-1.Po | ||
20047 | -rm -f Makefile | ||
20048 | distclean-am: clean-am distclean-DEJAGNU distclean-compile \ | ||
20049 | distclean-generic distclean-hdr distclean-libtool \ | ||
20050 | @@ -1406,7 +1443,13 @@ installcheck-am: | ||
20051 | maintainer-clean: maintainer-clean-am | ||
20052 | -rm -f $(am__CONFIG_DISTCLEAN_FILES) | ||
20053 | -rm -rf $(top_srcdir)/autom4te.cache | ||
20054 | - -rm -rf ./$(DEPDIR) testsuite/libsframe.decode/$(DEPDIR) testsuite/libsframe.encode/$(DEPDIR) | ||
20055 | + -rm -f ./$(DEPDIR)/libsframe_la-sframe-dump.Plo | ||
20056 | + -rm -f ./$(DEPDIR)/libsframe_la-sframe-error.Plo | ||
20057 | + -rm -f ./$(DEPDIR)/libsframe_la-sframe.Plo | ||
20058 | + -rm -f testsuite/libsframe.decode/$(DEPDIR)/be_flipping-be-flipping.Po | ||
20059 | + -rm -f testsuite/libsframe.decode/$(DEPDIR)/frecnt_1-frecnt-1.Po | ||
20060 | + -rm -f testsuite/libsframe.decode/$(DEPDIR)/frecnt_2-frecnt-2.Po | ||
20061 | + -rm -f testsuite/libsframe.encode/$(DEPDIR)/encode_1-encode-1.Po | ||
20062 | -rm -f Makefile | ||
20063 | maintainer-clean-am: distclean-am maintainer-clean-aminfo \ | ||
20064 | maintainer-clean-generic | ||
20065 | @@ -1430,28 +1473,28 @@ uninstall-am: uninstall-dvi-am uninstall-html-am \ | ||
20066 | |||
20067 | .MAKE: all check-am install-am install-strip | ||
20068 | |||
20069 | -.PHONY: CTAGS GTAGS TAGS all all-am am--refresh check check-DEJAGNU \ | ||
20070 | - check-am clean clean-aminfo clean-checkPROGRAMS clean-cscope \ | ||
20071 | - clean-generic clean-libLTLIBRARIES clean-libtool \ | ||
20072 | +.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles am--refresh check \ | ||
20073 | + check-DEJAGNU check-am clean clean-aminfo clean-checkPROGRAMS \ | ||
20074 | + clean-cscope clean-generic clean-libLTLIBRARIES clean-libtool \ | ||
20075 | clean-noinstLTLIBRARIES cscope cscopelist-am ctags ctags-am \ | ||
20076 | dist dist-all dist-bzip2 dist-gzip dist-info dist-lzip \ | ||
20077 | - dist-shar dist-tarZ dist-xz dist-zip distcheck distclean \ | ||
20078 | - distclean-DEJAGNU distclean-compile distclean-generic \ | ||
20079 | - distclean-hdr distclean-libtool distclean-tags distcleancheck \ | ||
20080 | - distdir distuninstallcheck dvi dvi-am html html-am html-local \ | ||
20081 | - info info-am install install-am install-data install-data-am \ | ||
20082 | - install-dvi install-dvi-am install-exec install-exec-am \ | ||
20083 | - install-html install-html-am install-includeHEADERS \ | ||
20084 | - install-info install-info-am install-libLTLIBRARIES \ | ||
20085 | - install-man install-pdf install-pdf-am install-ps \ | ||
20086 | - install-ps-am install-strip installcheck installcheck-am \ | ||
20087 | - installdirs maintainer-clean maintainer-clean-aminfo \ | ||
20088 | - maintainer-clean-generic mostlyclean mostlyclean-aminfo \ | ||
20089 | - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ | ||
20090 | - pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \ | ||
20091 | - uninstall-dvi-am uninstall-html-am uninstall-includeHEADERS \ | ||
20092 | - uninstall-info-am uninstall-libLTLIBRARIES uninstall-pdf-am \ | ||
20093 | - uninstall-ps-am | ||
20094 | + dist-shar dist-tarZ dist-xz dist-zip dist-zstd distcheck \ | ||
20095 | + distclean distclean-DEJAGNU distclean-compile \ | ||
20096 | + distclean-generic distclean-hdr distclean-libtool \ | ||
20097 | + distclean-tags distcleancheck distdir distuninstallcheck dvi \ | ||
20098 | + dvi-am html html-am html-local info info-am install install-am \ | ||
20099 | + install-data install-data-am install-dvi install-dvi-am \ | ||
20100 | + install-exec install-exec-am install-html install-html-am \ | ||
20101 | + install-includeHEADERS install-info install-info-am \ | ||
20102 | + install-libLTLIBRARIES install-man install-pdf install-pdf-am \ | ||
20103 | + install-ps install-ps-am install-strip installcheck \ | ||
20104 | + installcheck-am installdirs maintainer-clean \ | ||
20105 | + maintainer-clean-aminfo maintainer-clean-generic mostlyclean \ | ||
20106 | + mostlyclean-aminfo mostlyclean-compile mostlyclean-generic \ | ||
20107 | + mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \ | ||
20108 | + uninstall-am uninstall-dvi-am uninstall-html-am \ | ||
20109 | + uninstall-includeHEADERS uninstall-info-am \ | ||
20110 | + uninstall-libLTLIBRARIES uninstall-pdf-am uninstall-ps-am | ||
20111 | |||
20112 | .PRECIOUS: Makefile | ||
20113 | |||
20114 | diff --git a/libsframe/aclocal.m4 b/libsframe/aclocal.m4 | ||
20115 | index b0cdd6b184d..c83d4f62ece 100644 | ||
20116 | --- a/libsframe/aclocal.m4 | ||
20117 | +++ b/libsframe/aclocal.m4 | ||
20118 | @@ -1,6 +1,6 @@ | ||
20119 | -# generated automatically by aclocal 1.15.1 -*- Autoconf -*- | ||
20120 | +# generated automatically by aclocal 1.16.5 -*- Autoconf -*- | ||
20121 | |||
20122 | -# Copyright (C) 1996-2017 Free Software Foundation, Inc. | ||
20123 | +# Copyright (C) 1996-2021 Free Software Foundation, Inc. | ||
20124 | |||
20125 | # This file is free software; the Free Software Foundation | ||
20126 | # gives unlimited permission to copy and/or distribute it, | ||
20127 | @@ -20,7 +20,7 @@ You have another version of autoconf. It may work, but is not guaranteed to. | ||
20128 | If you have problems, you may need to regenerate the build system entirely. | ||
20129 | To do so, use the procedure documented by the package, typically 'autoreconf'.])]) | ||
20130 | |||
20131 | -# Copyright (C) 2002-2017 Free Software Foundation, Inc. | ||
20132 | +# Copyright (C) 2002-2021 Free Software Foundation, Inc. | ||
20133 | # | ||
20134 | # This file is free software; the Free Software Foundation | ||
20135 | # gives unlimited permission to copy and/or distribute it, | ||
20136 | @@ -32,10 +32,10 @@ To do so, use the procedure documented by the package, typically 'autoreconf'.]) | ||
20137 | # generated from the m4 files accompanying Automake X.Y. | ||
20138 | # (This private macro should not be called outside this file.) | ||
20139 | AC_DEFUN([AM_AUTOMAKE_VERSION], | ||
20140 | -[am__api_version='1.15' | ||
20141 | +[am__api_version='1.16' | ||
20142 | dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to | ||
20143 | dnl require some minimum version. Point them to the right macro. | ||
20144 | -m4_if([$1], [1.15.1], [], | ||
20145 | +m4_if([$1], [1.16.5], [], | ||
20146 | [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl | ||
20147 | ]) | ||
20148 | |||
20149 | @@ -51,12 +51,12 @@ m4_define([_AM_AUTOCONF_VERSION], []) | ||
20150 | # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. | ||
20151 | # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. | ||
20152 | AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], | ||
20153 | -[AM_AUTOMAKE_VERSION([1.15.1])dnl | ||
20154 | +[AM_AUTOMAKE_VERSION([1.16.5])dnl | ||
20155 | m4_ifndef([AC_AUTOCONF_VERSION], | ||
20156 | [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl | ||
20157 | _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) | ||
20158 | |||
20159 | -# Copyright (C) 2011-2017 Free Software Foundation, Inc. | ||
20160 | +# Copyright (C) 2011-2021 Free Software Foundation, Inc. | ||
20161 | # | ||
20162 | # This file is free software; the Free Software Foundation | ||
20163 | # gives unlimited permission to copy and/or distribute it, | ||
20164 | @@ -118,7 +118,7 @@ AC_SUBST([AR])dnl | ||
20165 | |||
20166 | # AM_AUX_DIR_EXPAND -*- Autoconf -*- | ||
20167 | |||
20168 | -# Copyright (C) 2001-2017 Free Software Foundation, Inc. | ||
20169 | +# Copyright (C) 2001-2021 Free Software Foundation, Inc. | ||
20170 | # | ||
20171 | # This file is free software; the Free Software Foundation | ||
20172 | # gives unlimited permission to copy and/or distribute it, | ||
20173 | @@ -170,7 +170,7 @@ am_aux_dir=`cd "$ac_aux_dir" && pwd` | ||
20174 | |||
20175 | # AM_CONDITIONAL -*- Autoconf -*- | ||
20176 | |||
20177 | -# Copyright (C) 1997-2017 Free Software Foundation, Inc. | ||
20178 | +# Copyright (C) 1997-2021 Free Software Foundation, Inc. | ||
20179 | # | ||
20180 | # This file is free software; the Free Software Foundation | ||
20181 | # gives unlimited permission to copy and/or distribute it, | ||
20182 | @@ -201,7 +201,7 @@ AC_CONFIG_COMMANDS_PRE( | ||
20183 | Usually this means the macro was only invoked conditionally.]]) | ||
20184 | fi])]) | ||
20185 | |||
20186 | -# Copyright (C) 1999-2017 Free Software Foundation, Inc. | ||
20187 | +# Copyright (C) 1999-2021 Free Software Foundation, Inc. | ||
20188 | # | ||
20189 | # This file is free software; the Free Software Foundation | ||
20190 | # gives unlimited permission to copy and/or distribute it, | ||
20191 | @@ -392,13 +392,12 @@ _AM_SUBST_NOTMAKE([am__nodep])dnl | ||
20192 | |||
20193 | # Generate code to set up dependency tracking. -*- Autoconf -*- | ||
20194 | |||
20195 | -# Copyright (C) 1999-2017 Free Software Foundation, Inc. | ||
20196 | +# Copyright (C) 1999-2021 Free Software Foundation, Inc. | ||
20197 | # | ||
20198 | # This file is free software; the Free Software Foundation | ||
20199 | # gives unlimited permission to copy and/or distribute it, | ||
20200 | # with or without modifications, as long as this notice is preserved. | ||
20201 | |||
20202 | - | ||
20203 | # _AM_OUTPUT_DEPENDENCY_COMMANDS | ||
20204 | # ------------------------------ | ||
20205 | AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], | ||
20206 | @@ -406,49 +405,43 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], | ||
20207 | # Older Autoconf quotes --file arguments for eval, but not when files | ||
20208 | # are listed without --file. Let's play safe and only enable the eval | ||
20209 | # if we detect the quoting. | ||
20210 | - case $CONFIG_FILES in | ||
20211 | - *\'*) eval set x "$CONFIG_FILES" ;; | ||
20212 | - *) set x $CONFIG_FILES ;; | ||
20213 | - esac | ||
20214 | + # TODO: see whether this extra hack can be removed once we start | ||
20215 | + # requiring Autoconf 2.70 or later. | ||
20216 | + AS_CASE([$CONFIG_FILES], | ||
20217 | + [*\'*], [eval set x "$CONFIG_FILES"], | ||
20218 | + [*], [set x $CONFIG_FILES]) | ||
20219 | shift | ||
20220 | - for mf | ||
20221 | + # Used to flag and report bootstrapping failures. | ||
20222 | + am_rc=0 | ||
20223 | + for am_mf | ||
20224 | do | ||
20225 | # Strip MF so we end up with the name of the file. | ||
20226 | - mf=`echo "$mf" | sed -e 's/:.*$//'` | ||
20227 | - # Check whether this is an Automake generated Makefile or not. | ||
20228 | - # We used to match only the files named 'Makefile.in', but | ||
20229 | - # some people rename them; so instead we look at the file content. | ||
20230 | - # Grep'ing the first line is not enough: some people post-process | ||
20231 | - # each Makefile.in and add a new line on top of each file to say so. | ||
20232 | - # Grep'ing the whole file is not good either: AIX grep has a line | ||
20233 | + am_mf=`AS_ECHO(["$am_mf"]) | sed -e 's/:.*$//'` | ||
20234 | + # Check whether this is an Automake generated Makefile which includes | ||
20235 | + # dependency-tracking related rules and includes. | ||
20236 | + # Grep'ing the whole file directly is not great: AIX grep has a line | ||
20237 | # limit of 2048, but all sed's we know have understand at least 4000. | ||
20238 | - if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then | ||
20239 | - dirpart=`AS_DIRNAME("$mf")` | ||
20240 | - else | ||
20241 | - continue | ||
20242 | - fi | ||
20243 | - # Extract the definition of DEPDIR, am__include, and am__quote | ||
20244 | - # from the Makefile without running 'make'. | ||
20245 | - DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` | ||
20246 | - test -z "$DEPDIR" && continue | ||
20247 | - am__include=`sed -n 's/^am__include = //p' < "$mf"` | ||
20248 | - test -z "$am__include" && continue | ||
20249 | - am__quote=`sed -n 's/^am__quote = //p' < "$mf"` | ||
20250 | - # Find all dependency output files, they are included files with | ||
20251 | - # $(DEPDIR) in their names. We invoke sed twice because it is the | ||
20252 | - # simplest approach to changing $(DEPDIR) to its actual value in the | ||
20253 | - # expansion. | ||
20254 | - for file in `sed -n " | ||
20255 | - s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ | ||
20256 | - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do | ||
20257 | - # Make sure the directory exists. | ||
20258 | - test -f "$dirpart/$file" && continue | ||
20259 | - fdir=`AS_DIRNAME(["$file"])` | ||
20260 | - AS_MKDIR_P([$dirpart/$fdir]) | ||
20261 | - # echo "creating $dirpart/$file" | ||
20262 | - echo '# dummy' > "$dirpart/$file" | ||
20263 | - done | ||
20264 | + sed -n 's,^am--depfiles:.*,X,p' "$am_mf" | grep X >/dev/null 2>&1 \ | ||
20265 | + || continue | ||
20266 | + am_dirpart=`AS_DIRNAME(["$am_mf"])` | ||
20267 | + am_filepart=`AS_BASENAME(["$am_mf"])` | ||
20268 | + AM_RUN_LOG([cd "$am_dirpart" \ | ||
20269 | + && sed -e '/# am--include-marker/d' "$am_filepart" \ | ||
20270 | + | $MAKE -f - am--depfiles]) || am_rc=$? | ||
20271 | done | ||
20272 | + if test $am_rc -ne 0; then | ||
20273 | + AC_MSG_FAILURE([Something went wrong bootstrapping makefile fragments | ||
20274 | + for automatic dependency tracking. If GNU make was not used, consider | ||
20275 | + re-running the configure script with MAKE="gmake" (or whatever is | ||
20276 | + necessary). You can also try re-running configure with the | ||
20277 | + '--disable-dependency-tracking' option to at least be able to build | ||
20278 | + the package (albeit without support for automatic dependency tracking).]) | ||
20279 | + fi | ||
20280 | + AS_UNSET([am_dirpart]) | ||
20281 | + AS_UNSET([am_filepart]) | ||
20282 | + AS_UNSET([am_mf]) | ||
20283 | + AS_UNSET([am_rc]) | ||
20284 | + rm -f conftest-deps.mk | ||
20285 | } | ||
20286 | ])# _AM_OUTPUT_DEPENDENCY_COMMANDS | ||
20287 | |||
20288 | @@ -457,18 +450,17 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], | ||
20289 | # ----------------------------- | ||
20290 | # This macro should only be invoked once -- use via AC_REQUIRE. | ||
20291 | # | ||
20292 | -# This code is only required when automatic dependency tracking | ||
20293 | -# is enabled. FIXME. This creates each '.P' file that we will | ||
20294 | -# need in order to bootstrap the dependency handling code. | ||
20295 | +# This code is only required when automatic dependency tracking is enabled. | ||
20296 | +# This creates each '.Po' and '.Plo' makefile fragment that we'll need in | ||
20297 | +# order to bootstrap the dependency handling code. | ||
20298 | AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], | ||
20299 | [AC_CONFIG_COMMANDS([depfiles], | ||
20300 | [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS], | ||
20301 | - [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) | ||
20302 | -]) | ||
20303 | + [AMDEP_TRUE="$AMDEP_TRUE" MAKE="${MAKE-make}"])]) | ||
20304 | |||
20305 | # Do all the work for Automake. -*- Autoconf -*- | ||
20306 | |||
20307 | -# Copyright (C) 1996-2017 Free Software Foundation, Inc. | ||
20308 | +# Copyright (C) 1996-2021 Free Software Foundation, Inc. | ||
20309 | # | ||
20310 | # This file is free software; the Free Software Foundation | ||
20311 | # gives unlimited permission to copy and/or distribute it, | ||
20312 | @@ -496,6 +488,10 @@ m4_defn([AC_PROG_CC]) | ||
20313 | # release and drop the old call support. | ||
20314 | AC_DEFUN([AM_INIT_AUTOMAKE], | ||
20315 | [AC_PREREQ([2.65])dnl | ||
20316 | +m4_ifdef([_$0_ALREADY_INIT], | ||
20317 | + [m4_fatal([$0 expanded multiple times | ||
20318 | +]m4_defn([_$0_ALREADY_INIT]))], | ||
20319 | + [m4_define([_$0_ALREADY_INIT], m4_expansion_stack)])dnl | ||
20320 | dnl Autoconf wants to disallow AM_ names. We explicitly allow | ||
20321 | dnl the ones we care about. | ||
20322 | m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl | ||
20323 | @@ -532,7 +528,7 @@ m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl | ||
20324 | [_AM_SET_OPTIONS([$1])dnl | ||
20325 | dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT. | ||
20326 | m4_if( | ||
20327 | - m4_ifdef([AC_PACKAGE_NAME], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]), | ||
20328 | + m4_ifset([AC_PACKAGE_NAME], [ok]):m4_ifset([AC_PACKAGE_VERSION], [ok]), | ||
20329 | [ok:ok],, | ||
20330 | [m4_fatal([AC_INIT should be called with package and version arguments])])dnl | ||
20331 | AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl | ||
20332 | @@ -555,8 +551,8 @@ AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl | ||
20333 | AC_REQUIRE([AC_PROG_MKDIR_P])dnl | ||
20334 | # For better backward compatibility. To be removed once Automake 1.9.x | ||
20335 | # dies out for good. For more background, see: | ||
20336 | -# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html> | ||
20337 | -# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html> | ||
20338 | +# <https://lists.gnu.org/archive/html/automake/2012-07/msg00001.html> | ||
20339 | +# <https://lists.gnu.org/archive/html/automake/2012-07/msg00014.html> | ||
20340 | AC_SUBST([mkdir_p], ['$(MKDIR_P)']) | ||
20341 | # We need awk for the "check" target (and possibly the TAP driver). The | ||
20342 | # system "awk" is bad on some platforms. | ||
20343 | @@ -584,6 +580,20 @@ AC_PROVIDE_IFELSE([AC_PROG_OBJCXX], | ||
20344 | [m4_define([AC_PROG_OBJCXX], | ||
20345 | m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl | ||
20346 | ]) | ||
20347 | +# Variables for tags utilities; see am/tags.am | ||
20348 | +if test -z "$CTAGS"; then | ||
20349 | + CTAGS=ctags | ||
20350 | +fi | ||
20351 | +AC_SUBST([CTAGS]) | ||
20352 | +if test -z "$ETAGS"; then | ||
20353 | + ETAGS=etags | ||
20354 | +fi | ||
20355 | +AC_SUBST([ETAGS]) | ||
20356 | +if test -z "$CSCOPE"; then | ||
20357 | + CSCOPE=cscope | ||
20358 | +fi | ||
20359 | +AC_SUBST([CSCOPE]) | ||
20360 | + | ||
20361 | AC_REQUIRE([AM_SILENT_RULES])dnl | ||
20362 | dnl The testsuite driver may need to know about EXEEXT, so add the | ||
20363 | dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This | ||
20364 | @@ -623,7 +633,7 @@ END | ||
20365 | Aborting the configuration process, to ensure you take notice of the issue. | ||
20366 | |||
20367 | You can download and install GNU coreutils to get an 'rm' implementation | ||
20368 | -that behaves properly: <http://www.gnu.org/software/coreutils/>. | ||
20369 | +that behaves properly: <https://www.gnu.org/software/coreutils/>. | ||
20370 | |||
20371 | If you want to complete the configuration process using your problematic | ||
20372 | 'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM | ||
20373 | @@ -665,7 +675,7 @@ for _am_header in $config_headers :; do | ||
20374 | done | ||
20375 | echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) | ||
20376 | |||
20377 | -# Copyright (C) 2001-2017 Free Software Foundation, Inc. | ||
20378 | +# Copyright (C) 2001-2021 Free Software Foundation, Inc. | ||
20379 | # | ||
20380 | # This file is free software; the Free Software Foundation | ||
20381 | # gives unlimited permission to copy and/or distribute it, | ||
20382 | @@ -689,7 +699,7 @@ AC_SUBST([install_sh])]) | ||
20383 | # Add --enable-maintainer-mode option to configure. -*- Autoconf -*- | ||
20384 | # From Jim Meyering | ||
20385 | |||
20386 | -# Copyright (C) 1996-2017 Free Software Foundation, Inc. | ||
20387 | +# Copyright (C) 1996-2021 Free Software Foundation, Inc. | ||
20388 | # | ||
20389 | # This file is free software; the Free Software Foundation | ||
20390 | # gives unlimited permission to copy and/or distribute it, | ||
20391 | @@ -724,7 +734,7 @@ AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) | ||
20392 | |||
20393 | # Check to see how 'make' treats includes. -*- Autoconf -*- | ||
20394 | |||
20395 | -# Copyright (C) 2001-2017 Free Software Foundation, Inc. | ||
20396 | +# Copyright (C) 2001-2021 Free Software Foundation, Inc. | ||
20397 | # | ||
20398 | # This file is free software; the Free Software Foundation | ||
20399 | # gives unlimited permission to copy and/or distribute it, | ||
20400 | @@ -732,49 +742,42 @@ AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) | ||
20401 | |||
20402 | # AM_MAKE_INCLUDE() | ||
20403 | # ----------------- | ||
20404 | -# Check to see how make treats includes. | ||
20405 | +# Check whether make has an 'include' directive that can support all | ||
20406 | +# the idioms we need for our automatic dependency tracking code. | ||
20407 | AC_DEFUN([AM_MAKE_INCLUDE], | ||
20408 | -[am_make=${MAKE-make} | ||
20409 | -cat > confinc << 'END' | ||
20410 | +[AC_MSG_CHECKING([whether ${MAKE-make} supports the include directive]) | ||
20411 | +cat > confinc.mk << 'END' | ||
20412 | am__doit: | ||
20413 | - @echo this is the am__doit target | ||
20414 | + @echo this is the am__doit target >confinc.out | ||
20415 | .PHONY: am__doit | ||
20416 | END | ||
20417 | -# If we don't find an include directive, just comment out the code. | ||
20418 | -AC_MSG_CHECKING([for style of include used by $am_make]) | ||
20419 | am__include="#" | ||
20420 | am__quote= | ||
20421 | -_am_result=none | ||
20422 | -# First try GNU make style include. | ||
20423 | -echo "include confinc" > confmf | ||
20424 | -# Ignore all kinds of additional output from 'make'. | ||
20425 | -case `$am_make -s -f confmf 2> /dev/null` in #( | ||
20426 | -*the\ am__doit\ target*) | ||
20427 | - am__include=include | ||
20428 | - am__quote= | ||
20429 | - _am_result=GNU | ||
20430 | - ;; | ||
20431 | -esac | ||
20432 | -# Now try BSD make style include. | ||
20433 | -if test "$am__include" = "#"; then | ||
20434 | - echo '.include "confinc"' > confmf | ||
20435 | - case `$am_make -s -f confmf 2> /dev/null` in #( | ||
20436 | - *the\ am__doit\ target*) | ||
20437 | - am__include=.include | ||
20438 | - am__quote="\"" | ||
20439 | - _am_result=BSD | ||
20440 | - ;; | ||
20441 | - esac | ||
20442 | -fi | ||
20443 | -AC_SUBST([am__include]) | ||
20444 | -AC_SUBST([am__quote]) | ||
20445 | -AC_MSG_RESULT([$_am_result]) | ||
20446 | -rm -f confinc confmf | ||
20447 | -]) | ||
20448 | +# BSD make does it like this. | ||
20449 | +echo '.include "confinc.mk" # ignored' > confmf.BSD | ||
20450 | +# Other make implementations (GNU, Solaris 10, AIX) do it like this. | ||
20451 | +echo 'include confinc.mk # ignored' > confmf.GNU | ||
20452 | +_am_result=no | ||
20453 | +for s in GNU BSD; do | ||
20454 | + AM_RUN_LOG([${MAKE-make} -f confmf.$s && cat confinc.out]) | ||
20455 | + AS_CASE([$?:`cat confinc.out 2>/dev/null`], | ||
20456 | + ['0:this is the am__doit target'], | ||
20457 | + [AS_CASE([$s], | ||
20458 | + [BSD], [am__include='.include' am__quote='"'], | ||
20459 | + [am__include='include' am__quote=''])]) | ||
20460 | + if test "$am__include" != "#"; then | ||
20461 | + _am_result="yes ($s style)" | ||
20462 | + break | ||
20463 | + fi | ||
20464 | +done | ||
20465 | +rm -f confinc.* confmf.* | ||
20466 | +AC_MSG_RESULT([${_am_result}]) | ||
20467 | +AC_SUBST([am__include])]) | ||
20468 | +AC_SUBST([am__quote])]) | ||
20469 | |||
20470 | # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- | ||
20471 | |||
20472 | -# Copyright (C) 1997-2017 Free Software Foundation, Inc. | ||
20473 | +# Copyright (C) 1997-2021 Free Software Foundation, Inc. | ||
20474 | # | ||
20475 | # This file is free software; the Free Software Foundation | ||
20476 | # gives unlimited permission to copy and/or distribute it, | ||
20477 | @@ -795,12 +798,7 @@ AC_DEFUN([AM_MISSING_HAS_RUN], | ||
20478 | [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl | ||
20479 | AC_REQUIRE_AUX_FILE([missing])dnl | ||
20480 | if test x"${MISSING+set}" != xset; then | ||
20481 | - case $am_aux_dir in | ||
20482 | - *\ * | *\ *) | ||
20483 | - MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;; | ||
20484 | - *) | ||
20485 | - MISSING="\${SHELL} $am_aux_dir/missing" ;; | ||
20486 | - esac | ||
20487 | + MISSING="\${SHELL} '$am_aux_dir/missing'" | ||
20488 | fi | ||
20489 | # Use eval to expand $SHELL | ||
20490 | if eval "$MISSING --is-lightweight"; then | ||
20491 | @@ -813,7 +811,7 @@ fi | ||
20492 | |||
20493 | # Helper functions for option handling. -*- Autoconf -*- | ||
20494 | |||
20495 | -# Copyright (C) 2001-2017 Free Software Foundation, Inc. | ||
20496 | +# Copyright (C) 2001-2021 Free Software Foundation, Inc. | ||
20497 | # | ||
20498 | # This file is free software; the Free Software Foundation | ||
20499 | # gives unlimited permission to copy and/or distribute it, | ||
20500 | @@ -842,7 +840,7 @@ AC_DEFUN([_AM_SET_OPTIONS], | ||
20501 | AC_DEFUN([_AM_IF_OPTION], | ||
20502 | [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) | ||
20503 | |||
20504 | -# Copyright (C) 1999-2017 Free Software Foundation, Inc. | ||
20505 | +# Copyright (C) 1999-2021 Free Software Foundation, Inc. | ||
20506 | # | ||
20507 | # This file is free software; the Free Software Foundation | ||
20508 | # gives unlimited permission to copy and/or distribute it, | ||
20509 | @@ -889,7 +887,7 @@ AC_LANG_POP([C])]) | ||
20510 | # For backward compatibility. | ||
20511 | AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])]) | ||
20512 | |||
20513 | -# Copyright (C) 2001-2017 Free Software Foundation, Inc. | ||
20514 | +# Copyright (C) 2001-2021 Free Software Foundation, Inc. | ||
20515 | # | ||
20516 | # This file is free software; the Free Software Foundation | ||
20517 | # gives unlimited permission to copy and/or distribute it, | ||
20518 | @@ -908,7 +906,7 @@ AC_DEFUN([AM_RUN_LOG], | ||
20519 | |||
20520 | # Check to make sure that the build environment is sane. -*- Autoconf -*- | ||
20521 | |||
20522 | -# Copyright (C) 1996-2017 Free Software Foundation, Inc. | ||
20523 | +# Copyright (C) 1996-2021 Free Software Foundation, Inc. | ||
20524 | # | ||
20525 | # This file is free software; the Free Software Foundation | ||
20526 | # gives unlimited permission to copy and/or distribute it, | ||
20527 | @@ -989,7 +987,7 @@ AC_CONFIG_COMMANDS_PRE( | ||
20528 | rm -f conftest.file | ||
20529 | ]) | ||
20530 | |||
20531 | -# Copyright (C) 2009-2017 Free Software Foundation, Inc. | ||
20532 | +# Copyright (C) 2009-2021 Free Software Foundation, Inc. | ||
20533 | # | ||
20534 | # This file is free software; the Free Software Foundation | ||
20535 | # gives unlimited permission to copy and/or distribute it, | ||
20536 | @@ -1049,7 +1047,7 @@ AC_SUBST([AM_BACKSLASH])dnl | ||
20537 | _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl | ||
20538 | ]) | ||
20539 | |||
20540 | -# Copyright (C) 2001-2017 Free Software Foundation, Inc. | ||
20541 | +# Copyright (C) 2001-2021 Free Software Foundation, Inc. | ||
20542 | # | ||
20543 | # This file is free software; the Free Software Foundation | ||
20544 | # gives unlimited permission to copy and/or distribute it, | ||
20545 | @@ -1077,7 +1075,7 @@ fi | ||
20546 | INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" | ||
20547 | AC_SUBST([INSTALL_STRIP_PROGRAM])]) | ||
20548 | |||
20549 | -# Copyright (C) 2006-2017 Free Software Foundation, Inc. | ||
20550 | +# Copyright (C) 2006-2021 Free Software Foundation, Inc. | ||
20551 | # | ||
20552 | # This file is free software; the Free Software Foundation | ||
20553 | # gives unlimited permission to copy and/or distribute it, | ||
20554 | @@ -1096,7 +1094,7 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) | ||
20555 | |||
20556 | # Check how to create a tarball. -*- Autoconf -*- | ||
20557 | |||
20558 | -# Copyright (C) 2004-2017 Free Software Foundation, Inc. | ||
20559 | +# Copyright (C) 2004-2021 Free Software Foundation, Inc. | ||
20560 | # | ||
20561 | # This file is free software; the Free Software Foundation | ||
20562 | # gives unlimited permission to copy and/or distribute it, | ||
20563 | diff --git a/libsframe/configure b/libsframe/configure | ||
20564 | index 7bbed5d8ccf..795e7802110 100755 | ||
20565 | --- a/libsframe/configure | ||
20566 | +++ b/libsframe/configure | ||
20567 | @@ -654,6 +654,8 @@ OTOOL | ||
20568 | LIPO | ||
20569 | NMEDIT | ||
20570 | DSYMUTIL | ||
20571 | +MANIFEST_TOOL | ||
20572 | +DLLTOOL | ||
20573 | OBJDUMP | ||
20574 | LN_S | ||
20575 | NM | ||
20576 | @@ -678,6 +680,9 @@ AM_BACKSLASH | ||
20577 | AM_DEFAULT_VERBOSITY | ||
20578 | AM_DEFAULT_V | ||
20579 | AM_V | ||
20580 | +CSCOPE | ||
20581 | +ETAGS | ||
20582 | +CTAGS | ||
20583 | am__fastdepCC_FALSE | ||
20584 | am__fastdepCC_TRUE | ||
20585 | CCDEPMODE | ||
20586 | @@ -685,7 +690,6 @@ am__nodep | ||
20587 | AMDEPBACKSLASH | ||
20588 | AMDEP_FALSE | ||
20589 | AMDEP_TRUE | ||
20590 | -am__quote | ||
20591 | am__include | ||
20592 | DEPDIR | ||
20593 | am__untar | ||
20594 | @@ -758,7 +762,8 @@ PACKAGE_VERSION | ||
20595 | PACKAGE_TARNAME | ||
20596 | PACKAGE_NAME | ||
20597 | PATH_SEPARATOR | ||
20598 | -SHELL' | ||
20599 | +SHELL | ||
20600 | +am__quote' | ||
20601 | ac_subst_files='' | ||
20602 | ac_user_opts=' | ||
20603 | enable_option_checking | ||
20604 | @@ -769,6 +774,7 @@ enable_static | ||
20605 | with_pic | ||
20606 | enable_fast_install | ||
20607 | with_gnu_ld | ||
20608 | +with_libtool_sysroot | ||
20609 | enable_libtool_lock | ||
20610 | enable_largefile | ||
20611 | enable_maintainer_mode | ||
20612 | @@ -1424,6 +1430,8 @@ Optional Packages: | ||
20613 | --with-pic try to use only PIC/non-PIC objects [default=use | ||
20614 | both] | ||
20615 | --with-gnu-ld assume the C compiler uses GNU ld [default=no] | ||
20616 | + --with-libtool-sysroot=DIR Search for dependent libraries within DIR | ||
20617 | + (or the compiler's sysroot if not specified). | ||
20618 | |||
20619 | Some influential environment variables: | ||
20620 | CC C compiler command | ||
20621 | @@ -3606,7 +3614,7 @@ $as_echo "$ac_cv_safe_to_define___extensions__" >&6; } | ||
20622 | $as_echo "#define _TANDEM_SOURCE 1" >>confdefs.h | ||
20623 | |||
20624 | |||
20625 | -am__api_version='1.15' | ||
20626 | +am__api_version='1.16' | ||
20627 | |||
20628 | # Find a good install program. We prefer a C program (faster), | ||
20629 | # so one script is as good as another. But avoid the broken or | ||
20630 | @@ -3779,12 +3787,7 @@ ac_script='s/[\\$]/&&/g;s/;s,x,x,$//' | ||
20631 | program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"` | ||
20632 | |||
20633 | if test x"${MISSING+set}" != xset; then | ||
20634 | - case $am_aux_dir in | ||
20635 | - *\ * | *\ *) | ||
20636 | - MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;; | ||
20637 | - *) | ||
20638 | - MISSING="\${SHELL} $am_aux_dir/missing" ;; | ||
20639 | - esac | ||
20640 | + MISSING="\${SHELL} '$am_aux_dir/missing'" | ||
20641 | fi | ||
20642 | # Use eval to expand $SHELL | ||
20643 | if eval "$MISSING --is-lightweight"; then | ||
20644 | @@ -4032,45 +4035,45 @@ DEPDIR="${am__leading_dot}deps" | ||
20645 | |||
20646 | ac_config_commands="$ac_config_commands depfiles" | ||
20647 | |||
20648 | - | ||
20649 | -am_make=${MAKE-make} | ||
20650 | -cat > confinc << 'END' | ||
20651 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} supports the include directive" >&5 | ||
20652 | +$as_echo_n "checking whether ${MAKE-make} supports the include directive... " >&6; } | ||
20653 | +cat > confinc.mk << 'END' | ||
20654 | am__doit: | ||
20655 | - @echo this is the am__doit target | ||
20656 | + @echo this is the am__doit target >confinc.out | ||
20657 | .PHONY: am__doit | ||
20658 | END | ||
20659 | -# If we don't find an include directive, just comment out the code. | ||
20660 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5 | ||
20661 | -$as_echo_n "checking for style of include used by $am_make... " >&6; } | ||
20662 | am__include="#" | ||
20663 | am__quote= | ||
20664 | -_am_result=none | ||
20665 | -# First try GNU make style include. | ||
20666 | -echo "include confinc" > confmf | ||
20667 | -# Ignore all kinds of additional output from 'make'. | ||
20668 | -case `$am_make -s -f confmf 2> /dev/null` in #( | ||
20669 | -*the\ am__doit\ target*) | ||
20670 | - am__include=include | ||
20671 | - am__quote= | ||
20672 | - _am_result=GNU | ||
20673 | - ;; | ||
20674 | -esac | ||
20675 | -# Now try BSD make style include. | ||
20676 | -if test "$am__include" = "#"; then | ||
20677 | - echo '.include "confinc"' > confmf | ||
20678 | - case `$am_make -s -f confmf 2> /dev/null` in #( | ||
20679 | - *the\ am__doit\ target*) | ||
20680 | - am__include=.include | ||
20681 | - am__quote="\"" | ||
20682 | - _am_result=BSD | ||
20683 | +# BSD make does it like this. | ||
20684 | +echo '.include "confinc.mk" # ignored' > confmf.BSD | ||
20685 | +# Other make implementations (GNU, Solaris 10, AIX) do it like this. | ||
20686 | +echo 'include confinc.mk # ignored' > confmf.GNU | ||
20687 | +_am_result=no | ||
20688 | +for s in GNU BSD; do | ||
20689 | + { echo "$as_me:$LINENO: ${MAKE-make} -f confmf.$s && cat confinc.out" >&5 | ||
20690 | + (${MAKE-make} -f confmf.$s && cat confinc.out) >&5 2>&5 | ||
20691 | + ac_status=$? | ||
20692 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
20693 | + (exit $ac_status); } | ||
20694 | + case $?:`cat confinc.out 2>/dev/null` in #( | ||
20695 | + '0:this is the am__doit target') : | ||
20696 | + case $s in #( | ||
20697 | + BSD) : | ||
20698 | + am__include='.include' am__quote='"' ;; #( | ||
20699 | + *) : | ||
20700 | + am__include='include' am__quote='' ;; | ||
20701 | +esac ;; #( | ||
20702 | + *) : | ||
20703 | ;; | ||
20704 | - esac | ||
20705 | -fi | ||
20706 | - | ||
20707 | - | ||
20708 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5 | ||
20709 | -$as_echo "$_am_result" >&6; } | ||
20710 | -rm -f confinc confmf | ||
20711 | +esac | ||
20712 | + if test "$am__include" != "#"; then | ||
20713 | + _am_result="yes ($s style)" | ||
20714 | + break | ||
20715 | + fi | ||
20716 | +done | ||
20717 | +rm -f confinc.* confmf.* | ||
20718 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${_am_result}" >&5 | ||
20719 | +$as_echo "${_am_result}" >&6; } | ||
20720 | |||
20721 | # Check whether --enable-dependency-tracking was given. | ||
20722 | if test "${enable_dependency_tracking+set}" = set; then : | ||
20723 | @@ -4182,8 +4185,8 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} | ||
20724 | |||
20725 | # For better backward compatibility. To be removed once Automake 1.9.x | ||
20726 | # dies out for good. For more background, see: | ||
20727 | -# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html> | ||
20728 | -# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html> | ||
20729 | +# <https://lists.gnu.org/archive/html/automake/2012-07/msg00001.html> | ||
20730 | +# <https://lists.gnu.org/archive/html/automake/2012-07/msg00014.html> | ||
20731 | mkdir_p='$(MKDIR_P)' | ||
20732 | |||
20733 | # We need awk for the "check" target (and possibly the TAP driver). The | ||
20734 | @@ -4330,6 +4333,20 @@ else | ||
20735 | fi | ||
20736 | |||
20737 | |||
20738 | +# Variables for tags utilities; see am/tags.am | ||
20739 | +if test -z "$CTAGS"; then | ||
20740 | + CTAGS=ctags | ||
20741 | +fi | ||
20742 | + | ||
20743 | +if test -z "$ETAGS"; then | ||
20744 | + ETAGS=etags | ||
20745 | +fi | ||
20746 | + | ||
20747 | +if test -z "$CSCOPE"; then | ||
20748 | + CSCOPE=cscope | ||
20749 | +fi | ||
20750 | + | ||
20751 | + | ||
20752 | |||
20753 | # POSIX will say in a future version that running "rm -f" with no argument | ||
20754 | # is OK; and we want to be able to make that assumption in our Makefile | ||
20755 | @@ -4362,7 +4379,7 @@ END | ||
20756 | Aborting the configuration process, to ensure you take notice of the issue. | ||
20757 | |||
20758 | You can download and install GNU coreutils to get an 'rm' implementation | ||
20759 | -that behaves properly: <http://www.gnu.org/software/coreutils/>. | ||
20760 | +that behaves properly: <https://www.gnu.org/software/coreutils/>. | ||
20761 | |||
20762 | If you want to complete the configuration process using your problematic | ||
20763 | 'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM | ||
20764 | @@ -5308,8 +5325,8 @@ esac | ||
20765 | |||
20766 | |||
20767 | |||
20768 | -macro_version='2.2.7a' | ||
20769 | -macro_revision='1.3134' | ||
20770 | +macro_version='2.4' | ||
20771 | +macro_revision='1.3293' | ||
20772 | |||
20773 | |||
20774 | |||
20775 | @@ -5420,7 +5437,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO | ||
20776 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 | ||
20777 | $as_echo_n "checking how to print strings... " >&6; } | ||
20778 | # Test print first, because it will be a builtin if present. | ||
20779 | -if test "X`print -r -- -n 2>/dev/null`" = X-n && \ | ||
20780 | +if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ | ||
20781 | test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then | ||
20782 | ECHO='print -r --' | ||
20783 | elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then | ||
20784 | @@ -6113,8 +6130,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; | ||
20785 | # Try some XSI features | ||
20786 | xsi_shell=no | ||
20787 | ( _lt_dummy="a/b/c" | ||
20788 | - test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ | ||
20789 | - = c,a/b,, \ | ||
20790 | + test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ | ||
20791 | + = c,a/b,b/c, \ | ||
20792 | && eval 'test $(( 1 + 1 )) -eq 2 \ | ||
20793 | && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ | ||
20794 | && xsi_shell=yes | ||
20795 | @@ -6163,6 +6180,80 @@ esac | ||
20796 | |||
20797 | |||
20798 | |||
20799 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5 | ||
20800 | +$as_echo_n "checking how to convert $build file names to $host format... " >&6; } | ||
20801 | +if ${lt_cv_to_host_file_cmd+:} false; then : | ||
20802 | + $as_echo_n "(cached) " >&6 | ||
20803 | +else | ||
20804 | + case $host in | ||
20805 | + *-*-mingw* ) | ||
20806 | + case $build in | ||
20807 | + *-*-mingw* ) # actually msys | ||
20808 | + lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 | ||
20809 | + ;; | ||
20810 | + *-*-cygwin* ) | ||
20811 | + lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 | ||
20812 | + ;; | ||
20813 | + * ) # otherwise, assume *nix | ||
20814 | + lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 | ||
20815 | + ;; | ||
20816 | + esac | ||
20817 | + ;; | ||
20818 | + *-*-cygwin* ) | ||
20819 | + case $build in | ||
20820 | + *-*-mingw* ) # actually msys | ||
20821 | + lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin | ||
20822 | + ;; | ||
20823 | + *-*-cygwin* ) | ||
20824 | + lt_cv_to_host_file_cmd=func_convert_file_noop | ||
20825 | + ;; | ||
20826 | + * ) # otherwise, assume *nix | ||
20827 | + lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin | ||
20828 | + ;; | ||
20829 | + esac | ||
20830 | + ;; | ||
20831 | + * ) # unhandled hosts (and "normal" native builds) | ||
20832 | + lt_cv_to_host_file_cmd=func_convert_file_noop | ||
20833 | + ;; | ||
20834 | +esac | ||
20835 | + | ||
20836 | +fi | ||
20837 | + | ||
20838 | +to_host_file_cmd=$lt_cv_to_host_file_cmd | ||
20839 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5 | ||
20840 | +$as_echo "$lt_cv_to_host_file_cmd" >&6; } | ||
20841 | + | ||
20842 | + | ||
20843 | + | ||
20844 | + | ||
20845 | + | ||
20846 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5 | ||
20847 | +$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; } | ||
20848 | +if ${lt_cv_to_tool_file_cmd+:} false; then : | ||
20849 | + $as_echo_n "(cached) " >&6 | ||
20850 | +else | ||
20851 | + #assume ordinary cross tools, or native build. | ||
20852 | +lt_cv_to_tool_file_cmd=func_convert_file_noop | ||
20853 | +case $host in | ||
20854 | + *-*-mingw* ) | ||
20855 | + case $build in | ||
20856 | + *-*-mingw* ) # actually msys | ||
20857 | + lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 | ||
20858 | + ;; | ||
20859 | + esac | ||
20860 | + ;; | ||
20861 | +esac | ||
20862 | + | ||
20863 | +fi | ||
20864 | + | ||
20865 | +to_tool_file_cmd=$lt_cv_to_tool_file_cmd | ||
20866 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5 | ||
20867 | +$as_echo "$lt_cv_to_tool_file_cmd" >&6; } | ||
20868 | + | ||
20869 | + | ||
20870 | + | ||
20871 | + | ||
20872 | + | ||
20873 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 | ||
20874 | $as_echo_n "checking for $LD option to reload object files... " >&6; } | ||
20875 | if ${lt_cv_ld_reload_flag+:} false; then : | ||
20876 | @@ -6179,6 +6270,11 @@ case $reload_flag in | ||
20877 | esac | ||
20878 | reload_cmds='$LD$reload_flag -o $output$reload_objs' | ||
20879 | case $host_os in | ||
20880 | + cygwin* | mingw* | pw32* | cegcc*) | ||
20881 | + if test "$GCC" != yes; then | ||
20882 | + reload_cmds=false | ||
20883 | + fi | ||
20884 | + ;; | ||
20885 | darwin*) | ||
20886 | if test "$GCC" = yes; then | ||
20887 | reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' | ||
20888 | @@ -6347,7 +6443,8 @@ mingw* | pw32*) | ||
20889 | lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' | ||
20890 | lt_cv_file_magic_cmd='func_win32_libid' | ||
20891 | else | ||
20892 | - lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' | ||
20893 | + # Keep this pattern in sync with the one in func_win32_libid. | ||
20894 | + lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' | ||
20895 | lt_cv_file_magic_cmd='$OBJDUMP -f' | ||
20896 | fi | ||
20897 | ;; | ||
20898 | @@ -6501,6 +6598,21 @@ esac | ||
20899 | fi | ||
20900 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 | ||
20901 | $as_echo "$lt_cv_deplibs_check_method" >&6; } | ||
20902 | + | ||
20903 | +file_magic_glob= | ||
20904 | +want_nocaseglob=no | ||
20905 | +if test "$build" = "$host"; then | ||
20906 | + case $host_os in | ||
20907 | + mingw* | pw32*) | ||
20908 | + if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then | ||
20909 | + want_nocaseglob=yes | ||
20910 | + else | ||
20911 | + file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"` | ||
20912 | + fi | ||
20913 | + ;; | ||
20914 | + esac | ||
20915 | +fi | ||
20916 | + | ||
20917 | file_magic_cmd=$lt_cv_file_magic_cmd | ||
20918 | deplibs_check_method=$lt_cv_deplibs_check_method | ||
20919 | test -z "$deplibs_check_method" && deplibs_check_method=unknown | ||
20920 | @@ -6516,6 +6628,157 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown | ||
20921 | |||
20922 | |||
20923 | |||
20924 | + | ||
20925 | + | ||
20926 | + | ||
20927 | + | ||
20928 | + | ||
20929 | + | ||
20930 | + | ||
20931 | + | ||
20932 | + | ||
20933 | + | ||
20934 | +if test -n "$ac_tool_prefix"; then | ||
20935 | + # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. | ||
20936 | +set dummy ${ac_tool_prefix}dlltool; ac_word=$2 | ||
20937 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
20938 | +$as_echo_n "checking for $ac_word... " >&6; } | ||
20939 | +if ${ac_cv_prog_DLLTOOL+:} false; then : | ||
20940 | + $as_echo_n "(cached) " >&6 | ||
20941 | +else | ||
20942 | + if test -n "$DLLTOOL"; then | ||
20943 | + ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. | ||
20944 | +else | ||
20945 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | ||
20946 | +for as_dir in $PATH | ||
20947 | +do | ||
20948 | + IFS=$as_save_IFS | ||
20949 | + test -z "$as_dir" && as_dir=. | ||
20950 | + for ac_exec_ext in '' $ac_executable_extensions; do | ||
20951 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | ||
20952 | + ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" | ||
20953 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
20954 | + break 2 | ||
20955 | + fi | ||
20956 | +done | ||
20957 | + done | ||
20958 | +IFS=$as_save_IFS | ||
20959 | + | ||
20960 | +fi | ||
20961 | +fi | ||
20962 | +DLLTOOL=$ac_cv_prog_DLLTOOL | ||
20963 | +if test -n "$DLLTOOL"; then | ||
20964 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 | ||
20965 | +$as_echo "$DLLTOOL" >&6; } | ||
20966 | +else | ||
20967 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
20968 | +$as_echo "no" >&6; } | ||
20969 | +fi | ||
20970 | + | ||
20971 | + | ||
20972 | +fi | ||
20973 | +if test -z "$ac_cv_prog_DLLTOOL"; then | ||
20974 | + ac_ct_DLLTOOL=$DLLTOOL | ||
20975 | + # Extract the first word of "dlltool", so it can be a program name with args. | ||
20976 | +set dummy dlltool; ac_word=$2 | ||
20977 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
20978 | +$as_echo_n "checking for $ac_word... " >&6; } | ||
20979 | +if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then : | ||
20980 | + $as_echo_n "(cached) " >&6 | ||
20981 | +else | ||
20982 | + if test -n "$ac_ct_DLLTOOL"; then | ||
20983 | + ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. | ||
20984 | +else | ||
20985 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | ||
20986 | +for as_dir in $PATH | ||
20987 | +do | ||
20988 | + IFS=$as_save_IFS | ||
20989 | + test -z "$as_dir" && as_dir=. | ||
20990 | + for ac_exec_ext in '' $ac_executable_extensions; do | ||
20991 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | ||
20992 | + ac_cv_prog_ac_ct_DLLTOOL="dlltool" | ||
20993 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
20994 | + break 2 | ||
20995 | + fi | ||
20996 | +done | ||
20997 | + done | ||
20998 | +IFS=$as_save_IFS | ||
20999 | + | ||
21000 | +fi | ||
21001 | +fi | ||
21002 | +ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL | ||
21003 | +if test -n "$ac_ct_DLLTOOL"; then | ||
21004 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 | ||
21005 | +$as_echo "$ac_ct_DLLTOOL" >&6; } | ||
21006 | +else | ||
21007 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
21008 | +$as_echo "no" >&6; } | ||
21009 | +fi | ||
21010 | + | ||
21011 | + if test "x$ac_ct_DLLTOOL" = x; then | ||
21012 | + DLLTOOL="false" | ||
21013 | + else | ||
21014 | + case $cross_compiling:$ac_tool_warned in | ||
21015 | +yes:) | ||
21016 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 | ||
21017 | +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} | ||
21018 | +ac_tool_warned=yes ;; | ||
21019 | +esac | ||
21020 | + DLLTOOL=$ac_ct_DLLTOOL | ||
21021 | + fi | ||
21022 | +else | ||
21023 | + DLLTOOL="$ac_cv_prog_DLLTOOL" | ||
21024 | +fi | ||
21025 | + | ||
21026 | +test -z "$DLLTOOL" && DLLTOOL=dlltool | ||
21027 | + | ||
21028 | + | ||
21029 | + | ||
21030 | + | ||
21031 | + | ||
21032 | + | ||
21033 | + | ||
21034 | + | ||
21035 | + | ||
21036 | + | ||
21037 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5 | ||
21038 | +$as_echo_n "checking how to associate runtime and link libraries... " >&6; } | ||
21039 | +if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then : | ||
21040 | + $as_echo_n "(cached) " >&6 | ||
21041 | +else | ||
21042 | + lt_cv_sharedlib_from_linklib_cmd='unknown' | ||
21043 | + | ||
21044 | +case $host_os in | ||
21045 | +cygwin* | mingw* | pw32* | cegcc*) | ||
21046 | + # two different shell functions defined in ltmain.sh | ||
21047 | + # decide which to use based on capabilities of $DLLTOOL | ||
21048 | + case `$DLLTOOL --help 2>&1` in | ||
21049 | + *--identify-strict*) | ||
21050 | + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib | ||
21051 | + ;; | ||
21052 | + *) | ||
21053 | + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback | ||
21054 | + ;; | ||
21055 | + esac | ||
21056 | + ;; | ||
21057 | +*) | ||
21058 | + # fallback: assume linklib IS sharedlib | ||
21059 | + lt_cv_sharedlib_from_linklib_cmd="$ECHO" | ||
21060 | + ;; | ||
21061 | +esac | ||
21062 | + | ||
21063 | +fi | ||
21064 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5 | ||
21065 | +$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; } | ||
21066 | +sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd | ||
21067 | +test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO | ||
21068 | + | ||
21069 | + | ||
21070 | + | ||
21071 | + | ||
21072 | + | ||
21073 | + | ||
21074 | + | ||
21075 | plugin_option= | ||
21076 | plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll" | ||
21077 | for plugin in $plugin_names; do | ||
21078 | @@ -6530,8 +6793,10 @@ for plugin in $plugin_names; do | ||
21079 | done | ||
21080 | |||
21081 | if test -n "$ac_tool_prefix"; then | ||
21082 | - # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. | ||
21083 | -set dummy ${ac_tool_prefix}ar; ac_word=$2 | ||
21084 | + for ac_prog in ar | ||
21085 | + do | ||
21086 | + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. | ||
21087 | +set dummy $ac_tool_prefix$ac_prog; ac_word=$2 | ||
21088 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
21089 | $as_echo_n "checking for $ac_word... " >&6; } | ||
21090 | if ${ac_cv_prog_AR+:} false; then : | ||
21091 | @@ -6547,7 +6812,7 @@ do | ||
21092 | test -z "$as_dir" && as_dir=. | ||
21093 | for ac_exec_ext in '' $ac_executable_extensions; do | ||
21094 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | ||
21095 | - ac_cv_prog_AR="${ac_tool_prefix}ar" | ||
21096 | + ac_cv_prog_AR="$ac_tool_prefix$ac_prog" | ||
21097 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
21098 | break 2 | ||
21099 | fi | ||
21100 | @@ -6567,11 +6832,15 @@ $as_echo "no" >&6; } | ||
21101 | fi | ||
21102 | |||
21103 | |||
21104 | + test -n "$AR" && break | ||
21105 | + done | ||
21106 | fi | ||
21107 | -if test -z "$ac_cv_prog_AR"; then | ||
21108 | +if test -z "$AR"; then | ||
21109 | ac_ct_AR=$AR | ||
21110 | - # Extract the first word of "ar", so it can be a program name with args. | ||
21111 | -set dummy ar; ac_word=$2 | ||
21112 | + for ac_prog in ar | ||
21113 | +do | ||
21114 | + # Extract the first word of "$ac_prog", so it can be a program name with args. | ||
21115 | +set dummy $ac_prog; ac_word=$2 | ||
21116 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
21117 | $as_echo_n "checking for $ac_word... " >&6; } | ||
21118 | if ${ac_cv_prog_ac_ct_AR+:} false; then : | ||
21119 | @@ -6587,7 +6856,7 @@ do | ||
21120 | test -z "$as_dir" && as_dir=. | ||
21121 | for ac_exec_ext in '' $ac_executable_extensions; do | ||
21122 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | ||
21123 | - ac_cv_prog_ac_ct_AR="ar" | ||
21124 | + ac_cv_prog_ac_ct_AR="$ac_prog" | ||
21125 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
21126 | break 2 | ||
21127 | fi | ||
21128 | @@ -6606,6 +6875,10 @@ else | ||
21129 | $as_echo "no" >&6; } | ||
21130 | fi | ||
21131 | |||
21132 | + | ||
21133 | + test -n "$ac_ct_AR" && break | ||
21134 | +done | ||
21135 | + | ||
21136 | if test "x$ac_ct_AR" = x; then | ||
21137 | AR="false" | ||
21138 | else | ||
21139 | @@ -6617,29 +6890,81 @@ ac_tool_warned=yes ;; | ||
21140 | esac | ||
21141 | AR=$ac_ct_AR | ||
21142 | fi | ||
21143 | -else | ||
21144 | - AR="$ac_cv_prog_AR" | ||
21145 | fi | ||
21146 | |||
21147 | -test -z "$AR" && AR=ar | ||
21148 | -if test -n "$plugin_option"; then | ||
21149 | - if $AR --help 2>&1 | grep -q "\--plugin"; then | ||
21150 | - touch conftest.c | ||
21151 | - $AR $plugin_option rc conftest.a conftest.c | ||
21152 | - if test "$?" != 0; then | ||
21153 | - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5 | ||
21154 | + touch conftest.c | ||
21155 | + $AR $plugin_option rc conftest.a conftest.c | ||
21156 | + if test "$?" != 0; then | ||
21157 | + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5 | ||
21158 | $as_echo "$as_me: WARNING: Failed: $AR $plugin_option rc" >&2;} | ||
21159 | - else | ||
21160 | - AR="$AR $plugin_option" | ||
21161 | - fi | ||
21162 | - rm -f conftest.* | ||
21163 | + else | ||
21164 | + AR="$AR $plugin_option" | ||
21165 | fi | ||
21166 | -fi | ||
21167 | -test -z "$AR_FLAGS" && AR_FLAGS=cru | ||
21168 | + rm -f conftest.* | ||
21169 | +: ${AR=ar} | ||
21170 | +: ${AR_FLAGS=cru} | ||
21171 | + | ||
21172 | + | ||
21173 | + | ||
21174 | + | ||
21175 | + | ||
21176 | + | ||
21177 | + | ||
21178 | |||
21179 | |||
21180 | |||
21181 | |||
21182 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 | ||
21183 | +$as_echo_n "checking for archiver @FILE support... " >&6; } | ||
21184 | +if ${lt_cv_ar_at_file+:} false; then : | ||
21185 | + $as_echo_n "(cached) " >&6 | ||
21186 | +else | ||
21187 | + lt_cv_ar_at_file=no | ||
21188 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
21189 | +/* end confdefs.h. */ | ||
21190 | + | ||
21191 | +int | ||
21192 | +main () | ||
21193 | +{ | ||
21194 | + | ||
21195 | + ; | ||
21196 | + return 0; | ||
21197 | +} | ||
21198 | +_ACEOF | ||
21199 | +if ac_fn_c_try_compile "$LINENO"; then : | ||
21200 | + echo conftest.$ac_objext > conftest.lst | ||
21201 | + lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5' | ||
21202 | + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 | ||
21203 | + (eval $lt_ar_try) 2>&5 | ||
21204 | + ac_status=$? | ||
21205 | + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 | ||
21206 | + test $ac_status = 0; } | ||
21207 | + if test "$ac_status" -eq 0; then | ||
21208 | + # Ensure the archiver fails upon bogus file names. | ||
21209 | + rm -f conftest.$ac_objext libconftest.a | ||
21210 | + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 | ||
21211 | + (eval $lt_ar_try) 2>&5 | ||
21212 | + ac_status=$? | ||
21213 | + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 | ||
21214 | + test $ac_status = 0; } | ||
21215 | + if test "$ac_status" -ne 0; then | ||
21216 | + lt_cv_ar_at_file=@ | ||
21217 | + fi | ||
21218 | + fi | ||
21219 | + rm -f conftest.* libconftest.a | ||
21220 | + | ||
21221 | +fi | ||
21222 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
21223 | + | ||
21224 | +fi | ||
21225 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 | ||
21226 | +$as_echo "$lt_cv_ar_at_file" >&6; } | ||
21227 | + | ||
21228 | +if test "x$lt_cv_ar_at_file" = xno; then | ||
21229 | + archiver_list_spec= | ||
21230 | +else | ||
21231 | + archiver_list_spec=$lt_cv_ar_at_file | ||
21232 | +fi | ||
21233 | |||
21234 | |||
21235 | |||
21236 | @@ -6986,8 +7311,8 @@ esac | ||
21237 | lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" | ||
21238 | |||
21239 | # Transform an extracted symbol line into symbol name and symbol address | ||
21240 | -lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" | ||
21241 | -lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'" | ||
21242 | +lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" | ||
21243 | +lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'" | ||
21244 | |||
21245 | # Handle CRLF in mingw tool chain | ||
21246 | opt_cr= | ||
21247 | @@ -7023,6 +7348,7 @@ for ac_symprfx in "" "_"; do | ||
21248 | else | ||
21249 | lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" | ||
21250 | fi | ||
21251 | + lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" | ||
21252 | |||
21253 | # Check to see that the pipe works correctly. | ||
21254 | pipe_works=no | ||
21255 | @@ -7064,6 +7390,18 @@ _LT_EOF | ||
21256 | if $GREP ' nm_test_var$' "$nlist" >/dev/null; then | ||
21257 | if $GREP ' nm_test_func$' "$nlist" >/dev/null; then | ||
21258 | cat <<_LT_EOF > conftest.$ac_ext | ||
21259 | +/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ | ||
21260 | +#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) | ||
21261 | +/* DATA imports from DLLs on WIN32 con't be const, because runtime | ||
21262 | + relocations are performed -- see ld's documentation on pseudo-relocs. */ | ||
21263 | +# define LT_DLSYM_CONST | ||
21264 | +#elif defined(__osf__) | ||
21265 | +/* This system does not cope well with relocations in const data. */ | ||
21266 | +# define LT_DLSYM_CONST | ||
21267 | +#else | ||
21268 | +# define LT_DLSYM_CONST const | ||
21269 | +#endif | ||
21270 | + | ||
21271 | #ifdef __cplusplus | ||
21272 | extern "C" { | ||
21273 | #endif | ||
21274 | @@ -7075,7 +7413,7 @@ _LT_EOF | ||
21275 | cat <<_LT_EOF >> conftest.$ac_ext | ||
21276 | |||
21277 | /* The mapping between symbol names and symbols. */ | ||
21278 | -const struct { | ||
21279 | +LT_DLSYM_CONST struct { | ||
21280 | const char *name; | ||
21281 | void *address; | ||
21282 | } | ||
21283 | @@ -7101,8 +7439,8 @@ static const void *lt_preloaded_setup() { | ||
21284 | _LT_EOF | ||
21285 | # Now try linking the two files. | ||
21286 | mv conftest.$ac_objext conftstm.$ac_objext | ||
21287 | - lt_save_LIBS="$LIBS" | ||
21288 | - lt_save_CFLAGS="$CFLAGS" | ||
21289 | + lt_globsym_save_LIBS=$LIBS | ||
21290 | + lt_globsym_save_CFLAGS=$CFLAGS | ||
21291 | LIBS="conftstm.$ac_objext" | ||
21292 | CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" | ||
21293 | if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 | ||
21294 | @@ -7112,8 +7450,8 @@ _LT_EOF | ||
21295 | test $ac_status = 0; } && test -s conftest${ac_exeext}; then | ||
21296 | pipe_works=yes | ||
21297 | fi | ||
21298 | - LIBS="$lt_save_LIBS" | ||
21299 | - CFLAGS="$lt_save_CFLAGS" | ||
21300 | + LIBS=$lt_globsym_save_LIBS | ||
21301 | + CFLAGS=$lt_globsym_save_CFLAGS | ||
21302 | else | ||
21303 | echo "cannot find nm_test_func in $nlist" >&5 | ||
21304 | fi | ||
21305 | @@ -7150,6 +7488,16 @@ else | ||
21306 | $as_echo "ok" >&6; } | ||
21307 | fi | ||
21308 | |||
21309 | +# Response file support. | ||
21310 | +if test "$lt_cv_nm_interface" = "MS dumpbin"; then | ||
21311 | + nm_file_list_spec='@' | ||
21312 | +elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then | ||
21313 | + nm_file_list_spec='@' | ||
21314 | +fi | ||
21315 | + | ||
21316 | + | ||
21317 | + | ||
21318 | + | ||
21319 | |||
21320 | |||
21321 | |||
21322 | @@ -7166,6 +7514,45 @@ fi | ||
21323 | |||
21324 | |||
21325 | |||
21326 | + | ||
21327 | + | ||
21328 | + | ||
21329 | + | ||
21330 | + | ||
21331 | + | ||
21332 | + | ||
21333 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 | ||
21334 | +$as_echo_n "checking for sysroot... " >&6; } | ||
21335 | + | ||
21336 | +# Check whether --with-libtool-sysroot was given. | ||
21337 | +if test "${with_libtool_sysroot+set}" = set; then : | ||
21338 | + withval=$with_libtool_sysroot; | ||
21339 | +else | ||
21340 | + with_libtool_sysroot=no | ||
21341 | +fi | ||
21342 | + | ||
21343 | + | ||
21344 | +lt_sysroot= | ||
21345 | +case ${with_libtool_sysroot} in #( | ||
21346 | + yes) | ||
21347 | + if test "$GCC" = yes; then | ||
21348 | + lt_sysroot=`$CC --print-sysroot 2>/dev/null` | ||
21349 | + fi | ||
21350 | + ;; #( | ||
21351 | + /*) | ||
21352 | + lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"` | ||
21353 | + ;; #( | ||
21354 | + no|'') | ||
21355 | + ;; #( | ||
21356 | + *) | ||
21357 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5 | ||
21358 | +$as_echo "${with_libtool_sysroot}" >&6; } | ||
21359 | + as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 | ||
21360 | + ;; | ||
21361 | +esac | ||
21362 | + | ||
21363 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 | ||
21364 | +$as_echo "${lt_sysroot:-no}" >&6; } | ||
21365 | |||
21366 | |||
21367 | |||
21368 | @@ -7371,11 +7758,128 @@ sparc*-*solaris*) | ||
21369 | ;; | ||
21370 | esac | ||
21371 | fi | ||
21372 | - rm -rf conftest* | ||
21373 | - ;; | ||
21374 | + rm -rf conftest* | ||
21375 | + ;; | ||
21376 | +esac | ||
21377 | + | ||
21378 | +need_locks="$enable_libtool_lock" | ||
21379 | + | ||
21380 | +if test -n "$ac_tool_prefix"; then | ||
21381 | + # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args. | ||
21382 | +set dummy ${ac_tool_prefix}mt; ac_word=$2 | ||
21383 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
21384 | +$as_echo_n "checking for $ac_word... " >&6; } | ||
21385 | +if ${ac_cv_prog_MANIFEST_TOOL+:} false; then : | ||
21386 | + $as_echo_n "(cached) " >&6 | ||
21387 | +else | ||
21388 | + if test -n "$MANIFEST_TOOL"; then | ||
21389 | + ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test. | ||
21390 | +else | ||
21391 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | ||
21392 | +for as_dir in $PATH | ||
21393 | +do | ||
21394 | + IFS=$as_save_IFS | ||
21395 | + test -z "$as_dir" && as_dir=. | ||
21396 | + for ac_exec_ext in '' $ac_executable_extensions; do | ||
21397 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | ||
21398 | + ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" | ||
21399 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
21400 | + break 2 | ||
21401 | + fi | ||
21402 | +done | ||
21403 | + done | ||
21404 | +IFS=$as_save_IFS | ||
21405 | + | ||
21406 | +fi | ||
21407 | +fi | ||
21408 | +MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL | ||
21409 | +if test -n "$MANIFEST_TOOL"; then | ||
21410 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5 | ||
21411 | +$as_echo "$MANIFEST_TOOL" >&6; } | ||
21412 | +else | ||
21413 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
21414 | +$as_echo "no" >&6; } | ||
21415 | +fi | ||
21416 | + | ||
21417 | + | ||
21418 | +fi | ||
21419 | +if test -z "$ac_cv_prog_MANIFEST_TOOL"; then | ||
21420 | + ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL | ||
21421 | + # Extract the first word of "mt", so it can be a program name with args. | ||
21422 | +set dummy mt; ac_word=$2 | ||
21423 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
21424 | +$as_echo_n "checking for $ac_word... " >&6; } | ||
21425 | +if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then : | ||
21426 | + $as_echo_n "(cached) " >&6 | ||
21427 | +else | ||
21428 | + if test -n "$ac_ct_MANIFEST_TOOL"; then | ||
21429 | + ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test. | ||
21430 | +else | ||
21431 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | ||
21432 | +for as_dir in $PATH | ||
21433 | +do | ||
21434 | + IFS=$as_save_IFS | ||
21435 | + test -z "$as_dir" && as_dir=. | ||
21436 | + for ac_exec_ext in '' $ac_executable_extensions; do | ||
21437 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | ||
21438 | + ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" | ||
21439 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
21440 | + break 2 | ||
21441 | + fi | ||
21442 | +done | ||
21443 | + done | ||
21444 | +IFS=$as_save_IFS | ||
21445 | + | ||
21446 | +fi | ||
21447 | +fi | ||
21448 | +ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL | ||
21449 | +if test -n "$ac_ct_MANIFEST_TOOL"; then | ||
21450 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5 | ||
21451 | +$as_echo "$ac_ct_MANIFEST_TOOL" >&6; } | ||
21452 | +else | ||
21453 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
21454 | +$as_echo "no" >&6; } | ||
21455 | +fi | ||
21456 | + | ||
21457 | + if test "x$ac_ct_MANIFEST_TOOL" = x; then | ||
21458 | + MANIFEST_TOOL=":" | ||
21459 | + else | ||
21460 | + case $cross_compiling:$ac_tool_warned in | ||
21461 | +yes:) | ||
21462 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 | ||
21463 | +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} | ||
21464 | +ac_tool_warned=yes ;; | ||
21465 | esac | ||
21466 | + MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL | ||
21467 | + fi | ||
21468 | +else | ||
21469 | + MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL" | ||
21470 | +fi | ||
21471 | + | ||
21472 | +test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt | ||
21473 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5 | ||
21474 | +$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; } | ||
21475 | +if ${lt_cv_path_mainfest_tool+:} false; then : | ||
21476 | + $as_echo_n "(cached) " >&6 | ||
21477 | +else | ||
21478 | + lt_cv_path_mainfest_tool=no | ||
21479 | + echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5 | ||
21480 | + $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out | ||
21481 | + cat conftest.err >&5 | ||
21482 | + if $GREP 'Manifest Tool' conftest.out > /dev/null; then | ||
21483 | + lt_cv_path_mainfest_tool=yes | ||
21484 | + fi | ||
21485 | + rm -f conftest* | ||
21486 | +fi | ||
21487 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5 | ||
21488 | +$as_echo "$lt_cv_path_mainfest_tool" >&6; } | ||
21489 | +if test "x$lt_cv_path_mainfest_tool" != xyes; then | ||
21490 | + MANIFEST_TOOL=: | ||
21491 | +fi | ||
21492 | + | ||
21493 | + | ||
21494 | + | ||
21495 | |||
21496 | -need_locks="$enable_libtool_lock" | ||
21497 | |||
21498 | |||
21499 | case $host_os in | ||
21500 | @@ -7940,6 +8444,8 @@ _LT_EOF | ||
21501 | $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 | ||
21502 | echo "$AR cru libconftest.a conftest.o" >&5 | ||
21503 | $AR cru libconftest.a conftest.o 2>&5 | ||
21504 | + echo "$RANLIB libconftest.a" >&5 | ||
21505 | + $RANLIB libconftest.a 2>&5 | ||
21506 | cat > conftest.c << _LT_EOF | ||
21507 | int main() { return 0;} | ||
21508 | _LT_EOF | ||
21509 | @@ -8492,8 +8998,6 @@ fi | ||
21510 | lt_prog_compiler_pic= | ||
21511 | lt_prog_compiler_static= | ||
21512 | |||
21513 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 | ||
21514 | -$as_echo_n "checking for $compiler option to produce PIC... " >&6; } | ||
21515 | |||
21516 | if test "$GCC" = yes; then | ||
21517 | lt_prog_compiler_wl='-Wl,' | ||
21518 | @@ -8659,6 +9163,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } | ||
21519 | lt_prog_compiler_pic='--shared' | ||
21520 | lt_prog_compiler_static='--static' | ||
21521 | ;; | ||
21522 | + nagfor*) | ||
21523 | + # NAG Fortran compiler | ||
21524 | + lt_prog_compiler_wl='-Wl,-Wl,,' | ||
21525 | + lt_prog_compiler_pic='-PIC' | ||
21526 | + lt_prog_compiler_static='-Bstatic' | ||
21527 | + ;; | ||
21528 | pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) | ||
21529 | # Portland Group compilers (*not* the Pentium gcc compiler, | ||
21530 | # which looks to be a dead project) | ||
21531 | @@ -8721,7 +9231,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } | ||
21532 | lt_prog_compiler_pic='-KPIC' | ||
21533 | lt_prog_compiler_static='-Bstatic' | ||
21534 | case $cc_basename in | ||
21535 | - f77* | f90* | f95*) | ||
21536 | + f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) | ||
21537 | lt_prog_compiler_wl='-Qoption ld ';; | ||
21538 | *) | ||
21539 | lt_prog_compiler_wl='-Wl,';; | ||
21540 | @@ -8778,13 +9288,17 @@ case $host_os in | ||
21541 | lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" | ||
21542 | ;; | ||
21543 | esac | ||
21544 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5 | ||
21545 | -$as_echo "$lt_prog_compiler_pic" >&6; } | ||
21546 | - | ||
21547 | - | ||
21548 | - | ||
21549 | - | ||
21550 | |||
21551 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 | ||
21552 | +$as_echo_n "checking for $compiler option to produce PIC... " >&6; } | ||
21553 | +if ${lt_cv_prog_compiler_pic+:} false; then : | ||
21554 | + $as_echo_n "(cached) " >&6 | ||
21555 | +else | ||
21556 | + lt_cv_prog_compiler_pic=$lt_prog_compiler_pic | ||
21557 | +fi | ||
21558 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5 | ||
21559 | +$as_echo "$lt_cv_prog_compiler_pic" >&6; } | ||
21560 | +lt_prog_compiler_pic=$lt_cv_prog_compiler_pic | ||
21561 | |||
21562 | # | ||
21563 | # Check to make sure the PIC flag actually works. | ||
21564 | @@ -8845,6 +9359,11 @@ fi | ||
21565 | |||
21566 | |||
21567 | |||
21568 | + | ||
21569 | + | ||
21570 | + | ||
21571 | + | ||
21572 | + | ||
21573 | # | ||
21574 | # Check to make sure the static flag actually works. | ||
21575 | # | ||
21576 | @@ -9195,7 +9714,8 @@ _LT_EOF | ||
21577 | allow_undefined_flag=unsupported | ||
21578 | always_export_symbols=no | ||
21579 | enable_shared_with_static_runtimes=yes | ||
21580 | - export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' | ||
21581 | + export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols' | ||
21582 | + exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' | ||
21583 | |||
21584 | if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then | ||
21585 | archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' | ||
21586 | @@ -9294,12 +9814,12 @@ _LT_EOF | ||
21587 | whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' | ||
21588 | hardcode_libdir_flag_spec= | ||
21589 | hardcode_libdir_flag_spec_ld='-rpath $libdir' | ||
21590 | - archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' | ||
21591 | + archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' | ||
21592 | if test "x$supports_anon_versioning" = xyes; then | ||
21593 | archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ | ||
21594 | cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ | ||
21595 | echo "local: *; };" >> $output_objdir/$libname.ver~ | ||
21596 | - $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' | ||
21597 | + $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' | ||
21598 | fi | ||
21599 | ;; | ||
21600 | esac | ||
21601 | @@ -9313,8 +9833,8 @@ _LT_EOF | ||
21602 | archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' | ||
21603 | wlarc= | ||
21604 | else | ||
21605 | - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' | ||
21606 | - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' | ||
21607 | + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' | ||
21608 | + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' | ||
21609 | fi | ||
21610 | ;; | ||
21611 | |||
21612 | @@ -9332,8 +9852,8 @@ _LT_EOF | ||
21613 | |||
21614 | _LT_EOF | ||
21615 | elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then | ||
21616 | - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' | ||
21617 | - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' | ||
21618 | + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' | ||
21619 | + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' | ||
21620 | else | ||
21621 | ld_shlibs=no | ||
21622 | fi | ||
21623 | @@ -9379,8 +9899,8 @@ _LT_EOF | ||
21624 | |||
21625 | *) | ||
21626 | if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then | ||
21627 | - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' | ||
21628 | - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' | ||
21629 | + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' | ||
21630 | + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' | ||
21631 | else | ||
21632 | ld_shlibs=no | ||
21633 | fi | ||
21634 | @@ -9510,7 +10030,13 @@ _LT_EOF | ||
21635 | allow_undefined_flag='-berok' | ||
21636 | # Determine the default libpath from the value encoded in an | ||
21637 | # empty executable. | ||
21638 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
21639 | + if test "${lt_cv_aix_libpath+set}" = set; then | ||
21640 | + aix_libpath=$lt_cv_aix_libpath | ||
21641 | +else | ||
21642 | + if ${lt_cv_aix_libpath_+:} false; then : | ||
21643 | + $as_echo_n "(cached) " >&6 | ||
21644 | +else | ||
21645 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
21646 | /* end confdefs.h. */ | ||
21647 | |||
21648 | int | ||
21649 | @@ -9523,22 +10049,29 @@ main () | ||
21650 | _ACEOF | ||
21651 | if ac_fn_c_try_link "$LINENO"; then : | ||
21652 | |||
21653 | -lt_aix_libpath_sed=' | ||
21654 | - /Import File Strings/,/^$/ { | ||
21655 | - /^0/ { | ||
21656 | - s/^0 *\(.*\)$/\1/ | ||
21657 | - p | ||
21658 | - } | ||
21659 | - }' | ||
21660 | -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | ||
21661 | -# Check for a 64-bit object if we didn't find anything. | ||
21662 | -if test -z "$aix_libpath"; then | ||
21663 | - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | ||
21664 | -fi | ||
21665 | + lt_aix_libpath_sed=' | ||
21666 | + /Import File Strings/,/^$/ { | ||
21667 | + /^0/ { | ||
21668 | + s/^0 *\([^ ]*\) *$/\1/ | ||
21669 | + p | ||
21670 | + } | ||
21671 | + }' | ||
21672 | + lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | ||
21673 | + # Check for a 64-bit object if we didn't find anything. | ||
21674 | + if test -z "$lt_cv_aix_libpath_"; then | ||
21675 | + lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | ||
21676 | + fi | ||
21677 | fi | ||
21678 | rm -f core conftest.err conftest.$ac_objext \ | ||
21679 | conftest$ac_exeext conftest.$ac_ext | ||
21680 | -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | ||
21681 | + if test -z "$lt_cv_aix_libpath_"; then | ||
21682 | + lt_cv_aix_libpath_="/usr/lib:/lib" | ||
21683 | + fi | ||
21684 | + | ||
21685 | +fi | ||
21686 | + | ||
21687 | + aix_libpath=$lt_cv_aix_libpath_ | ||
21688 | +fi | ||
21689 | |||
21690 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" | ||
21691 | 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" | ||
21692 | @@ -9550,7 +10083,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | ||
21693 | else | ||
21694 | # Determine the default libpath from the value encoded in an | ||
21695 | # empty executable. | ||
21696 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
21697 | + if test "${lt_cv_aix_libpath+set}" = set; then | ||
21698 | + aix_libpath=$lt_cv_aix_libpath | ||
21699 | +else | ||
21700 | + if ${lt_cv_aix_libpath_+:} false; then : | ||
21701 | + $as_echo_n "(cached) " >&6 | ||
21702 | +else | ||
21703 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
21704 | /* end confdefs.h. */ | ||
21705 | |||
21706 | int | ||
21707 | @@ -9563,22 +10102,29 @@ main () | ||
21708 | _ACEOF | ||
21709 | if ac_fn_c_try_link "$LINENO"; then : | ||
21710 | |||
21711 | -lt_aix_libpath_sed=' | ||
21712 | - /Import File Strings/,/^$/ { | ||
21713 | - /^0/ { | ||
21714 | - s/^0 *\(.*\)$/\1/ | ||
21715 | - p | ||
21716 | - } | ||
21717 | - }' | ||
21718 | -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | ||
21719 | -# Check for a 64-bit object if we didn't find anything. | ||
21720 | -if test -z "$aix_libpath"; then | ||
21721 | - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | ||
21722 | -fi | ||
21723 | + lt_aix_libpath_sed=' | ||
21724 | + /Import File Strings/,/^$/ { | ||
21725 | + /^0/ { | ||
21726 | + s/^0 *\([^ ]*\) *$/\1/ | ||
21727 | + p | ||
21728 | + } | ||
21729 | + }' | ||
21730 | + lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | ||
21731 | + # Check for a 64-bit object if we didn't find anything. | ||
21732 | + if test -z "$lt_cv_aix_libpath_"; then | ||
21733 | + lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | ||
21734 | + fi | ||
21735 | fi | ||
21736 | rm -f core conftest.err conftest.$ac_objext \ | ||
21737 | conftest$ac_exeext conftest.$ac_ext | ||
21738 | -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | ||
21739 | + if test -z "$lt_cv_aix_libpath_"; then | ||
21740 | + lt_cv_aix_libpath_="/usr/lib:/lib" | ||
21741 | + fi | ||
21742 | + | ||
21743 | +fi | ||
21744 | + | ||
21745 | + aix_libpath=$lt_cv_aix_libpath_ | ||
21746 | +fi | ||
21747 | |||
21748 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" | ||
21749 | # Warning - without using the other run time loading flags, | ||
21750 | @@ -9623,20 +10169,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | ||
21751 | # Microsoft Visual C++. | ||
21752 | # hardcode_libdir_flag_spec is actually meaningless, as there is | ||
21753 | # no search path for DLLs. | ||
21754 | - hardcode_libdir_flag_spec=' ' | ||
21755 | - allow_undefined_flag=unsupported | ||
21756 | - # Tell ltmain to make .lib files, not .a files. | ||
21757 | - libext=lib | ||
21758 | - # Tell ltmain to make .dll files, not .so files. | ||
21759 | - shrext_cmds=".dll" | ||
21760 | - # FIXME: Setting linknames here is a bad hack. | ||
21761 | - archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' | ||
21762 | - # The linker will automatically build a .lib file if we build a DLL. | ||
21763 | - old_archive_from_new_cmds='true' | ||
21764 | - # FIXME: Should let the user specify the lib program. | ||
21765 | - old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' | ||
21766 | - fix_srcfile_path='`cygpath -w "$srcfile"`' | ||
21767 | - enable_shared_with_static_runtimes=yes | ||
21768 | + case $cc_basename in | ||
21769 | + cl*) | ||
21770 | + # Native MSVC | ||
21771 | + hardcode_libdir_flag_spec=' ' | ||
21772 | + allow_undefined_flag=unsupported | ||
21773 | + always_export_symbols=yes | ||
21774 | + file_list_spec='@' | ||
21775 | + # Tell ltmain to make .lib files, not .a files. | ||
21776 | + libext=lib | ||
21777 | + # Tell ltmain to make .dll files, not .so files. | ||
21778 | + shrext_cmds=".dll" | ||
21779 | + # FIXME: Setting linknames here is a bad hack. | ||
21780 | + archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' | ||
21781 | + archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then | ||
21782 | + sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; | ||
21783 | + else | ||
21784 | + sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; | ||
21785 | + fi~ | ||
21786 | + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ | ||
21787 | + linknames=' | ||
21788 | + # The linker will not automatically build a static lib if we build a DLL. | ||
21789 | + # _LT_TAGVAR(old_archive_from_new_cmds, )='true' | ||
21790 | + enable_shared_with_static_runtimes=yes | ||
21791 | + export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' | ||
21792 | + # Don't use ranlib | ||
21793 | + old_postinstall_cmds='chmod 644 $oldlib' | ||
21794 | + postlink_cmds='lt_outputfile="@OUTPUT@"~ | ||
21795 | + lt_tool_outputfile="@TOOL_OUTPUT@"~ | ||
21796 | + case $lt_outputfile in | ||
21797 | + *.exe|*.EXE) ;; | ||
21798 | + *) | ||
21799 | + lt_outputfile="$lt_outputfile.exe" | ||
21800 | + lt_tool_outputfile="$lt_tool_outputfile.exe" | ||
21801 | + ;; | ||
21802 | + esac~ | ||
21803 | + if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then | ||
21804 | + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; | ||
21805 | + $RM "$lt_outputfile.manifest"; | ||
21806 | + fi' | ||
21807 | + ;; | ||
21808 | + *) | ||
21809 | + # Assume MSVC wrapper | ||
21810 | + hardcode_libdir_flag_spec=' ' | ||
21811 | + allow_undefined_flag=unsupported | ||
21812 | + # Tell ltmain to make .lib files, not .a files. | ||
21813 | + libext=lib | ||
21814 | + # Tell ltmain to make .dll files, not .so files. | ||
21815 | + shrext_cmds=".dll" | ||
21816 | + # FIXME: Setting linknames here is a bad hack. | ||
21817 | + archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' | ||
21818 | + # The linker will automatically build a .lib file if we build a DLL. | ||
21819 | + old_archive_from_new_cmds='true' | ||
21820 | + # FIXME: Should let the user specify the lib program. | ||
21821 | + old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' | ||
21822 | + enable_shared_with_static_runtimes=yes | ||
21823 | + ;; | ||
21824 | + esac | ||
21825 | ;; | ||
21826 | |||
21827 | darwin* | rhapsody*) | ||
21828 | @@ -9697,7 +10286,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | ||
21829 | |||
21830 | # FreeBSD 3 and greater uses gcc -shared to do shared libraries. | ||
21831 | freebsd* | dragonfly*) | ||
21832 | - archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' | ||
21833 | + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' | ||
21834 | hardcode_libdir_flag_spec='-R$libdir' | ||
21835 | hardcode_direct=yes | ||
21836 | hardcode_shlibpath_var=no | ||
21837 | @@ -9705,7 +10294,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | ||
21838 | |||
21839 | hpux9*) | ||
21840 | if test "$GCC" = yes; then | ||
21841 | - archive_cmds='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' | ||
21842 | + archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' | ||
21843 | else | ||
21844 | 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' | ||
21845 | fi | ||
21846 | @@ -9721,7 +10310,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | ||
21847 | |||
21848 | hpux10*) | ||
21849 | if test "$GCC" = yes && test "$with_gnu_ld" = no; then | ||
21850 | - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' | ||
21851 | + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' | ||
21852 | else | ||
21853 | archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' | ||
21854 | fi | ||
21855 | @@ -9745,10 +10334,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | ||
21856 | archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' | ||
21857 | ;; | ||
21858 | ia64*) | ||
21859 | - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' | ||
21860 | + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' | ||
21861 | ;; | ||
21862 | *) | ||
21863 | - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' | ||
21864 | + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' | ||
21865 | ;; | ||
21866 | esac | ||
21867 | else | ||
21868 | @@ -9827,23 +10416,36 @@ fi | ||
21869 | |||
21870 | irix5* | irix6* | nonstopux*) | ||
21871 | if test "$GCC" = yes; then | ||
21872 | - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' | ||
21873 | + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' | ||
21874 | # Try to use the -exported_symbol ld option, if it does not | ||
21875 | # work, assume that -exports_file does not work either and | ||
21876 | # implicitly export all symbols. | ||
21877 | - save_LDFLAGS="$LDFLAGS" | ||
21878 | - LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" | ||
21879 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
21880 | + # This should be the same for all languages, so no per-tag cache variable. | ||
21881 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5 | ||
21882 | +$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; } | ||
21883 | +if ${lt_cv_irix_exported_symbol+:} false; then : | ||
21884 | + $as_echo_n "(cached) " >&6 | ||
21885 | +else | ||
21886 | + save_LDFLAGS="$LDFLAGS" | ||
21887 | + LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" | ||
21888 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
21889 | /* end confdefs.h. */ | ||
21890 | -int foo(void) {} | ||
21891 | +int foo (void) { return 0; } | ||
21892 | _ACEOF | ||
21893 | if ac_fn_c_try_link "$LINENO"; then : | ||
21894 | - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' | ||
21895 | - | ||
21896 | + lt_cv_irix_exported_symbol=yes | ||
21897 | +else | ||
21898 | + lt_cv_irix_exported_symbol=no | ||
21899 | fi | ||
21900 | rm -f core conftest.err conftest.$ac_objext \ | ||
21901 | conftest$ac_exeext conftest.$ac_ext | ||
21902 | - LDFLAGS="$save_LDFLAGS" | ||
21903 | + LDFLAGS="$save_LDFLAGS" | ||
21904 | +fi | ||
21905 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5 | ||
21906 | +$as_echo "$lt_cv_irix_exported_symbol" >&6; } | ||
21907 | + if test "$lt_cv_irix_exported_symbol" = yes; then | ||
21908 | + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' | ||
21909 | + fi | ||
21910 | else | ||
21911 | 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' | ||
21912 | 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' | ||
21913 | @@ -9928,7 +10530,7 @@ rm -f core conftest.err conftest.$ac_objext \ | ||
21914 | osf4* | osf5*) # as osf3* with the addition of -msym flag | ||
21915 | if test "$GCC" = yes; then | ||
21916 | allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' | ||
21917 | - archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' | ||
21918 | + archive_cmds='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' | ||
21919 | hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' | ||
21920 | else | ||
21921 | allow_undefined_flag=' -expect_unresolved \*' | ||
21922 | @@ -9947,9 +10549,9 @@ rm -f core conftest.err conftest.$ac_objext \ | ||
21923 | no_undefined_flag=' -z defs' | ||
21924 | if test "$GCC" = yes; then | ||
21925 | wlarc='${wl}' | ||
21926 | - archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' | ||
21927 | + archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' | ||
21928 | archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ | ||
21929 | - $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' | ||
21930 | + $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' | ||
21931 | else | ||
21932 | case `$CC -V 2>&1` in | ||
21933 | *"Compilers 5.0"*) | ||
21934 | @@ -10525,8 +11127,9 @@ cygwin* | mingw* | pw32* | cegcc*) | ||
21935 | need_version=no | ||
21936 | need_lib_prefix=no | ||
21937 | |||
21938 | - case $GCC,$host_os in | ||
21939 | - yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) | ||
21940 | + case $GCC,$cc_basename in | ||
21941 | + yes,*) | ||
21942 | + # gcc | ||
21943 | library_names_spec='$libname.dll.a' | ||
21944 | # DLL is installed to $(libdir)/../bin by postinstall_cmds | ||
21945 | postinstall_cmds='base_file=`basename \${file}`~ | ||
21946 | @@ -10559,13 +11162,71 @@ cygwin* | mingw* | pw32* | cegcc*) | ||
21947 | library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' | ||
21948 | ;; | ||
21949 | esac | ||
21950 | + dynamic_linker='Win32 ld.exe' | ||
21951 | + ;; | ||
21952 | + | ||
21953 | + *,cl*) | ||
21954 | + # Native MSVC | ||
21955 | + libname_spec='$name' | ||
21956 | + soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' | ||
21957 | + library_names_spec='${libname}.dll.lib' | ||
21958 | + | ||
21959 | + case $build_os in | ||
21960 | + mingw*) | ||
21961 | + sys_lib_search_path_spec= | ||
21962 | + lt_save_ifs=$IFS | ||
21963 | + IFS=';' | ||
21964 | + for lt_path in $LIB | ||
21965 | + do | ||
21966 | + IFS=$lt_save_ifs | ||
21967 | + # Let DOS variable expansion print the short 8.3 style file name. | ||
21968 | + lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` | ||
21969 | + sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" | ||
21970 | + done | ||
21971 | + IFS=$lt_save_ifs | ||
21972 | + # Convert to MSYS style. | ||
21973 | + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` | ||
21974 | + ;; | ||
21975 | + cygwin*) | ||
21976 | + # Convert to unix form, then to dos form, then back to unix form | ||
21977 | + # but this time dos style (no spaces!) so that the unix form looks | ||
21978 | + # like /cygdrive/c/PROGRA~1:/cygdr... | ||
21979 | + sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` | ||
21980 | + sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` | ||
21981 | + sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` | ||
21982 | + ;; | ||
21983 | + *) | ||
21984 | + sys_lib_search_path_spec="$LIB" | ||
21985 | + if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then | ||
21986 | + # It is most probably a Windows format PATH. | ||
21987 | + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` | ||
21988 | + else | ||
21989 | + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` | ||
21990 | + fi | ||
21991 | + # FIXME: find the short name or the path components, as spaces are | ||
21992 | + # common. (e.g. "Program Files" -> "PROGRA~1") | ||
21993 | + ;; | ||
21994 | + esac | ||
21995 | + | ||
21996 | + # DLL is installed to $(libdir)/../bin by postinstall_cmds | ||
21997 | + postinstall_cmds='base_file=`basename \${file}`~ | ||
21998 | + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ | ||
21999 | + dldir=$destdir/`dirname \$dlpath`~ | ||
22000 | + test -d \$dldir || mkdir -p \$dldir~ | ||
22001 | + $install_prog $dir/$dlname \$dldir/$dlname' | ||
22002 | + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ | ||
22003 | + dlpath=$dir/\$dldll~ | ||
22004 | + $RM \$dlpath' | ||
22005 | + shlibpath_overrides_runpath=yes | ||
22006 | + dynamic_linker='Win32 link.exe' | ||
22007 | ;; | ||
22008 | |||
22009 | *) | ||
22010 | + # Assume MSVC wrapper | ||
22011 | library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' | ||
22012 | + dynamic_linker='Win32 ld.exe' | ||
22013 | ;; | ||
22014 | esac | ||
22015 | - dynamic_linker='Win32 ld.exe' | ||
22016 | # FIXME: first we should search . and the directory the executable is in | ||
22017 | shlibpath_var=PATH | ||
22018 | ;; | ||
22019 | @@ -11443,7 +12104,7 @@ else | ||
22020 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 | ||
22021 | lt_status=$lt_dlunknown | ||
22022 | cat > conftest.$ac_ext <<_LT_EOF | ||
22023 | -#line 11446 "configure" | ||
22024 | +#line $LINENO "configure" | ||
22025 | #include "confdefs.h" | ||
22026 | |||
22027 | #if HAVE_DLFCN_H | ||
22028 | @@ -11487,10 +12148,10 @@ else | ||
22029 | /* When -fvisbility=hidden is used, assume the code has been annotated | ||
22030 | correspondingly for the symbols needed. */ | ||
22031 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) | ||
22032 | -void fnord () __attribute__((visibility("default"))); | ||
22033 | +int fnord () __attribute__((visibility("default"))); | ||
22034 | #endif | ||
22035 | |||
22036 | -void fnord () { int i=42; } | ||
22037 | +int fnord () { return 42; } | ||
22038 | int main () | ||
22039 | { | ||
22040 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); | ||
22041 | @@ -11549,7 +12210,7 @@ else | ||
22042 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 | ||
22043 | lt_status=$lt_dlunknown | ||
22044 | cat > conftest.$ac_ext <<_LT_EOF | ||
22045 | -#line 11552 "configure" | ||
22046 | +#line $LINENO "configure" | ||
22047 | #include "confdefs.h" | ||
22048 | |||
22049 | #if HAVE_DLFCN_H | ||
22050 | @@ -11593,10 +12254,10 @@ else | ||
22051 | /* When -fvisbility=hidden is used, assume the code has been annotated | ||
22052 | correspondingly for the symbols needed. */ | ||
22053 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) | ||
22054 | -void fnord () __attribute__((visibility("default"))); | ||
22055 | +int fnord () __attribute__((visibility("default"))); | ||
22056 | #endif | ||
22057 | |||
22058 | -void fnord () { int i=42; } | ||
22059 | +int fnord () { return 42; } | ||
22060 | int main () | ||
22061 | { | ||
22062 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); | ||
22063 | @@ -13361,7 +14022,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 | ||
22064 | # | ||
22065 | # INIT-COMMANDS | ||
22066 | # | ||
22067 | -AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir" | ||
22068 | +AMDEP_TRUE="$AMDEP_TRUE" MAKE="${MAKE-make}" | ||
22069 | |||
22070 | |||
22071 | # The HP-UX ksh and POSIX shell print the target directory to stdout | ||
22072 | @@ -13399,13 +14060,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' | ||
22073 | lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' | ||
22074 | lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' | ||
22075 | lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' | ||
22076 | +lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`' | ||
22077 | +lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`' | ||
22078 | reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`' | ||
22079 | reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`' | ||
22080 | OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`' | ||
22081 | deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`' | ||
22082 | file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`' | ||
22083 | +file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`' | ||
22084 | +want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`' | ||
22085 | +DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`' | ||
22086 | +sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`' | ||
22087 | AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`' | ||
22088 | AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`' | ||
22089 | +archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`' | ||
22090 | STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' | ||
22091 | RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' | ||
22092 | old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' | ||
22093 | @@ -13420,14 +14088,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de | ||
22094 | lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' | ||
22095 | lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' | ||
22096 | 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"`' | ||
22097 | +nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`' | ||
22098 | +lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`' | ||
22099 | objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`' | ||
22100 | MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`' | ||
22101 | lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`' | ||
22102 | -lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' | ||
22103 | lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`' | ||
22104 | +lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' | ||
22105 | lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`' | ||
22106 | lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`' | ||
22107 | need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`' | ||
22108 | +MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`' | ||
22109 | DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' | ||
22110 | NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' | ||
22111 | LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' | ||
22112 | @@ -13460,12 +14131,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q | ||
22113 | hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' | ||
22114 | inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' | ||
22115 | link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' | ||
22116 | -fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`' | ||
22117 | always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`' | ||
22118 | export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`' | ||
22119 | exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`' | ||
22120 | include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`' | ||
22121 | prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`' | ||
22122 | +postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`' | ||
22123 | file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' | ||
22124 | variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' | ||
22125 | need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' | ||
22126 | @@ -13520,8 +14191,13 @@ reload_flag \ | ||
22127 | OBJDUMP \ | ||
22128 | deplibs_check_method \ | ||
22129 | file_magic_cmd \ | ||
22130 | +file_magic_glob \ | ||
22131 | +want_nocaseglob \ | ||
22132 | +DLLTOOL \ | ||
22133 | +sharedlib_from_linklib_cmd \ | ||
22134 | AR \ | ||
22135 | AR_FLAGS \ | ||
22136 | +archiver_list_spec \ | ||
22137 | STRIP \ | ||
22138 | RANLIB \ | ||
22139 | CC \ | ||
22140 | @@ -13531,12 +14207,14 @@ lt_cv_sys_global_symbol_pipe \ | ||
22141 | lt_cv_sys_global_symbol_to_cdecl \ | ||
22142 | lt_cv_sys_global_symbol_to_c_name_address \ | ||
22143 | lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ | ||
22144 | +nm_file_list_spec \ | ||
22145 | lt_prog_compiler_no_builtin_flag \ | ||
22146 | -lt_prog_compiler_wl \ | ||
22147 | lt_prog_compiler_pic \ | ||
22148 | +lt_prog_compiler_wl \ | ||
22149 | lt_prog_compiler_static \ | ||
22150 | lt_cv_prog_compiler_c_o \ | ||
22151 | need_locks \ | ||
22152 | +MANIFEST_TOOL \ | ||
22153 | DSYMUTIL \ | ||
22154 | NMEDIT \ | ||
22155 | LIPO \ | ||
22156 | @@ -13552,7 +14230,6 @@ no_undefined_flag \ | ||
22157 | hardcode_libdir_flag_spec \ | ||
22158 | hardcode_libdir_flag_spec_ld \ | ||
22159 | hardcode_libdir_separator \ | ||
22160 | -fix_srcfile_path \ | ||
22161 | exclude_expsyms \ | ||
22162 | include_expsyms \ | ||
22163 | file_list_spec \ | ||
22164 | @@ -13588,6 +14265,7 @@ module_cmds \ | ||
22165 | module_expsym_cmds \ | ||
22166 | export_symbols_cmds \ | ||
22167 | prelink_cmds \ | ||
22168 | +postlink_cmds \ | ||
22169 | postinstall_cmds \ | ||
22170 | postuninstall_cmds \ | ||
22171 | finish_cmds \ | ||
22172 | @@ -14234,29 +14912,35 @@ $as_echo "$as_me: executing $ac_file commands" >&6;} | ||
22173 | # Older Autoconf quotes --file arguments for eval, but not when files | ||
22174 | # are listed without --file. Let's play safe and only enable the eval | ||
22175 | # if we detect the quoting. | ||
22176 | - case $CONFIG_FILES in | ||
22177 | - *\'*) eval set x "$CONFIG_FILES" ;; | ||
22178 | - *) set x $CONFIG_FILES ;; | ||
22179 | - esac | ||
22180 | + # TODO: see whether this extra hack can be removed once we start | ||
22181 | + # requiring Autoconf 2.70 or later. | ||
22182 | + case $CONFIG_FILES in #( | ||
22183 | + *\'*) : | ||
22184 | + eval set x "$CONFIG_FILES" ;; #( | ||
22185 | + *) : | ||
22186 | + set x $CONFIG_FILES ;; #( | ||
22187 | + *) : | ||
22188 | + ;; | ||
22189 | +esac | ||
22190 | shift | ||
22191 | - for mf | ||
22192 | + # Used to flag and report bootstrapping failures. | ||
22193 | + am_rc=0 | ||
22194 | + for am_mf | ||
22195 | do | ||
22196 | # Strip MF so we end up with the name of the file. | ||
22197 | - mf=`echo "$mf" | sed -e 's/:.*$//'` | ||
22198 | - # Check whether this is an Automake generated Makefile or not. | ||
22199 | - # We used to match only the files named 'Makefile.in', but | ||
22200 | - # some people rename them; so instead we look at the file content. | ||
22201 | - # Grep'ing the first line is not enough: some people post-process | ||
22202 | - # each Makefile.in and add a new line on top of each file to say so. | ||
22203 | - # Grep'ing the whole file is not good either: AIX grep has a line | ||
22204 | + am_mf=`$as_echo "$am_mf" | sed -e 's/:.*$//'` | ||
22205 | + # Check whether this is an Automake generated Makefile which includes | ||
22206 | + # dependency-tracking related rules and includes. | ||
22207 | + # Grep'ing the whole file directly is not great: AIX grep has a line | ||
22208 | # limit of 2048, but all sed's we know have understand at least 4000. | ||
22209 | - if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then | ||
22210 | - dirpart=`$as_dirname -- "$mf" || | ||
22211 | -$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ | ||
22212 | - X"$mf" : 'X\(//\)[^/]' \| \ | ||
22213 | - X"$mf" : 'X\(//\)$' \| \ | ||
22214 | - X"$mf" : 'X\(/\)' \| . 2>/dev/null || | ||
22215 | -$as_echo X"$mf" | | ||
22216 | + sed -n 's,^am--depfiles:.*,X,p' "$am_mf" | grep X >/dev/null 2>&1 \ | ||
22217 | + || continue | ||
22218 | + am_dirpart=`$as_dirname -- "$am_mf" || | ||
22219 | +$as_expr X"$am_mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ | ||
22220 | + X"$am_mf" : 'X\(//\)[^/]' \| \ | ||
22221 | + X"$am_mf" : 'X\(//\)$' \| \ | ||
22222 | + X"$am_mf" : 'X\(/\)' \| . 2>/dev/null || | ||
22223 | +$as_echo X"$am_mf" | | ||
22224 | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ | ||
22225 | s//\1/ | ||
22226 | q | ||
22227 | @@ -14274,53 +14958,50 @@ $as_echo X"$mf" | | ||
22228 | q | ||
22229 | } | ||
22230 | s/.*/./; q'` | ||
22231 | - else | ||
22232 | - continue | ||
22233 | - fi | ||
22234 | - # Extract the definition of DEPDIR, am__include, and am__quote | ||
22235 | - # from the Makefile without running 'make'. | ||
22236 | - DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` | ||
22237 | - test -z "$DEPDIR" && continue | ||
22238 | - am__include=`sed -n 's/^am__include = //p' < "$mf"` | ||
22239 | - test -z "$am__include" && continue | ||
22240 | - am__quote=`sed -n 's/^am__quote = //p' < "$mf"` | ||
22241 | - # Find all dependency output files, they are included files with | ||
22242 | - # $(DEPDIR) in their names. We invoke sed twice because it is the | ||
22243 | - # simplest approach to changing $(DEPDIR) to its actual value in the | ||
22244 | - # expansion. | ||
22245 | - for file in `sed -n " | ||
22246 | - s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ | ||
22247 | - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do | ||
22248 | - # Make sure the directory exists. | ||
22249 | - test -f "$dirpart/$file" && continue | ||
22250 | - fdir=`$as_dirname -- "$file" || | ||
22251 | -$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ | ||
22252 | - X"$file" : 'X\(//\)[^/]' \| \ | ||
22253 | - X"$file" : 'X\(//\)$' \| \ | ||
22254 | - X"$file" : 'X\(/\)' \| . 2>/dev/null || | ||
22255 | -$as_echo X"$file" | | ||
22256 | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ | ||
22257 | - s//\1/ | ||
22258 | - q | ||
22259 | - } | ||
22260 | - /^X\(\/\/\)[^/].*/{ | ||
22261 | + am_filepart=`$as_basename -- "$am_mf" || | ||
22262 | +$as_expr X/"$am_mf" : '.*/\([^/][^/]*\)/*$' \| \ | ||
22263 | + X"$am_mf" : 'X\(//\)$' \| \ | ||
22264 | + X"$am_mf" : 'X\(/\)' \| . 2>/dev/null || | ||
22265 | +$as_echo X/"$am_mf" | | ||
22266 | + sed '/^.*\/\([^/][^/]*\)\/*$/{ | ||
22267 | s//\1/ | ||
22268 | q | ||
22269 | } | ||
22270 | - /^X\(\/\/\)$/{ | ||
22271 | + /^X\/\(\/\/\)$/{ | ||
22272 | s//\1/ | ||
22273 | q | ||
22274 | } | ||
22275 | - /^X\(\/\).*/{ | ||
22276 | + /^X\/\(\/\).*/{ | ||
22277 | s//\1/ | ||
22278 | q | ||
22279 | } | ||
22280 | s/.*/./; q'` | ||
22281 | - as_dir=$dirpart/$fdir; as_fn_mkdir_p | ||
22282 | - # echo "creating $dirpart/$file" | ||
22283 | - echo '# dummy' > "$dirpart/$file" | ||
22284 | - done | ||
22285 | + { echo "$as_me:$LINENO: cd "$am_dirpart" \ | ||
22286 | + && sed -e '/# am--include-marker/d' "$am_filepart" \ | ||
22287 | + | $MAKE -f - am--depfiles" >&5 | ||
22288 | + (cd "$am_dirpart" \ | ||
22289 | + && sed -e '/# am--include-marker/d' "$am_filepart" \ | ||
22290 | + | $MAKE -f - am--depfiles) >&5 2>&5 | ||
22291 | + ac_status=$? | ||
22292 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
22293 | + (exit $ac_status); } || am_rc=$? | ||
22294 | done | ||
22295 | + if test $am_rc -ne 0; then | ||
22296 | + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 | ||
22297 | +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} | ||
22298 | +as_fn_error $? "Something went wrong bootstrapping makefile fragments | ||
22299 | + for automatic dependency tracking. If GNU make was not used, consider | ||
22300 | + re-running the configure script with MAKE=\"gmake\" (or whatever is | ||
22301 | + necessary). You can also try re-running configure with the | ||
22302 | + '--disable-dependency-tracking' option to at least be able to build | ||
22303 | + the package (albeit without support for automatic dependency tracking). | ||
22304 | +See \`config.log' for more details" "$LINENO" 5; } | ||
22305 | + fi | ||
22306 | + { am_dirpart=; unset am_dirpart;} | ||
22307 | + { am_filepart=; unset am_filepart;} | ||
22308 | + { am_mf=; unset am_mf;} | ||
22309 | + { am_rc=; unset am_rc;} | ||
22310 | + rm -f conftest-deps.mk | ||
22311 | } | ||
22312 | ;; | ||
22313 | "libtool":C) | ||
22314 | @@ -14344,7 +15025,8 @@ $as_echo X"$file" | | ||
22315 | # NOTE: Changes made to this file will be lost: look at ltmain.sh. | ||
22316 | # | ||
22317 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, | ||
22318 | -# 2006, 2007, 2008, 2009 Free Software Foundation, Inc. | ||
22319 | +# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, | ||
22320 | +# Inc. | ||
22321 | # Written by Gordon Matzigkeit, 1996 | ||
22322 | # | ||
22323 | # This file is part of GNU Libtool. | ||
22324 | @@ -14447,19 +15129,42 @@ SP2NL=$lt_lt_SP2NL | ||
22325 | # turn newlines into spaces. | ||
22326 | NL2SP=$lt_lt_NL2SP | ||
22327 | |||
22328 | +# convert \$build file names to \$host format. | ||
22329 | +to_host_file_cmd=$lt_cv_to_host_file_cmd | ||
22330 | + | ||
22331 | +# convert \$build files to toolchain format. | ||
22332 | +to_tool_file_cmd=$lt_cv_to_tool_file_cmd | ||
22333 | + | ||
22334 | # An object symbol dumper. | ||
22335 | OBJDUMP=$lt_OBJDUMP | ||
22336 | |||
22337 | # Method to check whether dependent libraries are shared objects. | ||
22338 | deplibs_check_method=$lt_deplibs_check_method | ||
22339 | |||
22340 | -# Command to use when deplibs_check_method == "file_magic". | ||
22341 | +# Command to use when deplibs_check_method = "file_magic". | ||
22342 | file_magic_cmd=$lt_file_magic_cmd | ||
22343 | |||
22344 | +# How to find potential files when deplibs_check_method = "file_magic". | ||
22345 | +file_magic_glob=$lt_file_magic_glob | ||
22346 | + | ||
22347 | +# Find potential files using nocaseglob when deplibs_check_method = "file_magic". | ||
22348 | +want_nocaseglob=$lt_want_nocaseglob | ||
22349 | + | ||
22350 | +# DLL creation program. | ||
22351 | +DLLTOOL=$lt_DLLTOOL | ||
22352 | + | ||
22353 | +# Command to associate shared and link libraries. | ||
22354 | +sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd | ||
22355 | + | ||
22356 | # The archiver. | ||
22357 | AR=$lt_AR | ||
22358 | + | ||
22359 | +# Flags to create an archive. | ||
22360 | AR_FLAGS=$lt_AR_FLAGS | ||
22361 | |||
22362 | +# How to feed a file listing to the archiver. | ||
22363 | +archiver_list_spec=$lt_archiver_list_spec | ||
22364 | + | ||
22365 | # A symbol stripping program. | ||
22366 | STRIP=$lt_STRIP | ||
22367 | |||
22368 | @@ -14489,6 +15194,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address | ||
22369 | # Transform the output of nm in a C name address pair when lib prefix is needed. | ||
22370 | global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix | ||
22371 | |||
22372 | +# Specify filename containing input files for \$NM. | ||
22373 | +nm_file_list_spec=$lt_nm_file_list_spec | ||
22374 | + | ||
22375 | +# The root where to search for dependent libraries,and in which our libraries should be installed. | ||
22376 | +lt_sysroot=$lt_sysroot | ||
22377 | + | ||
22378 | # The name of the directory that contains temporary libtool files. | ||
22379 | objdir=$objdir | ||
22380 | |||
22381 | @@ -14498,6 +15209,9 @@ MAGIC_CMD=$MAGIC_CMD | ||
22382 | # Must we lock files when doing compilation? | ||
22383 | need_locks=$lt_need_locks | ||
22384 | |||
22385 | +# Manifest tool. | ||
22386 | +MANIFEST_TOOL=$lt_MANIFEST_TOOL | ||
22387 | + | ||
22388 | # Tool to manipulate archived DWARF debug symbol files on Mac OS X. | ||
22389 | DSYMUTIL=$lt_DSYMUTIL | ||
22390 | |||
22391 | @@ -14612,12 +15326,12 @@ with_gcc=$GCC | ||
22392 | # Compiler flag to turn off builtin functions. | ||
22393 | no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag | ||
22394 | |||
22395 | -# How to pass a linker flag through the compiler. | ||
22396 | -wl=$lt_lt_prog_compiler_wl | ||
22397 | - | ||
22398 | # Additional compiler flags for building library objects. | ||
22399 | pic_flag=$lt_lt_prog_compiler_pic | ||
22400 | |||
22401 | +# How to pass a linker flag through the compiler. | ||
22402 | +wl=$lt_lt_prog_compiler_wl | ||
22403 | + | ||
22404 | # Compiler flag to prevent dynamic linking. | ||
22405 | link_static_flag=$lt_lt_prog_compiler_static | ||
22406 | |||
22407 | @@ -14704,9 +15418,6 @@ inherit_rpath=$inherit_rpath | ||
22408 | # Whether libtool must link a program against all its dependency libraries. | ||
22409 | link_all_deplibs=$link_all_deplibs | ||
22410 | |||
22411 | -# Fix the shell variable \$srcfile for the compiler. | ||
22412 | -fix_srcfile_path=$lt_fix_srcfile_path | ||
22413 | - | ||
22414 | # Set to "yes" if exported symbols are required. | ||
22415 | always_export_symbols=$always_export_symbols | ||
22416 | |||
22417 | @@ -14722,6 +15433,9 @@ include_expsyms=$lt_include_expsyms | ||
22418 | # Commands necessary for linking programs (against libraries) with templates. | ||
22419 | prelink_cmds=$lt_prelink_cmds | ||
22420 | |||
22421 | +# Commands necessary for finishing linking programs. | ||
22422 | +postlink_cmds=$lt_postlink_cmds | ||
22423 | + | ||
22424 | # Specify filename containing input files. | ||
22425 | file_list_spec=$lt_file_list_spec | ||
22426 | |||
22427 | @@ -14754,210 +15468,169 @@ ltmain="$ac_aux_dir/ltmain.sh" | ||
19273 | # if finds mixed CR/LF and LF-only lines. Since sed operates in | 22428 | # if finds mixed CR/LF and LF-only lines. Since sed operates in |
19274 | # text mode, it properly converts lines to CR/LF. This bash problem | 22429 | # text mode, it properly converts lines to CR/LF. This bash problem |
19275 | # is reportedly fixed, but why not run on old versions too? | 22430 | # is reportedly fixed, but why not run on old versions too? |
@@ -26723,7 +29878,7 @@ index bf92b5e0790..c573da90c5c 100644 | |||
26723 | # These exist entirely to fool aclocal when bootstrapping libtool. | 29878 | # These exist entirely to fool aclocal when bootstrapping libtool. |
26724 | # | 29879 | # |
26725 | diff --git a/opcodes/Makefile.in b/opcodes/Makefile.in | 29880 | diff --git a/opcodes/Makefile.in b/opcodes/Makefile.in |
26726 | index 2257b0872af..73aae3b210f 100644 | 29881 | index c1eca5a42ed..7cab295b26d 100644 |
26727 | --- a/opcodes/Makefile.in | 29882 | --- a/opcodes/Makefile.in |
26728 | +++ b/opcodes/Makefile.in | 29883 | +++ b/opcodes/Makefile.in |
26729 | @@ -292,6 +292,7 @@ CYGPATH_W = @CYGPATH_W@ | 29884 | @@ -292,6 +292,7 @@ CYGPATH_W = @CYGPATH_W@ |
@@ -26751,7 +29906,7 @@ index 2257b0872af..73aae3b210f 100644 | |||
26751 | ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ | 29906 | ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ |
26752 | am__include = @am__include@ | 29907 | am__include = @am__include@ |
26753 | diff --git a/opcodes/configure b/opcodes/configure | 29908 | diff --git a/opcodes/configure b/opcodes/configure |
26754 | index db023b48c28..c562aada2a4 100755 | 29909 | index 483ae4f7a9c..907807594f9 100755 |
26755 | --- a/opcodes/configure | 29910 | --- a/opcodes/configure |
26756 | +++ b/opcodes/configure | 29911 | +++ b/opcodes/configure |
26757 | @@ -682,6 +682,9 @@ OTOOL | 29912 | @@ -682,6 +682,9 @@ OTOOL |
@@ -28075,7 +31230,7 @@ index db023b48c28..c562aada2a4 100755 | |||
28075 | int main () | 31230 | int main () |
28076 | { | 31231 | { |
28077 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); | 31232 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); |
28078 | @@ -13396,13 +14046,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' | 31233 | @@ -13414,13 +14064,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' |
28079 | lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' | 31234 | lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' |
28080 | lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' | 31235 | lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' |
28081 | lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' | 31236 | lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' |
@@ -28096,7 +31251,7 @@ index db023b48c28..c562aada2a4 100755 | |||
28096 | STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' | 31251 | STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' |
28097 | RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' | 31252 | RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' |
28098 | old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' | 31253 | old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' |
28099 | @@ -13417,14 +14074,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de | 31254 | @@ -13435,14 +14092,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de |
28100 | lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' | 31255 | lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' |
28101 | lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' | 31256 | lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' |
28102 | lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`' | 31257 | 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"`' |
@@ -28115,7 +31270,7 @@ index db023b48c28..c562aada2a4 100755 | |||
28115 | DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' | 31270 | DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' |
28116 | NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' | 31271 | NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' |
28117 | LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' | 31272 | LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' |
28118 | @@ -13457,12 +14117,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q | 31273 | @@ -13475,12 +14135,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q |
28119 | hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' | 31274 | hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' |
28120 | inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' | 31275 | inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' |
28121 | link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' | 31276 | link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' |
@@ -28129,7 +31284,7 @@ index db023b48c28..c562aada2a4 100755 | |||
28129 | file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' | 31284 | file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' |
28130 | variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' | 31285 | variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' |
28131 | need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' | 31286 | need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' |
28132 | @@ -13517,8 +14177,13 @@ reload_flag \ | 31287 | @@ -13535,8 +14195,13 @@ reload_flag \ |
28133 | OBJDUMP \ | 31288 | OBJDUMP \ |
28134 | deplibs_check_method \ | 31289 | deplibs_check_method \ |
28135 | file_magic_cmd \ | 31290 | file_magic_cmd \ |
@@ -28143,7 +31298,7 @@ index db023b48c28..c562aada2a4 100755 | |||
28143 | STRIP \ | 31298 | STRIP \ |
28144 | RANLIB \ | 31299 | RANLIB \ |
28145 | CC \ | 31300 | CC \ |
28146 | @@ -13528,12 +14193,14 @@ lt_cv_sys_global_symbol_pipe \ | 31301 | @@ -13546,12 +14211,14 @@ lt_cv_sys_global_symbol_pipe \ |
28147 | lt_cv_sys_global_symbol_to_cdecl \ | 31302 | lt_cv_sys_global_symbol_to_cdecl \ |
28148 | lt_cv_sys_global_symbol_to_c_name_address \ | 31303 | lt_cv_sys_global_symbol_to_c_name_address \ |
28149 | lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ | 31304 | lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ |
@@ -28159,7 +31314,7 @@ index db023b48c28..c562aada2a4 100755 | |||
28159 | DSYMUTIL \ | 31314 | DSYMUTIL \ |
28160 | NMEDIT \ | 31315 | NMEDIT \ |
28161 | LIPO \ | 31316 | LIPO \ |
28162 | @@ -13549,7 +14216,6 @@ no_undefined_flag \ | 31317 | @@ -13567,7 +14234,6 @@ no_undefined_flag \ |
28163 | hardcode_libdir_flag_spec \ | 31318 | hardcode_libdir_flag_spec \ |
28164 | hardcode_libdir_flag_spec_ld \ | 31319 | hardcode_libdir_flag_spec_ld \ |
28165 | hardcode_libdir_separator \ | 31320 | hardcode_libdir_separator \ |
@@ -28167,7 +31322,7 @@ index db023b48c28..c562aada2a4 100755 | |||
28167 | exclude_expsyms \ | 31322 | exclude_expsyms \ |
28168 | include_expsyms \ | 31323 | include_expsyms \ |
28169 | file_list_spec \ | 31324 | file_list_spec \ |
28170 | @@ -13585,6 +14251,7 @@ module_cmds \ | 31325 | @@ -13603,6 +14269,7 @@ module_cmds \ |
28171 | module_expsym_cmds \ | 31326 | module_expsym_cmds \ |
28172 | export_symbols_cmds \ | 31327 | export_symbols_cmds \ |
28173 | prelink_cmds \ | 31328 | prelink_cmds \ |
@@ -28175,7 +31330,7 @@ index db023b48c28..c562aada2a4 100755 | |||
28175 | postinstall_cmds \ | 31330 | postinstall_cmds \ |
28176 | postuninstall_cmds \ | 31331 | postuninstall_cmds \ |
28177 | finish_cmds \ | 31332 | finish_cmds \ |
28178 | @@ -14350,7 +15017,8 @@ $as_echo X"$file" | | 31333 | @@ -14368,7 +15035,8 @@ $as_echo X"$file" | |
28179 | # NOTE: Changes made to this file will be lost: look at ltmain.sh. | 31334 | # NOTE: Changes made to this file will be lost: look at ltmain.sh. |
28180 | # | 31335 | # |
28181 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, | 31336 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, |
@@ -28185,7 +31340,7 @@ index db023b48c28..c562aada2a4 100755 | |||
28185 | # Written by Gordon Matzigkeit, 1996 | 31340 | # Written by Gordon Matzigkeit, 1996 |
28186 | # | 31341 | # |
28187 | # This file is part of GNU Libtool. | 31342 | # This file is part of GNU Libtool. |
28188 | @@ -14453,19 +15121,42 @@ SP2NL=$lt_lt_SP2NL | 31343 | @@ -14471,19 +15139,42 @@ SP2NL=$lt_lt_SP2NL |
28189 | # turn newlines into spaces. | 31344 | # turn newlines into spaces. |
28190 | NL2SP=$lt_lt_NL2SP | 31345 | NL2SP=$lt_lt_NL2SP |
28191 | 31346 | ||
@@ -28229,7 +31384,7 @@ index db023b48c28..c562aada2a4 100755 | |||
28229 | # A symbol stripping program. | 31384 | # A symbol stripping program. |
28230 | STRIP=$lt_STRIP | 31385 | STRIP=$lt_STRIP |
28231 | 31386 | ||
28232 | @@ -14495,6 +15186,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address | 31387 | @@ -14513,6 +15204,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address |
28233 | # Transform the output of nm in a C name address pair when lib prefix is needed. | 31388 | # Transform the output of nm in a C name address pair when lib prefix is needed. |
28234 | global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix | 31389 | global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix |
28235 | 31390 | ||
@@ -28242,7 +31397,7 @@ index db023b48c28..c562aada2a4 100755 | |||
28242 | # The name of the directory that contains temporary libtool files. | 31397 | # The name of the directory that contains temporary libtool files. |
28243 | objdir=$objdir | 31398 | objdir=$objdir |
28244 | 31399 | ||
28245 | @@ -14504,6 +15201,9 @@ MAGIC_CMD=$MAGIC_CMD | 31400 | @@ -14522,6 +15219,9 @@ MAGIC_CMD=$MAGIC_CMD |
28246 | # Must we lock files when doing compilation? | 31401 | # Must we lock files when doing compilation? |
28247 | need_locks=$lt_need_locks | 31402 | need_locks=$lt_need_locks |
28248 | 31403 | ||
@@ -28252,7 +31407,7 @@ index db023b48c28..c562aada2a4 100755 | |||
28252 | # Tool to manipulate archived DWARF debug symbol files on Mac OS X. | 31407 | # Tool to manipulate archived DWARF debug symbol files on Mac OS X. |
28253 | DSYMUTIL=$lt_DSYMUTIL | 31408 | DSYMUTIL=$lt_DSYMUTIL |
28254 | 31409 | ||
28255 | @@ -14618,12 +15318,12 @@ with_gcc=$GCC | 31410 | @@ -14636,12 +15336,12 @@ with_gcc=$GCC |
28256 | # Compiler flag to turn off builtin functions. | 31411 | # Compiler flag to turn off builtin functions. |
28257 | no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag | 31412 | no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag |
28258 | 31413 | ||
@@ -28268,7 +31423,7 @@ index db023b48c28..c562aada2a4 100755 | |||
28268 | # Compiler flag to prevent dynamic linking. | 31423 | # Compiler flag to prevent dynamic linking. |
28269 | link_static_flag=$lt_lt_prog_compiler_static | 31424 | link_static_flag=$lt_lt_prog_compiler_static |
28270 | 31425 | ||
28271 | @@ -14710,9 +15410,6 @@ inherit_rpath=$inherit_rpath | 31426 | @@ -14728,9 +15428,6 @@ inherit_rpath=$inherit_rpath |
28272 | # Whether libtool must link a program against all its dependency libraries. | 31427 | # Whether libtool must link a program against all its dependency libraries. |
28273 | link_all_deplibs=$link_all_deplibs | 31428 | link_all_deplibs=$link_all_deplibs |
28274 | 31429 | ||
@@ -28278,7 +31433,7 @@ index db023b48c28..c562aada2a4 100755 | |||
28278 | # Set to "yes" if exported symbols are required. | 31433 | # Set to "yes" if exported symbols are required. |
28279 | always_export_symbols=$always_export_symbols | 31434 | always_export_symbols=$always_export_symbols |
28280 | 31435 | ||
28281 | @@ -14728,6 +15425,9 @@ include_expsyms=$lt_include_expsyms | 31436 | @@ -14746,6 +15443,9 @@ include_expsyms=$lt_include_expsyms |
28282 | # Commands necessary for linking programs (against libraries) with templates. | 31437 | # Commands necessary for linking programs (against libraries) with templates. |
28283 | prelink_cmds=$lt_prelink_cmds | 31438 | prelink_cmds=$lt_prelink_cmds |
28284 | 31439 | ||
@@ -28288,7 +31443,7 @@ index db023b48c28..c562aada2a4 100755 | |||
28288 | # Specify filename containing input files. | 31443 | # Specify filename containing input files. |
28289 | file_list_spec=$lt_file_list_spec | 31444 | file_list_spec=$lt_file_list_spec |
28290 | 31445 | ||
28291 | @@ -14760,210 +15460,169 @@ ltmain="$ac_aux_dir/ltmain.sh" | 31446 | @@ -14778,210 +15478,169 @@ ltmain="$ac_aux_dir/ltmain.sh" |
28292 | # if finds mixed CR/LF and LF-only lines. Since sed operates in | 31447 | # if finds mixed CR/LF and LF-only lines. Since sed operates in |
28293 | # text mode, it properly converts lines to CR/LF. This bash problem | 31448 | # text mode, it properly converts lines to CR/LF. This bash problem |
28294 | # is reportedly fixed, but why not run on old versions too? | 31449 | # is reportedly fixed, but why not run on old versions too? |
@@ -28663,18 +31818,18 @@ index db023b48c28..c562aada2a4 100755 | |||
28663 | chmod +x "$ofile" | 31818 | chmod +x "$ofile" |
28664 | 31819 | ||
28665 | diff --git a/sim/Makefile.in b/sim/Makefile.in | 31820 | diff --git a/sim/Makefile.in b/sim/Makefile.in |
28666 | index dbbaa84224a..f819bbe0bdd 100644 | 31821 | index 65085cada9c..c216f21920f 100644 |
28667 | --- a/sim/Makefile.in | 31822 | --- a/sim/Makefile.in |
28668 | +++ b/sim/Makefile.in | 31823 | +++ b/sim/Makefile.in |
28669 | @@ -744,6 +744,7 @@ C_DIALECT = @C_DIALECT@ | 31824 | @@ -1029,6 +1029,7 @@ CYGPATH_W = @CYGPATH_W@ |
28670 | DATADIRNAME = @DATADIRNAME@ | 31825 | C_DIALECT = @C_DIALECT@ |
28671 | DEFS = @DEFS@ | 31826 | DEFS = @DEFS@ |
28672 | DEPDIR = @DEPDIR@ | 31827 | DEPDIR = @DEPDIR@ |
28673 | +DLLTOOL = @DLLTOOL@ | 31828 | +DLLTOOL = @DLLTOOL@ |
28674 | DSYMUTIL = @DSYMUTIL@ | 31829 | DSYMUTIL = @DSYMUTIL@ |
28675 | DTC = @DTC@ | 31830 | DTC = @DTC@ |
28676 | DUMPBIN = @DUMPBIN@ | 31831 | DUMPBIN = @DUMPBIN@ |
28677 | @@ -809,6 +810,7 @@ LN_S = @LN_S@ | 31832 | @@ -1089,6 +1090,7 @@ LN_S = @LN_S@ |
28678 | LTLIBOBJS = @LTLIBOBJS@ | 31833 | LTLIBOBJS = @LTLIBOBJS@ |
28679 | MAINT = @MAINT@ | 31834 | MAINT = @MAINT@ |
28680 | MAKEINFO = @MAKEINFO@ | 31835 | MAKEINFO = @MAKEINFO@ |
@@ -28682,7 +31837,7 @@ index dbbaa84224a..f819bbe0bdd 100644 | |||
28682 | MKDIR_P = @MKDIR_P@ | 31837 | MKDIR_P = @MKDIR_P@ |
28683 | NM = @NM@ | 31838 | NM = @NM@ |
28684 | NMEDIT = @NMEDIT@ | 31839 | NMEDIT = @NMEDIT@ |
28685 | @@ -859,6 +861,7 @@ abs_builddir = @abs_builddir@ | 31840 | @@ -1150,6 +1152,7 @@ abs_builddir = @abs_builddir@ |
28686 | abs_srcdir = @abs_srcdir@ | 31841 | abs_srcdir = @abs_srcdir@ |
28687 | abs_top_builddir = @abs_top_builddir@ | 31842 | abs_top_builddir = @abs_top_builddir@ |
28688 | abs_top_srcdir = @abs_top_srcdir@ | 31843 | abs_top_srcdir = @abs_top_srcdir@ |
@@ -28690,810 +31845,1947 @@ index dbbaa84224a..f819bbe0bdd 100644 | |||
28690 | ac_ct_CC = @ac_ct_CC@ | 31845 | ac_ct_CC = @ac_ct_CC@ |
28691 | ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ | 31846 | ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ |
28692 | am__include = @am__include@ | 31847 | am__include = @am__include@ |
28693 | diff --git a/zlib/Makefile.in b/zlib/Makefile.in | 31848 | diff --git a/sim/configure b/sim/configure |
28694 | index c7584492a65..0605835c14f 100644 | 31849 | index c31ff71c805..1936741abe2 100755 |
28695 | --- a/zlib/Makefile.in | 31850 | --- a/sim/configure |
28696 | +++ b/zlib/Makefile.in | 31851 | +++ b/sim/configure |
28697 | @@ -1,7 +1,7 @@ | 31852 | @@ -887,8 +887,11 @@ OTOOL |
28698 | -# Makefile.in generated by automake 1.16.5 from Makefile.am. | 31853 | LIPO |
28699 | +# Makefile.in generated by automake 1.15.1 from Makefile.am. | 31854 | NMEDIT |
28700 | # @configure_input@ | 31855 | DSYMUTIL |
31856 | +MANIFEST_TOOL | ||
31857 | AWK | ||
31858 | STRIP | ||
31859 | +ac_ct_AR | ||
31860 | +DLLTOOL | ||
31861 | OBJDUMP | ||
31862 | LN_S | ||
31863 | NM | ||
31864 | @@ -991,6 +994,7 @@ enable_static | ||
31865 | with_pic | ||
31866 | enable_fast_install | ||
31867 | with_gnu_ld | ||
31868 | +with_libtool_sysroot | ||
31869 | enable_libtool_lock | ||
31870 | enable_maintainer_mode | ||
31871 | enable_dependency_tracking | ||
31872 | @@ -1809,6 +1813,8 @@ Optional Packages: | ||
31873 | --with-pic try to use only PIC/non-PIC objects [default=use | ||
31874 | both] | ||
31875 | --with-gnu-ld assume the C compiler uses GNU ld [default=no] | ||
31876 | + --with-libtool-sysroot=DIR Search for dependent libraries within DIR | ||
31877 | + (or the compiler's sysroot if not specified). | ||
28701 | 31878 | ||
28702 | -# Copyright (C) 1994-2021 Free Software Foundation, Inc. | 31879 | Some influential environment variables: |
28703 | +# Copyright (C) 1994-2017 Free Software Foundation, Inc. | 31880 | CC C compiler command |
31881 | @@ -5642,8 +5648,8 @@ esac | ||
28704 | 31882 | ||
28705 | # This Makefile.in is free software; the Free Software Foundation | ||
28706 | # gives unlimited permission to copy and/or distribute it, | ||
28707 | @@ -138,7 +138,6 @@ am__uninstall_files_from_dir = { \ | ||
28708 | } | ||
28709 | am__installdirs = "$(DESTDIR)$(toolexeclibdir)" | ||
28710 | LIBRARIES = $(toolexeclib_LIBRARIES) | ||
28711 | -LTLIBRARIES = $(noinst_LTLIBRARIES) | ||
28712 | ARFLAGS = cru | ||
28713 | AM_V_AR = $(am__v_AR_@AM_V@) | ||
28714 | am__v_AR_ = $(am__v_AR_@AM_DEFAULT_V@) | ||
28715 | @@ -161,6 +160,7 @@ am__objects_1 = libz_a-adler32.$(OBJEXT) libz_a-compress.$(OBJEXT) \ | ||
28716 | libz_a-zutil.$(OBJEXT) | ||
28717 | @TARGET_LIBRARY_FALSE@am_libz_a_OBJECTS = $(am__objects_1) | ||
28718 | libz_a_OBJECTS = $(am_libz_a_OBJECTS) | ||
28719 | +LTLIBRARIES = $(noinst_LTLIBRARIES) | ||
28720 | libzgcj_convenience_la_LIBADD = | ||
28721 | am__libzgcj_convenience_la_SOURCES_DIST = adler32.c compress.c crc32.c \ | ||
28722 | crc32.h deflate.c deflate.h gzguts.h gzread.c gzclose.c \ | ||
28723 | @@ -192,22 +192,7 @@ am__v_at_0 = @ | ||
28724 | am__v_at_1 = | ||
28725 | DEFAULT_INCLUDES = -I.@am__isrc@ | ||
28726 | depcomp = $(SHELL) $(top_srcdir)/../depcomp | ||
28727 | -am__maybe_remake_depfiles = depfiles | ||
28728 | -am__depfiles_remade = ./$(DEPDIR)/adler32.Plo ./$(DEPDIR)/compress.Plo \ | ||
28729 | - ./$(DEPDIR)/crc32.Plo ./$(DEPDIR)/deflate.Plo \ | ||
28730 | - ./$(DEPDIR)/gzclose.Plo ./$(DEPDIR)/gzlib.Plo \ | ||
28731 | - ./$(DEPDIR)/gzread.Plo ./$(DEPDIR)/gzwrite.Plo \ | ||
28732 | - ./$(DEPDIR)/infback.Plo ./$(DEPDIR)/inffast.Plo \ | ||
28733 | - ./$(DEPDIR)/inflate.Plo ./$(DEPDIR)/inftrees.Plo \ | ||
28734 | - ./$(DEPDIR)/libz_a-adler32.Po ./$(DEPDIR)/libz_a-compress.Po \ | ||
28735 | - ./$(DEPDIR)/libz_a-crc32.Po ./$(DEPDIR)/libz_a-deflate.Po \ | ||
28736 | - ./$(DEPDIR)/libz_a-gzclose.Po ./$(DEPDIR)/libz_a-gzlib.Po \ | ||
28737 | - ./$(DEPDIR)/libz_a-gzread.Po ./$(DEPDIR)/libz_a-gzwrite.Po \ | ||
28738 | - ./$(DEPDIR)/libz_a-infback.Po ./$(DEPDIR)/libz_a-inffast.Po \ | ||
28739 | - ./$(DEPDIR)/libz_a-inflate.Po ./$(DEPDIR)/libz_a-inftrees.Po \ | ||
28740 | - ./$(DEPDIR)/libz_a-trees.Po ./$(DEPDIR)/libz_a-uncompr.Po \ | ||
28741 | - ./$(DEPDIR)/libz_a-zutil.Po ./$(DEPDIR)/trees.Plo \ | ||
28742 | - ./$(DEPDIR)/uncompr.Plo ./$(DEPDIR)/zutil.Plo | ||
28743 | +am__depfiles_maybe = depfiles | ||
28744 | am__mv = mv -f | ||
28745 | COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ | ||
28746 | $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) | ||
28747 | @@ -252,6 +237,9 @@ am__define_uniq_tagged_files = \ | ||
28748 | unique=`for i in $$list; do \ | ||
28749 | if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ | ||
28750 | done | $(am__uniquify_input)` | ||
28751 | +ETAGS = etags | ||
28752 | +CTAGS = ctags | ||
28753 | +CSCOPE = cscope | ||
28754 | AM_RECURSIVE_TARGETS = cscope | ||
28755 | am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/../compile \ | ||
28756 | $(top_srcdir)/../config.guess $(top_srcdir)/../config.sub \ | ||
28757 | @@ -272,8 +260,6 @@ am__post_remove_distdir = $(am__remove_distdir) | ||
28758 | DIST_ARCHIVES = $(distdir).tar.gz | ||
28759 | GZIP_ENV = --best | ||
28760 | DIST_TARGETS = dist-gzip | ||
28761 | -# Exists only to be overridden by the user if desired. | ||
28762 | -AM_DISTCHECK_DVI_TARGET = dvi | ||
28763 | distuninstallcheck_listfiles = find . -type f -print | ||
28764 | am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \ | ||
28765 | | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$' | ||
28766 | @@ -292,18 +278,16 @@ CFLAGS = @CFLAGS@ | ||
28767 | COMPPATH = @COMPPATH@ | ||
28768 | CPP = @CPP@ | ||
28769 | CPPFLAGS = @CPPFLAGS@ | ||
28770 | -CSCOPE = @CSCOPE@ | ||
28771 | -CTAGS = @CTAGS@ | ||
28772 | CYGPATH_W = @CYGPATH_W@ | ||
28773 | DEFS = @DEFS@ | ||
28774 | DEPDIR = @DEPDIR@ | ||
28775 | +DLLTOOL = @DLLTOOL@ | ||
28776 | DSYMUTIL = @DSYMUTIL@ | ||
28777 | DUMPBIN = @DUMPBIN@ | ||
28778 | ECHO_C = @ECHO_C@ | ||
28779 | ECHO_N = @ECHO_N@ | ||
28780 | ECHO_T = @ECHO_T@ | ||
28781 | EGREP = @EGREP@ | ||
28782 | -ETAGS = @ETAGS@ | ||
28783 | EXEEXT = @EXEEXT@ | ||
28784 | FGREP = @FGREP@ | ||
28785 | GREP = @GREP@ | ||
28786 | @@ -322,6 +306,7 @@ LN_S = @LN_S@ | ||
28787 | LTLIBOBJS = @LTLIBOBJS@ | ||
28788 | MAINT = @MAINT@ | ||
28789 | MAKEINFO = @MAKEINFO@ | ||
28790 | +MANIFEST_TOOL = @MANIFEST_TOOL@ | ||
28791 | MKDIR_P = @MKDIR_P@ | ||
28792 | NM = @NM@ | ||
28793 | NMEDIT = @NMEDIT@ | ||
28794 | @@ -348,6 +333,7 @@ abs_builddir = @abs_builddir@ | ||
28795 | abs_srcdir = @abs_srcdir@ | ||
28796 | abs_top_builddir = @abs_top_builddir@ | ||
28797 | abs_top_srcdir = @abs_top_srcdir@ | ||
28798 | +ac_ct_AR = @ac_ct_AR@ | ||
28799 | ac_ct_CC = @ac_ct_CC@ | ||
28800 | ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ | ||
28801 | am__include = @am__include@ | ||
28802 | @@ -491,8 +477,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status | ||
28803 | echo ' $(SHELL) ./config.status'; \ | ||
28804 | $(SHELL) ./config.status;; \ | ||
28805 | *) \ | ||
28806 | - echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles)'; \ | ||
28807 | - cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles);; \ | ||
28808 | + echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \ | ||
28809 | + cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \ | ||
28810 | esac; | ||
28811 | $(top_srcdir)/../multilib.am $(am__empty): | ||
28812 | |||
28813 | @@ -536,6 +522,11 @@ uninstall-toolexeclibLIBRARIES: | ||
28814 | clean-toolexeclibLIBRARIES: | ||
28815 | -test -z "$(toolexeclib_LIBRARIES)" || rm -f $(toolexeclib_LIBRARIES) | ||
28816 | |||
28817 | +libz.a: $(libz_a_OBJECTS) $(libz_a_DEPENDENCIES) $(EXTRA_libz_a_DEPENDENCIES) | ||
28818 | + $(AM_V_at)-rm -f libz.a | ||
28819 | + $(AM_V_AR)$(libz_a_AR) libz.a $(libz_a_OBJECTS) $(libz_a_LIBADD) | ||
28820 | + $(AM_V_at)$(RANLIB) libz.a | ||
28821 | + | ||
28822 | clean-noinstLTLIBRARIES: | ||
28823 | -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) | ||
28824 | @list='$(noinst_LTLIBRARIES)'; \ | ||
28825 | @@ -547,11 +538,6 @@ clean-noinstLTLIBRARIES: | ||
28826 | rm -f $${locs}; \ | ||
28827 | } | ||
28828 | 31883 | ||
28829 | -libz.a: $(libz_a_OBJECTS) $(libz_a_DEPENDENCIES) $(EXTRA_libz_a_DEPENDENCIES) | ||
28830 | - $(AM_V_at)-rm -f libz.a | ||
28831 | - $(AM_V_AR)$(libz_a_AR) libz.a $(libz_a_OBJECTS) $(libz_a_LIBADD) | ||
28832 | - $(AM_V_at)$(RANLIB) libz.a | ||
28833 | - | ||
28834 | libzgcj_convenience.la: $(libzgcj_convenience_la_OBJECTS) $(libzgcj_convenience_la_DEPENDENCIES) $(EXTRA_libzgcj_convenience_la_DEPENDENCIES) | ||
28835 | $(AM_V_CCLD)$(LINK) $(am_libzgcj_convenience_la_rpath) $(libzgcj_convenience_la_OBJECTS) $(libzgcj_convenience_la_LIBADD) $(LIBS) | ||
28836 | 31884 | ||
28837 | @@ -561,42 +547,36 @@ mostlyclean-compile: | 31885 | -macro_version='2.2.7a' |
28838 | distclean-compile: | 31886 | -macro_revision='1.3134' |
28839 | -rm -f *.tab.c | 31887 | +macro_version='2.4' |
31888 | +macro_revision='1.3293' | ||
28840 | 31889 | ||
28841 | -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/adler32.Plo@am__quote@ # am--include-marker | ||
28842 | -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/compress.Plo@am__quote@ # am--include-marker | ||
28843 | -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/crc32.Plo@am__quote@ # am--include-marker | ||
28844 | -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/deflate.Plo@am__quote@ # am--include-marker | ||
28845 | -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gzclose.Plo@am__quote@ # am--include-marker | ||
28846 | -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gzlib.Plo@am__quote@ # am--include-marker | ||
28847 | -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gzread.Plo@am__quote@ # am--include-marker | ||
28848 | -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gzwrite.Plo@am__quote@ # am--include-marker | ||
28849 | -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/infback.Plo@am__quote@ # am--include-marker | ||
28850 | -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/inffast.Plo@am__quote@ # am--include-marker | ||
28851 | -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/inflate.Plo@am__quote@ # am--include-marker | ||
28852 | -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/inftrees.Plo@am__quote@ # am--include-marker | ||
28853 | -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libz_a-adler32.Po@am__quote@ # am--include-marker | ||
28854 | -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libz_a-compress.Po@am__quote@ # am--include-marker | ||
28855 | -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libz_a-crc32.Po@am__quote@ # am--include-marker | ||
28856 | -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libz_a-deflate.Po@am__quote@ # am--include-marker | ||
28857 | -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libz_a-gzclose.Po@am__quote@ # am--include-marker | ||
28858 | -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libz_a-gzlib.Po@am__quote@ # am--include-marker | ||
28859 | -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libz_a-gzread.Po@am__quote@ # am--include-marker | ||
28860 | -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libz_a-gzwrite.Po@am__quote@ # am--include-marker | ||
28861 | -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libz_a-infback.Po@am__quote@ # am--include-marker | ||
28862 | -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libz_a-inffast.Po@am__quote@ # am--include-marker | ||
28863 | -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libz_a-inflate.Po@am__quote@ # am--include-marker | ||
28864 | -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libz_a-inftrees.Po@am__quote@ # am--include-marker | ||
28865 | -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libz_a-trees.Po@am__quote@ # am--include-marker | ||
28866 | -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libz_a-uncompr.Po@am__quote@ # am--include-marker | ||
28867 | -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libz_a-zutil.Po@am__quote@ # am--include-marker | ||
28868 | -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/trees.Plo@am__quote@ # am--include-marker | ||
28869 | -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/uncompr.Plo@am__quote@ # am--include-marker | ||
28870 | -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/zutil.Plo@am__quote@ # am--include-marker | ||
28871 | - | ||
28872 | -$(am__depfiles_remade): | ||
28873 | - @$(MKDIR_P) $(@D) | ||
28874 | - @echo '# dummy' >$@-t && $(am__mv) $@-t $@ | ||
28875 | - | ||
28876 | -am--depfiles: $(am__depfiles_remade) | ||
28877 | +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/adler32.Plo@am__quote@ | ||
28878 | +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/compress.Plo@am__quote@ | ||
28879 | +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/crc32.Plo@am__quote@ | ||
28880 | +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/deflate.Plo@am__quote@ | ||
28881 | +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gzclose.Plo@am__quote@ | ||
28882 | +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gzlib.Plo@am__quote@ | ||
28883 | +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gzread.Plo@am__quote@ | ||
28884 | +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gzwrite.Plo@am__quote@ | ||
28885 | +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/infback.Plo@am__quote@ | ||
28886 | +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/inffast.Plo@am__quote@ | ||
28887 | +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/inflate.Plo@am__quote@ | ||
28888 | +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/inftrees.Plo@am__quote@ | ||
28889 | +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libz_a-adler32.Po@am__quote@ | ||
28890 | +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libz_a-compress.Po@am__quote@ | ||
28891 | +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libz_a-crc32.Po@am__quote@ | ||
28892 | +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libz_a-deflate.Po@am__quote@ | ||
28893 | +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libz_a-gzclose.Po@am__quote@ | ||
28894 | +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libz_a-gzlib.Po@am__quote@ | ||
28895 | +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libz_a-gzread.Po@am__quote@ | ||
28896 | +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libz_a-gzwrite.Po@am__quote@ | ||
28897 | +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libz_a-infback.Po@am__quote@ | ||
28898 | +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libz_a-inffast.Po@am__quote@ | ||
28899 | +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libz_a-inflate.Po@am__quote@ | ||
28900 | +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libz_a-inftrees.Po@am__quote@ | ||
28901 | +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libz_a-trees.Po@am__quote@ | ||
28902 | +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libz_a-uncompr.Po@am__quote@ | ||
28903 | +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libz_a-zutil.Po@am__quote@ | ||
28904 | +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/trees.Plo@am__quote@ | ||
28905 | +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/uncompr.Plo@am__quote@ | ||
28906 | +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/zutil.Plo@am__quote@ | ||
28907 | 31890 | ||
28908 | .c.o: | ||
28909 | @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< | ||
28910 | @@ -896,10 +876,8 @@ cscopelist-am: $(am__tagged_files) | ||
28911 | distclean-tags: | ||
28912 | -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags | ||
28913 | -rm -f cscope.out cscope.in.out cscope.po.out cscope.files | ||
28914 | -distdir: $(BUILT_SOURCES) | ||
28915 | - $(MAKE) $(AM_MAKEFLAGS) distdir-am | ||
28916 | |||
28917 | -distdir-am: $(DISTFILES) | ||
28918 | +distdir: $(DISTFILES) | ||
28919 | $(am__remove_distdir) | ||
28920 | test -d "$(distdir)" || mkdir "$(distdir)" | ||
28921 | @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ | ||
28922 | @@ -954,10 +932,6 @@ dist-xz: distdir | ||
28923 | tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz | ||
28924 | $(am__post_remove_distdir) | ||
28925 | 31891 | ||
28926 | -dist-zstd: distdir | 31892 | @@ -5683,7 +5689,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO |
28927 | - tardir=$(distdir) && $(am__tar) | zstd -c $${ZSTD_CLEVEL-$${ZSTD_OPT--19}} >$(distdir).tar.zst | 31893 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 |
28928 | - $(am__post_remove_distdir) | 31894 | $as_echo_n "checking how to print strings... " >&6; } |
28929 | - | 31895 | # Test print first, because it will be a builtin if present. |
28930 | dist-tarZ: distdir | 31896 | -if test "X`print -r -- -n 2>/dev/null`" = X-n && \ |
28931 | @echo WARNING: "Support for distribution archives compressed with" \ | 31897 | +if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ |
28932 | "legacy program 'compress' is deprecated." >&2 | 31898 | test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then |
28933 | @@ -1000,8 +974,6 @@ distcheck: dist | 31899 | ECHO='print -r --' |
28934 | eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\ | 31900 | elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then |
28935 | *.zip*) \ | 31901 | @@ -6376,8 +6382,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; |
28936 | unzip $(distdir).zip ;;\ | 31902 | # Try some XSI features |
28937 | - *.tar.zst*) \ | 31903 | xsi_shell=no |
28938 | - zstd -dc $(distdir).tar.zst | $(am__untar) ;;\ | 31904 | ( _lt_dummy="a/b/c" |
28939 | esac | 31905 | - test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ |
28940 | chmod -R a-w $(distdir) | 31906 | - = c,a/b,, \ |
28941 | chmod u+w $(distdir) | 31907 | + test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ |
28942 | @@ -1017,7 +989,7 @@ distcheck: dist | 31908 | + = c,a/b,b/c, \ |
28943 | $(DISTCHECK_CONFIGURE_FLAGS) \ | 31909 | && eval 'test $(( 1 + 1 )) -eq 2 \ |
28944 | --srcdir=../.. --prefix="$$dc_install_base" \ | 31910 | && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ |
28945 | && $(MAKE) $(AM_MAKEFLAGS) \ | 31911 | && xsi_shell=yes |
28946 | - && $(MAKE) $(AM_MAKEFLAGS) $(AM_DISTCHECK_DVI_TARGET) \ | 31912 | @@ -6426,6 +6432,80 @@ esac |
28947 | + && $(MAKE) $(AM_MAKEFLAGS) dvi \ | ||
28948 | && $(MAKE) $(AM_MAKEFLAGS) check \ | ||
28949 | && $(MAKE) $(AM_MAKEFLAGS) install \ | ||
28950 | && $(MAKE) $(AM_MAKEFLAGS) installcheck \ | ||
28951 | @@ -1113,36 +1085,7 @@ clean-am: clean-generic clean-libtool clean-local \ | ||
28952 | 31913 | ||
28953 | distclean: distclean-am | ||
28954 | -rm -f $(am__CONFIG_DISTCLEAN_FILES) | ||
28955 | - -rm -f ./$(DEPDIR)/adler32.Plo | ||
28956 | - -rm -f ./$(DEPDIR)/compress.Plo | ||
28957 | - -rm -f ./$(DEPDIR)/crc32.Plo | ||
28958 | - -rm -f ./$(DEPDIR)/deflate.Plo | ||
28959 | - -rm -f ./$(DEPDIR)/gzclose.Plo | ||
28960 | - -rm -f ./$(DEPDIR)/gzlib.Plo | ||
28961 | - -rm -f ./$(DEPDIR)/gzread.Plo | ||
28962 | - -rm -f ./$(DEPDIR)/gzwrite.Plo | ||
28963 | - -rm -f ./$(DEPDIR)/infback.Plo | ||
28964 | - -rm -f ./$(DEPDIR)/inffast.Plo | ||
28965 | - -rm -f ./$(DEPDIR)/inflate.Plo | ||
28966 | - -rm -f ./$(DEPDIR)/inftrees.Plo | ||
28967 | - -rm -f ./$(DEPDIR)/libz_a-adler32.Po | ||
28968 | - -rm -f ./$(DEPDIR)/libz_a-compress.Po | ||
28969 | - -rm -f ./$(DEPDIR)/libz_a-crc32.Po | ||
28970 | - -rm -f ./$(DEPDIR)/libz_a-deflate.Po | ||
28971 | - -rm -f ./$(DEPDIR)/libz_a-gzclose.Po | ||
28972 | - -rm -f ./$(DEPDIR)/libz_a-gzlib.Po | ||
28973 | - -rm -f ./$(DEPDIR)/libz_a-gzread.Po | ||
28974 | - -rm -f ./$(DEPDIR)/libz_a-gzwrite.Po | ||
28975 | - -rm -f ./$(DEPDIR)/libz_a-infback.Po | ||
28976 | - -rm -f ./$(DEPDIR)/libz_a-inffast.Po | ||
28977 | - -rm -f ./$(DEPDIR)/libz_a-inflate.Po | ||
28978 | - -rm -f ./$(DEPDIR)/libz_a-inftrees.Po | ||
28979 | - -rm -f ./$(DEPDIR)/libz_a-trees.Po | ||
28980 | - -rm -f ./$(DEPDIR)/libz_a-uncompr.Po | ||
28981 | - -rm -f ./$(DEPDIR)/libz_a-zutil.Po | ||
28982 | - -rm -f ./$(DEPDIR)/trees.Plo | ||
28983 | - -rm -f ./$(DEPDIR)/uncompr.Plo | ||
28984 | - -rm -f ./$(DEPDIR)/zutil.Plo | ||
28985 | + -rm -rf ./$(DEPDIR) | ||
28986 | -rm -f Makefile | ||
28987 | distclean-am: clean-am distclean-compile distclean-generic \ | ||
28988 | distclean-libtool distclean-local distclean-tags | ||
28989 | @@ -1190,36 +1133,7 @@ installcheck-am: | ||
28990 | maintainer-clean: maintainer-clean-am | ||
28991 | -rm -f $(am__CONFIG_DISTCLEAN_FILES) | ||
28992 | -rm -rf $(top_srcdir)/autom4te.cache | ||
28993 | - -rm -f ./$(DEPDIR)/adler32.Plo | ||
28994 | - -rm -f ./$(DEPDIR)/compress.Plo | ||
28995 | - -rm -f ./$(DEPDIR)/crc32.Plo | ||
28996 | - -rm -f ./$(DEPDIR)/deflate.Plo | ||
28997 | - -rm -f ./$(DEPDIR)/gzclose.Plo | ||
28998 | - -rm -f ./$(DEPDIR)/gzlib.Plo | ||
28999 | - -rm -f ./$(DEPDIR)/gzread.Plo | ||
29000 | - -rm -f ./$(DEPDIR)/gzwrite.Plo | ||
29001 | - -rm -f ./$(DEPDIR)/infback.Plo | ||
29002 | - -rm -f ./$(DEPDIR)/inffast.Plo | ||
29003 | - -rm -f ./$(DEPDIR)/inflate.Plo | ||
29004 | - -rm -f ./$(DEPDIR)/inftrees.Plo | ||
29005 | - -rm -f ./$(DEPDIR)/libz_a-adler32.Po | ||
29006 | - -rm -f ./$(DEPDIR)/libz_a-compress.Po | ||
29007 | - -rm -f ./$(DEPDIR)/libz_a-crc32.Po | ||
29008 | - -rm -f ./$(DEPDIR)/libz_a-deflate.Po | ||
29009 | - -rm -f ./$(DEPDIR)/libz_a-gzclose.Po | ||
29010 | - -rm -f ./$(DEPDIR)/libz_a-gzlib.Po | ||
29011 | - -rm -f ./$(DEPDIR)/libz_a-gzread.Po | ||
29012 | - -rm -f ./$(DEPDIR)/libz_a-gzwrite.Po | ||
29013 | - -rm -f ./$(DEPDIR)/libz_a-infback.Po | ||
29014 | - -rm -f ./$(DEPDIR)/libz_a-inffast.Po | ||
29015 | - -rm -f ./$(DEPDIR)/libz_a-inflate.Po | ||
29016 | - -rm -f ./$(DEPDIR)/libz_a-inftrees.Po | ||
29017 | - -rm -f ./$(DEPDIR)/libz_a-trees.Po | ||
29018 | - -rm -f ./$(DEPDIR)/libz_a-uncompr.Po | ||
29019 | - -rm -f ./$(DEPDIR)/libz_a-zutil.Po | ||
29020 | - -rm -f ./$(DEPDIR)/trees.Plo | ||
29021 | - -rm -f ./$(DEPDIR)/uncompr.Plo | ||
29022 | - -rm -f ./$(DEPDIR)/zutil.Plo | ||
29023 | + -rm -rf ./$(DEPDIR) | ||
29024 | -rm -f Makefile | ||
29025 | maintainer-clean-am: distclean-am maintainer-clean-generic \ | ||
29026 | maintainer-clean-local | ||
29027 | @@ -1241,17 +1155,17 @@ uninstall-am: uninstall-toolexeclibLIBRARIES | ||
29028 | |||
29029 | .MAKE: install-am install-strip | ||
29030 | |||
29031 | -.PHONY: CTAGS GTAGS TAGS all all-am all-local am--depfiles am--refresh \ | ||
29032 | - check check-am clean clean-cscope clean-generic clean-libtool \ | ||
29033 | +.PHONY: CTAGS GTAGS TAGS all all-am all-local am--refresh check \ | ||
29034 | + check-am clean clean-cscope clean-generic clean-libtool \ | ||
29035 | clean-local clean-noinstLTLIBRARIES clean-toolexeclibLIBRARIES \ | ||
29036 | cscope cscopelist-am ctags ctags-am dist dist-all dist-bzip2 \ | ||
29037 | dist-gzip dist-lzip dist-shar dist-tarZ dist-xz dist-zip \ | ||
29038 | - dist-zstd distcheck distclean distclean-compile \ | ||
29039 | - distclean-generic distclean-libtool distclean-local \ | ||
29040 | - distclean-tags distcleancheck distdir distuninstallcheck dvi \ | ||
29041 | - dvi-am html html-am info info-am install install-am \ | ||
29042 | - install-data install-data-am install-dvi install-dvi-am \ | ||
29043 | - install-exec install-exec-am install-exec-local install-html \ | ||
29044 | + distcheck distclean distclean-compile distclean-generic \ | ||
29045 | + distclean-libtool distclean-local distclean-tags \ | ||
29046 | + distcleancheck distdir distuninstallcheck dvi dvi-am html \ | ||
29047 | + html-am info info-am install install-am install-data \ | ||
29048 | + install-data-am install-dvi install-dvi-am install-exec \ | ||
29049 | + install-exec-am install-exec-local install-html \ | ||
29050 | install-html-am install-info install-info-am install-man \ | ||
29051 | install-pdf install-pdf-am install-ps install-ps-am \ | ||
29052 | install-strip install-toolexeclibLIBRARIES installcheck \ | ||
29053 | diff --git a/zlib/aclocal.m4 b/zlib/aclocal.m4 | ||
29054 | index 3538b0f0aea..e5eed57bd68 100644 | ||
29055 | --- a/zlib/aclocal.m4 | ||
29056 | +++ b/zlib/aclocal.m4 | ||
29057 | @@ -1,6 +1,6 @@ | ||
29058 | -# generated automatically by aclocal 1.16.5 -*- Autoconf -*- | ||
29059 | +# generated automatically by aclocal 1.15.1 -*- Autoconf -*- | ||
29060 | 31914 | ||
29061 | -# Copyright (C) 1996-2021 Free Software Foundation, Inc. | ||
29062 | +# Copyright (C) 1996-2017 Free Software Foundation, Inc. | ||
29063 | 31915 | ||
29064 | # This file is free software; the Free Software Foundation | 31916 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5 |
29065 | # gives unlimited permission to copy and/or distribute it, | 31917 | +$as_echo_n "checking how to convert $build file names to $host format... " >&6; } |
29066 | @@ -20,7 +20,7 @@ You have another version of autoconf. It may work, but is not guaranteed to. | 31918 | +if ${lt_cv_to_host_file_cmd+:} false; then : |
29067 | If you have problems, you may need to regenerate the build system entirely. | 31919 | + $as_echo_n "(cached) " >&6 |
29068 | To do so, use the procedure documented by the package, typically 'autoreconf'.])]) | 31920 | +else |
31921 | + case $host in | ||
31922 | + *-*-mingw* ) | ||
31923 | + case $build in | ||
31924 | + *-*-mingw* ) # actually msys | ||
31925 | + lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 | ||
31926 | + ;; | ||
31927 | + *-*-cygwin* ) | ||
31928 | + lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 | ||
31929 | + ;; | ||
31930 | + * ) # otherwise, assume *nix | ||
31931 | + lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 | ||
31932 | + ;; | ||
31933 | + esac | ||
31934 | + ;; | ||
31935 | + *-*-cygwin* ) | ||
31936 | + case $build in | ||
31937 | + *-*-mingw* ) # actually msys | ||
31938 | + lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin | ||
31939 | + ;; | ||
31940 | + *-*-cygwin* ) | ||
31941 | + lt_cv_to_host_file_cmd=func_convert_file_noop | ||
31942 | + ;; | ||
31943 | + * ) # otherwise, assume *nix | ||
31944 | + lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin | ||
31945 | + ;; | ||
31946 | + esac | ||
31947 | + ;; | ||
31948 | + * ) # unhandled hosts (and "normal" native builds) | ||
31949 | + lt_cv_to_host_file_cmd=func_convert_file_noop | ||
31950 | + ;; | ||
31951 | +esac | ||
31952 | + | ||
31953 | +fi | ||
31954 | + | ||
31955 | +to_host_file_cmd=$lt_cv_to_host_file_cmd | ||
31956 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5 | ||
31957 | +$as_echo "$lt_cv_to_host_file_cmd" >&6; } | ||
31958 | + | ||
31959 | + | ||
31960 | + | ||
31961 | + | ||
31962 | + | ||
31963 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5 | ||
31964 | +$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; } | ||
31965 | +if ${lt_cv_to_tool_file_cmd+:} false; then : | ||
31966 | + $as_echo_n "(cached) " >&6 | ||
31967 | +else | ||
31968 | + #assume ordinary cross tools, or native build. | ||
31969 | +lt_cv_to_tool_file_cmd=func_convert_file_noop | ||
31970 | +case $host in | ||
31971 | + *-*-mingw* ) | ||
31972 | + case $build in | ||
31973 | + *-*-mingw* ) # actually msys | ||
31974 | + lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 | ||
31975 | + ;; | ||
31976 | + esac | ||
31977 | + ;; | ||
31978 | +esac | ||
31979 | + | ||
31980 | +fi | ||
31981 | + | ||
31982 | +to_tool_file_cmd=$lt_cv_to_tool_file_cmd | ||
31983 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5 | ||
31984 | +$as_echo "$lt_cv_to_tool_file_cmd" >&6; } | ||
31985 | + | ||
31986 | + | ||
31987 | + | ||
31988 | + | ||
31989 | + | ||
31990 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 | ||
31991 | $as_echo_n "checking for $LD option to reload object files... " >&6; } | ||
31992 | if ${lt_cv_ld_reload_flag+:} false; then : | ||
31993 | @@ -6442,6 +6522,11 @@ case $reload_flag in | ||
31994 | esac | ||
31995 | reload_cmds='$LD$reload_flag -o $output$reload_objs' | ||
31996 | case $host_os in | ||
31997 | + cygwin* | mingw* | pw32* | cegcc*) | ||
31998 | + if test "$GCC" != yes; then | ||
31999 | + reload_cmds=false | ||
32000 | + fi | ||
32001 | + ;; | ||
32002 | darwin*) | ||
32003 | if test "$GCC" = yes; then | ||
32004 | reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' | ||
32005 | @@ -6610,7 +6695,8 @@ mingw* | pw32*) | ||
32006 | lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' | ||
32007 | lt_cv_file_magic_cmd='func_win32_libid' | ||
32008 | else | ||
32009 | - lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' | ||
32010 | + # Keep this pattern in sync with the one in func_win32_libid. | ||
32011 | + lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' | ||
32012 | lt_cv_file_magic_cmd='$OBJDUMP -f' | ||
32013 | fi | ||
32014 | ;; | ||
32015 | @@ -6764,6 +6850,21 @@ esac | ||
32016 | fi | ||
32017 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 | ||
32018 | $as_echo "$lt_cv_deplibs_check_method" >&6; } | ||
32019 | + | ||
32020 | +file_magic_glob= | ||
32021 | +want_nocaseglob=no | ||
32022 | +if test "$build" = "$host"; then | ||
32023 | + case $host_os in | ||
32024 | + mingw* | pw32*) | ||
32025 | + if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then | ||
32026 | + want_nocaseglob=yes | ||
32027 | + else | ||
32028 | + file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"` | ||
32029 | + fi | ||
32030 | + ;; | ||
32031 | + esac | ||
32032 | +fi | ||
32033 | + | ||
32034 | file_magic_cmd=$lt_cv_file_magic_cmd | ||
32035 | deplibs_check_method=$lt_cv_deplibs_check_method | ||
32036 | test -z "$deplibs_check_method" && deplibs_check_method=unknown | ||
32037 | @@ -6779,6 +6880,157 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown | ||
29069 | 32038 | ||
29070 | -# Copyright (C) 2002-2021 Free Software Foundation, Inc. | ||
29071 | +# Copyright (C) 2002-2017 Free Software Foundation, Inc. | ||
29072 | # | ||
29073 | # This file is free software; the Free Software Foundation | ||
29074 | # gives unlimited permission to copy and/or distribute it, | ||
29075 | @@ -32,10 +32,10 @@ To do so, use the procedure documented by the package, typically 'autoreconf'.]) | ||
29076 | # generated from the m4 files accompanying Automake X.Y. | ||
29077 | # (This private macro should not be called outside this file.) | ||
29078 | AC_DEFUN([AM_AUTOMAKE_VERSION], | ||
29079 | -[am__api_version='1.16' | ||
29080 | +[am__api_version='1.15' | ||
29081 | dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to | ||
29082 | dnl require some minimum version. Point them to the right macro. | ||
29083 | -m4_if([$1], [1.16.5], [], | ||
29084 | +m4_if([$1], [1.15.1], [], | ||
29085 | [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl | ||
29086 | ]) | ||
29087 | 32039 | ||
29088 | @@ -51,14 +51,14 @@ m4_define([_AM_AUTOCONF_VERSION], []) | ||
29089 | # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. | ||
29090 | # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. | ||
29091 | AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], | ||
29092 | -[AM_AUTOMAKE_VERSION([1.16.5])dnl | ||
29093 | +[AM_AUTOMAKE_VERSION([1.15.1])dnl | ||
29094 | m4_ifndef([AC_AUTOCONF_VERSION], | ||
29095 | [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl | ||
29096 | _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) | ||
29097 | 32040 | ||
29098 | # AM_AUX_DIR_EXPAND -*- Autoconf -*- | 32041 | + |
32042 | + | ||
32043 | + | ||
32044 | + | ||
32045 | + | ||
32046 | + | ||
32047 | + | ||
32048 | + | ||
32049 | + | ||
32050 | + | ||
32051 | +if test -n "$ac_tool_prefix"; then | ||
32052 | + # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. | ||
32053 | +set dummy ${ac_tool_prefix}dlltool; ac_word=$2 | ||
32054 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
32055 | +$as_echo_n "checking for $ac_word... " >&6; } | ||
32056 | +if ${ac_cv_prog_DLLTOOL+:} false; then : | ||
32057 | + $as_echo_n "(cached) " >&6 | ||
32058 | +else | ||
32059 | + if test -n "$DLLTOOL"; then | ||
32060 | + ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. | ||
32061 | +else | ||
32062 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | ||
32063 | +for as_dir in $PATH | ||
32064 | +do | ||
32065 | + IFS=$as_save_IFS | ||
32066 | + test -z "$as_dir" && as_dir=. | ||
32067 | + for ac_exec_ext in '' $ac_executable_extensions; do | ||
32068 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | ||
32069 | + ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" | ||
32070 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
32071 | + break 2 | ||
32072 | + fi | ||
32073 | +done | ||
32074 | + done | ||
32075 | +IFS=$as_save_IFS | ||
32076 | + | ||
32077 | +fi | ||
32078 | +fi | ||
32079 | +DLLTOOL=$ac_cv_prog_DLLTOOL | ||
32080 | +if test -n "$DLLTOOL"; then | ||
32081 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 | ||
32082 | +$as_echo "$DLLTOOL" >&6; } | ||
32083 | +else | ||
32084 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
32085 | +$as_echo "no" >&6; } | ||
32086 | +fi | ||
32087 | + | ||
32088 | + | ||
32089 | +fi | ||
32090 | +if test -z "$ac_cv_prog_DLLTOOL"; then | ||
32091 | + ac_ct_DLLTOOL=$DLLTOOL | ||
32092 | + # Extract the first word of "dlltool", so it can be a program name with args. | ||
32093 | +set dummy dlltool; ac_word=$2 | ||
32094 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
32095 | +$as_echo_n "checking for $ac_word... " >&6; } | ||
32096 | +if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then : | ||
32097 | + $as_echo_n "(cached) " >&6 | ||
32098 | +else | ||
32099 | + if test -n "$ac_ct_DLLTOOL"; then | ||
32100 | + ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. | ||
32101 | +else | ||
32102 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | ||
32103 | +for as_dir in $PATH | ||
32104 | +do | ||
32105 | + IFS=$as_save_IFS | ||
32106 | + test -z "$as_dir" && as_dir=. | ||
32107 | + for ac_exec_ext in '' $ac_executable_extensions; do | ||
32108 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | ||
32109 | + ac_cv_prog_ac_ct_DLLTOOL="dlltool" | ||
32110 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
32111 | + break 2 | ||
32112 | + fi | ||
32113 | +done | ||
32114 | + done | ||
32115 | +IFS=$as_save_IFS | ||
32116 | + | ||
32117 | +fi | ||
32118 | +fi | ||
32119 | +ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL | ||
32120 | +if test -n "$ac_ct_DLLTOOL"; then | ||
32121 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 | ||
32122 | +$as_echo "$ac_ct_DLLTOOL" >&6; } | ||
32123 | +else | ||
32124 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
32125 | +$as_echo "no" >&6; } | ||
32126 | +fi | ||
32127 | + | ||
32128 | + if test "x$ac_ct_DLLTOOL" = x; then | ||
32129 | + DLLTOOL="false" | ||
32130 | + else | ||
32131 | + case $cross_compiling:$ac_tool_warned in | ||
32132 | +yes:) | ||
32133 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 | ||
32134 | +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} | ||
32135 | +ac_tool_warned=yes ;; | ||
32136 | +esac | ||
32137 | + DLLTOOL=$ac_ct_DLLTOOL | ||
32138 | + fi | ||
32139 | +else | ||
32140 | + DLLTOOL="$ac_cv_prog_DLLTOOL" | ||
32141 | +fi | ||
32142 | + | ||
32143 | +test -z "$DLLTOOL" && DLLTOOL=dlltool | ||
32144 | + | ||
32145 | + | ||
32146 | + | ||
32147 | + | ||
32148 | + | ||
32149 | + | ||
32150 | + | ||
32151 | + | ||
32152 | + | ||
32153 | + | ||
32154 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5 | ||
32155 | +$as_echo_n "checking how to associate runtime and link libraries... " >&6; } | ||
32156 | +if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then : | ||
32157 | + $as_echo_n "(cached) " >&6 | ||
32158 | +else | ||
32159 | + lt_cv_sharedlib_from_linklib_cmd='unknown' | ||
32160 | + | ||
32161 | +case $host_os in | ||
32162 | +cygwin* | mingw* | pw32* | cegcc*) | ||
32163 | + # two different shell functions defined in ltmain.sh | ||
32164 | + # decide which to use based on capabilities of $DLLTOOL | ||
32165 | + case `$DLLTOOL --help 2>&1` in | ||
32166 | + *--identify-strict*) | ||
32167 | + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib | ||
32168 | + ;; | ||
32169 | + *) | ||
32170 | + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback | ||
32171 | + ;; | ||
32172 | + esac | ||
32173 | + ;; | ||
32174 | +*) | ||
32175 | + # fallback: assume linklib IS sharedlib | ||
32176 | + lt_cv_sharedlib_from_linklib_cmd="$ECHO" | ||
32177 | + ;; | ||
32178 | +esac | ||
32179 | + | ||
32180 | +fi | ||
32181 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5 | ||
32182 | +$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; } | ||
32183 | +sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd | ||
32184 | +test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO | ||
32185 | + | ||
32186 | + | ||
32187 | + | ||
32188 | + | ||
32189 | + | ||
32190 | + | ||
32191 | + | ||
32192 | plugin_option= | ||
32193 | plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll" | ||
32194 | for plugin in $plugin_names; do | ||
32195 | @@ -6793,8 +7045,10 @@ for plugin in $plugin_names; do | ||
32196 | done | ||
29099 | 32197 | ||
29100 | -# Copyright (C) 2001-2021 Free Software Foundation, Inc. | 32198 | if test -n "$ac_tool_prefix"; then |
29101 | +# Copyright (C) 2001-2017 Free Software Foundation, Inc. | 32199 | - # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. |
29102 | # | 32200 | -set dummy ${ac_tool_prefix}ar; ac_word=$2 |
29103 | # This file is free software; the Free Software Foundation | 32201 | + for ac_prog in ar |
29104 | # gives unlimited permission to copy and/or distribute it, | 32202 | + do |
29105 | @@ -110,7 +110,7 @@ am_aux_dir=`cd "$ac_aux_dir" && pwd` | 32203 | + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. |
32204 | +set dummy $ac_tool_prefix$ac_prog; ac_word=$2 | ||
32205 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
32206 | $as_echo_n "checking for $ac_word... " >&6; } | ||
32207 | if ${ac_cv_prog_AR+:} false; then : | ||
32208 | @@ -6810,7 +7064,7 @@ do | ||
32209 | test -z "$as_dir" && as_dir=. | ||
32210 | for ac_exec_ext in '' $ac_executable_extensions; do | ||
32211 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | ||
32212 | - ac_cv_prog_AR="${ac_tool_prefix}ar" | ||
32213 | + ac_cv_prog_AR="$ac_tool_prefix$ac_prog" | ||
32214 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
32215 | break 2 | ||
32216 | fi | ||
32217 | @@ -6830,11 +7084,15 @@ $as_echo "no" >&6; } | ||
32218 | fi | ||
29106 | 32219 | ||
29107 | # AM_CONDITIONAL -*- Autoconf -*- | ||
29108 | 32220 | ||
29109 | -# Copyright (C) 1997-2021 Free Software Foundation, Inc. | 32221 | + test -n "$AR" && break |
29110 | +# Copyright (C) 1997-2017 Free Software Foundation, Inc. | 32222 | + done |
29111 | # | 32223 | fi |
29112 | # This file is free software; the Free Software Foundation | 32224 | -if test -z "$ac_cv_prog_AR"; then |
29113 | # gives unlimited permission to copy and/or distribute it, | 32225 | +if test -z "$AR"; then |
29114 | @@ -141,7 +141,7 @@ AC_CONFIG_COMMANDS_PRE( | 32226 | ac_ct_AR=$AR |
29115 | Usually this means the macro was only invoked conditionally.]]) | 32227 | - # Extract the first word of "ar", so it can be a program name with args. |
29116 | fi])]) | 32228 | -set dummy ar; ac_word=$2 |
32229 | + for ac_prog in ar | ||
32230 | +do | ||
32231 | + # Extract the first word of "$ac_prog", so it can be a program name with args. | ||
32232 | +set dummy $ac_prog; ac_word=$2 | ||
32233 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
32234 | $as_echo_n "checking for $ac_word... " >&6; } | ||
32235 | if ${ac_cv_prog_ac_ct_AR+:} false; then : | ||
32236 | @@ -6850,7 +7108,7 @@ do | ||
32237 | test -z "$as_dir" && as_dir=. | ||
32238 | for ac_exec_ext in '' $ac_executable_extensions; do | ||
32239 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | ||
32240 | - ac_cv_prog_ac_ct_AR="ar" | ||
32241 | + ac_cv_prog_ac_ct_AR="$ac_prog" | ||
32242 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
32243 | break 2 | ||
32244 | fi | ||
32245 | @@ -6869,6 +7127,10 @@ else | ||
32246 | $as_echo "no" >&6; } | ||
32247 | fi | ||
29117 | 32248 | ||
29118 | -# Copyright (C) 1999-2021 Free Software Foundation, Inc. | 32249 | + |
29119 | +# Copyright (C) 1999-2017 Free Software Foundation, Inc. | 32250 | + test -n "$ac_ct_AR" && break |
29120 | # | 32251 | +done |
29121 | # This file is free software; the Free Software Foundation | 32252 | + |
29122 | # gives unlimited permission to copy and/or distribute it, | 32253 | if test "x$ac_ct_AR" = x; then |
29123 | @@ -332,12 +332,13 @@ _AM_SUBST_NOTMAKE([am__nodep])dnl | 32254 | AR="false" |
32255 | else | ||
32256 | @@ -6880,29 +7142,81 @@ ac_tool_warned=yes ;; | ||
32257 | esac | ||
32258 | AR=$ac_ct_AR | ||
32259 | fi | ||
32260 | -else | ||
32261 | - AR="$ac_cv_prog_AR" | ||
32262 | fi | ||
29124 | 32263 | ||
29125 | # Generate code to set up dependency tracking. -*- Autoconf -*- | 32264 | -test -z "$AR" && AR=ar |
32265 | -if test -n "$plugin_option"; then | ||
32266 | - if $AR --help 2>&1 | grep -q "\--plugin"; then | ||
32267 | - touch conftest.c | ||
32268 | - $AR $plugin_option rc conftest.a conftest.c | ||
32269 | - if test "$?" != 0; then | ||
32270 | - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5 | ||
32271 | + touch conftest.c | ||
32272 | + $AR $plugin_option rc conftest.a conftest.c | ||
32273 | + if test "$?" != 0; then | ||
32274 | + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5 | ||
32275 | $as_echo "$as_me: WARNING: Failed: $AR $plugin_option rc" >&2;} | ||
32276 | - else | ||
32277 | - AR="$AR $plugin_option" | ||
32278 | - fi | ||
32279 | - rm -f conftest.* | ||
32280 | + else | ||
32281 | + AR="$AR $plugin_option" | ||
32282 | fi | ||
32283 | -fi | ||
32284 | -test -z "$AR_FLAGS" && AR_FLAGS=cru | ||
32285 | + rm -f conftest.* | ||
32286 | +: ${AR=ar} | ||
32287 | +: ${AR_FLAGS=cru} | ||
32288 | + | ||
32289 | + | ||
32290 | + | ||
32291 | + | ||
32292 | + | ||
32293 | + | ||
32294 | + | ||
32295 | + | ||
32296 | + | ||
32297 | + | ||
32298 | + | ||
32299 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 | ||
32300 | +$as_echo_n "checking for archiver @FILE support... " >&6; } | ||
32301 | +if ${lt_cv_ar_at_file+:} false; then : | ||
32302 | + $as_echo_n "(cached) " >&6 | ||
32303 | +else | ||
32304 | + lt_cv_ar_at_file=no | ||
32305 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
32306 | +/* end confdefs.h. */ | ||
32307 | + | ||
32308 | +int | ||
32309 | +main () | ||
32310 | +{ | ||
29126 | 32311 | ||
29127 | -# Copyright (C) 1999-2021 Free Software Foundation, Inc. | 32312 | + ; |
29128 | +# Copyright (C) 1999-2017 Free Software Foundation, Inc. | 32313 | + return 0; |
29129 | # | 32314 | +} |
29130 | # This file is free software; the Free Software Foundation | 32315 | +_ACEOF |
29131 | # gives unlimited permission to copy and/or distribute it, | 32316 | +if ac_fn_c_try_compile "$LINENO"; then : |
29132 | # with or without modifications, as long as this notice is preserved. | 32317 | + echo conftest.$ac_objext > conftest.lst |
32318 | + lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5' | ||
32319 | + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 | ||
32320 | + (eval $lt_ar_try) 2>&5 | ||
32321 | + ac_status=$? | ||
32322 | + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 | ||
32323 | + test $ac_status = 0; } | ||
32324 | + if test "$ac_status" -eq 0; then | ||
32325 | + # Ensure the archiver fails upon bogus file names. | ||
32326 | + rm -f conftest.$ac_objext libconftest.a | ||
32327 | + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 | ||
32328 | + (eval $lt_ar_try) 2>&5 | ||
32329 | + ac_status=$? | ||
32330 | + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 | ||
32331 | + test $ac_status = 0; } | ||
32332 | + if test "$ac_status" -ne 0; then | ||
32333 | + lt_cv_ar_at_file=@ | ||
32334 | + fi | ||
32335 | + fi | ||
32336 | + rm -f conftest.* libconftest.a | ||
32337 | |||
32338 | +fi | ||
32339 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
32340 | |||
32341 | +fi | ||
32342 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 | ||
32343 | +$as_echo "$lt_cv_ar_at_file" >&6; } | ||
32344 | |||
32345 | +if test "x$lt_cv_ar_at_file" = xno; then | ||
32346 | + archiver_list_spec= | ||
32347 | +else | ||
32348 | + archiver_list_spec=$lt_cv_ar_at_file | ||
32349 | +fi | ||
32350 | |||
32351 | |||
32352 | |||
32353 | @@ -7291,8 +7605,8 @@ esac | ||
32354 | lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" | ||
32355 | |||
32356 | # Transform an extracted symbol line into symbol name and symbol address | ||
32357 | -lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" | ||
32358 | -lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'" | ||
32359 | +lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" | ||
32360 | +lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'" | ||
32361 | |||
32362 | # Handle CRLF in mingw tool chain | ||
32363 | opt_cr= | ||
32364 | @@ -7328,6 +7642,7 @@ for ac_symprfx in "" "_"; do | ||
32365 | else | ||
32366 | lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" | ||
32367 | fi | ||
32368 | + lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" | ||
29133 | 32369 | ||
32370 | # Check to see that the pipe works correctly. | ||
32371 | pipe_works=no | ||
32372 | @@ -7369,6 +7684,18 @@ _LT_EOF | ||
32373 | if $GREP ' nm_test_var$' "$nlist" >/dev/null; then | ||
32374 | if $GREP ' nm_test_func$' "$nlist" >/dev/null; then | ||
32375 | cat <<_LT_EOF > conftest.$ac_ext | ||
32376 | +/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ | ||
32377 | +#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) | ||
32378 | +/* DATA imports from DLLs on WIN32 con't be const, because runtime | ||
32379 | + relocations are performed -- see ld's documentation on pseudo-relocs. */ | ||
32380 | +# define LT_DLSYM_CONST | ||
32381 | +#elif defined(__osf__) | ||
32382 | +/* This system does not cope well with relocations in const data. */ | ||
32383 | +# define LT_DLSYM_CONST | ||
32384 | +#else | ||
32385 | +# define LT_DLSYM_CONST const | ||
32386 | +#endif | ||
29134 | + | 32387 | + |
29135 | # _AM_OUTPUT_DEPENDENCY_COMMANDS | 32388 | #ifdef __cplusplus |
29136 | # ------------------------------ | 32389 | extern "C" { |
29137 | AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], | 32390 | #endif |
29138 | @@ -345,43 +346,49 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], | 32391 | @@ -7380,7 +7707,7 @@ _LT_EOF |
29139 | # Older Autoconf quotes --file arguments for eval, but not when files | 32392 | cat <<_LT_EOF >> conftest.$ac_ext |
29140 | # are listed without --file. Let's play safe and only enable the eval | 32393 | |
29141 | # if we detect the quoting. | 32394 | /* The mapping between symbol names and symbols. */ |
29142 | - # TODO: see whether this extra hack can be removed once we start | 32395 | -const struct { |
29143 | - # requiring Autoconf 2.70 or later. | 32396 | +LT_DLSYM_CONST struct { |
29144 | - AS_CASE([$CONFIG_FILES], | 32397 | const char *name; |
29145 | - [*\'*], [eval set x "$CONFIG_FILES"], | 32398 | void *address; |
29146 | - [*], [set x $CONFIG_FILES]) | ||
29147 | + case $CONFIG_FILES in | ||
29148 | + *\'*) eval set x "$CONFIG_FILES" ;; | ||
29149 | + *) set x $CONFIG_FILES ;; | ||
29150 | + esac | ||
29151 | shift | ||
29152 | - # Used to flag and report bootstrapping failures. | ||
29153 | - am_rc=0 | ||
29154 | - for am_mf | ||
29155 | + for mf | ||
29156 | do | ||
29157 | # Strip MF so we end up with the name of the file. | ||
29158 | - am_mf=`AS_ECHO(["$am_mf"]) | sed -e 's/:.*$//'` | ||
29159 | - # Check whether this is an Automake generated Makefile which includes | ||
29160 | - # dependency-tracking related rules and includes. | ||
29161 | - # Grep'ing the whole file directly is not great: AIX grep has a line | ||
29162 | + mf=`echo "$mf" | sed -e 's/:.*$//'` | ||
29163 | + # Check whether this is an Automake generated Makefile or not. | ||
29164 | + # We used to match only the files named 'Makefile.in', but | ||
29165 | + # some people rename them; so instead we look at the file content. | ||
29166 | + # Grep'ing the first line is not enough: some people post-process | ||
29167 | + # each Makefile.in and add a new line on top of each file to say so. | ||
29168 | + # Grep'ing the whole file is not good either: AIX grep has a line | ||
29169 | # limit of 2048, but all sed's we know have understand at least 4000. | ||
29170 | - sed -n 's,^am--depfiles:.*,X,p' "$am_mf" | grep X >/dev/null 2>&1 \ | ||
29171 | - || continue | ||
29172 | - am_dirpart=`AS_DIRNAME(["$am_mf"])` | ||
29173 | - am_filepart=`AS_BASENAME(["$am_mf"])` | ||
29174 | - AM_RUN_LOG([cd "$am_dirpart" \ | ||
29175 | - && sed -e '/# am--include-marker/d' "$am_filepart" \ | ||
29176 | - | $MAKE -f - am--depfiles]) || am_rc=$? | ||
29177 | + if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then | ||
29178 | + dirpart=`AS_DIRNAME("$mf")` | ||
29179 | + else | ||
29180 | + continue | ||
29181 | + fi | ||
29182 | + # Extract the definition of DEPDIR, am__include, and am__quote | ||
29183 | + # from the Makefile without running 'make'. | ||
29184 | + DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` | ||
29185 | + test -z "$DEPDIR" && continue | ||
29186 | + am__include=`sed -n 's/^am__include = //p' < "$mf"` | ||
29187 | + test -z "$am__include" && continue | ||
29188 | + am__quote=`sed -n 's/^am__quote = //p' < "$mf"` | ||
29189 | + # Find all dependency output files, they are included files with | ||
29190 | + # $(DEPDIR) in their names. We invoke sed twice because it is the | ||
29191 | + # simplest approach to changing $(DEPDIR) to its actual value in the | ||
29192 | + # expansion. | ||
29193 | + for file in `sed -n " | ||
29194 | + s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ | ||
29195 | + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do | ||
29196 | + # Make sure the directory exists. | ||
29197 | + test -f "$dirpart/$file" && continue | ||
29198 | + fdir=`AS_DIRNAME(["$file"])` | ||
29199 | + AS_MKDIR_P([$dirpart/$fdir]) | ||
29200 | + # echo "creating $dirpart/$file" | ||
29201 | + echo '# dummy' > "$dirpart/$file" | ||
29202 | + done | ||
29203 | done | ||
29204 | - if test $am_rc -ne 0; then | ||
29205 | - AC_MSG_FAILURE([Something went wrong bootstrapping makefile fragments | ||
29206 | - for automatic dependency tracking. If GNU make was not used, consider | ||
29207 | - re-running the configure script with MAKE="gmake" (or whatever is | ||
29208 | - necessary). You can also try re-running configure with the | ||
29209 | - '--disable-dependency-tracking' option to at least be able to build | ||
29210 | - the package (albeit without support for automatic dependency tracking).]) | ||
29211 | - fi | ||
29212 | - AS_UNSET([am_dirpart]) | ||
29213 | - AS_UNSET([am_filepart]) | ||
29214 | - AS_UNSET([am_mf]) | ||
29215 | - AS_UNSET([am_rc]) | ||
29216 | - rm -f conftest-deps.mk | ||
29217 | } | 32399 | } |
29218 | ])# _AM_OUTPUT_DEPENDENCY_COMMANDS | 32400 | @@ -7406,8 +7733,8 @@ static const void *lt_preloaded_setup() { |
32401 | _LT_EOF | ||
32402 | # Now try linking the two files. | ||
32403 | mv conftest.$ac_objext conftstm.$ac_objext | ||
32404 | - lt_save_LIBS="$LIBS" | ||
32405 | - lt_save_CFLAGS="$CFLAGS" | ||
32406 | + lt_globsym_save_LIBS=$LIBS | ||
32407 | + lt_globsym_save_CFLAGS=$CFLAGS | ||
32408 | LIBS="conftstm.$ac_objext" | ||
32409 | CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" | ||
32410 | if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 | ||
32411 | @@ -7417,8 +7744,8 @@ _LT_EOF | ||
32412 | test $ac_status = 0; } && test -s conftest${ac_exeext}; then | ||
32413 | pipe_works=yes | ||
32414 | fi | ||
32415 | - LIBS="$lt_save_LIBS" | ||
32416 | - CFLAGS="$lt_save_CFLAGS" | ||
32417 | + LIBS=$lt_globsym_save_LIBS | ||
32418 | + CFLAGS=$lt_globsym_save_CFLAGS | ||
32419 | else | ||
32420 | echo "cannot find nm_test_func in $nlist" >&5 | ||
32421 | fi | ||
32422 | @@ -7455,6 +7782,14 @@ else | ||
32423 | $as_echo "ok" >&6; } | ||
32424 | fi | ||
32425 | |||
32426 | +# Response file support. | ||
32427 | +if test "$lt_cv_nm_interface" = "MS dumpbin"; then | ||
32428 | + nm_file_list_spec='@' | ||
32429 | +elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then | ||
32430 | + nm_file_list_spec='@' | ||
32431 | +fi | ||
32432 | + | ||
32433 | + | ||
32434 | |||
32435 | |||
32436 | |||
32437 | @@ -7473,6 +7808,47 @@ fi | ||
32438 | |||
32439 | |||
32440 | |||
32441 | + | ||
32442 | + | ||
32443 | + | ||
32444 | + | ||
32445 | + | ||
32446 | + | ||
32447 | + | ||
32448 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 | ||
32449 | +$as_echo_n "checking for sysroot... " >&6; } | ||
32450 | + | ||
32451 | +# Check whether --with-libtool-sysroot was given. | ||
32452 | +if test "${with_libtool_sysroot+set}" = set; then : | ||
32453 | + withval=$with_libtool_sysroot; | ||
32454 | +else | ||
32455 | + with_libtool_sysroot=no | ||
32456 | +fi | ||
32457 | + | ||
32458 | + | ||
32459 | +lt_sysroot= | ||
32460 | +case ${with_libtool_sysroot} in #( | ||
32461 | + yes) | ||
32462 | + if test "$GCC" = yes; then | ||
32463 | + lt_sysroot=`$CC --print-sysroot 2>/dev/null` | ||
32464 | + fi | ||
32465 | + ;; #( | ||
32466 | + /*) | ||
32467 | + lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"` | ||
32468 | + ;; #( | ||
32469 | + no|'') | ||
32470 | + ;; #( | ||
32471 | + *) | ||
32472 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5 | ||
32473 | +$as_echo "${with_libtool_sysroot}" >&6; } | ||
32474 | + as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 | ||
32475 | + ;; | ||
32476 | +esac | ||
32477 | + | ||
32478 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 | ||
32479 | +$as_echo "${lt_sysroot:-no}" >&6; } | ||
32480 | + | ||
32481 | + | ||
32482 | |||
32483 | |||
32484 | |||
32485 | @@ -7682,6 +8058,123 @@ esac | ||
32486 | |||
32487 | need_locks="$enable_libtool_lock" | ||
32488 | |||
32489 | +if test -n "$ac_tool_prefix"; then | ||
32490 | + # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args. | ||
32491 | +set dummy ${ac_tool_prefix}mt; ac_word=$2 | ||
32492 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
32493 | +$as_echo_n "checking for $ac_word... " >&6; } | ||
32494 | +if ${ac_cv_prog_MANIFEST_TOOL+:} false; then : | ||
32495 | + $as_echo_n "(cached) " >&6 | ||
32496 | +else | ||
32497 | + if test -n "$MANIFEST_TOOL"; then | ||
32498 | + ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test. | ||
32499 | +else | ||
32500 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | ||
32501 | +for as_dir in $PATH | ||
32502 | +do | ||
32503 | + IFS=$as_save_IFS | ||
32504 | + test -z "$as_dir" && as_dir=. | ||
32505 | + for ac_exec_ext in '' $ac_executable_extensions; do | ||
32506 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | ||
32507 | + ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" | ||
32508 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
32509 | + break 2 | ||
32510 | + fi | ||
32511 | +done | ||
32512 | + done | ||
32513 | +IFS=$as_save_IFS | ||
32514 | + | ||
32515 | +fi | ||
32516 | +fi | ||
32517 | +MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL | ||
32518 | +if test -n "$MANIFEST_TOOL"; then | ||
32519 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5 | ||
32520 | +$as_echo "$MANIFEST_TOOL" >&6; } | ||
32521 | +else | ||
32522 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
32523 | +$as_echo "no" >&6; } | ||
32524 | +fi | ||
32525 | + | ||
32526 | + | ||
32527 | +fi | ||
32528 | +if test -z "$ac_cv_prog_MANIFEST_TOOL"; then | ||
32529 | + ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL | ||
32530 | + # Extract the first word of "mt", so it can be a program name with args. | ||
32531 | +set dummy mt; ac_word=$2 | ||
32532 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
32533 | +$as_echo_n "checking for $ac_word... " >&6; } | ||
32534 | +if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then : | ||
32535 | + $as_echo_n "(cached) " >&6 | ||
32536 | +else | ||
32537 | + if test -n "$ac_ct_MANIFEST_TOOL"; then | ||
32538 | + ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test. | ||
32539 | +else | ||
32540 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | ||
32541 | +for as_dir in $PATH | ||
32542 | +do | ||
32543 | + IFS=$as_save_IFS | ||
32544 | + test -z "$as_dir" && as_dir=. | ||
32545 | + for ac_exec_ext in '' $ac_executable_extensions; do | ||
32546 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | ||
32547 | + ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" | ||
32548 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
32549 | + break 2 | ||
32550 | + fi | ||
32551 | +done | ||
32552 | + done | ||
32553 | +IFS=$as_save_IFS | ||
32554 | + | ||
32555 | +fi | ||
32556 | +fi | ||
32557 | +ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL | ||
32558 | +if test -n "$ac_ct_MANIFEST_TOOL"; then | ||
32559 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5 | ||
32560 | +$as_echo "$ac_ct_MANIFEST_TOOL" >&6; } | ||
32561 | +else | ||
32562 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
32563 | +$as_echo "no" >&6; } | ||
32564 | +fi | ||
32565 | + | ||
32566 | + if test "x$ac_ct_MANIFEST_TOOL" = x; then | ||
32567 | + MANIFEST_TOOL=":" | ||
32568 | + else | ||
32569 | + case $cross_compiling:$ac_tool_warned in | ||
32570 | +yes:) | ||
32571 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 | ||
32572 | +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} | ||
32573 | +ac_tool_warned=yes ;; | ||
32574 | +esac | ||
32575 | + MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL | ||
32576 | + fi | ||
32577 | +else | ||
32578 | + MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL" | ||
32579 | +fi | ||
32580 | + | ||
32581 | +test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt | ||
32582 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5 | ||
32583 | +$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; } | ||
32584 | +if ${lt_cv_path_mainfest_tool+:} false; then : | ||
32585 | + $as_echo_n "(cached) " >&6 | ||
32586 | +else | ||
32587 | + lt_cv_path_mainfest_tool=no | ||
32588 | + echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5 | ||
32589 | + $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out | ||
32590 | + cat conftest.err >&5 | ||
32591 | + if $GREP 'Manifest Tool' conftest.out > /dev/null; then | ||
32592 | + lt_cv_path_mainfest_tool=yes | ||
32593 | + fi | ||
32594 | + rm -f conftest* | ||
32595 | +fi | ||
32596 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5 | ||
32597 | +$as_echo "$lt_cv_path_mainfest_tool" >&6; } | ||
32598 | +if test "x$lt_cv_path_mainfest_tool" != xyes; then | ||
32599 | + MANIFEST_TOOL=: | ||
32600 | +fi | ||
32601 | + | ||
32602 | + | ||
32603 | + | ||
32604 | + | ||
32605 | + | ||
32606 | |||
32607 | case $host_os in | ||
32608 | rhapsody* | darwin*) | ||
32609 | @@ -8245,6 +8738,8 @@ _LT_EOF | ||
32610 | $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 | ||
32611 | echo "$AR cru libconftest.a conftest.o" >&5 | ||
32612 | $AR cru libconftest.a conftest.o 2>&5 | ||
32613 | + echo "$RANLIB libconftest.a" >&5 | ||
32614 | + $RANLIB libconftest.a 2>&5 | ||
32615 | cat > conftest.c << _LT_EOF | ||
32616 | int main() { return 0;} | ||
32617 | _LT_EOF | ||
32618 | @@ -9499,8 +9994,6 @@ fi | ||
32619 | lt_prog_compiler_pic= | ||
32620 | lt_prog_compiler_static= | ||
32621 | |||
32622 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 | ||
32623 | -$as_echo_n "checking for $compiler option to produce PIC... " >&6; } | ||
32624 | |||
32625 | if test "$GCC" = yes; then | ||
32626 | lt_prog_compiler_wl='-Wl,' | ||
32627 | @@ -9666,6 +10159,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } | ||
32628 | lt_prog_compiler_pic='--shared' | ||
32629 | lt_prog_compiler_static='--static' | ||
32630 | ;; | ||
32631 | + nagfor*) | ||
32632 | + # NAG Fortran compiler | ||
32633 | + lt_prog_compiler_wl='-Wl,-Wl,,' | ||
32634 | + lt_prog_compiler_pic='-PIC' | ||
32635 | + lt_prog_compiler_static='-Bstatic' | ||
32636 | + ;; | ||
32637 | pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) | ||
32638 | # Portland Group compilers (*not* the Pentium gcc compiler, | ||
32639 | # which looks to be a dead project) | ||
32640 | @@ -9728,7 +10227,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } | ||
32641 | lt_prog_compiler_pic='-KPIC' | ||
32642 | lt_prog_compiler_static='-Bstatic' | ||
32643 | case $cc_basename in | ||
32644 | - f77* | f90* | f95*) | ||
32645 | + f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) | ||
32646 | lt_prog_compiler_wl='-Qoption ld ';; | ||
32647 | *) | ||
32648 | lt_prog_compiler_wl='-Wl,';; | ||
32649 | @@ -9785,13 +10284,17 @@ case $host_os in | ||
32650 | lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" | ||
32651 | ;; | ||
32652 | esac | ||
32653 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5 | ||
32654 | -$as_echo "$lt_prog_compiler_pic" >&6; } | ||
32655 | - | ||
32656 | - | ||
32657 | - | ||
32658 | - | ||
32659 | |||
32660 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 | ||
32661 | +$as_echo_n "checking for $compiler option to produce PIC... " >&6; } | ||
32662 | +if ${lt_cv_prog_compiler_pic+:} false; then : | ||
32663 | + $as_echo_n "(cached) " >&6 | ||
32664 | +else | ||
32665 | + lt_cv_prog_compiler_pic=$lt_prog_compiler_pic | ||
32666 | +fi | ||
32667 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5 | ||
32668 | +$as_echo "$lt_cv_prog_compiler_pic" >&6; } | ||
32669 | +lt_prog_compiler_pic=$lt_cv_prog_compiler_pic | ||
29219 | 32670 | ||
29220 | @@ -390,17 +397,18 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], | ||
29221 | # ----------------------------- | ||
29222 | # This macro should only be invoked once -- use via AC_REQUIRE. | ||
29223 | # | 32671 | # |
29224 | -# This code is only required when automatic dependency tracking is enabled. | 32672 | # Check to make sure the PIC flag actually works. |
29225 | -# This creates each '.Po' and '.Plo' makefile fragment that we'll need in | 32673 | @@ -9852,6 +10355,11 @@ fi |
29226 | -# order to bootstrap the dependency handling code. | ||
29227 | +# This code is only required when automatic dependency tracking | ||
29228 | +# is enabled. FIXME. This creates each '.P' file that we will | ||
29229 | +# need in order to bootstrap the dependency handling code. | ||
29230 | AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], | ||
29231 | [AC_CONFIG_COMMANDS([depfiles], | ||
29232 | [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS], | ||
29233 | - [AMDEP_TRUE="$AMDEP_TRUE" MAKE="${MAKE-make}"])]) | ||
29234 | + [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) | ||
29235 | +]) | ||
29236 | 32674 | ||
29237 | # Do all the work for Automake. -*- Autoconf -*- | ||
29238 | 32675 | ||
29239 | -# Copyright (C) 1996-2021 Free Software Foundation, Inc. | 32676 | |
29240 | +# Copyright (C) 1996-2017 Free Software Foundation, Inc. | 32677 | + |
32678 | + | ||
32679 | + | ||
32680 | + | ||
32681 | + | ||
29241 | # | 32682 | # |
29242 | # This file is free software; the Free Software Foundation | 32683 | # Check to make sure the static flag actually works. |
29243 | # gives unlimited permission to copy and/or distribute it, | 32684 | # |
29244 | @@ -428,10 +436,6 @@ m4_defn([AC_PROG_CC]) | 32685 | @@ -10202,7 +10710,8 @@ _LT_EOF |
29245 | # release and drop the old call support. | 32686 | allow_undefined_flag=unsupported |
29246 | AC_DEFUN([AM_INIT_AUTOMAKE], | 32687 | always_export_symbols=no |
29247 | [AC_PREREQ([2.65])dnl | 32688 | enable_shared_with_static_runtimes=yes |
29248 | -m4_ifdef([_$0_ALREADY_INIT], | 32689 | - export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' |
29249 | - [m4_fatal([$0 expanded multiple times | 32690 | + export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols' |
29250 | -]m4_defn([_$0_ALREADY_INIT]))], | 32691 | + exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' |
29251 | - [m4_define([_$0_ALREADY_INIT], m4_expansion_stack)])dnl | 32692 | |
29252 | dnl Autoconf wants to disallow AM_ names. We explicitly allow | 32693 | if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then |
29253 | dnl the ones we care about. | 32694 | archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' |
29254 | m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl | 32695 | @@ -10301,12 +10810,12 @@ _LT_EOF |
29255 | @@ -468,7 +472,7 @@ m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl | 32696 | whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' |
29256 | [_AM_SET_OPTIONS([$1])dnl | 32697 | hardcode_libdir_flag_spec= |
29257 | dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT. | 32698 | hardcode_libdir_flag_spec_ld='-rpath $libdir' |
29258 | m4_if( | 32699 | - archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' |
29259 | - m4_ifset([AC_PACKAGE_NAME], [ok]):m4_ifset([AC_PACKAGE_VERSION], [ok]), | 32700 | + archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' |
29260 | + m4_ifdef([AC_PACKAGE_NAME], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]), | 32701 | if test "x$supports_anon_versioning" = xyes; then |
29261 | [ok:ok],, | 32702 | archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ |
29262 | [m4_fatal([AC_INIT should be called with package and version arguments])])dnl | 32703 | cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ |
29263 | AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl | 32704 | echo "local: *; };" >> $output_objdir/$libname.ver~ |
29264 | @@ -491,8 +495,8 @@ AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl | 32705 | - $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' |
29265 | AC_REQUIRE([AC_PROG_MKDIR_P])dnl | 32706 | + $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' |
29266 | # For better backward compatibility. To be removed once Automake 1.9.x | 32707 | fi |
29267 | # dies out for good. For more background, see: | 32708 | ;; |
29268 | -# <https://lists.gnu.org/archive/html/automake/2012-07/msg00001.html> | 32709 | esac |
29269 | -# <https://lists.gnu.org/archive/html/automake/2012-07/msg00014.html> | 32710 | @@ -10320,8 +10829,8 @@ _LT_EOF |
29270 | +# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html> | 32711 | archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' |
29271 | +# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html> | 32712 | wlarc= |
29272 | AC_SUBST([mkdir_p], ['$(MKDIR_P)']) | 32713 | else |
29273 | # We need awk for the "check" target (and possibly the TAP driver). The | 32714 | - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
29274 | # system "awk" is bad on some platforms. | 32715 | - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
29275 | @@ -520,20 +524,6 @@ AC_PROVIDE_IFELSE([AC_PROG_OBJCXX], | 32716 | + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
29276 | [m4_define([AC_PROG_OBJCXX], | 32717 | + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
29277 | m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl | 32718 | fi |
29278 | ]) | 32719 | ;; |
29279 | -# Variables for tags utilities; see am/tags.am | 32720 | |
29280 | -if test -z "$CTAGS"; then | 32721 | @@ -10339,8 +10848,8 @@ _LT_EOF |
29281 | - CTAGS=ctags | 32722 | |
29282 | -fi | 32723 | _LT_EOF |
29283 | -AC_SUBST([CTAGS]) | 32724 | elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then |
29284 | -if test -z "$ETAGS"; then | 32725 | - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
29285 | - ETAGS=etags | 32726 | - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
32727 | + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' | ||
32728 | + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' | ||
32729 | else | ||
32730 | ld_shlibs=no | ||
32731 | fi | ||
32732 | @@ -10386,8 +10895,8 @@ _LT_EOF | ||
32733 | |||
32734 | *) | ||
32735 | if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then | ||
32736 | - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' | ||
32737 | - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' | ||
32738 | + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' | ||
32739 | + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' | ||
32740 | else | ||
32741 | ld_shlibs=no | ||
32742 | fi | ||
32743 | @@ -10517,7 +11026,13 @@ _LT_EOF | ||
32744 | allow_undefined_flag='-berok' | ||
32745 | # Determine the default libpath from the value encoded in an | ||
32746 | # empty executable. | ||
32747 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
32748 | + if test "${lt_cv_aix_libpath+set}" = set; then | ||
32749 | + aix_libpath=$lt_cv_aix_libpath | ||
32750 | +else | ||
32751 | + if ${lt_cv_aix_libpath_+:} false; then : | ||
32752 | + $as_echo_n "(cached) " >&6 | ||
32753 | +else | ||
32754 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
32755 | /* end confdefs.h. */ | ||
32756 | |||
32757 | int | ||
32758 | @@ -10530,22 +11045,29 @@ main () | ||
32759 | _ACEOF | ||
32760 | if ac_fn_c_try_link "$LINENO"; then : | ||
32761 | |||
32762 | -lt_aix_libpath_sed=' | ||
32763 | - /Import File Strings/,/^$/ { | ||
32764 | - /^0/ { | ||
32765 | - s/^0 *\(.*\)$/\1/ | ||
32766 | - p | ||
32767 | - } | ||
32768 | - }' | ||
32769 | -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | ||
32770 | -# Check for a 64-bit object if we didn't find anything. | ||
32771 | -if test -z "$aix_libpath"; then | ||
32772 | - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | ||
29286 | -fi | 32773 | -fi |
29287 | -AC_SUBST([ETAGS]) | 32774 | + lt_aix_libpath_sed=' |
29288 | -if test -z "$CSCOPE"; then | 32775 | + /Import File Strings/,/^$/ { |
29289 | - CSCOPE=cscope | 32776 | + /^0/ { |
32777 | + s/^0 *\([^ ]*\) *$/\1/ | ||
32778 | + p | ||
32779 | + } | ||
32780 | + }' | ||
32781 | + lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | ||
32782 | + # Check for a 64-bit object if we didn't find anything. | ||
32783 | + if test -z "$lt_cv_aix_libpath_"; then | ||
32784 | + lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | ||
32785 | + fi | ||
32786 | fi | ||
32787 | rm -f core conftest.err conftest.$ac_objext \ | ||
32788 | conftest$ac_exeext conftest.$ac_ext | ||
32789 | -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | ||
32790 | + if test -z "$lt_cv_aix_libpath_"; then | ||
32791 | + lt_cv_aix_libpath_="/usr/lib:/lib" | ||
32792 | + fi | ||
32793 | + | ||
32794 | +fi | ||
32795 | + | ||
32796 | + aix_libpath=$lt_cv_aix_libpath_ | ||
32797 | +fi | ||
32798 | |||
32799 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" | ||
32800 | 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" | ||
32801 | @@ -10557,7 +11079,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | ||
32802 | else | ||
32803 | # Determine the default libpath from the value encoded in an | ||
32804 | # empty executable. | ||
32805 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
32806 | + if test "${lt_cv_aix_libpath+set}" = set; then | ||
32807 | + aix_libpath=$lt_cv_aix_libpath | ||
32808 | +else | ||
32809 | + if ${lt_cv_aix_libpath_+:} false; then : | ||
32810 | + $as_echo_n "(cached) " >&6 | ||
32811 | +else | ||
32812 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
32813 | /* end confdefs.h. */ | ||
32814 | |||
32815 | int | ||
32816 | @@ -10570,22 +11098,29 @@ main () | ||
32817 | _ACEOF | ||
32818 | if ac_fn_c_try_link "$LINENO"; then : | ||
32819 | |||
32820 | -lt_aix_libpath_sed=' | ||
32821 | - /Import File Strings/,/^$/ { | ||
32822 | - /^0/ { | ||
32823 | - s/^0 *\(.*\)$/\1/ | ||
32824 | - p | ||
32825 | - } | ||
32826 | - }' | ||
32827 | -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | ||
32828 | -# Check for a 64-bit object if we didn't find anything. | ||
32829 | -if test -z "$aix_libpath"; then | ||
32830 | - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | ||
29290 | -fi | 32831 | -fi |
29291 | -AC_SUBST([CSCOPE]) | 32832 | + lt_aix_libpath_sed=' |
32833 | + /Import File Strings/,/^$/ { | ||
32834 | + /^0/ { | ||
32835 | + s/^0 *\([^ ]*\) *$/\1/ | ||
32836 | + p | ||
32837 | + } | ||
32838 | + }' | ||
32839 | + lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | ||
32840 | + # Check for a 64-bit object if we didn't find anything. | ||
32841 | + if test -z "$lt_cv_aix_libpath_"; then | ||
32842 | + lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | ||
32843 | + fi | ||
32844 | fi | ||
32845 | rm -f core conftest.err conftest.$ac_objext \ | ||
32846 | conftest$ac_exeext conftest.$ac_ext | ||
32847 | -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | ||
32848 | + if test -z "$lt_cv_aix_libpath_"; then | ||
32849 | + lt_cv_aix_libpath_="/usr/lib:/lib" | ||
32850 | + fi | ||
32851 | + | ||
32852 | +fi | ||
32853 | + | ||
32854 | + aix_libpath=$lt_cv_aix_libpath_ | ||
32855 | +fi | ||
32856 | |||
32857 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" | ||
32858 | # Warning - without using the other run time loading flags, | ||
32859 | @@ -10630,20 +11165,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | ||
32860 | # Microsoft Visual C++. | ||
32861 | # hardcode_libdir_flag_spec is actually meaningless, as there is | ||
32862 | # no search path for DLLs. | ||
32863 | - hardcode_libdir_flag_spec=' ' | ||
32864 | - allow_undefined_flag=unsupported | ||
32865 | - # Tell ltmain to make .lib files, not .a files. | ||
32866 | - libext=lib | ||
32867 | - # Tell ltmain to make .dll files, not .so files. | ||
32868 | - shrext_cmds=".dll" | ||
32869 | - # FIXME: Setting linknames here is a bad hack. | ||
32870 | - archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' | ||
32871 | - # The linker will automatically build a .lib file if we build a DLL. | ||
32872 | - old_archive_from_new_cmds='true' | ||
32873 | - # FIXME: Should let the user specify the lib program. | ||
32874 | - old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' | ||
32875 | - fix_srcfile_path='`cygpath -w "$srcfile"`' | ||
32876 | - enable_shared_with_static_runtimes=yes | ||
32877 | + case $cc_basename in | ||
32878 | + cl*) | ||
32879 | + # Native MSVC | ||
32880 | + hardcode_libdir_flag_spec=' ' | ||
32881 | + allow_undefined_flag=unsupported | ||
32882 | + always_export_symbols=yes | ||
32883 | + file_list_spec='@' | ||
32884 | + # Tell ltmain to make .lib files, not .a files. | ||
32885 | + libext=lib | ||
32886 | + # Tell ltmain to make .dll files, not .so files. | ||
32887 | + shrext_cmds=".dll" | ||
32888 | + # FIXME: Setting linknames here is a bad hack. | ||
32889 | + archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' | ||
32890 | + archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then | ||
32891 | + sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; | ||
32892 | + else | ||
32893 | + sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; | ||
32894 | + fi~ | ||
32895 | + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ | ||
32896 | + linknames=' | ||
32897 | + # The linker will not automatically build a static lib if we build a DLL. | ||
32898 | + # _LT_TAGVAR(old_archive_from_new_cmds, )='true' | ||
32899 | + enable_shared_with_static_runtimes=yes | ||
32900 | + export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' | ||
32901 | + # Don't use ranlib | ||
32902 | + old_postinstall_cmds='chmod 644 $oldlib' | ||
32903 | + postlink_cmds='lt_outputfile="@OUTPUT@"~ | ||
32904 | + lt_tool_outputfile="@TOOL_OUTPUT@"~ | ||
32905 | + case $lt_outputfile in | ||
32906 | + *.exe|*.EXE) ;; | ||
32907 | + *) | ||
32908 | + lt_outputfile="$lt_outputfile.exe" | ||
32909 | + lt_tool_outputfile="$lt_tool_outputfile.exe" | ||
32910 | + ;; | ||
32911 | + esac~ | ||
32912 | + if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then | ||
32913 | + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; | ||
32914 | + $RM "$lt_outputfile.manifest"; | ||
32915 | + fi' | ||
32916 | + ;; | ||
32917 | + *) | ||
32918 | + # Assume MSVC wrapper | ||
32919 | + hardcode_libdir_flag_spec=' ' | ||
32920 | + allow_undefined_flag=unsupported | ||
32921 | + # Tell ltmain to make .lib files, not .a files. | ||
32922 | + libext=lib | ||
32923 | + # Tell ltmain to make .dll files, not .so files. | ||
32924 | + shrext_cmds=".dll" | ||
32925 | + # FIXME: Setting linknames here is a bad hack. | ||
32926 | + archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' | ||
32927 | + # The linker will automatically build a .lib file if we build a DLL. | ||
32928 | + old_archive_from_new_cmds='true' | ||
32929 | + # FIXME: Should let the user specify the lib program. | ||
32930 | + old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' | ||
32931 | + enable_shared_with_static_runtimes=yes | ||
32932 | + ;; | ||
32933 | + esac | ||
32934 | ;; | ||
32935 | |||
32936 | darwin* | rhapsody*) | ||
32937 | @@ -10704,7 +11282,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | ||
32938 | |||
32939 | # FreeBSD 3 and greater uses gcc -shared to do shared libraries. | ||
32940 | freebsd* | dragonfly*) | ||
32941 | - archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' | ||
32942 | + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' | ||
32943 | hardcode_libdir_flag_spec='-R$libdir' | ||
32944 | hardcode_direct=yes | ||
32945 | hardcode_shlibpath_var=no | ||
32946 | @@ -10712,7 +11290,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | ||
32947 | |||
32948 | hpux9*) | ||
32949 | if test "$GCC" = yes; then | ||
32950 | - archive_cmds='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' | ||
32951 | + archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' | ||
32952 | else | ||
32953 | 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' | ||
32954 | fi | ||
32955 | @@ -10728,7 +11306,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | ||
32956 | |||
32957 | hpux10*) | ||
32958 | if test "$GCC" = yes && test "$with_gnu_ld" = no; then | ||
32959 | - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' | ||
32960 | + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' | ||
32961 | else | ||
32962 | archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' | ||
32963 | fi | ||
32964 | @@ -10752,10 +11330,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | ||
32965 | archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' | ||
32966 | ;; | ||
32967 | ia64*) | ||
32968 | - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' | ||
32969 | + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' | ||
32970 | ;; | ||
32971 | *) | ||
32972 | - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' | ||
32973 | + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' | ||
32974 | ;; | ||
32975 | esac | ||
32976 | else | ||
32977 | @@ -10834,23 +11412,36 @@ fi | ||
32978 | |||
32979 | irix5* | irix6* | nonstopux*) | ||
32980 | if test "$GCC" = yes; then | ||
32981 | - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' | ||
32982 | + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' | ||
32983 | # Try to use the -exported_symbol ld option, if it does not | ||
32984 | # work, assume that -exports_file does not work either and | ||
32985 | # implicitly export all symbols. | ||
32986 | - save_LDFLAGS="$LDFLAGS" | ||
32987 | - LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" | ||
32988 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
32989 | + # This should be the same for all languages, so no per-tag cache variable. | ||
32990 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5 | ||
32991 | +$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; } | ||
32992 | +if ${lt_cv_irix_exported_symbol+:} false; then : | ||
32993 | + $as_echo_n "(cached) " >&6 | ||
32994 | +else | ||
32995 | + save_LDFLAGS="$LDFLAGS" | ||
32996 | + LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" | ||
32997 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
32998 | /* end confdefs.h. */ | ||
32999 | -int foo(void) {} | ||
33000 | +int foo (void) { return 0; } | ||
33001 | _ACEOF | ||
33002 | if ac_fn_c_try_link "$LINENO"; then : | ||
33003 | - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' | ||
29292 | - | 33004 | - |
29293 | AC_REQUIRE([AM_SILENT_RULES])dnl | 33005 | + lt_cv_irix_exported_symbol=yes |
29294 | dnl The testsuite driver may need to know about EXEEXT, so add the | 33006 | +else |
29295 | dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This | 33007 | + lt_cv_irix_exported_symbol=no |
29296 | @@ -573,7 +563,7 @@ END | 33008 | fi |
29297 | Aborting the configuration process, to ensure you take notice of the issue. | 33009 | rm -f core conftest.err conftest.$ac_objext \ |
33010 | conftest$ac_exeext conftest.$ac_ext | ||
33011 | - LDFLAGS="$save_LDFLAGS" | ||
33012 | + LDFLAGS="$save_LDFLAGS" | ||
33013 | +fi | ||
33014 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5 | ||
33015 | +$as_echo "$lt_cv_irix_exported_symbol" >&6; } | ||
33016 | + if test "$lt_cv_irix_exported_symbol" = yes; then | ||
33017 | + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' | ||
33018 | + fi | ||
33019 | else | ||
33020 | 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' | ||
33021 | 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' | ||
33022 | @@ -10935,7 +11526,7 @@ rm -f core conftest.err conftest.$ac_objext \ | ||
33023 | osf4* | osf5*) # as osf3* with the addition of -msym flag | ||
33024 | if test "$GCC" = yes; then | ||
33025 | allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' | ||
33026 | - archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' | ||
33027 | + archive_cmds='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' | ||
33028 | hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' | ||
33029 | else | ||
33030 | allow_undefined_flag=' -expect_unresolved \*' | ||
33031 | @@ -10954,9 +11545,9 @@ rm -f core conftest.err conftest.$ac_objext \ | ||
33032 | no_undefined_flag=' -z defs' | ||
33033 | if test "$GCC" = yes; then | ||
33034 | wlarc='${wl}' | ||
33035 | - archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' | ||
33036 | + archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' | ||
33037 | archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ | ||
33038 | - $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' | ||
33039 | + $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' | ||
33040 | else | ||
33041 | case `$CC -V 2>&1` in | ||
33042 | *"Compilers 5.0"*) | ||
33043 | @@ -11532,8 +12123,9 @@ cygwin* | mingw* | pw32* | cegcc*) | ||
33044 | need_version=no | ||
33045 | need_lib_prefix=no | ||
29298 | 33046 | ||
29299 | You can download and install GNU coreutils to get an 'rm' implementation | 33047 | - case $GCC,$host_os in |
29300 | -that behaves properly: <https://www.gnu.org/software/coreutils/>. | 33048 | - yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) |
29301 | +that behaves properly: <http://www.gnu.org/software/coreutils/>. | 33049 | + case $GCC,$cc_basename in |
33050 | + yes,*) | ||
33051 | + # gcc | ||
33052 | library_names_spec='$libname.dll.a' | ||
33053 | # DLL is installed to $(libdir)/../bin by postinstall_cmds | ||
33054 | postinstall_cmds='base_file=`basename \${file}`~ | ||
33055 | @@ -11566,13 +12158,71 @@ cygwin* | mingw* | pw32* | cegcc*) | ||
33056 | library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' | ||
33057 | ;; | ||
33058 | esac | ||
33059 | + dynamic_linker='Win32 ld.exe' | ||
33060 | + ;; | ||
33061 | + | ||
33062 | + *,cl*) | ||
33063 | + # Native MSVC | ||
33064 | + libname_spec='$name' | ||
33065 | + soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' | ||
33066 | + library_names_spec='${libname}.dll.lib' | ||
33067 | + | ||
33068 | + case $build_os in | ||
33069 | + mingw*) | ||
33070 | + sys_lib_search_path_spec= | ||
33071 | + lt_save_ifs=$IFS | ||
33072 | + IFS=';' | ||
33073 | + for lt_path in $LIB | ||
33074 | + do | ||
33075 | + IFS=$lt_save_ifs | ||
33076 | + # Let DOS variable expansion print the short 8.3 style file name. | ||
33077 | + lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` | ||
33078 | + sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" | ||
33079 | + done | ||
33080 | + IFS=$lt_save_ifs | ||
33081 | + # Convert to MSYS style. | ||
33082 | + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` | ||
33083 | + ;; | ||
33084 | + cygwin*) | ||
33085 | + # Convert to unix form, then to dos form, then back to unix form | ||
33086 | + # but this time dos style (no spaces!) so that the unix form looks | ||
33087 | + # like /cygdrive/c/PROGRA~1:/cygdr... | ||
33088 | + sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` | ||
33089 | + sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` | ||
33090 | + sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` | ||
33091 | + ;; | ||
33092 | + *) | ||
33093 | + sys_lib_search_path_spec="$LIB" | ||
33094 | + if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then | ||
33095 | + # It is most probably a Windows format PATH. | ||
33096 | + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` | ||
33097 | + else | ||
33098 | + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` | ||
33099 | + fi | ||
33100 | + # FIXME: find the short name or the path components, as spaces are | ||
33101 | + # common. (e.g. "Program Files" -> "PROGRA~1") | ||
33102 | + ;; | ||
33103 | + esac | ||
33104 | + | ||
33105 | + # DLL is installed to $(libdir)/../bin by postinstall_cmds | ||
33106 | + postinstall_cmds='base_file=`basename \${file}`~ | ||
33107 | + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ | ||
33108 | + dldir=$destdir/`dirname \$dlpath`~ | ||
33109 | + test -d \$dldir || mkdir -p \$dldir~ | ||
33110 | + $install_prog $dir/$dlname \$dldir/$dlname' | ||
33111 | + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ | ||
33112 | + dlpath=$dir/\$dldll~ | ||
33113 | + $RM \$dlpath' | ||
33114 | + shlibpath_overrides_runpath=yes | ||
33115 | + dynamic_linker='Win32 link.exe' | ||
33116 | ;; | ||
29302 | 33117 | ||
29303 | If you want to complete the configuration process using your problematic | 33118 | *) |
29304 | 'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM | 33119 | + # Assume MSVC wrapper |
29305 | @@ -615,7 +605,7 @@ for _am_header in $config_headers :; do | 33120 | library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' |
29306 | done | 33121 | + dynamic_linker='Win32 ld.exe' |
29307 | echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) | 33122 | ;; |
33123 | esac | ||
33124 | - dynamic_linker='Win32 ld.exe' | ||
33125 | # FIXME: first we should search . and the directory the executable is in | ||
33126 | shlibpath_var=PATH | ||
33127 | ;; | ||
33128 | @@ -12450,7 +13100,7 @@ else | ||
33129 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 | ||
33130 | lt_status=$lt_dlunknown | ||
33131 | cat > conftest.$ac_ext <<_LT_EOF | ||
33132 | -#line 12453 "configure" | ||
33133 | +#line $LINENO "configure" | ||
33134 | #include "confdefs.h" | ||
29308 | 33135 | ||
29309 | -# Copyright (C) 2001-2021 Free Software Foundation, Inc. | 33136 | #if HAVE_DLFCN_H |
29310 | +# Copyright (C) 2001-2017 Free Software Foundation, Inc. | 33137 | @@ -12494,10 +13144,10 @@ else |
29311 | # | 33138 | /* When -fvisbility=hidden is used, assume the code has been annotated |
29312 | # This file is free software; the Free Software Foundation | 33139 | correspondingly for the symbols needed. */ |
29313 | # gives unlimited permission to copy and/or distribute it, | 33140 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) |
29314 | @@ -639,7 +629,7 @@ AC_SUBST([install_sh])]) | 33141 | -void fnord () __attribute__((visibility("default"))); |
29315 | # Add --enable-maintainer-mode option to configure. -*- Autoconf -*- | 33142 | +int fnord () __attribute__((visibility("default"))); |
29316 | # From Jim Meyering | 33143 | #endif |
29317 | 33144 | ||
29318 | -# Copyright (C) 1996-2021 Free Software Foundation, Inc. | 33145 | -void fnord () { int i=42; } |
29319 | +# Copyright (C) 1996-2017 Free Software Foundation, Inc. | 33146 | +int fnord () { return 42; } |
29320 | # | 33147 | int main () |
29321 | # This file is free software; the Free Software Foundation | 33148 | { |
29322 | # gives unlimited permission to copy and/or distribute it, | 33149 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); |
29323 | @@ -674,7 +664,7 @@ AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) | 33150 | @@ -12556,7 +13206,7 @@ else |
33151 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 | ||
33152 | lt_status=$lt_dlunknown | ||
33153 | cat > conftest.$ac_ext <<_LT_EOF | ||
33154 | -#line 12559 "configure" | ||
33155 | +#line $LINENO "configure" | ||
33156 | #include "confdefs.h" | ||
29324 | 33157 | ||
29325 | # Check to see how 'make' treats includes. -*- Autoconf -*- | 33158 | #if HAVE_DLFCN_H |
33159 | @@ -12600,10 +13250,10 @@ else | ||
33160 | /* When -fvisbility=hidden is used, assume the code has been annotated | ||
33161 | correspondingly for the symbols needed. */ | ||
33162 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) | ||
33163 | -void fnord () __attribute__((visibility("default"))); | ||
33164 | +int fnord () __attribute__((visibility("default"))); | ||
33165 | #endif | ||
29326 | 33166 | ||
29327 | -# Copyright (C) 2001-2021 Free Software Foundation, Inc. | 33167 | -void fnord () { int i=42; } |
29328 | +# Copyright (C) 2001-2017 Free Software Foundation, Inc. | 33168 | +int fnord () { return 42; } |
33169 | int main () | ||
33170 | { | ||
33171 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); | ||
33172 | @@ -17596,13 +18246,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' | ||
33173 | lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' | ||
33174 | lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' | ||
33175 | lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' | ||
33176 | +lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`' | ||
33177 | +lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`' | ||
33178 | reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`' | ||
33179 | reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`' | ||
33180 | OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`' | ||
33181 | deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`' | ||
33182 | file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`' | ||
33183 | +file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`' | ||
33184 | +want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`' | ||
33185 | +DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`' | ||
33186 | +sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`' | ||
33187 | AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`' | ||
33188 | AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`' | ||
33189 | +archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`' | ||
33190 | STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' | ||
33191 | RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' | ||
33192 | old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' | ||
33193 | @@ -17617,14 +18274,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de | ||
33194 | lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' | ||
33195 | lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' | ||
33196 | 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"`' | ||
33197 | +nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`' | ||
33198 | +lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`' | ||
33199 | objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`' | ||
33200 | MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`' | ||
33201 | lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`' | ||
33202 | -lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' | ||
33203 | lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`' | ||
33204 | +lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' | ||
33205 | lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`' | ||
33206 | lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`' | ||
33207 | need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`' | ||
33208 | +MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`' | ||
33209 | DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' | ||
33210 | NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' | ||
33211 | LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' | ||
33212 | @@ -17657,12 +18317,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q | ||
33213 | hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' | ||
33214 | inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' | ||
33215 | link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' | ||
33216 | -fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`' | ||
33217 | always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`' | ||
33218 | export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`' | ||
33219 | exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`' | ||
33220 | include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`' | ||
33221 | prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`' | ||
33222 | +postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`' | ||
33223 | file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' | ||
33224 | variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' | ||
33225 | need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' | ||
33226 | @@ -17717,8 +18377,13 @@ reload_flag \ | ||
33227 | OBJDUMP \ | ||
33228 | deplibs_check_method \ | ||
33229 | file_magic_cmd \ | ||
33230 | +file_magic_glob \ | ||
33231 | +want_nocaseglob \ | ||
33232 | +DLLTOOL \ | ||
33233 | +sharedlib_from_linklib_cmd \ | ||
33234 | AR \ | ||
33235 | AR_FLAGS \ | ||
33236 | +archiver_list_spec \ | ||
33237 | STRIP \ | ||
33238 | RANLIB \ | ||
33239 | CC \ | ||
33240 | @@ -17728,12 +18393,14 @@ lt_cv_sys_global_symbol_pipe \ | ||
33241 | lt_cv_sys_global_symbol_to_cdecl \ | ||
33242 | lt_cv_sys_global_symbol_to_c_name_address \ | ||
33243 | lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ | ||
33244 | +nm_file_list_spec \ | ||
33245 | lt_prog_compiler_no_builtin_flag \ | ||
33246 | -lt_prog_compiler_wl \ | ||
33247 | lt_prog_compiler_pic \ | ||
33248 | +lt_prog_compiler_wl \ | ||
33249 | lt_prog_compiler_static \ | ||
33250 | lt_cv_prog_compiler_c_o \ | ||
33251 | need_locks \ | ||
33252 | +MANIFEST_TOOL \ | ||
33253 | DSYMUTIL \ | ||
33254 | NMEDIT \ | ||
33255 | LIPO \ | ||
33256 | @@ -17749,7 +18416,6 @@ no_undefined_flag \ | ||
33257 | hardcode_libdir_flag_spec \ | ||
33258 | hardcode_libdir_flag_spec_ld \ | ||
33259 | hardcode_libdir_separator \ | ||
33260 | -fix_srcfile_path \ | ||
33261 | exclude_expsyms \ | ||
33262 | include_expsyms \ | ||
33263 | file_list_spec \ | ||
33264 | @@ -17785,6 +18451,7 @@ module_cmds \ | ||
33265 | module_expsym_cmds \ | ||
33266 | export_symbols_cmds \ | ||
33267 | prelink_cmds \ | ||
33268 | +postlink_cmds \ | ||
33269 | postinstall_cmds \ | ||
33270 | postuninstall_cmds \ | ||
33271 | finish_cmds \ | ||
33272 | @@ -18610,7 +19277,8 @@ $as_echo "$as_me: executing $ac_file commands" >&6;} | ||
33273 | # NOTE: Changes made to this file will be lost: look at ltmain.sh. | ||
29329 | # | 33274 | # |
29330 | # This file is free software; the Free Software Foundation | 33275 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, |
29331 | # gives unlimited permission to copy and/or distribute it, | 33276 | -# 2006, 2007, 2008, 2009 Free Software Foundation, Inc. |
29332 | @@ -682,42 +672,49 @@ AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) | 33277 | +# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, |
33278 | +# Inc. | ||
33279 | # Written by Gordon Matzigkeit, 1996 | ||
33280 | # | ||
33281 | # This file is part of GNU Libtool. | ||
33282 | @@ -18713,19 +19381,42 @@ SP2NL=$lt_lt_SP2NL | ||
33283 | # turn newlines into spaces. | ||
33284 | NL2SP=$lt_lt_NL2SP | ||
29333 | 33285 | ||
29334 | # AM_MAKE_INCLUDE() | 33286 | +# convert \$build file names to \$host format. |
29335 | # ----------------- | 33287 | +to_host_file_cmd=$lt_cv_to_host_file_cmd |
29336 | -# Check whether make has an 'include' directive that can support all | 33288 | + |
29337 | -# the idioms we need for our automatic dependency tracking code. | 33289 | +# convert \$build files to toolchain format. |
29338 | +# Check to see how make treats includes. | 33290 | +to_tool_file_cmd=$lt_cv_to_tool_file_cmd |
29339 | AC_DEFUN([AM_MAKE_INCLUDE], | 33291 | + |
29340 | -[AC_MSG_CHECKING([whether ${MAKE-make} supports the include directive]) | 33292 | # An object symbol dumper. |
29341 | -cat > confinc.mk << 'END' | 33293 | OBJDUMP=$lt_OBJDUMP |
29342 | +[am_make=${MAKE-make} | ||
29343 | +cat > confinc << 'END' | ||
29344 | am__doit: | ||
29345 | - @echo this is the am__doit target >confinc.out | ||
29346 | + @echo this is the am__doit target | ||
29347 | .PHONY: am__doit | ||
29348 | END | ||
29349 | +# If we don't find an include directive, just comment out the code. | ||
29350 | +AC_MSG_CHECKING([for style of include used by $am_make]) | ||
29351 | am__include="#" | ||
29352 | am__quote= | ||
29353 | -# BSD make does it like this. | ||
29354 | -echo '.include "confinc.mk" # ignored' > confmf.BSD | ||
29355 | -# Other make implementations (GNU, Solaris 10, AIX) do it like this. | ||
29356 | -echo 'include confinc.mk # ignored' > confmf.GNU | ||
29357 | -_am_result=no | ||
29358 | -for s in GNU BSD; do | ||
29359 | - AM_RUN_LOG([${MAKE-make} -f confmf.$s && cat confinc.out]) | ||
29360 | - AS_CASE([$?:`cat confinc.out 2>/dev/null`], | ||
29361 | - ['0:this is the am__doit target'], | ||
29362 | - [AS_CASE([$s], | ||
29363 | - [BSD], [am__include='.include' am__quote='"'], | ||
29364 | - [am__include='include' am__quote=''])]) | ||
29365 | - if test "$am__include" != "#"; then | ||
29366 | - _am_result="yes ($s style)" | ||
29367 | - break | ||
29368 | - fi | ||
29369 | -done | ||
29370 | -rm -f confinc.* confmf.* | ||
29371 | -AC_MSG_RESULT([${_am_result}]) | ||
29372 | -AC_SUBST([am__include])]) | ||
29373 | -AC_SUBST([am__quote])]) | ||
29374 | +_am_result=none | ||
29375 | +# First try GNU make style include. | ||
29376 | +echo "include confinc" > confmf | ||
29377 | +# Ignore all kinds of additional output from 'make'. | ||
29378 | +case `$am_make -s -f confmf 2> /dev/null` in #( | ||
29379 | +*the\ am__doit\ target*) | ||
29380 | + am__include=include | ||
29381 | + am__quote= | ||
29382 | + _am_result=GNU | ||
29383 | + ;; | ||
29384 | +esac | ||
29385 | +# Now try BSD make style include. | ||
29386 | +if test "$am__include" = "#"; then | ||
29387 | + echo '.include "confinc"' > confmf | ||
29388 | + case `$am_make -s -f confmf 2> /dev/null` in #( | ||
29389 | + *the\ am__doit\ target*) | ||
29390 | + am__include=.include | ||
29391 | + am__quote="\"" | ||
29392 | + _am_result=BSD | ||
29393 | + ;; | ||
29394 | + esac | ||
29395 | +fi | ||
29396 | +AC_SUBST([am__include]) | ||
29397 | +AC_SUBST([am__quote]) | ||
29398 | +AC_MSG_RESULT([$_am_result]) | ||
29399 | +rm -f confinc confmf | ||
29400 | +]) | ||
29401 | 33294 | ||
29402 | # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- | 33295 | # Method to check whether dependent libraries are shared objects. |
33296 | deplibs_check_method=$lt_deplibs_check_method | ||
29403 | 33297 | ||
29404 | -# Copyright (C) 1997-2021 Free Software Foundation, Inc. | 33298 | -# Command to use when deplibs_check_method == "file_magic". |
29405 | +# Copyright (C) 1997-2017 Free Software Foundation, Inc. | 33299 | +# Command to use when deplibs_check_method = "file_magic". |
29406 | # | 33300 | file_magic_cmd=$lt_file_magic_cmd |
29407 | # This file is free software; the Free Software Foundation | ||
29408 | # gives unlimited permission to copy and/or distribute it, | ||
29409 | @@ -738,7 +735,12 @@ AC_DEFUN([AM_MISSING_HAS_RUN], | ||
29410 | [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl | ||
29411 | AC_REQUIRE_AUX_FILE([missing])dnl | ||
29412 | if test x"${MISSING+set}" != xset; then | ||
29413 | - MISSING="\${SHELL} '$am_aux_dir/missing'" | ||
29414 | + case $am_aux_dir in | ||
29415 | + *\ * | *\ *) | ||
29416 | + MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;; | ||
29417 | + *) | ||
29418 | + MISSING="\${SHELL} $am_aux_dir/missing" ;; | ||
29419 | + esac | ||
29420 | fi | ||
29421 | # Use eval to expand $SHELL | ||
29422 | if eval "$MISSING --is-lightweight"; then | ||
29423 | @@ -751,7 +753,7 @@ fi | ||
29424 | 33301 | ||
29425 | # Helper functions for option handling. -*- Autoconf -*- | 33302 | +# How to find potential files when deplibs_check_method = "file_magic". |
33303 | +file_magic_glob=$lt_file_magic_glob | ||
33304 | + | ||
33305 | +# Find potential files using nocaseglob when deplibs_check_method = "file_magic". | ||
33306 | +want_nocaseglob=$lt_want_nocaseglob | ||
33307 | + | ||
33308 | +# DLL creation program. | ||
33309 | +DLLTOOL=$lt_DLLTOOL | ||
33310 | + | ||
33311 | +# Command to associate shared and link libraries. | ||
33312 | +sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd | ||
33313 | + | ||
33314 | # The archiver. | ||
33315 | AR=$lt_AR | ||
33316 | + | ||
33317 | +# Flags to create an archive. | ||
33318 | AR_FLAGS=$lt_AR_FLAGS | ||
29426 | 33319 | ||
29427 | -# Copyright (C) 2001-2021 Free Software Foundation, Inc. | 33320 | +# How to feed a file listing to the archiver. |
29428 | +# Copyright (C) 2001-2017 Free Software Foundation, Inc. | 33321 | +archiver_list_spec=$lt_archiver_list_spec |
29429 | # | 33322 | + |
29430 | # This file is free software; the Free Software Foundation | 33323 | # A symbol stripping program. |
29431 | # gives unlimited permission to copy and/or distribute it, | 33324 | STRIP=$lt_STRIP |
29432 | @@ -780,7 +782,7 @@ AC_DEFUN([_AM_SET_OPTIONS], | ||
29433 | AC_DEFUN([_AM_IF_OPTION], | ||
29434 | [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) | ||
29435 | 33325 | ||
29436 | -# Copyright (C) 1999-2021 Free Software Foundation, Inc. | 33326 | @@ -18755,6 +19446,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address |
29437 | +# Copyright (C) 1999-2017 Free Software Foundation, Inc. | 33327 | # Transform the output of nm in a C name address pair when lib prefix is needed. |
29438 | # | 33328 | global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix |
29439 | # This file is free software; the Free Software Foundation | ||
29440 | # gives unlimited permission to copy and/or distribute it, | ||
29441 | @@ -827,7 +829,7 @@ AC_LANG_POP([C])]) | ||
29442 | # For backward compatibility. | ||
29443 | AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])]) | ||
29444 | 33329 | ||
29445 | -# Copyright (C) 2001-2021 Free Software Foundation, Inc. | 33330 | +# Specify filename containing input files for \$NM. |
29446 | +# Copyright (C) 2001-2017 Free Software Foundation, Inc. | 33331 | +nm_file_list_spec=$lt_nm_file_list_spec |
29447 | # | 33332 | + |
29448 | # This file is free software; the Free Software Foundation | 33333 | +# The root where to search for dependent libraries,and in which our libraries should be installed. |
29449 | # gives unlimited permission to copy and/or distribute it, | 33334 | +lt_sysroot=$lt_sysroot |
29450 | @@ -846,7 +848,7 @@ AC_DEFUN([AM_RUN_LOG], | 33335 | + |
33336 | # The name of the directory that contains temporary libtool files. | ||
33337 | objdir=$objdir | ||
29451 | 33338 | ||
29452 | # Check to make sure that the build environment is sane. -*- Autoconf -*- | 33339 | @@ -18764,6 +19461,9 @@ MAGIC_CMD=$MAGIC_CMD |
33340 | # Must we lock files when doing compilation? | ||
33341 | need_locks=$lt_need_locks | ||
29453 | 33342 | ||
29454 | -# Copyright (C) 1996-2021 Free Software Foundation, Inc. | 33343 | +# Manifest tool. |
29455 | +# Copyright (C) 1996-2017 Free Software Foundation, Inc. | 33344 | +MANIFEST_TOOL=$lt_MANIFEST_TOOL |
29456 | # | 33345 | + |
29457 | # This file is free software; the Free Software Foundation | 33346 | # Tool to manipulate archived DWARF debug symbol files on Mac OS X. |
29458 | # gives unlimited permission to copy and/or distribute it, | 33347 | DSYMUTIL=$lt_DSYMUTIL |
29459 | @@ -927,7 +929,7 @@ AC_CONFIG_COMMANDS_PRE( | ||
29460 | rm -f conftest.file | ||
29461 | ]) | ||
29462 | 33348 | ||
29463 | -# Copyright (C) 2009-2021 Free Software Foundation, Inc. | 33349 | @@ -18878,12 +19578,12 @@ with_gcc=$GCC |
29464 | +# Copyright (C) 2009-2017 Free Software Foundation, Inc. | 33350 | # Compiler flag to turn off builtin functions. |
29465 | # | 33351 | no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag |
29466 | # This file is free software; the Free Software Foundation | ||
29467 | # gives unlimited permission to copy and/or distribute it, | ||
29468 | @@ -987,7 +989,7 @@ AC_SUBST([AM_BACKSLASH])dnl | ||
29469 | _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl | ||
29470 | ]) | ||
29471 | 33352 | ||
29472 | -# Copyright (C) 2001-2021 Free Software Foundation, Inc. | 33353 | -# How to pass a linker flag through the compiler. |
29473 | +# Copyright (C) 2001-2017 Free Software Foundation, Inc. | 33354 | -wl=$lt_lt_prog_compiler_wl |
29474 | # | 33355 | - |
29475 | # This file is free software; the Free Software Foundation | 33356 | # Additional compiler flags for building library objects. |
29476 | # gives unlimited permission to copy and/or distribute it, | 33357 | pic_flag=$lt_lt_prog_compiler_pic |
29477 | @@ -1015,7 +1017,7 @@ fi | ||
29478 | INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" | ||
29479 | AC_SUBST([INSTALL_STRIP_PROGRAM])]) | ||
29480 | 33358 | ||
29481 | -# Copyright (C) 2006-2021 Free Software Foundation, Inc. | 33359 | +# How to pass a linker flag through the compiler. |
29482 | +# Copyright (C) 2006-2017 Free Software Foundation, Inc. | 33360 | +wl=$lt_lt_prog_compiler_wl |
29483 | # | 33361 | + |
29484 | # This file is free software; the Free Software Foundation | 33362 | # Compiler flag to prevent dynamic linking. |
29485 | # gives unlimited permission to copy and/or distribute it, | 33363 | link_static_flag=$lt_lt_prog_compiler_static |
29486 | @@ -1034,7 +1036,7 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) | ||
29487 | 33364 | ||
29488 | # Check how to create a tarball. -*- Autoconf -*- | 33365 | @@ -18970,9 +19670,6 @@ inherit_rpath=$inherit_rpath |
33366 | # Whether libtool must link a program against all its dependency libraries. | ||
33367 | link_all_deplibs=$link_all_deplibs | ||
29489 | 33368 | ||
29490 | -# Copyright (C) 2004-2021 Free Software Foundation, Inc. | 33369 | -# Fix the shell variable \$srcfile for the compiler. |
29491 | +# Copyright (C) 2004-2017 Free Software Foundation, Inc. | 33370 | -fix_srcfile_path=$lt_fix_srcfile_path |
29492 | # | 33371 | - |
29493 | # This file is free software; the Free Software Foundation | 33372 | # Set to "yes" if exported symbols are required. |
29494 | # gives unlimited permission to copy and/or distribute it, | 33373 | always_export_symbols=$always_export_symbols |
33374 | |||
33375 | @@ -18988,6 +19685,9 @@ include_expsyms=$lt_include_expsyms | ||
33376 | # Commands necessary for linking programs (against libraries) with templates. | ||
33377 | prelink_cmds=$lt_prelink_cmds | ||
33378 | |||
33379 | +# Commands necessary for finishing linking programs. | ||
33380 | +postlink_cmds=$lt_postlink_cmds | ||
33381 | + | ||
33382 | # Specify filename containing input files. | ||
33383 | file_list_spec=$lt_file_list_spec | ||
33384 | |||
33385 | @@ -19020,210 +19720,169 @@ ltmain="$ac_aux_dir/ltmain.sh" | ||
33386 | # if finds mixed CR/LF and LF-only lines. Since sed operates in | ||
33387 | # text mode, it properly converts lines to CR/LF. This bash problem | ||
33388 | # is reportedly fixed, but why not run on old versions too? | ||
33389 | - sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ | ||
33390 | - || (rm -f "$cfgfile"; exit 1) | ||
33391 | - | ||
33392 | - case $xsi_shell in | ||
33393 | - yes) | ||
33394 | - cat << \_LT_EOF >> "$cfgfile" | ||
33395 | - | ||
33396 | -# func_dirname file append nondir_replacement | ||
33397 | -# Compute the dirname of FILE. If nonempty, add APPEND to the result, | ||
33398 | -# otherwise set result to NONDIR_REPLACEMENT. | ||
33399 | -func_dirname () | ||
33400 | -{ | ||
33401 | - case ${1} in | ||
33402 | - */*) func_dirname_result="${1%/*}${2}" ;; | ||
33403 | - * ) func_dirname_result="${3}" ;; | ||
33404 | - esac | ||
33405 | -} | ||
33406 | - | ||
33407 | -# func_basename file | ||
33408 | -func_basename () | ||
33409 | -{ | ||
33410 | - func_basename_result="${1##*/}" | ||
33411 | -} | ||
33412 | - | ||
33413 | -# func_dirname_and_basename file append nondir_replacement | ||
33414 | -# perform func_basename and func_dirname in a single function | ||
33415 | -# call: | ||
33416 | -# dirname: Compute the dirname of FILE. If nonempty, | ||
33417 | -# add APPEND to the result, otherwise set result | ||
33418 | -# to NONDIR_REPLACEMENT. | ||
33419 | -# value returned in "$func_dirname_result" | ||
33420 | -# basename: Compute filename of FILE. | ||
33421 | -# value retuned in "$func_basename_result" | ||
33422 | -# Implementation must be kept synchronized with func_dirname | ||
33423 | -# and func_basename. For efficiency, we do not delegate to | ||
33424 | -# those functions but instead duplicate the functionality here. | ||
33425 | -func_dirname_and_basename () | ||
33426 | -{ | ||
33427 | - case ${1} in | ||
33428 | - */*) func_dirname_result="${1%/*}${2}" ;; | ||
33429 | - * ) func_dirname_result="${3}" ;; | ||
33430 | - esac | ||
33431 | - func_basename_result="${1##*/}" | ||
33432 | -} | ||
33433 | - | ||
33434 | -# func_stripname prefix suffix name | ||
33435 | -# strip PREFIX and SUFFIX off of NAME. | ||
33436 | -# PREFIX and SUFFIX must not contain globbing or regex special | ||
33437 | -# characters, hashes, percent signs, but SUFFIX may contain a leading | ||
33438 | -# dot (in which case that matches only a dot). | ||
33439 | -func_stripname () | ||
33440 | -{ | ||
33441 | - # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are | ||
33442 | - # positional parameters, so assign one to ordinary parameter first. | ||
33443 | - func_stripname_result=${3} | ||
33444 | - func_stripname_result=${func_stripname_result#"${1}"} | ||
33445 | - func_stripname_result=${func_stripname_result%"${2}"} | ||
33446 | -} | ||
33447 | - | ||
33448 | -# func_opt_split | ||
33449 | -func_opt_split () | ||
33450 | -{ | ||
33451 | - func_opt_split_opt=${1%%=*} | ||
33452 | - func_opt_split_arg=${1#*=} | ||
33453 | -} | ||
33454 | - | ||
33455 | -# func_lo2o object | ||
33456 | -func_lo2o () | ||
33457 | -{ | ||
33458 | - case ${1} in | ||
33459 | - *.lo) func_lo2o_result=${1%.lo}.${objext} ;; | ||
33460 | - *) func_lo2o_result=${1} ;; | ||
33461 | - esac | ||
33462 | -} | ||
33463 | - | ||
33464 | -# func_xform libobj-or-source | ||
33465 | -func_xform () | ||
33466 | -{ | ||
33467 | - func_xform_result=${1%.*}.lo | ||
33468 | -} | ||
33469 | - | ||
33470 | -# func_arith arithmetic-term... | ||
33471 | -func_arith () | ||
33472 | -{ | ||
33473 | - func_arith_result=$(( $* )) | ||
33474 | -} | ||
33475 | - | ||
33476 | -# func_len string | ||
33477 | -# STRING may not start with a hyphen. | ||
33478 | -func_len () | ||
33479 | -{ | ||
33480 | - func_len_result=${#1} | ||
33481 | -} | ||
33482 | - | ||
33483 | -_LT_EOF | ||
33484 | - ;; | ||
33485 | - *) # Bourne compatible functions. | ||
33486 | - cat << \_LT_EOF >> "$cfgfile" | ||
33487 | - | ||
33488 | -# func_dirname file append nondir_replacement | ||
33489 | -# Compute the dirname of FILE. If nonempty, add APPEND to the result, | ||
33490 | -# otherwise set result to NONDIR_REPLACEMENT. | ||
33491 | -func_dirname () | ||
33492 | -{ | ||
33493 | - # Extract subdirectory from the argument. | ||
33494 | - func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` | ||
33495 | - if test "X$func_dirname_result" = "X${1}"; then | ||
33496 | - func_dirname_result="${3}" | ||
33497 | - else | ||
33498 | - func_dirname_result="$func_dirname_result${2}" | ||
33499 | - fi | ||
33500 | -} | ||
33501 | - | ||
33502 | -# func_basename file | ||
33503 | -func_basename () | ||
33504 | -{ | ||
33505 | - func_basename_result=`$ECHO "${1}" | $SED "$basename"` | ||
33506 | -} | ||
33507 | - | ||
33508 | - | ||
33509 | -# func_stripname prefix suffix name | ||
33510 | -# strip PREFIX and SUFFIX off of NAME. | ||
33511 | -# PREFIX and SUFFIX must not contain globbing or regex special | ||
33512 | -# characters, hashes, percent signs, but SUFFIX may contain a leading | ||
33513 | -# dot (in which case that matches only a dot). | ||
33514 | -# func_strip_suffix prefix name | ||
33515 | -func_stripname () | ||
33516 | -{ | ||
33517 | - case ${2} in | ||
33518 | - .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; | ||
33519 | - *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; | ||
33520 | - esac | ||
33521 | -} | ||
33522 | - | ||
33523 | -# sed scripts: | ||
33524 | -my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q' | ||
33525 | -my_sed_long_arg='1s/^-[^=]*=//' | ||
33526 | - | ||
33527 | -# func_opt_split | ||
33528 | -func_opt_split () | ||
33529 | -{ | ||
33530 | - func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"` | ||
33531 | - func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"` | ||
33532 | -} | ||
33533 | - | ||
33534 | -# func_lo2o object | ||
33535 | -func_lo2o () | ||
33536 | -{ | ||
33537 | - func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` | ||
33538 | -} | ||
33539 | - | ||
33540 | -# func_xform libobj-or-source | ||
33541 | -func_xform () | ||
33542 | -{ | ||
33543 | - func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'` | ||
33544 | -} | ||
33545 | - | ||
33546 | -# func_arith arithmetic-term... | ||
33547 | -func_arith () | ||
33548 | -{ | ||
33549 | - func_arith_result=`expr "$@"` | ||
33550 | -} | ||
33551 | - | ||
33552 | -# func_len string | ||
33553 | -# STRING may not start with a hyphen. | ||
33554 | -func_len () | ||
33555 | -{ | ||
33556 | - func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len` | ||
33557 | -} | ||
33558 | - | ||
33559 | -_LT_EOF | ||
33560 | -esac | ||
33561 | - | ||
33562 | -case $lt_shell_append in | ||
33563 | - yes) | ||
33564 | - cat << \_LT_EOF >> "$cfgfile" | ||
33565 | - | ||
33566 | -# func_append var value | ||
33567 | -# Append VALUE to the end of shell variable VAR. | ||
33568 | -func_append () | ||
33569 | -{ | ||
33570 | - eval "$1+=\$2" | ||
33571 | -} | ||
33572 | -_LT_EOF | ||
33573 | - ;; | ||
33574 | - *) | ||
33575 | - cat << \_LT_EOF >> "$cfgfile" | ||
33576 | - | ||
33577 | -# func_append var value | ||
33578 | -# Append VALUE to the end of shell variable VAR. | ||
33579 | -func_append () | ||
33580 | -{ | ||
33581 | - eval "$1=\$$1\$2" | ||
33582 | -} | ||
33583 | - | ||
33584 | -_LT_EOF | ||
33585 | - ;; | ||
33586 | - esac | ||
33587 | - | ||
33588 | - | ||
33589 | - sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ | ||
33590 | - || (rm -f "$cfgfile"; exit 1) | ||
33591 | - | ||
33592 | - mv -f "$cfgfile" "$ofile" || | ||
33593 | + sed '$q' "$ltmain" >> "$cfgfile" \ | ||
33594 | + || (rm -f "$cfgfile"; exit 1) | ||
33595 | + | ||
33596 | + if test x"$xsi_shell" = xyes; then | ||
33597 | + sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ | ||
33598 | +func_dirname ()\ | ||
33599 | +{\ | ||
33600 | +\ case ${1} in\ | ||
33601 | +\ */*) func_dirname_result="${1%/*}${2}" ;;\ | ||
33602 | +\ * ) func_dirname_result="${3}" ;;\ | ||
33603 | +\ esac\ | ||
33604 | +} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \ | ||
33605 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
33606 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
33607 | +test 0 -eq $? || _lt_function_replace_fail=: | ||
33608 | + | ||
33609 | + | ||
33610 | + sed -e '/^func_basename ()$/,/^} # func_basename /c\ | ||
33611 | +func_basename ()\ | ||
33612 | +{\ | ||
33613 | +\ func_basename_result="${1##*/}"\ | ||
33614 | +} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \ | ||
33615 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
33616 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
33617 | +test 0 -eq $? || _lt_function_replace_fail=: | ||
33618 | + | ||
33619 | + | ||
33620 | + sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\ | ||
33621 | +func_dirname_and_basename ()\ | ||
33622 | +{\ | ||
33623 | +\ case ${1} in\ | ||
33624 | +\ */*) func_dirname_result="${1%/*}${2}" ;;\ | ||
33625 | +\ * ) func_dirname_result="${3}" ;;\ | ||
33626 | +\ esac\ | ||
33627 | +\ func_basename_result="${1##*/}"\ | ||
33628 | +} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \ | ||
33629 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
33630 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
33631 | +test 0 -eq $? || _lt_function_replace_fail=: | ||
33632 | + | ||
33633 | + | ||
33634 | + sed -e '/^func_stripname ()$/,/^} # func_stripname /c\ | ||
33635 | +func_stripname ()\ | ||
33636 | +{\ | ||
33637 | +\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\ | ||
33638 | +\ # positional parameters, so assign one to ordinary parameter first.\ | ||
33639 | +\ func_stripname_result=${3}\ | ||
33640 | +\ func_stripname_result=${func_stripname_result#"${1}"}\ | ||
33641 | +\ func_stripname_result=${func_stripname_result%"${2}"}\ | ||
33642 | +} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \ | ||
33643 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
33644 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
33645 | +test 0 -eq $? || _lt_function_replace_fail=: | ||
33646 | + | ||
33647 | + | ||
33648 | + sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\ | ||
33649 | +func_split_long_opt ()\ | ||
33650 | +{\ | ||
33651 | +\ func_split_long_opt_name=${1%%=*}\ | ||
33652 | +\ func_split_long_opt_arg=${1#*=}\ | ||
33653 | +} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \ | ||
33654 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
33655 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
33656 | +test 0 -eq $? || _lt_function_replace_fail=: | ||
33657 | + | ||
33658 | + | ||
33659 | + sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\ | ||
33660 | +func_split_short_opt ()\ | ||
33661 | +{\ | ||
33662 | +\ func_split_short_opt_arg=${1#??}\ | ||
33663 | +\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\ | ||
33664 | +} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \ | ||
33665 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
33666 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
33667 | +test 0 -eq $? || _lt_function_replace_fail=: | ||
33668 | + | ||
33669 | + | ||
33670 | + sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\ | ||
33671 | +func_lo2o ()\ | ||
33672 | +{\ | ||
33673 | +\ case ${1} in\ | ||
33674 | +\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\ | ||
33675 | +\ *) func_lo2o_result=${1} ;;\ | ||
33676 | +\ esac\ | ||
33677 | +} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \ | ||
33678 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
33679 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
33680 | +test 0 -eq $? || _lt_function_replace_fail=: | ||
33681 | + | ||
33682 | + | ||
33683 | + sed -e '/^func_xform ()$/,/^} # func_xform /c\ | ||
33684 | +func_xform ()\ | ||
33685 | +{\ | ||
33686 | + func_xform_result=${1%.*}.lo\ | ||
33687 | +} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \ | ||
33688 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
33689 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
33690 | +test 0 -eq $? || _lt_function_replace_fail=: | ||
33691 | + | ||
33692 | + | ||
33693 | + sed -e '/^func_arith ()$/,/^} # func_arith /c\ | ||
33694 | +func_arith ()\ | ||
33695 | +{\ | ||
33696 | + func_arith_result=$(( $* ))\ | ||
33697 | +} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \ | ||
33698 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
33699 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
33700 | +test 0 -eq $? || _lt_function_replace_fail=: | ||
33701 | + | ||
33702 | + | ||
33703 | + sed -e '/^func_len ()$/,/^} # func_len /c\ | ||
33704 | +func_len ()\ | ||
33705 | +{\ | ||
33706 | + func_len_result=${#1}\ | ||
33707 | +} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \ | ||
33708 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
33709 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
33710 | +test 0 -eq $? || _lt_function_replace_fail=: | ||
33711 | + | ||
33712 | +fi | ||
33713 | + | ||
33714 | +if test x"$lt_shell_append" = xyes; then | ||
33715 | + sed -e '/^func_append ()$/,/^} # func_append /c\ | ||
33716 | +func_append ()\ | ||
33717 | +{\ | ||
33718 | + eval "${1}+=\\${2}"\ | ||
33719 | +} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \ | ||
33720 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
33721 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
33722 | +test 0 -eq $? || _lt_function_replace_fail=: | ||
33723 | + | ||
33724 | + | ||
33725 | + sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\ | ||
33726 | +func_append_quoted ()\ | ||
33727 | +{\ | ||
33728 | +\ func_quote_for_eval "${2}"\ | ||
33729 | +\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\ | ||
33730 | +} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \ | ||
33731 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
33732 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
33733 | +test 0 -eq $? || _lt_function_replace_fail=: | ||
33734 | + | ||
33735 | + | ||
33736 | + # Save a `func_append' function call where possible by direct use of '+=' | ||
33737 | + sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ | ||
33738 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
33739 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
33740 | + test 0 -eq $? || _lt_function_replace_fail=: | ||
33741 | +else | ||
33742 | + # Save a `func_append' function call even when '+=' is not available | ||
33743 | + sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ | ||
33744 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
33745 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
33746 | + test 0 -eq $? || _lt_function_replace_fail=: | ||
33747 | +fi | ||
33748 | + | ||
33749 | +if test x"$_lt_function_replace_fail" = x":"; then | ||
33750 | + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 | ||
33751 | +$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} | ||
33752 | +fi | ||
33753 | + | ||
33754 | + | ||
33755 | + mv -f "$cfgfile" "$ofile" || | ||
33756 | (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") | ||
33757 | chmod +x "$ofile" | ||
33758 | |||
33759 | diff --git a/zlib/Makefile.in b/zlib/Makefile.in | ||
33760 | index 855c23eea23..0605835c14f 100644 | ||
33761 | --- a/zlib/Makefile.in | ||
33762 | +++ b/zlib/Makefile.in | ||
33763 | @@ -281,6 +281,7 @@ CPPFLAGS = @CPPFLAGS@ | ||
33764 | CYGPATH_W = @CYGPATH_W@ | ||
33765 | DEFS = @DEFS@ | ||
33766 | DEPDIR = @DEPDIR@ | ||
33767 | +DLLTOOL = @DLLTOOL@ | ||
33768 | DSYMUTIL = @DSYMUTIL@ | ||
33769 | DUMPBIN = @DUMPBIN@ | ||
33770 | ECHO_C = @ECHO_C@ | ||
33771 | @@ -305,6 +306,7 @@ LN_S = @LN_S@ | ||
33772 | LTLIBOBJS = @LTLIBOBJS@ | ||
33773 | MAINT = @MAINT@ | ||
33774 | MAKEINFO = @MAKEINFO@ | ||
33775 | +MANIFEST_TOOL = @MANIFEST_TOOL@ | ||
33776 | MKDIR_P = @MKDIR_P@ | ||
33777 | NM = @NM@ | ||
33778 | NMEDIT = @NMEDIT@ | ||
33779 | @@ -331,6 +333,7 @@ abs_builddir = @abs_builddir@ | ||
33780 | abs_srcdir = @abs_srcdir@ | ||
33781 | abs_top_builddir = @abs_top_builddir@ | ||
33782 | abs_top_srcdir = @abs_top_srcdir@ | ||
33783 | +ac_ct_AR = @ac_ct_AR@ | ||
33784 | ac_ct_CC = @ac_ct_CC@ | ||
33785 | ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ | ||
33786 | am__include = @am__include@ | ||
29495 | diff --git a/zlib/configure b/zlib/configure | 33787 | diff --git a/zlib/configure b/zlib/configure |
29496 | index 0a9ad9e8ccb..35b44e2819c 100755 | 33788 | index e65ade3badd..35b44e2819c 100755 |
29497 | --- a/zlib/configure | 33789 | --- a/zlib/configure |
29498 | +++ b/zlib/configure | 33790 | +++ b/zlib/configure |
29499 | @@ -646,8 +646,11 @@ OTOOL | 33791 | @@ -646,8 +646,11 @@ OTOOL |
@@ -29508,35 +33800,7 @@ index 0a9ad9e8ccb..35b44e2819c 100755 | |||
29508 | OBJDUMP | 33800 | OBJDUMP |
29509 | LN_S | 33801 | LN_S |
29510 | NM | 33802 | NM |
29511 | @@ -666,6 +669,7 @@ am__nodep | 33803 | @@ -774,6 +777,7 @@ enable_static |
29512 | AMDEPBACKSLASH | ||
29513 | AMDEP_FALSE | ||
29514 | AMDEP_TRUE | ||
29515 | +am__quote | ||
29516 | am__include | ||
29517 | DEPDIR | ||
29518 | OBJEXT | ||
29519 | @@ -683,9 +687,6 @@ AM_BACKSLASH | ||
29520 | AM_DEFAULT_VERBOSITY | ||
29521 | AM_DEFAULT_V | ||
29522 | AM_V | ||
29523 | -CSCOPE | ||
29524 | -ETAGS | ||
29525 | -CTAGS | ||
29526 | am__untar | ||
29527 | am__tar | ||
29528 | AMTAR | ||
29529 | @@ -760,8 +761,7 @@ PACKAGE_VERSION | ||
29530 | PACKAGE_TARNAME | ||
29531 | PACKAGE_NAME | ||
29532 | PATH_SEPARATOR | ||
29533 | -SHELL | ||
29534 | -am__quote' | ||
29535 | +SHELL' | ||
29536 | ac_subst_files='' | ||
29537 | ac_user_opts=' | ||
29538 | enable_option_checking | ||
29539 | @@ -777,6 +777,7 @@ enable_static | ||
29540 | with_pic | 33804 | with_pic |
29541 | enable_fast_install | 33805 | enable_fast_install |
29542 | with_gnu_ld | 33806 | with_gnu_ld |
@@ -29544,7 +33808,7 @@ index 0a9ad9e8ccb..35b44e2819c 100755 | |||
29544 | enable_libtool_lock | 33808 | enable_libtool_lock |
29545 | enable_host_shared | 33809 | enable_host_shared |
29546 | ' | 33810 | ' |
29547 | @@ -1431,6 +1432,8 @@ Optional Packages: | 33811 | @@ -1428,6 +1432,8 @@ Optional Packages: |
29548 | --with-pic try to use only PIC/non-PIC objects [default=use | 33812 | --with-pic try to use only PIC/non-PIC objects [default=use |
29549 | both] | 33813 | both] |
29550 | --with-gnu-ld assume the C compiler uses GNU ld [default=no] | 33814 | --with-gnu-ld assume the C compiler uses GNU ld [default=no] |
@@ -29553,150 +33817,7 @@ index 0a9ad9e8ccb..35b44e2819c 100755 | |||
29553 | 33817 | ||
29554 | Some influential environment variables: | 33818 | Some influential environment variables: |
29555 | CC C compiler command | 33819 | CC C compiler command |
29556 | @@ -2417,7 +2420,7 @@ test -n "$target_alias" && | 33820 | @@ -4186,8 +4192,8 @@ esac |
29557 | mkinstalldirs="`cd $ac_aux_dir && ${PWDCMD-pwd}`/mkinstalldirs" | ||
29558 | |||
29559 | |||
29560 | -am__api_version='1.16' | ||
29561 | +am__api_version='1.15' | ||
29562 | |||
29563 | # Find a good install program. We prefer a C program (faster), | ||
29564 | # so one script is as good as another. But avoid the broken or | ||
29565 | @@ -2593,7 +2596,12 @@ program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"` | ||
29566 | am_aux_dir=`cd "$ac_aux_dir" && pwd` | ||
29567 | |||
29568 | if test x"${MISSING+set}" != xset; then | ||
29569 | - MISSING="\${SHELL} '$am_aux_dir/missing'" | ||
29570 | + case $am_aux_dir in | ||
29571 | + *\ * | *\ *) | ||
29572 | + MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;; | ||
29573 | + *) | ||
29574 | + MISSING="\${SHELL} $am_aux_dir/missing" ;; | ||
29575 | + esac | ||
29576 | fi | ||
29577 | # Use eval to expand $SHELL | ||
29578 | if eval "$MISSING --is-lightweight"; then | ||
29579 | @@ -2928,8 +2936,8 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} | ||
29580 | |||
29581 | # For better backward compatibility. To be removed once Automake 1.9.x | ||
29582 | # dies out for good. For more background, see: | ||
29583 | -# <https://lists.gnu.org/archive/html/automake/2012-07/msg00001.html> | ||
29584 | -# <https://lists.gnu.org/archive/html/automake/2012-07/msg00014.html> | ||
29585 | +# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html> | ||
29586 | +# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html> | ||
29587 | mkdir_p='$(MKDIR_P)' | ||
29588 | |||
29589 | # We need awk for the "check" target (and possibly the TAP driver). The | ||
29590 | @@ -2948,20 +2956,6 @@ am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -' | ||
29591 | |||
29592 | |||
29593 | |||
29594 | -# Variables for tags utilities; see am/tags.am | ||
29595 | -if test -z "$CTAGS"; then | ||
29596 | - CTAGS=ctags | ||
29597 | -fi | ||
29598 | - | ||
29599 | -if test -z "$ETAGS"; then | ||
29600 | - ETAGS=etags | ||
29601 | -fi | ||
29602 | - | ||
29603 | -if test -z "$CSCOPE"; then | ||
29604 | - CSCOPE=cscope | ||
29605 | -fi | ||
29606 | - | ||
29607 | - | ||
29608 | |||
29609 | # POSIX will say in a future version that running "rm -f" with no argument | ||
29610 | # is OK; and we want to be able to make that assumption in our Makefile | ||
29611 | @@ -2994,7 +2988,7 @@ END | ||
29612 | Aborting the configuration process, to ensure you take notice of the issue. | ||
29613 | |||
29614 | You can download and install GNU coreutils to get an 'rm' implementation | ||
29615 | -that behaves properly: <https://www.gnu.org/software/coreutils/>. | ||
29616 | +that behaves properly: <http://www.gnu.org/software/coreutils/>. | ||
29617 | |||
29618 | If you want to complete the configuration process using your problematic | ||
29619 | 'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM | ||
29620 | @@ -3998,45 +3992,45 @@ DEPDIR="${am__leading_dot}deps" | ||
29621 | |||
29622 | ac_config_commands="$ac_config_commands depfiles" | ||
29623 | |||
29624 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} supports the include directive" >&5 | ||
29625 | -$as_echo_n "checking whether ${MAKE-make} supports the include directive... " >&6; } | ||
29626 | -cat > confinc.mk << 'END' | ||
29627 | + | ||
29628 | +am_make=${MAKE-make} | ||
29629 | +cat > confinc << 'END' | ||
29630 | am__doit: | ||
29631 | - @echo this is the am__doit target >confinc.out | ||
29632 | + @echo this is the am__doit target | ||
29633 | .PHONY: am__doit | ||
29634 | END | ||
29635 | +# If we don't find an include directive, just comment out the code. | ||
29636 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5 | ||
29637 | +$as_echo_n "checking for style of include used by $am_make... " >&6; } | ||
29638 | am__include="#" | ||
29639 | am__quote= | ||
29640 | -# BSD make does it like this. | ||
29641 | -echo '.include "confinc.mk" # ignored' > confmf.BSD | ||
29642 | -# Other make implementations (GNU, Solaris 10, AIX) do it like this. | ||
29643 | -echo 'include confinc.mk # ignored' > confmf.GNU | ||
29644 | -_am_result=no | ||
29645 | -for s in GNU BSD; do | ||
29646 | - { echo "$as_me:$LINENO: ${MAKE-make} -f confmf.$s && cat confinc.out" >&5 | ||
29647 | - (${MAKE-make} -f confmf.$s && cat confinc.out) >&5 2>&5 | ||
29648 | - ac_status=$? | ||
29649 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
29650 | - (exit $ac_status); } | ||
29651 | - case $?:`cat confinc.out 2>/dev/null` in #( | ||
29652 | - '0:this is the am__doit target') : | ||
29653 | - case $s in #( | ||
29654 | - BSD) : | ||
29655 | - am__include='.include' am__quote='"' ;; #( | ||
29656 | - *) : | ||
29657 | - am__include='include' am__quote='' ;; | ||
29658 | -esac ;; #( | ||
29659 | - *) : | ||
29660 | - ;; | ||
29661 | +_am_result=none | ||
29662 | +# First try GNU make style include. | ||
29663 | +echo "include confinc" > confmf | ||
29664 | +# Ignore all kinds of additional output from 'make'. | ||
29665 | +case `$am_make -s -f confmf 2> /dev/null` in #( | ||
29666 | +*the\ am__doit\ target*) | ||
29667 | + am__include=include | ||
29668 | + am__quote= | ||
29669 | + _am_result=GNU | ||
29670 | + ;; | ||
29671 | esac | ||
29672 | - if test "$am__include" != "#"; then | ||
29673 | - _am_result="yes ($s style)" | ||
29674 | - break | ||
29675 | - fi | ||
29676 | -done | ||
29677 | -rm -f confinc.* confmf.* | ||
29678 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${_am_result}" >&5 | ||
29679 | -$as_echo "${_am_result}" >&6; } | ||
29680 | +# Now try BSD make style include. | ||
29681 | +if test "$am__include" = "#"; then | ||
29682 | + echo '.include "confinc"' > confmf | ||
29683 | + case `$am_make -s -f confmf 2> /dev/null` in #( | ||
29684 | + *the\ am__doit\ target*) | ||
29685 | + am__include=.include | ||
29686 | + am__quote="\"" | ||
29687 | + _am_result=BSD | ||
29688 | + ;; | ||
29689 | + esac | ||
29690 | +fi | ||
29691 | + | ||
29692 | + | ||
29693 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5 | ||
29694 | +$as_echo "$_am_result" >&6; } | ||
29695 | +rm -f confinc confmf | ||
29696 | |||
29697 | # Check whether --enable-dependency-tracking was given. | ||
29698 | if test "${enable_dependency_tracking+set}" = set; then : | ||
29699 | @@ -4198,8 +4192,8 @@ esac | ||
29700 | 33821 | ||
29701 | 33822 | ||
29702 | 33823 | ||
@@ -29707,7 +33828,7 @@ index 0a9ad9e8ccb..35b44e2819c 100755 | |||
29707 | 33828 | ||
29708 | 33829 | ||
29709 | 33830 | ||
29710 | @@ -4239,7 +4233,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO | 33831 | @@ -4227,7 +4233,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO |
29711 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 | 33832 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 |
29712 | $as_echo_n "checking how to print strings... " >&6; } | 33833 | $as_echo_n "checking how to print strings... " >&6; } |
29713 | # Test print first, because it will be a builtin if present. | 33834 | # Test print first, because it will be a builtin if present. |
@@ -29716,7 +33837,7 @@ index 0a9ad9e8ccb..35b44e2819c 100755 | |||
29716 | test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then | 33837 | test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then |
29717 | ECHO='print -r --' | 33838 | ECHO='print -r --' |
29718 | elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then | 33839 | elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then |
29719 | @@ -5062,8 +5056,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; | 33840 | @@ -5050,8 +5056,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; |
29720 | # Try some XSI features | 33841 | # Try some XSI features |
29721 | xsi_shell=no | 33842 | xsi_shell=no |
29722 | ( _lt_dummy="a/b/c" | 33843 | ( _lt_dummy="a/b/c" |
@@ -29727,7 +33848,7 @@ index 0a9ad9e8ccb..35b44e2819c 100755 | |||
29727 | && eval 'test $(( 1 + 1 )) -eq 2 \ | 33848 | && eval 'test $(( 1 + 1 )) -eq 2 \ |
29728 | && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ | 33849 | && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ |
29729 | && xsi_shell=yes | 33850 | && xsi_shell=yes |
29730 | @@ -5112,6 +5106,80 @@ esac | 33851 | @@ -5100,6 +5106,80 @@ esac |
29731 | 33852 | ||
29732 | 33853 | ||
29733 | 33854 | ||
@@ -29808,7 +33929,7 @@ index 0a9ad9e8ccb..35b44e2819c 100755 | |||
29808 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 | 33929 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 |
29809 | $as_echo_n "checking for $LD option to reload object files... " >&6; } | 33930 | $as_echo_n "checking for $LD option to reload object files... " >&6; } |
29810 | if ${lt_cv_ld_reload_flag+:} false; then : | 33931 | if ${lt_cv_ld_reload_flag+:} false; then : |
29811 | @@ -5128,6 +5196,11 @@ case $reload_flag in | 33932 | @@ -5116,6 +5196,11 @@ case $reload_flag in |
29812 | esac | 33933 | esac |
29813 | reload_cmds='$LD$reload_flag -o $output$reload_objs' | 33934 | reload_cmds='$LD$reload_flag -o $output$reload_objs' |
29814 | case $host_os in | 33935 | case $host_os in |
@@ -29820,7 +33941,7 @@ index 0a9ad9e8ccb..35b44e2819c 100755 | |||
29820 | darwin*) | 33941 | darwin*) |
29821 | if test "$GCC" = yes; then | 33942 | if test "$GCC" = yes; then |
29822 | reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' | 33943 | reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' |
29823 | @@ -5296,7 +5369,8 @@ mingw* | pw32*) | 33944 | @@ -5284,7 +5369,8 @@ mingw* | pw32*) |
29824 | lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' | 33945 | lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' |
29825 | lt_cv_file_magic_cmd='func_win32_libid' | 33946 | lt_cv_file_magic_cmd='func_win32_libid' |
29826 | else | 33947 | else |
@@ -29830,7 +33951,7 @@ index 0a9ad9e8ccb..35b44e2819c 100755 | |||
29830 | lt_cv_file_magic_cmd='$OBJDUMP -f' | 33951 | lt_cv_file_magic_cmd='$OBJDUMP -f' |
29831 | fi | 33952 | fi |
29832 | ;; | 33953 | ;; |
29833 | @@ -5450,6 +5524,21 @@ esac | 33954 | @@ -5438,6 +5524,21 @@ esac |
29834 | fi | 33955 | fi |
29835 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 | 33956 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 |
29836 | $as_echo "$lt_cv_deplibs_check_method" >&6; } | 33957 | $as_echo "$lt_cv_deplibs_check_method" >&6; } |
@@ -29852,7 +33973,7 @@ index 0a9ad9e8ccb..35b44e2819c 100755 | |||
29852 | file_magic_cmd=$lt_cv_file_magic_cmd | 33973 | file_magic_cmd=$lt_cv_file_magic_cmd |
29853 | deplibs_check_method=$lt_cv_deplibs_check_method | 33974 | deplibs_check_method=$lt_cv_deplibs_check_method |
29854 | test -z "$deplibs_check_method" && deplibs_check_method=unknown | 33975 | test -z "$deplibs_check_method" && deplibs_check_method=unknown |
29855 | @@ -5465,6 +5554,158 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown | 33976 | @@ -5453,6 +5554,158 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown |
29856 | 33977 | ||
29857 | 33978 | ||
29858 | 33979 | ||
@@ -30011,7 +34132,7 @@ index 0a9ad9e8ccb..35b44e2819c 100755 | |||
30011 | plugin_option= | 34132 | plugin_option= |
30012 | plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll" | 34133 | plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll" |
30013 | for plugin in $plugin_names; do | 34134 | for plugin in $plugin_names; do |
30014 | @@ -5479,8 +5720,10 @@ for plugin in $plugin_names; do | 34135 | @@ -5467,8 +5720,10 @@ for plugin in $plugin_names; do |
30015 | done | 34136 | done |
30016 | 34137 | ||
30017 | if test -n "$ac_tool_prefix"; then | 34138 | if test -n "$ac_tool_prefix"; then |
@@ -30024,7 +34145,7 @@ index 0a9ad9e8ccb..35b44e2819c 100755 | |||
30024 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | 34145 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
30025 | $as_echo_n "checking for $ac_word... " >&6; } | 34146 | $as_echo_n "checking for $ac_word... " >&6; } |
30026 | if ${ac_cv_prog_AR+:} false; then : | 34147 | if ${ac_cv_prog_AR+:} false; then : |
30027 | @@ -5496,7 +5739,7 @@ do | 34148 | @@ -5484,7 +5739,7 @@ do |
30028 | test -z "$as_dir" && as_dir=. | 34149 | test -z "$as_dir" && as_dir=. |
30029 | for ac_exec_ext in '' $ac_executable_extensions; do | 34150 | for ac_exec_ext in '' $ac_executable_extensions; do |
30030 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | 34151 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
@@ -30033,7 +34154,7 @@ index 0a9ad9e8ccb..35b44e2819c 100755 | |||
30033 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | 34154 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
30034 | break 2 | 34155 | break 2 |
30035 | fi | 34156 | fi |
30036 | @@ -5516,11 +5759,15 @@ $as_echo "no" >&6; } | 34157 | @@ -5504,11 +5759,15 @@ $as_echo "no" >&6; } |
30037 | fi | 34158 | fi |
30038 | 34159 | ||
30039 | 34160 | ||
@@ -30052,7 +34173,7 @@ index 0a9ad9e8ccb..35b44e2819c 100755 | |||
30052 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | 34173 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
30053 | $as_echo_n "checking for $ac_word... " >&6; } | 34174 | $as_echo_n "checking for $ac_word... " >&6; } |
30054 | if ${ac_cv_prog_ac_ct_AR+:} false; then : | 34175 | if ${ac_cv_prog_ac_ct_AR+:} false; then : |
30055 | @@ -5536,7 +5783,7 @@ do | 34176 | @@ -5524,7 +5783,7 @@ do |
30056 | test -z "$as_dir" && as_dir=. | 34177 | test -z "$as_dir" && as_dir=. |
30057 | for ac_exec_ext in '' $ac_executable_extensions; do | 34178 | for ac_exec_ext in '' $ac_executable_extensions; do |
30058 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | 34179 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
@@ -30061,7 +34182,7 @@ index 0a9ad9e8ccb..35b44e2819c 100755 | |||
30061 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | 34182 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
30062 | break 2 | 34183 | break 2 |
30063 | fi | 34184 | fi |
30064 | @@ -5555,6 +5802,10 @@ else | 34185 | @@ -5543,6 +5802,10 @@ else |
30065 | $as_echo "no" >&6; } | 34186 | $as_echo "no" >&6; } |
30066 | fi | 34187 | fi |
30067 | 34188 | ||
@@ -30072,7 +34193,7 @@ index 0a9ad9e8ccb..35b44e2819c 100755 | |||
30072 | if test "x$ac_ct_AR" = x; then | 34193 | if test "x$ac_ct_AR" = x; then |
30073 | AR="false" | 34194 | AR="false" |
30074 | else | 34195 | else |
30075 | @@ -5566,25 +5817,22 @@ ac_tool_warned=yes ;; | 34196 | @@ -5554,25 +5817,19 @@ ac_tool_warned=yes ;; |
30076 | esac | 34197 | esac |
30077 | AR=$ac_ct_AR | 34198 | AR=$ac_ct_AR |
30078 | fi | 34199 | fi |
@@ -30104,13 +34225,10 @@ index 0a9ad9e8ccb..35b44e2819c 100755 | |||
30104 | + rm -f conftest.* | 34225 | + rm -f conftest.* |
30105 | +: ${AR=ar} | 34226 | +: ${AR=ar} |
30106 | +: ${AR_FLAGS=cru} | 34227 | +: ${AR_FLAGS=cru} |
30107 | + | ||
30108 | + | ||
30109 | + | ||
30110 | 34228 | ||
30111 | 34229 | ||
30112 | 34230 | ||
30113 | @@ -5593,6 +5841,61 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru | 34231 | @@ -5584,6 +5841,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru |
30114 | 34232 | ||
30115 | 34233 | ||
30116 | 34234 | ||
@@ -30169,10 +34287,13 @@ index 0a9ad9e8ccb..35b44e2819c 100755 | |||
30169 | + | 34287 | + |
30170 | + | 34288 | + |
30171 | + | 34289 | + |
30172 | 34290 | + | |
30173 | 34291 | + | |
30174 | 34292 | + | |
30175 | @@ -5935,8 +6238,8 @@ esac | 34293 | if test -n "$ac_tool_prefix"; then |
34294 | # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. | ||
34295 | set dummy ${ac_tool_prefix}strip; ac_word=$2 | ||
34296 | @@ -5923,8 +6238,8 @@ esac | ||
30176 | lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" | 34297 | lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" |
30177 | 34298 | ||
30178 | # Transform an extracted symbol line into symbol name and symbol address | 34299 | # Transform an extracted symbol line into symbol name and symbol address |
@@ -30183,7 +34304,7 @@ index 0a9ad9e8ccb..35b44e2819c 100755 | |||
30183 | 34304 | ||
30184 | # Handle CRLF in mingw tool chain | 34305 | # Handle CRLF in mingw tool chain |
30185 | opt_cr= | 34306 | opt_cr= |
30186 | @@ -5972,6 +6275,7 @@ for ac_symprfx in "" "_"; do | 34307 | @@ -5960,6 +6275,7 @@ for ac_symprfx in "" "_"; do |
30187 | else | 34308 | else |
30188 | lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" | 34309 | lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" |
30189 | fi | 34310 | fi |
@@ -30191,7 +34312,7 @@ index 0a9ad9e8ccb..35b44e2819c 100755 | |||
30191 | 34312 | ||
30192 | # Check to see that the pipe works correctly. | 34313 | # Check to see that the pipe works correctly. |
30193 | pipe_works=no | 34314 | pipe_works=no |
30194 | @@ -6013,6 +6317,18 @@ _LT_EOF | 34315 | @@ -6001,6 +6317,18 @@ _LT_EOF |
30195 | if $GREP ' nm_test_var$' "$nlist" >/dev/null; then | 34316 | if $GREP ' nm_test_var$' "$nlist" >/dev/null; then |
30196 | if $GREP ' nm_test_func$' "$nlist" >/dev/null; then | 34317 | if $GREP ' nm_test_func$' "$nlist" >/dev/null; then |
30197 | cat <<_LT_EOF > conftest.$ac_ext | 34318 | cat <<_LT_EOF > conftest.$ac_ext |
@@ -30210,7 +34331,7 @@ index 0a9ad9e8ccb..35b44e2819c 100755 | |||
30210 | #ifdef __cplusplus | 34331 | #ifdef __cplusplus |
30211 | extern "C" { | 34332 | extern "C" { |
30212 | #endif | 34333 | #endif |
30213 | @@ -6024,7 +6340,7 @@ _LT_EOF | 34334 | @@ -6012,7 +6340,7 @@ _LT_EOF |
30214 | cat <<_LT_EOF >> conftest.$ac_ext | 34335 | cat <<_LT_EOF >> conftest.$ac_ext |
30215 | 34336 | ||
30216 | /* The mapping between symbol names and symbols. */ | 34337 | /* The mapping between symbol names and symbols. */ |
@@ -30219,7 +34340,7 @@ index 0a9ad9e8ccb..35b44e2819c 100755 | |||
30219 | const char *name; | 34340 | const char *name; |
30220 | void *address; | 34341 | void *address; |
30221 | } | 34342 | } |
30222 | @@ -6050,8 +6366,8 @@ static const void *lt_preloaded_setup() { | 34343 | @@ -6038,8 +6366,8 @@ static const void *lt_preloaded_setup() { |
30223 | _LT_EOF | 34344 | _LT_EOF |
30224 | # Now try linking the two files. | 34345 | # Now try linking the two files. |
30225 | mv conftest.$ac_objext conftstm.$ac_objext | 34346 | mv conftest.$ac_objext conftstm.$ac_objext |
@@ -30230,7 +34351,7 @@ index 0a9ad9e8ccb..35b44e2819c 100755 | |||
30230 | LIBS="conftstm.$ac_objext" | 34351 | LIBS="conftstm.$ac_objext" |
30231 | CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" | 34352 | CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" |
30232 | if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 | 34353 | if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 |
30233 | @@ -6061,8 +6377,8 @@ _LT_EOF | 34354 | @@ -6049,8 +6377,8 @@ _LT_EOF |
30234 | test $ac_status = 0; } && test -s conftest${ac_exeext}; then | 34355 | test $ac_status = 0; } && test -s conftest${ac_exeext}; then |
30235 | pipe_works=yes | 34356 | pipe_works=yes |
30236 | fi | 34357 | fi |
@@ -30241,7 +34362,7 @@ index 0a9ad9e8ccb..35b44e2819c 100755 | |||
30241 | else | 34362 | else |
30242 | echo "cannot find nm_test_func in $nlist" >&5 | 34363 | echo "cannot find nm_test_func in $nlist" >&5 |
30243 | fi | 34364 | fi |
30244 | @@ -6099,6 +6415,16 @@ else | 34365 | @@ -6087,6 +6415,17 @@ else |
30245 | $as_echo "ok" >&6; } | 34366 | $as_echo "ok" >&6; } |
30246 | fi | 34367 | fi |
30247 | 34368 | ||
@@ -30255,10 +34376,11 @@ index 0a9ad9e8ccb..35b44e2819c 100755 | |||
30255 | + | 34376 | + |
30256 | + | 34377 | + |
30257 | + | 34378 | + |
34379 | + | ||
30258 | 34380 | ||
30259 | 34381 | ||
30260 | 34382 | ||
30261 | @@ -6116,6 +6442,44 @@ fi | 34383 | @@ -6104,6 +6443,43 @@ fi |
30262 | 34384 | ||
30263 | 34385 | ||
30264 | 34386 | ||
@@ -30267,7 +34389,6 @@ index 0a9ad9e8ccb..35b44e2819c 100755 | |||
30267 | + | 34389 | + |
30268 | + | 34390 | + |
30269 | + | 34391 | + |
30270 | + | ||
30271 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 | 34392 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 |
30272 | +$as_echo_n "checking for sysroot... " >&6; } | 34393 | +$as_echo_n "checking for sysroot... " >&6; } |
30273 | + | 34394 | + |
@@ -30303,18 +34424,10 @@ index 0a9ad9e8ccb..35b44e2819c 100755 | |||
30303 | 34424 | ||
30304 | 34425 | ||
30305 | 34426 | ||
30306 | @@ -6324,11 +6688,128 @@ sparc*-*solaris*) | 34427 | @@ -6318,6 +6694,123 @@ esac |
30307 | ;; | 34428 | |
30308 | esac | 34429 | need_locks="$enable_libtool_lock" |
30309 | fi | 34430 | |
30310 | - rm -rf conftest* | ||
30311 | - ;; | ||
30312 | + rm -rf conftest* | ||
30313 | + ;; | ||
30314 | +esac | ||
30315 | + | ||
30316 | +need_locks="$enable_libtool_lock" | ||
30317 | + | ||
30318 | +if test -n "$ac_tool_prefix"; then | 34431 | +if test -n "$ac_tool_prefix"; then |
30319 | + # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args. | 34432 | + # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args. |
30320 | +set dummy ${ac_tool_prefix}mt; ac_word=$2 | 34433 | +set dummy ${ac_tool_prefix}mt; ac_word=$2 |
@@ -30400,7 +34513,7 @@ index 0a9ad9e8ccb..35b44e2819c 100755 | |||
30400 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 | 34513 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 |
30401 | +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} | 34514 | +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} |
30402 | +ac_tool_warned=yes ;; | 34515 | +ac_tool_warned=yes ;; |
30403 | esac | 34516 | +esac |
30404 | + MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL | 34517 | + MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL |
30405 | + fi | 34518 | + fi |
30406 | +else | 34519 | +else |
@@ -30430,12 +34543,12 @@ index 0a9ad9e8ccb..35b44e2819c 100755 | |||
30430 | + | 34543 | + |
30431 | + | 34544 | + |
30432 | + | 34545 | + |
30433 | 34546 | + | |
30434 | -need_locks="$enable_libtool_lock" | 34547 | + |
30435 | |||
30436 | 34548 | ||
30437 | case $host_os in | 34549 | case $host_os in |
30438 | @@ -6896,6 +7377,8 @@ _LT_EOF | 34550 | rhapsody* | darwin*) |
34551 | @@ -6884,6 +7377,8 @@ _LT_EOF | ||
30439 | $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 | 34552 | $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 |
30440 | echo "$AR cru libconftest.a conftest.o" >&5 | 34553 | echo "$AR cru libconftest.a conftest.o" >&5 |
30441 | $AR cru libconftest.a conftest.o 2>&5 | 34554 | $AR cru libconftest.a conftest.o 2>&5 |
@@ -30444,7 +34557,7 @@ index 0a9ad9e8ccb..35b44e2819c 100755 | |||
30444 | cat > conftest.c << _LT_EOF | 34557 | cat > conftest.c << _LT_EOF |
30445 | int main() { return 0;} | 34558 | int main() { return 0;} |
30446 | _LT_EOF | 34559 | _LT_EOF |
30447 | @@ -7745,8 +8228,6 @@ fi | 34560 | @@ -7733,8 +8228,6 @@ fi |
30448 | lt_prog_compiler_pic= | 34561 | lt_prog_compiler_pic= |
30449 | lt_prog_compiler_static= | 34562 | lt_prog_compiler_static= |
30450 | 34563 | ||
@@ -30453,7 +34566,7 @@ index 0a9ad9e8ccb..35b44e2819c 100755 | |||
30453 | 34566 | ||
30454 | if test "$GCC" = yes; then | 34567 | if test "$GCC" = yes; then |
30455 | lt_prog_compiler_wl='-Wl,' | 34568 | lt_prog_compiler_wl='-Wl,' |
30456 | @@ -7912,6 +8393,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } | 34569 | @@ -7900,6 +8393,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } |
30457 | lt_prog_compiler_pic='--shared' | 34570 | lt_prog_compiler_pic='--shared' |
30458 | lt_prog_compiler_static='--static' | 34571 | lt_prog_compiler_static='--static' |
30459 | ;; | 34572 | ;; |
@@ -30466,7 +34579,7 @@ index 0a9ad9e8ccb..35b44e2819c 100755 | |||
30466 | pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) | 34579 | pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) |
30467 | # Portland Group compilers (*not* the Pentium gcc compiler, | 34580 | # Portland Group compilers (*not* the Pentium gcc compiler, |
30468 | # which looks to be a dead project) | 34581 | # which looks to be a dead project) |
30469 | @@ -7974,7 +8461,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } | 34582 | @@ -7962,7 +8461,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } |
30470 | lt_prog_compiler_pic='-KPIC' | 34583 | lt_prog_compiler_pic='-KPIC' |
30471 | lt_prog_compiler_static='-Bstatic' | 34584 | lt_prog_compiler_static='-Bstatic' |
30472 | case $cc_basename in | 34585 | case $cc_basename in |
@@ -30475,7 +34588,7 @@ index 0a9ad9e8ccb..35b44e2819c 100755 | |||
30475 | lt_prog_compiler_wl='-Qoption ld ';; | 34588 | lt_prog_compiler_wl='-Qoption ld ';; |
30476 | *) | 34589 | *) |
30477 | lt_prog_compiler_wl='-Wl,';; | 34590 | lt_prog_compiler_wl='-Wl,';; |
30478 | @@ -8031,13 +8518,17 @@ case $host_os in | 34591 | @@ -8019,13 +8518,17 @@ case $host_os in |
30479 | lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" | 34592 | lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" |
30480 | ;; | 34593 | ;; |
30481 | esac | 34594 | esac |
@@ -30499,7 +34612,7 @@ index 0a9ad9e8ccb..35b44e2819c 100755 | |||
30499 | 34612 | ||
30500 | # | 34613 | # |
30501 | # Check to make sure the PIC flag actually works. | 34614 | # Check to make sure the PIC flag actually works. |
30502 | @@ -8098,6 +8589,11 @@ fi | 34615 | @@ -8086,6 +8589,11 @@ fi |
30503 | 34616 | ||
30504 | 34617 | ||
30505 | 34618 | ||
@@ -30511,7 +34624,7 @@ index 0a9ad9e8ccb..35b44e2819c 100755 | |||
30511 | # | 34624 | # |
30512 | # Check to make sure the static flag actually works. | 34625 | # Check to make sure the static flag actually works. |
30513 | # | 34626 | # |
30514 | @@ -8448,7 +8944,8 @@ _LT_EOF | 34627 | @@ -8436,7 +8944,8 @@ _LT_EOF |
30515 | allow_undefined_flag=unsupported | 34628 | allow_undefined_flag=unsupported |
30516 | always_export_symbols=no | 34629 | always_export_symbols=no |
30517 | enable_shared_with_static_runtimes=yes | 34630 | enable_shared_with_static_runtimes=yes |
@@ -30521,7 +34634,7 @@ index 0a9ad9e8ccb..35b44e2819c 100755 | |||
30521 | 34634 | ||
30522 | if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then | 34635 | if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then |
30523 | archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' | 34636 | archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' |
30524 | @@ -8547,12 +9044,12 @@ _LT_EOF | 34637 | @@ -8535,12 +9044,12 @@ _LT_EOF |
30525 | whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' | 34638 | whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' |
30526 | hardcode_libdir_flag_spec= | 34639 | hardcode_libdir_flag_spec= |
30527 | hardcode_libdir_flag_spec_ld='-rpath $libdir' | 34640 | hardcode_libdir_flag_spec_ld='-rpath $libdir' |
@@ -30536,7 +34649,7 @@ index 0a9ad9e8ccb..35b44e2819c 100755 | |||
30536 | fi | 34649 | fi |
30537 | ;; | 34650 | ;; |
30538 | esac | 34651 | esac |
30539 | @@ -8566,8 +9063,8 @@ _LT_EOF | 34652 | @@ -8554,8 +9063,8 @@ _LT_EOF |
30540 | archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' | 34653 | archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' |
30541 | wlarc= | 34654 | wlarc= |
30542 | else | 34655 | else |
@@ -30547,7 +34660,7 @@ index 0a9ad9e8ccb..35b44e2819c 100755 | |||
30547 | fi | 34660 | fi |
30548 | ;; | 34661 | ;; |
30549 | 34662 | ||
30550 | @@ -8585,8 +9082,8 @@ _LT_EOF | 34663 | @@ -8573,8 +9082,8 @@ _LT_EOF |
30551 | 34664 | ||
30552 | _LT_EOF | 34665 | _LT_EOF |
30553 | elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then | 34666 | elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then |
@@ -30558,7 +34671,7 @@ index 0a9ad9e8ccb..35b44e2819c 100755 | |||
30558 | else | 34671 | else |
30559 | ld_shlibs=no | 34672 | ld_shlibs=no |
30560 | fi | 34673 | fi |
30561 | @@ -8632,8 +9129,8 @@ _LT_EOF | 34674 | @@ -8620,8 +9129,8 @@ _LT_EOF |
30562 | 34675 | ||
30563 | *) | 34676 | *) |
30564 | if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then | 34677 | if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then |
@@ -30569,7 +34682,7 @@ index 0a9ad9e8ccb..35b44e2819c 100755 | |||
30569 | else | 34682 | else |
30570 | ld_shlibs=no | 34683 | ld_shlibs=no |
30571 | fi | 34684 | fi |
30572 | @@ -8763,7 +9260,13 @@ _LT_EOF | 34685 | @@ -8751,7 +9260,13 @@ _LT_EOF |
30573 | allow_undefined_flag='-berok' | 34686 | allow_undefined_flag='-berok' |
30574 | # Determine the default libpath from the value encoded in an | 34687 | # Determine the default libpath from the value encoded in an |
30575 | # empty executable. | 34688 | # empty executable. |
@@ -30584,7 +34697,7 @@ index 0a9ad9e8ccb..35b44e2819c 100755 | |||
30584 | as_fn_error $? "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5 | 34697 | as_fn_error $? "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5 |
30585 | fi | 34698 | fi |
30586 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext | 34699 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
30587 | @@ -8779,22 +9282,29 @@ main () | 34700 | @@ -8767,22 +9282,29 @@ main () |
30588 | _ACEOF | 34701 | _ACEOF |
30589 | if ac_fn_c_try_link "$LINENO"; then : | 34702 | if ac_fn_c_try_link "$LINENO"; then : |
30590 | 34703 | ||
@@ -30627,7 +34740,7 @@ index 0a9ad9e8ccb..35b44e2819c 100755 | |||
30627 | 34740 | ||
30628 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" | 34741 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" |
30629 | archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" | 34742 | 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" |
30630 | @@ -8806,7 +9316,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | 34743 | @@ -8794,7 +9316,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
30631 | else | 34744 | else |
30632 | # Determine the default libpath from the value encoded in an | 34745 | # Determine the default libpath from the value encoded in an |
30633 | # empty executable. | 34746 | # empty executable. |
@@ -30642,7 +34755,7 @@ index 0a9ad9e8ccb..35b44e2819c 100755 | |||
30642 | as_fn_error $? "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5 | 34755 | as_fn_error $? "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5 |
30643 | fi | 34756 | fi |
30644 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext | 34757 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
30645 | @@ -8822,22 +9338,29 @@ main () | 34758 | @@ -8810,22 +9338,29 @@ main () |
30646 | _ACEOF | 34759 | _ACEOF |
30647 | if ac_fn_c_try_link "$LINENO"; then : | 34760 | if ac_fn_c_try_link "$LINENO"; then : |
30648 | 34761 | ||
@@ -30685,7 +34798,7 @@ index 0a9ad9e8ccb..35b44e2819c 100755 | |||
30685 | 34798 | ||
30686 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" | 34799 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" |
30687 | # Warning - without using the other run time loading flags, | 34800 | # Warning - without using the other run time loading flags, |
30688 | @@ -8882,20 +9405,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | 34801 | @@ -8870,20 +9405,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
30689 | # Microsoft Visual C++. | 34802 | # Microsoft Visual C++. |
30690 | # hardcode_libdir_flag_spec is actually meaningless, as there is | 34803 | # hardcode_libdir_flag_spec is actually meaningless, as there is |
30691 | # no search path for DLLs. | 34804 | # no search path for DLLs. |
@@ -30763,7 +34876,7 @@ index 0a9ad9e8ccb..35b44e2819c 100755 | |||
30763 | ;; | 34876 | ;; |
30764 | 34877 | ||
30765 | darwin* | rhapsody*) | 34878 | darwin* | rhapsody*) |
30766 | @@ -8956,7 +9522,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | 34879 | @@ -8944,7 +9522,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
30767 | 34880 | ||
30768 | # FreeBSD 3 and greater uses gcc -shared to do shared libraries. | 34881 | # FreeBSD 3 and greater uses gcc -shared to do shared libraries. |
30769 | freebsd* | dragonfly*) | 34882 | freebsd* | dragonfly*) |
@@ -30772,7 +34885,7 @@ index 0a9ad9e8ccb..35b44e2819c 100755 | |||
30772 | hardcode_libdir_flag_spec='-R$libdir' | 34885 | hardcode_libdir_flag_spec='-R$libdir' |
30773 | hardcode_direct=yes | 34886 | hardcode_direct=yes |
30774 | hardcode_shlibpath_var=no | 34887 | hardcode_shlibpath_var=no |
30775 | @@ -8964,7 +9530,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | 34888 | @@ -8952,7 +9530,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
30776 | 34889 | ||
30777 | hpux9*) | 34890 | hpux9*) |
30778 | if test "$GCC" = yes; then | 34891 | if test "$GCC" = yes; then |
@@ -30781,7 +34894,7 @@ index 0a9ad9e8ccb..35b44e2819c 100755 | |||
30781 | else | 34894 | else |
30782 | archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' | 34895 | 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' |
30783 | fi | 34896 | fi |
30784 | @@ -8980,7 +9546,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | 34897 | @@ -8968,7 +9546,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
30785 | 34898 | ||
30786 | hpux10*) | 34899 | hpux10*) |
30787 | if test "$GCC" = yes && test "$with_gnu_ld" = no; then | 34900 | if test "$GCC" = yes && test "$with_gnu_ld" = no; then |
@@ -30790,7 +34903,7 @@ index 0a9ad9e8ccb..35b44e2819c 100755 | |||
30790 | else | 34903 | else |
30791 | archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' | 34904 | archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' |
30792 | fi | 34905 | fi |
30793 | @@ -9004,10 +9570,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | 34906 | @@ -8992,10 +9570,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
30794 | archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' | 34907 | archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' |
30795 | ;; | 34908 | ;; |
30796 | ia64*) | 34909 | ia64*) |
@@ -30803,7 +34916,7 @@ index 0a9ad9e8ccb..35b44e2819c 100755 | |||
30803 | ;; | 34916 | ;; |
30804 | esac | 34917 | esac |
30805 | else | 34918 | else |
30806 | @@ -9086,26 +9652,39 @@ fi | 34919 | @@ -9074,26 +9652,39 @@ fi |
30807 | 34920 | ||
30808 | irix5* | irix6* | nonstopux*) | 34921 | irix5* | irix6* | nonstopux*) |
30809 | if test "$GCC" = yes; then | 34922 | if test "$GCC" = yes; then |
@@ -30851,7 +34964,7 @@ index 0a9ad9e8ccb..35b44e2819c 100755 | |||
30851 | else | 34964 | else |
30852 | archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' | 34965 | 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' |
30853 | archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' | 34966 | 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' |
30854 | @@ -9190,7 +9769,7 @@ rm -f core conftest.err conftest.$ac_objext \ | 34967 | @@ -9178,7 +9769,7 @@ rm -f core conftest.err conftest.$ac_objext \ |
30855 | osf4* | osf5*) # as osf3* with the addition of -msym flag | 34968 | osf4* | osf5*) # as osf3* with the addition of -msym flag |
30856 | if test "$GCC" = yes; then | 34969 | if test "$GCC" = yes; then |
30857 | allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' | 34970 | allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' |
@@ -30860,7 +34973,7 @@ index 0a9ad9e8ccb..35b44e2819c 100755 | |||
30860 | hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' | 34973 | hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' |
30861 | else | 34974 | else |
30862 | allow_undefined_flag=' -expect_unresolved \*' | 34975 | allow_undefined_flag=' -expect_unresolved \*' |
30863 | @@ -9209,9 +9788,9 @@ rm -f core conftest.err conftest.$ac_objext \ | 34976 | @@ -9197,9 +9788,9 @@ rm -f core conftest.err conftest.$ac_objext \ |
30864 | no_undefined_flag=' -z defs' | 34977 | no_undefined_flag=' -z defs' |
30865 | if test "$GCC" = yes; then | 34978 | if test "$GCC" = yes; then |
30866 | wlarc='${wl}' | 34979 | wlarc='${wl}' |
@@ -30872,7 +34985,7 @@ index 0a9ad9e8ccb..35b44e2819c 100755 | |||
30872 | else | 34985 | else |
30873 | case `$CC -V 2>&1` in | 34986 | case `$CC -V 2>&1` in |
30874 | *"Compilers 5.0"*) | 34987 | *"Compilers 5.0"*) |
30875 | @@ -9787,8 +10366,9 @@ cygwin* | mingw* | pw32* | cegcc*) | 34988 | @@ -9775,8 +10366,9 @@ cygwin* | mingw* | pw32* | cegcc*) |
30876 | need_version=no | 34989 | need_version=no |
30877 | need_lib_prefix=no | 34990 | need_lib_prefix=no |
30878 | 34991 | ||
@@ -30884,7 +34997,7 @@ index 0a9ad9e8ccb..35b44e2819c 100755 | |||
30884 | library_names_spec='$libname.dll.a' | 34997 | library_names_spec='$libname.dll.a' |
30885 | # DLL is installed to $(libdir)/../bin by postinstall_cmds | 34998 | # DLL is installed to $(libdir)/../bin by postinstall_cmds |
30886 | postinstall_cmds='base_file=`basename \${file}`~ | 34999 | postinstall_cmds='base_file=`basename \${file}`~ |
30887 | @@ -9821,13 +10401,71 @@ cygwin* | mingw* | pw32* | cegcc*) | 35000 | @@ -9809,13 +10401,71 @@ cygwin* | mingw* | pw32* | cegcc*) |
30888 | library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' | 35001 | library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' |
30889 | ;; | 35002 | ;; |
30890 | esac | 35003 | esac |
@@ -30957,16 +35070,16 @@ index 0a9ad9e8ccb..35b44e2819c 100755 | |||
30957 | # FIXME: first we should search . and the directory the executable is in | 35070 | # FIXME: first we should search . and the directory the executable is in |
30958 | shlibpath_var=PATH | 35071 | shlibpath_var=PATH |
30959 | ;; | 35072 | ;; |
30960 | @@ -10723,7 +11361,7 @@ else | 35073 | @@ -10711,7 +11361,7 @@ else |
30961 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 | 35074 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 |
30962 | lt_status=$lt_dlunknown | 35075 | lt_status=$lt_dlunknown |
30963 | cat > conftest.$ac_ext <<_LT_EOF | 35076 | cat > conftest.$ac_ext <<_LT_EOF |
30964 | -#line 10726 "configure" | 35077 | -#line 10714 "configure" |
30965 | +#line $LINENO "configure" | 35078 | +#line $LINENO "configure" |
30966 | #include "confdefs.h" | 35079 | #include "confdefs.h" |
30967 | 35080 | ||
30968 | #if HAVE_DLFCN_H | 35081 | #if HAVE_DLFCN_H |
30969 | @@ -10767,10 +11405,10 @@ else | 35082 | @@ -10755,10 +11405,10 @@ else |
30970 | /* When -fvisbility=hidden is used, assume the code has been annotated | 35083 | /* When -fvisbility=hidden is used, assume the code has been annotated |
30971 | correspondingly for the symbols needed. */ | 35084 | correspondingly for the symbols needed. */ |
30972 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) | 35085 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) |
@@ -30979,16 +35092,16 @@ index 0a9ad9e8ccb..35b44e2819c 100755 | |||
30979 | int main () | 35092 | int main () |
30980 | { | 35093 | { |
30981 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); | 35094 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); |
30982 | @@ -10829,7 +11467,7 @@ else | 35095 | @@ -10817,7 +11467,7 @@ else |
30983 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 | 35096 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 |
30984 | lt_status=$lt_dlunknown | 35097 | lt_status=$lt_dlunknown |
30985 | cat > conftest.$ac_ext <<_LT_EOF | 35098 | cat > conftest.$ac_ext <<_LT_EOF |
30986 | -#line 10832 "configure" | 35099 | -#line 10820 "configure" |
30987 | +#line $LINENO "configure" | 35100 | +#line $LINENO "configure" |
30988 | #include "confdefs.h" | 35101 | #include "confdefs.h" |
30989 | 35102 | ||
30990 | #if HAVE_DLFCN_H | 35103 | #if HAVE_DLFCN_H |
30991 | @@ -10873,10 +11511,10 @@ else | 35104 | @@ -10861,10 +11511,10 @@ else |
30992 | /* When -fvisbility=hidden is used, assume the code has been annotated | 35105 | /* When -fvisbility=hidden is used, assume the code has been annotated |
30993 | correspondingly for the symbols needed. */ | 35106 | correspondingly for the symbols needed. */ |
30994 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) | 35107 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) |
@@ -31001,16 +35114,7 @@ index 0a9ad9e8ccb..35b44e2819c 100755 | |||
31001 | int main () | 35114 | int main () |
31002 | { | 35115 | { |
31003 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); | 35116 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); |
31004 | @@ -12308,7 +12946,7 @@ CC="$CC" | 35117 | @@ -12334,13 +12984,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' |
31005 | CXX="$CXX" | ||
31006 | GFORTRAN="$GFORTRAN" | ||
31007 | GDC="$GDC" | ||
31008 | -AMDEP_TRUE="$AMDEP_TRUE" MAKE="${MAKE-make}" | ||
31009 | +AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir" | ||
31010 | |||
31011 | |||
31012 | # The HP-UX ksh and POSIX shell print the target directory to stdout | ||
31013 | @@ -12346,13 +12984,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' | ||
31014 | lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' | 35118 | lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' |
31015 | lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' | 35119 | lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' |
31016 | lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' | 35120 | lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' |
@@ -31031,7 +35135,7 @@ index 0a9ad9e8ccb..35b44e2819c 100755 | |||
31031 | STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' | 35135 | STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' |
31032 | RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' | 35136 | RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' |
31033 | old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' | 35137 | old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' |
31034 | @@ -12367,14 +13012,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de | 35138 | @@ -12355,14 +13012,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de |
31035 | lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' | 35139 | lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' |
31036 | lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' | 35140 | lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' |
31037 | lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`' | 35141 | 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"`' |
@@ -31050,7 +35154,7 @@ index 0a9ad9e8ccb..35b44e2819c 100755 | |||
31050 | DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' | 35154 | DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' |
31051 | NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' | 35155 | NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' |
31052 | LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' | 35156 | LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' |
31053 | @@ -12407,12 +13055,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q | 35157 | @@ -12395,12 +13055,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q |
31054 | hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' | 35158 | hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' |
31055 | inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' | 35159 | inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' |
31056 | link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' | 35160 | link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' |
@@ -31064,7 +35168,7 @@ index 0a9ad9e8ccb..35b44e2819c 100755 | |||
31064 | file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' | 35168 | file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' |
31065 | variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' | 35169 | variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' |
31066 | need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' | 35170 | need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' |
31067 | @@ -12467,8 +13115,13 @@ reload_flag \ | 35171 | @@ -12455,8 +13115,13 @@ reload_flag \ |
31068 | OBJDUMP \ | 35172 | OBJDUMP \ |
31069 | deplibs_check_method \ | 35173 | deplibs_check_method \ |
31070 | file_magic_cmd \ | 35174 | file_magic_cmd \ |
@@ -31078,7 +35182,7 @@ index 0a9ad9e8ccb..35b44e2819c 100755 | |||
31078 | STRIP \ | 35182 | STRIP \ |
31079 | RANLIB \ | 35183 | RANLIB \ |
31080 | CC \ | 35184 | CC \ |
31081 | @@ -12478,12 +13131,14 @@ lt_cv_sys_global_symbol_pipe \ | 35185 | @@ -12466,12 +13131,14 @@ lt_cv_sys_global_symbol_pipe \ |
31082 | lt_cv_sys_global_symbol_to_cdecl \ | 35186 | lt_cv_sys_global_symbol_to_cdecl \ |
31083 | lt_cv_sys_global_symbol_to_c_name_address \ | 35187 | lt_cv_sys_global_symbol_to_c_name_address \ |
31084 | lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ | 35188 | lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ |
@@ -31094,7 +35198,7 @@ index 0a9ad9e8ccb..35b44e2819c 100755 | |||
31094 | DSYMUTIL \ | 35198 | DSYMUTIL \ |
31095 | NMEDIT \ | 35199 | NMEDIT \ |
31096 | LIPO \ | 35200 | LIPO \ |
31097 | @@ -12499,7 +13154,6 @@ no_undefined_flag \ | 35201 | @@ -12487,7 +13154,6 @@ no_undefined_flag \ |
31098 | hardcode_libdir_flag_spec \ | 35202 | hardcode_libdir_flag_spec \ |
31099 | hardcode_libdir_flag_spec_ld \ | 35203 | hardcode_libdir_flag_spec_ld \ |
31100 | hardcode_libdir_separator \ | 35204 | hardcode_libdir_separator \ |
@@ -31102,7 +35206,7 @@ index 0a9ad9e8ccb..35b44e2819c 100755 | |||
31102 | exclude_expsyms \ | 35206 | exclude_expsyms \ |
31103 | include_expsyms \ | 35207 | include_expsyms \ |
31104 | file_list_spec \ | 35208 | file_list_spec \ |
31105 | @@ -12535,6 +13189,7 @@ module_cmds \ | 35209 | @@ -12523,6 +13189,7 @@ module_cmds \ |
31106 | module_expsym_cmds \ | 35210 | module_expsym_cmds \ |
31107 | export_symbols_cmds \ | 35211 | export_symbols_cmds \ |
31108 | prelink_cmds \ | 35212 | prelink_cmds \ |
@@ -31110,149 +35214,7 @@ index 0a9ad9e8ccb..35b44e2819c 100755 | |||
31110 | postinstall_cmds \ | 35214 | postinstall_cmds \ |
31111 | postuninstall_cmds \ | 35215 | postuninstall_cmds \ |
31112 | finish_cmds \ | 35216 | finish_cmds \ |
31113 | @@ -13023,35 +13678,29 @@ esac ;; | 35217 | @@ -13121,7 +13788,8 @@ $as_echo X"$file" | |
31114 | # Older Autoconf quotes --file arguments for eval, but not when files | ||
31115 | # are listed without --file. Let's play safe and only enable the eval | ||
31116 | # if we detect the quoting. | ||
31117 | - # TODO: see whether this extra hack can be removed once we start | ||
31118 | - # requiring Autoconf 2.70 or later. | ||
31119 | - case $CONFIG_FILES in #( | ||
31120 | - *\'*) : | ||
31121 | - eval set x "$CONFIG_FILES" ;; #( | ||
31122 | - *) : | ||
31123 | - set x $CONFIG_FILES ;; #( | ||
31124 | - *) : | ||
31125 | - ;; | ||
31126 | -esac | ||
31127 | + case $CONFIG_FILES in | ||
31128 | + *\'*) eval set x "$CONFIG_FILES" ;; | ||
31129 | + *) set x $CONFIG_FILES ;; | ||
31130 | + esac | ||
31131 | shift | ||
31132 | - # Used to flag and report bootstrapping failures. | ||
31133 | - am_rc=0 | ||
31134 | - for am_mf | ||
31135 | + for mf | ||
31136 | do | ||
31137 | # Strip MF so we end up with the name of the file. | ||
31138 | - am_mf=`$as_echo "$am_mf" | sed -e 's/:.*$//'` | ||
31139 | - # Check whether this is an Automake generated Makefile which includes | ||
31140 | - # dependency-tracking related rules and includes. | ||
31141 | - # Grep'ing the whole file directly is not great: AIX grep has a line | ||
31142 | + mf=`echo "$mf" | sed -e 's/:.*$//'` | ||
31143 | + # Check whether this is an Automake generated Makefile or not. | ||
31144 | + # We used to match only the files named 'Makefile.in', but | ||
31145 | + # some people rename them; so instead we look at the file content. | ||
31146 | + # Grep'ing the first line is not enough: some people post-process | ||
31147 | + # each Makefile.in and add a new line on top of each file to say so. | ||
31148 | + # Grep'ing the whole file is not good either: AIX grep has a line | ||
31149 | # limit of 2048, but all sed's we know have understand at least 4000. | ||
31150 | - sed -n 's,^am--depfiles:.*,X,p' "$am_mf" | grep X >/dev/null 2>&1 \ | ||
31151 | - || continue | ||
31152 | - am_dirpart=`$as_dirname -- "$am_mf" || | ||
31153 | -$as_expr X"$am_mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ | ||
31154 | - X"$am_mf" : 'X\(//\)[^/]' \| \ | ||
31155 | - X"$am_mf" : 'X\(//\)$' \| \ | ||
31156 | - X"$am_mf" : 'X\(/\)' \| . 2>/dev/null || | ||
31157 | -$as_echo X"$am_mf" | | ||
31158 | + if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then | ||
31159 | + dirpart=`$as_dirname -- "$mf" || | ||
31160 | +$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ | ||
31161 | + X"$mf" : 'X\(//\)[^/]' \| \ | ||
31162 | + X"$mf" : 'X\(//\)$' \| \ | ||
31163 | + X"$mf" : 'X\(/\)' \| . 2>/dev/null || | ||
31164 | +$as_echo X"$mf" | | ||
31165 | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ | ||
31166 | s//\1/ | ||
31167 | q | ||
31168 | @@ -13069,50 +13718,53 @@ $as_echo X"$am_mf" | | ||
31169 | q | ||
31170 | } | ||
31171 | s/.*/./; q'` | ||
31172 | - am_filepart=`$as_basename -- "$am_mf" || | ||
31173 | -$as_expr X/"$am_mf" : '.*/\([^/][^/]*\)/*$' \| \ | ||
31174 | - X"$am_mf" : 'X\(//\)$' \| \ | ||
31175 | - X"$am_mf" : 'X\(/\)' \| . 2>/dev/null || | ||
31176 | -$as_echo X/"$am_mf" | | ||
31177 | - sed '/^.*\/\([^/][^/]*\)\/*$/{ | ||
31178 | + else | ||
31179 | + continue | ||
31180 | + fi | ||
31181 | + # Extract the definition of DEPDIR, am__include, and am__quote | ||
31182 | + # from the Makefile without running 'make'. | ||
31183 | + DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` | ||
31184 | + test -z "$DEPDIR" && continue | ||
31185 | + am__include=`sed -n 's/^am__include = //p' < "$mf"` | ||
31186 | + test -z "$am__include" && continue | ||
31187 | + am__quote=`sed -n 's/^am__quote = //p' < "$mf"` | ||
31188 | + # Find all dependency output files, they are included files with | ||
31189 | + # $(DEPDIR) in their names. We invoke sed twice because it is the | ||
31190 | + # simplest approach to changing $(DEPDIR) to its actual value in the | ||
31191 | + # expansion. | ||
31192 | + for file in `sed -n " | ||
31193 | + s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ | ||
31194 | + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do | ||
31195 | + # Make sure the directory exists. | ||
31196 | + test -f "$dirpart/$file" && continue | ||
31197 | + fdir=`$as_dirname -- "$file" || | ||
31198 | +$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ | ||
31199 | + X"$file" : 'X\(//\)[^/]' \| \ | ||
31200 | + X"$file" : 'X\(//\)$' \| \ | ||
31201 | + X"$file" : 'X\(/\)' \| . 2>/dev/null || | ||
31202 | +$as_echo X"$file" | | ||
31203 | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ | ||
31204 | s//\1/ | ||
31205 | q | ||
31206 | } | ||
31207 | - /^X\/\(\/\/\)$/{ | ||
31208 | + /^X\(\/\/\)[^/].*/{ | ||
31209 | s//\1/ | ||
31210 | q | ||
31211 | } | ||
31212 | - /^X\/\(\/\).*/{ | ||
31213 | + /^X\(\/\/\)$/{ | ||
31214 | + s//\1/ | ||
31215 | + q | ||
31216 | + } | ||
31217 | + /^X\(\/\).*/{ | ||
31218 | s//\1/ | ||
31219 | q | ||
31220 | } | ||
31221 | s/.*/./; q'` | ||
31222 | - { echo "$as_me:$LINENO: cd "$am_dirpart" \ | ||
31223 | - && sed -e '/# am--include-marker/d' "$am_filepart" \ | ||
31224 | - | $MAKE -f - am--depfiles" >&5 | ||
31225 | - (cd "$am_dirpart" \ | ||
31226 | - && sed -e '/# am--include-marker/d' "$am_filepart" \ | ||
31227 | - | $MAKE -f - am--depfiles) >&5 2>&5 | ||
31228 | - ac_status=$? | ||
31229 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
31230 | - (exit $ac_status); } || am_rc=$? | ||
31231 | + as_dir=$dirpart/$fdir; as_fn_mkdir_p | ||
31232 | + # echo "creating $dirpart/$file" | ||
31233 | + echo '# dummy' > "$dirpart/$file" | ||
31234 | + done | ||
31235 | done | ||
31236 | - if test $am_rc -ne 0; then | ||
31237 | - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 | ||
31238 | -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} | ||
31239 | -as_fn_error $? "Something went wrong bootstrapping makefile fragments | ||
31240 | - for automatic dependency tracking. If GNU make was not used, consider | ||
31241 | - re-running the configure script with MAKE=\"gmake\" (or whatever is | ||
31242 | - necessary). You can also try re-running configure with the | ||
31243 | - '--disable-dependency-tracking' option to at least be able to build | ||
31244 | - the package (albeit without support for automatic dependency tracking). | ||
31245 | -See \`config.log' for more details" "$LINENO" 5; } | ||
31246 | - fi | ||
31247 | - { am_dirpart=; unset am_dirpart;} | ||
31248 | - { am_filepart=; unset am_filepart;} | ||
31249 | - { am_mf=; unset am_mf;} | ||
31250 | - { am_rc=; unset am_rc;} | ||
31251 | - rm -f conftest-deps.mk | ||
31252 | } | ||
31253 | ;; | ||
31254 | "libtool":C) | ||
31255 | @@ -13136,7 +13788,8 @@ See \`config.log' for more details" "$LINENO" 5; } | ||
31256 | # NOTE: Changes made to this file will be lost: look at ltmain.sh. | 35218 | # NOTE: Changes made to this file will be lost: look at ltmain.sh. |
31257 | # | 35219 | # |
31258 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, | 35220 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, |
@@ -31262,7 +35224,7 @@ index 0a9ad9e8ccb..35b44e2819c 100755 | |||
31262 | # Written by Gordon Matzigkeit, 1996 | 35224 | # Written by Gordon Matzigkeit, 1996 |
31263 | # | 35225 | # |
31264 | # This file is part of GNU Libtool. | 35226 | # This file is part of GNU Libtool. |
31265 | @@ -13239,19 +13892,42 @@ SP2NL=$lt_lt_SP2NL | 35227 | @@ -13224,19 +13892,42 @@ SP2NL=$lt_lt_SP2NL |
31266 | # turn newlines into spaces. | 35228 | # turn newlines into spaces. |
31267 | NL2SP=$lt_lt_NL2SP | 35229 | NL2SP=$lt_lt_NL2SP |
31268 | 35230 | ||
@@ -31306,7 +35268,7 @@ index 0a9ad9e8ccb..35b44e2819c 100755 | |||
31306 | # A symbol stripping program. | 35268 | # A symbol stripping program. |
31307 | STRIP=$lt_STRIP | 35269 | STRIP=$lt_STRIP |
31308 | 35270 | ||
31309 | @@ -13281,6 +13957,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address | 35271 | @@ -13266,6 +13957,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address |
31310 | # Transform the output of nm in a C name address pair when lib prefix is needed. | 35272 | # Transform the output of nm in a C name address pair when lib prefix is needed. |
31311 | global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix | 35273 | global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix |
31312 | 35274 | ||
@@ -31319,7 +35281,7 @@ index 0a9ad9e8ccb..35b44e2819c 100755 | |||
31319 | # The name of the directory that contains temporary libtool files. | 35281 | # The name of the directory that contains temporary libtool files. |
31320 | objdir=$objdir | 35282 | objdir=$objdir |
31321 | 35283 | ||
31322 | @@ -13290,6 +13972,9 @@ MAGIC_CMD=$MAGIC_CMD | 35284 | @@ -13275,6 +13972,9 @@ MAGIC_CMD=$MAGIC_CMD |
31323 | # Must we lock files when doing compilation? | 35285 | # Must we lock files when doing compilation? |
31324 | need_locks=$lt_need_locks | 35286 | need_locks=$lt_need_locks |
31325 | 35287 | ||
@@ -31329,7 +35291,7 @@ index 0a9ad9e8ccb..35b44e2819c 100755 | |||
31329 | # Tool to manipulate archived DWARF debug symbol files on Mac OS X. | 35291 | # Tool to manipulate archived DWARF debug symbol files on Mac OS X. |
31330 | DSYMUTIL=$lt_DSYMUTIL | 35292 | DSYMUTIL=$lt_DSYMUTIL |
31331 | 35293 | ||
31332 | @@ -13404,12 +14089,12 @@ with_gcc=$GCC | 35294 | @@ -13389,12 +14089,12 @@ with_gcc=$GCC |
31333 | # Compiler flag to turn off builtin functions. | 35295 | # Compiler flag to turn off builtin functions. |
31334 | no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag | 35296 | no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag |
31335 | 35297 | ||
@@ -31345,7 +35307,7 @@ index 0a9ad9e8ccb..35b44e2819c 100755 | |||
31345 | # Compiler flag to prevent dynamic linking. | 35307 | # Compiler flag to prevent dynamic linking. |
31346 | link_static_flag=$lt_lt_prog_compiler_static | 35308 | link_static_flag=$lt_lt_prog_compiler_static |
31347 | 35309 | ||
31348 | @@ -13496,9 +14181,6 @@ inherit_rpath=$inherit_rpath | 35310 | @@ -13481,9 +14181,6 @@ inherit_rpath=$inherit_rpath |
31349 | # Whether libtool must link a program against all its dependency libraries. | 35311 | # Whether libtool must link a program against all its dependency libraries. |
31350 | link_all_deplibs=$link_all_deplibs | 35312 | link_all_deplibs=$link_all_deplibs |
31351 | 35313 | ||
@@ -31355,7 +35317,7 @@ index 0a9ad9e8ccb..35b44e2819c 100755 | |||
31355 | # Set to "yes" if exported symbols are required. | 35317 | # Set to "yes" if exported symbols are required. |
31356 | always_export_symbols=$always_export_symbols | 35318 | always_export_symbols=$always_export_symbols |
31357 | 35319 | ||
31358 | @@ -13514,6 +14196,9 @@ include_expsyms=$lt_include_expsyms | 35320 | @@ -13499,6 +14196,9 @@ include_expsyms=$lt_include_expsyms |
31359 | # Commands necessary for linking programs (against libraries) with templates. | 35321 | # Commands necessary for linking programs (against libraries) with templates. |
31360 | prelink_cmds=$lt_prelink_cmds | 35322 | prelink_cmds=$lt_prelink_cmds |
31361 | 35323 | ||
@@ -31365,7 +35327,7 @@ index 0a9ad9e8ccb..35b44e2819c 100755 | |||
31365 | # Specify filename containing input files. | 35327 | # Specify filename containing input files. |
31366 | file_list_spec=$lt_file_list_spec | 35328 | file_list_spec=$lt_file_list_spec |
31367 | 35329 | ||
31368 | @@ -13546,210 +14231,169 @@ ltmain="$ac_aux_dir/ltmain.sh" | 35330 | @@ -13531,210 +14231,169 @@ ltmain="$ac_aux_dir/ltmain.sh" |
31369 | # if finds mixed CR/LF and LF-only lines. Since sed operates in | 35331 | # if finds mixed CR/LF and LF-only lines. Since sed operates in |
31370 | # text mode, it properly converts lines to CR/LF. This bash problem | 35332 | # text mode, it properly converts lines to CR/LF. This bash problem |
31371 | # is reportedly fixed, but why not run on old versions too? | 35333 | # 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 2c4ffec4e6..ce795b7522 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 @@ | |||
1 | From 98410efc334e31ccfbdc0080fb293b0e06885454 Mon Sep 17 00:00:00 2001 | 1 | From d6f4f62fda4fde10b805b06d5e61792ee821449c Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Mon, 2 Mar 2015 01:42:38 +0000 | 3 | Date: Mon, 2 Mar 2015 01:42:38 +0000 |
4 | Subject: [PATCH] Fix rpath in libtool when sysroot is enabled | 4 | Subject: [PATCH] Fix rpath in libtool when sysroot is enabled |
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 199aafcaee..910bd38694 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 @@ | |||
1 | From 84fc4ceafcbfad4c6ddc9d65f6a425bd62dd062e Mon Sep 17 00:00:00 2001 | 1 | From 654b4ea9e28aad037e788672ca0d9ba450b3285e Mon Sep 17 00:00:00 2001 |
2 | From: Ross Burton <ross.burton@intel.com> | 2 | From: Ross Burton <ross.burton@intel.com> |
3 | Date: Mon, 6 Mar 2017 23:33:27 -0800 | 3 | Date: Mon, 6 Mar 2017 23:33:27 -0800 |
4 | Subject: [PATCH] sync with OE libtool changes | 4 | Subject: [PATCH] sync with OE libtool changes |
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 f75ec2ee9d..a825f9c842 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 @@ | |||
1 | From 628c10087e6e11a7bc748437c5b695835b704aaf Mon Sep 17 00:00:00 2001 | 1 | From 9d35ab04de550f1db5d2e74d37fdeab4ca436148 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Wed, 15 Apr 2020 14:17:20 -0700 | 3 | Date: Wed, 15 Apr 2020 14:17:20 -0700 |
4 | Subject: [PATCH] Check for clang before checking gcc version | 4 | Subject: [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 | ||
20 | diff --git a/configure b/configure | 20 | diff --git a/configure b/configure |
21 | index be433ef6d5d..7494fbd2f06 100755 | 21 | index 417fc5a970c..bdc3583215f 100755 |
22 | --- a/configure | 22 | --- a/configure |
23 | +++ b/configure | 23 | +++ b/configure |
24 | @@ -5294,7 +5294,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu | 24 | @@ -5460,7 +5460,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 be433ef6d5d..7494fbd2f06 100755 | |||
31 | #endif | 31 | #endif |
32 | int main() {} | 32 | int main() {} |
33 | diff --git a/configure.ac b/configure.ac | 33 | diff --git a/configure.ac b/configure.ac |
34 | index 1651cbf3b02..2e2ecc47542 100644 | 34 | index 3a1eb0357e5..1c00b9aec42 100644 |
35 | --- a/configure.ac | 35 | --- a/configure.ac |
36 | +++ b/configure.ac | 36 | +++ b/configure.ac |
37 | @@ -1323,7 +1323,7 @@ if test "$GCC" = yes; then | 37 | @@ -1444,7 +1444,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 c4b4198910..1871fbc799 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 @@ | |||
1 | From 63157cb403b6aa13147840c036a8555c4ea9c166 Mon Sep 17 00:00:00 2001 | 1 | From 9a296e537708296d32c07c1dc681f59de3d1acf9 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Thu, 10 Mar 2022 21:21:33 -0800 | 3 | Date: Thu, 10 Mar 2022 21:21:33 -0800 |
4 | Subject: [PATCH] Only generate an RPATH entry if LD_RUN_PATH is not empty | 4 | Subject: [PATCH] Only generate an RPATH entry if LD_RUN_PATH is not empty |
@@ -14,7 +14,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
14 | 1 file changed, 5 insertions(+) | 14 | 1 file changed, 5 insertions(+) |
15 | 15 | ||
16 | diff --git a/ld/ldelf.c b/ld/ldelf.c | 16 | diff --git a/ld/ldelf.c b/ld/ldelf.c |
17 | index 0d61a3209ec..cd0da2013e2 100644 | 17 | index 95787012b89..bc29909386f 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 | @@ -1127,6 +1127,9 @@ ldelf_handle_dt_needed (struct elf_link_hash_table *htab, |
diff --git a/meta/recipes-devtools/binutils/binutils/0013-CVE-2022-38533.patch b/meta/recipes-devtools/binutils/binutils/0013-CVE-2022-38533.patch deleted file mode 100644 index 5d9ac2cb1f..0000000000 --- a/meta/recipes-devtools/binutils/binutils/0013-CVE-2022-38533.patch +++ /dev/null | |||
@@ -1,36 +0,0 @@ | |||
1 | From ef186fe54aa6d281a3ff8a9528417e5cc614c797 Mon Sep 17 00:00:00 2001 | ||
2 | From: Alan Modra <amodra@gmail.com> | ||
3 | Date: Sat, 13 Aug 2022 15:32:47 +0930 | ||
4 | Subject: [PATCH] PR29482 - strip: heap-buffer-overflow | ||
5 | |||
6 | PR 29482 | ||
7 | * coffcode.h (coff_set_section_contents): Sanity check _LIB. | ||
8 | |||
9 | Upstream-Status: Backport [https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=ef186fe54aa6d281a3ff8a9528417e5cc614c797] | ||
10 | |||
11 | Signed-off-by: Pgowda <pgowda.cve@gmail.com> | ||
12 | |||
13 | --- | ||
14 | bfd/coffcode.h | 7 +++++-- | ||
15 | 1 file changed, 5 insertions(+), 2 deletions(-) | ||
16 | |||
17 | diff --git a/bfd/coffcode.h b/bfd/coffcode.h | ||
18 | index 67aaf158ca1..52027981c3f 100644 | ||
19 | --- a/bfd/coffcode.h | ||
20 | +++ b/bfd/coffcode.h | ||
21 | @@ -4302,10 +4302,13 @@ coff_set_section_contents (bfd * abfd, | ||
22 | |||
23 | rec = (bfd_byte *) location; | ||
24 | recend = rec + count; | ||
25 | - while (rec < recend) | ||
26 | + while (recend - rec >= 4) | ||
27 | { | ||
28 | + size_t len = bfd_get_32 (abfd, rec); | ||
29 | + if (len == 0 || len > (size_t) (recend - rec) / 4) | ||
30 | + break; | ||
31 | + rec += len * 4; | ||
32 | ++section->lma; | ||
33 | - rec += bfd_get_32 (abfd, rec) * 4; | ||
34 | } | ||
35 | |||
36 | BFD_ASSERT (rec == recend); | ||
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 new file mode 100644 index 0000000000..91ac606f78 --- /dev/null +++ b/meta/recipes-devtools/binutils/binutils/0013-Define-alignof-using-_Alignof-when-using-C11-or-newe.patch | |||
@@ -0,0 +1,48 @@ | |||
1 | From 5fb47367d885a4a32625f09138b306d36ec3769f Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Sun, 15 Jan 2023 00:16:25 -0800 | ||
4 | Subject: [PATCH] Define alignof using _Alignof when using C11 or newer | ||
5 | |||
6 | WG14 N2350 made very clear that it is an UB having type definitions | ||
7 | within "offsetof" [1]. This patch enhances the implementation of macro | ||
8 | alignof to use builtin "_Alignof" to avoid undefined behavior on | ||
9 | when using std=c11 or newer | ||
10 | |||
11 | clang 16+ has started to flag this [2] | ||
12 | |||
13 | Fixes build when using -std >= gnu11 and using clang16+ | ||
14 | |||
15 | Older compilers gcc < 4.9 or clang < 8 has buggy _Alignof even though it | ||
16 | may support C11, exclude those compilers too | ||
17 | |||
18 | [1] https://www.open-std.org/jtc1/sc22/wg14/www/docs/n2350.htm | ||
19 | [2] https://reviews.llvm.org/D133574 | ||
20 | |||
21 | Upstream-Status: Pending | ||
22 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
23 | --- | ||
24 | libiberty/sha1.c | 10 ++++++++++ | ||
25 | 1 file changed, 10 insertions(+) | ||
26 | |||
27 | diff --git a/libiberty/sha1.c b/libiberty/sha1.c | ||
28 | index 6c71e3ebb41..a2caf947d31 100644 | ||
29 | --- a/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) | ||
32 | if (len >= 64) | ||
33 | { | ||
34 | #if !_STRING_ARCH_unaligned | ||
35 | +/* GCC releases before GCC 4.9 had a bug in _Alignof. See GCC bug 52023 | ||
36 | + <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=52023>. | ||
37 | + clang versions < 8.0.0 have the same bug. */ | ||
38 | +#if (!defined __STDC_VERSION__ || __STDC_VERSION__ < 201112 \ | ||
39 | + || (defined __GNUC__ && __GNUC__ < 4 + (__GNUC_MINOR__ < 9) \ | ||
40 | + && !defined __clang__) \ | ||
41 | + || (defined __clang__ && __clang_major__ < 8)) | ||
42 | # define alignof(type) offsetof (struct { char c; type x; }, x) | ||
43 | +#else | ||
44 | +# define alignof(type) _Alignof(type) | ||
45 | +#endif | ||
46 | # define UNALIGNED_P(p) (((size_t) p) % alignof (sha1_uint32) != 0) | ||
47 | if (UNALIGNED_P (buffer)) | ||
48 | while (len > 64) | ||
diff --git a/meta/recipes-devtools/binutils/binutils/0014-CVE-2022-38128-1.patch b/meta/recipes-devtools/binutils/binutils/0014-CVE-2022-38128-1.patch deleted file mode 100644 index 0a490d86b3..0000000000 --- a/meta/recipes-devtools/binutils/binutils/0014-CVE-2022-38128-1.patch +++ /dev/null | |||
@@ -1,350 +0,0 @@ | |||
1 | From f07c08e115e27cddf5a0030dc6332bbee1bd9c6a Mon Sep 17 00:00:00 2001 | ||
2 | From: Alan Modra <amodra@gmail.com> | ||
3 | Date: Thu, 21 Jul 2022 08:38:14 +0930 | ||
4 | Subject: [PATCH] binutils/dwarf.c: abbrev caching | ||
5 | |||
6 | I'm inclined to think that abbrev caching is counter-productive. The | ||
7 | time taken to search the list of abbrevs converted to internal form is | ||
8 | non-zero, and it's easy to decode the raw abbrevs. It's especially | ||
9 | silly to cache empty lists of decoded abbrevs (happens with zero | ||
10 | padding in .debug_abbrev), or abbrevs as they are displayed when there | ||
11 | is no further use of those abbrevs. This patch stops caching in those | ||
12 | cases. | ||
13 | |||
14 | * dwarf.c (record_abbrev_list_for_cu): Add free_list param. | ||
15 | Put abbrevs on abbrev_lists here. | ||
16 | (new_abbrev_list): Delete function. | ||
17 | (process_abbrev_set): Return newly allocated list. Move | ||
18 | abbrev base, offset and size checking to.. | ||
19 | (find_and_process_abbrev_set): ..here, new function. Handle | ||
20 | lookup of cached abbrevs here, and calculate start and end | ||
21 | for process_abbrev_set. Return free_list if newly alloc'd. | ||
22 | (process_debug_info): Consolidate cached list lookup, new list | ||
23 | alloc and processing into find_and_process_abbrev_set call. | ||
24 | Free list when not cached. | ||
25 | (display_debug_abbrev): Similarly. | ||
26 | |||
27 | Upstream-Status: Backport [https://sourceware.org/git/?p=binutils-gdb.git;a=commitdiff;h=f07c08e115e27cddf5a0030dc6332bbee1bd9c6a] | ||
28 | |||
29 | Signed-off-by: Pgowda <pgowda.cve@gmail.com> | ||
30 | --- | ||
31 | binutils/dwarf.c | 208 +++++++++++++++++++++++++---------------------- | ||
32 | 1 file changed, 110 insertions(+), 98 deletions(-) | ||
33 | |||
34 | diff --git a/binutils/dwarf.c b/binutils/dwarf.c | ||
35 | index 267ed3bb382..2fc352f74c5 100644 | ||
36 | --- a/binutils/dwarf.c | ||
37 | +++ b/binutils/dwarf.c | ||
38 | @@ -882,8 +882,15 @@ static unsigned long next_free_abbrev_m | ||
39 | #define ABBREV_MAP_ENTRIES_INCREMENT 8 | ||
40 | |||
41 | static void | ||
42 | -record_abbrev_list_for_cu (dwarf_vma start, dwarf_vma end, abbrev_list * list) | ||
43 | +record_abbrev_list_for_cu (dwarf_vma start, dwarf_vma end, | ||
44 | + abbrev_list *list, abbrev_list *free_list) | ||
45 | { | ||
46 | + if (free_list != NULL) | ||
47 | + { | ||
48 | + list->next = abbrev_lists; | ||
49 | + abbrev_lists = list; | ||
50 | + } | ||
51 | + | ||
52 | if (cu_abbrev_map == NULL) | ||
53 | { | ||
54 | num_abbrev_map_entries = INITIAL_NUM_ABBREV_MAP_ENTRIES; | ||
55 | @@ -936,20 +943,6 @@ free_all_abbrevs (void) | ||
56 | } | ||
57 | |||
58 | static abbrev_list * | ||
59 | -new_abbrev_list (dwarf_vma abbrev_base, dwarf_vma abbrev_offset) | ||
60 | -{ | ||
61 | - abbrev_list * list = (abbrev_list *) xcalloc (sizeof * list, 1); | ||
62 | - | ||
63 | - list->abbrev_base = abbrev_base; | ||
64 | - list->abbrev_offset = abbrev_offset; | ||
65 | - | ||
66 | - list->next = abbrev_lists; | ||
67 | - abbrev_lists = list; | ||
68 | - | ||
69 | - return list; | ||
70 | -} | ||
71 | - | ||
72 | -static abbrev_list * | ||
73 | find_abbrev_list_by_abbrev_offset (dwarf_vma abbrev_base, | ||
74 | dwarf_vma abbrev_offset) | ||
75 | { | ||
76 | @@ -966,7 +959,7 @@ find_abbrev_list_by_abbrev_offset (dwarf | ||
77 | /* Find the abbreviation map for the CU that includes OFFSET. | ||
78 | OFFSET is an absolute offset from the start of the .debug_info section. */ | ||
79 | /* FIXME: This function is going to slow down readelf & objdump. | ||
80 | - Consider using a better algorithm to mitigate this effect. */ | ||
81 | + Not caching abbrevs is likely the answer. */ | ||
82 | |||
83 | static abbrev_map * | ||
84 | find_abbrev_map_by_offset (dwarf_vma offset) | ||
85 | @@ -1033,40 +1026,18 @@ add_abbrev_attr (unsigned long attrib | ||
86 | list->last_abbrev->last_attr = attr; | ||
87 | } | ||
88 | |||
89 | -/* Processes the (partial) contents of a .debug_abbrev section. | ||
90 | - Returns NULL if the end of the section was encountered. | ||
91 | - Returns the address after the last byte read if the end of | ||
92 | - an abbreviation set was found. */ | ||
93 | +/* Return processed (partial) contents of a .debug_abbrev section. | ||
94 | + Returns NULL on errors. */ | ||
95 | |||
96 | -static unsigned char * | ||
97 | +static abbrev_list * | ||
98 | process_abbrev_set (struct dwarf_section *section, | ||
99 | - dwarf_vma abbrev_base, | ||
100 | - dwarf_vma abbrev_size, | ||
101 | - dwarf_vma abbrev_offset, | ||
102 | - abbrev_list *list) | ||
103 | + unsigned char *start, | ||
104 | + unsigned char *end) | ||
105 | { | ||
106 | - if (abbrev_base >= section->size | ||
107 | - || abbrev_size > section->size - abbrev_base) | ||
108 | - { | ||
109 | - /* PR 17531: file:4bcd9ce9. */ | ||
110 | - warn (_("Debug info is corrupted, abbrev size (%lx) is larger than " | ||
111 | - "abbrev section size (%lx)\n"), | ||
112 | - (unsigned long) (abbrev_base + abbrev_size), | ||
113 | - (unsigned long) section->size); | ||
114 | - return NULL; | ||
115 | - } | ||
116 | - if (abbrev_offset >= abbrev_size) | ||
117 | - { | ||
118 | - warn (_("Debug info is corrupted, abbrev offset (%lx) is larger than " | ||
119 | - "abbrev section size (%lx)\n"), | ||
120 | - (unsigned long) abbrev_offset, | ||
121 | - (unsigned long) abbrev_size); | ||
122 | - return NULL; | ||
123 | - } | ||
124 | + abbrev_list *list = xmalloc (sizeof (*list)); | ||
125 | + list->first_abbrev = NULL; | ||
126 | + list->last_abbrev = NULL; | ||
127 | |||
128 | - unsigned char *start = section->start + abbrev_base; | ||
129 | - unsigned char *end = start + abbrev_size; | ||
130 | - start += abbrev_offset; | ||
131 | while (start < end) | ||
132 | { | ||
133 | unsigned long entry; | ||
134 | @@ -1079,14 +1050,18 @@ process_abbrev_set (struct dwarf_section | ||
135 | /* A single zero is supposed to end the set according | ||
136 | to the standard. If there's more, then signal that to | ||
137 | the caller. */ | ||
138 | - if (start == end) | ||
139 | - return NULL; | ||
140 | - if (entry == 0) | ||
141 | - return start; | ||
142 | + if (start == end || entry == 0) | ||
143 | + { | ||
144 | + list->start_of_next_abbrevs = start != end ? start : NULL; | ||
145 | + return list; | ||
146 | + } | ||
147 | |||
148 | READ_ULEB (tag, start, end); | ||
149 | if (start == end) | ||
150 | - return NULL; | ||
151 | + { | ||
152 | + free (list); | ||
153 | + return NULL; | ||
154 | + } | ||
155 | |||
156 | children = *start++; | ||
157 | |||
158 | @@ -1121,9 +1096,67 @@ process_abbrev_set (struct dwarf_section | ||
159 | /* Report the missing single zero which ends the section. */ | ||
160 | error (_(".debug_abbrev section not zero terminated\n")); | ||
161 | |||
162 | + free (list); | ||
163 | return NULL; | ||
164 | } | ||
165 | |||
166 | +/* Return a sequence of abbrevs in SECTION starting at ABBREV_BASE | ||
167 | + plus ABBREV_OFFSET and finishing at ABBREV_BASE + ABBREV_SIZE. | ||
168 | + If FREE_LIST is non-NULL search the already decoded abbrevs on | ||
169 | + abbrev_lists first and if found set *FREE_LIST to NULL. If | ||
170 | + searching doesn't find a matching abbrev, set *FREE_LIST to the | ||
171 | + newly allocated list. If FREE_LIST is NULL, no search is done and | ||
172 | + the returned abbrev_list is always newly allocated. */ | ||
173 | + | ||
174 | +static abbrev_list * | ||
175 | +find_and_process_abbrev_set (struct dwarf_section *section, | ||
176 | + dwarf_vma abbrev_base, | ||
177 | + dwarf_vma abbrev_size, | ||
178 | + dwarf_vma abbrev_offset, | ||
179 | + abbrev_list **free_list) | ||
180 | +{ | ||
181 | + if (free_list) | ||
182 | + *free_list = NULL; | ||
183 | + | ||
184 | + if (abbrev_base >= section->size | ||
185 | + || abbrev_size > section->size - abbrev_base) | ||
186 | + { | ||
187 | + /* PR 17531: file:4bcd9ce9. */ | ||
188 | + warn (_("Debug info is corrupted, abbrev size (%lx) is larger than " | ||
189 | + "abbrev section size (%lx)\n"), | ||
190 | + (unsigned long) (abbrev_base + abbrev_size), | ||
191 | + (unsigned long) section->size); | ||
192 | + return NULL; | ||
193 | + } | ||
194 | + if (abbrev_offset >= abbrev_size) | ||
195 | + { | ||
196 | + warn (_("Debug info is corrupted, abbrev offset (%lx) is larger than " | ||
197 | + "abbrev section size (%lx)\n"), | ||
198 | + (unsigned long) abbrev_offset, | ||
199 | + (unsigned long) abbrev_size); | ||
200 | + return NULL; | ||
201 | + } | ||
202 | + | ||
203 | + unsigned char *start = section->start + abbrev_base + abbrev_offset; | ||
204 | + unsigned char *end = section->start + abbrev_base + abbrev_size; | ||
205 | + abbrev_list *list = NULL; | ||
206 | + if (free_list) | ||
207 | + list = find_abbrev_list_by_abbrev_offset (abbrev_base, abbrev_offset); | ||
208 | + if (list == NULL) | ||
209 | + { | ||
210 | + list = process_abbrev_set (section, start, end); | ||
211 | + if (list) | ||
212 | + { | ||
213 | + list->abbrev_base = abbrev_base; | ||
214 | + list->abbrev_offset = abbrev_offset; | ||
215 | + list->next = NULL; | ||
216 | + } | ||
217 | + if (free_list) | ||
218 | + *free_list = list; | ||
219 | + } | ||
220 | + return list; | ||
221 | +} | ||
222 | + | ||
223 | static const char * | ||
224 | get_TAG_name (unsigned long tag) | ||
225 | { | ||
226 | @@ -3670,7 +3703,6 @@ process_debug_info (struct dwarf_section | ||
227 | dwarf_vma cu_offset; | ||
228 | unsigned int offset_size; | ||
229 | struct cu_tu_set * this_set; | ||
230 | - abbrev_list * list; | ||
231 | unsigned char *end_cu; | ||
232 | |||
233 | hdrptr = start; | ||
234 | @@ -3726,22 +3758,18 @@ process_debug_info (struct dwarf_section | ||
235 | abbrev_size = this_set->section_sizes [DW_SECT_ABBREV]; | ||
236 | } | ||
237 | |||
238 | - list = find_abbrev_list_by_abbrev_offset (abbrev_base, | ||
239 | - compunit.cu_abbrev_offset); | ||
240 | - if (list == NULL) | ||
241 | - { | ||
242 | - unsigned char * next; | ||
243 | - | ||
244 | - list = new_abbrev_list (abbrev_base, | ||
245 | - compunit.cu_abbrev_offset); | ||
246 | - next = process_abbrev_set (&debug_displays[abbrev_sec].section, | ||
247 | - abbrev_base, abbrev_size, | ||
248 | - compunit.cu_abbrev_offset, list); | ||
249 | - list->start_of_next_abbrevs = next; | ||
250 | - } | ||
251 | - | ||
252 | + abbrev_list *list; | ||
253 | + abbrev_list *free_list; | ||
254 | + list = find_and_process_abbrev_set (&debug_displays[abbrev_sec].section, | ||
255 | + abbrev_base, abbrev_size, | ||
256 | + compunit.cu_abbrev_offset, | ||
257 | + &free_list); | ||
258 | start = end_cu; | ||
259 | - record_abbrev_list_for_cu (cu_offset, start - section_begin, list); | ||
260 | + if (list != NULL && list->first_abbrev != NULL) | ||
261 | + record_abbrev_list_for_cu (cu_offset, start - section_begin, | ||
262 | + list, free_list); | ||
263 | + else if (free_list != NULL) | ||
264 | + free_abbrev_list (free_list); | ||
265 | } | ||
266 | |||
267 | for (start = section_begin, unit = 0; start < end; unit++) | ||
268 | @@ -3757,7 +3785,6 @@ process_debug_info (struct dwarf_section | ||
269 | struct cu_tu_set *this_set; | ||
270 | dwarf_vma abbrev_base; | ||
271 | size_t abbrev_size; | ||
272 | - abbrev_list * list = NULL; | ||
273 | unsigned char *end_cu; | ||
274 | |||
275 | hdrptr = start; | ||
276 | @@ -3936,20 +3963,10 @@ process_debug_info (struct dwarf_section | ||
277 | } | ||
278 | |||
279 | /* Process the abbrevs used by this compilation unit. */ | ||
280 | - list = find_abbrev_list_by_abbrev_offset (abbrev_base, | ||
281 | - compunit.cu_abbrev_offset); | ||
282 | - if (list == NULL) | ||
283 | - { | ||
284 | - unsigned char *next; | ||
285 | - | ||
286 | - list = new_abbrev_list (abbrev_base, | ||
287 | - compunit.cu_abbrev_offset); | ||
288 | - next = process_abbrev_set (&debug_displays[abbrev_sec].section, | ||
289 | - abbrev_base, abbrev_size, | ||
290 | - compunit.cu_abbrev_offset, list); | ||
291 | - list->start_of_next_abbrevs = next; | ||
292 | - } | ||
293 | - | ||
294 | + abbrev_list *list; | ||
295 | + list = find_and_process_abbrev_set (&debug_displays[abbrev_sec].section, | ||
296 | + abbrev_base, abbrev_size, | ||
297 | + compunit.cu_abbrev_offset, NULL); | ||
298 | level = 0; | ||
299 | last_level = level; | ||
300 | saved_level = -1; | ||
301 | @@ -4128,6 +4145,8 @@ process_debug_info (struct dwarf_section | ||
302 | if (entry->children) | ||
303 | ++level; | ||
304 | } | ||
305 | + if (list != NULL) | ||
306 | + free_abbrev_list (list); | ||
307 | } | ||
308 | |||
309 | /* Set num_debug_info_entries here so that it can be used to check if | ||
310 | @@ -6353,24 +6372,15 @@ display_debug_abbrev (struct dwarf_secti | ||
311 | |||
312 | do | ||
313 | { | ||
314 | - abbrev_list * list; | ||
315 | - dwarf_vma offset; | ||
316 | - | ||
317 | - offset = start - section->start; | ||
318 | - list = find_abbrev_list_by_abbrev_offset (0, offset); | ||
319 | + dwarf_vma offset = start - section->start; | ||
320 | + abbrev_list *list = find_and_process_abbrev_set (section, 0, | ||
321 | + section->size, offset, | ||
322 | + NULL); | ||
323 | if (list == NULL) | ||
324 | - { | ||
325 | - list = new_abbrev_list (0, offset); | ||
326 | - start = process_abbrev_set (section, 0, section->size, offset, list); | ||
327 | - list->start_of_next_abbrevs = start; | ||
328 | - } | ||
329 | - else | ||
330 | - start = list->start_of_next_abbrevs; | ||
331 | - | ||
332 | - if (list->first_abbrev == NULL) | ||
333 | - continue; | ||
334 | + break; | ||
335 | |||
336 | - printf (_(" Number TAG (0x%lx)\n"), (long) offset); | ||
337 | + if (list->first_abbrev) | ||
338 | + printf (_(" Number TAG (0x%lx)\n"), (long) offset); | ||
339 | |||
340 | for (entry = list->first_abbrev; entry; entry = entry->next) | ||
341 | { | ||
342 | @@ -6391,6 +6401,8 @@ display_debug_abbrev (struct dwarf_secti | ||
343 | putchar ('\n'); | ||
344 | } | ||
345 | } | ||
346 | + start = list->start_of_next_abbrevs; | ||
347 | + free_abbrev_list (list); | ||
348 | } | ||
349 | while (start); | ||
350 | |||
diff --git a/meta/recipes-devtools/binutils/binutils/0014-CVE-2022-38128-2.patch b/meta/recipes-devtools/binutils/binutils/0014-CVE-2022-38128-2.patch deleted file mode 100644 index e30b4d86e1..0000000000 --- a/meta/recipes-devtools/binutils/binutils/0014-CVE-2022-38128-2.patch +++ /dev/null | |||
@@ -1,536 +0,0 @@ | |||
1 | From 175b91507b83ad42607d2f6dadaf55b7b511bdbe Mon Sep 17 00:00:00 2001 | ||
2 | From: Alan Modra <amodra@gmail.com> | ||
3 | Date: Wed, 20 Jul 2022 18:28:50 +0930 | ||
4 | Subject: [PATCH] miscellaneous dwarf.c tidies | ||
5 | |||
6 | * dwarf.c: Leading and trailing whitespace fixes. | ||
7 | (free_abbrev_list): New function. | ||
8 | (free_all_abbrevs): Use the above. Free cu_abbrev_map here too. | ||
9 | (process_abbrev_set): Print actual section name on error. | ||
10 | (get_type_abbrev_from_form): Add overflow check. | ||
11 | (free_debug_memory): Don't free cu_abbrev_map here.. | ||
12 | (process_debug_info): ..or here. Warn on another case of not | ||
13 | finding a neeeded abbrev. | ||
14 | |||
15 | Upstream-Status: Backport [https://sourceware.org/git/?p=binutils-gdb.git;a=commitdiff;h=175b91507b83ad42607d2f6dadaf55b7b511bdbe] | ||
16 | |||
17 | Signed-off-by: Pgowda <pgowda.cve@gmail.com> | ||
18 | --- | ||
19 | binutils/dwarf.c | 216 +++++++++++++++++++++++------------------------ | ||
20 | 1 file changed, 106 insertions(+), 110 deletions(-) | ||
21 | |||
22 | diff --git a/binutils/dwarf.c b/binutils/dwarf.c | ||
23 | index 2b1eec49422..267ed3bb382 100644 | ||
24 | --- a/binutils/dwarf.c | ||
25 | +++ b/binutils/dwarf.c | ||
26 | @@ -806,7 +806,7 @@ fetch_indexed_value (dwarf_vma idx, | ||
27 | pointer_size = 4; | ||
28 | bias = 12; | ||
29 | } | ||
30 | - | ||
31 | + | ||
32 | dwarf_vma offset = idx * pointer_size; | ||
33 | |||
34 | /* Offsets are biased by the size of the section header | ||
35 | @@ -908,38 +908,41 @@ record_abbrev_list_for_cu (dwarf_vma sta | ||
36 | next_free_abbrev_map_entry ++; | ||
37 | } | ||
38 | |||
39 | -static void | ||
40 | -free_all_abbrevs (void) | ||
41 | +static abbrev_list * | ||
42 | +free_abbrev_list (abbrev_list *list) | ||
43 | { | ||
44 | - abbrev_list * list; | ||
45 | + abbrev_entry *abbrv = list->first_abbrev; | ||
46 | |||
47 | - for (list = abbrev_lists; list != NULL;) | ||
48 | + while (abbrv) | ||
49 | { | ||
50 | - abbrev_list * next = list->next; | ||
51 | - abbrev_entry * abbrv; | ||
52 | + abbrev_attr *attr = abbrv->first_attr; | ||
53 | |||
54 | - for (abbrv = list->first_abbrev; abbrv != NULL;) | ||
55 | + while (attr) | ||
56 | { | ||
57 | - abbrev_entry * next_abbrev = abbrv->next; | ||
58 | - abbrev_attr * attr; | ||
59 | - | ||
60 | - for (attr = abbrv->first_attr; attr;) | ||
61 | - { | ||
62 | - abbrev_attr *next_attr = attr->next; | ||
63 | - | ||
64 | - free (attr); | ||
65 | - attr = next_attr; | ||
66 | - } | ||
67 | - | ||
68 | - free (abbrv); | ||
69 | - abbrv = next_abbrev; | ||
70 | + abbrev_attr *next_attr = attr->next; | ||
71 | + free (attr); | ||
72 | + attr = next_attr; | ||
73 | } | ||
74 | |||
75 | - free (list); | ||
76 | - list = next; | ||
77 | + abbrev_entry *next_abbrev = abbrv->next; | ||
78 | + free (abbrv); | ||
79 | + abbrv = next_abbrev; | ||
80 | } | ||
81 | |||
82 | - abbrev_lists = NULL; | ||
83 | + abbrev_list *next = list->next; | ||
84 | + free (list); | ||
85 | + return next; | ||
86 | +} | ||
87 | + | ||
88 | +static void | ||
89 | +free_all_abbrevs (void) | ||
90 | +{ | ||
91 | + while (abbrev_lists) | ||
92 | + abbrev_lists = free_abbrev_list (abbrev_lists); | ||
93 | + | ||
94 | + free (cu_abbrev_map); | ||
95 | + cu_abbrev_map = NULL; | ||
96 | + next_free_abbrev_map_entry = 0; | ||
97 | } | ||
98 | |||
99 | static abbrev_list * | ||
100 | @@ -971,7 +974,7 @@ find_abbrev_map_by_offset (dwarf_vma off | ||
101 | && cu_abbrev_map[i].end > offset) | ||
102 | return cu_abbrev_map + i; | ||
103 | |||
104 | - return NULL; | ||
105 | + return NULL; | ||
106 | } | ||
107 | |||
108 | static void | ||
109 | @@ -1094,7 +1097,7 @@ process_abbrev_set (struct dwarf_section | ||
110 | } | ||
111 | |||
112 | /* Report the missing single zero which ends the section. */ | ||
113 | - error (_(".debug_abbrev section not zero terminated\n")); | ||
114 | + error (_("%s section not zero terminated\n"), section->name); | ||
115 | |||
116 | free (list); | ||
117 | return NULL; | ||
118 | @@ -1875,7 +1878,7 @@ fetch_alt_indirect_string (dwarf_vma off | ||
119 | dwarf_vmatoa ("x", offset)); | ||
120 | return _("<offset is too big>"); | ||
121 | } | ||
122 | - | ||
123 | + | ||
124 | static const char * | ||
125 | get_AT_name (unsigned long attribute) | ||
126 | { | ||
127 | @@ -2157,7 +2160,8 @@ get_type_abbrev_from_form (unsigned long | ||
128 | case DW_FORM_ref4: | ||
129 | case DW_FORM_ref8: | ||
130 | case DW_FORM_ref_udata: | ||
131 | - if (uvalue + cu_offset > (size_t) (cu_end - section->start)) | ||
132 | + if (uvalue + cu_offset < uvalue | ||
133 | + || uvalue + cu_offset > (size_t) (cu_end - section->start)) | ||
134 | { | ||
135 | warn (_("Unable to resolve ref form: uvalue %lx + cu_offset %lx > CU size %lx\n"), | ||
136 | uvalue, (long) cu_offset, (long) (cu_end - section->start)); | ||
137 | @@ -2194,7 +2198,7 @@ get_type_abbrev_from_form (unsigned long | ||
138 | else | ||
139 | *map_return = NULL; | ||
140 | } | ||
141 | - | ||
142 | + | ||
143 | READ_ULEB (abbrev_number, data, section->start + section->size); | ||
144 | |||
145 | for (entry = map->list->first_abbrev; entry != NULL; entry = entry->next) | ||
146 | @@ -2783,10 +2787,10 @@ read_and_display_attr_value (unsigned lo | ||
147 | if (form == DW_FORM_loclistx) | ||
148 | { | ||
149 | if (dwo) | ||
150 | - { | ||
151 | - index = fetch_indexed_value (uvalue, loclists_dwo, 0); | ||
152 | - index += (offset_size == 8) ? 20 : 12; | ||
153 | - } | ||
154 | + { | ||
155 | + index = fetch_indexed_value (uvalue, loclists_dwo, 0); | ||
156 | + index += (offset_size == 8) ? 20 : 12; | ||
157 | + } | ||
158 | else if (debug_info_p == NULL) | ||
159 | { | ||
160 | index = fetch_indexed_value (uvalue, loclists, 0); | ||
161 | @@ -2804,21 +2808,21 @@ read_and_display_attr_value (unsigned lo | ||
162 | else if (form == DW_FORM_rnglistx) | ||
163 | { | ||
164 | if (dwo) | ||
165 | - { | ||
166 | - index = fetch_indexed_value (uvalue, rnglists_dwo, 0); | ||
167 | - index += (offset_size == 8) ? 20 : 12; | ||
168 | - } | ||
169 | + { | ||
170 | + index = fetch_indexed_value (uvalue, rnglists_dwo, 0); | ||
171 | + index += (offset_size == 8) ? 20 : 12; | ||
172 | + } | ||
173 | else | ||
174 | - { | ||
175 | - if (debug_info_p == NULL) | ||
176 | - base = 0; | ||
177 | - else | ||
178 | - base = debug_info_p->rnglists_base; | ||
179 | - /* We do not have a cached value this time, so we perform the | ||
180 | - computation manually. */ | ||
181 | - index = fetch_indexed_value (uvalue, rnglists, base); | ||
182 | - index += base; | ||
183 | - } | ||
184 | + { | ||
185 | + if (debug_info_p == NULL) | ||
186 | + base = 0; | ||
187 | + else | ||
188 | + base = debug_info_p->rnglists_base; | ||
189 | + /* We do not have a cached value this time, so we perform the | ||
190 | + computation manually. */ | ||
191 | + index = fetch_indexed_value (uvalue, rnglists, base); | ||
192 | + index += base; | ||
193 | + } | ||
194 | } | ||
195 | else | ||
196 | { | ||
197 | @@ -2844,7 +2848,7 @@ read_and_display_attr_value (unsigned lo | ||
198 | if (!do_loc) | ||
199 | printf ("%c<0x%s>", delimiter, dwarf_vmatoa ("x", uvalue + cu_offset)); | ||
200 | break; | ||
201 | - | ||
202 | + | ||
203 | default: | ||
204 | warn (_("Unrecognized form: 0x%lx\n"), form); | ||
205 | /* What to do? Consume a byte maybe? */ | ||
206 | @@ -2869,9 +2873,9 @@ read_and_display_attr_value (unsigned lo | ||
207 | case DW_AT_rnglists_base: | ||
208 | if (debug_info_p->rnglists_base) | ||
209 | warn (_("CU @ 0x%s has multiple rnglists_base values (0x%s and 0x%s)"), | ||
210 | - dwarf_vmatoa ("x", debug_info_p->cu_offset), | ||
211 | - dwarf_vmatoa ("x", debug_info_p->rnglists_base), | ||
212 | - dwarf_vmatoa ("x", uvalue)); | ||
213 | + dwarf_vmatoa ("x", debug_info_p->cu_offset), | ||
214 | + dwarf_vmatoa ("x", debug_info_p->rnglists_base), | ||
215 | + dwarf_vmatoa ("x", uvalue)); | ||
216 | debug_info_p->rnglists_base = uvalue; | ||
217 | break; | ||
218 | case DW_AT_str_offsets_base: | ||
219 | @@ -3021,7 +3025,7 @@ read_and_display_attr_value (unsigned lo | ||
220 | case DW_FORM_strx3: | ||
221 | case DW_FORM_strx4: | ||
222 | add_dwo_name (fetch_indexed_string (uvalue, this_set, offset_size, false, | ||
223 | - debug_info_p->str_offsets_base), | ||
224 | + debug_info_p->str_offsets_base), | ||
225 | cu_offset); | ||
226 | break; | ||
227 | case DW_FORM_string: | ||
228 | @@ -3055,7 +3059,7 @@ read_and_display_attr_value (unsigned lo | ||
229 | case DW_FORM_strx3: | ||
230 | case DW_FORM_strx4: | ||
231 | add_dwo_dir (fetch_indexed_string (uvalue, this_set, offset_size, false, | ||
232 | - debug_info_p->str_offsets_base), | ||
233 | + debug_info_p->str_offsets_base), | ||
234 | cu_offset); | ||
235 | break; | ||
236 | case DW_FORM_string: | ||
237 | @@ -3686,11 +3690,8 @@ process_debug_info (struct dwarf_section | ||
238 | introduce (section, false); | ||
239 | |||
240 | free_all_abbrevs (); | ||
241 | - free (cu_abbrev_map); | ||
242 | - cu_abbrev_map = NULL; | ||
243 | - next_free_abbrev_map_entry = 0; | ||
244 | |||
245 | - /* In order to be able to resolve DW_FORM_ref_attr forms we need | ||
246 | + /* In order to be able to resolve DW_FORM_ref_addr forms we need | ||
247 | to load *all* of the abbrevs for all CUs in this .debug_info | ||
248 | section. This does effectively mean that we (partially) read | ||
249 | every CU header twice. */ | ||
250 | @@ -4045,12 +4046,11 @@ process_debug_info (struct dwarf_section | ||
251 | |||
252 | /* Scan through the abbreviation list until we reach the | ||
253 | correct entry. */ | ||
254 | - if (list == NULL) | ||
255 | - continue; | ||
256 | - | ||
257 | - for (entry = list->first_abbrev; entry != NULL; entry = entry->next) | ||
258 | - if (entry->number == abbrev_number) | ||
259 | - break; | ||
260 | + entry = NULL; | ||
261 | + if (list != NULL) | ||
262 | + for (entry = list->first_abbrev; entry != NULL; entry = entry->next) | ||
263 | + if (entry->number == abbrev_number) | ||
264 | + break; | ||
265 | |||
266 | if (entry == NULL) | ||
267 | { | ||
268 | @@ -4074,7 +4074,7 @@ process_debug_info (struct dwarf_section | ||
269 | break; | ||
270 | case DW_TAG_compile_unit: | ||
271 | case DW_TAG_skeleton_unit: | ||
272 | - need_base_address = 1; | ||
273 | + need_base_address = 1; | ||
274 | need_dwo_info = do_loc; | ||
275 | break; | ||
276 | case DW_TAG_entry_point: | ||
277 | @@ -4459,7 +4459,7 @@ display_debug_sup (struct dwarf_section | ||
278 | |||
279 | SAFE_BYTE_GET_AND_INC (is_supplementary, start, 1, end); | ||
280 | if (is_supplementary != 0 && is_supplementary != 1) | ||
281 | - warn (_("corrupt .debug_sup section: is_supplementary not 0 or 1\n")); | ||
282 | + warn (_("corrupt .debug_sup section: is_supplementary not 0 or 1\n")); | ||
283 | |||
284 | sup_filename = start; | ||
285 | if (is_supplementary && sup_filename[0] != 0) | ||
286 | @@ -5638,7 +5638,7 @@ display_debug_lines_decoded (struct dwar | ||
287 | printf ("%s %11d %#18" DWARF_VMA_FMT "x", | ||
288 | newFileName, state_machine_regs.line, | ||
289 | state_machine_regs.address); | ||
290 | - } | ||
291 | + } | ||
292 | else | ||
293 | { | ||
294 | if (xop == -DW_LNE_end_sequence) | ||
295 | @@ -6092,7 +6092,7 @@ display_debug_macro (struct dwarf_sectio | ||
296 | load_debug_section_with_follow (str, file); | ||
297 | load_debug_section_with_follow (line, file); | ||
298 | load_debug_section_with_follow (str_index, file); | ||
299 | - | ||
300 | + | ||
301 | introduce (section, false); | ||
302 | |||
303 | while (curr < end) | ||
304 | @@ -6537,7 +6537,7 @@ display_loc_list (struct dwarf_section * | ||
305 | |||
306 | /* Check base address specifiers. */ | ||
307 | if (is_max_address (begin, pointer_size) | ||
308 | - && !is_max_address (end, pointer_size)) | ||
309 | + && !is_max_address (end, pointer_size)) | ||
310 | { | ||
311 | base_address = end; | ||
312 | print_dwarf_vma (begin, pointer_size); | ||
313 | @@ -6715,7 +6715,7 @@ display_loclists_list (struct dwarf_sect | ||
314 | case DW_LLE_default_location: | ||
315 | begin = end = 0; | ||
316 | break; | ||
317 | - | ||
318 | + | ||
319 | case DW_LLE_offset_pair: | ||
320 | READ_ULEB (begin, start, section_end); | ||
321 | begin += base_address; | ||
322 | @@ -7011,7 +7011,7 @@ display_offset_entry_loclists (struct dw | ||
323 | unsigned char * start = section->start; | ||
324 | unsigned char * const end = start + section->size; | ||
325 | |||
326 | - introduce (section, false); | ||
327 | + introduce (section, false); | ||
328 | |||
329 | do | ||
330 | { | ||
331 | @@ -7060,14 +7060,14 @@ display_offset_entry_loclists (struct dw | ||
332 | section->name, segment_selector_size); | ||
333 | return 0; | ||
334 | } | ||
335 | - | ||
336 | + | ||
337 | if (offset_entry_count == 0) | ||
338 | { | ||
339 | warn (_("The %s section contains a table without offset\n"), | ||
340 | section->name); | ||
341 | return 0; | ||
342 | } | ||
343 | - | ||
344 | + | ||
345 | printf (_("\n Offset Entries starting at 0x%lx:\n"), | ||
346 | (long)(start - section->start)); | ||
347 | |||
348 | @@ -8229,7 +8229,7 @@ display_debug_rnglists (struct dwarf_sec | ||
349 | start = display_debug_rnglists_list | ||
350 | (start, end, address_size, offset, 0, offset_size); | ||
351 | if (start >= end) | ||
352 | - break; | ||
353 | + break; | ||
354 | } | ||
355 | |||
356 | start = end; | ||
357 | @@ -8347,12 +8347,12 @@ display_debug_ranges (struct dwarf_secti | ||
358 | next = section_begin + offset + debug_info_p->rnglists_base; | ||
359 | |||
360 | /* If multiple DWARF entities reference the same range then we will | ||
361 | - have multiple entries in the `range_entries' list for the same | ||
362 | - offset. Thanks to the sort above these will all be consecutive in | ||
363 | - the `range_entries' list, so we can easily ignore duplicates | ||
364 | - here. */ | ||
365 | + have multiple entries in the `range_entries' list for the same | ||
366 | + offset. Thanks to the sort above these will all be consecutive in | ||
367 | + the `range_entries' list, so we can easily ignore duplicates | ||
368 | + here. */ | ||
369 | if (i > 0 && last_offset == offset) | ||
370 | - continue; | ||
371 | + continue; | ||
372 | last_offset = offset; | ||
373 | |||
374 | if (dwarf_check != 0 && i > 0) | ||
375 | @@ -10286,7 +10286,7 @@ display_debug_names (struct dwarf_sectio | ||
376 | printf (_("Out of %lu items there are %zu bucket clashes" | ||
377 | " (longest of %zu entries).\n"), | ||
378 | (unsigned long) name_count, hash_clash_count, longest_clash); | ||
379 | - | ||
380 | + | ||
381 | if (name_count != buckets_filled + hash_clash_count) | ||
382 | warn (_("The name_count (%lu) is not the same as the used bucket_count (%lu) + the hash clash count (%lu)"), | ||
383 | (unsigned long) name_count, | ||
384 | @@ -10390,7 +10390,7 @@ display_debug_names (struct dwarf_sectio | ||
385 | break; | ||
386 | if (tagno >= 0) | ||
387 | printf ("%s<%lu>", | ||
388 | - (tagno == 0 && second_abbrev_tag == 0 ? " " : "\n\t"), | ||
389 | + (tagno == 0 && second_abbrev_tag == 0 ? " " : "\n\t"), | ||
390 | (unsigned long) abbrev_tag); | ||
391 | |||
392 | for (entry = abbrev_lookup; | ||
393 | @@ -10919,7 +10919,7 @@ process_cu_tu_index (struct dwarf_sectio | ||
394 | Check for integer overflow (can occur when size_t is 32-bit) | ||
395 | with overlarge ncols or nused values. */ | ||
396 | if (nused == -1u | ||
397 | - || _mul_overflow ((size_t) ncols, 4, &temp) | ||
398 | + || _mul_overflow ((size_t) ncols, 4, &temp) | ||
399 | || _mul_overflow ((size_t) nused + 1, temp, &total) | ||
400 | || total > (size_t) (limit - ppool)) | ||
401 | { | ||
402 | @@ -10927,7 +10927,7 @@ process_cu_tu_index (struct dwarf_sectio | ||
403 | section->name); | ||
404 | return 0; | ||
405 | } | ||
406 | - | ||
407 | + | ||
408 | if (do_display) | ||
409 | { | ||
410 | printf (_(" Offset table\n")); | ||
411 | @@ -11431,8 +11431,8 @@ add_separate_debug_file (const char * fi | ||
412 | |||
413 | static bool | ||
414 | debuginfod_fetch_separate_debug_info (struct dwarf_section * section, | ||
415 | - char ** filename, | ||
416 | - void * file) | ||
417 | + char ** filename, | ||
418 | + void * file) | ||
419 | { | ||
420 | size_t build_id_len; | ||
421 | unsigned char * build_id; | ||
422 | @@ -11450,14 +11450,14 @@ debuginfod_fetch_separate_debug_info (st | ||
423 | |||
424 | filelen = strnlen ((const char *)section->start, section->size); | ||
425 | if (filelen == section->size) | ||
426 | - /* Corrupt debugaltlink. */ | ||
427 | - return false; | ||
428 | + /* Corrupt debugaltlink. */ | ||
429 | + return false; | ||
430 | |||
431 | build_id = section->start + filelen + 1; | ||
432 | build_id_len = section->size - (filelen + 1); | ||
433 | |||
434 | if (build_id_len == 0) | ||
435 | - return false; | ||
436 | + return false; | ||
437 | } | ||
438 | else | ||
439 | return false; | ||
440 | @@ -11469,25 +11469,25 @@ debuginfod_fetch_separate_debug_info (st | ||
441 | |||
442 | client = debuginfod_begin (); | ||
443 | if (client == NULL) | ||
444 | - return false; | ||
445 | + return false; | ||
446 | |||
447 | /* Query debuginfod servers for the target file. If found its path | ||
448 | - will be stored in filename. */ | ||
449 | + will be stored in filename. */ | ||
450 | fd = debuginfod_find_debuginfo (client, build_id, build_id_len, filename); | ||
451 | debuginfod_end (client); | ||
452 | |||
453 | /* Only free build_id if we allocated space for a hex string | ||
454 | - in get_build_id (). */ | ||
455 | + in get_build_id (). */ | ||
456 | if (build_id_len == 0) | ||
457 | - free (build_id); | ||
458 | + free (build_id); | ||
459 | |||
460 | if (fd >= 0) | ||
461 | - { | ||
462 | - /* File successfully retrieved. Close fd since we want to | ||
463 | - use open_debug_file () on filename instead. */ | ||
464 | - close (fd); | ||
465 | - return true; | ||
466 | - } | ||
467 | + { | ||
468 | + /* File successfully retrieved. Close fd since we want to | ||
469 | + use open_debug_file () on filename instead. */ | ||
470 | + close (fd); | ||
471 | + return true; | ||
472 | + } | ||
473 | } | ||
474 | |||
475 | return false; | ||
476 | @@ -11500,7 +11500,7 @@ load_separate_debug_info (const char * | ||
477 | parse_func_type parse_func, | ||
478 | check_func_type check_func, | ||
479 | void * func_data, | ||
480 | - void * file ATTRIBUTE_UNUSED) | ||
481 | + void * file ATTRIBUTE_UNUSED) | ||
482 | { | ||
483 | const char * separate_filename; | ||
484 | char * debug_filename; | ||
485 | @@ -11616,11 +11616,11 @@ load_separate_debug_info (const char * | ||
486 | & tmp_filename, | ||
487 | file)) | ||
488 | { | ||
489 | - /* File successfully downloaded from server, replace | ||
490 | - debug_filename with the file's path. */ | ||
491 | - free (debug_filename); | ||
492 | - debug_filename = tmp_filename; | ||
493 | - goto found; | ||
494 | + /* File successfully downloaded from server, replace | ||
495 | + debug_filename with the file's path. */ | ||
496 | + free (debug_filename); | ||
497 | + debug_filename = tmp_filename; | ||
498 | + goto found; | ||
499 | } | ||
500 | } | ||
501 | #endif | ||
502 | @@ -11787,12 +11787,12 @@ load_build_id_debug_file (const char * m | ||
503 | /* In theory we should extract the contents of the section into | ||
504 | a note structure and then check the fields. For now though | ||
505 | just use hard coded offsets instead: | ||
506 | - | ||
507 | + | ||
508 | Field Bytes Contents | ||
509 | NSize 0...3 4 | ||
510 | DSize 4...7 8+ | ||
511 | Type 8..11 3 (NT_GNU_BUILD_ID) | ||
512 | - Name 12.15 GNU\0 | ||
513 | + Name 12.15 GNU\0 | ||
514 | Data 16.... */ | ||
515 | |||
516 | /* FIXME: Check the name size, name and type fields. */ | ||
517 | @@ -11804,7 +11804,7 @@ load_build_id_debug_file (const char * m | ||
518 | warn (_(".note.gnu.build-id data size is too small\n")); | ||
519 | return; | ||
520 | } | ||
521 | - | ||
522 | + | ||
523 | if (build_id_size > (section->size - 16)) | ||
524 | { | ||
525 | warn (_(".note.gnu.build-id data size is too bug\n")); | ||
526 | @@ -12100,10 +12100,6 @@ free_debug_memory (void) | ||
527 | |||
528 | free_all_abbrevs (); | ||
529 | |||
530 | - free (cu_abbrev_map); | ||
531 | - cu_abbrev_map = NULL; | ||
532 | - next_free_abbrev_map_entry = 0; | ||
533 | - | ||
534 | free (shndx_pool); | ||
535 | shndx_pool = NULL; | ||
536 | shndx_pool_size = 0; | ||
diff --git a/meta/recipes-devtools/binutils/binutils/0014-CVE-2022-38128-3.patch b/meta/recipes-devtools/binutils/binutils/0014-CVE-2022-38128-3.patch deleted file mode 100644 index 04d06ed6b6..0000000000 --- a/meta/recipes-devtools/binutils/binutils/0014-CVE-2022-38128-3.patch +++ /dev/null | |||
@@ -1,95 +0,0 @@ | |||
1 | From 695c6dfe7e85006b98c8b746f3fd5f913c94ebff Mon Sep 17 00:00:00 2001 | ||
2 | From: Alan Modra <amodra@gmail.com> | ||
3 | Date: Thu, 21 Jul 2022 09:56:15 +0930 | ||
4 | Subject: [PATCH] PR29370, infinite loop in display_debug_abbrev | ||
5 | |||
6 | The PR29370 testcase is a fuzzed object file with multiple | ||
7 | .trace_abbrev sections. Multiple .trace_abbrev or .debug_abbrev | ||
8 | sections are not a violation of the DWARF standard. The DWARF5 | ||
9 | standard even gives an example of multiple .debug_abbrev sections | ||
10 | contained in groups. Caching and lookup of processed abbrevs thus | ||
11 | needs to be done by section and offset rather than base and offset. | ||
12 | (Why base anyway?) Or, since section contents are kept, by a pointer | ||
13 | into the contents. | ||
14 | |||
15 | PR 29370 | ||
16 | * dwarf.c (struct abbrev_list): Replace abbrev_base and | ||
17 | abbrev_offset with raw field. | ||
18 | (find_abbrev_list_by_abbrev_offset): Delete. | ||
19 | (find_abbrev_list_by_raw_abbrev): New function. | ||
20 | (process_abbrev_set): Set list->raw and list->next. | ||
21 | (find_and_process_abbrev_set): Replace abbrev list lookup with | ||
22 | new function. Don't set list abbrev_base, abbrev_offset or next. | ||
23 | |||
24 | Upstream-Status: Backport [https://sourceware.org/git/?p=binutils-gdb.git;a=patch;h=695c6dfe7e85006b98c8b746f3fd5f913c94ebff] | ||
25 | |||
26 | Signed-off-by: Pgowda <pgowda.cve@gmail.com> | ||
27 | --- | ||
28 | binutils/dwarf.c | 19 ++++++------------- | ||
29 | 1 file changed, 6 insertions(+), 13 deletions(-) | ||
30 | |||
31 | diff --git a/binutils/dwarf.c b/binutils/dwarf.c | ||
32 | index 2fc352f74c5..99fb3566994 100644 | ||
33 | --- a/binutils/dwarf.c | ||
34 | +++ b/binutils/dwarf.c | ||
35 | @@ -856,8 +856,7 @@ typedef struct abbrev_list | ||
36 | { | ||
37 | abbrev_entry * first_abbrev; | ||
38 | abbrev_entry * last_abbrev; | ||
39 | - dwarf_vma abbrev_base; | ||
40 | - dwarf_vma abbrev_offset; | ||
41 | + unsigned char * raw; | ||
42 | struct abbrev_list * next; | ||
43 | unsigned char * start_of_next_abbrevs; | ||
44 | } | ||
45 | @@ -946,14 +945,12 @@ free_all_abbrevs (void) | ||
46 | } | ||
47 | |||
48 | static abbrev_list * | ||
49 | -find_abbrev_list_by_abbrev_offset (dwarf_vma abbrev_base, | ||
50 | - dwarf_vma abbrev_offset) | ||
51 | +find_abbrev_list_by_raw_abbrev (unsigned char *raw) | ||
52 | { | ||
53 | abbrev_list * list; | ||
54 | |||
55 | for (list = abbrev_lists; list != NULL; list = list->next) | ||
56 | - if (list->abbrev_base == abbrev_base | ||
57 | - && list->abbrev_offset == abbrev_offset) | ||
58 | + if (list->raw == raw) | ||
59 | return list; | ||
60 | |||
61 | return NULL; | ||
62 | @@ -1040,6 +1037,7 @@ process_abbrev_set (struct dwarf_section | ||
63 | abbrev_list *list = xmalloc (sizeof (*list)); | ||
64 | list->first_abbrev = NULL; | ||
65 | list->last_abbrev = NULL; | ||
66 | + list->raw = start; | ||
67 | |||
68 | while (start < end) | ||
69 | { | ||
70 | @@ -1055,6 +1053,7 @@ process_abbrev_set (struct dwarf_section | ||
71 | the caller. */ | ||
72 | if (start == end || entry == 0) | ||
73 | { | ||
74 | + list->next = NULL; | ||
75 | list->start_of_next_abbrevs = start != end ? start : NULL; | ||
76 | return list; | ||
77 | } | ||
78 | @@ -1144,16 +1143,10 @@ find_and_process_abbrev_set (struct dwar | ||
79 | unsigned char *end = section->start + abbrev_base + abbrev_size; | ||
80 | abbrev_list *list = NULL; | ||
81 | if (free_list) | ||
82 | - list = find_abbrev_list_by_abbrev_offset (abbrev_base, abbrev_offset); | ||
83 | + list = find_abbrev_list_by_raw_abbrev (start); | ||
84 | if (list == NULL) | ||
85 | { | ||
86 | list = process_abbrev_set (section, start, end); | ||
87 | - if (list) | ||
88 | - { | ||
89 | - list->abbrev_base = abbrev_base; | ||
90 | - list->abbrev_offset = abbrev_offset; | ||
91 | - list->next = NULL; | ||
92 | - } | ||
93 | if (free_list) | ||
94 | *free_list = list; | ||
95 | } | ||
diff --git a/meta/recipes-devtools/binutils/binutils/0014-configure-remove-dependencies-on-gmp-and-mpfr-when-g.patch b/meta/recipes-devtools/binutils/binutils/0014-configure-remove-dependencies-on-gmp-and-mpfr-when-g.patch new file mode 100644 index 0000000000..04c1310cbe --- /dev/null +++ b/meta/recipes-devtools/binutils/binutils/0014-configure-remove-dependencies-on-gmp-and-mpfr-when-g.patch | |||
@@ -0,0 +1,56 @@ | |||
1 | From 518c167116ab7aa6bb84a97200aeda2c4289e064 Mon Sep 17 00:00:00 2001 | ||
2 | From: =?UTF-8?q?Cl=C3=A9ment=20Chigot?= <chigot@adacore.com> | ||
3 | Date: Tue, 3 Jan 2023 14:24:43 +0100 | ||
4 | Subject: [PATCH] configure: remove dependencies on gmp and mpfr when gdb is | ||
5 | disabled | ||
6 | |||
7 | Since 991180627851801f1999d1ebbc0e569a17e47c74, the configure checks | ||
8 | about GMP and MPFR for gdb builds have been moved to the toplevel | ||
9 | configure. | ||
10 | However, it doesn't take into account the --disable-gdb option. Meaning | ||
11 | that a build without gdb will require these libraries even if not | ||
12 | needed. | ||
13 | |||
14 | ChangeLog: | ||
15 | |||
16 | * configure.ac: Skip GMP and MPFR when --disable-gdb is | ||
17 | provided. | ||
18 | * configure: Regenerate. | ||
19 | |||
20 | Upstream-Status: Backport [https://sourceware.org/git/?p=binutils-gdb.git;a=commitdiff;h=5fb0e308577143ceb313fde5538dc9ecb038f29f] | ||
21 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
22 | --- | ||
23 | configure | 4 +++- | ||
24 | configure.ac | 4 +++- | ||
25 | 2 files changed, 6 insertions(+), 2 deletions(-) | ||
26 | |||
27 | diff --git a/configure b/configure | ||
28 | index bdc3583215f..b63b5cd3de0 100755 | ||
29 | --- a/configure | ||
30 | +++ b/configure | ||
31 | @@ -8032,7 +8032,9 @@ if test -d ${srcdir}/gcc ; then | ||
32 | require_mpc=yes | ||
33 | fi | ||
34 | if test -d ${srcdir}/gdb ; then | ||
35 | - require_gmp=yes | ||
36 | + if test "x$enable_gdb" != xno; then | ||
37 | + require_gmp=yes | ||
38 | + fi | ||
39 | fi | ||
40 | |||
41 | gmplibs="-lmpfr -lgmp" | ||
42 | diff --git a/configure.ac b/configure.ac | ||
43 | index 1c00b9aec42..2df870b86af 100644 | ||
44 | --- a/configure.ac | ||
45 | +++ b/configure.ac | ||
46 | @@ -1585,7 +1585,9 @@ if test -d ${srcdir}/gcc ; then | ||
47 | require_mpc=yes | ||
48 | fi | ||
49 | if test -d ${srcdir}/gdb ; then | ||
50 | - require_gmp=yes | ||
51 | + if test "x$enable_gdb" != xno; then | ||
52 | + require_gmp=yes | ||
53 | + fi | ||
54 | fi | ||
55 | |||
56 | gmplibs="-lmpfr -lgmp" | ||
diff --git a/meta/recipes-devtools/binutils/binutils/0015-CVE-2022-4285.patch b/meta/recipes-devtools/binutils/binutils/0015-CVE-2022-4285.patch deleted file mode 100644 index 46ec0b15a3..0000000000 --- a/meta/recipes-devtools/binutils/binutils/0015-CVE-2022-4285.patch +++ /dev/null | |||
@@ -1,37 +0,0 @@ | |||
1 | From 5c831a3c7f3ca98d6aba1200353311e1a1f84c70 Mon Sep 17 00:00:00 2001 | ||
2 | From: Nick Clifton <nickc@redhat.com> | ||
3 | Date: Wed, 19 Oct 2022 15:09:12 +0100 | ||
4 | Subject: [PATCH] Fix an illegal memory access when parsing an ELF file | ||
5 | containing corrupt symbol version information. | ||
6 | |||
7 | PR 29699 | ||
8 | * elf.c (_bfd_elf_slurp_version_tables): Fail if the sh_info field | ||
9 | of the section header is zero. | ||
10 | |||
11 | Upstream-Status: Backport | ||
12 | [https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=5c831a3c7f3ca98d6aba1200353311e1a1f84c70] | ||
13 | |||
14 | Signed-off-by: Pgowda <pgowda.cve@gmail.com> | ||
15 | --- | ||
16 | bfd/ChangeLog | 6 ++++++ | ||
17 | bfd/elf.c | 4 +++- | ||
18 | 2 files changed, 9 insertions(+), 1 deletion(-) | ||
19 | |||
20 | diff --git a/bfd/elf.c b/bfd/elf.c | ||
21 | index fe00e0f9189..7cd7febcf95 100644 | ||
22 | --- a/bfd/elf.c | ||
23 | +++ b/bfd/elf.c | ||
24 | @@ -8918,7 +8918,9 @@ _bfd_elf_slurp_version_tables (bfd *abfd, bool default_imported_symver) | ||
25 | bfd_set_error (bfd_error_file_too_big); | ||
26 | goto error_return_verref; | ||
27 | } | ||
28 | - elf_tdata (abfd)->verref = (Elf_Internal_Verneed *) bfd_alloc (abfd, amt); | ||
29 | + if (amt == 0) | ||
30 | + goto error_return_verref; | ||
31 | + elf_tdata (abfd)->verref = (Elf_Internal_Verneed *) bfd_zalloc (abfd, amt); | ||
32 | if (elf_tdata (abfd)->verref == NULL) | ||
33 | goto error_return_verref; | ||
34 | |||
35 | -- | ||
36 | 2.31.1 | ||
37 | |||
diff --git a/meta/recipes-devtools/binutils/binutils/0015-Remove-duplicate-pe-dll.o-entry-deom-targ_extra_ofil.patch b/meta/recipes-devtools/binutils/binutils/0015-Remove-duplicate-pe-dll.o-entry-deom-targ_extra_ofil.patch new file mode 100644 index 0000000000..f57f65ce72 --- /dev/null +++ b/meta/recipes-devtools/binutils/binutils/0015-Remove-duplicate-pe-dll.o-entry-deom-targ_extra_ofil.patch | |||
@@ -0,0 +1,32 @@ | |||
1 | From 9599d7d48913fca4c2bf0d0012f9655353ca6f6c Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Wed, 18 Jan 2023 19:35:07 -0800 | ||
4 | Subject: [PATCH] Remove duplicate pe-dll.o entry deom targ_extra_ofiles | ||
5 | |||
6 | Commit c60b3806799abf1d7f6cf5108a1b0e733a950b13 added support for | ||
7 | aarch64-pe which introduced wrapper over pep-dll.c for x86_64 as well as | ||
8 | aarch64, on x86_64 it was added but the old object pe-dll.o needs to be | ||
9 | removed too, otherwise build fails with duplicate symbols from pe-dll.o | ||
10 | and pep-dll-x86_64.o | ||
11 | |||
12 | Upstream-Status: Submitted [https://sourceware.org/pipermail/binutils/2023-January/125739.html] | ||
13 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
14 | Cc: Jedidiah Thompson <wej22007@outlook.com> | ||
15 | Cc: Zac Walker <zac.walker@linaro.org> | ||
16 | --- | ||
17 | ld/configure.tgt | 4 ++-- | ||
18 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
19 | |||
20 | diff --git a/ld/configure.tgt b/ld/configure.tgt | ||
21 | index de04a44b812..f80c84ab13c 100644 | ||
22 | --- a/ld/configure.tgt | ||
23 | +++ b/ld/configure.tgt | ||
24 | @@ -1056,7 +1056,7 @@ x86_64-*-cygwin) targ_emul=i386pep ; | ||
25 | ;; | ||
26 | x86_64-*-mingw*) targ_emul=i386pep ; | ||
27 | targ_extra_emuls=i386pe | ||
28 | - targ_extra_ofiles="deffilep.o pdb.o pep-dll.o pe-dll.o" | ||
29 | + targ_extra_ofiles="deffilep.o pdb.o pe-dll.o" | ||
30 | ;; | ||
31 | x86_64-*-gnu*) targ_emul=elf_x86_64 | ||
32 | targ_extra_emuls="elf32_x86_64 elf_iamcu elf_i386" | ||
diff --git a/meta/recipes-devtools/binutils/binutils_2.39.bb b/meta/recipes-devtools/binutils/binutils_2.40.bb index 67240383f7..67240383f7 100644 --- a/meta/recipes-devtools/binutils/binutils_2.39.bb +++ b/meta/recipes-devtools/binutils/binutils_2.40.bb | |||