diff options
Diffstat (limited to 'meta/recipes-devtools/binutils/binutils')
19 files changed, 12664 insertions, 1864 deletions
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 49dacfef81..4ef11c56e7 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 3b278a56a0e98d50ec62735598ee5f4b1834e8b3 Mon Sep 17 00:00:00 2001 | 1 | From 089ee95b342e79af09258b45c888a13b35fadf26 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 a27cb071c75..32b52890b39 100644 | 24 | index b43ae841a6c..6101a95195b 100644 |
25 | --- a/gold/layout.cc | 25 | --- a/gold/layout.cc |
26 | +++ b/gold/layout.cc | 26 | +++ b/gold/layout.cc |
27 | @@ -5032,7 +5032,7 @@ Layout::create_interp(const Target* target) | 27 | @@ -5102,7 +5102,7 @@ Layout::create_interp(const Target* target) |
28 | gold_assert(interp != NULL); | 28 | gold_assert(interp != NULL); |
29 | } | 29 | } |
30 | 30 | ||
@@ -34,10 +34,10 @@ index a27cb071c75..32b52890b39 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 088417ef2d5..46a2db7005c 100755 | 37 | index d6ceb3fe4f5..365c0e778cc 100755 |
38 | --- a/ld/genscripts.sh | 38 | --- a/ld/genscripts.sh |
39 | +++ b/ld/genscripts.sh | 39 | +++ b/ld/genscripts.sh |
40 | @@ -304,6 +304,7 @@ DATA_ALIGNMENT_u="${DATA_ALIGNMENT_u-${DATA_ALIGNMENT_r}}" | 40 | @@ -298,6 +298,7 @@ DATA_ALIGNMENT_u="${DATA_ALIGNMENT_u-${DATA_ALIGNMENT_r}}" |
41 | LD_FLAG=r | 41 | LD_FLAG=r |
42 | DATA_ALIGNMENT=${DATA_ALIGNMENT_r} | 42 | DATA_ALIGNMENT=${DATA_ALIGNMENT_r} |
43 | DEFAULT_DATA_ALIGNMENT="ALIGN(${SEGMENT_SIZE})" | 43 | DEFAULT_DATA_ALIGNMENT="ALIGN(${SEGMENT_SIZE})" |
@@ -45,7 +45,7 @@ index 088417ef2d5..46a2db7005c 100755 | |||
45 | ( echo "/* Script for -r */" | 45 | ( echo "/* Script for -r */" |
46 | source_sh ${CUSTOMIZER_SCRIPT} | 46 | source_sh ${CUSTOMIZER_SCRIPT} |
47 | source_sh ${srcdir}/scripttempl/${SCRIPT_NAME}.sc | 47 | source_sh ${srcdir}/scripttempl/${SCRIPT_NAME}.sc |
48 | @@ -312,10 +313,12 @@ DEFAULT_DATA_ALIGNMENT="ALIGN(${SEGMENT_SIZE})" | 48 | @@ -306,10 +307,12 @@ DEFAULT_DATA_ALIGNMENT="ALIGN(${SEGMENT_SIZE})" |
49 | LD_FLAG=u | 49 | LD_FLAG=u |
50 | DATA_ALIGNMENT=${DATA_ALIGNMENT_u} | 50 | DATA_ALIGNMENT=${DATA_ALIGNMENT_u} |
51 | CONSTRUCTING=" " | 51 | CONSTRUCTING=" " |
@@ -59,10 +59,10 @@ index 088417ef2d5..46a2db7005c 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 29a8f0781d5..75e46f4adaf 100644 | 62 | index fae7c2ad71c..7fe37eb1874 100644 |
63 | --- a/ld/scripttempl/elf.sc | 63 | --- a/ld/scripttempl/elf.sc |
64 | +++ b/ld/scripttempl/elf.sc | 64 | +++ b/ld/scripttempl/elf.sc |
65 | @@ -147,8 +147,8 @@ if test -z "$DATA_SEGMENT_ALIGN"; then | 65 | @@ -150,8 +150,8 @@ if test -z "$DATA_SEGMENT_ALIGN"; then |
66 | DATA_SEGMENT_RELRO_END=". = DATA_SEGMENT_RELRO_END (${SEPARATE_GOTPLT-0}, .);" | 66 | DATA_SEGMENT_RELRO_END=". = DATA_SEGMENT_RELRO_END (${SEPARATE_GOTPLT-0}, .);" |
67 | fi | 67 | fi |
68 | fi | 68 | fi |
diff --git a/meta/recipes-devtools/binutils/binutils/0002-binutils-cross-Do-not-generate-linker-script-directo.patch b/meta/recipes-devtools/binutils/binutils/0002-binutils-cross-Do-not-generate-linker-script-directo.patch index d07947404f..1652473bcb 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 cf4c8a97b7dc1fe36a7d5dabed417fe18b15ad6b Mon Sep 17 00:00:00 2001 | 1 | From 6fae7afeb713a60755e17443964e46190bb97ede 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,10 +22,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
22 | 1 file changed, 25 deletions(-) | 22 | 1 file changed, 25 deletions(-) |
23 | 23 | ||
24 | diff --git a/ld/genscripts.sh b/ld/genscripts.sh | 24 | diff --git a/ld/genscripts.sh b/ld/genscripts.sh |
25 | index 46a2db7005c..4bb7c33f560 100755 | 25 | index 365c0e778cc..b0893fda3c5 100755 |
26 | --- a/ld/genscripts.sh | 26 | --- a/ld/genscripts.sh |
27 | +++ b/ld/genscripts.sh | 27 | +++ b/ld/genscripts.sh |
28 | @@ -235,31 +235,6 @@ append_to_lib_path() | 28 | @@ -229,31 +229,6 @@ append_to_lib_path() |
29 | fi | 29 | fi |
30 | } | 30 | } |
31 | 31 | ||
diff --git a/meta/recipes-devtools/binutils/binutils/0003-binutils-nativesdk-Search-for-alternative-ld.so.conf.patch b/meta/recipes-devtools/binutils/binutils/0003-binutils-nativesdk-Search-for-alternative-ld.so.conf.patch index cc37d30c53..f45690ed68 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 9701cab0fdf6a0c011978ae140c4c12a962956f6 Mon Sep 17 00:00:00 2001 | 1 | From 1fe9aa3f25e09281cb018b29081db4cc44bdc01f 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,51 +29,51 @@ 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 2c9a487335c..3b01357b651 100644 | 32 | index f9ee05b1400..07801c2c3ac 100644 |
33 | --- a/ld/Makefile.am | 33 | --- a/ld/Makefile.am |
34 | +++ b/ld/Makefile.am | 34 | +++ b/ld/Makefile.am |
35 | @@ -42,7 +42,8 @@ ZLIBINC = @zlibinc@ | 35 | @@ -42,7 +42,8 @@ ZLIBINC = @zlibinc@ |
36 | 36 | ||
37 | ELF_CLFAGS=-DELF_LIST_OPTIONS=@elf_list_options@ \ | 37 | ELF_CFLAGS=-DELF_LIST_OPTIONS=@elf_list_options@ \ |
38 | -DELF_SHLIB_LIST_OPTIONS=@elf_shlib_list_options@ \ | 38 | -DELF_SHLIB_LIST_OPTIONS=@elf_shlib_list_options@ \ |
39 | - -DELF_PLT_UNWIND_LIST_OPTIONS=@elf_plt_unwind_list_options@ | 39 | - -DELF_PLT_UNWIND_LIST_OPTIONS=@elf_plt_unwind_list_options@ |
40 | + -DELF_PLT_UNWIND_LIST_OPTIONS=@elf_plt_unwind_list_options@ \ | 40 | + -DELF_PLT_UNWIND_LIST_OPTIONS=@elf_plt_unwind_list_options@ \ |
41 | + -DSYSCONFDIR="\"$(sysconfdir)\"" | 41 | + -DSYSCONFDIR="\"$(sysconfdir)\"" |
42 | WARN_CFLAGS = @WARN_CFLAGS@ | 42 | WARN_CFLAGS = @WARN_CFLAGS@ |
43 | NO_WERROR = @NO_WERROR@ | 43 | NO_WERROR = @NO_WERROR@ |
44 | AM_CFLAGS = $(WARN_CFLAGS) $(ELF_CLFAGS) | 44 | AM_CFLAGS = $(WARN_CFLAGS) $(ELF_CFLAGS) $(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 b41941c89e2..a6382bf2a45 100644 | 46 | index abb0565718f..6329a12a0d6 100644 |
47 | --- a/ld/Makefile.in | 47 | --- a/ld/Makefile.in |
48 | +++ b/ld/Makefile.in | 48 | +++ b/ld/Makefile.in |
49 | @@ -554,7 +554,8 @@ ZLIB = @zlibdir@ -lz | 49 | @@ -576,7 +576,8 @@ ZLIB = @zlibdir@ -lz |
50 | ZLIBINC = @zlibinc@ | 50 | ZLIBINC = @zlibinc@ |
51 | ELF_CLFAGS = -DELF_LIST_OPTIONS=@elf_list_options@ \ | 51 | ELF_CFLAGS = -DELF_LIST_OPTIONS=@elf_list_options@ \ |
52 | -DELF_SHLIB_LIST_OPTIONS=@elf_shlib_list_options@ \ | 52 | -DELF_SHLIB_LIST_OPTIONS=@elf_shlib_list_options@ \ |
53 | - -DELF_PLT_UNWIND_LIST_OPTIONS=@elf_plt_unwind_list_options@ | 53 | - -DELF_PLT_UNWIND_LIST_OPTIONS=@elf_plt_unwind_list_options@ |
54 | + -DELF_PLT_UNWIND_LIST_OPTIONS=@elf_plt_unwind_list_options@ \ | 54 | + -DELF_PLT_UNWIND_LIST_OPTIONS=@elf_plt_unwind_list_options@ \ |
55 | + -DSYSCONFDIR="\"$(sysconfdir)\"" | 55 | + -DSYSCONFDIR="\"$(sysconfdir)\"" |
56 | 56 | ||
57 | AM_CFLAGS = $(WARN_CFLAGS) $(ELF_CLFAGS) | 57 | AM_CFLAGS = $(WARN_CFLAGS) $(ELF_CFLAGS) $(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 f7407ab55a7..b25781cc0c4 100644 | 60 | index 2852851dcd5..187b359af86 100644 |
61 | --- a/ld/ldelf.c | 61 | --- a/ld/ldelf.c |
62 | +++ b/ld/ldelf.c | 62 | +++ b/ld/ldelf.c |
63 | @@ -911,7 +911,7 @@ ldelf_check_ld_so_conf (const struct bfd_link_needed_list *l, int force, | 63 | @@ -939,7 +939,7 @@ ldelf_check_ld_so_conf (const struct bfd_link_needed_list *l, int force, |
64 | 64 | ||
65 | info.path = NULL; | 65 | info.path = NULL; |
66 | info.len = info.alloc = 0; | 66 | info.len = info.alloc = 0; |
67 | - tmppath = concat (ld_sysroot, prefix, "/etc/ld.so.conf", | 67 | - tmppath = concat (ld_sysroot, prefix, "/etc/ld.so.conf", |
68 | + tmppath = concat (ld_sysconfdir, "/etc/ld.so.conf", | 68 | + tmppath = concat (ld_sysconfdir, "/ld.so.conf", |
69 | (const char *) NULL); | 69 | (const char *) NULL); |
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 863df0293ea..080b1c4c6c2 100644 | 73 | index e90c2021b33..01b306e58a1 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 | @@ -69,6 +69,7 @@ char *program_name; |
77 | 77 | ||
78 | /* The prefix for system library directories. */ | 78 | /* The prefix for system library directories. */ |
79 | const char *ld_sysroot; | 79 | const char *ld_sysroot; |
@@ -82,7 +82,7 @@ index 863df0293ea..080b1c4c6c2 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 38e63922d31..0966914938c 100644 | 85 | index 0238aed0ebd..2dd00db13b3 100644 |
86 | --- a/ld/ldmain.h | 86 | --- a/ld/ldmain.h |
87 | +++ b/ld/ldmain.h | 87 | +++ b/ld/ldmain.h |
88 | @@ -23,6 +23,7 @@ | 88 | @@ -23,6 +23,7 @@ |
diff --git a/meta/recipes-devtools/binutils/binutils/0005-Point-scripts-location-to-libdir.patch b/meta/recipes-devtools/binutils/binutils/0004-Point-scripts-location-to-libdir.patch index dde0cb5d6d..ab12c145ea 100644 --- a/meta/recipes-devtools/binutils/binutils/0005-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 6a67d277941228d997b527990960413f8444fb81 Mon Sep 17 00:00:00 2001 | 1 | From 780109902b00652dfdc080607c614f210e96ae9b 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 3b01357b651..b7a1f7491b0 100644 | 15 | index 07801c2c3ac..a2bcffecf73 100644 |
16 | --- a/ld/Makefile.am | 16 | --- a/ld/Makefile.am |
17 | +++ b/ld/Makefile.am | 17 | +++ b/ld/Makefile.am |
18 | @@ -51,7 +51,7 @@ AM_CFLAGS = $(WARN_CFLAGS) $(ELF_CLFAGS) | 18 | @@ -51,7 +51,7 @@ AM_CFLAGS = $(WARN_CFLAGS) $(ELF_CFLAGS) $(JANSSON_CFLAGS) $(ZSTD_CFLAGS) |
19 | # We put the scripts in the directory $(scriptdir)/ldscripts. | 19 | # We put the scripts in the directory $(scriptdir)/ldscripts. |
20 | # We can't put the scripts in $(datadir) because the SEARCH_DIR | 20 | # We can't put the scripts in $(datadir) because the SEARCH_DIR |
21 | # directives need to be different for native and cross linkers. | 21 | # directives need to be different for native and cross linkers. |
@@ -25,10 +25,10 @@ index 3b01357b651..b7a1f7491b0 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 a6382bf2a45..5ee3a4971be 100644 | 28 | index 6329a12a0d6..15311048855 100644 |
29 | --- a/ld/Makefile.in | 29 | --- a/ld/Makefile.in |
30 | +++ b/ld/Makefile.in | 30 | +++ b/ld/Makefile.in |
31 | @@ -562,7 +562,7 @@ AM_CFLAGS = $(WARN_CFLAGS) $(ELF_CLFAGS) | 31 | @@ -584,7 +584,7 @@ AM_CFLAGS = $(WARN_CFLAGS) $(ELF_CFLAGS) $(JANSSON_CFLAGS) $(ZSTD_CFLAGS) |
32 | # We put the scripts in the directory $(scriptdir)/ldscripts. | 32 | # We put the scripts in the directory $(scriptdir)/ldscripts. |
33 | # We can't put the scripts in $(datadir) because the SEARCH_DIR | 33 | # We can't put the scripts in $(datadir) because the SEARCH_DIR |
34 | # directives need to be different for native and cross linkers. | 34 | # directives need to be different for native and cross linkers. |
diff --git a/meta/recipes-devtools/binutils/binutils/0004-configure-widen-the-regexp-for-SH-architectures.patch b/meta/recipes-devtools/binutils/binutils/0004-configure-widen-the-regexp-for-SH-architectures.patch deleted file mode 100644 index 1cd459ae81..0000000000 --- a/meta/recipes-devtools/binutils/binutils/0004-configure-widen-the-regexp-for-SH-architectures.patch +++ /dev/null | |||
@@ -1,41 +0,0 @@ | |||
1 | From 7e7512c82402363688cca6f1febea2c01cb03409 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Mon, 2 Mar 2015 01:07:33 +0000 | ||
4 | Subject: [PATCH] configure: widen the regexp for SH architectures | ||
5 | |||
6 | gprof needs to know about uclibc | ||
7 | |||
8 | Upstream-Status: Pending | ||
9 | |||
10 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
11 | --- | ||
12 | configure | 2 +- | ||
13 | configure.ac | 2 +- | ||
14 | 2 files changed, 2 insertions(+), 2 deletions(-) | ||
15 | |||
16 | diff --git a/configure b/configure | ||
17 | index 68779feb42b..7b369071141 100755 | ||
18 | --- a/configure | ||
19 | +++ b/configure | ||
20 | @@ -3887,7 +3887,7 @@ case "${target}" in | ||
21 | nvptx*-*-*) | ||
22 | noconfigdirs="$noconfigdirs target-libssp target-libstdc++-v3 target-libobjc" | ||
23 | ;; | ||
24 | - sh-*-*) | ||
25 | + sh*-*-* | sh64-*-*) | ||
26 | case "${target}" in | ||
27 | sh*-*-elf) | ||
28 | ;; | ||
29 | diff --git a/configure.ac b/configure.ac | ||
30 | index d16a2757689..92f01fb3ed7 100644 | ||
31 | --- a/configure.ac | ||
32 | +++ b/configure.ac | ||
33 | @@ -1177,7 +1177,7 @@ case "${target}" in | ||
34 | nvptx*-*-*) | ||
35 | noconfigdirs="$noconfigdirs target-libssp target-libstdc++-v3 target-libobjc" | ||
36 | ;; | ||
37 | - sh-*-*) | ||
38 | + sh*-*-* | sh64-*-*) | ||
39 | case "${target}" in | ||
40 | sh*-*-elf) | ||
41 | ;; | ||
diff --git a/meta/recipes-devtools/binutils/binutils/0007-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 b13a35e02f..f7c3987542 100644 --- a/meta/recipes-devtools/binutils/binutils/0007-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 091870218f192a5698c4420adf938e7178553c07 Mon Sep 17 00:00:00 2001 | 1 | From c8cca8d2364c9f233d6e771136a4d4ff7f405c21 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,10 +17,10 @@ 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 788590957e1..1bca4aafeb7 100644 | 20 | index 85c4b6b6ef8..cb6e91c8f9b 100644 |
21 | --- a/libiberty/Makefile.in | 21 | --- a/libiberty/Makefile.in |
22 | +++ b/libiberty/Makefile.in | 22 | +++ b/libiberty/Makefile.in |
23 | @@ -367,7 +367,8 @@ install-strip: install | 23 | @@ -385,7 +385,8 @@ install-strip: install |
24 | # multilib-specific flags, it's overridden by FLAGS_TO_PASS from the | 24 | # multilib-specific flags, it's overridden by FLAGS_TO_PASS from the |
25 | # default multilib, so we have to take CFLAGS into account as well, | 25 | # default multilib, so we have to take CFLAGS into account as well, |
26 | # since it will be passed the multilib flags. | 26 | # since it will be passed the multilib flags. |
diff --git a/meta/recipes-devtools/binutils/binutils/0008-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 3f83d48f62..bf6a1a3961 100644 --- a/meta/recipes-devtools/binutils/binutils/0008-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 a1d0ca24d3bbdf4cb37537cd84d04a17bf0f813b Mon Sep 17 00:00:00 2001 | 1 | From a92c46e3703d038d7d810bdc91e8540ad9d9150a 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 |
@@ -58,15 +58,15 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
58 | ld/ld.texi | 12 ++++++++++++ | 58 | ld/ld.texi | 12 ++++++++++++ |
59 | ld/ldfile.c | 17 +++++++++++++++++ | 59 | ld/ldfile.c | 17 +++++++++++++++++ |
60 | ld/ldlex.h | 2 ++ | 60 | ld/ldlex.h | 2 ++ |
61 | ld/ldmain.c | 2 ++ | 61 | ld/ldmain.c | 6 ++++-- |
62 | ld/lexsup.c | 15 +++++++++++++++ | 62 | ld/lexsup.c | 15 +++++++++++++++ |
63 | 9 files changed, 85 insertions(+) | 63 | 9 files changed, 87 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 7b60d778587..37b8e9b6f6c 100644 | 66 | index 52d62f06ff0..b5944e7ba55 100644 |
67 | --- a/ld/config.in | 67 | --- a/ld/config.in |
68 | +++ b/ld/config.in | 68 | +++ b/ld/config.in |
69 | @@ -40,6 +40,9 @@ | 69 | @@ -70,6 +70,9 @@ |
70 | language is requested. */ | 70 | language is requested. */ |
71 | #undef ENABLE_NLS | 71 | #undef ENABLE_NLS |
72 | 72 | ||
@@ -77,10 +77,10 @@ index 7b60d778587..37b8e9b6f6c 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 d399d08d0c4..8355c433c76 100755 | 80 | index 6f8a05c3b6c..98a76d6da7f 100755 |
81 | --- a/ld/configure | 81 | --- a/ld/configure |
82 | +++ b/ld/configure | 82 | +++ b/ld/configure |
83 | @@ -828,6 +828,7 @@ with_lib_path | 83 | @@ -844,6 +844,7 @@ with_lib_path |
84 | enable_targets | 84 | enable_targets |
85 | enable_64_bit_bfd | 85 | enable_64_bit_bfd |
86 | with_sysroot | 86 | with_sysroot |
@@ -88,8 +88,8 @@ index d399d08d0c4..8355c433c76 100755 | |||
88 | enable_gold | 88 | enable_gold |
89 | enable_got | 89 | enable_got |
90 | enable_compressed_debug_sections | 90 | enable_compressed_debug_sections |
91 | @@ -1496,6 +1497,8 @@ Optional Features: | 91 | @@ -1534,6 +1535,8 @@ Optional Features: |
92 | --disable-largefile omit support for large files | 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) |
95 | + --enable-poison-system-directories | 95 | + --enable-poison-system-directories |
@@ -97,7 +97,7 @@ index d399d08d0c4..8355c433c76 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 | @@ -15820,6 +15823,19 @@ fi | 100 | @@ -15566,6 +15569,19 @@ fi |
101 | 101 | ||
102 | 102 | ||
103 | 103 | ||
@@ -118,10 +118,10 @@ index d399d08d0c4..8355c433c76 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 c9c69ab9245..59dab0a6ac4 100644 | 121 | index 4a11787ae71..104a531fb0f 100644 |
122 | --- a/ld/configure.ac | 122 | --- a/ld/configure.ac |
123 | +++ b/ld/configure.ac | 123 | +++ b/ld/configure.ac |
124 | @@ -94,6 +94,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,32 +139,32 @@ index c9c69ab9245..59dab0a6ac4 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 93f5af92c7d..ff7f71a7b66 100644 | 142 | index 54d9079678c..9f0163b2911 100644 |
143 | --- a/ld/ld.h | 143 | --- a/ld/ld.h |
144 | +++ b/ld/ld.h | 144 | +++ b/ld/ld.h |
145 | @@ -166,6 +166,14 @@ typedef struct | 145 | @@ -166,6 +166,14 @@ typedef struct |
146 | in the linker script. */ | 146 | in the linker script. */ |
147 | bfd_boolean force_group_allocation; | 147 | bool force_group_allocation; |
148 | 148 | ||
149 | + /* If TRUE (the default) warn for uses of system directories when | 149 | + /* If TRUE (the default) warn for uses of system directories when |
150 | + cross linking. */ | 150 | + cross linking. */ |
151 | + bfd_boolean poison_system_directories; | 151 | + bool poison_system_directories; |
152 | + | 152 | + |
153 | + /* If TRUE (default FALSE) give an error for uses of system | 153 | + /* If TRUE (default FALSE) give an error for uses of system |
154 | + directories when cross linking instead of a warning. */ | 154 | + directories when cross linking instead of a warning. */ |
155 | + bfd_boolean error_poison_system_directories; | 155 | + bool error_poison_system_directories; |
156 | + | 156 | + |
157 | /* Big or little endian as set on command line. */ | 157 | /* Big or little endian as set on command line. */ |
158 | enum endian_enum endian; | 158 | enum endian_enum endian; |
159 | 159 | ||
160 | diff --git a/ld/ld.texi b/ld/ld.texi | 160 | diff --git a/ld/ld.texi b/ld/ld.texi |
161 | index 7a602b9c6ab..cccbfbab3bb 100644 | 161 | index 4fda259a552..22685f5f1dd 100644 |
162 | --- a/ld/ld.texi | 162 | --- a/ld/ld.texi |
163 | +++ b/ld/ld.texi | 163 | +++ b/ld/ld.texi |
164 | @@ -2810,6 +2810,18 @@ string identifying the original linked file does not change. | 164 | @@ -3119,6 +3119,18 @@ creation of the metadata note, if one had been enabled by an earlier |
165 | 165 | occurrence of the --package-metadata option. | |
166 | Passing @code{none} for @var{style} disables the setting from any | 166 | If the linker has been built with libjansson, then the JSON string |
167 | @code{--build-id} options earlier on the command line. | 167 | will be validated. |
168 | + | 168 | + |
169 | +@kindex --no-poison-system-directories | 169 | +@kindex --no-poison-system-directories |
170 | +@item --no-poison-system-directories | 170 | +@item --no-poison-system-directories |
@@ -181,10 +181,10 @@ index 7a602b9c6ab..cccbfbab3bb 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 81cb86d51e2..cd5c2752679 100644 | 184 | index dc9875d8813..49d899ee49d 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, bfd_boolean cmdline) | 187 | @@ -327,6 +327,23 @@ ldfile_add_library_path (const char *name, bool cmdline) |
188 | new_dirs->name = concat (ld_sysroot, name + strlen ("$SYSROOT"), (const char *) NULL); | 188 | new_dirs->name = concat (ld_sysroot, name + strlen ("$SYSROOT"), (const char *) NULL); |
189 | else | 189 | else |
190 | new_dirs->name = xstrdup (name); | 190 | new_dirs->name = xstrdup (name); |
@@ -209,36 +209,54 @@ index 81cb86d51e2..cd5c2752679 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 b0101028321..77f5accb5d9 100644 | 212 | index 161a9d4d8dc..757fe2f7650 100644 |
213 | --- a/ld/ldlex.h | 213 | --- a/ld/ldlex.h |
214 | +++ b/ld/ldlex.h | 214 | +++ b/ld/ldlex.h |
215 | @@ -161,6 +161,8 @@ enum option_values | 215 | @@ -147,6 +147,8 @@ enum option_values |
216 | OPTION_CTF_VARIABLES, | 216 | OPTION_PLUGIN, |
217 | OPTION_NO_CTF_VARIABLES, | 217 | OPTION_PLUGIN_OPT, |
218 | OPTION_CTF_SHARE_TYPES, | 218 | #endif /* BFD_SUPPORTS_PLUGINS */ |
219 | + OPTION_NO_POISON_SYSTEM_DIRECTORIES, | 219 | + OPTION_NO_POISON_SYSTEM_DIRECTORIES, |
220 | + OPTION_ERROR_POISON_SYSTEM_DIRECTORIES, | 220 | + OPTION_ERROR_POISON_SYSTEM_DIRECTORIES, |
221 | }; | 221 | OPTION_DEFAULT_SCRIPT, |
222 | 222 | OPTION_PRINT_OUTPUT_FORMAT, | |
223 | /* The initial parser states. */ | 223 | OPTION_PRINT_SYSROOT, |
224 | diff --git a/ld/ldmain.c b/ld/ldmain.c | 224 | diff --git a/ld/ldmain.c b/ld/ldmain.c |
225 | index 080b1c4c6c2..78d8a2df278 100644 | 225 | index 01b306e58a1..eddefc24332 100644 |
226 | --- a/ld/ldmain.c | 226 | --- a/ld/ldmain.c |
227 | +++ b/ld/ldmain.c | 227 | +++ b/ld/ldmain.c |
228 | @@ -324,6 +324,8 @@ main (int argc, char **argv) | 228 | @@ -326,6 +326,8 @@ main (int argc, char **argv) |
229 | command_line.warn_mismatch = TRUE; | 229 | command_line.warn_mismatch = true; |
230 | command_line.warn_search_mismatch = TRUE; | 230 | command_line.warn_search_mismatch = true; |
231 | command_line.check_section_addresses = -1; | 231 | command_line.check_section_addresses = -1; |
232 | + command_line.poison_system_directories = TRUE; | 232 | + command_line.poison_system_directories = true; |
233 | + command_line.error_poison_system_directories = FALSE; | 233 | + command_line.error_poison_system_directories = false; |
234 | 234 | ||
235 | /* We initialize DEMANGLING based on the environment variable | 235 | /* We initialize DEMANGLING based on the environment variable |
236 | COLLECT_NO_DEMANGLE. The gcc collect2 program will demangle the | 236 | COLLECT_NO_DEMANGLE. The gcc collect2 program will demangle the |
237 | @@ -1458,7 +1460,7 @@ undefined_symbol (struct bfd_link_info *info, | ||
238 | argv[1] = "undefined-symbol"; | ||
239 | argv[2] = (char *) name; | ||
240 | argv[3] = NULL; | ||
241 | - | ||
242 | + | ||
243 | if (verbose) | ||
244 | einfo (_("%P: About to run error handling script '%s' with arguments: '%s' '%s'\n"), | ||
245 | argv[0], argv[1], argv[2]); | ||
246 | @@ -1479,7 +1481,7 @@ undefined_symbol (struct bfd_link_info *info, | ||
247 | carry on to issue the normal error message. */ | ||
248 | } | ||
249 | #endif /* SUPPORT_ERROR_HANDLING_SCRIPT */ | ||
250 | - | ||
251 | + | ||
252 | if (section != NULL) | ||
253 | { | ||
254 | if (error_count < MAX_ERRORS_IN_A_ROW) | ||
237 | diff --git a/ld/lexsup.c b/ld/lexsup.c | 255 | diff --git a/ld/lexsup.c b/ld/lexsup.c |
238 | index f005a58a045..c83292a9427 100644 | 256 | index 099dff8ecde..e9939000b2e 100644 |
239 | --- a/ld/lexsup.c | 257 | --- a/ld/lexsup.c |
240 | +++ b/ld/lexsup.c | 258 | +++ b/ld/lexsup.c |
241 | @@ -591,6 +591,14 @@ static const struct ld_option ld_options[] = | 259 | @@ -642,6 +642,14 @@ static const struct ld_option ld_options[] = |
242 | " <method> is: share-unconflicted (default),\n" | 260 | " <method> is: share-unconflicted (default),\n" |
243 | " share-duplicated"), | 261 | " share-duplicated"), |
244 | TWO_DASHES }, | 262 | TWO_DASHES }, |
@@ -253,17 +271,17 @@ index f005a58a045..c83292a9427 100644 | |||
253 | }; | 271 | }; |
254 | 272 | ||
255 | #define OPTION_COUNT ARRAY_SIZE (ld_options) | 273 | #define OPTION_COUNT ARRAY_SIZE (ld_options) |
256 | @@ -1674,6 +1682,13 @@ parse_args (unsigned argc, char **argv) | 274 | @@ -1818,6 +1826,13 @@ parse_args (unsigned argc, char **argv) |
257 | 275 | ||
258 | case OPTION_PRINT_MAP_DISCARDED: | 276 | case OPTION_PRINT_MAP_LOCALS: |
259 | config.print_map_discarded = TRUE; | 277 | config.print_map_locals = true; |
260 | + | 278 | + |
261 | + case OPTION_NO_POISON_SYSTEM_DIRECTORIES: | 279 | + case OPTION_NO_POISON_SYSTEM_DIRECTORIES: |
262 | + command_line.poison_system_directories = FALSE; | 280 | + command_line.poison_system_directories = false; |
263 | + break; | 281 | + break; |
264 | + | 282 | + |
265 | + case OPTION_ERROR_POISON_SYSTEM_DIRECTORIES: | 283 | + case OPTION_ERROR_POISON_SYSTEM_DIRECTORIES: |
266 | + command_line.error_poison_system_directories = TRUE; | 284 | + command_line.error_poison_system_directories = true; |
267 | break; | 285 | break; |
268 | 286 | ||
269 | case OPTION_DEPENDENCY_FILE: | 287 | case OPTION_DEPENDENCY_FILE: |
diff --git a/meta/recipes-devtools/binutils/binutils/0011-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 1041b7301e..f9fa0d4f78 100644 --- a/meta/recipes-devtools/binutils/binutils/0011-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,32 +1,35 @@ | |||
1 | From 7f4938d062146e40b4e6d427a5eca6cc6acaaeee Mon Sep 17 00:00:00 2001 | 1 | From d35fd95eee9930ab41d9ad637eacb35aa9fe6f44 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 |
5 | 5 | ||
6 | Signed-off-by: Zhenhua Luo <zhenhua.luo@nxp.com> | 6 | The wait mnemonic for ppc targets is incorrectly assembled into 0x7c00003c due |
7 | to duplicated address definition with waitasec instruction. The issue causes | ||
8 | kernel boot calltrace for ppc targets when wait instruction is executed. | ||
7 | 9 | ||
8 | Upstream-Status: Pending | 10 | Upstream-Status: Pending |
11 | Signed-off-by: Zhenhua Luo <zhenhua.luo@nxp.com> | ||
9 | --- | 12 | --- |
10 | opcodes/ppc-opc.c | 4 +--- | 13 | opcodes/ppc-opc.c | 4 +--- |
11 | 1 file changed, 1 insertion(+), 3 deletions(-) | 14 | 1 file changed, 1 insertion(+), 3 deletions(-) |
12 | 15 | ||
13 | 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 |
14 | index bbbadffad8f..72092355e12 100644 | 17 | index e55bfe846cd..66b37e36e6f 100644 |
15 | --- a/opcodes/ppc-opc.c | 18 | --- a/opcodes/ppc-opc.c |
16 | +++ b/opcodes/ppc-opc.c | 19 | +++ b/opcodes/ppc-opc.c |
17 | @@ -6302,8 +6302,6 @@ const struct powerpc_opcode powerpc_opcodes[] = { | 20 | @@ -7138,8 +7138,6 @@ const struct powerpc_opcode powerpc_opcodes[] = { |
18 | {"waitasec", X(31,30), XRTRARB_MASK, POWER8, POWER9, {0}}, | 21 | {"waitasec", X(31,30), XRTRARB_MASK, POWER8, POWER9, {0}}, |
19 | {"waitrsv", XWCPL(31,30,1,0),0xffffffff, POWER10, 0, {0}}, | 22 | {"waitrsv", XWCPL(31,30,1,0),0xffffffff, POWER10, EXT, {0}}, |
20 | {"pause_short", XWCPL(31,30,2,0),0xffffffff, POWER10, 0, {0}}, | 23 | {"pause_short", XWCPL(31,30,2,0),0xffffffff, POWER10, EXT, {0}}, |
21 | -{"wait", X(31,30), XWCPL_MASK, POWER10, 0, {WC, PL}}, | 24 | -{"wait", X(31,30), XWCPL_MASK, POWER10, 0, {WC, PL}}, |
22 | -{"wait", X(31,30), XWC_MASK, POWER9, POWER10, {WC}}, | 25 | -{"wait", X(31,30), XWC_MASK, POWER9, POWER10, {WC}}, |
23 | 26 | ||
24 | {"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}}, |
25 | 28 | ||
26 | @@ -6363,7 +6361,7 @@ const struct powerpc_opcode powerpc_opcodes[] = { | 29 | @@ -7193,7 +7191,7 @@ const struct powerpc_opcode powerpc_opcodes[] = { |
27 | 30 | ||
28 | {"waitrsv", X(31,62)|(1<<21), 0xffffffff, E500MC|PPCA2, 0, {0}}, | 31 | {"waitrsv", X(31,62)|(1<<21), 0xffffffff, E500MC|PPCA2, EXT, {0}}, |
29 | {"waitimpl", X(31,62)|(2<<21), 0xffffffff, E500MC|PPCA2, 0, {0}}, | 32 | {"waitimpl", X(31,62)|(2<<21), 0xffffffff, E500MC|PPCA2, EXT, {0}}, |
30 | -{"wait", X(31,62), XWC_MASK, E500MC|PPCA2, 0, {WC}}, | 33 | -{"wait", X(31,62), XWC_MASK, E500MC|PPCA2, 0, {WC}}, |
31 | +{"wait", X(31,62), XWC_MASK, E500MC|PPCA2|POWER9|POWER10, 0, {WC}}, | 34 | +{"wait", X(31,62), XWC_MASK, E500MC|PPCA2|POWER9|POWER10, 0, {WC}}, |
32 | 35 | ||
diff --git a/meta/recipes-devtools/binutils/binutils/0013-Use-libtool-2.4.patch b/meta/recipes-devtools/binutils/binutils/0008-Use-libtool-2.4.patch index d4067691cf..05f1ed0dc5 100644 --- a/meta/recipes-devtools/binutils/binutils/0013-Use-libtool-2.4.patch +++ b/meta/recipes-devtools/binutils/binutils/0008-Use-libtool-2.4.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From a1031fca1b6c1348c078bb8a9df6e7d29148dae1 Mon Sep 17 00:00:00 2001 | 1 | From da089ddacb6506f406acd8939389183a4356ebf0 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 |
@@ -9,27 +9,76 @@ Upstream-Status: Pending | |||
9 | 9 | ||
10 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 10 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
11 | --- | 11 | --- |
12 | bfd/configure | 1322 +++++++++++++++----- | 12 | bfd/Makefile.in | 3 + |
13 | bfd/configure.ac | 2 +- | 13 | bfd/configure | 1333 +++++++++--- |
14 | binutils/configure | 1320 +++++++++++++++----- | 14 | bfd/configure.ac | 2 +- |
15 | gas/configure | 1320 +++++++++++++++----- | 15 | binutils/Makefile.in | 3 + |
16 | gprof/configure | 1320 +++++++++++++++----- | 16 | binutils/configure | 1331 +++++++++--- |
17 | ld/configure | 1695 ++++++++++++++++++------- | 17 | gas/Makefile.in | 3 + |
18 | libctf/configure | 1319 +++++++++++++++----- | 18 | gas/configure | 1331 +++++++++--- |
19 | libtool.m4 | 1080 +++++++++++----- | 19 | gprof/Makefile.in | 3 + |
20 | ltmain.sh | 2925 +++++++++++++++++++++++++++++--------------- | 20 | gprof/configure | 1331 +++++++++--- |
21 | ltoptions.m4 | 2 +- | 21 | gprofng/Makefile.in | 2 + |
22 | ltversion.m4 | 12 +- | 22 | gprofng/configure | 1693 ++++++++++++---- |
23 | lt~obsolete.m4 | 2 +- | 23 | gprofng/doc/Makefile.in | 2 + |
24 | opcodes/configure | 1320 +++++++++++++++----- | 24 | gprofng/gp-display-html/Makefile.in | 2 + |
25 | zlib/configure | 1320 +++++++++++++++----- | 25 | gprofng/libcollector/Makefile.in | 2 + |
26 | 14 files changed, 10931 insertions(+), 4028 deletions(-) | 26 | gprofng/libcollector/configure | 1693 ++++++++++++---- |
27 | gprofng/src/Makefile.in | 2 + | ||
28 | ld/Makefile.in | 3 + | ||
29 | ld/configure | 1694 ++++++++++++---- | ||
30 | libbacktrace/Makefile.in | 108 +- | ||
31 | libbacktrace/aclocal.m4 | 73 +- | ||
32 | libbacktrace/configure | 1441 +++++++++---- | ||
33 | libctf/Makefile.in | 2 + | ||
34 | libctf/configure | 1334 +++++++++--- | ||
35 | libsframe/Makefile.in | 344 ++-- | ||
36 | libsframe/aclocal.m4 | 220 +- | ||
37 | libsframe/configure | 1553 ++++++++++---- | ||
38 | libtool.m4 | 1085 ++++++---- | ||
39 | ltmain.sh | 2921 ++++++++++++++++++--------- | ||
40 | ltoptions.m4 | 2 +- | ||
41 | ltversion.m4 | 12 +- | ||
42 | lt~obsolete.m4 | 2 +- | ||
43 | opcodes/Makefile.in | 3 + | ||
44 | opcodes/configure | 1331 +++++++++--- | ||
45 | zlib/Makefile.in | 3 + | ||
46 | zlib/configure | 1331 +++++++++--- | ||
47 | 35 files changed, 16094 insertions(+), 6104 deletions(-) | ||
27 | 48 | ||
49 | diff --git a/bfd/Makefile.in b/bfd/Makefile.in | ||
50 | index faaa0c424b8..5371e093163 100644 | ||
51 | --- a/bfd/Makefile.in | ||
52 | +++ b/bfd/Makefile.in | ||
53 | @@ -340,6 +340,7 @@ DATADIRNAME = @DATADIRNAME@ | ||
54 | DEBUGDIR = @DEBUGDIR@ | ||
55 | DEFS = @DEFS@ | ||
56 | DEPDIR = @DEPDIR@ | ||
57 | +DLLTOOL = @DLLTOOL@ | ||
58 | DSYMUTIL = @DSYMUTIL@ | ||
59 | DUMPBIN = @DUMPBIN@ | ||
60 | ECHO_C = @ECHO_C@ | ||
61 | @@ -379,6 +380,7 @@ LTLIBINTL = @LTLIBINTL@ | ||
62 | LTLIBOBJS = @LTLIBOBJS@ | ||
63 | MAINT = @MAINT@ | ||
64 | MAKEINFO = @MAKEINFO@ | ||
65 | +MANIFEST_TOOL = @MANIFEST_TOOL@ | ||
66 | MKDIR_P = @MKDIR_P@ | ||
67 | MKINSTALLDIRS = @MKINSTALLDIRS@ | ||
68 | MSGFMT = @MSGFMT@ | ||
69 | @@ -425,6 +427,7 @@ abs_builddir = @abs_builddir@ | ||
70 | abs_srcdir = @abs_srcdir@ | ||
71 | abs_top_builddir = @abs_top_builddir@ | ||
72 | abs_top_srcdir = @abs_top_srcdir@ | ||
73 | +ac_ct_AR = @ac_ct_AR@ | ||
74 | ac_ct_CC = @ac_ct_CC@ | ||
75 | ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ | ||
76 | all_backends = @all_backends@ | ||
28 | diff --git a/bfd/configure b/bfd/configure | 77 | diff --git a/bfd/configure b/bfd/configure |
29 | index b3665c68c13..376b951d496 100755 | 78 | index acbac2f364a..a53a9d52719 100755 |
30 | --- a/bfd/configure | 79 | --- a/bfd/configure |
31 | +++ b/bfd/configure | 80 | +++ b/bfd/configure |
32 | @@ -705,6 +705,9 @@ OTOOL | 81 | @@ -712,6 +712,9 @@ OTOOL |
33 | LIPO | 82 | LIPO |
34 | NMEDIT | 83 | NMEDIT |
35 | DSYMUTIL | 84 | DSYMUTIL |
@@ -39,7 +88,7 @@ index b3665c68c13..376b951d496 100755 | |||
39 | OBJDUMP | 88 | OBJDUMP |
40 | LN_S | 89 | LN_S |
41 | NM | 90 | NM |
42 | @@ -823,6 +826,7 @@ enable_static | 91 | @@ -830,6 +833,7 @@ enable_static |
43 | with_pic | 92 | with_pic |
44 | enable_fast_install | 93 | enable_fast_install |
45 | with_gnu_ld | 94 | with_gnu_ld |
@@ -47,7 +96,7 @@ index b3665c68c13..376b951d496 100755 | |||
47 | enable_libtool_lock | 96 | enable_libtool_lock |
48 | enable_plugins | 97 | enable_plugins |
49 | enable_largefile | 98 | enable_largefile |
50 | @@ -1505,6 +1509,8 @@ Optional Packages: | 99 | @@ -1526,6 +1530,8 @@ Optional Packages: |
51 | --with-pic try to use only PIC/non-PIC objects [default=use | 100 | --with-pic try to use only PIC/non-PIC objects [default=use |
52 | both] | 101 | both] |
53 | --with-gnu-ld assume the C compiler uses GNU ld [default=no] | 102 | --with-gnu-ld assume the C compiler uses GNU ld [default=no] |
@@ -56,7 +105,7 @@ index b3665c68c13..376b951d496 100755 | |||
56 | --with-mmap try using mmap for BFD input files if available | 105 | --with-mmap try using mmap for BFD input files if available |
57 | --with-separate-debug-dir=DIR | 106 | --with-separate-debug-dir=DIR |
58 | Look for global separate debug info in DIR | 107 | Look for global separate debug info in DIR |
59 | @@ -5694,8 +5700,8 @@ esac | 108 | @@ -5063,8 +5069,8 @@ esac |
60 | 109 | ||
61 | 110 | ||
62 | 111 | ||
@@ -67,7 +116,7 @@ index b3665c68c13..376b951d496 100755 | |||
67 | 116 | ||
68 | 117 | ||
69 | 118 | ||
70 | @@ -5735,7 +5741,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO | 119 | @@ -5104,7 +5110,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO |
71 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 | 120 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 |
72 | $as_echo_n "checking how to print strings... " >&6; } | 121 | $as_echo_n "checking how to print strings... " >&6; } |
73 | # Test print first, because it will be a builtin if present. | 122 | # Test print first, because it will be a builtin if present. |
@@ -76,7 +125,7 @@ index b3665c68c13..376b951d496 100755 | |||
76 | test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then | 125 | test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then |
77 | ECHO='print -r --' | 126 | ECHO='print -r --' |
78 | elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then | 127 | elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then |
79 | @@ -6421,8 +6427,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; | 128 | @@ -5797,8 +5803,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; |
80 | # Try some XSI features | 129 | # Try some XSI features |
81 | xsi_shell=no | 130 | xsi_shell=no |
82 | ( _lt_dummy="a/b/c" | 131 | ( _lt_dummy="a/b/c" |
@@ -87,7 +136,7 @@ index b3665c68c13..376b951d496 100755 | |||
87 | && eval 'test $(( 1 + 1 )) -eq 2 \ | 136 | && eval 'test $(( 1 + 1 )) -eq 2 \ |
88 | && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ | 137 | && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ |
89 | && xsi_shell=yes | 138 | && xsi_shell=yes |
90 | @@ -6471,6 +6477,80 @@ esac | 139 | @@ -5847,6 +5853,80 @@ esac |
91 | 140 | ||
92 | 141 | ||
93 | 142 | ||
@@ -168,7 +217,7 @@ index b3665c68c13..376b951d496 100755 | |||
168 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 | 217 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 |
169 | $as_echo_n "checking for $LD option to reload object files... " >&6; } | 218 | $as_echo_n "checking for $LD option to reload object files... " >&6; } |
170 | if ${lt_cv_ld_reload_flag+:} false; then : | 219 | if ${lt_cv_ld_reload_flag+:} false; then : |
171 | @@ -6487,6 +6567,11 @@ case $reload_flag in | 220 | @@ -5863,6 +5943,11 @@ case $reload_flag in |
172 | esac | 221 | esac |
173 | reload_cmds='$LD$reload_flag -o $output$reload_objs' | 222 | reload_cmds='$LD$reload_flag -o $output$reload_objs' |
174 | case $host_os in | 223 | case $host_os in |
@@ -180,7 +229,7 @@ index b3665c68c13..376b951d496 100755 | |||
180 | darwin*) | 229 | darwin*) |
181 | if test "$GCC" = yes; then | 230 | if test "$GCC" = yes; then |
182 | reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' | 231 | reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' |
183 | @@ -6655,7 +6740,8 @@ mingw* | pw32*) | 232 | @@ -6031,7 +6116,8 @@ mingw* | pw32*) |
184 | lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' | 233 | lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' |
185 | lt_cv_file_magic_cmd='func_win32_libid' | 234 | lt_cv_file_magic_cmd='func_win32_libid' |
186 | else | 235 | else |
@@ -190,7 +239,7 @@ index b3665c68c13..376b951d496 100755 | |||
190 | lt_cv_file_magic_cmd='$OBJDUMP -f' | 239 | lt_cv_file_magic_cmd='$OBJDUMP -f' |
191 | fi | 240 | fi |
192 | ;; | 241 | ;; |
193 | @@ -6809,6 +6895,21 @@ esac | 242 | @@ -6190,6 +6276,21 @@ esac |
194 | fi | 243 | fi |
195 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 | 244 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 |
196 | $as_echo "$lt_cv_deplibs_check_method" >&6; } | 245 | $as_echo "$lt_cv_deplibs_check_method" >&6; } |
@@ -212,7 +261,7 @@ index b3665c68c13..376b951d496 100755 | |||
212 | file_magic_cmd=$lt_cv_file_magic_cmd | 261 | file_magic_cmd=$lt_cv_file_magic_cmd |
213 | deplibs_check_method=$lt_cv_deplibs_check_method | 262 | deplibs_check_method=$lt_cv_deplibs_check_method |
214 | test -z "$deplibs_check_method" && deplibs_check_method=unknown | 263 | test -z "$deplibs_check_method" && deplibs_check_method=unknown |
215 | @@ -6822,11 +6923,164 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown | 264 | @@ -6205,6 +6306,157 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown |
216 | 265 | ||
217 | 266 | ||
218 | 267 | ||
@@ -226,11 +275,7 @@ index b3665c68c13..376b951d496 100755 | |||
226 | + | 275 | + |
227 | + | 276 | + |
228 | + | 277 | + |
229 | 278 | +if test -n "$ac_tool_prefix"; then | |
230 | |||
231 | if test -n "$ac_tool_prefix"; then | ||
232 | - # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. | ||
233 | -set dummy ${ac_tool_prefix}ar; ac_word=$2 | ||
234 | + # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. | 279 | + # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. |
235 | +set dummy ${ac_tool_prefix}dlltool; ac_word=$2 | 280 | +set dummy ${ac_tool_prefix}dlltool; ac_word=$2 |
236 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | 281 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
@@ -371,7 +416,15 @@ index b3665c68c13..376b951d496 100755 | |||
371 | + | 416 | + |
372 | + | 417 | + |
373 | + | 418 | + |
374 | +if test -n "$ac_tool_prefix"; then | 419 | plugin_option= |
420 | plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll" | ||
421 | for plugin in $plugin_names; do | ||
422 | @@ -6219,8 +6471,10 @@ for plugin in $plugin_names; do | ||
423 | done | ||
424 | |||
425 | if test -n "$ac_tool_prefix"; then | ||
426 | - # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. | ||
427 | -set dummy ${ac_tool_prefix}ar; ac_word=$2 | ||
375 | + for ac_prog in ar | 428 | + for ac_prog in ar |
376 | + do | 429 | + do |
377 | + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. | 430 | + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. |
@@ -379,7 +432,7 @@ index b3665c68c13..376b951d496 100755 | |||
379 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | 432 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
380 | $as_echo_n "checking for $ac_word... " >&6; } | 433 | $as_echo_n "checking for $ac_word... " >&6; } |
381 | if ${ac_cv_prog_AR+:} false; then : | 434 | if ${ac_cv_prog_AR+:} false; then : |
382 | @@ -6842,7 +7096,7 @@ do | 435 | @@ -6236,7 +6490,7 @@ do |
383 | test -z "$as_dir" && as_dir=. | 436 | test -z "$as_dir" && as_dir=. |
384 | for ac_exec_ext in '' $ac_executable_extensions; do | 437 | for ac_exec_ext in '' $ac_executable_extensions; do |
385 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | 438 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
@@ -388,7 +441,7 @@ index b3665c68c13..376b951d496 100755 | |||
388 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | 441 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
389 | break 2 | 442 | break 2 |
390 | fi | 443 | fi |
391 | @@ -6862,11 +7116,15 @@ $as_echo "no" >&6; } | 444 | @@ -6256,11 +6510,15 @@ $as_echo "no" >&6; } |
392 | fi | 445 | fi |
393 | 446 | ||
394 | 447 | ||
@@ -407,7 +460,7 @@ index b3665c68c13..376b951d496 100755 | |||
407 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | 460 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
408 | $as_echo_n "checking for $ac_word... " >&6; } | 461 | $as_echo_n "checking for $ac_word... " >&6; } |
409 | if ${ac_cv_prog_ac_ct_AR+:} false; then : | 462 | if ${ac_cv_prog_ac_ct_AR+:} false; then : |
410 | @@ -6882,7 +7140,7 @@ do | 463 | @@ -6276,7 +6534,7 @@ do |
411 | test -z "$as_dir" && as_dir=. | 464 | test -z "$as_dir" && as_dir=. |
412 | for ac_exec_ext in '' $ac_executable_extensions; do | 465 | for ac_exec_ext in '' $ac_executable_extensions; do |
413 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | 466 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
@@ -416,7 +469,7 @@ index b3665c68c13..376b951d496 100755 | |||
416 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | 469 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
417 | break 2 | 470 | break 2 |
418 | fi | 471 | fi |
419 | @@ -6901,6 +7159,10 @@ else | 472 | @@ -6295,6 +6553,10 @@ else |
420 | $as_echo "no" >&6; } | 473 | $as_echo "no" >&6; } |
421 | fi | 474 | fi |
422 | 475 | ||
@@ -427,7 +480,7 @@ index b3665c68c13..376b951d496 100755 | |||
427 | if test "x$ac_ct_AR" = x; then | 480 | if test "x$ac_ct_AR" = x; then |
428 | AR="false" | 481 | AR="false" |
429 | else | 482 | else |
430 | @@ -6912,16 +7174,72 @@ ac_tool_warned=yes ;; | 483 | @@ -6306,25 +6568,20 @@ ac_tool_warned=yes ;; |
431 | esac | 484 | esac |
432 | AR=$ac_ct_AR | 485 | AR=$ac_ct_AR |
433 | fi | 486 | fi |
@@ -436,20 +489,37 @@ index b3665c68c13..376b951d496 100755 | |||
436 | fi | 489 | fi |
437 | 490 | ||
438 | -test -z "$AR" && AR=ar | 491 | -test -z "$AR" && AR=ar |
492 | -if test -n "$plugin_option"; then | ||
493 | - if $AR --help 2>&1 | grep -q "\--plugin"; then | ||
494 | - touch conftest.c | ||
495 | - $AR $plugin_option rc conftest.a conftest.c | ||
496 | - if test "$?" != 0; then | ||
497 | - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5 | ||
498 | + touch conftest.c | ||
499 | + $AR $plugin_option rc conftest.a conftest.c | ||
500 | + if test "$?" != 0; then | ||
501 | + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5 | ||
502 | $as_echo "$as_me: WARNING: Failed: $AR $plugin_option rc" >&2;} | ||
503 | - else | ||
504 | - AR="$AR $plugin_option" | ||
505 | - fi | ||
506 | - rm -f conftest.* | ||
507 | + else | ||
508 | + AR="$AR $plugin_option" | ||
509 | fi | ||
510 | -fi | ||
439 | -test -z "$AR_FLAGS" && AR_FLAGS=cru | 511 | -test -z "$AR_FLAGS" && AR_FLAGS=cru |
512 | + rm -f conftest.* | ||
440 | +: ${AR=ar} | 513 | +: ${AR=ar} |
441 | +: ${AR_FLAGS=cru} | 514 | +: ${AR_FLAGS=cru} |
442 | + | 515 | + |
443 | + | 516 | |
444 | + | 517 | |
445 | + | 518 | |
446 | + | 519 | @@ -6335,6 +6592,63 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru |
447 | + | 520 | |
448 | + | 521 | |
449 | + | 522 | |
450 | + | ||
451 | + | ||
452 | + | ||
453 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 | 523 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 |
454 | +$as_echo_n "checking for archiver @FILE support... " >&6; } | 524 | +$as_echo_n "checking for archiver @FILE support... " >&6; } |
455 | +if ${lt_cv_ar_at_file+:} false; then : | 525 | +if ${lt_cv_ar_at_file+:} false; then : |
@@ -462,7 +532,7 @@ index b3665c68c13..376b951d496 100755 | |||
462 | +int | 532 | +int |
463 | +main () | 533 | +main () |
464 | +{ | 534 | +{ |
465 | 535 | + | |
466 | + ; | 536 | + ; |
467 | + return 0; | 537 | + return 0; |
468 | +} | 538 | +} |
@@ -488,23 +558,29 @@ index b3665c68c13..376b951d496 100755 | |||
488 | + fi | 558 | + fi |
489 | + fi | 559 | + fi |
490 | + rm -f conftest.* libconftest.a | 560 | + rm -f conftest.* libconftest.a |
491 | 561 | + | |
492 | +fi | 562 | +fi |
493 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | 563 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext |
494 | 564 | + | |
495 | +fi | 565 | +fi |
496 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 | 566 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 |
497 | +$as_echo "$lt_cv_ar_at_file" >&6; } | 567 | +$as_echo "$lt_cv_ar_at_file" >&6; } |
498 | 568 | + | |
499 | +if test "x$lt_cv_ar_at_file" = xno; then | 569 | +if test "x$lt_cv_ar_at_file" = xno; then |
500 | + archiver_list_spec= | 570 | + archiver_list_spec= |
501 | +else | 571 | +else |
502 | + archiver_list_spec=$lt_cv_ar_at_file | 572 | + archiver_list_spec=$lt_cv_ar_at_file |
503 | +fi | 573 | +fi |
574 | + | ||
575 | + | ||
576 | + | ||
577 | + | ||
578 | + | ||
579 | + | ||
504 | 580 | ||
505 | 581 | if test -n "$ac_tool_prefix"; then | |
506 | 582 | # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. | |
507 | @@ -7263,8 +7581,8 @@ esac | 583 | @@ -6675,8 +6989,8 @@ esac |
508 | lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" | 584 | lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" |
509 | 585 | ||
510 | # Transform an extracted symbol line into symbol name and symbol address | 586 | # Transform an extracted symbol line into symbol name and symbol address |
@@ -515,7 +591,7 @@ index b3665c68c13..376b951d496 100755 | |||
515 | 591 | ||
516 | # Handle CRLF in mingw tool chain | 592 | # Handle CRLF in mingw tool chain |
517 | opt_cr= | 593 | opt_cr= |
518 | @@ -7300,6 +7618,7 @@ for ac_symprfx in "" "_"; do | 594 | @@ -6712,6 +7026,7 @@ for ac_symprfx in "" "_"; do |
519 | else | 595 | else |
520 | lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" | 596 | lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" |
521 | fi | 597 | fi |
@@ -523,7 +599,7 @@ index b3665c68c13..376b951d496 100755 | |||
523 | 599 | ||
524 | # Check to see that the pipe works correctly. | 600 | # Check to see that the pipe works correctly. |
525 | pipe_works=no | 601 | pipe_works=no |
526 | @@ -7341,6 +7660,18 @@ _LT_EOF | 602 | @@ -6753,6 +7068,18 @@ _LT_EOF |
527 | if $GREP ' nm_test_var$' "$nlist" >/dev/null; then | 603 | if $GREP ' nm_test_var$' "$nlist" >/dev/null; then |
528 | if $GREP ' nm_test_func$' "$nlist" >/dev/null; then | 604 | if $GREP ' nm_test_func$' "$nlist" >/dev/null; then |
529 | cat <<_LT_EOF > conftest.$ac_ext | 605 | cat <<_LT_EOF > conftest.$ac_ext |
@@ -542,7 +618,7 @@ index b3665c68c13..376b951d496 100755 | |||
542 | #ifdef __cplusplus | 618 | #ifdef __cplusplus |
543 | extern "C" { | 619 | extern "C" { |
544 | #endif | 620 | #endif |
545 | @@ -7352,7 +7683,7 @@ _LT_EOF | 621 | @@ -6764,7 +7091,7 @@ _LT_EOF |
546 | cat <<_LT_EOF >> conftest.$ac_ext | 622 | cat <<_LT_EOF >> conftest.$ac_ext |
547 | 623 | ||
548 | /* The mapping between symbol names and symbols. */ | 624 | /* The mapping between symbol names and symbols. */ |
@@ -551,7 +627,7 @@ index b3665c68c13..376b951d496 100755 | |||
551 | const char *name; | 627 | const char *name; |
552 | void *address; | 628 | void *address; |
553 | } | 629 | } |
554 | @@ -7378,8 +7709,8 @@ static const void *lt_preloaded_setup() { | 630 | @@ -6790,8 +7117,8 @@ static const void *lt_preloaded_setup() { |
555 | _LT_EOF | 631 | _LT_EOF |
556 | # Now try linking the two files. | 632 | # Now try linking the two files. |
557 | mv conftest.$ac_objext conftstm.$ac_objext | 633 | mv conftest.$ac_objext conftstm.$ac_objext |
@@ -562,7 +638,7 @@ index b3665c68c13..376b951d496 100755 | |||
562 | LIBS="conftstm.$ac_objext" | 638 | LIBS="conftstm.$ac_objext" |
563 | CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" | 639 | CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" |
564 | if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 | 640 | if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 |
565 | @@ -7389,8 +7720,8 @@ _LT_EOF | 641 | @@ -6801,8 +7128,8 @@ _LT_EOF |
566 | test $ac_status = 0; } && test -s conftest${ac_exeext}; then | 642 | test $ac_status = 0; } && test -s conftest${ac_exeext}; then |
567 | pipe_works=yes | 643 | pipe_works=yes |
568 | fi | 644 | fi |
@@ -573,7 +649,7 @@ index b3665c68c13..376b951d496 100755 | |||
573 | else | 649 | else |
574 | echo "cannot find nm_test_func in $nlist" >&5 | 650 | echo "cannot find nm_test_func in $nlist" >&5 |
575 | fi | 651 | fi |
576 | @@ -7427,6 +7758,16 @@ else | 652 | @@ -6839,6 +7166,14 @@ else |
577 | $as_echo "ok" >&6; } | 653 | $as_echo "ok" >&6; } |
578 | fi | 654 | fi |
579 | 655 | ||
@@ -585,12 +661,10 @@ index b3665c68c13..376b951d496 100755 | |||
585 | +fi | 661 | +fi |
586 | + | 662 | + |
587 | + | 663 | + |
588 | + | ||
589 | + | ||
590 | 664 | ||
591 | 665 | ||
592 | 666 | ||
593 | @@ -7443,6 +7784,45 @@ fi | 667 | @@ -6857,6 +7192,47 @@ fi |
594 | 668 | ||
595 | 669 | ||
596 | 670 | ||
@@ -633,10 +707,12 @@ index b3665c68c13..376b951d496 100755 | |||
633 | + | 707 | + |
634 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 | 708 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 |
635 | +$as_echo "${lt_sysroot:-no}" >&6; } | 709 | +$as_echo "${lt_sysroot:-no}" >&6; } |
710 | + | ||
711 | + | ||
636 | 712 | ||
637 | 713 | ||
638 | 714 | ||
639 | @@ -7654,6 +8034,123 @@ esac | 715 | @@ -7066,6 +7442,123 @@ esac |
640 | 716 | ||
641 | need_locks="$enable_libtool_lock" | 717 | need_locks="$enable_libtool_lock" |
642 | 718 | ||
@@ -760,7 +836,7 @@ index b3665c68c13..376b951d496 100755 | |||
760 | 836 | ||
761 | case $host_os in | 837 | case $host_os in |
762 | rhapsody* | darwin*) | 838 | rhapsody* | darwin*) |
763 | @@ -8217,6 +8714,8 @@ _LT_EOF | 839 | @@ -7629,6 +8122,8 @@ _LT_EOF |
764 | $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 | 840 | $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 |
765 | echo "$AR cru libconftest.a conftest.o" >&5 | 841 | echo "$AR cru libconftest.a conftest.o" >&5 |
766 | $AR cru libconftest.a conftest.o 2>&5 | 842 | $AR cru libconftest.a conftest.o 2>&5 |
@@ -769,26 +845,7 @@ index b3665c68c13..376b951d496 100755 | |||
769 | cat > conftest.c << _LT_EOF | 845 | cat > conftest.c << _LT_EOF |
770 | int main() { return 0;} | 846 | int main() { return 0;} |
771 | _LT_EOF | 847 | _LT_EOF |
772 | @@ -8381,7 +8880,8 @@ fi | 848 | @@ -8182,8 +8677,6 @@ fi |
773 | LIBTOOL_DEPS="$ltmain" | ||
774 | |||
775 | # Always use our own libtool. | ||
776 | -LIBTOOL='$(SHELL) $(top_builddir)/libtool' | ||
777 | +LIBTOOL='$(SHELL) $(top_builddir)' | ||
778 | +LIBTOOL="$LIBTOOL/${host_alias}-libtool" | ||
779 | |||
780 | |||
781 | |||
782 | @@ -8470,7 +8970,7 @@ aix3*) | ||
783 | esac | ||
784 | |||
785 | # Global variables: | ||
786 | -ofile=libtool | ||
787 | +ofile=${host_alias}-libtool | ||
788 | can_build_shared=yes | ||
789 | |||
790 | # All known linkers require a `.a' archive for static linking (except MSVC, | ||
791 | @@ -8768,8 +9268,6 @@ fi | ||
792 | lt_prog_compiler_pic= | 849 | lt_prog_compiler_pic= |
793 | lt_prog_compiler_static= | 850 | lt_prog_compiler_static= |
794 | 851 | ||
@@ -797,7 +854,7 @@ index b3665c68c13..376b951d496 100755 | |||
797 | 854 | ||
798 | if test "$GCC" = yes; then | 855 | if test "$GCC" = yes; then |
799 | lt_prog_compiler_wl='-Wl,' | 856 | lt_prog_compiler_wl='-Wl,' |
800 | @@ -8935,6 +9433,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } | 857 | @@ -8349,6 +8842,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } |
801 | lt_prog_compiler_pic='--shared' | 858 | lt_prog_compiler_pic='--shared' |
802 | lt_prog_compiler_static='--static' | 859 | lt_prog_compiler_static='--static' |
803 | ;; | 860 | ;; |
@@ -810,7 +867,7 @@ index b3665c68c13..376b951d496 100755 | |||
810 | pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) | 867 | pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) |
811 | # Portland Group compilers (*not* the Pentium gcc compiler, | 868 | # Portland Group compilers (*not* the Pentium gcc compiler, |
812 | # which looks to be a dead project) | 869 | # which looks to be a dead project) |
813 | @@ -8997,7 +9501,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } | 870 | @@ -8411,7 +8910,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } |
814 | lt_prog_compiler_pic='-KPIC' | 871 | lt_prog_compiler_pic='-KPIC' |
815 | lt_prog_compiler_static='-Bstatic' | 872 | lt_prog_compiler_static='-Bstatic' |
816 | case $cc_basename in | 873 | case $cc_basename in |
@@ -819,7 +876,7 @@ index b3665c68c13..376b951d496 100755 | |||
819 | lt_prog_compiler_wl='-Qoption ld ';; | 876 | lt_prog_compiler_wl='-Qoption ld ';; |
820 | *) | 877 | *) |
821 | lt_prog_compiler_wl='-Wl,';; | 878 | lt_prog_compiler_wl='-Wl,';; |
822 | @@ -9054,13 +9558,17 @@ case $host_os in | 879 | @@ -8468,13 +8967,17 @@ case $host_os in |
823 | lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" | 880 | lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" |
824 | ;; | 881 | ;; |
825 | esac | 882 | esac |
@@ -843,7 +900,7 @@ index b3665c68c13..376b951d496 100755 | |||
843 | 900 | ||
844 | # | 901 | # |
845 | # Check to make sure the PIC flag actually works. | 902 | # Check to make sure the PIC flag actually works. |
846 | @@ -9121,6 +9629,11 @@ fi | 903 | @@ -8535,6 +9038,11 @@ fi |
847 | 904 | ||
848 | 905 | ||
849 | 906 | ||
@@ -855,7 +912,7 @@ index b3665c68c13..376b951d496 100755 | |||
855 | # | 912 | # |
856 | # Check to make sure the static flag actually works. | 913 | # Check to make sure the static flag actually works. |
857 | # | 914 | # |
858 | @@ -9471,7 +9984,8 @@ _LT_EOF | 915 | @@ -8885,7 +9393,8 @@ _LT_EOF |
859 | allow_undefined_flag=unsupported | 916 | allow_undefined_flag=unsupported |
860 | always_export_symbols=no | 917 | always_export_symbols=no |
861 | enable_shared_with_static_runtimes=yes | 918 | enable_shared_with_static_runtimes=yes |
@@ -865,7 +922,7 @@ index b3665c68c13..376b951d496 100755 | |||
865 | 922 | ||
866 | if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then | 923 | if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then |
867 | archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' | 924 | archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' |
868 | @@ -9570,12 +10084,12 @@ _LT_EOF | 925 | @@ -8984,12 +9493,12 @@ _LT_EOF |
869 | whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' | 926 | whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' |
870 | hardcode_libdir_flag_spec= | 927 | hardcode_libdir_flag_spec= |
871 | hardcode_libdir_flag_spec_ld='-rpath $libdir' | 928 | hardcode_libdir_flag_spec_ld='-rpath $libdir' |
@@ -880,7 +937,7 @@ index b3665c68c13..376b951d496 100755 | |||
880 | fi | 937 | fi |
881 | ;; | 938 | ;; |
882 | esac | 939 | esac |
883 | @@ -9589,8 +10103,8 @@ _LT_EOF | 940 | @@ -9003,8 +9512,8 @@ _LT_EOF |
884 | archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' | 941 | archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' |
885 | wlarc= | 942 | wlarc= |
886 | else | 943 | else |
@@ -891,7 +948,7 @@ index b3665c68c13..376b951d496 100755 | |||
891 | fi | 948 | fi |
892 | ;; | 949 | ;; |
893 | 950 | ||
894 | @@ -9608,8 +10122,8 @@ _LT_EOF | 951 | @@ -9022,8 +9531,8 @@ _LT_EOF |
895 | 952 | ||
896 | _LT_EOF | 953 | _LT_EOF |
897 | elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then | 954 | elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then |
@@ -902,7 +959,7 @@ index b3665c68c13..376b951d496 100755 | |||
902 | else | 959 | else |
903 | ld_shlibs=no | 960 | ld_shlibs=no |
904 | fi | 961 | fi |
905 | @@ -9655,8 +10169,8 @@ _LT_EOF | 962 | @@ -9069,8 +9578,8 @@ _LT_EOF |
906 | 963 | ||
907 | *) | 964 | *) |
908 | if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then | 965 | if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then |
@@ -913,7 +970,7 @@ index b3665c68c13..376b951d496 100755 | |||
913 | else | 970 | else |
914 | ld_shlibs=no | 971 | ld_shlibs=no |
915 | fi | 972 | fi |
916 | @@ -9786,7 +10300,13 @@ _LT_EOF | 973 | @@ -9200,7 +9709,13 @@ _LT_EOF |
917 | allow_undefined_flag='-berok' | 974 | allow_undefined_flag='-berok' |
918 | # Determine the default libpath from the value encoded in an | 975 | # Determine the default libpath from the value encoded in an |
919 | # empty executable. | 976 | # empty executable. |
@@ -928,7 +985,7 @@ index b3665c68c13..376b951d496 100755 | |||
928 | /* end confdefs.h. */ | 985 | /* end confdefs.h. */ |
929 | 986 | ||
930 | int | 987 | int |
931 | @@ -9799,22 +10319,29 @@ main () | 988 | @@ -9213,22 +9728,29 @@ main () |
932 | _ACEOF | 989 | _ACEOF |
933 | if ac_fn_c_try_link "$LINENO"; then : | 990 | if ac_fn_c_try_link "$LINENO"; then : |
934 | 991 | ||
@@ -971,7 +1028,7 @@ index b3665c68c13..376b951d496 100755 | |||
971 | 1028 | ||
972 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" | 1029 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" |
973 | archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" | 1030 | archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" |
974 | @@ -9826,7 +10353,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | 1031 | @@ -9240,7 +9762,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
975 | else | 1032 | else |
976 | # Determine the default libpath from the value encoded in an | 1033 | # Determine the default libpath from the value encoded in an |
977 | # empty executable. | 1034 | # empty executable. |
@@ -986,7 +1043,7 @@ index b3665c68c13..376b951d496 100755 | |||
986 | /* end confdefs.h. */ | 1043 | /* end confdefs.h. */ |
987 | 1044 | ||
988 | int | 1045 | int |
989 | @@ -9839,22 +10372,29 @@ main () | 1046 | @@ -9253,22 +9781,29 @@ main () |
990 | _ACEOF | 1047 | _ACEOF |
991 | if ac_fn_c_try_link "$LINENO"; then : | 1048 | if ac_fn_c_try_link "$LINENO"; then : |
992 | 1049 | ||
@@ -1029,7 +1086,7 @@ index b3665c68c13..376b951d496 100755 | |||
1029 | 1086 | ||
1030 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" | 1087 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" |
1031 | # Warning - without using the other run time loading flags, | 1088 | # Warning - without using the other run time loading flags, |
1032 | @@ -9899,20 +10439,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | 1089 | @@ -9313,20 +9848,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
1033 | # Microsoft Visual C++. | 1090 | # Microsoft Visual C++. |
1034 | # hardcode_libdir_flag_spec is actually meaningless, as there is | 1091 | # hardcode_libdir_flag_spec is actually meaningless, as there is |
1035 | # no search path for DLLs. | 1092 | # no search path for DLLs. |
@@ -1107,7 +1164,7 @@ index b3665c68c13..376b951d496 100755 | |||
1107 | ;; | 1164 | ;; |
1108 | 1165 | ||
1109 | darwin* | rhapsody*) | 1166 | darwin* | rhapsody*) |
1110 | @@ -9973,7 +10556,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | 1167 | @@ -9387,7 +9965,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
1111 | 1168 | ||
1112 | # FreeBSD 3 and greater uses gcc -shared to do shared libraries. | 1169 | # FreeBSD 3 and greater uses gcc -shared to do shared libraries. |
1113 | freebsd* | dragonfly*) | 1170 | freebsd* | dragonfly*) |
@@ -1116,7 +1173,7 @@ index b3665c68c13..376b951d496 100755 | |||
1116 | hardcode_libdir_flag_spec='-R$libdir' | 1173 | hardcode_libdir_flag_spec='-R$libdir' |
1117 | hardcode_direct=yes | 1174 | hardcode_direct=yes |
1118 | hardcode_shlibpath_var=no | 1175 | hardcode_shlibpath_var=no |
1119 | @@ -9981,7 +10564,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | 1176 | @@ -9395,7 +9973,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
1120 | 1177 | ||
1121 | hpux9*) | 1178 | hpux9*) |
1122 | if test "$GCC" = yes; then | 1179 | if test "$GCC" = yes; then |
@@ -1125,7 +1182,7 @@ index b3665c68c13..376b951d496 100755 | |||
1125 | else | 1182 | else |
1126 | archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' | 1183 | archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' |
1127 | fi | 1184 | fi |
1128 | @@ -9997,7 +10580,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | 1185 | @@ -9411,7 +9989,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
1129 | 1186 | ||
1130 | hpux10*) | 1187 | hpux10*) |
1131 | if test "$GCC" = yes && test "$with_gnu_ld" = no; then | 1188 | if test "$GCC" = yes && test "$with_gnu_ld" = no; then |
@@ -1134,8 +1191,8 @@ index b3665c68c13..376b951d496 100755 | |||
1134 | else | 1191 | else |
1135 | archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' | 1192 | archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' |
1136 | fi | 1193 | fi |
1137 | @@ -10021,10 +10604,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | 1194 | @@ -9435,10 +10013,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
1138 | archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' | 1195 | archive_cmds='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' |
1139 | ;; | 1196 | ;; |
1140 | ia64*) | 1197 | ia64*) |
1141 | - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' | 1198 | - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' |
@@ -1147,7 +1204,7 @@ index b3665c68c13..376b951d496 100755 | |||
1147 | ;; | 1204 | ;; |
1148 | esac | 1205 | esac |
1149 | else | 1206 | else |
1150 | @@ -10103,23 +10686,36 @@ fi | 1207 | @@ -9517,23 +10095,36 @@ fi |
1151 | 1208 | ||
1152 | irix5* | irix6* | nonstopux*) | 1209 | irix5* | irix6* | nonstopux*) |
1153 | if test "$GCC" = yes; then | 1210 | if test "$GCC" = yes; then |
@@ -1192,7 +1249,7 @@ index b3665c68c13..376b951d496 100755 | |||
1192 | else | 1249 | else |
1193 | archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' | 1250 | archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' |
1194 | archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' | 1251 | archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' |
1195 | @@ -10204,7 +10800,7 @@ rm -f core conftest.err conftest.$ac_objext \ | 1252 | @@ -9618,7 +10209,7 @@ rm -f core conftest.err conftest.$ac_objext \ |
1196 | osf4* | osf5*) # as osf3* with the addition of -msym flag | 1253 | osf4* | osf5*) # as osf3* with the addition of -msym flag |
1197 | if test "$GCC" = yes; then | 1254 | if test "$GCC" = yes; then |
1198 | allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' | 1255 | allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' |
@@ -1201,7 +1258,7 @@ index b3665c68c13..376b951d496 100755 | |||
1201 | hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' | 1258 | hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' |
1202 | else | 1259 | else |
1203 | allow_undefined_flag=' -expect_unresolved \*' | 1260 | allow_undefined_flag=' -expect_unresolved \*' |
1204 | @@ -10223,9 +10819,9 @@ rm -f core conftest.err conftest.$ac_objext \ | 1261 | @@ -9637,9 +10228,9 @@ rm -f core conftest.err conftest.$ac_objext \ |
1205 | no_undefined_flag=' -z defs' | 1262 | no_undefined_flag=' -z defs' |
1206 | if test "$GCC" = yes; then | 1263 | if test "$GCC" = yes; then |
1207 | wlarc='${wl}' | 1264 | wlarc='${wl}' |
@@ -1213,7 +1270,7 @@ index b3665c68c13..376b951d496 100755 | |||
1213 | else | 1270 | else |
1214 | case `$CC -V 2>&1` in | 1271 | case `$CC -V 2>&1` in |
1215 | *"Compilers 5.0"*) | 1272 | *"Compilers 5.0"*) |
1216 | @@ -10801,8 +11397,9 @@ cygwin* | mingw* | pw32* | cegcc*) | 1273 | @@ -10215,8 +10806,9 @@ cygwin* | mingw* | pw32* | cegcc*) |
1217 | need_version=no | 1274 | need_version=no |
1218 | need_lib_prefix=no | 1275 | need_lib_prefix=no |
1219 | 1276 | ||
@@ -1225,7 +1282,7 @@ index b3665c68c13..376b951d496 100755 | |||
1225 | library_names_spec='$libname.dll.a' | 1282 | library_names_spec='$libname.dll.a' |
1226 | # DLL is installed to $(libdir)/../bin by postinstall_cmds | 1283 | # DLL is installed to $(libdir)/../bin by postinstall_cmds |
1227 | postinstall_cmds='base_file=`basename \${file}`~ | 1284 | postinstall_cmds='base_file=`basename \${file}`~ |
1228 | @@ -10835,13 +11432,71 @@ cygwin* | mingw* | pw32* | cegcc*) | 1285 | @@ -10249,13 +10841,71 @@ cygwin* | mingw* | pw32* | cegcc*) |
1229 | library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' | 1286 | library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' |
1230 | ;; | 1287 | ;; |
1231 | esac | 1288 | esac |
@@ -1298,25 +1355,16 @@ index b3665c68c13..376b951d496 100755 | |||
1298 | # FIXME: first we should search . and the directory the executable is in | 1355 | # FIXME: first we should search . and the directory the executable is in |
1299 | shlibpath_var=PATH | 1356 | shlibpath_var=PATH |
1300 | ;; | 1357 | ;; |
1301 | @@ -10923,7 +11578,7 @@ haiku*) | 1358 | @@ -11157,7 +11807,7 @@ else |
1302 | soname_spec='${libname}${release}${shared_ext}$major' | ||
1303 | shlibpath_var=LIBRARY_PATH | ||
1304 | shlibpath_overrides_runpath=yes | ||
1305 | - sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib' | ||
1306 | + sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' | ||
1307 | hardcode_into_libs=yes | ||
1308 | ;; | ||
1309 | |||
1310 | @@ -11719,7 +12374,7 @@ else | ||
1311 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 | 1359 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 |
1312 | lt_status=$lt_dlunknown | 1360 | lt_status=$lt_dlunknown |
1313 | cat > conftest.$ac_ext <<_LT_EOF | 1361 | cat > conftest.$ac_ext <<_LT_EOF |
1314 | -#line 11722 "configure" | 1362 | -#line 11160 "configure" |
1315 | +#line $LINENO "configure" | 1363 | +#line $LINENO "configure" |
1316 | #include "confdefs.h" | 1364 | #include "confdefs.h" |
1317 | 1365 | ||
1318 | #if HAVE_DLFCN_H | 1366 | #if HAVE_DLFCN_H |
1319 | @@ -11763,10 +12418,10 @@ else | 1367 | @@ -11201,10 +11851,10 @@ else |
1320 | /* When -fvisbility=hidden is used, assume the code has been annotated | 1368 | /* When -fvisbility=hidden is used, assume the code has been annotated |
1321 | correspondingly for the symbols needed. */ | 1369 | correspondingly for the symbols needed. */ |
1322 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) | 1370 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) |
@@ -1329,16 +1377,16 @@ index b3665c68c13..376b951d496 100755 | |||
1329 | int main () | 1377 | int main () |
1330 | { | 1378 | { |
1331 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); | 1379 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); |
1332 | @@ -11825,7 +12480,7 @@ else | 1380 | @@ -11263,7 +11913,7 @@ else |
1333 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 | 1381 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 |
1334 | lt_status=$lt_dlunknown | 1382 | lt_status=$lt_dlunknown |
1335 | cat > conftest.$ac_ext <<_LT_EOF | 1383 | cat > conftest.$ac_ext <<_LT_EOF |
1336 | -#line 11828 "configure" | 1384 | -#line 11266 "configure" |
1337 | +#line $LINENO "configure" | 1385 | +#line $LINENO "configure" |
1338 | #include "confdefs.h" | 1386 | #include "confdefs.h" |
1339 | 1387 | ||
1340 | #if HAVE_DLFCN_H | 1388 | #if HAVE_DLFCN_H |
1341 | @@ -11869,10 +12524,10 @@ else | 1389 | @@ -11307,10 +11957,10 @@ else |
1342 | /* When -fvisbility=hidden is used, assume the code has been annotated | 1390 | /* When -fvisbility=hidden is used, assume the code has been annotated |
1343 | correspondingly for the symbols needed. */ | 1391 | correspondingly for the symbols needed. */ |
1344 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) | 1392 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) |
@@ -1351,16 +1399,16 @@ index b3665c68c13..376b951d496 100755 | |||
1351 | int main () | 1399 | int main () |
1352 | { | 1400 | { |
1353 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); | 1401 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); |
1354 | @@ -14599,7 +15254,7 @@ SHARED_LDFLAGS= | 1402 | @@ -15691,7 +16341,7 @@ SHARED_LDFLAGS= |
1355 | if test "$enable_shared" = "yes"; then | 1403 | if test "$enable_shared" = "yes"; then |
1356 | x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'` | 1404 | x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'` |
1357 | if test -n "$x"; then | 1405 | if test -n "$x"; then |
1358 | - SHARED_LIBADD="-L`pwd`/../libiberty/pic -liberty" | 1406 | - SHARED_LIBADD="-L`pwd`/../libiberty/pic -liberty" |
1359 | + SHARED_LIBADD="`pwd`/../libiberty/pic/libiberty.a" | 1407 | + SHARED_LIBADD="`pwd`/../libiberty/pic/libiberty.a" |
1360 | fi | 1408 | fi |
1409 | fi | ||
1361 | 1410 | ||
1362 | case "${host}" in | 1411 | @@ -18313,13 +18963,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' |
1363 | @@ -17199,13 +17854,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' | ||
1364 | lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' | 1412 | lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' |
1365 | lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' | 1413 | lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' |
1366 | lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' | 1414 | lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' |
@@ -1381,7 +1429,7 @@ index b3665c68c13..376b951d496 100755 | |||
1381 | STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' | 1429 | STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' |
1382 | RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' | 1430 | RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' |
1383 | old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' | 1431 | old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' |
1384 | @@ -17220,14 +17882,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de | 1432 | @@ -18334,14 +18991,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de |
1385 | lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' | 1433 | lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' |
1386 | lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' | 1434 | lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' |
1387 | lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`' | 1435 | lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`' |
@@ -1400,7 +1448,7 @@ index b3665c68c13..376b951d496 100755 | |||
1400 | DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' | 1448 | DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' |
1401 | NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' | 1449 | NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' |
1402 | LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' | 1450 | LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' |
1403 | @@ -17260,12 +17925,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q | 1451 | @@ -18374,12 +19034,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q |
1404 | hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' | 1452 | hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' |
1405 | inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' | 1453 | inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' |
1406 | link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' | 1454 | link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' |
@@ -1414,7 +1462,7 @@ index b3665c68c13..376b951d496 100755 | |||
1414 | file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' | 1462 | file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' |
1415 | variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' | 1463 | variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' |
1416 | need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' | 1464 | need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' |
1417 | @@ -17320,8 +17985,13 @@ reload_flag \ | 1465 | @@ -18434,8 +19094,13 @@ reload_flag \ |
1418 | OBJDUMP \ | 1466 | OBJDUMP \ |
1419 | deplibs_check_method \ | 1467 | deplibs_check_method \ |
1420 | file_magic_cmd \ | 1468 | file_magic_cmd \ |
@@ -1428,7 +1476,7 @@ index b3665c68c13..376b951d496 100755 | |||
1428 | STRIP \ | 1476 | STRIP \ |
1429 | RANLIB \ | 1477 | RANLIB \ |
1430 | CC \ | 1478 | CC \ |
1431 | @@ -17331,12 +18001,14 @@ lt_cv_sys_global_symbol_pipe \ | 1479 | @@ -18445,12 +19110,14 @@ lt_cv_sys_global_symbol_pipe \ |
1432 | lt_cv_sys_global_symbol_to_cdecl \ | 1480 | lt_cv_sys_global_symbol_to_cdecl \ |
1433 | lt_cv_sys_global_symbol_to_c_name_address \ | 1481 | lt_cv_sys_global_symbol_to_c_name_address \ |
1434 | lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ | 1482 | lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ |
@@ -1444,7 +1492,7 @@ index b3665c68c13..376b951d496 100755 | |||
1444 | DSYMUTIL \ | 1492 | DSYMUTIL \ |
1445 | NMEDIT \ | 1493 | NMEDIT \ |
1446 | LIPO \ | 1494 | LIPO \ |
1447 | @@ -17352,7 +18024,6 @@ no_undefined_flag \ | 1495 | @@ -18466,7 +19133,6 @@ no_undefined_flag \ |
1448 | hardcode_libdir_flag_spec \ | 1496 | hardcode_libdir_flag_spec \ |
1449 | hardcode_libdir_flag_spec_ld \ | 1497 | hardcode_libdir_flag_spec_ld \ |
1450 | hardcode_libdir_separator \ | 1498 | hardcode_libdir_separator \ |
@@ -1452,7 +1500,7 @@ index b3665c68c13..376b951d496 100755 | |||
1452 | exclude_expsyms \ | 1500 | exclude_expsyms \ |
1453 | include_expsyms \ | 1501 | include_expsyms \ |
1454 | file_list_spec \ | 1502 | file_list_spec \ |
1455 | @@ -17388,6 +18059,7 @@ module_cmds \ | 1503 | @@ -18502,6 +19168,7 @@ module_cmds \ |
1456 | module_expsym_cmds \ | 1504 | module_expsym_cmds \ |
1457 | export_symbols_cmds \ | 1505 | export_symbols_cmds \ |
1458 | prelink_cmds \ | 1506 | prelink_cmds \ |
@@ -1460,7 +1508,7 @@ index b3665c68c13..376b951d496 100755 | |||
1460 | postinstall_cmds \ | 1508 | postinstall_cmds \ |
1461 | postuninstall_cmds \ | 1509 | postuninstall_cmds \ |
1462 | finish_cmds \ | 1510 | finish_cmds \ |
1463 | @@ -18176,7 +18848,8 @@ $as_echo X"$file" | | 1511 | @@ -19278,7 +19945,8 @@ $as_echo X"$file" | |
1464 | # NOTE: Changes made to this file will be lost: look at ltmain.sh. | 1512 | # NOTE: Changes made to this file will be lost: look at ltmain.sh. |
1465 | # | 1513 | # |
1466 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, | 1514 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, |
@@ -1470,7 +1518,7 @@ index b3665c68c13..376b951d496 100755 | |||
1470 | # Written by Gordon Matzigkeit, 1996 | 1518 | # Written by Gordon Matzigkeit, 1996 |
1471 | # | 1519 | # |
1472 | # This file is part of GNU Libtool. | 1520 | # This file is part of GNU Libtool. |
1473 | @@ -18279,19 +18952,42 @@ SP2NL=$lt_lt_SP2NL | 1521 | @@ -19381,19 +20049,42 @@ SP2NL=$lt_lt_SP2NL |
1474 | # turn newlines into spaces. | 1522 | # turn newlines into spaces. |
1475 | NL2SP=$lt_lt_NL2SP | 1523 | NL2SP=$lt_lt_NL2SP |
1476 | 1524 | ||
@@ -1514,7 +1562,7 @@ index b3665c68c13..376b951d496 100755 | |||
1514 | # A symbol stripping program. | 1562 | # A symbol stripping program. |
1515 | STRIP=$lt_STRIP | 1563 | STRIP=$lt_STRIP |
1516 | 1564 | ||
1517 | @@ -18321,6 +19017,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address | 1565 | @@ -19423,6 +20114,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address |
1518 | # Transform the output of nm in a C name address pair when lib prefix is needed. | 1566 | # Transform the output of nm in a C name address pair when lib prefix is needed. |
1519 | global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix | 1567 | global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix |
1520 | 1568 | ||
@@ -1527,7 +1575,7 @@ index b3665c68c13..376b951d496 100755 | |||
1527 | # The name of the directory that contains temporary libtool files. | 1575 | # The name of the directory that contains temporary libtool files. |
1528 | objdir=$objdir | 1576 | objdir=$objdir |
1529 | 1577 | ||
1530 | @@ -18330,6 +19032,9 @@ MAGIC_CMD=$MAGIC_CMD | 1578 | @@ -19432,6 +20129,9 @@ MAGIC_CMD=$MAGIC_CMD |
1531 | # Must we lock files when doing compilation? | 1579 | # Must we lock files when doing compilation? |
1532 | need_locks=$lt_need_locks | 1580 | need_locks=$lt_need_locks |
1533 | 1581 | ||
@@ -1537,7 +1585,7 @@ index b3665c68c13..376b951d496 100755 | |||
1537 | # Tool to manipulate archived DWARF debug symbol files on Mac OS X. | 1585 | # Tool to manipulate archived DWARF debug symbol files on Mac OS X. |
1538 | DSYMUTIL=$lt_DSYMUTIL | 1586 | DSYMUTIL=$lt_DSYMUTIL |
1539 | 1587 | ||
1540 | @@ -18444,12 +19149,12 @@ with_gcc=$GCC | 1588 | @@ -19546,12 +20246,12 @@ with_gcc=$GCC |
1541 | # Compiler flag to turn off builtin functions. | 1589 | # Compiler flag to turn off builtin functions. |
1542 | no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag | 1590 | no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag |
1543 | 1591 | ||
@@ -1553,7 +1601,7 @@ index b3665c68c13..376b951d496 100755 | |||
1553 | # Compiler flag to prevent dynamic linking. | 1601 | # Compiler flag to prevent dynamic linking. |
1554 | link_static_flag=$lt_lt_prog_compiler_static | 1602 | link_static_flag=$lt_lt_prog_compiler_static |
1555 | 1603 | ||
1556 | @@ -18536,9 +19241,6 @@ inherit_rpath=$inherit_rpath | 1604 | @@ -19638,9 +20338,6 @@ inherit_rpath=$inherit_rpath |
1557 | # Whether libtool must link a program against all its dependency libraries. | 1605 | # Whether libtool must link a program against all its dependency libraries. |
1558 | link_all_deplibs=$link_all_deplibs | 1606 | link_all_deplibs=$link_all_deplibs |
1559 | 1607 | ||
@@ -1563,7 +1611,7 @@ index b3665c68c13..376b951d496 100755 | |||
1563 | # Set to "yes" if exported symbols are required. | 1611 | # Set to "yes" if exported symbols are required. |
1564 | always_export_symbols=$always_export_symbols | 1612 | always_export_symbols=$always_export_symbols |
1565 | 1613 | ||
1566 | @@ -18554,6 +19256,9 @@ include_expsyms=$lt_include_expsyms | 1614 | @@ -19656,6 +20353,9 @@ include_expsyms=$lt_include_expsyms |
1567 | # Commands necessary for linking programs (against libraries) with templates. | 1615 | # Commands necessary for linking programs (against libraries) with templates. |
1568 | prelink_cmds=$lt_prelink_cmds | 1616 | prelink_cmds=$lt_prelink_cmds |
1569 | 1617 | ||
@@ -1573,7 +1621,7 @@ index b3665c68c13..376b951d496 100755 | |||
1573 | # Specify filename containing input files. | 1621 | # Specify filename containing input files. |
1574 | file_list_spec=$lt_file_list_spec | 1622 | file_list_spec=$lt_file_list_spec |
1575 | 1623 | ||
1576 | @@ -18586,210 +19291,169 @@ ltmain="$ac_aux_dir/ltmain.sh" | 1624 | @@ -19688,210 +20388,169 @@ ltmain="$ac_aux_dir/ltmain.sh" |
1577 | # if finds mixed CR/LF and LF-only lines. Since sed operates in | 1625 | # if finds mixed CR/LF and LF-only lines. Since sed operates in |
1578 | # text mode, it properly converts lines to CR/LF. This bash problem | 1626 | # text mode, it properly converts lines to CR/LF. This bash problem |
1579 | # is reportedly fixed, but why not run on old versions too? | 1627 | # is reportedly fixed, but why not run on old versions too? |
@@ -1948,23 +1996,51 @@ index b3665c68c13..376b951d496 100755 | |||
1948 | chmod +x "$ofile" | 1996 | chmod +x "$ofile" |
1949 | 1997 | ||
1950 | diff --git a/bfd/configure.ac b/bfd/configure.ac | 1998 | diff --git a/bfd/configure.ac b/bfd/configure.ac |
1951 | index 0797a08ff37..133d714cf18 100644 | 1999 | index 7fcc5d4a947..f7191d3f30f 100644 |
1952 | --- a/bfd/configure.ac | 2000 | --- a/bfd/configure.ac |
1953 | +++ b/bfd/configure.ac | 2001 | +++ b/bfd/configure.ac |
1954 | @@ -315,7 +315,7 @@ changequote(,)dnl | 2002 | @@ -276,7 +276,7 @@ changequote(,)dnl |
1955 | x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'` | 2003 | x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'` |
1956 | changequote([,])dnl | 2004 | changequote([,])dnl |
1957 | if test -n "$x"; then | 2005 | if test -n "$x"; then |
1958 | - SHARED_LIBADD="-L`pwd`/../libiberty/pic -liberty" | 2006 | - SHARED_LIBADD="-L`pwd`/../libiberty/pic -liberty" |
1959 | + SHARED_LIBADD="`pwd`/../libiberty/pic/libiberty.a" | 2007 | + SHARED_LIBADD="`pwd`/../libiberty/pic/libiberty.a" |
1960 | fi | 2008 | fi |
2009 | fi | ||
1961 | 2010 | ||
1962 | case "${host}" in | 2011 | diff --git a/binutils/Makefile.in b/binutils/Makefile.in |
2012 | index 842a6d99b54..037cccde038 100644 | ||
2013 | --- a/binutils/Makefile.in | ||
2014 | +++ b/binutils/Makefile.in | ||
2015 | @@ -495,6 +495,7 @@ DEBUGINFOD_LIBS = @DEBUGINFOD_LIBS@ | ||
2016 | DEFS = @DEFS@ | ||
2017 | DEMANGLER_NAME = @DEMANGLER_NAME@ | ||
2018 | DEPDIR = @DEPDIR@ | ||
2019 | +DLLTOOL = @DLLTOOL@ | ||
2020 | DLLTOOL_DEFS = @DLLTOOL_DEFS@ | ||
2021 | DSYMUTIL = @DSYMUTIL@ | ||
2022 | DUMPBIN = @DUMPBIN@ | ||
2023 | @@ -539,6 +540,7 @@ LTLIBINTL = @LTLIBINTL@ | ||
2024 | LTLIBOBJS = @LTLIBOBJS@ | ||
2025 | MAINT = @MAINT@ | ||
2026 | MAKEINFO = @MAKEINFO@ | ||
2027 | +MANIFEST_TOOL = @MANIFEST_TOOL@ | ||
2028 | MKDIR_P = @MKDIR_P@ | ||
2029 | MKINSTALLDIRS = @MKINSTALLDIRS@ | ||
2030 | MSGFMT = @MSGFMT@ | ||
2031 | @@ -587,6 +589,7 @@ abs_builddir = @abs_builddir@ | ||
2032 | abs_srcdir = @abs_srcdir@ | ||
2033 | abs_top_builddir = @abs_top_builddir@ | ||
2034 | abs_top_srcdir = @abs_top_srcdir@ | ||
2035 | +ac_ct_AR = @ac_ct_AR@ | ||
2036 | ac_ct_CC = @ac_ct_CC@ | ||
2037 | ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ | ||
2038 | am__include = @am__include@ | ||
1963 | diff --git a/binutils/configure b/binutils/configure | 2039 | diff --git a/binutils/configure b/binutils/configure |
1964 | index 83b4b0172db..2154238189e 100755 | 2040 | index a1092735311..f3bdee98f3f 100755 |
1965 | --- a/binutils/configure | 2041 | --- a/binutils/configure |
1966 | +++ b/binutils/configure | 2042 | +++ b/binutils/configure |
1967 | @@ -697,8 +697,11 @@ OTOOL | 2043 | @@ -704,8 +704,11 @@ OTOOL |
1968 | LIPO | 2044 | LIPO |
1969 | NMEDIT | 2045 | NMEDIT |
1970 | DSYMUTIL | 2046 | DSYMUTIL |
@@ -1976,7 +2052,7 @@ index 83b4b0172db..2154238189e 100755 | |||
1976 | OBJDUMP | 2052 | OBJDUMP |
1977 | LN_S | 2053 | LN_S |
1978 | NM | 2054 | NM |
1979 | @@ -815,6 +818,7 @@ enable_static | 2055 | @@ -822,6 +825,7 @@ enable_static |
1980 | with_pic | 2056 | with_pic |
1981 | enable_fast_install | 2057 | enable_fast_install |
1982 | with_gnu_ld | 2058 | with_gnu_ld |
@@ -1984,7 +2060,7 @@ index 83b4b0172db..2154238189e 100755 | |||
1984 | enable_libtool_lock | 2060 | enable_libtool_lock |
1985 | enable_plugins | 2061 | enable_plugins |
1986 | enable_largefile | 2062 | enable_largefile |
1987 | @@ -1504,6 +1508,8 @@ Optional Packages: | 2063 | @@ -1529,6 +1533,8 @@ Optional Packages: |
1988 | --with-pic try to use only PIC/non-PIC objects [default=use | 2064 | --with-pic try to use only PIC/non-PIC objects [default=use |
1989 | both] | 2065 | both] |
1990 | --with-gnu-ld assume the C compiler uses GNU ld [default=no] | 2066 | --with-gnu-ld assume the C compiler uses GNU ld [default=no] |
@@ -1992,8 +2068,8 @@ index 83b4b0172db..2154238189e 100755 | |||
1992 | + (or the compiler's sysroot if not specified). | 2068 | + (or the compiler's sysroot if not specified). |
1993 | --with-debuginfod Enable debuginfo lookups with debuginfod | 2069 | --with-debuginfod Enable debuginfo lookups with debuginfod |
1994 | (auto/yes/no) | 2070 | (auto/yes/no) |
1995 | --with-system-zlib use installed libz | 2071 | --with-gnu-ld assume the C compiler uses GNU ld default=no |
1996 | @@ -5490,8 +5496,8 @@ esac | 2072 | @@ -4958,8 +4964,8 @@ esac |
1997 | 2073 | ||
1998 | 2074 | ||
1999 | 2075 | ||
@@ -2004,7 +2080,7 @@ index 83b4b0172db..2154238189e 100755 | |||
2004 | 2080 | ||
2005 | 2081 | ||
2006 | 2082 | ||
2007 | @@ -5531,7 +5537,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO | 2083 | @@ -4999,7 +5005,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO |
2008 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 | 2084 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 |
2009 | $as_echo_n "checking how to print strings... " >&6; } | 2085 | $as_echo_n "checking how to print strings... " >&6; } |
2010 | # Test print first, because it will be a builtin if present. | 2086 | # Test print first, because it will be a builtin if present. |
@@ -2013,7 +2089,7 @@ index 83b4b0172db..2154238189e 100755 | |||
2013 | test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then | 2089 | test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then |
2014 | ECHO='print -r --' | 2090 | ECHO='print -r --' |
2015 | elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then | 2091 | elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then |
2016 | @@ -6217,8 +6223,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; | 2092 | @@ -5692,8 +5698,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; |
2017 | # Try some XSI features | 2093 | # Try some XSI features |
2018 | xsi_shell=no | 2094 | xsi_shell=no |
2019 | ( _lt_dummy="a/b/c" | 2095 | ( _lt_dummy="a/b/c" |
@@ -2024,7 +2100,7 @@ index 83b4b0172db..2154238189e 100755 | |||
2024 | && eval 'test $(( 1 + 1 )) -eq 2 \ | 2100 | && eval 'test $(( 1 + 1 )) -eq 2 \ |
2025 | && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ | 2101 | && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ |
2026 | && xsi_shell=yes | 2102 | && xsi_shell=yes |
2027 | @@ -6267,6 +6273,80 @@ esac | 2103 | @@ -5742,6 +5748,80 @@ esac |
2028 | 2104 | ||
2029 | 2105 | ||
2030 | 2106 | ||
@@ -2105,7 +2181,7 @@ index 83b4b0172db..2154238189e 100755 | |||
2105 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 | 2181 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 |
2106 | $as_echo_n "checking for $LD option to reload object files... " >&6; } | 2182 | $as_echo_n "checking for $LD option to reload object files... " >&6; } |
2107 | if ${lt_cv_ld_reload_flag+:} false; then : | 2183 | if ${lt_cv_ld_reload_flag+:} false; then : |
2108 | @@ -6283,6 +6363,11 @@ case $reload_flag in | 2184 | @@ -5758,6 +5838,11 @@ case $reload_flag in |
2109 | esac | 2185 | esac |
2110 | reload_cmds='$LD$reload_flag -o $output$reload_objs' | 2186 | reload_cmds='$LD$reload_flag -o $output$reload_objs' |
2111 | case $host_os in | 2187 | case $host_os in |
@@ -2117,7 +2193,7 @@ index 83b4b0172db..2154238189e 100755 | |||
2117 | darwin*) | 2193 | darwin*) |
2118 | if test "$GCC" = yes; then | 2194 | if test "$GCC" = yes; then |
2119 | reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' | 2195 | reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' |
2120 | @@ -6451,7 +6536,8 @@ mingw* | pw32*) | 2196 | @@ -5926,7 +6011,8 @@ mingw* | pw32*) |
2121 | lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' | 2197 | lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' |
2122 | lt_cv_file_magic_cmd='func_win32_libid' | 2198 | lt_cv_file_magic_cmd='func_win32_libid' |
2123 | else | 2199 | else |
@@ -2127,7 +2203,7 @@ index 83b4b0172db..2154238189e 100755 | |||
2127 | lt_cv_file_magic_cmd='$OBJDUMP -f' | 2203 | lt_cv_file_magic_cmd='$OBJDUMP -f' |
2128 | fi | 2204 | fi |
2129 | ;; | 2205 | ;; |
2130 | @@ -6605,6 +6691,21 @@ esac | 2206 | @@ -6085,6 +6171,21 @@ esac |
2131 | fi | 2207 | fi |
2132 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 | 2208 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 |
2133 | $as_echo "$lt_cv_deplibs_check_method" >&6; } | 2209 | $as_echo "$lt_cv_deplibs_check_method" >&6; } |
@@ -2149,7 +2225,7 @@ index 83b4b0172db..2154238189e 100755 | |||
2149 | file_magic_cmd=$lt_cv_file_magic_cmd | 2225 | file_magic_cmd=$lt_cv_file_magic_cmd |
2150 | deplibs_check_method=$lt_cv_deplibs_check_method | 2226 | deplibs_check_method=$lt_cv_deplibs_check_method |
2151 | test -z "$deplibs_check_method" && deplibs_check_method=unknown | 2227 | test -z "$deplibs_check_method" && deplibs_check_method=unknown |
2152 | @@ -6620,9 +6721,162 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown | 2228 | @@ -6100,6 +6201,157 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown |
2153 | 2229 | ||
2154 | 2230 | ||
2155 | 2231 | ||
@@ -2304,6 +2380,12 @@ index 83b4b0172db..2154238189e 100755 | |||
2304 | + | 2380 | + |
2305 | + | 2381 | + |
2306 | + | 2382 | + |
2383 | plugin_option= | ||
2384 | plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll" | ||
2385 | for plugin in $plugin_names; do | ||
2386 | @@ -6114,8 +6366,10 @@ for plugin in $plugin_names; do | ||
2387 | done | ||
2388 | |||
2307 | if test -n "$ac_tool_prefix"; then | 2389 | if test -n "$ac_tool_prefix"; then |
2308 | - # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. | 2390 | - # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. |
2309 | -set dummy ${ac_tool_prefix}ar; ac_word=$2 | 2391 | -set dummy ${ac_tool_prefix}ar; ac_word=$2 |
@@ -2314,7 +2396,7 @@ index 83b4b0172db..2154238189e 100755 | |||
2314 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | 2396 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
2315 | $as_echo_n "checking for $ac_word... " >&6; } | 2397 | $as_echo_n "checking for $ac_word... " >&6; } |
2316 | if ${ac_cv_prog_AR+:} false; then : | 2398 | if ${ac_cv_prog_AR+:} false; then : |
2317 | @@ -6638,7 +6892,7 @@ do | 2399 | @@ -6131,7 +6385,7 @@ do |
2318 | test -z "$as_dir" && as_dir=. | 2400 | test -z "$as_dir" && as_dir=. |
2319 | for ac_exec_ext in '' $ac_executable_extensions; do | 2401 | for ac_exec_ext in '' $ac_executable_extensions; do |
2320 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | 2402 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
@@ -2323,7 +2405,7 @@ index 83b4b0172db..2154238189e 100755 | |||
2323 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | 2405 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
2324 | break 2 | 2406 | break 2 |
2325 | fi | 2407 | fi |
2326 | @@ -6658,11 +6912,15 @@ $as_echo "no" >&6; } | 2408 | @@ -6151,11 +6405,15 @@ $as_echo "no" >&6; } |
2327 | fi | 2409 | fi |
2328 | 2410 | ||
2329 | 2411 | ||
@@ -2342,7 +2424,7 @@ index 83b4b0172db..2154238189e 100755 | |||
2342 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | 2424 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
2343 | $as_echo_n "checking for $ac_word... " >&6; } | 2425 | $as_echo_n "checking for $ac_word... " >&6; } |
2344 | if ${ac_cv_prog_ac_ct_AR+:} false; then : | 2426 | if ${ac_cv_prog_ac_ct_AR+:} false; then : |
2345 | @@ -6678,7 +6936,7 @@ do | 2427 | @@ -6171,7 +6429,7 @@ do |
2346 | test -z "$as_dir" && as_dir=. | 2428 | test -z "$as_dir" && as_dir=. |
2347 | for ac_exec_ext in '' $ac_executable_extensions; do | 2429 | for ac_exec_ext in '' $ac_executable_extensions; do |
2348 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | 2430 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
@@ -2351,7 +2433,7 @@ index 83b4b0172db..2154238189e 100755 | |||
2351 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | 2433 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
2352 | break 2 | 2434 | break 2 |
2353 | fi | 2435 | fi |
2354 | @@ -6697,6 +6955,10 @@ else | 2436 | @@ -6190,6 +6448,10 @@ else |
2355 | $as_echo "no" >&6; } | 2437 | $as_echo "no" >&6; } |
2356 | fi | 2438 | fi |
2357 | 2439 | ||
@@ -2362,7 +2444,7 @@ index 83b4b0172db..2154238189e 100755 | |||
2362 | if test "x$ac_ct_AR" = x; then | 2444 | if test "x$ac_ct_AR" = x; then |
2363 | AR="false" | 2445 | AR="false" |
2364 | else | 2446 | else |
2365 | @@ -6708,12 +6970,10 @@ ac_tool_warned=yes ;; | 2447 | @@ -6201,25 +6463,19 @@ ac_tool_warned=yes ;; |
2366 | esac | 2448 | esac |
2367 | AR=$ac_ct_AR | 2449 | AR=$ac_ct_AR |
2368 | fi | 2450 | fi |
@@ -2371,13 +2453,33 @@ index 83b4b0172db..2154238189e 100755 | |||
2371 | fi | 2453 | fi |
2372 | 2454 | ||
2373 | -test -z "$AR" && AR=ar | 2455 | -test -z "$AR" && AR=ar |
2456 | -if test -n "$plugin_option"; then | ||
2457 | - if $AR --help 2>&1 | grep -q "\--plugin"; then | ||
2458 | - touch conftest.c | ||
2459 | - $AR $plugin_option rc conftest.a conftest.c | ||
2460 | - if test "$?" != 0; then | ||
2461 | - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5 | ||
2462 | + touch conftest.c | ||
2463 | + $AR $plugin_option rc conftest.a conftest.c | ||
2464 | + if test "$?" != 0; then | ||
2465 | + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5 | ||
2466 | $as_echo "$as_me: WARNING: Failed: $AR $plugin_option rc" >&2;} | ||
2467 | - else | ||
2468 | - AR="$AR $plugin_option" | ||
2469 | - fi | ||
2470 | - rm -f conftest.* | ||
2471 | + else | ||
2472 | + AR="$AR $plugin_option" | ||
2473 | fi | ||
2474 | -fi | ||
2374 | -test -z "$AR_FLAGS" && AR_FLAGS=cru | 2475 | -test -z "$AR_FLAGS" && AR_FLAGS=cru |
2476 | + rm -f conftest.* | ||
2375 | +: ${AR=ar} | 2477 | +: ${AR=ar} |
2376 | +: ${AR_FLAGS=cru} | 2478 | +: ${AR_FLAGS=cru} |
2377 | 2479 | ||
2378 | 2480 | ||
2379 | 2481 | ||
2380 | @@ -6725,6 +6985,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru | 2482 | @@ -6231,6 +6487,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru |
2381 | 2483 | ||
2382 | 2484 | ||
2383 | 2485 | ||
@@ -2442,7 +2544,7 @@ index 83b4b0172db..2154238189e 100755 | |||
2442 | if test -n "$ac_tool_prefix"; then | 2544 | if test -n "$ac_tool_prefix"; then |
2443 | # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. | 2545 | # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. |
2444 | set dummy ${ac_tool_prefix}strip; ac_word=$2 | 2546 | set dummy ${ac_tool_prefix}strip; ac_word=$2 |
2445 | @@ -7059,8 +7377,8 @@ esac | 2547 | @@ -6570,8 +6884,8 @@ esac |
2446 | lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" | 2548 | lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" |
2447 | 2549 | ||
2448 | # Transform an extracted symbol line into symbol name and symbol address | 2550 | # Transform an extracted symbol line into symbol name and symbol address |
@@ -2453,7 +2555,7 @@ index 83b4b0172db..2154238189e 100755 | |||
2453 | 2555 | ||
2454 | # Handle CRLF in mingw tool chain | 2556 | # Handle CRLF in mingw tool chain |
2455 | opt_cr= | 2557 | opt_cr= |
2456 | @@ -7096,6 +7414,7 @@ for ac_symprfx in "" "_"; do | 2558 | @@ -6607,6 +6921,7 @@ for ac_symprfx in "" "_"; do |
2457 | else | 2559 | else |
2458 | lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" | 2560 | lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" |
2459 | fi | 2561 | fi |
@@ -2461,7 +2563,7 @@ index 83b4b0172db..2154238189e 100755 | |||
2461 | 2563 | ||
2462 | # Check to see that the pipe works correctly. | 2564 | # Check to see that the pipe works correctly. |
2463 | pipe_works=no | 2565 | pipe_works=no |
2464 | @@ -7137,6 +7456,18 @@ _LT_EOF | 2566 | @@ -6648,6 +6963,18 @@ _LT_EOF |
2465 | if $GREP ' nm_test_var$' "$nlist" >/dev/null; then | 2567 | if $GREP ' nm_test_var$' "$nlist" >/dev/null; then |
2466 | if $GREP ' nm_test_func$' "$nlist" >/dev/null; then | 2568 | if $GREP ' nm_test_func$' "$nlist" >/dev/null; then |
2467 | cat <<_LT_EOF > conftest.$ac_ext | 2569 | cat <<_LT_EOF > conftest.$ac_ext |
@@ -2480,7 +2582,7 @@ index 83b4b0172db..2154238189e 100755 | |||
2480 | #ifdef __cplusplus | 2582 | #ifdef __cplusplus |
2481 | extern "C" { | 2583 | extern "C" { |
2482 | #endif | 2584 | #endif |
2483 | @@ -7148,7 +7479,7 @@ _LT_EOF | 2585 | @@ -6659,7 +6986,7 @@ _LT_EOF |
2484 | cat <<_LT_EOF >> conftest.$ac_ext | 2586 | cat <<_LT_EOF >> conftest.$ac_ext |
2485 | 2587 | ||
2486 | /* The mapping between symbol names and symbols. */ | 2588 | /* The mapping between symbol names and symbols. */ |
@@ -2489,7 +2591,7 @@ index 83b4b0172db..2154238189e 100755 | |||
2489 | const char *name; | 2591 | const char *name; |
2490 | void *address; | 2592 | void *address; |
2491 | } | 2593 | } |
2492 | @@ -7174,8 +7505,8 @@ static const void *lt_preloaded_setup() { | 2594 | @@ -6685,8 +7012,8 @@ static const void *lt_preloaded_setup() { |
2493 | _LT_EOF | 2595 | _LT_EOF |
2494 | # Now try linking the two files. | 2596 | # Now try linking the two files. |
2495 | mv conftest.$ac_objext conftstm.$ac_objext | 2597 | mv conftest.$ac_objext conftstm.$ac_objext |
@@ -2500,7 +2602,7 @@ index 83b4b0172db..2154238189e 100755 | |||
2500 | LIBS="conftstm.$ac_objext" | 2602 | LIBS="conftstm.$ac_objext" |
2501 | CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" | 2603 | CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" |
2502 | if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 | 2604 | if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 |
2503 | @@ -7185,8 +7516,8 @@ _LT_EOF | 2605 | @@ -6696,8 +7023,8 @@ _LT_EOF |
2504 | test $ac_status = 0; } && test -s conftest${ac_exeext}; then | 2606 | test $ac_status = 0; } && test -s conftest${ac_exeext}; then |
2505 | pipe_works=yes | 2607 | pipe_works=yes |
2506 | fi | 2608 | fi |
@@ -2511,7 +2613,7 @@ index 83b4b0172db..2154238189e 100755 | |||
2511 | else | 2613 | else |
2512 | echo "cannot find nm_test_func in $nlist" >&5 | 2614 | echo "cannot find nm_test_func in $nlist" >&5 |
2513 | fi | 2615 | fi |
2514 | @@ -7223,6 +7554,21 @@ else | 2616 | @@ -6734,6 +7061,18 @@ else |
2515 | $as_echo "ok" >&6; } | 2617 | $as_echo "ok" >&6; } |
2516 | fi | 2618 | fi |
2517 | 2619 | ||
@@ -2527,18 +2629,18 @@ index 83b4b0172db..2154238189e 100755 | |||
2527 | + | 2629 | + |
2528 | + | 2630 | + |
2529 | + | 2631 | + |
2530 | + | ||
2531 | + | ||
2532 | + | ||
2533 | 2632 | ||
2534 | 2633 | ||
2535 | 2634 | ||
2536 | @@ -7239,6 +7585,40 @@ fi | 2635 | @@ -6750,6 +7089,43 @@ fi |
2537 | 2636 | ||
2538 | 2637 | ||
2539 | 2638 | ||
2540 | + | 2639 | + |
2541 | + | 2640 | + |
2641 | + | ||
2642 | + | ||
2643 | + | ||
2542 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 | 2644 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 |
2543 | +$as_echo_n "checking for sysroot... " >&6; } | 2645 | +$as_echo_n "checking for sysroot... " >&6; } |
2544 | + | 2646 | + |
@@ -2574,7 +2676,7 @@ index 83b4b0172db..2154238189e 100755 | |||
2574 | 2676 | ||
2575 | 2677 | ||
2576 | 2678 | ||
2577 | @@ -7450,6 +7830,123 @@ esac | 2679 | @@ -6961,6 +7337,123 @@ esac |
2578 | 2680 | ||
2579 | need_locks="$enable_libtool_lock" | 2681 | need_locks="$enable_libtool_lock" |
2580 | 2682 | ||
@@ -2698,7 +2800,7 @@ index 83b4b0172db..2154238189e 100755 | |||
2698 | 2800 | ||
2699 | case $host_os in | 2801 | case $host_os in |
2700 | rhapsody* | darwin*) | 2802 | rhapsody* | darwin*) |
2701 | @@ -8013,6 +8510,8 @@ _LT_EOF | 2803 | @@ -7524,6 +8017,8 @@ _LT_EOF |
2702 | $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 | 2804 | $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 |
2703 | echo "$AR cru libconftest.a conftest.o" >&5 | 2805 | echo "$AR cru libconftest.a conftest.o" >&5 |
2704 | $AR cru libconftest.a conftest.o 2>&5 | 2806 | $AR cru libconftest.a conftest.o 2>&5 |
@@ -2707,26 +2809,7 @@ index 83b4b0172db..2154238189e 100755 | |||
2707 | cat > conftest.c << _LT_EOF | 2809 | cat > conftest.c << _LT_EOF |
2708 | int main() { return 0;} | 2810 | int main() { return 0;} |
2709 | _LT_EOF | 2811 | _LT_EOF |
2710 | @@ -8208,7 +8707,8 @@ fi | 2812 | @@ -8108,8 +8603,6 @@ fi |
2711 | LIBTOOL_DEPS="$ltmain" | ||
2712 | |||
2713 | # Always use our own libtool. | ||
2714 | -LIBTOOL='$(SHELL) $(top_builddir)/libtool' | ||
2715 | +LIBTOOL='$(SHELL) $(top_builddir)' | ||
2716 | +LIBTOOL="$LIBTOOL/${host_alias}-libtool" | ||
2717 | |||
2718 | |||
2719 | |||
2720 | @@ -8297,7 +8797,7 @@ aix3*) | ||
2721 | esac | ||
2722 | |||
2723 | # Global variables: | ||
2724 | -ofile=libtool | ||
2725 | +ofile=${host_alias}-libtool | ||
2726 | can_build_shared=yes | ||
2727 | |||
2728 | # All known linkers require a `.a' archive for static linking (except MSVC, | ||
2729 | @@ -8595,8 +9095,6 @@ fi | ||
2730 | lt_prog_compiler_pic= | 2813 | lt_prog_compiler_pic= |
2731 | lt_prog_compiler_static= | 2814 | lt_prog_compiler_static= |
2732 | 2815 | ||
@@ -2735,7 +2818,7 @@ index 83b4b0172db..2154238189e 100755 | |||
2735 | 2818 | ||
2736 | if test "$GCC" = yes; then | 2819 | if test "$GCC" = yes; then |
2737 | lt_prog_compiler_wl='-Wl,' | 2820 | lt_prog_compiler_wl='-Wl,' |
2738 | @@ -8762,6 +9260,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } | 2821 | @@ -8275,6 +8768,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } |
2739 | lt_prog_compiler_pic='--shared' | 2822 | lt_prog_compiler_pic='--shared' |
2740 | lt_prog_compiler_static='--static' | 2823 | lt_prog_compiler_static='--static' |
2741 | ;; | 2824 | ;; |
@@ -2748,7 +2831,7 @@ index 83b4b0172db..2154238189e 100755 | |||
2748 | pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) | 2831 | pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) |
2749 | # Portland Group compilers (*not* the Pentium gcc compiler, | 2832 | # Portland Group compilers (*not* the Pentium gcc compiler, |
2750 | # which looks to be a dead project) | 2833 | # which looks to be a dead project) |
2751 | @@ -8824,7 +9328,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } | 2834 | @@ -8337,7 +8836,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } |
2752 | lt_prog_compiler_pic='-KPIC' | 2835 | lt_prog_compiler_pic='-KPIC' |
2753 | lt_prog_compiler_static='-Bstatic' | 2836 | lt_prog_compiler_static='-Bstatic' |
2754 | case $cc_basename in | 2837 | case $cc_basename in |
@@ -2757,7 +2840,7 @@ index 83b4b0172db..2154238189e 100755 | |||
2757 | lt_prog_compiler_wl='-Qoption ld ';; | 2840 | lt_prog_compiler_wl='-Qoption ld ';; |
2758 | *) | 2841 | *) |
2759 | lt_prog_compiler_wl='-Wl,';; | 2842 | lt_prog_compiler_wl='-Wl,';; |
2760 | @@ -8881,13 +9385,17 @@ case $host_os in | 2843 | @@ -8394,13 +8893,17 @@ case $host_os in |
2761 | lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" | 2844 | lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" |
2762 | ;; | 2845 | ;; |
2763 | esac | 2846 | esac |
@@ -2781,7 +2864,7 @@ index 83b4b0172db..2154238189e 100755 | |||
2781 | 2864 | ||
2782 | # | 2865 | # |
2783 | # Check to make sure the PIC flag actually works. | 2866 | # Check to make sure the PIC flag actually works. |
2784 | @@ -8948,6 +9456,11 @@ fi | 2867 | @@ -8461,6 +8964,11 @@ fi |
2785 | 2868 | ||
2786 | 2869 | ||
2787 | 2870 | ||
@@ -2793,7 +2876,7 @@ index 83b4b0172db..2154238189e 100755 | |||
2793 | # | 2876 | # |
2794 | # Check to make sure the static flag actually works. | 2877 | # Check to make sure the static flag actually works. |
2795 | # | 2878 | # |
2796 | @@ -9298,7 +9811,8 @@ _LT_EOF | 2879 | @@ -8811,7 +9319,8 @@ _LT_EOF |
2797 | allow_undefined_flag=unsupported | 2880 | allow_undefined_flag=unsupported |
2798 | always_export_symbols=no | 2881 | always_export_symbols=no |
2799 | enable_shared_with_static_runtimes=yes | 2882 | enable_shared_with_static_runtimes=yes |
@@ -2803,7 +2886,7 @@ index 83b4b0172db..2154238189e 100755 | |||
2803 | 2886 | ||
2804 | if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then | 2887 | if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then |
2805 | archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' | 2888 | archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' |
2806 | @@ -9397,12 +9911,12 @@ _LT_EOF | 2889 | @@ -8910,12 +9419,12 @@ _LT_EOF |
2807 | whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' | 2890 | whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' |
2808 | hardcode_libdir_flag_spec= | 2891 | hardcode_libdir_flag_spec= |
2809 | hardcode_libdir_flag_spec_ld='-rpath $libdir' | 2892 | hardcode_libdir_flag_spec_ld='-rpath $libdir' |
@@ -2818,7 +2901,7 @@ index 83b4b0172db..2154238189e 100755 | |||
2818 | fi | 2901 | fi |
2819 | ;; | 2902 | ;; |
2820 | esac | 2903 | esac |
2821 | @@ -9416,8 +9930,8 @@ _LT_EOF | 2904 | @@ -8929,8 +9438,8 @@ _LT_EOF |
2822 | archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' | 2905 | archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' |
2823 | wlarc= | 2906 | wlarc= |
2824 | else | 2907 | else |
@@ -2829,7 +2912,7 @@ index 83b4b0172db..2154238189e 100755 | |||
2829 | fi | 2912 | fi |
2830 | ;; | 2913 | ;; |
2831 | 2914 | ||
2832 | @@ -9435,8 +9949,8 @@ _LT_EOF | 2915 | @@ -8948,8 +9457,8 @@ _LT_EOF |
2833 | 2916 | ||
2834 | _LT_EOF | 2917 | _LT_EOF |
2835 | elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then | 2918 | elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then |
@@ -2840,7 +2923,7 @@ index 83b4b0172db..2154238189e 100755 | |||
2840 | else | 2923 | else |
2841 | ld_shlibs=no | 2924 | ld_shlibs=no |
2842 | fi | 2925 | fi |
2843 | @@ -9482,8 +9996,8 @@ _LT_EOF | 2926 | @@ -8995,8 +9504,8 @@ _LT_EOF |
2844 | 2927 | ||
2845 | *) | 2928 | *) |
2846 | if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then | 2929 | if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then |
@@ -2851,7 +2934,7 @@ index 83b4b0172db..2154238189e 100755 | |||
2851 | else | 2934 | else |
2852 | ld_shlibs=no | 2935 | ld_shlibs=no |
2853 | fi | 2936 | fi |
2854 | @@ -9613,7 +10127,13 @@ _LT_EOF | 2937 | @@ -9126,7 +9635,13 @@ _LT_EOF |
2855 | allow_undefined_flag='-berok' | 2938 | allow_undefined_flag='-berok' |
2856 | # Determine the default libpath from the value encoded in an | 2939 | # Determine the default libpath from the value encoded in an |
2857 | # empty executable. | 2940 | # empty executable. |
@@ -2866,7 +2949,7 @@ index 83b4b0172db..2154238189e 100755 | |||
2866 | /* end confdefs.h. */ | 2949 | /* end confdefs.h. */ |
2867 | 2950 | ||
2868 | int | 2951 | int |
2869 | @@ -9626,22 +10146,29 @@ main () | 2952 | @@ -9139,22 +9654,29 @@ main () |
2870 | _ACEOF | 2953 | _ACEOF |
2871 | if ac_fn_c_try_link "$LINENO"; then : | 2954 | if ac_fn_c_try_link "$LINENO"; then : |
2872 | 2955 | ||
@@ -2909,7 +2992,7 @@ index 83b4b0172db..2154238189e 100755 | |||
2909 | 2992 | ||
2910 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" | 2993 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" |
2911 | archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" | 2994 | archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" |
2912 | @@ -9653,7 +10180,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | 2995 | @@ -9166,7 +9688,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
2913 | else | 2996 | else |
2914 | # Determine the default libpath from the value encoded in an | 2997 | # Determine the default libpath from the value encoded in an |
2915 | # empty executable. | 2998 | # empty executable. |
@@ -2924,7 +3007,7 @@ index 83b4b0172db..2154238189e 100755 | |||
2924 | /* end confdefs.h. */ | 3007 | /* end confdefs.h. */ |
2925 | 3008 | ||
2926 | int | 3009 | int |
2927 | @@ -9666,22 +10199,29 @@ main () | 3010 | @@ -9179,22 +9707,29 @@ main () |
2928 | _ACEOF | 3011 | _ACEOF |
2929 | if ac_fn_c_try_link "$LINENO"; then : | 3012 | if ac_fn_c_try_link "$LINENO"; then : |
2930 | 3013 | ||
@@ -2967,7 +3050,7 @@ index 83b4b0172db..2154238189e 100755 | |||
2967 | 3050 | ||
2968 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" | 3051 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" |
2969 | # Warning - without using the other run time loading flags, | 3052 | # Warning - without using the other run time loading flags, |
2970 | @@ -9726,20 +10266,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | 3053 | @@ -9239,20 +9774,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
2971 | # Microsoft Visual C++. | 3054 | # Microsoft Visual C++. |
2972 | # hardcode_libdir_flag_spec is actually meaningless, as there is | 3055 | # hardcode_libdir_flag_spec is actually meaningless, as there is |
2973 | # no search path for DLLs. | 3056 | # no search path for DLLs. |
@@ -3045,7 +3128,7 @@ index 83b4b0172db..2154238189e 100755 | |||
3045 | ;; | 3128 | ;; |
3046 | 3129 | ||
3047 | darwin* | rhapsody*) | 3130 | darwin* | rhapsody*) |
3048 | @@ -9800,7 +10383,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | 3131 | @@ -9313,7 +9891,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
3049 | 3132 | ||
3050 | # FreeBSD 3 and greater uses gcc -shared to do shared libraries. | 3133 | # FreeBSD 3 and greater uses gcc -shared to do shared libraries. |
3051 | freebsd* | dragonfly*) | 3134 | freebsd* | dragonfly*) |
@@ -3054,7 +3137,7 @@ index 83b4b0172db..2154238189e 100755 | |||
3054 | hardcode_libdir_flag_spec='-R$libdir' | 3137 | hardcode_libdir_flag_spec='-R$libdir' |
3055 | hardcode_direct=yes | 3138 | hardcode_direct=yes |
3056 | hardcode_shlibpath_var=no | 3139 | hardcode_shlibpath_var=no |
3057 | @@ -9808,7 +10391,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | 3140 | @@ -9321,7 +9899,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
3058 | 3141 | ||
3059 | hpux9*) | 3142 | hpux9*) |
3060 | if test "$GCC" = yes; then | 3143 | if test "$GCC" = yes; then |
@@ -3063,7 +3146,7 @@ index 83b4b0172db..2154238189e 100755 | |||
3063 | else | 3146 | else |
3064 | archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' | 3147 | archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' |
3065 | fi | 3148 | fi |
3066 | @@ -9824,7 +10407,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | 3149 | @@ -9337,7 +9915,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
3067 | 3150 | ||
3068 | hpux10*) | 3151 | hpux10*) |
3069 | if test "$GCC" = yes && test "$with_gnu_ld" = no; then | 3152 | if test "$GCC" = yes && test "$with_gnu_ld" = no; then |
@@ -3072,8 +3155,8 @@ index 83b4b0172db..2154238189e 100755 | |||
3072 | else | 3155 | else |
3073 | archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' | 3156 | archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' |
3074 | fi | 3157 | fi |
3075 | @@ -9848,10 +10431,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | 3158 | @@ -9361,10 +9939,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
3076 | archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' | 3159 | archive_cmds='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' |
3077 | ;; | 3160 | ;; |
3078 | ia64*) | 3161 | ia64*) |
3079 | - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' | 3162 | - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' |
@@ -3085,7 +3168,7 @@ index 83b4b0172db..2154238189e 100755 | |||
3085 | ;; | 3168 | ;; |
3086 | esac | 3169 | esac |
3087 | else | 3170 | else |
3088 | @@ -9930,23 +10513,36 @@ fi | 3171 | @@ -9443,23 +10021,36 @@ fi |
3089 | 3172 | ||
3090 | irix5* | irix6* | nonstopux*) | 3173 | irix5* | irix6* | nonstopux*) |
3091 | if test "$GCC" = yes; then | 3174 | if test "$GCC" = yes; then |
@@ -3130,7 +3213,7 @@ index 83b4b0172db..2154238189e 100755 | |||
3130 | else | 3213 | else |
3131 | archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' | 3214 | archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' |
3132 | archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' | 3215 | archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' |
3133 | @@ -10031,7 +10627,7 @@ rm -f core conftest.err conftest.$ac_objext \ | 3216 | @@ -9544,7 +10135,7 @@ rm -f core conftest.err conftest.$ac_objext \ |
3134 | osf4* | osf5*) # as osf3* with the addition of -msym flag | 3217 | osf4* | osf5*) # as osf3* with the addition of -msym flag |
3135 | if test "$GCC" = yes; then | 3218 | if test "$GCC" = yes; then |
3136 | allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' | 3219 | allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' |
@@ -3139,7 +3222,7 @@ index 83b4b0172db..2154238189e 100755 | |||
3139 | hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' | 3222 | hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' |
3140 | else | 3223 | else |
3141 | allow_undefined_flag=' -expect_unresolved \*' | 3224 | allow_undefined_flag=' -expect_unresolved \*' |
3142 | @@ -10050,9 +10646,9 @@ rm -f core conftest.err conftest.$ac_objext \ | 3225 | @@ -9563,9 +10154,9 @@ rm -f core conftest.err conftest.$ac_objext \ |
3143 | no_undefined_flag=' -z defs' | 3226 | no_undefined_flag=' -z defs' |
3144 | if test "$GCC" = yes; then | 3227 | if test "$GCC" = yes; then |
3145 | wlarc='${wl}' | 3228 | wlarc='${wl}' |
@@ -3151,7 +3234,7 @@ index 83b4b0172db..2154238189e 100755 | |||
3151 | else | 3234 | else |
3152 | case `$CC -V 2>&1` in | 3235 | case `$CC -V 2>&1` in |
3153 | *"Compilers 5.0"*) | 3236 | *"Compilers 5.0"*) |
3154 | @@ -10628,8 +11224,9 @@ cygwin* | mingw* | pw32* | cegcc*) | 3237 | @@ -10141,8 +10732,9 @@ cygwin* | mingw* | pw32* | cegcc*) |
3155 | need_version=no | 3238 | need_version=no |
3156 | need_lib_prefix=no | 3239 | need_lib_prefix=no |
3157 | 3240 | ||
@@ -3163,7 +3246,7 @@ index 83b4b0172db..2154238189e 100755 | |||
3163 | library_names_spec='$libname.dll.a' | 3246 | library_names_spec='$libname.dll.a' |
3164 | # DLL is installed to $(libdir)/../bin by postinstall_cmds | 3247 | # DLL is installed to $(libdir)/../bin by postinstall_cmds |
3165 | postinstall_cmds='base_file=`basename \${file}`~ | 3248 | postinstall_cmds='base_file=`basename \${file}`~ |
3166 | @@ -10662,13 +11259,71 @@ cygwin* | mingw* | pw32* | cegcc*) | 3249 | @@ -10175,13 +10767,71 @@ cygwin* | mingw* | pw32* | cegcc*) |
3167 | library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' | 3250 | library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' |
3168 | ;; | 3251 | ;; |
3169 | esac | 3252 | esac |
@@ -3236,25 +3319,16 @@ index 83b4b0172db..2154238189e 100755 | |||
3236 | # FIXME: first we should search . and the directory the executable is in | 3319 | # FIXME: first we should search . and the directory the executable is in |
3237 | shlibpath_var=PATH | 3320 | shlibpath_var=PATH |
3238 | ;; | 3321 | ;; |
3239 | @@ -10750,7 +11405,7 @@ haiku*) | 3322 | @@ -11083,7 +11733,7 @@ else |
3240 | soname_spec='${libname}${release}${shared_ext}$major' | ||
3241 | shlibpath_var=LIBRARY_PATH | ||
3242 | shlibpath_overrides_runpath=yes | ||
3243 | - sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib' | ||
3244 | + sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' | ||
3245 | hardcode_into_libs=yes | ||
3246 | ;; | ||
3247 | |||
3248 | @@ -11546,7 +12201,7 @@ else | ||
3249 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 | 3323 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 |
3250 | lt_status=$lt_dlunknown | 3324 | lt_status=$lt_dlunknown |
3251 | cat > conftest.$ac_ext <<_LT_EOF | 3325 | cat > conftest.$ac_ext <<_LT_EOF |
3252 | -#line 11549 "configure" | 3326 | -#line 11086 "configure" |
3253 | +#line $LINENO "configure" | 3327 | +#line $LINENO "configure" |
3254 | #include "confdefs.h" | 3328 | #include "confdefs.h" |
3255 | 3329 | ||
3256 | #if HAVE_DLFCN_H | 3330 | #if HAVE_DLFCN_H |
3257 | @@ -11590,10 +12245,10 @@ else | 3331 | @@ -11127,10 +11777,10 @@ else |
3258 | /* When -fvisbility=hidden is used, assume the code has been annotated | 3332 | /* When -fvisbility=hidden is used, assume the code has been annotated |
3259 | correspondingly for the symbols needed. */ | 3333 | correspondingly for the symbols needed. */ |
3260 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) | 3334 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) |
@@ -3267,16 +3341,16 @@ index 83b4b0172db..2154238189e 100755 | |||
3267 | int main () | 3341 | int main () |
3268 | { | 3342 | { |
3269 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); | 3343 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); |
3270 | @@ -11652,7 +12307,7 @@ else | 3344 | @@ -11189,7 +11839,7 @@ else |
3271 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 | 3345 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 |
3272 | lt_status=$lt_dlunknown | 3346 | lt_status=$lt_dlunknown |
3273 | cat > conftest.$ac_ext <<_LT_EOF | 3347 | cat > conftest.$ac_ext <<_LT_EOF |
3274 | -#line 11655 "configure" | 3348 | -#line 11192 "configure" |
3275 | +#line $LINENO "configure" | 3349 | +#line $LINENO "configure" |
3276 | #include "confdefs.h" | 3350 | #include "confdefs.h" |
3277 | 3351 | ||
3278 | #if HAVE_DLFCN_H | 3352 | #if HAVE_DLFCN_H |
3279 | @@ -11696,10 +12351,10 @@ else | 3353 | @@ -11233,10 +11883,10 @@ else |
3280 | /* When -fvisbility=hidden is used, assume the code has been annotated | 3354 | /* When -fvisbility=hidden is used, assume the code has been annotated |
3281 | correspondingly for the symbols needed. */ | 3355 | correspondingly for the symbols needed. */ |
3282 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) | 3356 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) |
@@ -3289,7 +3363,7 @@ index 83b4b0172db..2154238189e 100755 | |||
3289 | int main () | 3363 | int main () |
3290 | { | 3364 | { |
3291 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); | 3365 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); |
3292 | @@ -16308,13 +16963,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' | 3366 | @@ -17390,13 +18040,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' |
3293 | lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' | 3367 | lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' |
3294 | lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' | 3368 | lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' |
3295 | lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' | 3369 | lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' |
@@ -3310,7 +3384,7 @@ index 83b4b0172db..2154238189e 100755 | |||
3310 | STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' | 3384 | STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' |
3311 | RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' | 3385 | RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' |
3312 | old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' | 3386 | old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' |
3313 | @@ -16329,14 +16991,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de | 3387 | @@ -17411,14 +18068,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de |
3314 | lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' | 3388 | lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' |
3315 | lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' | 3389 | lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' |
3316 | lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`' | 3390 | lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`' |
@@ -3329,7 +3403,7 @@ index 83b4b0172db..2154238189e 100755 | |||
3329 | DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' | 3403 | DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' |
3330 | NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' | 3404 | NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' |
3331 | LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' | 3405 | LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' |
3332 | @@ -16369,12 +17034,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q | 3406 | @@ -17451,12 +18111,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q |
3333 | hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' | 3407 | hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' |
3334 | inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' | 3408 | inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' |
3335 | link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' | 3409 | link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' |
@@ -3343,7 +3417,7 @@ index 83b4b0172db..2154238189e 100755 | |||
3343 | file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' | 3417 | file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' |
3344 | variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' | 3418 | variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' |
3345 | need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' | 3419 | need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' |
3346 | @@ -16429,8 +17094,13 @@ reload_flag \ | 3420 | @@ -17511,8 +18171,13 @@ reload_flag \ |
3347 | OBJDUMP \ | 3421 | OBJDUMP \ |
3348 | deplibs_check_method \ | 3422 | deplibs_check_method \ |
3349 | file_magic_cmd \ | 3423 | file_magic_cmd \ |
@@ -3357,7 +3431,7 @@ index 83b4b0172db..2154238189e 100755 | |||
3357 | STRIP \ | 3431 | STRIP \ |
3358 | RANLIB \ | 3432 | RANLIB \ |
3359 | CC \ | 3433 | CC \ |
3360 | @@ -16440,12 +17110,14 @@ lt_cv_sys_global_symbol_pipe \ | 3434 | @@ -17522,12 +18187,14 @@ lt_cv_sys_global_symbol_pipe \ |
3361 | lt_cv_sys_global_symbol_to_cdecl \ | 3435 | lt_cv_sys_global_symbol_to_cdecl \ |
3362 | lt_cv_sys_global_symbol_to_c_name_address \ | 3436 | lt_cv_sys_global_symbol_to_c_name_address \ |
3363 | lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ | 3437 | lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ |
@@ -3373,7 +3447,7 @@ index 83b4b0172db..2154238189e 100755 | |||
3373 | DSYMUTIL \ | 3447 | DSYMUTIL \ |
3374 | NMEDIT \ | 3448 | NMEDIT \ |
3375 | LIPO \ | 3449 | LIPO \ |
3376 | @@ -16461,7 +17133,6 @@ no_undefined_flag \ | 3450 | @@ -17543,7 +18210,6 @@ no_undefined_flag \ |
3377 | hardcode_libdir_flag_spec \ | 3451 | hardcode_libdir_flag_spec \ |
3378 | hardcode_libdir_flag_spec_ld \ | 3452 | hardcode_libdir_flag_spec_ld \ |
3379 | hardcode_libdir_separator \ | 3453 | hardcode_libdir_separator \ |
@@ -3381,7 +3455,7 @@ index 83b4b0172db..2154238189e 100755 | |||
3381 | exclude_expsyms \ | 3455 | exclude_expsyms \ |
3382 | include_expsyms \ | 3456 | include_expsyms \ |
3383 | file_list_spec \ | 3457 | file_list_spec \ |
3384 | @@ -16497,6 +17168,7 @@ module_cmds \ | 3458 | @@ -17579,6 +18245,7 @@ module_cmds \ |
3385 | module_expsym_cmds \ | 3459 | module_expsym_cmds \ |
3386 | export_symbols_cmds \ | 3460 | export_symbols_cmds \ |
3387 | prelink_cmds \ | 3461 | prelink_cmds \ |
@@ -3389,7 +3463,7 @@ index 83b4b0172db..2154238189e 100755 | |||
3389 | postinstall_cmds \ | 3463 | postinstall_cmds \ |
3390 | postuninstall_cmds \ | 3464 | postuninstall_cmds \ |
3391 | finish_cmds \ | 3465 | finish_cmds \ |
3392 | @@ -17263,7 +17935,8 @@ $as_echo X"$file" | | 3466 | @@ -18352,7 +19019,8 @@ $as_echo X"$file" | |
3393 | # NOTE: Changes made to this file will be lost: look at ltmain.sh. | 3467 | # NOTE: Changes made to this file will be lost: look at ltmain.sh. |
3394 | # | 3468 | # |
3395 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, | 3469 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, |
@@ -3399,7 +3473,7 @@ index 83b4b0172db..2154238189e 100755 | |||
3399 | # Written by Gordon Matzigkeit, 1996 | 3473 | # Written by Gordon Matzigkeit, 1996 |
3400 | # | 3474 | # |
3401 | # This file is part of GNU Libtool. | 3475 | # This file is part of GNU Libtool. |
3402 | @@ -17366,19 +18039,42 @@ SP2NL=$lt_lt_SP2NL | 3476 | @@ -18455,19 +19123,42 @@ SP2NL=$lt_lt_SP2NL |
3403 | # turn newlines into spaces. | 3477 | # turn newlines into spaces. |
3404 | NL2SP=$lt_lt_NL2SP | 3478 | NL2SP=$lt_lt_NL2SP |
3405 | 3479 | ||
@@ -3443,7 +3517,7 @@ index 83b4b0172db..2154238189e 100755 | |||
3443 | # A symbol stripping program. | 3517 | # A symbol stripping program. |
3444 | STRIP=$lt_STRIP | 3518 | STRIP=$lt_STRIP |
3445 | 3519 | ||
3446 | @@ -17408,6 +18104,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address | 3520 | @@ -18497,6 +19188,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address |
3447 | # Transform the output of nm in a C name address pair when lib prefix is needed. | 3521 | # Transform the output of nm in a C name address pair when lib prefix is needed. |
3448 | global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix | 3522 | global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix |
3449 | 3523 | ||
@@ -3456,7 +3530,7 @@ index 83b4b0172db..2154238189e 100755 | |||
3456 | # The name of the directory that contains temporary libtool files. | 3530 | # The name of the directory that contains temporary libtool files. |
3457 | objdir=$objdir | 3531 | objdir=$objdir |
3458 | 3532 | ||
3459 | @@ -17417,6 +18119,9 @@ MAGIC_CMD=$MAGIC_CMD | 3533 | @@ -18506,6 +19203,9 @@ MAGIC_CMD=$MAGIC_CMD |
3460 | # Must we lock files when doing compilation? | 3534 | # Must we lock files when doing compilation? |
3461 | need_locks=$lt_need_locks | 3535 | need_locks=$lt_need_locks |
3462 | 3536 | ||
@@ -3466,7 +3540,7 @@ index 83b4b0172db..2154238189e 100755 | |||
3466 | # Tool to manipulate archived DWARF debug symbol files on Mac OS X. | 3540 | # Tool to manipulate archived DWARF debug symbol files on Mac OS X. |
3467 | DSYMUTIL=$lt_DSYMUTIL | 3541 | DSYMUTIL=$lt_DSYMUTIL |
3468 | 3542 | ||
3469 | @@ -17531,12 +18236,12 @@ with_gcc=$GCC | 3543 | @@ -18620,12 +19320,12 @@ with_gcc=$GCC |
3470 | # Compiler flag to turn off builtin functions. | 3544 | # Compiler flag to turn off builtin functions. |
3471 | no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag | 3545 | no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag |
3472 | 3546 | ||
@@ -3482,7 +3556,7 @@ index 83b4b0172db..2154238189e 100755 | |||
3482 | # Compiler flag to prevent dynamic linking. | 3556 | # Compiler flag to prevent dynamic linking. |
3483 | link_static_flag=$lt_lt_prog_compiler_static | 3557 | link_static_flag=$lt_lt_prog_compiler_static |
3484 | 3558 | ||
3485 | @@ -17623,9 +18328,6 @@ inherit_rpath=$inherit_rpath | 3559 | @@ -18712,9 +19412,6 @@ inherit_rpath=$inherit_rpath |
3486 | # Whether libtool must link a program against all its dependency libraries. | 3560 | # Whether libtool must link a program against all its dependency libraries. |
3487 | link_all_deplibs=$link_all_deplibs | 3561 | link_all_deplibs=$link_all_deplibs |
3488 | 3562 | ||
@@ -3492,7 +3566,7 @@ index 83b4b0172db..2154238189e 100755 | |||
3492 | # Set to "yes" if exported symbols are required. | 3566 | # Set to "yes" if exported symbols are required. |
3493 | always_export_symbols=$always_export_symbols | 3567 | always_export_symbols=$always_export_symbols |
3494 | 3568 | ||
3495 | @@ -17641,6 +18343,9 @@ include_expsyms=$lt_include_expsyms | 3569 | @@ -18730,6 +19427,9 @@ include_expsyms=$lt_include_expsyms |
3496 | # Commands necessary for linking programs (against libraries) with templates. | 3570 | # Commands necessary for linking programs (against libraries) with templates. |
3497 | prelink_cmds=$lt_prelink_cmds | 3571 | prelink_cmds=$lt_prelink_cmds |
3498 | 3572 | ||
@@ -3502,7 +3576,7 @@ index 83b4b0172db..2154238189e 100755 | |||
3502 | # Specify filename containing input files. | 3576 | # Specify filename containing input files. |
3503 | file_list_spec=$lt_file_list_spec | 3577 | file_list_spec=$lt_file_list_spec |
3504 | 3578 | ||
3505 | @@ -17673,210 +18378,169 @@ ltmain="$ac_aux_dir/ltmain.sh" | 3579 | @@ -18762,210 +19462,169 @@ ltmain="$ac_aux_dir/ltmain.sh" |
3506 | # if finds mixed CR/LF and LF-only lines. Since sed operates in | 3580 | # if finds mixed CR/LF and LF-only lines. Since sed operates in |
3507 | # text mode, it properly converts lines to CR/LF. This bash problem | 3581 | # text mode, it properly converts lines to CR/LF. This bash problem |
3508 | # is reportedly fixed, but why not run on old versions too? | 3582 | # is reportedly fixed, but why not run on old versions too? |
@@ -3876,11 +3950,39 @@ index 83b4b0172db..2154238189e 100755 | |||
3876 | (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") | 3950 | (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") |
3877 | chmod +x "$ofile" | 3951 | chmod +x "$ofile" |
3878 | 3952 | ||
3953 | diff --git a/gas/Makefile.in b/gas/Makefile.in | ||
3954 | index bc25765cb5b..c481d96a05a 100644 | ||
3955 | --- a/gas/Makefile.in | ||
3956 | +++ b/gas/Makefile.in | ||
3957 | @@ -384,6 +384,7 @@ CYGPATH_W = @CYGPATH_W@ | ||
3958 | DATADIRNAME = @DATADIRNAME@ | ||
3959 | DEFS = @DEFS@ | ||
3960 | DEPDIR = @DEPDIR@ | ||
3961 | +DLLTOOL = @DLLTOOL@ | ||
3962 | DSYMUTIL = @DSYMUTIL@ | ||
3963 | DUMPBIN = @DUMPBIN@ | ||
3964 | ECHO_C = @ECHO_C@ | ||
3965 | @@ -425,6 +426,7 @@ LTLIBINTL = @LTLIBINTL@ | ||
3966 | LTLIBOBJS = @LTLIBOBJS@ | ||
3967 | MAINT = @MAINT@ | ||
3968 | MAKEINFO = @MAKEINFO@ | ||
3969 | +MANIFEST_TOOL = @MANIFEST_TOOL@ | ||
3970 | MKDIR_P = @MKDIR_P@ | ||
3971 | MKINSTALLDIRS = @MKINSTALLDIRS@ | ||
3972 | MSGFMT = @MSGFMT@ | ||
3973 | @@ -468,6 +470,7 @@ abs_builddir = @abs_builddir@ | ||
3974 | abs_srcdir = @abs_srcdir@ | ||
3975 | abs_top_builddir = @abs_top_builddir@ | ||
3976 | abs_top_srcdir = @abs_top_srcdir@ | ||
3977 | +ac_ct_AR = @ac_ct_AR@ | ||
3978 | ac_ct_CC = @ac_ct_CC@ | ||
3979 | ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ | ||
3980 | am__include = @am__include@ | ||
3879 | diff --git a/gas/configure b/gas/configure | 3981 | diff --git a/gas/configure b/gas/configure |
3880 | index d5ae54925e9..3ff1148d9dd 100755 | 3982 | index 5f8c8493589..998727b6108 100755 |
3881 | --- a/gas/configure | 3983 | --- a/gas/configure |
3882 | +++ b/gas/configure | 3984 | +++ b/gas/configure |
3883 | @@ -682,8 +682,11 @@ OTOOL | 3985 | @@ -692,8 +692,11 @@ OTOOL |
3884 | LIPO | 3986 | LIPO |
3885 | NMEDIT | 3987 | NMEDIT |
3886 | DSYMUTIL | 3988 | DSYMUTIL |
@@ -3892,7 +3994,7 @@ index d5ae54925e9..3ff1148d9dd 100755 | |||
3892 | OBJDUMP | 3994 | OBJDUMP |
3893 | LN_S | 3995 | LN_S |
3894 | NM | 3996 | NM |
3895 | @@ -800,6 +803,7 @@ enable_static | 3997 | @@ -810,6 +813,7 @@ enable_static |
3896 | with_pic | 3998 | with_pic |
3897 | enable_fast_install | 3999 | enable_fast_install |
3898 | with_gnu_ld | 4000 | with_gnu_ld |
@@ -3900,7 +4002,7 @@ index d5ae54925e9..3ff1148d9dd 100755 | |||
3900 | enable_libtool_lock | 4002 | enable_libtool_lock |
3901 | enable_plugins | 4003 | enable_plugins |
3902 | enable_largefile | 4004 | enable_largefile |
3903 | @@ -1491,6 +1495,8 @@ Optional Packages: | 4005 | @@ -1517,6 +1521,8 @@ Optional Packages: |
3904 | --with-pic try to use only PIC/non-PIC objects [default=use | 4006 | --with-pic try to use only PIC/non-PIC objects [default=use |
3905 | both] | 4007 | both] |
3906 | --with-gnu-ld assume the C compiler uses GNU ld [default=no] | 4008 | --with-gnu-ld assume the C compiler uses GNU ld [default=no] |
@@ -3908,8 +4010,1947 @@ index d5ae54925e9..3ff1148d9dd 100755 | |||
3908 | + (or the compiler's sysroot if not specified). | 4010 | + (or the compiler's sysroot if not specified). |
3909 | --with-cpu=CPU default cpu variant is CPU (currently only supported | 4011 | --with-cpu=CPU default cpu variant is CPU (currently only supported |
3910 | on ARC) | 4012 | on ARC) |
3911 | --with-system-zlib use installed libz | 4013 | --with-gnu-ld assume the C compiler uses GNU ld default=no |
3912 | @@ -5278,8 +5284,8 @@ esac | 4014 | @@ -4652,8 +4658,8 @@ esac |
4015 | |||
4016 | |||
4017 | |||
4018 | -macro_version='2.2.7a' | ||
4019 | -macro_revision='1.3134' | ||
4020 | +macro_version='2.4' | ||
4021 | +macro_revision='1.3293' | ||
4022 | |||
4023 | |||
4024 | |||
4025 | @@ -4693,7 +4699,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO | ||
4026 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 | ||
4027 | $as_echo_n "checking how to print strings... " >&6; } | ||
4028 | # Test print first, because it will be a builtin if present. | ||
4029 | -if test "X`print -r -- -n 2>/dev/null`" = X-n && \ | ||
4030 | +if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ | ||
4031 | test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then | ||
4032 | ECHO='print -r --' | ||
4033 | elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then | ||
4034 | @@ -5386,8 +5392,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; | ||
4035 | # Try some XSI features | ||
4036 | xsi_shell=no | ||
4037 | ( _lt_dummy="a/b/c" | ||
4038 | - test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ | ||
4039 | - = c,a/b,, \ | ||
4040 | + test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ | ||
4041 | + = c,a/b,b/c, \ | ||
4042 | && eval 'test $(( 1 + 1 )) -eq 2 \ | ||
4043 | && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ | ||
4044 | && xsi_shell=yes | ||
4045 | @@ -5436,6 +5442,80 @@ esac | ||
4046 | |||
4047 | |||
4048 | |||
4049 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5 | ||
4050 | +$as_echo_n "checking how to convert $build file names to $host format... " >&6; } | ||
4051 | +if ${lt_cv_to_host_file_cmd+:} false; then : | ||
4052 | + $as_echo_n "(cached) " >&6 | ||
4053 | +else | ||
4054 | + case $host in | ||
4055 | + *-*-mingw* ) | ||
4056 | + case $build in | ||
4057 | + *-*-mingw* ) # actually msys | ||
4058 | + lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 | ||
4059 | + ;; | ||
4060 | + *-*-cygwin* ) | ||
4061 | + lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 | ||
4062 | + ;; | ||
4063 | + * ) # otherwise, assume *nix | ||
4064 | + lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 | ||
4065 | + ;; | ||
4066 | + esac | ||
4067 | + ;; | ||
4068 | + *-*-cygwin* ) | ||
4069 | + case $build in | ||
4070 | + *-*-mingw* ) # actually msys | ||
4071 | + lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin | ||
4072 | + ;; | ||
4073 | + *-*-cygwin* ) | ||
4074 | + lt_cv_to_host_file_cmd=func_convert_file_noop | ||
4075 | + ;; | ||
4076 | + * ) # otherwise, assume *nix | ||
4077 | + lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin | ||
4078 | + ;; | ||
4079 | + esac | ||
4080 | + ;; | ||
4081 | + * ) # unhandled hosts (and "normal" native builds) | ||
4082 | + lt_cv_to_host_file_cmd=func_convert_file_noop | ||
4083 | + ;; | ||
4084 | +esac | ||
4085 | + | ||
4086 | +fi | ||
4087 | + | ||
4088 | +to_host_file_cmd=$lt_cv_to_host_file_cmd | ||
4089 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5 | ||
4090 | +$as_echo "$lt_cv_to_host_file_cmd" >&6; } | ||
4091 | + | ||
4092 | + | ||
4093 | + | ||
4094 | + | ||
4095 | + | ||
4096 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5 | ||
4097 | +$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; } | ||
4098 | +if ${lt_cv_to_tool_file_cmd+:} false; then : | ||
4099 | + $as_echo_n "(cached) " >&6 | ||
4100 | +else | ||
4101 | + #assume ordinary cross tools, or native build. | ||
4102 | +lt_cv_to_tool_file_cmd=func_convert_file_noop | ||
4103 | +case $host in | ||
4104 | + *-*-mingw* ) | ||
4105 | + case $build in | ||
4106 | + *-*-mingw* ) # actually msys | ||
4107 | + lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 | ||
4108 | + ;; | ||
4109 | + esac | ||
4110 | + ;; | ||
4111 | +esac | ||
4112 | + | ||
4113 | +fi | ||
4114 | + | ||
4115 | +to_tool_file_cmd=$lt_cv_to_tool_file_cmd | ||
4116 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5 | ||
4117 | +$as_echo "$lt_cv_to_tool_file_cmd" >&6; } | ||
4118 | + | ||
4119 | + | ||
4120 | + | ||
4121 | + | ||
4122 | + | ||
4123 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 | ||
4124 | $as_echo_n "checking for $LD option to reload object files... " >&6; } | ||
4125 | if ${lt_cv_ld_reload_flag+:} false; then : | ||
4126 | @@ -5452,6 +5532,11 @@ case $reload_flag in | ||
4127 | esac | ||
4128 | reload_cmds='$LD$reload_flag -o $output$reload_objs' | ||
4129 | case $host_os in | ||
4130 | + cygwin* | mingw* | pw32* | cegcc*) | ||
4131 | + if test "$GCC" != yes; then | ||
4132 | + reload_cmds=false | ||
4133 | + fi | ||
4134 | + ;; | ||
4135 | darwin*) | ||
4136 | if test "$GCC" = yes; then | ||
4137 | reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' | ||
4138 | @@ -5620,7 +5705,8 @@ mingw* | pw32*) | ||
4139 | lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' | ||
4140 | lt_cv_file_magic_cmd='func_win32_libid' | ||
4141 | else | ||
4142 | - lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' | ||
4143 | + # Keep this pattern in sync with the one in func_win32_libid. | ||
4144 | + lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' | ||
4145 | lt_cv_file_magic_cmd='$OBJDUMP -f' | ||
4146 | fi | ||
4147 | ;; | ||
4148 | @@ -5779,6 +5865,21 @@ esac | ||
4149 | fi | ||
4150 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 | ||
4151 | $as_echo "$lt_cv_deplibs_check_method" >&6; } | ||
4152 | + | ||
4153 | +file_magic_glob= | ||
4154 | +want_nocaseglob=no | ||
4155 | +if test "$build" = "$host"; then | ||
4156 | + case $host_os in | ||
4157 | + mingw* | pw32*) | ||
4158 | + if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then | ||
4159 | + want_nocaseglob=yes | ||
4160 | + else | ||
4161 | + file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"` | ||
4162 | + fi | ||
4163 | + ;; | ||
4164 | + esac | ||
4165 | +fi | ||
4166 | + | ||
4167 | file_magic_cmd=$lt_cv_file_magic_cmd | ||
4168 | deplibs_check_method=$lt_cv_deplibs_check_method | ||
4169 | test -z "$deplibs_check_method" && deplibs_check_method=unknown | ||
4170 | @@ -5794,6 +5895,157 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown | ||
4171 | |||
4172 | |||
4173 | |||
4174 | + | ||
4175 | + | ||
4176 | + | ||
4177 | + | ||
4178 | + | ||
4179 | + | ||
4180 | + | ||
4181 | + | ||
4182 | + | ||
4183 | + | ||
4184 | +if test -n "$ac_tool_prefix"; then | ||
4185 | + # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. | ||
4186 | +set dummy ${ac_tool_prefix}dlltool; ac_word=$2 | ||
4187 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
4188 | +$as_echo_n "checking for $ac_word... " >&6; } | ||
4189 | +if ${ac_cv_prog_DLLTOOL+:} false; then : | ||
4190 | + $as_echo_n "(cached) " >&6 | ||
4191 | +else | ||
4192 | + if test -n "$DLLTOOL"; then | ||
4193 | + ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. | ||
4194 | +else | ||
4195 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | ||
4196 | +for as_dir in $PATH | ||
4197 | +do | ||
4198 | + IFS=$as_save_IFS | ||
4199 | + test -z "$as_dir" && as_dir=. | ||
4200 | + for ac_exec_ext in '' $ac_executable_extensions; do | ||
4201 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | ||
4202 | + ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" | ||
4203 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
4204 | + break 2 | ||
4205 | + fi | ||
4206 | +done | ||
4207 | + done | ||
4208 | +IFS=$as_save_IFS | ||
4209 | + | ||
4210 | +fi | ||
4211 | +fi | ||
4212 | +DLLTOOL=$ac_cv_prog_DLLTOOL | ||
4213 | +if test -n "$DLLTOOL"; then | ||
4214 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 | ||
4215 | +$as_echo "$DLLTOOL" >&6; } | ||
4216 | +else | ||
4217 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
4218 | +$as_echo "no" >&6; } | ||
4219 | +fi | ||
4220 | + | ||
4221 | + | ||
4222 | +fi | ||
4223 | +if test -z "$ac_cv_prog_DLLTOOL"; then | ||
4224 | + ac_ct_DLLTOOL=$DLLTOOL | ||
4225 | + # Extract the first word of "dlltool", so it can be a program name with args. | ||
4226 | +set dummy dlltool; ac_word=$2 | ||
4227 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
4228 | +$as_echo_n "checking for $ac_word... " >&6; } | ||
4229 | +if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then : | ||
4230 | + $as_echo_n "(cached) " >&6 | ||
4231 | +else | ||
4232 | + if test -n "$ac_ct_DLLTOOL"; then | ||
4233 | + ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. | ||
4234 | +else | ||
4235 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | ||
4236 | +for as_dir in $PATH | ||
4237 | +do | ||
4238 | + IFS=$as_save_IFS | ||
4239 | + test -z "$as_dir" && as_dir=. | ||
4240 | + for ac_exec_ext in '' $ac_executable_extensions; do | ||
4241 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | ||
4242 | + ac_cv_prog_ac_ct_DLLTOOL="dlltool" | ||
4243 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
4244 | + break 2 | ||
4245 | + fi | ||
4246 | +done | ||
4247 | + done | ||
4248 | +IFS=$as_save_IFS | ||
4249 | + | ||
4250 | +fi | ||
4251 | +fi | ||
4252 | +ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL | ||
4253 | +if test -n "$ac_ct_DLLTOOL"; then | ||
4254 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 | ||
4255 | +$as_echo "$ac_ct_DLLTOOL" >&6; } | ||
4256 | +else | ||
4257 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
4258 | +$as_echo "no" >&6; } | ||
4259 | +fi | ||
4260 | + | ||
4261 | + if test "x$ac_ct_DLLTOOL" = x; then | ||
4262 | + DLLTOOL="false" | ||
4263 | + else | ||
4264 | + case $cross_compiling:$ac_tool_warned in | ||
4265 | +yes:) | ||
4266 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 | ||
4267 | +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} | ||
4268 | +ac_tool_warned=yes ;; | ||
4269 | +esac | ||
4270 | + DLLTOOL=$ac_ct_DLLTOOL | ||
4271 | + fi | ||
4272 | +else | ||
4273 | + DLLTOOL="$ac_cv_prog_DLLTOOL" | ||
4274 | +fi | ||
4275 | + | ||
4276 | +test -z "$DLLTOOL" && DLLTOOL=dlltool | ||
4277 | + | ||
4278 | + | ||
4279 | + | ||
4280 | + | ||
4281 | + | ||
4282 | + | ||
4283 | + | ||
4284 | + | ||
4285 | + | ||
4286 | + | ||
4287 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5 | ||
4288 | +$as_echo_n "checking how to associate runtime and link libraries... " >&6; } | ||
4289 | +if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then : | ||
4290 | + $as_echo_n "(cached) " >&6 | ||
4291 | +else | ||
4292 | + lt_cv_sharedlib_from_linklib_cmd='unknown' | ||
4293 | + | ||
4294 | +case $host_os in | ||
4295 | +cygwin* | mingw* | pw32* | cegcc*) | ||
4296 | + # two different shell functions defined in ltmain.sh | ||
4297 | + # decide which to use based on capabilities of $DLLTOOL | ||
4298 | + case `$DLLTOOL --help 2>&1` in | ||
4299 | + *--identify-strict*) | ||
4300 | + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib | ||
4301 | + ;; | ||
4302 | + *) | ||
4303 | + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback | ||
4304 | + ;; | ||
4305 | + esac | ||
4306 | + ;; | ||
4307 | +*) | ||
4308 | + # fallback: assume linklib IS sharedlib | ||
4309 | + lt_cv_sharedlib_from_linklib_cmd="$ECHO" | ||
4310 | + ;; | ||
4311 | +esac | ||
4312 | + | ||
4313 | +fi | ||
4314 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5 | ||
4315 | +$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; } | ||
4316 | +sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd | ||
4317 | +test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO | ||
4318 | + | ||
4319 | + | ||
4320 | + | ||
4321 | + | ||
4322 | + | ||
4323 | + | ||
4324 | + | ||
4325 | plugin_option= | ||
4326 | plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll" | ||
4327 | for plugin in $plugin_names; do | ||
4328 | @@ -5808,8 +6060,10 @@ for plugin in $plugin_names; do | ||
4329 | done | ||
4330 | |||
4331 | if test -n "$ac_tool_prefix"; then | ||
4332 | - # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. | ||
4333 | -set dummy ${ac_tool_prefix}ar; ac_word=$2 | ||
4334 | + for ac_prog in ar | ||
4335 | + do | ||
4336 | + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. | ||
4337 | +set dummy $ac_tool_prefix$ac_prog; ac_word=$2 | ||
4338 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
4339 | $as_echo_n "checking for $ac_word... " >&6; } | ||
4340 | if ${ac_cv_prog_AR+:} false; then : | ||
4341 | @@ -5825,7 +6079,7 @@ do | ||
4342 | test -z "$as_dir" && as_dir=. | ||
4343 | for ac_exec_ext in '' $ac_executable_extensions; do | ||
4344 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | ||
4345 | - ac_cv_prog_AR="${ac_tool_prefix}ar" | ||
4346 | + ac_cv_prog_AR="$ac_tool_prefix$ac_prog" | ||
4347 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
4348 | break 2 | ||
4349 | fi | ||
4350 | @@ -5845,11 +6099,15 @@ $as_echo "no" >&6; } | ||
4351 | fi | ||
4352 | |||
4353 | |||
4354 | + test -n "$AR" && break | ||
4355 | + done | ||
4356 | fi | ||
4357 | -if test -z "$ac_cv_prog_AR"; then | ||
4358 | +if test -z "$AR"; then | ||
4359 | ac_ct_AR=$AR | ||
4360 | - # Extract the first word of "ar", so it can be a program name with args. | ||
4361 | -set dummy ar; ac_word=$2 | ||
4362 | + for ac_prog in ar | ||
4363 | +do | ||
4364 | + # Extract the first word of "$ac_prog", so it can be a program name with args. | ||
4365 | +set dummy $ac_prog; ac_word=$2 | ||
4366 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
4367 | $as_echo_n "checking for $ac_word... " >&6; } | ||
4368 | if ${ac_cv_prog_ac_ct_AR+:} false; then : | ||
4369 | @@ -5865,7 +6123,7 @@ do | ||
4370 | test -z "$as_dir" && as_dir=. | ||
4371 | for ac_exec_ext in '' $ac_executable_extensions; do | ||
4372 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | ||
4373 | - ac_cv_prog_ac_ct_AR="ar" | ||
4374 | + ac_cv_prog_ac_ct_AR="$ac_prog" | ||
4375 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
4376 | break 2 | ||
4377 | fi | ||
4378 | @@ -5884,6 +6142,10 @@ else | ||
4379 | $as_echo "no" >&6; } | ||
4380 | fi | ||
4381 | |||
4382 | + | ||
4383 | + test -n "$ac_ct_AR" && break | ||
4384 | +done | ||
4385 | + | ||
4386 | if test "x$ac_ct_AR" = x; then | ||
4387 | AR="false" | ||
4388 | else | ||
4389 | @@ -5895,29 +6157,81 @@ ac_tool_warned=yes ;; | ||
4390 | esac | ||
4391 | AR=$ac_ct_AR | ||
4392 | fi | ||
4393 | -else | ||
4394 | - AR="$ac_cv_prog_AR" | ||
4395 | fi | ||
4396 | |||
4397 | -test -z "$AR" && AR=ar | ||
4398 | -if test -n "$plugin_option"; then | ||
4399 | - if $AR --help 2>&1 | grep -q "\--plugin"; then | ||
4400 | - touch conftest.c | ||
4401 | - $AR $plugin_option rc conftest.a conftest.c | ||
4402 | - if test "$?" != 0; then | ||
4403 | - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5 | ||
4404 | + touch conftest.c | ||
4405 | + $AR $plugin_option rc conftest.a conftest.c | ||
4406 | + if test "$?" != 0; then | ||
4407 | + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5 | ||
4408 | $as_echo "$as_me: WARNING: Failed: $AR $plugin_option rc" >&2;} | ||
4409 | - else | ||
4410 | - AR="$AR $plugin_option" | ||
4411 | - fi | ||
4412 | - rm -f conftest.* | ||
4413 | + else | ||
4414 | + AR="$AR $plugin_option" | ||
4415 | fi | ||
4416 | -fi | ||
4417 | -test -z "$AR_FLAGS" && AR_FLAGS=cru | ||
4418 | + rm -f conftest.* | ||
4419 | +: ${AR=ar} | ||
4420 | +: ${AR_FLAGS=cru} | ||
4421 | + | ||
4422 | + | ||
4423 | + | ||
4424 | + | ||
4425 | + | ||
4426 | + | ||
4427 | + | ||
4428 | + | ||
4429 | + | ||
4430 | + | ||
4431 | + | ||
4432 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 | ||
4433 | +$as_echo_n "checking for archiver @FILE support... " >&6; } | ||
4434 | +if ${lt_cv_ar_at_file+:} false; then : | ||
4435 | + $as_echo_n "(cached) " >&6 | ||
4436 | +else | ||
4437 | + lt_cv_ar_at_file=no | ||
4438 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
4439 | +/* end confdefs.h. */ | ||
4440 | + | ||
4441 | +int | ||
4442 | +main () | ||
4443 | +{ | ||
4444 | |||
4445 | + ; | ||
4446 | + return 0; | ||
4447 | +} | ||
4448 | +_ACEOF | ||
4449 | +if ac_fn_c_try_compile "$LINENO"; then : | ||
4450 | + echo conftest.$ac_objext > conftest.lst | ||
4451 | + lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5' | ||
4452 | + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 | ||
4453 | + (eval $lt_ar_try) 2>&5 | ||
4454 | + ac_status=$? | ||
4455 | + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 | ||
4456 | + test $ac_status = 0; } | ||
4457 | + if test "$ac_status" -eq 0; then | ||
4458 | + # Ensure the archiver fails upon bogus file names. | ||
4459 | + rm -f conftest.$ac_objext libconftest.a | ||
4460 | + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 | ||
4461 | + (eval $lt_ar_try) 2>&5 | ||
4462 | + ac_status=$? | ||
4463 | + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 | ||
4464 | + test $ac_status = 0; } | ||
4465 | + if test "$ac_status" -ne 0; then | ||
4466 | + lt_cv_ar_at_file=@ | ||
4467 | + fi | ||
4468 | + fi | ||
4469 | + rm -f conftest.* libconftest.a | ||
4470 | |||
4471 | +fi | ||
4472 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
4473 | |||
4474 | +fi | ||
4475 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 | ||
4476 | +$as_echo "$lt_cv_ar_at_file" >&6; } | ||
4477 | |||
4478 | +if test "x$lt_cv_ar_at_file" = xno; then | ||
4479 | + archiver_list_spec= | ||
4480 | +else | ||
4481 | + archiver_list_spec=$lt_cv_ar_at_file | ||
4482 | +fi | ||
4483 | |||
4484 | |||
4485 | |||
4486 | @@ -6264,8 +6578,8 @@ esac | ||
4487 | lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" | ||
4488 | |||
4489 | # Transform an extracted symbol line into symbol name and symbol address | ||
4490 | -lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" | ||
4491 | -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'" | ||
4492 | +lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" | ||
4493 | +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'" | ||
4494 | |||
4495 | # Handle CRLF in mingw tool chain | ||
4496 | opt_cr= | ||
4497 | @@ -6301,6 +6615,7 @@ for ac_symprfx in "" "_"; do | ||
4498 | else | ||
4499 | lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" | ||
4500 | fi | ||
4501 | + lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" | ||
4502 | |||
4503 | # Check to see that the pipe works correctly. | ||
4504 | pipe_works=no | ||
4505 | @@ -6342,6 +6657,18 @@ _LT_EOF | ||
4506 | if $GREP ' nm_test_var$' "$nlist" >/dev/null; then | ||
4507 | if $GREP ' nm_test_func$' "$nlist" >/dev/null; then | ||
4508 | cat <<_LT_EOF > conftest.$ac_ext | ||
4509 | +/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ | ||
4510 | +#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) | ||
4511 | +/* DATA imports from DLLs on WIN32 con't be const, because runtime | ||
4512 | + relocations are performed -- see ld's documentation on pseudo-relocs. */ | ||
4513 | +# define LT_DLSYM_CONST | ||
4514 | +#elif defined(__osf__) | ||
4515 | +/* This system does not cope well with relocations in const data. */ | ||
4516 | +# define LT_DLSYM_CONST | ||
4517 | +#else | ||
4518 | +# define LT_DLSYM_CONST const | ||
4519 | +#endif | ||
4520 | + | ||
4521 | #ifdef __cplusplus | ||
4522 | extern "C" { | ||
4523 | #endif | ||
4524 | @@ -6353,7 +6680,7 @@ _LT_EOF | ||
4525 | cat <<_LT_EOF >> conftest.$ac_ext | ||
4526 | |||
4527 | /* The mapping between symbol names and symbols. */ | ||
4528 | -const struct { | ||
4529 | +LT_DLSYM_CONST struct { | ||
4530 | const char *name; | ||
4531 | void *address; | ||
4532 | } | ||
4533 | @@ -6379,8 +6706,8 @@ static const void *lt_preloaded_setup() { | ||
4534 | _LT_EOF | ||
4535 | # Now try linking the two files. | ||
4536 | mv conftest.$ac_objext conftstm.$ac_objext | ||
4537 | - lt_save_LIBS="$LIBS" | ||
4538 | - lt_save_CFLAGS="$CFLAGS" | ||
4539 | + lt_globsym_save_LIBS=$LIBS | ||
4540 | + lt_globsym_save_CFLAGS=$CFLAGS | ||
4541 | LIBS="conftstm.$ac_objext" | ||
4542 | CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" | ||
4543 | if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 | ||
4544 | @@ -6390,8 +6717,8 @@ _LT_EOF | ||
4545 | test $ac_status = 0; } && test -s conftest${ac_exeext}; then | ||
4546 | pipe_works=yes | ||
4547 | fi | ||
4548 | - LIBS="$lt_save_LIBS" | ||
4549 | - CFLAGS="$lt_save_CFLAGS" | ||
4550 | + LIBS=$lt_globsym_save_LIBS | ||
4551 | + CFLAGS=$lt_globsym_save_CFLAGS | ||
4552 | else | ||
4553 | echo "cannot find nm_test_func in $nlist" >&5 | ||
4554 | fi | ||
4555 | @@ -6428,6 +6755,19 @@ else | ||
4556 | $as_echo "ok" >&6; } | ||
4557 | fi | ||
4558 | |||
4559 | +# Response file support. | ||
4560 | +if test "$lt_cv_nm_interface" = "MS dumpbin"; then | ||
4561 | + nm_file_list_spec='@' | ||
4562 | +elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then | ||
4563 | + nm_file_list_spec='@' | ||
4564 | +fi | ||
4565 | + | ||
4566 | + | ||
4567 | + | ||
4568 | + | ||
4569 | + | ||
4570 | + | ||
4571 | + | ||
4572 | |||
4573 | |||
4574 | |||
4575 | @@ -6444,6 +6784,42 @@ fi | ||
4576 | |||
4577 | |||
4578 | |||
4579 | + | ||
4580 | + | ||
4581 | + | ||
4582 | + | ||
4583 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 | ||
4584 | +$as_echo_n "checking for sysroot... " >&6; } | ||
4585 | + | ||
4586 | +# Check whether --with-libtool-sysroot was given. | ||
4587 | +if test "${with_libtool_sysroot+set}" = set; then : | ||
4588 | + withval=$with_libtool_sysroot; | ||
4589 | +else | ||
4590 | + with_libtool_sysroot=no | ||
4591 | +fi | ||
4592 | + | ||
4593 | + | ||
4594 | +lt_sysroot= | ||
4595 | +case ${with_libtool_sysroot} in #( | ||
4596 | + yes) | ||
4597 | + if test "$GCC" = yes; then | ||
4598 | + lt_sysroot=`$CC --print-sysroot 2>/dev/null` | ||
4599 | + fi | ||
4600 | + ;; #( | ||
4601 | + /*) | ||
4602 | + lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"` | ||
4603 | + ;; #( | ||
4604 | + no|'') | ||
4605 | + ;; #( | ||
4606 | + *) | ||
4607 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5 | ||
4608 | +$as_echo "${with_libtool_sysroot}" >&6; } | ||
4609 | + as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 | ||
4610 | + ;; | ||
4611 | +esac | ||
4612 | + | ||
4613 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 | ||
4614 | +$as_echo "${lt_sysroot:-no}" >&6; } | ||
4615 | |||
4616 | |||
4617 | |||
4618 | @@ -6655,6 +7031,123 @@ esac | ||
4619 | |||
4620 | need_locks="$enable_libtool_lock" | ||
4621 | |||
4622 | +if test -n "$ac_tool_prefix"; then | ||
4623 | + # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args. | ||
4624 | +set dummy ${ac_tool_prefix}mt; ac_word=$2 | ||
4625 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
4626 | +$as_echo_n "checking for $ac_word... " >&6; } | ||
4627 | +if ${ac_cv_prog_MANIFEST_TOOL+:} false; then : | ||
4628 | + $as_echo_n "(cached) " >&6 | ||
4629 | +else | ||
4630 | + if test -n "$MANIFEST_TOOL"; then | ||
4631 | + ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test. | ||
4632 | +else | ||
4633 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | ||
4634 | +for as_dir in $PATH | ||
4635 | +do | ||
4636 | + IFS=$as_save_IFS | ||
4637 | + test -z "$as_dir" && as_dir=. | ||
4638 | + for ac_exec_ext in '' $ac_executable_extensions; do | ||
4639 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | ||
4640 | + ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" | ||
4641 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
4642 | + break 2 | ||
4643 | + fi | ||
4644 | +done | ||
4645 | + done | ||
4646 | +IFS=$as_save_IFS | ||
4647 | + | ||
4648 | +fi | ||
4649 | +fi | ||
4650 | +MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL | ||
4651 | +if test -n "$MANIFEST_TOOL"; then | ||
4652 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5 | ||
4653 | +$as_echo "$MANIFEST_TOOL" >&6; } | ||
4654 | +else | ||
4655 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
4656 | +$as_echo "no" >&6; } | ||
4657 | +fi | ||
4658 | + | ||
4659 | + | ||
4660 | +fi | ||
4661 | +if test -z "$ac_cv_prog_MANIFEST_TOOL"; then | ||
4662 | + ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL | ||
4663 | + # Extract the first word of "mt", so it can be a program name with args. | ||
4664 | +set dummy mt; ac_word=$2 | ||
4665 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
4666 | +$as_echo_n "checking for $ac_word... " >&6; } | ||
4667 | +if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then : | ||
4668 | + $as_echo_n "(cached) " >&6 | ||
4669 | +else | ||
4670 | + if test -n "$ac_ct_MANIFEST_TOOL"; then | ||
4671 | + ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test. | ||
4672 | +else | ||
4673 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | ||
4674 | +for as_dir in $PATH | ||
4675 | +do | ||
4676 | + IFS=$as_save_IFS | ||
4677 | + test -z "$as_dir" && as_dir=. | ||
4678 | + for ac_exec_ext in '' $ac_executable_extensions; do | ||
4679 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | ||
4680 | + ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" | ||
4681 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
4682 | + break 2 | ||
4683 | + fi | ||
4684 | +done | ||
4685 | + done | ||
4686 | +IFS=$as_save_IFS | ||
4687 | + | ||
4688 | +fi | ||
4689 | +fi | ||
4690 | +ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL | ||
4691 | +if test -n "$ac_ct_MANIFEST_TOOL"; then | ||
4692 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5 | ||
4693 | +$as_echo "$ac_ct_MANIFEST_TOOL" >&6; } | ||
4694 | +else | ||
4695 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
4696 | +$as_echo "no" >&6; } | ||
4697 | +fi | ||
4698 | + | ||
4699 | + if test "x$ac_ct_MANIFEST_TOOL" = x; then | ||
4700 | + MANIFEST_TOOL=":" | ||
4701 | + else | ||
4702 | + case $cross_compiling:$ac_tool_warned in | ||
4703 | +yes:) | ||
4704 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 | ||
4705 | +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} | ||
4706 | +ac_tool_warned=yes ;; | ||
4707 | +esac | ||
4708 | + MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL | ||
4709 | + fi | ||
4710 | +else | ||
4711 | + MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL" | ||
4712 | +fi | ||
4713 | + | ||
4714 | +test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt | ||
4715 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5 | ||
4716 | +$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; } | ||
4717 | +if ${lt_cv_path_mainfest_tool+:} false; then : | ||
4718 | + $as_echo_n "(cached) " >&6 | ||
4719 | +else | ||
4720 | + lt_cv_path_mainfest_tool=no | ||
4721 | + echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5 | ||
4722 | + $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out | ||
4723 | + cat conftest.err >&5 | ||
4724 | + if $GREP 'Manifest Tool' conftest.out > /dev/null; then | ||
4725 | + lt_cv_path_mainfest_tool=yes | ||
4726 | + fi | ||
4727 | + rm -f conftest* | ||
4728 | +fi | ||
4729 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5 | ||
4730 | +$as_echo "$lt_cv_path_mainfest_tool" >&6; } | ||
4731 | +if test "x$lt_cv_path_mainfest_tool" != xyes; then | ||
4732 | + MANIFEST_TOOL=: | ||
4733 | +fi | ||
4734 | + | ||
4735 | + | ||
4736 | + | ||
4737 | + | ||
4738 | + | ||
4739 | |||
4740 | case $host_os in | ||
4741 | rhapsody* | darwin*) | ||
4742 | @@ -7218,6 +7711,8 @@ _LT_EOF | ||
4743 | $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 | ||
4744 | echo "$AR cru libconftest.a conftest.o" >&5 | ||
4745 | $AR cru libconftest.a conftest.o 2>&5 | ||
4746 | + echo "$RANLIB libconftest.a" >&5 | ||
4747 | + $RANLIB libconftest.a 2>&5 | ||
4748 | cat > conftest.c << _LT_EOF | ||
4749 | int main() { return 0;} | ||
4750 | _LT_EOF | ||
4751 | @@ -7802,8 +8297,6 @@ fi | ||
4752 | lt_prog_compiler_pic= | ||
4753 | lt_prog_compiler_static= | ||
4754 | |||
4755 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 | ||
4756 | -$as_echo_n "checking for $compiler option to produce PIC... " >&6; } | ||
4757 | |||
4758 | if test "$GCC" = yes; then | ||
4759 | lt_prog_compiler_wl='-Wl,' | ||
4760 | @@ -7969,6 +8462,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } | ||
4761 | lt_prog_compiler_pic='--shared' | ||
4762 | lt_prog_compiler_static='--static' | ||
4763 | ;; | ||
4764 | + nagfor*) | ||
4765 | + # NAG Fortran compiler | ||
4766 | + lt_prog_compiler_wl='-Wl,-Wl,,' | ||
4767 | + lt_prog_compiler_pic='-PIC' | ||
4768 | + lt_prog_compiler_static='-Bstatic' | ||
4769 | + ;; | ||
4770 | pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) | ||
4771 | # Portland Group compilers (*not* the Pentium gcc compiler, | ||
4772 | # which looks to be a dead project) | ||
4773 | @@ -8031,7 +8530,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } | ||
4774 | lt_prog_compiler_pic='-KPIC' | ||
4775 | lt_prog_compiler_static='-Bstatic' | ||
4776 | case $cc_basename in | ||
4777 | - f77* | f90* | f95*) | ||
4778 | + f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) | ||
4779 | lt_prog_compiler_wl='-Qoption ld ';; | ||
4780 | *) | ||
4781 | lt_prog_compiler_wl='-Wl,';; | ||
4782 | @@ -8088,13 +8587,17 @@ case $host_os in | ||
4783 | lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" | ||
4784 | ;; | ||
4785 | esac | ||
4786 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5 | ||
4787 | -$as_echo "$lt_prog_compiler_pic" >&6; } | ||
4788 | - | ||
4789 | - | ||
4790 | - | ||
4791 | - | ||
4792 | |||
4793 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 | ||
4794 | +$as_echo_n "checking for $compiler option to produce PIC... " >&6; } | ||
4795 | +if ${lt_cv_prog_compiler_pic+:} false; then : | ||
4796 | + $as_echo_n "(cached) " >&6 | ||
4797 | +else | ||
4798 | + lt_cv_prog_compiler_pic=$lt_prog_compiler_pic | ||
4799 | +fi | ||
4800 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5 | ||
4801 | +$as_echo "$lt_cv_prog_compiler_pic" >&6; } | ||
4802 | +lt_prog_compiler_pic=$lt_cv_prog_compiler_pic | ||
4803 | |||
4804 | # | ||
4805 | # Check to make sure the PIC flag actually works. | ||
4806 | @@ -8155,6 +8658,11 @@ fi | ||
4807 | |||
4808 | |||
4809 | |||
4810 | + | ||
4811 | + | ||
4812 | + | ||
4813 | + | ||
4814 | + | ||
4815 | # | ||
4816 | # Check to make sure the static flag actually works. | ||
4817 | # | ||
4818 | @@ -8505,7 +9013,8 @@ _LT_EOF | ||
4819 | allow_undefined_flag=unsupported | ||
4820 | always_export_symbols=no | ||
4821 | enable_shared_with_static_runtimes=yes | ||
4822 | - export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' | ||
4823 | + 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' | ||
4824 | + exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' | ||
4825 | |||
4826 | if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then | ||
4827 | archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' | ||
4828 | @@ -8604,12 +9113,12 @@ _LT_EOF | ||
4829 | whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' | ||
4830 | hardcode_libdir_flag_spec= | ||
4831 | hardcode_libdir_flag_spec_ld='-rpath $libdir' | ||
4832 | - archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' | ||
4833 | + archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' | ||
4834 | if test "x$supports_anon_versioning" = xyes; then | ||
4835 | archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ | ||
4836 | cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ | ||
4837 | echo "local: *; };" >> $output_objdir/$libname.ver~ | ||
4838 | - $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' | ||
4839 | + $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' | ||
4840 | fi | ||
4841 | ;; | ||
4842 | esac | ||
4843 | @@ -8623,8 +9132,8 @@ _LT_EOF | ||
4844 | archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' | ||
4845 | wlarc= | ||
4846 | else | ||
4847 | - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' | ||
4848 | - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' | ||
4849 | + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' | ||
4850 | + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' | ||
4851 | fi | ||
4852 | ;; | ||
4853 | |||
4854 | @@ -8642,8 +9151,8 @@ _LT_EOF | ||
4855 | |||
4856 | _LT_EOF | ||
4857 | elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then | ||
4858 | - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' | ||
4859 | - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' | ||
4860 | + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' | ||
4861 | + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' | ||
4862 | else | ||
4863 | ld_shlibs=no | ||
4864 | fi | ||
4865 | @@ -8689,8 +9198,8 @@ _LT_EOF | ||
4866 | |||
4867 | *) | ||
4868 | if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then | ||
4869 | - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' | ||
4870 | - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' | ||
4871 | + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' | ||
4872 | + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' | ||
4873 | else | ||
4874 | ld_shlibs=no | ||
4875 | fi | ||
4876 | @@ -8820,7 +9329,13 @@ _LT_EOF | ||
4877 | allow_undefined_flag='-berok' | ||
4878 | # Determine the default libpath from the value encoded in an | ||
4879 | # empty executable. | ||
4880 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
4881 | + if test "${lt_cv_aix_libpath+set}" = set; then | ||
4882 | + aix_libpath=$lt_cv_aix_libpath | ||
4883 | +else | ||
4884 | + if ${lt_cv_aix_libpath_+:} false; then : | ||
4885 | + $as_echo_n "(cached) " >&6 | ||
4886 | +else | ||
4887 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
4888 | /* end confdefs.h. */ | ||
4889 | |||
4890 | int | ||
4891 | @@ -8833,22 +9348,29 @@ main () | ||
4892 | _ACEOF | ||
4893 | if ac_fn_c_try_link "$LINENO"; then : | ||
4894 | |||
4895 | -lt_aix_libpath_sed=' | ||
4896 | - /Import File Strings/,/^$/ { | ||
4897 | - /^0/ { | ||
4898 | - s/^0 *\(.*\)$/\1/ | ||
4899 | - p | ||
4900 | - } | ||
4901 | - }' | ||
4902 | -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | ||
4903 | -# Check for a 64-bit object if we didn't find anything. | ||
4904 | -if test -z "$aix_libpath"; then | ||
4905 | - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | ||
4906 | -fi | ||
4907 | + lt_aix_libpath_sed=' | ||
4908 | + /Import File Strings/,/^$/ { | ||
4909 | + /^0/ { | ||
4910 | + s/^0 *\([^ ]*\) *$/\1/ | ||
4911 | + p | ||
4912 | + } | ||
4913 | + }' | ||
4914 | + lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | ||
4915 | + # Check for a 64-bit object if we didn't find anything. | ||
4916 | + if test -z "$lt_cv_aix_libpath_"; then | ||
4917 | + lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | ||
4918 | + fi | ||
4919 | fi | ||
4920 | rm -f core conftest.err conftest.$ac_objext \ | ||
4921 | conftest$ac_exeext conftest.$ac_ext | ||
4922 | -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | ||
4923 | + if test -z "$lt_cv_aix_libpath_"; then | ||
4924 | + lt_cv_aix_libpath_="/usr/lib:/lib" | ||
4925 | + fi | ||
4926 | + | ||
4927 | +fi | ||
4928 | + | ||
4929 | + aix_libpath=$lt_cv_aix_libpath_ | ||
4930 | +fi | ||
4931 | |||
4932 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" | ||
4933 | archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" | ||
4934 | @@ -8860,7 +9382,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | ||
4935 | else | ||
4936 | # Determine the default libpath from the value encoded in an | ||
4937 | # empty executable. | ||
4938 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
4939 | + if test "${lt_cv_aix_libpath+set}" = set; then | ||
4940 | + aix_libpath=$lt_cv_aix_libpath | ||
4941 | +else | ||
4942 | + if ${lt_cv_aix_libpath_+:} false; then : | ||
4943 | + $as_echo_n "(cached) " >&6 | ||
4944 | +else | ||
4945 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
4946 | /* end confdefs.h. */ | ||
4947 | |||
4948 | int | ||
4949 | @@ -8873,22 +9401,29 @@ main () | ||
4950 | _ACEOF | ||
4951 | if ac_fn_c_try_link "$LINENO"; then : | ||
4952 | |||
4953 | -lt_aix_libpath_sed=' | ||
4954 | - /Import File Strings/,/^$/ { | ||
4955 | - /^0/ { | ||
4956 | - s/^0 *\(.*\)$/\1/ | ||
4957 | - p | ||
4958 | - } | ||
4959 | - }' | ||
4960 | -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | ||
4961 | -# Check for a 64-bit object if we didn't find anything. | ||
4962 | -if test -z "$aix_libpath"; then | ||
4963 | - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | ||
4964 | -fi | ||
4965 | + lt_aix_libpath_sed=' | ||
4966 | + /Import File Strings/,/^$/ { | ||
4967 | + /^0/ { | ||
4968 | + s/^0 *\([^ ]*\) *$/\1/ | ||
4969 | + p | ||
4970 | + } | ||
4971 | + }' | ||
4972 | + lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | ||
4973 | + # Check for a 64-bit object if we didn't find anything. | ||
4974 | + if test -z "$lt_cv_aix_libpath_"; then | ||
4975 | + lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | ||
4976 | + fi | ||
4977 | fi | ||
4978 | rm -f core conftest.err conftest.$ac_objext \ | ||
4979 | conftest$ac_exeext conftest.$ac_ext | ||
4980 | -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | ||
4981 | + if test -z "$lt_cv_aix_libpath_"; then | ||
4982 | + lt_cv_aix_libpath_="/usr/lib:/lib" | ||
4983 | + fi | ||
4984 | + | ||
4985 | +fi | ||
4986 | + | ||
4987 | + aix_libpath=$lt_cv_aix_libpath_ | ||
4988 | +fi | ||
4989 | |||
4990 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" | ||
4991 | # Warning - without using the other run time loading flags, | ||
4992 | @@ -8933,20 +9468,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | ||
4993 | # Microsoft Visual C++. | ||
4994 | # hardcode_libdir_flag_spec is actually meaningless, as there is | ||
4995 | # no search path for DLLs. | ||
4996 | - hardcode_libdir_flag_spec=' ' | ||
4997 | - allow_undefined_flag=unsupported | ||
4998 | - # Tell ltmain to make .lib files, not .a files. | ||
4999 | - libext=lib | ||
5000 | - # Tell ltmain to make .dll files, not .so files. | ||
5001 | - shrext_cmds=".dll" | ||
5002 | - # FIXME: Setting linknames here is a bad hack. | ||
5003 | - archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' | ||
5004 | - # The linker will automatically build a .lib file if we build a DLL. | ||
5005 | - old_archive_from_new_cmds='true' | ||
5006 | - # FIXME: Should let the user specify the lib program. | ||
5007 | - old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' | ||
5008 | - fix_srcfile_path='`cygpath -w "$srcfile"`' | ||
5009 | - enable_shared_with_static_runtimes=yes | ||
5010 | + case $cc_basename in | ||
5011 | + cl*) | ||
5012 | + # Native MSVC | ||
5013 | + hardcode_libdir_flag_spec=' ' | ||
5014 | + allow_undefined_flag=unsupported | ||
5015 | + always_export_symbols=yes | ||
5016 | + file_list_spec='@' | ||
5017 | + # Tell ltmain to make .lib files, not .a files. | ||
5018 | + libext=lib | ||
5019 | + # Tell ltmain to make .dll files, not .so files. | ||
5020 | + shrext_cmds=".dll" | ||
5021 | + # FIXME: Setting linknames here is a bad hack. | ||
5022 | + archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' | ||
5023 | + archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then | ||
5024 | + sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; | ||
5025 | + else | ||
5026 | + sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; | ||
5027 | + fi~ | ||
5028 | + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ | ||
5029 | + linknames=' | ||
5030 | + # The linker will not automatically build a static lib if we build a DLL. | ||
5031 | + # _LT_TAGVAR(old_archive_from_new_cmds, )='true' | ||
5032 | + enable_shared_with_static_runtimes=yes | ||
5033 | + export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' | ||
5034 | + # Don't use ranlib | ||
5035 | + old_postinstall_cmds='chmod 644 $oldlib' | ||
5036 | + postlink_cmds='lt_outputfile="@OUTPUT@"~ | ||
5037 | + lt_tool_outputfile="@TOOL_OUTPUT@"~ | ||
5038 | + case $lt_outputfile in | ||
5039 | + *.exe|*.EXE) ;; | ||
5040 | + *) | ||
5041 | + lt_outputfile="$lt_outputfile.exe" | ||
5042 | + lt_tool_outputfile="$lt_tool_outputfile.exe" | ||
5043 | + ;; | ||
5044 | + esac~ | ||
5045 | + if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then | ||
5046 | + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; | ||
5047 | + $RM "$lt_outputfile.manifest"; | ||
5048 | + fi' | ||
5049 | + ;; | ||
5050 | + *) | ||
5051 | + # Assume MSVC wrapper | ||
5052 | + hardcode_libdir_flag_spec=' ' | ||
5053 | + allow_undefined_flag=unsupported | ||
5054 | + # Tell ltmain to make .lib files, not .a files. | ||
5055 | + libext=lib | ||
5056 | + # Tell ltmain to make .dll files, not .so files. | ||
5057 | + shrext_cmds=".dll" | ||
5058 | + # FIXME: Setting linknames here is a bad hack. | ||
5059 | + archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' | ||
5060 | + # The linker will automatically build a .lib file if we build a DLL. | ||
5061 | + old_archive_from_new_cmds='true' | ||
5062 | + # FIXME: Should let the user specify the lib program. | ||
5063 | + old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' | ||
5064 | + enable_shared_with_static_runtimes=yes | ||
5065 | + ;; | ||
5066 | + esac | ||
5067 | ;; | ||
5068 | |||
5069 | darwin* | rhapsody*) | ||
5070 | @@ -9007,7 +9585,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | ||
5071 | |||
5072 | # FreeBSD 3 and greater uses gcc -shared to do shared libraries. | ||
5073 | freebsd* | dragonfly*) | ||
5074 | - archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' | ||
5075 | + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' | ||
5076 | hardcode_libdir_flag_spec='-R$libdir' | ||
5077 | hardcode_direct=yes | ||
5078 | hardcode_shlibpath_var=no | ||
5079 | @@ -9015,7 +9593,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | ||
5080 | |||
5081 | hpux9*) | ||
5082 | if test "$GCC" = yes; then | ||
5083 | - 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' | ||
5084 | + 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' | ||
5085 | else | ||
5086 | archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' | ||
5087 | fi | ||
5088 | @@ -9031,7 +9609,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | ||
5089 | |||
5090 | hpux10*) | ||
5091 | if test "$GCC" = yes && test "$with_gnu_ld" = no; then | ||
5092 | - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' | ||
5093 | + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' | ||
5094 | else | ||
5095 | archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' | ||
5096 | fi | ||
5097 | @@ -9055,10 +9633,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | ||
5098 | archive_cmds='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' | ||
5099 | ;; | ||
5100 | ia64*) | ||
5101 | - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' | ||
5102 | + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' | ||
5103 | ;; | ||
5104 | *) | ||
5105 | - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' | ||
5106 | + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' | ||
5107 | ;; | ||
5108 | esac | ||
5109 | else | ||
5110 | @@ -9137,23 +9715,36 @@ fi | ||
5111 | |||
5112 | irix5* | irix6* | nonstopux*) | ||
5113 | if test "$GCC" = yes; then | ||
5114 | - 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' | ||
5115 | + 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' | ||
5116 | # Try to use the -exported_symbol ld option, if it does not | ||
5117 | # work, assume that -exports_file does not work either and | ||
5118 | # implicitly export all symbols. | ||
5119 | - save_LDFLAGS="$LDFLAGS" | ||
5120 | - LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" | ||
5121 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
5122 | + # This should be the same for all languages, so no per-tag cache variable. | ||
5123 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5 | ||
5124 | +$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; } | ||
5125 | +if ${lt_cv_irix_exported_symbol+:} false; then : | ||
5126 | + $as_echo_n "(cached) " >&6 | ||
5127 | +else | ||
5128 | + save_LDFLAGS="$LDFLAGS" | ||
5129 | + LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" | ||
5130 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
5131 | /* end confdefs.h. */ | ||
5132 | -int foo(void) {} | ||
5133 | +int foo (void) { return 0; } | ||
5134 | _ACEOF | ||
5135 | if ac_fn_c_try_link "$LINENO"; then : | ||
5136 | - 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' | ||
5137 | - | ||
5138 | + lt_cv_irix_exported_symbol=yes | ||
5139 | +else | ||
5140 | + lt_cv_irix_exported_symbol=no | ||
5141 | fi | ||
5142 | rm -f core conftest.err conftest.$ac_objext \ | ||
5143 | conftest$ac_exeext conftest.$ac_ext | ||
5144 | - LDFLAGS="$save_LDFLAGS" | ||
5145 | + LDFLAGS="$save_LDFLAGS" | ||
5146 | +fi | ||
5147 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5 | ||
5148 | +$as_echo "$lt_cv_irix_exported_symbol" >&6; } | ||
5149 | + if test "$lt_cv_irix_exported_symbol" = yes; then | ||
5150 | + 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' | ||
5151 | + fi | ||
5152 | else | ||
5153 | archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' | ||
5154 | archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' | ||
5155 | @@ -9238,7 +9829,7 @@ rm -f core conftest.err conftest.$ac_objext \ | ||
5156 | osf4* | osf5*) # as osf3* with the addition of -msym flag | ||
5157 | if test "$GCC" = yes; then | ||
5158 | allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' | ||
5159 | - 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' | ||
5160 | + 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' | ||
5161 | hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' | ||
5162 | else | ||
5163 | allow_undefined_flag=' -expect_unresolved \*' | ||
5164 | @@ -9257,9 +9848,9 @@ rm -f core conftest.err conftest.$ac_objext \ | ||
5165 | no_undefined_flag=' -z defs' | ||
5166 | if test "$GCC" = yes; then | ||
5167 | wlarc='${wl}' | ||
5168 | - archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' | ||
5169 | + archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' | ||
5170 | archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ | ||
5171 | - $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' | ||
5172 | + $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' | ||
5173 | else | ||
5174 | case `$CC -V 2>&1` in | ||
5175 | *"Compilers 5.0"*) | ||
5176 | @@ -9835,8 +10426,9 @@ cygwin* | mingw* | pw32* | cegcc*) | ||
5177 | need_version=no | ||
5178 | need_lib_prefix=no | ||
5179 | |||
5180 | - case $GCC,$host_os in | ||
5181 | - yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) | ||
5182 | + case $GCC,$cc_basename in | ||
5183 | + yes,*) | ||
5184 | + # gcc | ||
5185 | library_names_spec='$libname.dll.a' | ||
5186 | # DLL is installed to $(libdir)/../bin by postinstall_cmds | ||
5187 | postinstall_cmds='base_file=`basename \${file}`~ | ||
5188 | @@ -9869,13 +10461,71 @@ cygwin* | mingw* | pw32* | cegcc*) | ||
5189 | library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' | ||
5190 | ;; | ||
5191 | esac | ||
5192 | + dynamic_linker='Win32 ld.exe' | ||
5193 | + ;; | ||
5194 | + | ||
5195 | + *,cl*) | ||
5196 | + # Native MSVC | ||
5197 | + libname_spec='$name' | ||
5198 | + soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' | ||
5199 | + library_names_spec='${libname}.dll.lib' | ||
5200 | + | ||
5201 | + case $build_os in | ||
5202 | + mingw*) | ||
5203 | + sys_lib_search_path_spec= | ||
5204 | + lt_save_ifs=$IFS | ||
5205 | + IFS=';' | ||
5206 | + for lt_path in $LIB | ||
5207 | + do | ||
5208 | + IFS=$lt_save_ifs | ||
5209 | + # Let DOS variable expansion print the short 8.3 style file name. | ||
5210 | + lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` | ||
5211 | + sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" | ||
5212 | + done | ||
5213 | + IFS=$lt_save_ifs | ||
5214 | + # Convert to MSYS style. | ||
5215 | + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` | ||
5216 | + ;; | ||
5217 | + cygwin*) | ||
5218 | + # Convert to unix form, then to dos form, then back to unix form | ||
5219 | + # but this time dos style (no spaces!) so that the unix form looks | ||
5220 | + # like /cygdrive/c/PROGRA~1:/cygdr... | ||
5221 | + sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` | ||
5222 | + sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` | ||
5223 | + sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` | ||
5224 | + ;; | ||
5225 | + *) | ||
5226 | + sys_lib_search_path_spec="$LIB" | ||
5227 | + if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then | ||
5228 | + # It is most probably a Windows format PATH. | ||
5229 | + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` | ||
5230 | + else | ||
5231 | + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` | ||
5232 | + fi | ||
5233 | + # FIXME: find the short name or the path components, as spaces are | ||
5234 | + # common. (e.g. "Program Files" -> "PROGRA~1") | ||
5235 | + ;; | ||
5236 | + esac | ||
5237 | + | ||
5238 | + # DLL is installed to $(libdir)/../bin by postinstall_cmds | ||
5239 | + postinstall_cmds='base_file=`basename \${file}`~ | ||
5240 | + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ | ||
5241 | + dldir=$destdir/`dirname \$dlpath`~ | ||
5242 | + test -d \$dldir || mkdir -p \$dldir~ | ||
5243 | + $install_prog $dir/$dlname \$dldir/$dlname' | ||
5244 | + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ | ||
5245 | + dlpath=$dir/\$dldll~ | ||
5246 | + $RM \$dlpath' | ||
5247 | + shlibpath_overrides_runpath=yes | ||
5248 | + dynamic_linker='Win32 link.exe' | ||
5249 | ;; | ||
5250 | |||
5251 | *) | ||
5252 | + # Assume MSVC wrapper | ||
5253 | library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' | ||
5254 | + dynamic_linker='Win32 ld.exe' | ||
5255 | ;; | ||
5256 | esac | ||
5257 | - dynamic_linker='Win32 ld.exe' | ||
5258 | # FIXME: first we should search . and the directory the executable is in | ||
5259 | shlibpath_var=PATH | ||
5260 | ;; | ||
5261 | @@ -10777,7 +11427,7 @@ else | ||
5262 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 | ||
5263 | lt_status=$lt_dlunknown | ||
5264 | cat > conftest.$ac_ext <<_LT_EOF | ||
5265 | -#line 10780 "configure" | ||
5266 | +#line $LINENO "configure" | ||
5267 | #include "confdefs.h" | ||
5268 | |||
5269 | #if HAVE_DLFCN_H | ||
5270 | @@ -10821,10 +11471,10 @@ else | ||
5271 | /* When -fvisbility=hidden is used, assume the code has been annotated | ||
5272 | correspondingly for the symbols needed. */ | ||
5273 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) | ||
5274 | -void fnord () __attribute__((visibility("default"))); | ||
5275 | +int fnord () __attribute__((visibility("default"))); | ||
5276 | #endif | ||
5277 | |||
5278 | -void fnord () { int i=42; } | ||
5279 | +int fnord () { return 42; } | ||
5280 | int main () | ||
5281 | { | ||
5282 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); | ||
5283 | @@ -10883,7 +11533,7 @@ else | ||
5284 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 | ||
5285 | lt_status=$lt_dlunknown | ||
5286 | cat > conftest.$ac_ext <<_LT_EOF | ||
5287 | -#line 10886 "configure" | ||
5288 | +#line $LINENO "configure" | ||
5289 | #include "confdefs.h" | ||
5290 | |||
5291 | #if HAVE_DLFCN_H | ||
5292 | @@ -10927,10 +11577,10 @@ else | ||
5293 | /* When -fvisbility=hidden is used, assume the code has been annotated | ||
5294 | correspondingly for the symbols needed. */ | ||
5295 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) | ||
5296 | -void fnord () __attribute__((visibility("default"))); | ||
5297 | +int fnord () __attribute__((visibility("default"))); | ||
5298 | #endif | ||
5299 | |||
5300 | -void fnord () { int i=42; } | ||
5301 | +int fnord () { return 42; } | ||
5302 | int main () | ||
5303 | { | ||
5304 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); | ||
5305 | @@ -17080,13 +17730,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' | ||
5306 | lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' | ||
5307 | lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' | ||
5308 | lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' | ||
5309 | +lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`' | ||
5310 | +lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`' | ||
5311 | reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`' | ||
5312 | reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`' | ||
5313 | OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`' | ||
5314 | deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`' | ||
5315 | file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`' | ||
5316 | +file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`' | ||
5317 | +want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`' | ||
5318 | +DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`' | ||
5319 | +sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`' | ||
5320 | AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`' | ||
5321 | AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`' | ||
5322 | +archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`' | ||
5323 | STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' | ||
5324 | RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' | ||
5325 | old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' | ||
5326 | @@ -17101,14 +17758,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de | ||
5327 | lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' | ||
5328 | lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' | ||
5329 | lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`' | ||
5330 | +nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`' | ||
5331 | +lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`' | ||
5332 | objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`' | ||
5333 | MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`' | ||
5334 | lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`' | ||
5335 | -lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' | ||
5336 | lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`' | ||
5337 | +lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' | ||
5338 | lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`' | ||
5339 | lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`' | ||
5340 | need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`' | ||
5341 | +MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`' | ||
5342 | DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' | ||
5343 | NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' | ||
5344 | LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' | ||
5345 | @@ -17141,12 +17801,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q | ||
5346 | hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' | ||
5347 | inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' | ||
5348 | link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' | ||
5349 | -fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`' | ||
5350 | always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`' | ||
5351 | export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`' | ||
5352 | exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`' | ||
5353 | include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`' | ||
5354 | prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`' | ||
5355 | +postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`' | ||
5356 | file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' | ||
5357 | variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' | ||
5358 | need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' | ||
5359 | @@ -17201,8 +17861,13 @@ reload_flag \ | ||
5360 | OBJDUMP \ | ||
5361 | deplibs_check_method \ | ||
5362 | file_magic_cmd \ | ||
5363 | +file_magic_glob \ | ||
5364 | +want_nocaseglob \ | ||
5365 | +DLLTOOL \ | ||
5366 | +sharedlib_from_linklib_cmd \ | ||
5367 | AR \ | ||
5368 | AR_FLAGS \ | ||
5369 | +archiver_list_spec \ | ||
5370 | STRIP \ | ||
5371 | RANLIB \ | ||
5372 | CC \ | ||
5373 | @@ -17212,12 +17877,14 @@ lt_cv_sys_global_symbol_pipe \ | ||
5374 | lt_cv_sys_global_symbol_to_cdecl \ | ||
5375 | lt_cv_sys_global_symbol_to_c_name_address \ | ||
5376 | lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ | ||
5377 | +nm_file_list_spec \ | ||
5378 | lt_prog_compiler_no_builtin_flag \ | ||
5379 | -lt_prog_compiler_wl \ | ||
5380 | lt_prog_compiler_pic \ | ||
5381 | +lt_prog_compiler_wl \ | ||
5382 | lt_prog_compiler_static \ | ||
5383 | lt_cv_prog_compiler_c_o \ | ||
5384 | need_locks \ | ||
5385 | +MANIFEST_TOOL \ | ||
5386 | DSYMUTIL \ | ||
5387 | NMEDIT \ | ||
5388 | LIPO \ | ||
5389 | @@ -17233,7 +17900,6 @@ no_undefined_flag \ | ||
5390 | hardcode_libdir_flag_spec \ | ||
5391 | hardcode_libdir_flag_spec_ld \ | ||
5392 | hardcode_libdir_separator \ | ||
5393 | -fix_srcfile_path \ | ||
5394 | exclude_expsyms \ | ||
5395 | include_expsyms \ | ||
5396 | file_list_spec \ | ||
5397 | @@ -17269,6 +17935,7 @@ module_cmds \ | ||
5398 | module_expsym_cmds \ | ||
5399 | export_symbols_cmds \ | ||
5400 | prelink_cmds \ | ||
5401 | +postlink_cmds \ | ||
5402 | postinstall_cmds \ | ||
5403 | postuninstall_cmds \ | ||
5404 | finish_cmds \ | ||
5405 | @@ -18049,7 +18716,8 @@ $as_echo X"$file" | | ||
5406 | # NOTE: Changes made to this file will be lost: look at ltmain.sh. | ||
5407 | # | ||
5408 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, | ||
5409 | -# 2006, 2007, 2008, 2009 Free Software Foundation, Inc. | ||
5410 | +# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, | ||
5411 | +# Inc. | ||
5412 | # Written by Gordon Matzigkeit, 1996 | ||
5413 | # | ||
5414 | # This file is part of GNU Libtool. | ||
5415 | @@ -18152,19 +18820,42 @@ SP2NL=$lt_lt_SP2NL | ||
5416 | # turn newlines into spaces. | ||
5417 | NL2SP=$lt_lt_NL2SP | ||
5418 | |||
5419 | +# convert \$build file names to \$host format. | ||
5420 | +to_host_file_cmd=$lt_cv_to_host_file_cmd | ||
5421 | + | ||
5422 | +# convert \$build files to toolchain format. | ||
5423 | +to_tool_file_cmd=$lt_cv_to_tool_file_cmd | ||
5424 | + | ||
5425 | # An object symbol dumper. | ||
5426 | OBJDUMP=$lt_OBJDUMP | ||
5427 | |||
5428 | # Method to check whether dependent libraries are shared objects. | ||
5429 | deplibs_check_method=$lt_deplibs_check_method | ||
5430 | |||
5431 | -# Command to use when deplibs_check_method == "file_magic". | ||
5432 | +# Command to use when deplibs_check_method = "file_magic". | ||
5433 | file_magic_cmd=$lt_file_magic_cmd | ||
5434 | |||
5435 | +# How to find potential files when deplibs_check_method = "file_magic". | ||
5436 | +file_magic_glob=$lt_file_magic_glob | ||
5437 | + | ||
5438 | +# Find potential files using nocaseglob when deplibs_check_method = "file_magic". | ||
5439 | +want_nocaseglob=$lt_want_nocaseglob | ||
5440 | + | ||
5441 | +# DLL creation program. | ||
5442 | +DLLTOOL=$lt_DLLTOOL | ||
5443 | + | ||
5444 | +# Command to associate shared and link libraries. | ||
5445 | +sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd | ||
5446 | + | ||
5447 | # The archiver. | ||
5448 | AR=$lt_AR | ||
5449 | + | ||
5450 | +# Flags to create an archive. | ||
5451 | AR_FLAGS=$lt_AR_FLAGS | ||
5452 | |||
5453 | +# How to feed a file listing to the archiver. | ||
5454 | +archiver_list_spec=$lt_archiver_list_spec | ||
5455 | + | ||
5456 | # A symbol stripping program. | ||
5457 | STRIP=$lt_STRIP | ||
5458 | |||
5459 | @@ -18194,6 +18885,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address | ||
5460 | # Transform the output of nm in a C name address pair when lib prefix is needed. | ||
5461 | global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix | ||
5462 | |||
5463 | +# Specify filename containing input files for \$NM. | ||
5464 | +nm_file_list_spec=$lt_nm_file_list_spec | ||
5465 | + | ||
5466 | +# The root where to search for dependent libraries,and in which our libraries should be installed. | ||
5467 | +lt_sysroot=$lt_sysroot | ||
5468 | + | ||
5469 | # The name of the directory that contains temporary libtool files. | ||
5470 | objdir=$objdir | ||
5471 | |||
5472 | @@ -18203,6 +18900,9 @@ MAGIC_CMD=$MAGIC_CMD | ||
5473 | # Must we lock files when doing compilation? | ||
5474 | need_locks=$lt_need_locks | ||
5475 | |||
5476 | +# Manifest tool. | ||
5477 | +MANIFEST_TOOL=$lt_MANIFEST_TOOL | ||
5478 | + | ||
5479 | # Tool to manipulate archived DWARF debug symbol files on Mac OS X. | ||
5480 | DSYMUTIL=$lt_DSYMUTIL | ||
5481 | |||
5482 | @@ -18317,12 +19017,12 @@ with_gcc=$GCC | ||
5483 | # Compiler flag to turn off builtin functions. | ||
5484 | no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag | ||
5485 | |||
5486 | -# How to pass a linker flag through the compiler. | ||
5487 | -wl=$lt_lt_prog_compiler_wl | ||
5488 | - | ||
5489 | # Additional compiler flags for building library objects. | ||
5490 | pic_flag=$lt_lt_prog_compiler_pic | ||
5491 | |||
5492 | +# How to pass a linker flag through the compiler. | ||
5493 | +wl=$lt_lt_prog_compiler_wl | ||
5494 | + | ||
5495 | # Compiler flag to prevent dynamic linking. | ||
5496 | link_static_flag=$lt_lt_prog_compiler_static | ||
5497 | |||
5498 | @@ -18409,9 +19109,6 @@ inherit_rpath=$inherit_rpath | ||
5499 | # Whether libtool must link a program against all its dependency libraries. | ||
5500 | link_all_deplibs=$link_all_deplibs | ||
5501 | |||
5502 | -# Fix the shell variable \$srcfile for the compiler. | ||
5503 | -fix_srcfile_path=$lt_fix_srcfile_path | ||
5504 | - | ||
5505 | # Set to "yes" if exported symbols are required. | ||
5506 | always_export_symbols=$always_export_symbols | ||
5507 | |||
5508 | @@ -18427,6 +19124,9 @@ include_expsyms=$lt_include_expsyms | ||
5509 | # Commands necessary for linking programs (against libraries) with templates. | ||
5510 | prelink_cmds=$lt_prelink_cmds | ||
5511 | |||
5512 | +# Commands necessary for finishing linking programs. | ||
5513 | +postlink_cmds=$lt_postlink_cmds | ||
5514 | + | ||
5515 | # Specify filename containing input files. | ||
5516 | file_list_spec=$lt_file_list_spec | ||
5517 | |||
5518 | @@ -18459,210 +19159,169 @@ ltmain="$ac_aux_dir/ltmain.sh" | ||
5519 | # if finds mixed CR/LF and LF-only lines. Since sed operates in | ||
5520 | # text mode, it properly converts lines to CR/LF. This bash problem | ||
5521 | # is reportedly fixed, but why not run on old versions too? | ||
5522 | - sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ | ||
5523 | - || (rm -f "$cfgfile"; exit 1) | ||
5524 | - | ||
5525 | - case $xsi_shell in | ||
5526 | - yes) | ||
5527 | - cat << \_LT_EOF >> "$cfgfile" | ||
5528 | - | ||
5529 | -# func_dirname file append nondir_replacement | ||
5530 | -# Compute the dirname of FILE. If nonempty, add APPEND to the result, | ||
5531 | -# otherwise set result to NONDIR_REPLACEMENT. | ||
5532 | -func_dirname () | ||
5533 | -{ | ||
5534 | - case ${1} in | ||
5535 | - */*) func_dirname_result="${1%/*}${2}" ;; | ||
5536 | - * ) func_dirname_result="${3}" ;; | ||
5537 | - esac | ||
5538 | -} | ||
5539 | - | ||
5540 | -# func_basename file | ||
5541 | -func_basename () | ||
5542 | -{ | ||
5543 | - func_basename_result="${1##*/}" | ||
5544 | -} | ||
5545 | - | ||
5546 | -# func_dirname_and_basename file append nondir_replacement | ||
5547 | -# perform func_basename and func_dirname in a single function | ||
5548 | -# call: | ||
5549 | -# dirname: Compute the dirname of FILE. If nonempty, | ||
5550 | -# add APPEND to the result, otherwise set result | ||
5551 | -# to NONDIR_REPLACEMENT. | ||
5552 | -# value returned in "$func_dirname_result" | ||
5553 | -# basename: Compute filename of FILE. | ||
5554 | -# value retuned in "$func_basename_result" | ||
5555 | -# Implementation must be kept synchronized with func_dirname | ||
5556 | -# and func_basename. For efficiency, we do not delegate to | ||
5557 | -# those functions but instead duplicate the functionality here. | ||
5558 | -func_dirname_and_basename () | ||
5559 | -{ | ||
5560 | - case ${1} in | ||
5561 | - */*) func_dirname_result="${1%/*}${2}" ;; | ||
5562 | - * ) func_dirname_result="${3}" ;; | ||
5563 | - esac | ||
5564 | - func_basename_result="${1##*/}" | ||
5565 | -} | ||
5566 | - | ||
5567 | -# func_stripname prefix suffix name | ||
5568 | -# strip PREFIX and SUFFIX off of NAME. | ||
5569 | -# PREFIX and SUFFIX must not contain globbing or regex special | ||
5570 | -# characters, hashes, percent signs, but SUFFIX may contain a leading | ||
5571 | -# dot (in which case that matches only a dot). | ||
5572 | -func_stripname () | ||
5573 | -{ | ||
5574 | - # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are | ||
5575 | - # positional parameters, so assign one to ordinary parameter first. | ||
5576 | - func_stripname_result=${3} | ||
5577 | - func_stripname_result=${func_stripname_result#"${1}"} | ||
5578 | - func_stripname_result=${func_stripname_result%"${2}"} | ||
5579 | -} | ||
5580 | - | ||
5581 | -# func_opt_split | ||
5582 | -func_opt_split () | ||
5583 | -{ | ||
5584 | - func_opt_split_opt=${1%%=*} | ||
5585 | - func_opt_split_arg=${1#*=} | ||
5586 | -} | ||
5587 | - | ||
5588 | -# func_lo2o object | ||
5589 | -func_lo2o () | ||
5590 | -{ | ||
5591 | - case ${1} in | ||
5592 | - *.lo) func_lo2o_result=${1%.lo}.${objext} ;; | ||
5593 | - *) func_lo2o_result=${1} ;; | ||
5594 | - esac | ||
5595 | -} | ||
5596 | - | ||
5597 | -# func_xform libobj-or-source | ||
5598 | -func_xform () | ||
5599 | -{ | ||
5600 | - func_xform_result=${1%.*}.lo | ||
5601 | -} | ||
5602 | - | ||
5603 | -# func_arith arithmetic-term... | ||
5604 | -func_arith () | ||
5605 | -{ | ||
5606 | - func_arith_result=$(( $* )) | ||
5607 | -} | ||
5608 | - | ||
5609 | -# func_len string | ||
5610 | -# STRING may not start with a hyphen. | ||
5611 | -func_len () | ||
5612 | -{ | ||
5613 | - func_len_result=${#1} | ||
5614 | -} | ||
5615 | - | ||
5616 | -_LT_EOF | ||
5617 | - ;; | ||
5618 | - *) # Bourne compatible functions. | ||
5619 | - cat << \_LT_EOF >> "$cfgfile" | ||
5620 | - | ||
5621 | -# func_dirname file append nondir_replacement | ||
5622 | -# Compute the dirname of FILE. If nonempty, add APPEND to the result, | ||
5623 | -# otherwise set result to NONDIR_REPLACEMENT. | ||
5624 | -func_dirname () | ||
5625 | -{ | ||
5626 | - # Extract subdirectory from the argument. | ||
5627 | - func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` | ||
5628 | - if test "X$func_dirname_result" = "X${1}"; then | ||
5629 | - func_dirname_result="${3}" | ||
5630 | - else | ||
5631 | - func_dirname_result="$func_dirname_result${2}" | ||
5632 | - fi | ||
5633 | -} | ||
5634 | - | ||
5635 | -# func_basename file | ||
5636 | -func_basename () | ||
5637 | -{ | ||
5638 | - func_basename_result=`$ECHO "${1}" | $SED "$basename"` | ||
5639 | -} | ||
5640 | - | ||
5641 | - | ||
5642 | -# func_stripname prefix suffix name | ||
5643 | -# strip PREFIX and SUFFIX off of NAME. | ||
5644 | -# PREFIX and SUFFIX must not contain globbing or regex special | ||
5645 | -# characters, hashes, percent signs, but SUFFIX may contain a leading | ||
5646 | -# dot (in which case that matches only a dot). | ||
5647 | -# func_strip_suffix prefix name | ||
5648 | -func_stripname () | ||
5649 | -{ | ||
5650 | - case ${2} in | ||
5651 | - .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; | ||
5652 | - *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; | ||
5653 | - esac | ||
5654 | -} | ||
5655 | - | ||
5656 | -# sed scripts: | ||
5657 | -my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q' | ||
5658 | -my_sed_long_arg='1s/^-[^=]*=//' | ||
5659 | - | ||
5660 | -# func_opt_split | ||
5661 | -func_opt_split () | ||
5662 | -{ | ||
5663 | - func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"` | ||
5664 | - func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"` | ||
5665 | -} | ||
5666 | - | ||
5667 | -# func_lo2o object | ||
5668 | -func_lo2o () | ||
5669 | -{ | ||
5670 | - func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` | ||
5671 | -} | ||
5672 | - | ||
5673 | -# func_xform libobj-or-source | ||
5674 | -func_xform () | ||
5675 | -{ | ||
5676 | - func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'` | ||
5677 | -} | ||
5678 | - | ||
5679 | -# func_arith arithmetic-term... | ||
5680 | -func_arith () | ||
5681 | -{ | ||
5682 | - func_arith_result=`expr "$@"` | ||
5683 | -} | ||
5684 | - | ||
5685 | -# func_len string | ||
5686 | -# STRING may not start with a hyphen. | ||
5687 | -func_len () | ||
5688 | -{ | ||
5689 | - func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len` | ||
5690 | -} | ||
5691 | - | ||
5692 | -_LT_EOF | ||
5693 | -esac | ||
5694 | - | ||
5695 | -case $lt_shell_append in | ||
5696 | - yes) | ||
5697 | - cat << \_LT_EOF >> "$cfgfile" | ||
5698 | - | ||
5699 | -# func_append var value | ||
5700 | -# Append VALUE to the end of shell variable VAR. | ||
5701 | -func_append () | ||
5702 | -{ | ||
5703 | - eval "$1+=\$2" | ||
5704 | -} | ||
5705 | -_LT_EOF | ||
5706 | - ;; | ||
5707 | - *) | ||
5708 | - cat << \_LT_EOF >> "$cfgfile" | ||
5709 | - | ||
5710 | -# func_append var value | ||
5711 | -# Append VALUE to the end of shell variable VAR. | ||
5712 | -func_append () | ||
5713 | -{ | ||
5714 | - eval "$1=\$$1\$2" | ||
5715 | -} | ||
5716 | - | ||
5717 | -_LT_EOF | ||
5718 | - ;; | ||
5719 | - esac | ||
5720 | - | ||
5721 | - | ||
5722 | - sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ | ||
5723 | - || (rm -f "$cfgfile"; exit 1) | ||
5724 | - | ||
5725 | - mv -f "$cfgfile" "$ofile" || | ||
5726 | + sed '$q' "$ltmain" >> "$cfgfile" \ | ||
5727 | + || (rm -f "$cfgfile"; exit 1) | ||
5728 | + | ||
5729 | + if test x"$xsi_shell" = xyes; then | ||
5730 | + sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ | ||
5731 | +func_dirname ()\ | ||
5732 | +{\ | ||
5733 | +\ case ${1} in\ | ||
5734 | +\ */*) func_dirname_result="${1%/*}${2}" ;;\ | ||
5735 | +\ * ) func_dirname_result="${3}" ;;\ | ||
5736 | +\ esac\ | ||
5737 | +} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \ | ||
5738 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
5739 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
5740 | +test 0 -eq $? || _lt_function_replace_fail=: | ||
5741 | + | ||
5742 | + | ||
5743 | + sed -e '/^func_basename ()$/,/^} # func_basename /c\ | ||
5744 | +func_basename ()\ | ||
5745 | +{\ | ||
5746 | +\ func_basename_result="${1##*/}"\ | ||
5747 | +} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \ | ||
5748 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
5749 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
5750 | +test 0 -eq $? || _lt_function_replace_fail=: | ||
5751 | + | ||
5752 | + | ||
5753 | + sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\ | ||
5754 | +func_dirname_and_basename ()\ | ||
5755 | +{\ | ||
5756 | +\ case ${1} in\ | ||
5757 | +\ */*) func_dirname_result="${1%/*}${2}" ;;\ | ||
5758 | +\ * ) func_dirname_result="${3}" ;;\ | ||
5759 | +\ esac\ | ||
5760 | +\ func_basename_result="${1##*/}"\ | ||
5761 | +} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \ | ||
5762 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
5763 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
5764 | +test 0 -eq $? || _lt_function_replace_fail=: | ||
5765 | + | ||
5766 | + | ||
5767 | + sed -e '/^func_stripname ()$/,/^} # func_stripname /c\ | ||
5768 | +func_stripname ()\ | ||
5769 | +{\ | ||
5770 | +\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\ | ||
5771 | +\ # positional parameters, so assign one to ordinary parameter first.\ | ||
5772 | +\ func_stripname_result=${3}\ | ||
5773 | +\ func_stripname_result=${func_stripname_result#"${1}"}\ | ||
5774 | +\ func_stripname_result=${func_stripname_result%"${2}"}\ | ||
5775 | +} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \ | ||
5776 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
5777 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
5778 | +test 0 -eq $? || _lt_function_replace_fail=: | ||
5779 | + | ||
5780 | + | ||
5781 | + sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\ | ||
5782 | +func_split_long_opt ()\ | ||
5783 | +{\ | ||
5784 | +\ func_split_long_opt_name=${1%%=*}\ | ||
5785 | +\ func_split_long_opt_arg=${1#*=}\ | ||
5786 | +} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \ | ||
5787 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
5788 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
5789 | +test 0 -eq $? || _lt_function_replace_fail=: | ||
5790 | + | ||
5791 | + | ||
5792 | + sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\ | ||
5793 | +func_split_short_opt ()\ | ||
5794 | +{\ | ||
5795 | +\ func_split_short_opt_arg=${1#??}\ | ||
5796 | +\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\ | ||
5797 | +} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \ | ||
5798 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
5799 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
5800 | +test 0 -eq $? || _lt_function_replace_fail=: | ||
5801 | + | ||
5802 | + | ||
5803 | + sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\ | ||
5804 | +func_lo2o ()\ | ||
5805 | +{\ | ||
5806 | +\ case ${1} in\ | ||
5807 | +\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\ | ||
5808 | +\ *) func_lo2o_result=${1} ;;\ | ||
5809 | +\ esac\ | ||
5810 | +} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \ | ||
5811 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
5812 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
5813 | +test 0 -eq $? || _lt_function_replace_fail=: | ||
5814 | + | ||
5815 | + | ||
5816 | + sed -e '/^func_xform ()$/,/^} # func_xform /c\ | ||
5817 | +func_xform ()\ | ||
5818 | +{\ | ||
5819 | + func_xform_result=${1%.*}.lo\ | ||
5820 | +} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \ | ||
5821 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
5822 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
5823 | +test 0 -eq $? || _lt_function_replace_fail=: | ||
5824 | + | ||
5825 | + | ||
5826 | + sed -e '/^func_arith ()$/,/^} # func_arith /c\ | ||
5827 | +func_arith ()\ | ||
5828 | +{\ | ||
5829 | + func_arith_result=$(( $* ))\ | ||
5830 | +} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \ | ||
5831 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
5832 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
5833 | +test 0 -eq $? || _lt_function_replace_fail=: | ||
5834 | + | ||
5835 | + | ||
5836 | + sed -e '/^func_len ()$/,/^} # func_len /c\ | ||
5837 | +func_len ()\ | ||
5838 | +{\ | ||
5839 | + func_len_result=${#1}\ | ||
5840 | +} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \ | ||
5841 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
5842 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
5843 | +test 0 -eq $? || _lt_function_replace_fail=: | ||
5844 | + | ||
5845 | +fi | ||
5846 | + | ||
5847 | +if test x"$lt_shell_append" = xyes; then | ||
5848 | + sed -e '/^func_append ()$/,/^} # func_append /c\ | ||
5849 | +func_append ()\ | ||
5850 | +{\ | ||
5851 | + eval "${1}+=\\${2}"\ | ||
5852 | +} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \ | ||
5853 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
5854 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
5855 | +test 0 -eq $? || _lt_function_replace_fail=: | ||
5856 | + | ||
5857 | + | ||
5858 | + sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\ | ||
5859 | +func_append_quoted ()\ | ||
5860 | +{\ | ||
5861 | +\ func_quote_for_eval "${2}"\ | ||
5862 | +\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\ | ||
5863 | +} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \ | ||
5864 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
5865 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
5866 | +test 0 -eq $? || _lt_function_replace_fail=: | ||
5867 | + | ||
5868 | + | ||
5869 | + # Save a `func_append' function call where possible by direct use of '+=' | ||
5870 | + sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ | ||
5871 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
5872 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
5873 | + test 0 -eq $? || _lt_function_replace_fail=: | ||
5874 | +else | ||
5875 | + # Save a `func_append' function call even when '+=' is not available | ||
5876 | + sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ | ||
5877 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
5878 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
5879 | + test 0 -eq $? || _lt_function_replace_fail=: | ||
5880 | +fi | ||
5881 | + | ||
5882 | +if test x"$_lt_function_replace_fail" = x":"; then | ||
5883 | + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 | ||
5884 | +$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} | ||
5885 | +fi | ||
5886 | + | ||
5887 | + | ||
5888 | + mv -f "$cfgfile" "$ofile" || | ||
5889 | (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") | ||
5890 | chmod +x "$ofile" | ||
5891 | |||
5892 | diff --git a/gprof/Makefile.in b/gprof/Makefile.in | ||
5893 | index a7398231030..fc7a3d78db0 100644 | ||
5894 | --- a/gprof/Makefile.in | ||
5895 | +++ b/gprof/Makefile.in | ||
5896 | @@ -327,6 +327,7 @@ CYGPATH_W = @CYGPATH_W@ | ||
5897 | DATADIRNAME = @DATADIRNAME@ | ||
5898 | DEFS = @DEFS@ | ||
5899 | DEPDIR = @DEPDIR@ | ||
5900 | +DLLTOOL = @DLLTOOL@ | ||
5901 | DSYMUTIL = @DSYMUTIL@ | ||
5902 | DUMPBIN = @DUMPBIN@ | ||
5903 | ECHO_C = @ECHO_C@ | ||
5904 | @@ -363,6 +364,7 @@ LTLIBINTL = @LTLIBINTL@ | ||
5905 | LTLIBOBJS = @LTLIBOBJS@ | ||
5906 | MAINT = @MAINT@ | ||
5907 | MAKEINFO = @MAKEINFO@ | ||
5908 | +MANIFEST_TOOL = @MANIFEST_TOOL@ | ||
5909 | MKDIR_P = @MKDIR_P@ | ||
5910 | MKINSTALLDIRS = @MKINSTALLDIRS@ | ||
5911 | MSGFMT = @MSGFMT@ | ||
5912 | @@ -398,6 +400,7 @@ abs_builddir = @abs_builddir@ | ||
5913 | abs_srcdir = @abs_srcdir@ | ||
5914 | abs_top_builddir = @abs_top_builddir@ | ||
5915 | abs_top_srcdir = @abs_top_srcdir@ | ||
5916 | +ac_ct_AR = @ac_ct_AR@ | ||
5917 | ac_ct_CC = @ac_ct_CC@ | ||
5918 | ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ | ||
5919 | am__include = @am__include@ | ||
5920 | diff --git a/gprof/configure b/gprof/configure | ||
5921 | index 2d62b6fbb07..0cafee249eb 100755 | ||
5922 | --- a/gprof/configure | ||
5923 | +++ b/gprof/configure | ||
5924 | @@ -669,8 +669,11 @@ OTOOL | ||
5925 | LIPO | ||
5926 | NMEDIT | ||
5927 | DSYMUTIL | ||
5928 | +MANIFEST_TOOL | ||
5929 | RANLIB | ||
5930 | +ac_ct_AR | ||
5931 | AR | ||
5932 | +DLLTOOL | ||
5933 | OBJDUMP | ||
5934 | LN_S | ||
5935 | NM | ||
5936 | @@ -787,6 +790,7 @@ enable_static | ||
5937 | with_pic | ||
5938 | enable_fast_install | ||
5939 | with_gnu_ld | ||
5940 | +with_libtool_sysroot | ||
5941 | enable_libtool_lock | ||
5942 | enable_plugins | ||
5943 | enable_largefile | ||
5944 | @@ -1462,6 +1466,8 @@ Optional Packages: | ||
5945 | --with-libintl-prefix[=DIR] search for libintl in DIR/include and DIR/lib | ||
5946 | --without-libintl-prefix don't search for libintl in includedir and libdir | ||
5947 | --with-libintl-type=TYPE type of library to search for (auto/static/shared) | ||
5948 | + --with-libtool-sysroot=DIR Search for dependent libraries within DIR | ||
5949 | + (or the compiler's sysroot if not specified). | ||
5950 | |||
5951 | Some influential environment variables: | ||
5952 | CC C compiler command | ||
5953 | @@ -4530,8 +4536,8 @@ esac | ||
3913 | 5954 | ||
3914 | 5955 | ||
3915 | 5956 | ||
@@ -3920,7 +5961,7 @@ index d5ae54925e9..3ff1148d9dd 100755 | |||
3920 | 5961 | ||
3921 | 5962 | ||
3922 | 5963 | ||
3923 | @@ -5319,7 +5325,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO | 5964 | @@ -4571,7 +4577,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO |
3924 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 | 5965 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 |
3925 | $as_echo_n "checking how to print strings... " >&6; } | 5966 | $as_echo_n "checking how to print strings... " >&6; } |
3926 | # Test print first, because it will be a builtin if present. | 5967 | # Test print first, because it will be a builtin if present. |
@@ -3929,7 +5970,7 @@ index d5ae54925e9..3ff1148d9dd 100755 | |||
3929 | test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then | 5970 | test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then |
3930 | ECHO='print -r --' | 5971 | ECHO='print -r --' |
3931 | elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then | 5972 | elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then |
3932 | @@ -6005,8 +6011,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; | 5973 | @@ -5264,8 +5270,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; |
3933 | # Try some XSI features | 5974 | # Try some XSI features |
3934 | xsi_shell=no | 5975 | xsi_shell=no |
3935 | ( _lt_dummy="a/b/c" | 5976 | ( _lt_dummy="a/b/c" |
@@ -3940,7 +5981,7 @@ index d5ae54925e9..3ff1148d9dd 100755 | |||
3940 | && eval 'test $(( 1 + 1 )) -eq 2 \ | 5981 | && eval 'test $(( 1 + 1 )) -eq 2 \ |
3941 | && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ | 5982 | && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ |
3942 | && xsi_shell=yes | 5983 | && xsi_shell=yes |
3943 | @@ -6055,6 +6061,80 @@ esac | 5984 | @@ -5314,6 +5320,80 @@ esac |
3944 | 5985 | ||
3945 | 5986 | ||
3946 | 5987 | ||
@@ -4021,7 +6062,7 @@ index d5ae54925e9..3ff1148d9dd 100755 | |||
4021 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 | 6062 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 |
4022 | $as_echo_n "checking for $LD option to reload object files... " >&6; } | 6063 | $as_echo_n "checking for $LD option to reload object files... " >&6; } |
4023 | if ${lt_cv_ld_reload_flag+:} false; then : | 6064 | if ${lt_cv_ld_reload_flag+:} false; then : |
4024 | @@ -6071,6 +6151,11 @@ case $reload_flag in | 6065 | @@ -5330,6 +5410,11 @@ case $reload_flag in |
4025 | esac | 6066 | esac |
4026 | reload_cmds='$LD$reload_flag -o $output$reload_objs' | 6067 | reload_cmds='$LD$reload_flag -o $output$reload_objs' |
4027 | case $host_os in | 6068 | case $host_os in |
@@ -4033,7 +6074,7 @@ index d5ae54925e9..3ff1148d9dd 100755 | |||
4033 | darwin*) | 6074 | darwin*) |
4034 | if test "$GCC" = yes; then | 6075 | if test "$GCC" = yes; then |
4035 | reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' | 6076 | reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' |
4036 | @@ -6239,7 +6324,8 @@ mingw* | pw32*) | 6077 | @@ -5498,7 +5583,8 @@ mingw* | pw32*) |
4037 | lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' | 6078 | lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' |
4038 | lt_cv_file_magic_cmd='func_win32_libid' | 6079 | lt_cv_file_magic_cmd='func_win32_libid' |
4039 | else | 6080 | else |
@@ -4043,7 +6084,7 @@ index d5ae54925e9..3ff1148d9dd 100755 | |||
4043 | lt_cv_file_magic_cmd='$OBJDUMP -f' | 6084 | lt_cv_file_magic_cmd='$OBJDUMP -f' |
4044 | fi | 6085 | fi |
4045 | ;; | 6086 | ;; |
4046 | @@ -6393,6 +6479,21 @@ esac | 6087 | @@ -5657,6 +5743,21 @@ esac |
4047 | fi | 6088 | fi |
4048 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 | 6089 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 |
4049 | $as_echo "$lt_cv_deplibs_check_method" >&6; } | 6090 | $as_echo "$lt_cv_deplibs_check_method" >&6; } |
@@ -4065,7 +6106,7 @@ index d5ae54925e9..3ff1148d9dd 100755 | |||
4065 | file_magic_cmd=$lt_cv_file_magic_cmd | 6106 | file_magic_cmd=$lt_cv_file_magic_cmd |
4066 | deplibs_check_method=$lt_cv_deplibs_check_method | 6107 | deplibs_check_method=$lt_cv_deplibs_check_method |
4067 | test -z "$deplibs_check_method" && deplibs_check_method=unknown | 6108 | test -z "$deplibs_check_method" && deplibs_check_method=unknown |
4068 | @@ -6408,9 +6509,162 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown | 6109 | @@ -5672,6 +5773,157 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown |
4069 | 6110 | ||
4070 | 6111 | ||
4071 | 6112 | ||
@@ -4220,6 +6261,12 @@ index d5ae54925e9..3ff1148d9dd 100755 | |||
4220 | + | 6261 | + |
4221 | + | 6262 | + |
4222 | + | 6263 | + |
6264 | plugin_option= | ||
6265 | plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll" | ||
6266 | for plugin in $plugin_names; do | ||
6267 | @@ -5686,8 +5938,10 @@ for plugin in $plugin_names; do | ||
6268 | done | ||
6269 | |||
4223 | if test -n "$ac_tool_prefix"; then | 6270 | if test -n "$ac_tool_prefix"; then |
4224 | - # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. | 6271 | - # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. |
4225 | -set dummy ${ac_tool_prefix}ar; ac_word=$2 | 6272 | -set dummy ${ac_tool_prefix}ar; ac_word=$2 |
@@ -4230,7 +6277,7 @@ index d5ae54925e9..3ff1148d9dd 100755 | |||
4230 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | 6277 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
4231 | $as_echo_n "checking for $ac_word... " >&6; } | 6278 | $as_echo_n "checking for $ac_word... " >&6; } |
4232 | if ${ac_cv_prog_AR+:} false; then : | 6279 | if ${ac_cv_prog_AR+:} false; then : |
4233 | @@ -6426,7 +6680,7 @@ do | 6280 | @@ -5703,7 +5957,7 @@ do |
4234 | test -z "$as_dir" && as_dir=. | 6281 | test -z "$as_dir" && as_dir=. |
4235 | for ac_exec_ext in '' $ac_executable_extensions; do | 6282 | for ac_exec_ext in '' $ac_executable_extensions; do |
4236 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | 6283 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
@@ -4239,7 +6286,7 @@ index d5ae54925e9..3ff1148d9dd 100755 | |||
4239 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | 6286 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
4240 | break 2 | 6287 | break 2 |
4241 | fi | 6288 | fi |
4242 | @@ -6446,11 +6700,15 @@ $as_echo "no" >&6; } | 6289 | @@ -5723,11 +5977,15 @@ $as_echo "no" >&6; } |
4243 | fi | 6290 | fi |
4244 | 6291 | ||
4245 | 6292 | ||
@@ -4258,7 +6305,7 @@ index d5ae54925e9..3ff1148d9dd 100755 | |||
4258 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | 6305 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
4259 | $as_echo_n "checking for $ac_word... " >&6; } | 6306 | $as_echo_n "checking for $ac_word... " >&6; } |
4260 | if ${ac_cv_prog_ac_ct_AR+:} false; then : | 6307 | if ${ac_cv_prog_ac_ct_AR+:} false; then : |
4261 | @@ -6466,7 +6724,7 @@ do | 6308 | @@ -5743,7 +6001,7 @@ do |
4262 | test -z "$as_dir" && as_dir=. | 6309 | test -z "$as_dir" && as_dir=. |
4263 | for ac_exec_ext in '' $ac_executable_extensions; do | 6310 | for ac_exec_ext in '' $ac_executable_extensions; do |
4264 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | 6311 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
@@ -4267,7 +6314,7 @@ index d5ae54925e9..3ff1148d9dd 100755 | |||
4267 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | 6314 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
4268 | break 2 | 6315 | break 2 |
4269 | fi | 6316 | fi |
4270 | @@ -6485,6 +6743,10 @@ else | 6317 | @@ -5762,6 +6020,10 @@ else |
4271 | $as_echo "no" >&6; } | 6318 | $as_echo "no" >&6; } |
4272 | fi | 6319 | fi |
4273 | 6320 | ||
@@ -4278,7 +6325,7 @@ index d5ae54925e9..3ff1148d9dd 100755 | |||
4278 | if test "x$ac_ct_AR" = x; then | 6325 | if test "x$ac_ct_AR" = x; then |
4279 | AR="false" | 6326 | AR="false" |
4280 | else | 6327 | else |
4281 | @@ -6496,12 +6758,10 @@ ac_tool_warned=yes ;; | 6328 | @@ -5773,25 +6035,19 @@ ac_tool_warned=yes ;; |
4282 | esac | 6329 | esac |
4283 | AR=$ac_ct_AR | 6330 | AR=$ac_ct_AR |
4284 | fi | 6331 | fi |
@@ -4287,13 +6334,33 @@ index d5ae54925e9..3ff1148d9dd 100755 | |||
4287 | fi | 6334 | fi |
4288 | 6335 | ||
4289 | -test -z "$AR" && AR=ar | 6336 | -test -z "$AR" && AR=ar |
6337 | -if test -n "$plugin_option"; then | ||
6338 | - if $AR --help 2>&1 | grep -q "\--plugin"; then | ||
6339 | - touch conftest.c | ||
6340 | - $AR $plugin_option rc conftest.a conftest.c | ||
6341 | - if test "$?" != 0; then | ||
6342 | - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5 | ||
6343 | + touch conftest.c | ||
6344 | + $AR $plugin_option rc conftest.a conftest.c | ||
6345 | + if test "$?" != 0; then | ||
6346 | + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5 | ||
6347 | $as_echo "$as_me: WARNING: Failed: $AR $plugin_option rc" >&2;} | ||
6348 | - else | ||
6349 | - AR="$AR $plugin_option" | ||
6350 | - fi | ||
6351 | - rm -f conftest.* | ||
6352 | + else | ||
6353 | + AR="$AR $plugin_option" | ||
6354 | fi | ||
6355 | -fi | ||
4290 | -test -z "$AR_FLAGS" && AR_FLAGS=cru | 6356 | -test -z "$AR_FLAGS" && AR_FLAGS=cru |
6357 | + rm -f conftest.* | ||
4291 | +: ${AR=ar} | 6358 | +: ${AR=ar} |
4292 | +: ${AR_FLAGS=cru} | 6359 | +: ${AR_FLAGS=cru} |
4293 | 6360 | ||
4294 | 6361 | ||
4295 | 6362 | ||
4296 | @@ -6513,6 +6773,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru | 6363 | @@ -5803,6 +6059,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru |
4297 | 6364 | ||
4298 | 6365 | ||
4299 | 6366 | ||
@@ -4358,7 +6425,7 @@ index d5ae54925e9..3ff1148d9dd 100755 | |||
4358 | if test -n "$ac_tool_prefix"; then | 6425 | if test -n "$ac_tool_prefix"; then |
4359 | # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. | 6426 | # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. |
4360 | set dummy ${ac_tool_prefix}strip; ac_word=$2 | 6427 | set dummy ${ac_tool_prefix}strip; ac_word=$2 |
4361 | @@ -6847,8 +7165,8 @@ esac | 6428 | @@ -6142,8 +6456,8 @@ esac |
4362 | lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" | 6429 | lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" |
4363 | 6430 | ||
4364 | # Transform an extracted symbol line into symbol name and symbol address | 6431 | # Transform an extracted symbol line into symbol name and symbol address |
@@ -4369,7 +6436,7 @@ index d5ae54925e9..3ff1148d9dd 100755 | |||
4369 | 6436 | ||
4370 | # Handle CRLF in mingw tool chain | 6437 | # Handle CRLF in mingw tool chain |
4371 | opt_cr= | 6438 | opt_cr= |
4372 | @@ -6884,6 +7202,7 @@ for ac_symprfx in "" "_"; do | 6439 | @@ -6179,6 +6493,7 @@ for ac_symprfx in "" "_"; do |
4373 | else | 6440 | else |
4374 | lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" | 6441 | lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" |
4375 | fi | 6442 | fi |
@@ -4377,7 +6444,7 @@ index d5ae54925e9..3ff1148d9dd 100755 | |||
4377 | 6444 | ||
4378 | # Check to see that the pipe works correctly. | 6445 | # Check to see that the pipe works correctly. |
4379 | pipe_works=no | 6446 | pipe_works=no |
4380 | @@ -6925,6 +7244,18 @@ _LT_EOF | 6447 | @@ -6220,6 +6535,18 @@ _LT_EOF |
4381 | if $GREP ' nm_test_var$' "$nlist" >/dev/null; then | 6448 | if $GREP ' nm_test_var$' "$nlist" >/dev/null; then |
4382 | if $GREP ' nm_test_func$' "$nlist" >/dev/null; then | 6449 | if $GREP ' nm_test_func$' "$nlist" >/dev/null; then |
4383 | cat <<_LT_EOF > conftest.$ac_ext | 6450 | cat <<_LT_EOF > conftest.$ac_ext |
@@ -4396,7 +6463,7 @@ index d5ae54925e9..3ff1148d9dd 100755 | |||
4396 | #ifdef __cplusplus | 6463 | #ifdef __cplusplus |
4397 | extern "C" { | 6464 | extern "C" { |
4398 | #endif | 6465 | #endif |
4399 | @@ -6936,7 +7267,7 @@ _LT_EOF | 6466 | @@ -6231,7 +6558,7 @@ _LT_EOF |
4400 | cat <<_LT_EOF >> conftest.$ac_ext | 6467 | cat <<_LT_EOF >> conftest.$ac_ext |
4401 | 6468 | ||
4402 | /* The mapping between symbol names and symbols. */ | 6469 | /* The mapping between symbol names and symbols. */ |
@@ -4405,7 +6472,7 @@ index d5ae54925e9..3ff1148d9dd 100755 | |||
4405 | const char *name; | 6472 | const char *name; |
4406 | void *address; | 6473 | void *address; |
4407 | } | 6474 | } |
4408 | @@ -6962,8 +7293,8 @@ static const void *lt_preloaded_setup() { | 6475 | @@ -6257,8 +6584,8 @@ static const void *lt_preloaded_setup() { |
4409 | _LT_EOF | 6476 | _LT_EOF |
4410 | # Now try linking the two files. | 6477 | # Now try linking the two files. |
4411 | mv conftest.$ac_objext conftstm.$ac_objext | 6478 | mv conftest.$ac_objext conftstm.$ac_objext |
@@ -4416,7 +6483,7 @@ index d5ae54925e9..3ff1148d9dd 100755 | |||
4416 | LIBS="conftstm.$ac_objext" | 6483 | LIBS="conftstm.$ac_objext" |
4417 | CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" | 6484 | CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" |
4418 | if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 | 6485 | if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 |
4419 | @@ -6973,8 +7304,8 @@ _LT_EOF | 6486 | @@ -6268,8 +6595,8 @@ _LT_EOF |
4420 | test $ac_status = 0; } && test -s conftest${ac_exeext}; then | 6487 | test $ac_status = 0; } && test -s conftest${ac_exeext}; then |
4421 | pipe_works=yes | 6488 | pipe_works=yes |
4422 | fi | 6489 | fi |
@@ -4427,7 +6494,7 @@ index d5ae54925e9..3ff1148d9dd 100755 | |||
4427 | else | 6494 | else |
4428 | echo "cannot find nm_test_func in $nlist" >&5 | 6495 | echo "cannot find nm_test_func in $nlist" >&5 |
4429 | fi | 6496 | fi |
4430 | @@ -7011,6 +7342,21 @@ else | 6497 | @@ -6306,6 +6633,18 @@ else |
4431 | $as_echo "ok" >&6; } | 6498 | $as_echo "ok" >&6; } |
4432 | fi | 6499 | fi |
4433 | 6500 | ||
@@ -4443,18 +6510,18 @@ index d5ae54925e9..3ff1148d9dd 100755 | |||
4443 | + | 6510 | + |
4444 | + | 6511 | + |
4445 | + | 6512 | + |
4446 | + | ||
4447 | + | ||
4448 | + | ||
4449 | 6513 | ||
4450 | 6514 | ||
4451 | 6515 | ||
4452 | @@ -7027,6 +7373,40 @@ fi | 6516 | @@ -6322,6 +6661,43 @@ fi |
4453 | 6517 | ||
4454 | 6518 | ||
4455 | 6519 | ||
4456 | + | 6520 | + |
4457 | + | 6521 | + |
6522 | + | ||
6523 | + | ||
6524 | + | ||
4458 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 | 6525 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 |
4459 | +$as_echo_n "checking for sysroot... " >&6; } | 6526 | +$as_echo_n "checking for sysroot... " >&6; } |
4460 | + | 6527 | + |
@@ -4490,7 +6557,7 @@ index d5ae54925e9..3ff1148d9dd 100755 | |||
4490 | 6557 | ||
4491 | 6558 | ||
4492 | 6559 | ||
4493 | @@ -7238,6 +7618,123 @@ esac | 6560 | @@ -6533,6 +6909,123 @@ esac |
4494 | 6561 | ||
4495 | need_locks="$enable_libtool_lock" | 6562 | need_locks="$enable_libtool_lock" |
4496 | 6563 | ||
@@ -4614,7 +6681,7 @@ index d5ae54925e9..3ff1148d9dd 100755 | |||
4614 | 6681 | ||
4615 | case $host_os in | 6682 | case $host_os in |
4616 | rhapsody* | darwin*) | 6683 | rhapsody* | darwin*) |
4617 | @@ -7801,6 +8298,8 @@ _LT_EOF | 6684 | @@ -7096,6 +7589,8 @@ _LT_EOF |
4618 | $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 | 6685 | $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 |
4619 | echo "$AR cru libconftest.a conftest.o" >&5 | 6686 | echo "$AR cru libconftest.a conftest.o" >&5 |
4620 | $AR cru libconftest.a conftest.o 2>&5 | 6687 | $AR cru libconftest.a conftest.o 2>&5 |
@@ -4623,26 +6690,7 @@ index d5ae54925e9..3ff1148d9dd 100755 | |||
4623 | cat > conftest.c << _LT_EOF | 6690 | cat > conftest.c << _LT_EOF |
4624 | int main() { return 0;} | 6691 | int main() { return 0;} |
4625 | _LT_EOF | 6692 | _LT_EOF |
4626 | @@ -7996,7 +8495,8 @@ fi | 6693 | @@ -7680,8 +8175,6 @@ fi |
4627 | LIBTOOL_DEPS="$ltmain" | ||
4628 | |||
4629 | # Always use our own libtool. | ||
4630 | -LIBTOOL='$(SHELL) $(top_builddir)/libtool' | ||
4631 | +LIBTOOL='$(SHELL) $(top_builddir)' | ||
4632 | +LIBTOOL="$LIBTOOL/${host_alias}-libtool" | ||
4633 | |||
4634 | |||
4635 | |||
4636 | @@ -8085,7 +8585,7 @@ aix3*) | ||
4637 | esac | ||
4638 | |||
4639 | # Global variables: | ||
4640 | -ofile=libtool | ||
4641 | +ofile=${host_alias}-libtool | ||
4642 | can_build_shared=yes | ||
4643 | |||
4644 | # All known linkers require a `.a' archive for static linking (except MSVC, | ||
4645 | @@ -8383,8 +8883,6 @@ fi | ||
4646 | lt_prog_compiler_pic= | 6694 | lt_prog_compiler_pic= |
4647 | lt_prog_compiler_static= | 6695 | lt_prog_compiler_static= |
4648 | 6696 | ||
@@ -4651,7 +6699,7 @@ index d5ae54925e9..3ff1148d9dd 100755 | |||
4651 | 6699 | ||
4652 | if test "$GCC" = yes; then | 6700 | if test "$GCC" = yes; then |
4653 | lt_prog_compiler_wl='-Wl,' | 6701 | lt_prog_compiler_wl='-Wl,' |
4654 | @@ -8550,6 +9048,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } | 6702 | @@ -7847,6 +8340,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } |
4655 | lt_prog_compiler_pic='--shared' | 6703 | lt_prog_compiler_pic='--shared' |
4656 | lt_prog_compiler_static='--static' | 6704 | lt_prog_compiler_static='--static' |
4657 | ;; | 6705 | ;; |
@@ -4664,7 +6712,7 @@ index d5ae54925e9..3ff1148d9dd 100755 | |||
4664 | pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) | 6712 | pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) |
4665 | # Portland Group compilers (*not* the Pentium gcc compiler, | 6713 | # Portland Group compilers (*not* the Pentium gcc compiler, |
4666 | # which looks to be a dead project) | 6714 | # which looks to be a dead project) |
4667 | @@ -8612,7 +9116,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } | 6715 | @@ -7909,7 +8408,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } |
4668 | lt_prog_compiler_pic='-KPIC' | 6716 | lt_prog_compiler_pic='-KPIC' |
4669 | lt_prog_compiler_static='-Bstatic' | 6717 | lt_prog_compiler_static='-Bstatic' |
4670 | case $cc_basename in | 6718 | case $cc_basename in |
@@ -4673,7 +6721,7 @@ index d5ae54925e9..3ff1148d9dd 100755 | |||
4673 | lt_prog_compiler_wl='-Qoption ld ';; | 6721 | lt_prog_compiler_wl='-Qoption ld ';; |
4674 | *) | 6722 | *) |
4675 | lt_prog_compiler_wl='-Wl,';; | 6723 | lt_prog_compiler_wl='-Wl,';; |
4676 | @@ -8669,13 +9173,17 @@ case $host_os in | 6724 | @@ -7966,13 +8465,17 @@ case $host_os in |
4677 | lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" | 6725 | lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" |
4678 | ;; | 6726 | ;; |
4679 | esac | 6727 | esac |
@@ -4697,7 +6745,7 @@ index d5ae54925e9..3ff1148d9dd 100755 | |||
4697 | 6745 | ||
4698 | # | 6746 | # |
4699 | # Check to make sure the PIC flag actually works. | 6747 | # Check to make sure the PIC flag actually works. |
4700 | @@ -8736,6 +9244,11 @@ fi | 6748 | @@ -8033,6 +8536,11 @@ fi |
4701 | 6749 | ||
4702 | 6750 | ||
4703 | 6751 | ||
@@ -4709,7 +6757,7 @@ index d5ae54925e9..3ff1148d9dd 100755 | |||
4709 | # | 6757 | # |
4710 | # Check to make sure the static flag actually works. | 6758 | # Check to make sure the static flag actually works. |
4711 | # | 6759 | # |
4712 | @@ -9086,7 +9599,8 @@ _LT_EOF | 6760 | @@ -8383,7 +8891,8 @@ _LT_EOF |
4713 | allow_undefined_flag=unsupported | 6761 | allow_undefined_flag=unsupported |
4714 | always_export_symbols=no | 6762 | always_export_symbols=no |
4715 | enable_shared_with_static_runtimes=yes | 6763 | enable_shared_with_static_runtimes=yes |
@@ -4719,7 +6767,7 @@ index d5ae54925e9..3ff1148d9dd 100755 | |||
4719 | 6767 | ||
4720 | if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then | 6768 | if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then |
4721 | archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' | 6769 | archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' |
4722 | @@ -9185,12 +9699,12 @@ _LT_EOF | 6770 | @@ -8482,12 +8991,12 @@ _LT_EOF |
4723 | whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' | 6771 | whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' |
4724 | hardcode_libdir_flag_spec= | 6772 | hardcode_libdir_flag_spec= |
4725 | hardcode_libdir_flag_spec_ld='-rpath $libdir' | 6773 | hardcode_libdir_flag_spec_ld='-rpath $libdir' |
@@ -4734,7 +6782,7 @@ index d5ae54925e9..3ff1148d9dd 100755 | |||
4734 | fi | 6782 | fi |
4735 | ;; | 6783 | ;; |
4736 | esac | 6784 | esac |
4737 | @@ -9204,8 +9718,8 @@ _LT_EOF | 6785 | @@ -8501,8 +9010,8 @@ _LT_EOF |
4738 | archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' | 6786 | archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' |
4739 | wlarc= | 6787 | wlarc= |
4740 | else | 6788 | else |
@@ -4745,7 +6793,7 @@ index d5ae54925e9..3ff1148d9dd 100755 | |||
4745 | fi | 6793 | fi |
4746 | ;; | 6794 | ;; |
4747 | 6795 | ||
4748 | @@ -9223,8 +9737,8 @@ _LT_EOF | 6796 | @@ -8520,8 +9029,8 @@ _LT_EOF |
4749 | 6797 | ||
4750 | _LT_EOF | 6798 | _LT_EOF |
4751 | elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then | 6799 | elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then |
@@ -4756,7 +6804,7 @@ index d5ae54925e9..3ff1148d9dd 100755 | |||
4756 | else | 6804 | else |
4757 | ld_shlibs=no | 6805 | ld_shlibs=no |
4758 | fi | 6806 | fi |
4759 | @@ -9270,8 +9784,8 @@ _LT_EOF | 6807 | @@ -8567,8 +9076,8 @@ _LT_EOF |
4760 | 6808 | ||
4761 | *) | 6809 | *) |
4762 | if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then | 6810 | if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then |
@@ -4767,7 +6815,7 @@ index d5ae54925e9..3ff1148d9dd 100755 | |||
4767 | else | 6815 | else |
4768 | ld_shlibs=no | 6816 | ld_shlibs=no |
4769 | fi | 6817 | fi |
4770 | @@ -9401,7 +9915,13 @@ _LT_EOF | 6818 | @@ -8698,7 +9207,13 @@ _LT_EOF |
4771 | allow_undefined_flag='-berok' | 6819 | allow_undefined_flag='-berok' |
4772 | # Determine the default libpath from the value encoded in an | 6820 | # Determine the default libpath from the value encoded in an |
4773 | # empty executable. | 6821 | # empty executable. |
@@ -4782,7 +6830,7 @@ index d5ae54925e9..3ff1148d9dd 100755 | |||
4782 | /* end confdefs.h. */ | 6830 | /* end confdefs.h. */ |
4783 | 6831 | ||
4784 | int | 6832 | int |
4785 | @@ -9414,22 +9934,29 @@ main () | 6833 | @@ -8711,22 +9226,29 @@ main () |
4786 | _ACEOF | 6834 | _ACEOF |
4787 | if ac_fn_c_try_link "$LINENO"; then : | 6835 | if ac_fn_c_try_link "$LINENO"; then : |
4788 | 6836 | ||
@@ -4825,7 +6873,7 @@ index d5ae54925e9..3ff1148d9dd 100755 | |||
4825 | 6873 | ||
4826 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" | 6874 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" |
4827 | archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" | 6875 | archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" |
4828 | @@ -9441,7 +9968,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | 6876 | @@ -8738,7 +9260,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
4829 | else | 6877 | else |
4830 | # Determine the default libpath from the value encoded in an | 6878 | # Determine the default libpath from the value encoded in an |
4831 | # empty executable. | 6879 | # empty executable. |
@@ -4840,7 +6888,7 @@ index d5ae54925e9..3ff1148d9dd 100755 | |||
4840 | /* end confdefs.h. */ | 6888 | /* end confdefs.h. */ |
4841 | 6889 | ||
4842 | int | 6890 | int |
4843 | @@ -9454,22 +9987,29 @@ main () | 6891 | @@ -8751,22 +9279,29 @@ main () |
4844 | _ACEOF | 6892 | _ACEOF |
4845 | if ac_fn_c_try_link "$LINENO"; then : | 6893 | if ac_fn_c_try_link "$LINENO"; then : |
4846 | 6894 | ||
@@ -4883,7 +6931,7 @@ index d5ae54925e9..3ff1148d9dd 100755 | |||
4883 | 6931 | ||
4884 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" | 6932 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" |
4885 | # Warning - without using the other run time loading flags, | 6933 | # Warning - without using the other run time loading flags, |
4886 | @@ -9514,20 +10054,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | 6934 | @@ -8811,20 +9346,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
4887 | # Microsoft Visual C++. | 6935 | # Microsoft Visual C++. |
4888 | # hardcode_libdir_flag_spec is actually meaningless, as there is | 6936 | # hardcode_libdir_flag_spec is actually meaningless, as there is |
4889 | # no search path for DLLs. | 6937 | # no search path for DLLs. |
@@ -4961,7 +7009,7 @@ index d5ae54925e9..3ff1148d9dd 100755 | |||
4961 | ;; | 7009 | ;; |
4962 | 7010 | ||
4963 | darwin* | rhapsody*) | 7011 | darwin* | rhapsody*) |
4964 | @@ -9588,7 +10171,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | 7012 | @@ -8885,7 +9463,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
4965 | 7013 | ||
4966 | # FreeBSD 3 and greater uses gcc -shared to do shared libraries. | 7014 | # FreeBSD 3 and greater uses gcc -shared to do shared libraries. |
4967 | freebsd* | dragonfly*) | 7015 | freebsd* | dragonfly*) |
@@ -4970,7 +7018,7 @@ index d5ae54925e9..3ff1148d9dd 100755 | |||
4970 | hardcode_libdir_flag_spec='-R$libdir' | 7018 | hardcode_libdir_flag_spec='-R$libdir' |
4971 | hardcode_direct=yes | 7019 | hardcode_direct=yes |
4972 | hardcode_shlibpath_var=no | 7020 | hardcode_shlibpath_var=no |
4973 | @@ -9596,7 +10179,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | 7021 | @@ -8893,7 +9471,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
4974 | 7022 | ||
4975 | hpux9*) | 7023 | hpux9*) |
4976 | if test "$GCC" = yes; then | 7024 | if test "$GCC" = yes; then |
@@ -4979,7 +7027,7 @@ index d5ae54925e9..3ff1148d9dd 100755 | |||
4979 | else | 7027 | else |
4980 | archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' | 7028 | archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' |
4981 | fi | 7029 | fi |
4982 | @@ -9612,7 +10195,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | 7030 | @@ -8909,7 +9487,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
4983 | 7031 | ||
4984 | hpux10*) | 7032 | hpux10*) |
4985 | if test "$GCC" = yes && test "$with_gnu_ld" = no; then | 7033 | if test "$GCC" = yes && test "$with_gnu_ld" = no; then |
@@ -4988,8 +7036,8 @@ index d5ae54925e9..3ff1148d9dd 100755 | |||
4988 | else | 7036 | else |
4989 | archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' | 7037 | archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' |
4990 | fi | 7038 | fi |
4991 | @@ -9636,10 +10219,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | 7039 | @@ -8933,10 +9511,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
4992 | archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' | 7040 | archive_cmds='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' |
4993 | ;; | 7041 | ;; |
4994 | ia64*) | 7042 | ia64*) |
4995 | - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' | 7043 | - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' |
@@ -5001,7 +7049,7 @@ index d5ae54925e9..3ff1148d9dd 100755 | |||
5001 | ;; | 7049 | ;; |
5002 | esac | 7050 | esac |
5003 | else | 7051 | else |
5004 | @@ -9718,23 +10301,36 @@ fi | 7052 | @@ -9015,23 +9593,36 @@ fi |
5005 | 7053 | ||
5006 | irix5* | irix6* | nonstopux*) | 7054 | irix5* | irix6* | nonstopux*) |
5007 | if test "$GCC" = yes; then | 7055 | if test "$GCC" = yes; then |
@@ -5046,7 +7094,7 @@ index d5ae54925e9..3ff1148d9dd 100755 | |||
5046 | else | 7094 | else |
5047 | archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' | 7095 | archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' |
5048 | archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' | 7096 | archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' |
5049 | @@ -9819,7 +10415,7 @@ rm -f core conftest.err conftest.$ac_objext \ | 7097 | @@ -9116,7 +9707,7 @@ rm -f core conftest.err conftest.$ac_objext \ |
5050 | osf4* | osf5*) # as osf3* with the addition of -msym flag | 7098 | osf4* | osf5*) # as osf3* with the addition of -msym flag |
5051 | if test "$GCC" = yes; then | 7099 | if test "$GCC" = yes; then |
5052 | allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' | 7100 | allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' |
@@ -5055,7 +7103,7 @@ index d5ae54925e9..3ff1148d9dd 100755 | |||
5055 | hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' | 7103 | hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' |
5056 | else | 7104 | else |
5057 | allow_undefined_flag=' -expect_unresolved \*' | 7105 | allow_undefined_flag=' -expect_unresolved \*' |
5058 | @@ -9838,9 +10434,9 @@ rm -f core conftest.err conftest.$ac_objext \ | 7106 | @@ -9135,9 +9726,9 @@ rm -f core conftest.err conftest.$ac_objext \ |
5059 | no_undefined_flag=' -z defs' | 7107 | no_undefined_flag=' -z defs' |
5060 | if test "$GCC" = yes; then | 7108 | if test "$GCC" = yes; then |
5061 | wlarc='${wl}' | 7109 | wlarc='${wl}' |
@@ -5067,7 +7115,7 @@ index d5ae54925e9..3ff1148d9dd 100755 | |||
5067 | else | 7115 | else |
5068 | case `$CC -V 2>&1` in | 7116 | case `$CC -V 2>&1` in |
5069 | *"Compilers 5.0"*) | 7117 | *"Compilers 5.0"*) |
5070 | @@ -10416,8 +11012,9 @@ cygwin* | mingw* | pw32* | cegcc*) | 7118 | @@ -9713,8 +10304,9 @@ cygwin* | mingw* | pw32* | cegcc*) |
5071 | need_version=no | 7119 | need_version=no |
5072 | need_lib_prefix=no | 7120 | need_lib_prefix=no |
5073 | 7121 | ||
@@ -5079,7 +7127,7 @@ index d5ae54925e9..3ff1148d9dd 100755 | |||
5079 | library_names_spec='$libname.dll.a' | 7127 | library_names_spec='$libname.dll.a' |
5080 | # DLL is installed to $(libdir)/../bin by postinstall_cmds | 7128 | # DLL is installed to $(libdir)/../bin by postinstall_cmds |
5081 | postinstall_cmds='base_file=`basename \${file}`~ | 7129 | postinstall_cmds='base_file=`basename \${file}`~ |
5082 | @@ -10450,13 +11047,71 @@ cygwin* | mingw* | pw32* | cegcc*) | 7130 | @@ -9747,13 +10339,71 @@ cygwin* | mingw* | pw32* | cegcc*) |
5083 | library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' | 7131 | library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' |
5084 | ;; | 7132 | ;; |
5085 | esac | 7133 | esac |
@@ -5152,25 +7200,16 @@ index d5ae54925e9..3ff1148d9dd 100755 | |||
5152 | # FIXME: first we should search . and the directory the executable is in | 7200 | # FIXME: first we should search . and the directory the executable is in |
5153 | shlibpath_var=PATH | 7201 | shlibpath_var=PATH |
5154 | ;; | 7202 | ;; |
5155 | @@ -10538,7 +11193,7 @@ haiku*) | 7203 | @@ -10655,7 +11305,7 @@ else |
5156 | soname_spec='${libname}${release}${shared_ext}$major' | ||
5157 | shlibpath_var=LIBRARY_PATH | ||
5158 | shlibpath_overrides_runpath=yes | ||
5159 | - sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib' | ||
5160 | + sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' | ||
5161 | hardcode_into_libs=yes | ||
5162 | ;; | ||
5163 | |||
5164 | @@ -11334,7 +11989,7 @@ else | ||
5165 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 | 7204 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 |
5166 | lt_status=$lt_dlunknown | 7205 | lt_status=$lt_dlunknown |
5167 | cat > conftest.$ac_ext <<_LT_EOF | 7206 | cat > conftest.$ac_ext <<_LT_EOF |
5168 | -#line 11337 "configure" | 7207 | -#line 10658 "configure" |
5169 | +#line $LINENO "configure" | 7208 | +#line $LINENO "configure" |
5170 | #include "confdefs.h" | 7209 | #include "confdefs.h" |
5171 | 7210 | ||
5172 | #if HAVE_DLFCN_H | 7211 | #if HAVE_DLFCN_H |
5173 | @@ -11378,10 +12033,10 @@ else | 7212 | @@ -10699,10 +11349,10 @@ else |
5174 | /* When -fvisbility=hidden is used, assume the code has been annotated | 7213 | /* When -fvisbility=hidden is used, assume the code has been annotated |
5175 | correspondingly for the symbols needed. */ | 7214 | correspondingly for the symbols needed. */ |
5176 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) | 7215 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) |
@@ -5183,16 +7222,16 @@ index d5ae54925e9..3ff1148d9dd 100755 | |||
5183 | int main () | 7222 | int main () |
5184 | { | 7223 | { |
5185 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); | 7224 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); |
5186 | @@ -11440,7 +12095,7 @@ else | 7225 | @@ -10761,7 +11411,7 @@ else |
5187 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 | 7226 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 |
5188 | lt_status=$lt_dlunknown | 7227 | lt_status=$lt_dlunknown |
5189 | cat > conftest.$ac_ext <<_LT_EOF | 7228 | cat > conftest.$ac_ext <<_LT_EOF |
5190 | -#line 11443 "configure" | 7229 | -#line 10764 "configure" |
5191 | +#line $LINENO "configure" | 7230 | +#line $LINENO "configure" |
5192 | #include "confdefs.h" | 7231 | #include "confdefs.h" |
5193 | 7232 | ||
5194 | #if HAVE_DLFCN_H | 7233 | #if HAVE_DLFCN_H |
5195 | @@ -11484,10 +12139,10 @@ else | 7234 | @@ -10805,10 +11455,10 @@ else |
5196 | /* When -fvisbility=hidden is used, assume the code has been annotated | 7235 | /* When -fvisbility=hidden is used, assume the code has been annotated |
5197 | correspondingly for the symbols needed. */ | 7236 | correspondingly for the symbols needed. */ |
5198 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) | 7237 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) |
@@ -5205,7 +7244,7 @@ index d5ae54925e9..3ff1148d9dd 100755 | |||
5205 | int main () | 7244 | int main () |
5206 | { | 7245 | { |
5207 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); | 7246 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); |
5208 | @@ -16020,13 +16675,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' | 7247 | @@ -14728,13 +15378,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' |
5209 | lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' | 7248 | lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' |
5210 | lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' | 7249 | lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' |
5211 | lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' | 7250 | lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' |
@@ -5226,7 +7265,7 @@ index d5ae54925e9..3ff1148d9dd 100755 | |||
5226 | STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' | 7265 | STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' |
5227 | RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' | 7266 | RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' |
5228 | old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' | 7267 | old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' |
5229 | @@ -16041,14 +16703,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de | 7268 | @@ -14749,14 +15406,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de |
5230 | lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' | 7269 | lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' |
5231 | lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' | 7270 | lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' |
5232 | lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`' | 7271 | lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`' |
@@ -5245,7 +7284,7 @@ index d5ae54925e9..3ff1148d9dd 100755 | |||
5245 | DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' | 7284 | DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' |
5246 | NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' | 7285 | NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' |
5247 | LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' | 7286 | LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' |
5248 | @@ -16081,12 +16746,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q | 7287 | @@ -14789,12 +15449,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q |
5249 | hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' | 7288 | hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' |
5250 | inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' | 7289 | inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' |
5251 | link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' | 7290 | link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' |
@@ -5259,7 +7298,7 @@ index d5ae54925e9..3ff1148d9dd 100755 | |||
5259 | file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' | 7298 | file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' |
5260 | variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' | 7299 | variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' |
5261 | need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' | 7300 | need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' |
5262 | @@ -16141,8 +16806,13 @@ reload_flag \ | 7301 | @@ -14849,8 +15509,13 @@ reload_flag \ |
5263 | OBJDUMP \ | 7302 | OBJDUMP \ |
5264 | deplibs_check_method \ | 7303 | deplibs_check_method \ |
5265 | file_magic_cmd \ | 7304 | file_magic_cmd \ |
@@ -5273,7 +7312,7 @@ index d5ae54925e9..3ff1148d9dd 100755 | |||
5273 | STRIP \ | 7312 | STRIP \ |
5274 | RANLIB \ | 7313 | RANLIB \ |
5275 | CC \ | 7314 | CC \ |
5276 | @@ -16152,12 +16822,14 @@ lt_cv_sys_global_symbol_pipe \ | 7315 | @@ -14860,12 +15525,14 @@ lt_cv_sys_global_symbol_pipe \ |
5277 | lt_cv_sys_global_symbol_to_cdecl \ | 7316 | lt_cv_sys_global_symbol_to_cdecl \ |
5278 | lt_cv_sys_global_symbol_to_c_name_address \ | 7317 | lt_cv_sys_global_symbol_to_c_name_address \ |
5279 | lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ | 7318 | lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ |
@@ -5289,7 +7328,7 @@ index d5ae54925e9..3ff1148d9dd 100755 | |||
5289 | DSYMUTIL \ | 7328 | DSYMUTIL \ |
5290 | NMEDIT \ | 7329 | NMEDIT \ |
5291 | LIPO \ | 7330 | LIPO \ |
5292 | @@ -16173,7 +16845,6 @@ no_undefined_flag \ | 7331 | @@ -14881,7 +15548,6 @@ no_undefined_flag \ |
5293 | hardcode_libdir_flag_spec \ | 7332 | hardcode_libdir_flag_spec \ |
5294 | hardcode_libdir_flag_spec_ld \ | 7333 | hardcode_libdir_flag_spec_ld \ |
5295 | hardcode_libdir_separator \ | 7334 | hardcode_libdir_separator \ |
@@ -5297,7 +7336,7 @@ index d5ae54925e9..3ff1148d9dd 100755 | |||
5297 | exclude_expsyms \ | 7336 | exclude_expsyms \ |
5298 | include_expsyms \ | 7337 | include_expsyms \ |
5299 | file_list_spec \ | 7338 | file_list_spec \ |
5300 | @@ -16209,6 +16880,7 @@ module_cmds \ | 7339 | @@ -14917,6 +15583,7 @@ module_cmds \ |
5301 | module_expsym_cmds \ | 7340 | module_expsym_cmds \ |
5302 | export_symbols_cmds \ | 7341 | export_symbols_cmds \ |
5303 | prelink_cmds \ | 7342 | prelink_cmds \ |
@@ -5305,7 +7344,7 @@ index d5ae54925e9..3ff1148d9dd 100755 | |||
5305 | postinstall_cmds \ | 7344 | postinstall_cmds \ |
5306 | postuninstall_cmds \ | 7345 | postuninstall_cmds \ |
5307 | finish_cmds \ | 7346 | finish_cmds \ |
5308 | @@ -16982,7 +17654,8 @@ $as_echo X"$file" | | 7347 | @@ -15690,7 +16357,8 @@ $as_echo X"$file" | |
5309 | # NOTE: Changes made to this file will be lost: look at ltmain.sh. | 7348 | # NOTE: Changes made to this file will be lost: look at ltmain.sh. |
5310 | # | 7349 | # |
5311 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, | 7350 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, |
@@ -5315,7 +7354,7 @@ index d5ae54925e9..3ff1148d9dd 100755 | |||
5315 | # Written by Gordon Matzigkeit, 1996 | 7354 | # Written by Gordon Matzigkeit, 1996 |
5316 | # | 7355 | # |
5317 | # This file is part of GNU Libtool. | 7356 | # This file is part of GNU Libtool. |
5318 | @@ -17085,19 +17758,42 @@ SP2NL=$lt_lt_SP2NL | 7357 | @@ -15793,19 +16461,42 @@ SP2NL=$lt_lt_SP2NL |
5319 | # turn newlines into spaces. | 7358 | # turn newlines into spaces. |
5320 | NL2SP=$lt_lt_NL2SP | 7359 | NL2SP=$lt_lt_NL2SP |
5321 | 7360 | ||
@@ -5359,7 +7398,7 @@ index d5ae54925e9..3ff1148d9dd 100755 | |||
5359 | # A symbol stripping program. | 7398 | # A symbol stripping program. |
5360 | STRIP=$lt_STRIP | 7399 | STRIP=$lt_STRIP |
5361 | 7400 | ||
5362 | @@ -17127,6 +17823,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address | 7401 | @@ -15835,6 +16526,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address |
5363 | # Transform the output of nm in a C name address pair when lib prefix is needed. | 7402 | # Transform the output of nm in a C name address pair when lib prefix is needed. |
5364 | global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix | 7403 | global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix |
5365 | 7404 | ||
@@ -5372,7 +7411,7 @@ index d5ae54925e9..3ff1148d9dd 100755 | |||
5372 | # The name of the directory that contains temporary libtool files. | 7411 | # The name of the directory that contains temporary libtool files. |
5373 | objdir=$objdir | 7412 | objdir=$objdir |
5374 | 7413 | ||
5375 | @@ -17136,6 +17838,9 @@ MAGIC_CMD=$MAGIC_CMD | 7414 | @@ -15844,6 +16541,9 @@ MAGIC_CMD=$MAGIC_CMD |
5376 | # Must we lock files when doing compilation? | 7415 | # Must we lock files when doing compilation? |
5377 | need_locks=$lt_need_locks | 7416 | need_locks=$lt_need_locks |
5378 | 7417 | ||
@@ -5382,7 +7421,7 @@ index d5ae54925e9..3ff1148d9dd 100755 | |||
5382 | # Tool to manipulate archived DWARF debug symbol files on Mac OS X. | 7421 | # Tool to manipulate archived DWARF debug symbol files on Mac OS X. |
5383 | DSYMUTIL=$lt_DSYMUTIL | 7422 | DSYMUTIL=$lt_DSYMUTIL |
5384 | 7423 | ||
5385 | @@ -17250,12 +17955,12 @@ with_gcc=$GCC | 7424 | @@ -15958,12 +16658,12 @@ with_gcc=$GCC |
5386 | # Compiler flag to turn off builtin functions. | 7425 | # Compiler flag to turn off builtin functions. |
5387 | no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag | 7426 | no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag |
5388 | 7427 | ||
@@ -5398,7 +7437,7 @@ index d5ae54925e9..3ff1148d9dd 100755 | |||
5398 | # Compiler flag to prevent dynamic linking. | 7437 | # Compiler flag to prevent dynamic linking. |
5399 | link_static_flag=$lt_lt_prog_compiler_static | 7438 | link_static_flag=$lt_lt_prog_compiler_static |
5400 | 7439 | ||
5401 | @@ -17342,9 +18047,6 @@ inherit_rpath=$inherit_rpath | 7440 | @@ -16050,9 +16750,6 @@ inherit_rpath=$inherit_rpath |
5402 | # Whether libtool must link a program against all its dependency libraries. | 7441 | # Whether libtool must link a program against all its dependency libraries. |
5403 | link_all_deplibs=$link_all_deplibs | 7442 | link_all_deplibs=$link_all_deplibs |
5404 | 7443 | ||
@@ -5408,7 +7447,7 @@ index d5ae54925e9..3ff1148d9dd 100755 | |||
5408 | # Set to "yes" if exported symbols are required. | 7447 | # Set to "yes" if exported symbols are required. |
5409 | always_export_symbols=$always_export_symbols | 7448 | always_export_symbols=$always_export_symbols |
5410 | 7449 | ||
5411 | @@ -17360,6 +18062,9 @@ include_expsyms=$lt_include_expsyms | 7450 | @@ -16068,6 +16765,9 @@ include_expsyms=$lt_include_expsyms |
5412 | # Commands necessary for linking programs (against libraries) with templates. | 7451 | # Commands necessary for linking programs (against libraries) with templates. |
5413 | prelink_cmds=$lt_prelink_cmds | 7452 | prelink_cmds=$lt_prelink_cmds |
5414 | 7453 | ||
@@ -5418,7 +7457,7 @@ index d5ae54925e9..3ff1148d9dd 100755 | |||
5418 | # Specify filename containing input files. | 7457 | # Specify filename containing input files. |
5419 | file_list_spec=$lt_file_list_spec | 7458 | file_list_spec=$lt_file_list_spec |
5420 | 7459 | ||
5421 | @@ -17392,210 +18097,169 @@ ltmain="$ac_aux_dir/ltmain.sh" | 7460 | @@ -16100,210 +16800,169 @@ ltmain="$ac_aux_dir/ltmain.sh" |
5422 | # if finds mixed CR/LF and LF-only lines. Since sed operates in | 7461 | # if finds mixed CR/LF and LF-only lines. Since sed operates in |
5423 | # text mode, it properly converts lines to CR/LF. This bash problem | 7462 | # text mode, it properly converts lines to CR/LF. This bash problem |
5424 | # is reportedly fixed, but why not run on old versions too? | 7463 | # is reportedly fixed, but why not run on old versions too? |
@@ -5792,40 +7831,57 @@ index d5ae54925e9..3ff1148d9dd 100755 | |||
5792 | (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") | 7831 | (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") |
5793 | chmod +x "$ofile" | 7832 | chmod +x "$ofile" |
5794 | 7833 | ||
5795 | diff --git a/gprof/configure b/gprof/configure | 7834 | diff --git a/gprofng/Makefile.in b/gprofng/Makefile.in |
5796 | index b12ec2e472f..57986ca995a 100755 | 7835 | index dbc868191b7..1ca6dd01f58 100644 |
5797 | --- a/gprof/configure | 7836 | --- a/gprofng/Makefile.in |
5798 | +++ b/gprof/configure | 7837 | +++ b/gprofng/Makefile.in |
5799 | @@ -663,8 +663,11 @@ OTOOL | 7838 | @@ -253,6 +253,7 @@ CXXFLAGS = @CXXFLAGS@ |
7839 | CYGPATH_W = @CYGPATH_W@ | ||
7840 | DEFS = @DEFS@ | ||
7841 | DEPDIR = @DEPDIR@ | ||
7842 | +DLLTOOL = @DLLTOOL@ | ||
7843 | DSYMUTIL = @DSYMUTIL@ | ||
7844 | DUMPBIN = @DUMPBIN@ | ||
7845 | ECHO_C = @ECHO_C@ | ||
7846 | @@ -289,6 +290,7 @@ LN_S = @LN_S@ | ||
7847 | LTLIBOBJS = @LTLIBOBJS@ | ||
7848 | MAINT = @MAINT@ | ||
7849 | MAKEINFO = @MAKEINFO@ | ||
7850 | +MANIFEST_TOOL = @MANIFEST_TOOL@ | ||
7851 | MKDIR_P = @MKDIR_P@ | ||
7852 | NM = @NM@ | ||
7853 | NMEDIT = @NMEDIT@ | ||
7854 | diff --git a/gprofng/configure b/gprofng/configure | ||
7855 | index bdfa2281f2c..b6376eb3f77 100755 | ||
7856 | --- a/gprofng/configure | ||
7857 | +++ b/gprofng/configure | ||
7858 | @@ -671,6 +671,8 @@ OTOOL | ||
5800 | LIPO | 7859 | LIPO |
5801 | NMEDIT | 7860 | NMEDIT |
5802 | DSYMUTIL | 7861 | DSYMUTIL |
5803 | +MANIFEST_TOOL | 7862 | +MANIFEST_TOOL |
5804 | RANLIB | ||
5805 | +ac_ct_AR | ||
5806 | AR | ||
5807 | +DLLTOOL | 7863 | +DLLTOOL |
5808 | OBJDUMP | 7864 | OBJDUMP |
5809 | LN_S | 7865 | LN_S |
5810 | NM | 7866 | NM |
5811 | @@ -781,6 +784,7 @@ enable_static | 7867 | @@ -801,6 +803,7 @@ enable_static |
5812 | with_pic | 7868 | with_pic |
5813 | enable_fast_install | 7869 | enable_fast_install |
5814 | with_gnu_ld | 7870 | with_gnu_ld |
5815 | +with_libtool_sysroot | 7871 | +with_libtool_sysroot |
5816 | enable_libtool_lock | 7872 | enable_libtool_lock |
5817 | enable_plugins | 7873 | enable_werror_always |
5818 | enable_largefile | 7874 | enable_gprofng_tools |
5819 | @@ -1443,6 +1447,8 @@ Optional Packages: | 7875 | @@ -1464,6 +1467,8 @@ Optional Packages: |
5820 | --with-pic try to use only PIC/non-PIC objects [default=use | 7876 | --with-pic try to use only PIC/non-PIC objects [default=use |
5821 | both] | 7877 | both] |
5822 | --with-gnu-ld assume the C compiler uses GNU ld [default=no] | 7878 | --with-gnu-ld assume the C compiler uses GNU ld [default=no] |
5823 | + --with-libtool-sysroot=DIR Search for dependent libraries within DIR | 7879 | + --with-libtool-sysroot=DIR Search for dependent libraries within DIR |
5824 | + (or the compiler's sysroot if not specified). | 7880 | + (or the compiler's sysroot if not specified). |
7881 | --with-jdk=PATH specify prefix directory for installed JDK. | ||
7882 | --with-system-zlib use installed libz | ||
5825 | 7883 | ||
5826 | Some influential environment variables: | 7884 | @@ -6152,8 +6157,8 @@ esac |
5827 | CC C compiler command | ||
5828 | @@ -5125,8 +5131,8 @@ esac | ||
5829 | 7885 | ||
5830 | 7886 | ||
5831 | 7887 | ||
@@ -5836,7 +7892,7 @@ index b12ec2e472f..57986ca995a 100755 | |||
5836 | 7892 | ||
5837 | 7893 | ||
5838 | 7894 | ||
5839 | @@ -5166,7 +5172,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO | 7895 | @@ -6193,7 +6198,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO |
5840 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 | 7896 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 |
5841 | $as_echo_n "checking how to print strings... " >&6; } | 7897 | $as_echo_n "checking how to print strings... " >&6; } |
5842 | # Test print first, because it will be a builtin if present. | 7898 | # Test print first, because it will be a builtin if present. |
@@ -5845,7 +7901,7 @@ index b12ec2e472f..57986ca995a 100755 | |||
5845 | test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then | 7901 | test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then |
5846 | ECHO='print -r --' | 7902 | ECHO='print -r --' |
5847 | elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then | 7903 | elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then |
5848 | @@ -5852,8 +5858,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; | 7904 | @@ -6886,8 +6891,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; |
5849 | # Try some XSI features | 7905 | # Try some XSI features |
5850 | xsi_shell=no | 7906 | xsi_shell=no |
5851 | ( _lt_dummy="a/b/c" | 7907 | ( _lt_dummy="a/b/c" |
@@ -5856,7 +7912,7 @@ index b12ec2e472f..57986ca995a 100755 | |||
5856 | && eval 'test $(( 1 + 1 )) -eq 2 \ | 7912 | && eval 'test $(( 1 + 1 )) -eq 2 \ |
5857 | && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ | 7913 | && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ |
5858 | && xsi_shell=yes | 7914 | && xsi_shell=yes |
5859 | @@ -5902,6 +5908,80 @@ esac | 7915 | @@ -6936,6 +6941,80 @@ esac |
5860 | 7916 | ||
5861 | 7917 | ||
5862 | 7918 | ||
@@ -5937,7 +7993,7 @@ index b12ec2e472f..57986ca995a 100755 | |||
5937 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 | 7993 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 |
5938 | $as_echo_n "checking for $LD option to reload object files... " >&6; } | 7994 | $as_echo_n "checking for $LD option to reload object files... " >&6; } |
5939 | if ${lt_cv_ld_reload_flag+:} false; then : | 7995 | if ${lt_cv_ld_reload_flag+:} false; then : |
5940 | @@ -5918,6 +5998,11 @@ case $reload_flag in | 7996 | @@ -6952,6 +7031,11 @@ case $reload_flag in |
5941 | esac | 7997 | esac |
5942 | reload_cmds='$LD$reload_flag -o $output$reload_objs' | 7998 | reload_cmds='$LD$reload_flag -o $output$reload_objs' |
5943 | case $host_os in | 7999 | case $host_os in |
@@ -5949,7 +8005,7 @@ index b12ec2e472f..57986ca995a 100755 | |||
5949 | darwin*) | 8005 | darwin*) |
5950 | if test "$GCC" = yes; then | 8006 | if test "$GCC" = yes; then |
5951 | reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' | 8007 | reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' |
5952 | @@ -6086,7 +6171,8 @@ mingw* | pw32*) | 8008 | @@ -7120,7 +7204,8 @@ mingw* | pw32*) |
5953 | lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' | 8009 | lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' |
5954 | lt_cv_file_magic_cmd='func_win32_libid' | 8010 | lt_cv_file_magic_cmd='func_win32_libid' |
5955 | else | 8011 | else |
@@ -5959,7 +8015,7 @@ index b12ec2e472f..57986ca995a 100755 | |||
5959 | lt_cv_file_magic_cmd='$OBJDUMP -f' | 8015 | lt_cv_file_magic_cmd='$OBJDUMP -f' |
5960 | fi | 8016 | fi |
5961 | ;; | 8017 | ;; |
5962 | @@ -6240,6 +6326,21 @@ esac | 8018 | @@ -7279,6 +7364,21 @@ esac |
5963 | fi | 8019 | fi |
5964 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 | 8020 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 |
5965 | $as_echo "$lt_cv_deplibs_check_method" >&6; } | 8021 | $as_echo "$lt_cv_deplibs_check_method" >&6; } |
@@ -5981,7 +8037,7 @@ index b12ec2e472f..57986ca995a 100755 | |||
5981 | file_magic_cmd=$lt_cv_file_magic_cmd | 8037 | file_magic_cmd=$lt_cv_file_magic_cmd |
5982 | deplibs_check_method=$lt_cv_deplibs_check_method | 8038 | deplibs_check_method=$lt_cv_deplibs_check_method |
5983 | test -z "$deplibs_check_method" && deplibs_check_method=unknown | 8039 | test -z "$deplibs_check_method" && deplibs_check_method=unknown |
5984 | @@ -6253,11 +6354,164 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown | 8040 | @@ -7294,6 +7394,157 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown |
5985 | 8041 | ||
5986 | 8042 | ||
5987 | 8043 | ||
@@ -5995,11 +8051,7 @@ index b12ec2e472f..57986ca995a 100755 | |||
5995 | + | 8051 | + |
5996 | + | 8052 | + |
5997 | + | 8053 | + |
5998 | 8054 | +if test -n "$ac_tool_prefix"; then | |
5999 | |||
6000 | if test -n "$ac_tool_prefix"; then | ||
6001 | - # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. | ||
6002 | -set dummy ${ac_tool_prefix}ar; ac_word=$2 | ||
6003 | + # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. | 8055 | + # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. |
6004 | +set dummy ${ac_tool_prefix}dlltool; ac_word=$2 | 8056 | +set dummy ${ac_tool_prefix}dlltool; ac_word=$2 |
6005 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | 8057 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
@@ -6140,7 +8192,15 @@ index b12ec2e472f..57986ca995a 100755 | |||
6140 | + | 8192 | + |
6141 | + | 8193 | + |
6142 | + | 8194 | + |
6143 | +if test -n "$ac_tool_prefix"; then | 8195 | plugin_option= |
8196 | plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll" | ||
8197 | for plugin in $plugin_names; do | ||
8198 | @@ -7308,8 +7559,10 @@ for plugin in $plugin_names; do | ||
8199 | done | ||
8200 | |||
8201 | if test -n "$ac_tool_prefix"; then | ||
8202 | - # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. | ||
8203 | -set dummy ${ac_tool_prefix}ar; ac_word=$2 | ||
6144 | + for ac_prog in ar | 8204 | + for ac_prog in ar |
6145 | + do | 8205 | + do |
6146 | + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. | 8206 | + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. |
@@ -6148,7 +8208,7 @@ index b12ec2e472f..57986ca995a 100755 | |||
6148 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | 8208 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
6149 | $as_echo_n "checking for $ac_word... " >&6; } | 8209 | $as_echo_n "checking for $ac_word... " >&6; } |
6150 | if ${ac_cv_prog_AR+:} false; then : | 8210 | if ${ac_cv_prog_AR+:} false; then : |
6151 | @@ -6273,7 +6527,7 @@ do | 8211 | @@ -7325,7 +7578,7 @@ do |
6152 | test -z "$as_dir" && as_dir=. | 8212 | test -z "$as_dir" && as_dir=. |
6153 | for ac_exec_ext in '' $ac_executable_extensions; do | 8213 | for ac_exec_ext in '' $ac_executable_extensions; do |
6154 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | 8214 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
@@ -6157,7 +8217,7 @@ index b12ec2e472f..57986ca995a 100755 | |||
6157 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | 8217 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
6158 | break 2 | 8218 | break 2 |
6159 | fi | 8219 | fi |
6160 | @@ -6293,11 +6547,15 @@ $as_echo "no" >&6; } | 8220 | @@ -7345,11 +7598,15 @@ $as_echo "no" >&6; } |
6161 | fi | 8221 | fi |
6162 | 8222 | ||
6163 | 8223 | ||
@@ -6176,7 +8236,7 @@ index b12ec2e472f..57986ca995a 100755 | |||
6176 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | 8236 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
6177 | $as_echo_n "checking for $ac_word... " >&6; } | 8237 | $as_echo_n "checking for $ac_word... " >&6; } |
6178 | if ${ac_cv_prog_ac_ct_AR+:} false; then : | 8238 | if ${ac_cv_prog_ac_ct_AR+:} false; then : |
6179 | @@ -6313,7 +6571,7 @@ do | 8239 | @@ -7365,7 +7622,7 @@ do |
6180 | test -z "$as_dir" && as_dir=. | 8240 | test -z "$as_dir" && as_dir=. |
6181 | for ac_exec_ext in '' $ac_executable_extensions; do | 8241 | for ac_exec_ext in '' $ac_executable_extensions; do |
6182 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | 8242 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
@@ -6185,7 +8245,7 @@ index b12ec2e472f..57986ca995a 100755 | |||
6185 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | 8245 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
6186 | break 2 | 8246 | break 2 |
6187 | fi | 8247 | fi |
6188 | @@ -6332,6 +6590,10 @@ else | 8248 | @@ -7384,6 +7641,10 @@ else |
6189 | $as_echo "no" >&6; } | 8249 | $as_echo "no" >&6; } |
6190 | fi | 8250 | fi |
6191 | 8251 | ||
@@ -6196,7 +8256,7 @@ index b12ec2e472f..57986ca995a 100755 | |||
6196 | if test "x$ac_ct_AR" = x; then | 8256 | if test "x$ac_ct_AR" = x; then |
6197 | AR="false" | 8257 | AR="false" |
6198 | else | 8258 | else |
6199 | @@ -6343,16 +6605,72 @@ ac_tool_warned=yes ;; | 8259 | @@ -7395,25 +7656,19 @@ ac_tool_warned=yes ;; |
6200 | esac | 8260 | esac |
6201 | AR=$ac_ct_AR | 8261 | AR=$ac_ct_AR |
6202 | fi | 8262 | fi |
@@ -6205,10 +8265,87 @@ index b12ec2e472f..57986ca995a 100755 | |||
6205 | fi | 8265 | fi |
6206 | 8266 | ||
6207 | -test -z "$AR" && AR=ar | 8267 | -test -z "$AR" && AR=ar |
8268 | -if test -n "$plugin_option"; then | ||
8269 | - if $AR --help 2>&1 | grep -q "\--plugin"; then | ||
8270 | - touch conftest.c | ||
8271 | - $AR $plugin_option rc conftest.a conftest.c | ||
8272 | - if test "$?" != 0; then | ||
8273 | - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5 | ||
8274 | + touch conftest.c | ||
8275 | + $AR $plugin_option rc conftest.a conftest.c | ||
8276 | + if test "$?" != 0; then | ||
8277 | + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5 | ||
8278 | $as_echo "$as_me: WARNING: Failed: $AR $plugin_option rc" >&2;} | ||
8279 | - else | ||
8280 | - AR="$AR $plugin_option" | ||
8281 | - fi | ||
8282 | - rm -f conftest.* | ||
8283 | + else | ||
8284 | + AR="$AR $plugin_option" | ||
8285 | fi | ||
8286 | -fi | ||
6208 | -test -z "$AR_FLAGS" && AR_FLAGS=cru | 8287 | -test -z "$AR_FLAGS" && AR_FLAGS=cru |
8288 | + rm -f conftest.* | ||
6209 | +: ${AR=ar} | 8289 | +: ${AR=ar} |
6210 | +: ${AR_FLAGS=cru} | 8290 | +: ${AR_FLAGS=cru} |
8291 | |||
8292 | |||
8293 | |||
8294 | @@ -7425,6 +7680,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru | ||
8295 | |||
8296 | |||
8297 | |||
8298 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 | ||
8299 | +$as_echo_n "checking for archiver @FILE support... " >&6; } | ||
8300 | +if ${lt_cv_ar_at_file+:} false; then : | ||
8301 | + $as_echo_n "(cached) " >&6 | ||
8302 | +else | ||
8303 | + lt_cv_ar_at_file=no | ||
8304 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
8305 | +/* end confdefs.h. */ | ||
8306 | + | ||
8307 | +int | ||
8308 | +main () | ||
8309 | +{ | ||
8310 | + | ||
8311 | + ; | ||
8312 | + return 0; | ||
8313 | +} | ||
8314 | +_ACEOF | ||
8315 | +if ac_fn_c_try_compile "$LINENO"; then : | ||
8316 | + echo conftest.$ac_objext > conftest.lst | ||
8317 | + lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5' | ||
8318 | + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 | ||
8319 | + (eval $lt_ar_try) 2>&5 | ||
8320 | + ac_status=$? | ||
8321 | + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 | ||
8322 | + test $ac_status = 0; } | ||
8323 | + if test "$ac_status" -eq 0; then | ||
8324 | + # Ensure the archiver fails upon bogus file names. | ||
8325 | + rm -f conftest.$ac_objext libconftest.a | ||
8326 | + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 | ||
8327 | + (eval $lt_ar_try) 2>&5 | ||
8328 | + ac_status=$? | ||
8329 | + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 | ||
8330 | + test $ac_status = 0; } | ||
8331 | + if test "$ac_status" -ne 0; then | ||
8332 | + lt_cv_ar_at_file=@ | ||
8333 | + fi | ||
8334 | + fi | ||
8335 | + rm -f conftest.* libconftest.a | ||
8336 | + | ||
8337 | +fi | ||
8338 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
6211 | + | 8339 | + |
8340 | +fi | ||
8341 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 | ||
8342 | +$as_echo "$lt_cv_ar_at_file" >&6; } | ||
8343 | + | ||
8344 | +if test "x$lt_cv_ar_at_file" = xno; then | ||
8345 | + archiver_list_spec= | ||
8346 | +else | ||
8347 | + archiver_list_spec=$lt_cv_ar_at_file | ||
8348 | +fi | ||
6212 | + | 8349 | + |
6213 | + | 8350 | + |
6214 | + | 8351 | + |
@@ -6216,9 +8353,2584 @@ index b12ec2e472f..57986ca995a 100755 | |||
6216 | + | 8353 | + |
6217 | + | 8354 | + |
6218 | + | 8355 | + |
8356 | if test -n "$ac_tool_prefix"; then | ||
8357 | # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. | ||
8358 | set dummy ${ac_tool_prefix}strip; ac_word=$2 | ||
8359 | @@ -7764,8 +8077,8 @@ esac | ||
8360 | lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" | ||
8361 | |||
8362 | # Transform an extracted symbol line into symbol name and symbol address | ||
8363 | -lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" | ||
8364 | -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'" | ||
8365 | +lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" | ||
8366 | +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'" | ||
8367 | |||
8368 | # Handle CRLF in mingw tool chain | ||
8369 | opt_cr= | ||
8370 | @@ -7801,6 +8114,7 @@ for ac_symprfx in "" "_"; do | ||
8371 | else | ||
8372 | lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" | ||
8373 | fi | ||
8374 | + lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" | ||
8375 | |||
8376 | # Check to see that the pipe works correctly. | ||
8377 | pipe_works=no | ||
8378 | @@ -7842,6 +8156,18 @@ _LT_EOF | ||
8379 | if $GREP ' nm_test_var$' "$nlist" >/dev/null; then | ||
8380 | if $GREP ' nm_test_func$' "$nlist" >/dev/null; then | ||
8381 | cat <<_LT_EOF > conftest.$ac_ext | ||
8382 | +/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ | ||
8383 | +#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) | ||
8384 | +/* DATA imports from DLLs on WIN32 con't be const, because runtime | ||
8385 | + relocations are performed -- see ld's documentation on pseudo-relocs. */ | ||
8386 | +# define LT_DLSYM_CONST | ||
8387 | +#elif defined(__osf__) | ||
8388 | +/* This system does not cope well with relocations in const data. */ | ||
8389 | +# define LT_DLSYM_CONST | ||
8390 | +#else | ||
8391 | +# define LT_DLSYM_CONST const | ||
8392 | +#endif | ||
6219 | + | 8393 | + |
8394 | #ifdef __cplusplus | ||
8395 | extern "C" { | ||
8396 | #endif | ||
8397 | @@ -7853,7 +8179,7 @@ _LT_EOF | ||
8398 | cat <<_LT_EOF >> conftest.$ac_ext | ||
8399 | |||
8400 | /* The mapping between symbol names and symbols. */ | ||
8401 | -const struct { | ||
8402 | +LT_DLSYM_CONST struct { | ||
8403 | const char *name; | ||
8404 | void *address; | ||
8405 | } | ||
8406 | @@ -7879,8 +8205,8 @@ static const void *lt_preloaded_setup() { | ||
8407 | _LT_EOF | ||
8408 | # Now try linking the two files. | ||
8409 | mv conftest.$ac_objext conftstm.$ac_objext | ||
8410 | - lt_save_LIBS="$LIBS" | ||
8411 | - lt_save_CFLAGS="$CFLAGS" | ||
8412 | + lt_globsym_save_LIBS=$LIBS | ||
8413 | + lt_globsym_save_CFLAGS=$CFLAGS | ||
8414 | LIBS="conftstm.$ac_objext" | ||
8415 | CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" | ||
8416 | if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 | ||
8417 | @@ -7890,8 +8216,8 @@ _LT_EOF | ||
8418 | test $ac_status = 0; } && test -s conftest${ac_exeext}; then | ||
8419 | pipe_works=yes | ||
8420 | fi | ||
8421 | - LIBS="$lt_save_LIBS" | ||
8422 | - CFLAGS="$lt_save_CFLAGS" | ||
8423 | + LIBS=$lt_globsym_save_LIBS | ||
8424 | + CFLAGS=$lt_globsym_save_CFLAGS | ||
8425 | else | ||
8426 | echo "cannot find nm_test_func in $nlist" >&5 | ||
8427 | fi | ||
8428 | @@ -7928,6 +8254,14 @@ else | ||
8429 | $as_echo "ok" >&6; } | ||
8430 | fi | ||
8431 | |||
8432 | +# Response file support. | ||
8433 | +if test "$lt_cv_nm_interface" = "MS dumpbin"; then | ||
8434 | + nm_file_list_spec='@' | ||
8435 | +elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then | ||
8436 | + nm_file_list_spec='@' | ||
8437 | +fi | ||
8438 | + | ||
8439 | + | ||
8440 | |||
8441 | |||
8442 | |||
8443 | @@ -7946,6 +8280,47 @@ fi | ||
8444 | |||
8445 | |||
8446 | |||
8447 | + | ||
8448 | + | ||
8449 | + | ||
8450 | + | ||
8451 | + | ||
8452 | + | ||
8453 | + | ||
8454 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 | ||
8455 | +$as_echo_n "checking for sysroot... " >&6; } | ||
8456 | + | ||
8457 | +# Check whether --with-libtool-sysroot was given. | ||
8458 | +if test "${with_libtool_sysroot+set}" = set; then : | ||
8459 | + withval=$with_libtool_sysroot; | ||
8460 | +else | ||
8461 | + with_libtool_sysroot=no | ||
8462 | +fi | ||
8463 | + | ||
8464 | + | ||
8465 | +lt_sysroot= | ||
8466 | +case ${with_libtool_sysroot} in #( | ||
8467 | + yes) | ||
8468 | + if test "$GCC" = yes; then | ||
8469 | + lt_sysroot=`$CC --print-sysroot 2>/dev/null` | ||
8470 | + fi | ||
8471 | + ;; #( | ||
8472 | + /*) | ||
8473 | + lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"` | ||
8474 | + ;; #( | ||
8475 | + no|'') | ||
8476 | + ;; #( | ||
8477 | + *) | ||
8478 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5 | ||
8479 | +$as_echo "${with_libtool_sysroot}" >&6; } | ||
8480 | + as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 | ||
8481 | + ;; | ||
8482 | +esac | ||
8483 | + | ||
8484 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 | ||
8485 | +$as_echo "${lt_sysroot:-no}" >&6; } | ||
8486 | + | ||
8487 | + | ||
8488 | |||
8489 | |||
8490 | |||
8491 | @@ -8155,6 +8530,123 @@ esac | ||
8492 | |||
8493 | need_locks="$enable_libtool_lock" | ||
8494 | |||
8495 | +if test -n "$ac_tool_prefix"; then | ||
8496 | + # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args. | ||
8497 | +set dummy ${ac_tool_prefix}mt; ac_word=$2 | ||
8498 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
8499 | +$as_echo_n "checking for $ac_word... " >&6; } | ||
8500 | +if ${ac_cv_prog_MANIFEST_TOOL+:} false; then : | ||
8501 | + $as_echo_n "(cached) " >&6 | ||
8502 | +else | ||
8503 | + if test -n "$MANIFEST_TOOL"; then | ||
8504 | + ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test. | ||
8505 | +else | ||
8506 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | ||
8507 | +for as_dir in $PATH | ||
8508 | +do | ||
8509 | + IFS=$as_save_IFS | ||
8510 | + test -z "$as_dir" && as_dir=. | ||
8511 | + for ac_exec_ext in '' $ac_executable_extensions; do | ||
8512 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | ||
8513 | + ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" | ||
8514 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
8515 | + break 2 | ||
8516 | + fi | ||
8517 | +done | ||
8518 | + done | ||
8519 | +IFS=$as_save_IFS | ||
8520 | + | ||
8521 | +fi | ||
8522 | +fi | ||
8523 | +MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL | ||
8524 | +if test -n "$MANIFEST_TOOL"; then | ||
8525 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5 | ||
8526 | +$as_echo "$MANIFEST_TOOL" >&6; } | ||
8527 | +else | ||
8528 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
8529 | +$as_echo "no" >&6; } | ||
8530 | +fi | ||
8531 | + | ||
8532 | + | ||
8533 | +fi | ||
8534 | +if test -z "$ac_cv_prog_MANIFEST_TOOL"; then | ||
8535 | + ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL | ||
8536 | + # Extract the first word of "mt", so it can be a program name with args. | ||
8537 | +set dummy mt; ac_word=$2 | ||
8538 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
8539 | +$as_echo_n "checking for $ac_word... " >&6; } | ||
8540 | +if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then : | ||
8541 | + $as_echo_n "(cached) " >&6 | ||
8542 | +else | ||
8543 | + if test -n "$ac_ct_MANIFEST_TOOL"; then | ||
8544 | + ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test. | ||
8545 | +else | ||
8546 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | ||
8547 | +for as_dir in $PATH | ||
8548 | +do | ||
8549 | + IFS=$as_save_IFS | ||
8550 | + test -z "$as_dir" && as_dir=. | ||
8551 | + for ac_exec_ext in '' $ac_executable_extensions; do | ||
8552 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | ||
8553 | + ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" | ||
8554 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
8555 | + break 2 | ||
8556 | + fi | ||
8557 | +done | ||
8558 | + done | ||
8559 | +IFS=$as_save_IFS | ||
8560 | + | ||
8561 | +fi | ||
8562 | +fi | ||
8563 | +ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL | ||
8564 | +if test -n "$ac_ct_MANIFEST_TOOL"; then | ||
8565 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5 | ||
8566 | +$as_echo "$ac_ct_MANIFEST_TOOL" >&6; } | ||
8567 | +else | ||
8568 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
8569 | +$as_echo "no" >&6; } | ||
8570 | +fi | ||
8571 | + | ||
8572 | + if test "x$ac_ct_MANIFEST_TOOL" = x; then | ||
8573 | + MANIFEST_TOOL=":" | ||
8574 | + else | ||
8575 | + case $cross_compiling:$ac_tool_warned in | ||
8576 | +yes:) | ||
8577 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 | ||
8578 | +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} | ||
8579 | +ac_tool_warned=yes ;; | ||
8580 | +esac | ||
8581 | + MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL | ||
8582 | + fi | ||
8583 | +else | ||
8584 | + MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL" | ||
8585 | +fi | ||
8586 | + | ||
8587 | +test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt | ||
8588 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5 | ||
8589 | +$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; } | ||
8590 | +if ${lt_cv_path_mainfest_tool+:} false; then : | ||
8591 | + $as_echo_n "(cached) " >&6 | ||
8592 | +else | ||
8593 | + lt_cv_path_mainfest_tool=no | ||
8594 | + echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5 | ||
8595 | + $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out | ||
8596 | + cat conftest.err >&5 | ||
8597 | + if $GREP 'Manifest Tool' conftest.out > /dev/null; then | ||
8598 | + lt_cv_path_mainfest_tool=yes | ||
8599 | + fi | ||
8600 | + rm -f conftest* | ||
8601 | +fi | ||
8602 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5 | ||
8603 | +$as_echo "$lt_cv_path_mainfest_tool" >&6; } | ||
8604 | +if test "x$lt_cv_path_mainfest_tool" != xyes; then | ||
8605 | + MANIFEST_TOOL=: | ||
8606 | +fi | ||
8607 | + | ||
8608 | + | ||
8609 | + | ||
8610 | + | ||
8611 | + | ||
8612 | |||
8613 | case $host_os in | ||
8614 | rhapsody* | darwin*) | ||
8615 | @@ -8718,6 +9210,8 @@ _LT_EOF | ||
8616 | $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 | ||
8617 | echo "$AR cru libconftest.a conftest.o" >&5 | ||
8618 | $AR cru libconftest.a conftest.o 2>&5 | ||
8619 | + echo "$RANLIB libconftest.a" >&5 | ||
8620 | + $RANLIB libconftest.a 2>&5 | ||
8621 | cat > conftest.c << _LT_EOF | ||
8622 | int main() { return 0;} | ||
8623 | _LT_EOF | ||
8624 | @@ -8788,6 +9282,16 @@ done | ||
8625 | |||
8626 | |||
8627 | |||
8628 | +func_stripname_cnf () | ||
8629 | +{ | ||
8630 | + case ${2} in | ||
8631 | + .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; | ||
8632 | + *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; | ||
8633 | + esac | ||
8634 | +} # func_stripname_cnf | ||
6220 | + | 8635 | + |
6221 | + | 8636 | + |
8637 | + | ||
8638 | |||
8639 | |||
8640 | # Set options | ||
8641 | @@ -9273,8 +9777,6 @@ fi | ||
8642 | lt_prog_compiler_pic= | ||
8643 | lt_prog_compiler_static= | ||
8644 | |||
8645 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 | ||
8646 | -$as_echo_n "checking for $compiler option to produce PIC... " >&6; } | ||
8647 | |||
8648 | if test "$GCC" = yes; then | ||
8649 | lt_prog_compiler_wl='-Wl,' | ||
8650 | @@ -9440,6 +9942,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } | ||
8651 | lt_prog_compiler_pic='--shared' | ||
8652 | lt_prog_compiler_static='--static' | ||
8653 | ;; | ||
8654 | + nagfor*) | ||
8655 | + # NAG Fortran compiler | ||
8656 | + lt_prog_compiler_wl='-Wl,-Wl,,' | ||
8657 | + lt_prog_compiler_pic='-PIC' | ||
8658 | + lt_prog_compiler_static='-Bstatic' | ||
8659 | + ;; | ||
8660 | pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) | ||
8661 | # Portland Group compilers (*not* the Pentium gcc compiler, | ||
8662 | # which looks to be a dead project) | ||
8663 | @@ -9502,7 +10010,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } | ||
8664 | lt_prog_compiler_pic='-KPIC' | ||
8665 | lt_prog_compiler_static='-Bstatic' | ||
8666 | case $cc_basename in | ||
8667 | - f77* | f90* | f95*) | ||
8668 | + f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) | ||
8669 | lt_prog_compiler_wl='-Qoption ld ';; | ||
8670 | *) | ||
8671 | lt_prog_compiler_wl='-Wl,';; | ||
8672 | @@ -9559,13 +10067,17 @@ case $host_os in | ||
8673 | lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" | ||
8674 | ;; | ||
8675 | esac | ||
8676 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5 | ||
8677 | -$as_echo "$lt_prog_compiler_pic" >&6; } | ||
8678 | - | ||
8679 | - | ||
8680 | - | ||
8681 | - | ||
8682 | |||
8683 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 | ||
8684 | +$as_echo_n "checking for $compiler option to produce PIC... " >&6; } | ||
8685 | +if ${lt_cv_prog_compiler_pic+:} false; then : | ||
8686 | + $as_echo_n "(cached) " >&6 | ||
8687 | +else | ||
8688 | + lt_cv_prog_compiler_pic=$lt_prog_compiler_pic | ||
8689 | +fi | ||
8690 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5 | ||
8691 | +$as_echo "$lt_cv_prog_compiler_pic" >&6; } | ||
8692 | +lt_prog_compiler_pic=$lt_cv_prog_compiler_pic | ||
8693 | |||
8694 | # | ||
8695 | # Check to make sure the PIC flag actually works. | ||
8696 | @@ -9626,6 +10138,11 @@ fi | ||
8697 | |||
8698 | |||
8699 | |||
8700 | + | ||
8701 | + | ||
8702 | + | ||
8703 | + | ||
8704 | + | ||
8705 | # | ||
8706 | # Check to make sure the static flag actually works. | ||
8707 | # | ||
8708 | @@ -9976,7 +10493,8 @@ _LT_EOF | ||
8709 | allow_undefined_flag=unsupported | ||
8710 | always_export_symbols=no | ||
8711 | enable_shared_with_static_runtimes=yes | ||
8712 | - export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' | ||
8713 | + 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' | ||
8714 | + exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' | ||
8715 | |||
8716 | if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then | ||
8717 | archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' | ||
8718 | @@ -10075,12 +10593,12 @@ _LT_EOF | ||
8719 | whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' | ||
8720 | hardcode_libdir_flag_spec= | ||
8721 | hardcode_libdir_flag_spec_ld='-rpath $libdir' | ||
8722 | - archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' | ||
8723 | + archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' | ||
8724 | if test "x$supports_anon_versioning" = xyes; then | ||
8725 | archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ | ||
8726 | cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ | ||
8727 | echo "local: *; };" >> $output_objdir/$libname.ver~ | ||
8728 | - $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' | ||
8729 | + $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' | ||
8730 | fi | ||
8731 | ;; | ||
8732 | esac | ||
8733 | @@ -10094,8 +10612,8 @@ _LT_EOF | ||
8734 | archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' | ||
8735 | wlarc= | ||
8736 | else | ||
8737 | - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' | ||
8738 | - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' | ||
8739 | + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' | ||
8740 | + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' | ||
8741 | fi | ||
8742 | ;; | ||
8743 | |||
8744 | @@ -10113,8 +10631,8 @@ _LT_EOF | ||
8745 | |||
8746 | _LT_EOF | ||
8747 | elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then | ||
8748 | - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' | ||
8749 | - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' | ||
8750 | + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' | ||
8751 | + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' | ||
8752 | else | ||
8753 | ld_shlibs=no | ||
8754 | fi | ||
8755 | @@ -10160,8 +10678,8 @@ _LT_EOF | ||
8756 | |||
8757 | *) | ||
8758 | if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then | ||
8759 | - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' | ||
8760 | - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' | ||
8761 | + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' | ||
8762 | + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' | ||
8763 | else | ||
8764 | ld_shlibs=no | ||
8765 | fi | ||
8766 | @@ -10291,7 +10809,13 @@ _LT_EOF | ||
8767 | allow_undefined_flag='-berok' | ||
8768 | # Determine the default libpath from the value encoded in an | ||
8769 | # empty executable. | ||
8770 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
8771 | + if test "${lt_cv_aix_libpath+set}" = set; then | ||
8772 | + aix_libpath=$lt_cv_aix_libpath | ||
8773 | +else | ||
8774 | + if ${lt_cv_aix_libpath_+:} false; then : | ||
8775 | + $as_echo_n "(cached) " >&6 | ||
8776 | +else | ||
8777 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
8778 | /* end confdefs.h. */ | ||
8779 | |||
8780 | int | ||
8781 | @@ -10304,22 +10828,29 @@ main () | ||
8782 | _ACEOF | ||
8783 | if ac_fn_c_try_link "$LINENO"; then : | ||
8784 | |||
8785 | -lt_aix_libpath_sed=' | ||
8786 | - /Import File Strings/,/^$/ { | ||
8787 | - /^0/ { | ||
8788 | - s/^0 *\(.*\)$/\1/ | ||
8789 | - p | ||
8790 | - } | ||
8791 | - }' | ||
8792 | -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | ||
8793 | -# Check for a 64-bit object if we didn't find anything. | ||
8794 | -if test -z "$aix_libpath"; then | ||
8795 | - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | ||
8796 | -fi | ||
8797 | + lt_aix_libpath_sed=' | ||
8798 | + /Import File Strings/,/^$/ { | ||
8799 | + /^0/ { | ||
8800 | + s/^0 *\([^ ]*\) *$/\1/ | ||
8801 | + p | ||
8802 | + } | ||
8803 | + }' | ||
8804 | + lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | ||
8805 | + # Check for a 64-bit object if we didn't find anything. | ||
8806 | + if test -z "$lt_cv_aix_libpath_"; then | ||
8807 | + lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | ||
8808 | + fi | ||
8809 | fi | ||
8810 | rm -f core conftest.err conftest.$ac_objext \ | ||
8811 | conftest$ac_exeext conftest.$ac_ext | ||
8812 | -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | ||
8813 | + if test -z "$lt_cv_aix_libpath_"; then | ||
8814 | + lt_cv_aix_libpath_="/usr/lib:/lib" | ||
8815 | + fi | ||
8816 | + | ||
8817 | +fi | ||
8818 | + | ||
8819 | + aix_libpath=$lt_cv_aix_libpath_ | ||
8820 | +fi | ||
8821 | |||
8822 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" | ||
8823 | archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" | ||
8824 | @@ -10331,7 +10862,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | ||
8825 | else | ||
8826 | # Determine the default libpath from the value encoded in an | ||
8827 | # empty executable. | ||
8828 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
8829 | + if test "${lt_cv_aix_libpath+set}" = set; then | ||
8830 | + aix_libpath=$lt_cv_aix_libpath | ||
8831 | +else | ||
8832 | + if ${lt_cv_aix_libpath_+:} false; then : | ||
8833 | + $as_echo_n "(cached) " >&6 | ||
8834 | +else | ||
8835 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
8836 | /* end confdefs.h. */ | ||
8837 | |||
8838 | int | ||
8839 | @@ -10344,22 +10881,29 @@ main () | ||
8840 | _ACEOF | ||
8841 | if ac_fn_c_try_link "$LINENO"; then : | ||
8842 | |||
8843 | -lt_aix_libpath_sed=' | ||
8844 | - /Import File Strings/,/^$/ { | ||
8845 | - /^0/ { | ||
8846 | - s/^0 *\(.*\)$/\1/ | ||
8847 | - p | ||
8848 | - } | ||
8849 | - }' | ||
8850 | -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | ||
8851 | -# Check for a 64-bit object if we didn't find anything. | ||
8852 | -if test -z "$aix_libpath"; then | ||
8853 | - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | ||
8854 | -fi | ||
8855 | + lt_aix_libpath_sed=' | ||
8856 | + /Import File Strings/,/^$/ { | ||
8857 | + /^0/ { | ||
8858 | + s/^0 *\([^ ]*\) *$/\1/ | ||
8859 | + p | ||
8860 | + } | ||
8861 | + }' | ||
8862 | + lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | ||
8863 | + # Check for a 64-bit object if we didn't find anything. | ||
8864 | + if test -z "$lt_cv_aix_libpath_"; then | ||
8865 | + lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | ||
8866 | + fi | ||
8867 | fi | ||
8868 | rm -f core conftest.err conftest.$ac_objext \ | ||
8869 | conftest$ac_exeext conftest.$ac_ext | ||
8870 | -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | ||
8871 | + if test -z "$lt_cv_aix_libpath_"; then | ||
8872 | + lt_cv_aix_libpath_="/usr/lib:/lib" | ||
8873 | + fi | ||
8874 | + | ||
8875 | +fi | ||
8876 | + | ||
8877 | + aix_libpath=$lt_cv_aix_libpath_ | ||
8878 | +fi | ||
8879 | |||
8880 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" | ||
8881 | # Warning - without using the other run time loading flags, | ||
8882 | @@ -10404,20 +10948,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | ||
8883 | # Microsoft Visual C++. | ||
8884 | # hardcode_libdir_flag_spec is actually meaningless, as there is | ||
8885 | # no search path for DLLs. | ||
8886 | - hardcode_libdir_flag_spec=' ' | ||
8887 | - allow_undefined_flag=unsupported | ||
8888 | - # Tell ltmain to make .lib files, not .a files. | ||
8889 | - libext=lib | ||
8890 | - # Tell ltmain to make .dll files, not .so files. | ||
8891 | - shrext_cmds=".dll" | ||
8892 | - # FIXME: Setting linknames here is a bad hack. | ||
8893 | - archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' | ||
8894 | - # The linker will automatically build a .lib file if we build a DLL. | ||
8895 | - old_archive_from_new_cmds='true' | ||
8896 | - # FIXME: Should let the user specify the lib program. | ||
8897 | - old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' | ||
8898 | - fix_srcfile_path='`cygpath -w "$srcfile"`' | ||
8899 | - enable_shared_with_static_runtimes=yes | ||
8900 | + case $cc_basename in | ||
8901 | + cl*) | ||
8902 | + # Native MSVC | ||
8903 | + hardcode_libdir_flag_spec=' ' | ||
8904 | + allow_undefined_flag=unsupported | ||
8905 | + always_export_symbols=yes | ||
8906 | + file_list_spec='@' | ||
8907 | + # Tell ltmain to make .lib files, not .a files. | ||
8908 | + libext=lib | ||
8909 | + # Tell ltmain to make .dll files, not .so files. | ||
8910 | + shrext_cmds=".dll" | ||
8911 | + # FIXME: Setting linknames here is a bad hack. | ||
8912 | + archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' | ||
8913 | + archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then | ||
8914 | + sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; | ||
8915 | + else | ||
8916 | + sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; | ||
8917 | + fi~ | ||
8918 | + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ | ||
8919 | + linknames=' | ||
8920 | + # The linker will not automatically build a static lib if we build a DLL. | ||
8921 | + # _LT_TAGVAR(old_archive_from_new_cmds, )='true' | ||
8922 | + enable_shared_with_static_runtimes=yes | ||
8923 | + export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' | ||
8924 | + # Don't use ranlib | ||
8925 | + old_postinstall_cmds='chmod 644 $oldlib' | ||
8926 | + postlink_cmds='lt_outputfile="@OUTPUT@"~ | ||
8927 | + lt_tool_outputfile="@TOOL_OUTPUT@"~ | ||
8928 | + case $lt_outputfile in | ||
8929 | + *.exe|*.EXE) ;; | ||
8930 | + *) | ||
8931 | + lt_outputfile="$lt_outputfile.exe" | ||
8932 | + lt_tool_outputfile="$lt_tool_outputfile.exe" | ||
8933 | + ;; | ||
8934 | + esac~ | ||
8935 | + if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then | ||
8936 | + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; | ||
8937 | + $RM "$lt_outputfile.manifest"; | ||
8938 | + fi' | ||
8939 | + ;; | ||
8940 | + *) | ||
8941 | + # Assume MSVC wrapper | ||
8942 | + hardcode_libdir_flag_spec=' ' | ||
8943 | + allow_undefined_flag=unsupported | ||
8944 | + # Tell ltmain to make .lib files, not .a files. | ||
8945 | + libext=lib | ||
8946 | + # Tell ltmain to make .dll files, not .so files. | ||
8947 | + shrext_cmds=".dll" | ||
8948 | + # FIXME: Setting linknames here is a bad hack. | ||
8949 | + archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' | ||
8950 | + # The linker will automatically build a .lib file if we build a DLL. | ||
8951 | + old_archive_from_new_cmds='true' | ||
8952 | + # FIXME: Should let the user specify the lib program. | ||
8953 | + old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' | ||
8954 | + enable_shared_with_static_runtimes=yes | ||
8955 | + ;; | ||
8956 | + esac | ||
8957 | ;; | ||
8958 | |||
8959 | darwin* | rhapsody*) | ||
8960 | @@ -10478,7 +11065,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | ||
8961 | |||
8962 | # FreeBSD 3 and greater uses gcc -shared to do shared libraries. | ||
8963 | freebsd* | dragonfly*) | ||
8964 | - archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' | ||
8965 | + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' | ||
8966 | hardcode_libdir_flag_spec='-R$libdir' | ||
8967 | hardcode_direct=yes | ||
8968 | hardcode_shlibpath_var=no | ||
8969 | @@ -10486,7 +11073,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | ||
8970 | |||
8971 | hpux9*) | ||
8972 | if test "$GCC" = yes; then | ||
8973 | - 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' | ||
8974 | + 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' | ||
8975 | else | ||
8976 | archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' | ||
8977 | fi | ||
8978 | @@ -10502,7 +11089,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | ||
8979 | |||
8980 | hpux10*) | ||
8981 | if test "$GCC" = yes && test "$with_gnu_ld" = no; then | ||
8982 | - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' | ||
8983 | + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' | ||
8984 | else | ||
8985 | archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' | ||
8986 | fi | ||
8987 | @@ -10526,10 +11113,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | ||
8988 | archive_cmds='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' | ||
8989 | ;; | ||
8990 | ia64*) | ||
8991 | - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' | ||
8992 | + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' | ||
8993 | ;; | ||
8994 | *) | ||
8995 | - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' | ||
8996 | + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' | ||
8997 | ;; | ||
8998 | esac | ||
8999 | else | ||
9000 | @@ -10608,23 +11195,36 @@ fi | ||
9001 | |||
9002 | irix5* | irix6* | nonstopux*) | ||
9003 | if test "$GCC" = yes; then | ||
9004 | - 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' | ||
9005 | + 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' | ||
9006 | # Try to use the -exported_symbol ld option, if it does not | ||
9007 | # work, assume that -exports_file does not work either and | ||
9008 | # implicitly export all symbols. | ||
9009 | - save_LDFLAGS="$LDFLAGS" | ||
9010 | - LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" | ||
9011 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
9012 | + # This should be the same for all languages, so no per-tag cache variable. | ||
9013 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5 | ||
9014 | +$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; } | ||
9015 | +if ${lt_cv_irix_exported_symbol+:} false; then : | ||
9016 | + $as_echo_n "(cached) " >&6 | ||
9017 | +else | ||
9018 | + save_LDFLAGS="$LDFLAGS" | ||
9019 | + LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" | ||
9020 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
9021 | /* end confdefs.h. */ | ||
9022 | -int foo(void) {} | ||
9023 | +int foo (void) { return 0; } | ||
9024 | _ACEOF | ||
9025 | if ac_fn_c_try_link "$LINENO"; then : | ||
9026 | - 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' | ||
9027 | - | ||
9028 | + lt_cv_irix_exported_symbol=yes | ||
9029 | +else | ||
9030 | + lt_cv_irix_exported_symbol=no | ||
9031 | fi | ||
9032 | rm -f core conftest.err conftest.$ac_objext \ | ||
9033 | conftest$ac_exeext conftest.$ac_ext | ||
9034 | - LDFLAGS="$save_LDFLAGS" | ||
9035 | + LDFLAGS="$save_LDFLAGS" | ||
9036 | +fi | ||
9037 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5 | ||
9038 | +$as_echo "$lt_cv_irix_exported_symbol" >&6; } | ||
9039 | + if test "$lt_cv_irix_exported_symbol" = yes; then | ||
9040 | + 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' | ||
9041 | + fi | ||
9042 | else | ||
9043 | archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' | ||
9044 | archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' | ||
9045 | @@ -10709,7 +11309,7 @@ rm -f core conftest.err conftest.$ac_objext \ | ||
9046 | osf4* | osf5*) # as osf3* with the addition of -msym flag | ||
9047 | if test "$GCC" = yes; then | ||
9048 | allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' | ||
9049 | - 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' | ||
9050 | + 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' | ||
9051 | hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' | ||
9052 | else | ||
9053 | allow_undefined_flag=' -expect_unresolved \*' | ||
9054 | @@ -10728,9 +11328,9 @@ rm -f core conftest.err conftest.$ac_objext \ | ||
9055 | no_undefined_flag=' -z defs' | ||
9056 | if test "$GCC" = yes; then | ||
9057 | wlarc='${wl}' | ||
9058 | - archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' | ||
9059 | + archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' | ||
9060 | archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ | ||
9061 | - $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' | ||
9062 | + $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' | ||
9063 | else | ||
9064 | case `$CC -V 2>&1` in | ||
9065 | *"Compilers 5.0"*) | ||
9066 | @@ -11306,8 +11906,9 @@ cygwin* | mingw* | pw32* | cegcc*) | ||
9067 | need_version=no | ||
9068 | need_lib_prefix=no | ||
9069 | |||
9070 | - case $GCC,$host_os in | ||
9071 | - yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) | ||
9072 | + case $GCC,$cc_basename in | ||
9073 | + yes,*) | ||
9074 | + # gcc | ||
9075 | library_names_spec='$libname.dll.a' | ||
9076 | # DLL is installed to $(libdir)/../bin by postinstall_cmds | ||
9077 | postinstall_cmds='base_file=`basename \${file}`~ | ||
9078 | @@ -11340,13 +11941,71 @@ cygwin* | mingw* | pw32* | cegcc*) | ||
9079 | library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' | ||
9080 | ;; | ||
9081 | esac | ||
9082 | + dynamic_linker='Win32 ld.exe' | ||
9083 | + ;; | ||
9084 | + | ||
9085 | + *,cl*) | ||
9086 | + # Native MSVC | ||
9087 | + libname_spec='$name' | ||
9088 | + soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' | ||
9089 | + library_names_spec='${libname}.dll.lib' | ||
9090 | + | ||
9091 | + case $build_os in | ||
9092 | + mingw*) | ||
9093 | + sys_lib_search_path_spec= | ||
9094 | + lt_save_ifs=$IFS | ||
9095 | + IFS=';' | ||
9096 | + for lt_path in $LIB | ||
9097 | + do | ||
9098 | + IFS=$lt_save_ifs | ||
9099 | + # Let DOS variable expansion print the short 8.3 style file name. | ||
9100 | + lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` | ||
9101 | + sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" | ||
9102 | + done | ||
9103 | + IFS=$lt_save_ifs | ||
9104 | + # Convert to MSYS style. | ||
9105 | + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` | ||
9106 | + ;; | ||
9107 | + cygwin*) | ||
9108 | + # Convert to unix form, then to dos form, then back to unix form | ||
9109 | + # but this time dos style (no spaces!) so that the unix form looks | ||
9110 | + # like /cygdrive/c/PROGRA~1:/cygdr... | ||
9111 | + sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` | ||
9112 | + sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` | ||
9113 | + sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` | ||
9114 | + ;; | ||
9115 | + *) | ||
9116 | + sys_lib_search_path_spec="$LIB" | ||
9117 | + if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then | ||
9118 | + # It is most probably a Windows format PATH. | ||
9119 | + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` | ||
9120 | + else | ||
9121 | + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` | ||
9122 | + fi | ||
9123 | + # FIXME: find the short name or the path components, as spaces are | ||
9124 | + # common. (e.g. "Program Files" -> "PROGRA~1") | ||
9125 | + ;; | ||
9126 | + esac | ||
9127 | + | ||
9128 | + # DLL is installed to $(libdir)/../bin by postinstall_cmds | ||
9129 | + postinstall_cmds='base_file=`basename \${file}`~ | ||
9130 | + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ | ||
9131 | + dldir=$destdir/`dirname \$dlpath`~ | ||
9132 | + test -d \$dldir || mkdir -p \$dldir~ | ||
9133 | + $install_prog $dir/$dlname \$dldir/$dlname' | ||
9134 | + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ | ||
9135 | + dlpath=$dir/\$dldll~ | ||
9136 | + $RM \$dlpath' | ||
9137 | + shlibpath_overrides_runpath=yes | ||
9138 | + dynamic_linker='Win32 link.exe' | ||
9139 | ;; | ||
9140 | |||
9141 | *) | ||
9142 | + # Assume MSVC wrapper | ||
9143 | library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' | ||
9144 | + dynamic_linker='Win32 ld.exe' | ||
9145 | ;; | ||
9146 | esac | ||
9147 | - dynamic_linker='Win32 ld.exe' | ||
9148 | # FIXME: first we should search . and the directory the executable is in | ||
9149 | shlibpath_var=PATH | ||
9150 | ;; | ||
9151 | @@ -12248,7 +12907,7 @@ else | ||
9152 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 | ||
9153 | lt_status=$lt_dlunknown | ||
9154 | cat > conftest.$ac_ext <<_LT_EOF | ||
9155 | -#line 12251 "configure" | ||
9156 | +#line $LINENO "configure" | ||
9157 | #include "confdefs.h" | ||
9158 | |||
9159 | #if HAVE_DLFCN_H | ||
9160 | @@ -12292,10 +12951,10 @@ else | ||
9161 | /* When -fvisbility=hidden is used, assume the code has been annotated | ||
9162 | correspondingly for the symbols needed. */ | ||
9163 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) | ||
9164 | -void fnord () __attribute__((visibility("default"))); | ||
9165 | +int fnord () __attribute__((visibility("default"))); | ||
9166 | #endif | ||
9167 | |||
9168 | -void fnord () { int i=42; } | ||
9169 | +int fnord () { return 42; } | ||
9170 | int main () | ||
9171 | { | ||
9172 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); | ||
9173 | @@ -12354,7 +13013,7 @@ else | ||
9174 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 | ||
9175 | lt_status=$lt_dlunknown | ||
9176 | cat > conftest.$ac_ext <<_LT_EOF | ||
9177 | -#line 12357 "configure" | ||
9178 | +#line $LINENO "configure" | ||
9179 | #include "confdefs.h" | ||
9180 | |||
9181 | #if HAVE_DLFCN_H | ||
9182 | @@ -12398,10 +13057,10 @@ else | ||
9183 | /* When -fvisbility=hidden is used, assume the code has been annotated | ||
9184 | correspondingly for the symbols needed. */ | ||
9185 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) | ||
9186 | -void fnord () __attribute__((visibility("default"))); | ||
9187 | +int fnord () __attribute__((visibility("default"))); | ||
9188 | #endif | ||
9189 | |||
9190 | -void fnord () { int i=42; } | ||
9191 | +int fnord () { return 42; } | ||
9192 | int main () | ||
9193 | { | ||
9194 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); | ||
9195 | @@ -12793,6 +13452,7 @@ $RM -r conftest* | ||
9196 | |||
9197 | # Allow CC to be a program name with arguments. | ||
9198 | lt_save_CC=$CC | ||
9199 | + lt_save_CFLAGS=$CFLAGS | ||
9200 | lt_save_LD=$LD | ||
9201 | lt_save_GCC=$GCC | ||
9202 | GCC=$GXX | ||
9203 | @@ -12810,6 +13470,7 @@ $RM -r conftest* | ||
9204 | fi | ||
9205 | test -z "${LDCXX+set}" || LD=$LDCXX | ||
9206 | CC=${CXX-"c++"} | ||
9207 | + CFLAGS=$CXXFLAGS | ||
9208 | compiler=$CC | ||
9209 | compiler_CXX=$CC | ||
9210 | for cc_temp in $compiler""; do | ||
9211 | @@ -13092,7 +13753,13 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie | ||
9212 | allow_undefined_flag_CXX='-berok' | ||
9213 | # Determine the default libpath from the value encoded in an empty | ||
9214 | # executable. | ||
9215 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
9216 | + if test "${lt_cv_aix_libpath+set}" = set; then | ||
9217 | + aix_libpath=$lt_cv_aix_libpath | ||
9218 | +else | ||
9219 | + if ${lt_cv_aix_libpath__CXX+:} false; then : | ||
9220 | + $as_echo_n "(cached) " >&6 | ||
9221 | +else | ||
9222 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
9223 | /* end confdefs.h. */ | ||
9224 | |||
9225 | int | ||
9226 | @@ -13105,22 +13772,29 @@ main () | ||
9227 | _ACEOF | ||
9228 | if ac_fn_cxx_try_link "$LINENO"; then : | ||
9229 | |||
9230 | -lt_aix_libpath_sed=' | ||
9231 | - /Import File Strings/,/^$/ { | ||
9232 | - /^0/ { | ||
9233 | - s/^0 *\(.*\)$/\1/ | ||
9234 | - p | ||
9235 | - } | ||
9236 | - }' | ||
9237 | -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | ||
9238 | -# Check for a 64-bit object if we didn't find anything. | ||
9239 | -if test -z "$aix_libpath"; then | ||
9240 | - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | ||
9241 | -fi | ||
9242 | + lt_aix_libpath_sed=' | ||
9243 | + /Import File Strings/,/^$/ { | ||
9244 | + /^0/ { | ||
9245 | + s/^0 *\([^ ]*\) *$/\1/ | ||
9246 | + p | ||
9247 | + } | ||
9248 | + }' | ||
9249 | + lt_cv_aix_libpath__CXX=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | ||
9250 | + # Check for a 64-bit object if we didn't find anything. | ||
9251 | + if test -z "$lt_cv_aix_libpath__CXX"; then | ||
9252 | + lt_cv_aix_libpath__CXX=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | ||
9253 | + fi | ||
9254 | fi | ||
9255 | rm -f core conftest.err conftest.$ac_objext \ | ||
9256 | conftest$ac_exeext conftest.$ac_ext | ||
9257 | -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | ||
9258 | + if test -z "$lt_cv_aix_libpath__CXX"; then | ||
9259 | + lt_cv_aix_libpath__CXX="/usr/lib:/lib" | ||
9260 | + fi | ||
9261 | + | ||
9262 | +fi | ||
9263 | + | ||
9264 | + aix_libpath=$lt_cv_aix_libpath__CXX | ||
9265 | +fi | ||
9266 | |||
9267 | hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" | ||
9268 | |||
9269 | @@ -13133,7 +13807,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | ||
9270 | else | ||
9271 | # Determine the default libpath from the value encoded in an | ||
9272 | # empty executable. | ||
9273 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
9274 | + if test "${lt_cv_aix_libpath+set}" = set; then | ||
9275 | + aix_libpath=$lt_cv_aix_libpath | ||
9276 | +else | ||
9277 | + if ${lt_cv_aix_libpath__CXX+:} false; then : | ||
9278 | + $as_echo_n "(cached) " >&6 | ||
9279 | +else | ||
9280 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
9281 | /* end confdefs.h. */ | ||
9282 | |||
9283 | int | ||
9284 | @@ -13146,22 +13826,29 @@ main () | ||
9285 | _ACEOF | ||
9286 | if ac_fn_cxx_try_link "$LINENO"; then : | ||
9287 | |||
9288 | -lt_aix_libpath_sed=' | ||
9289 | - /Import File Strings/,/^$/ { | ||
9290 | - /^0/ { | ||
9291 | - s/^0 *\(.*\)$/\1/ | ||
9292 | - p | ||
9293 | - } | ||
9294 | - }' | ||
9295 | -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | ||
9296 | -# Check for a 64-bit object if we didn't find anything. | ||
9297 | -if test -z "$aix_libpath"; then | ||
9298 | - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | ||
9299 | -fi | ||
9300 | + lt_aix_libpath_sed=' | ||
9301 | + /Import File Strings/,/^$/ { | ||
9302 | + /^0/ { | ||
9303 | + s/^0 *\([^ ]*\) *$/\1/ | ||
9304 | + p | ||
9305 | + } | ||
9306 | + }' | ||
9307 | + lt_cv_aix_libpath__CXX=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | ||
9308 | + # Check for a 64-bit object if we didn't find anything. | ||
9309 | + if test -z "$lt_cv_aix_libpath__CXX"; then | ||
9310 | + lt_cv_aix_libpath__CXX=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | ||
9311 | + fi | ||
9312 | fi | ||
9313 | rm -f core conftest.err conftest.$ac_objext \ | ||
9314 | conftest$ac_exeext conftest.$ac_ext | ||
9315 | -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | ||
9316 | + if test -z "$lt_cv_aix_libpath__CXX"; then | ||
9317 | + lt_cv_aix_libpath__CXX="/usr/lib:/lib" | ||
9318 | + fi | ||
9319 | + | ||
9320 | +fi | ||
9321 | + | ||
9322 | + aix_libpath=$lt_cv_aix_libpath__CXX | ||
9323 | +fi | ||
9324 | |||
9325 | hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" | ||
9326 | # Warning - without using the other run time loading flags, | ||
9327 | @@ -13204,29 +13891,75 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | ||
9328 | ;; | ||
9329 | |||
9330 | cygwin* | mingw* | pw32* | cegcc*) | ||
9331 | - # _LT_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless, | ||
9332 | - # as there is no search path for DLLs. | ||
9333 | - hardcode_libdir_flag_spec_CXX='-L$libdir' | ||
9334 | - export_dynamic_flag_spec_CXX='${wl}--export-all-symbols' | ||
9335 | - allow_undefined_flag_CXX=unsupported | ||
9336 | - always_export_symbols_CXX=no | ||
9337 | - enable_shared_with_static_runtimes_CXX=yes | ||
9338 | - | ||
9339 | - if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then | ||
9340 | - archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' | ||
9341 | - # If the export-symbols file already is a .def file (1st line | ||
9342 | - # is EXPORTS), use it as is; otherwise, prepend... | ||
9343 | - archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then | ||
9344 | - cp $export_symbols $output_objdir/$soname.def; | ||
9345 | - else | ||
9346 | - echo EXPORTS > $output_objdir/$soname.def; | ||
9347 | - cat $export_symbols >> $output_objdir/$soname.def; | ||
9348 | - fi~ | ||
9349 | - $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' | ||
9350 | - else | ||
9351 | - ld_shlibs_CXX=no | ||
9352 | - fi | ||
9353 | - ;; | ||
9354 | + case $GXX,$cc_basename in | ||
9355 | + ,cl* | no,cl*) | ||
9356 | + # Native MSVC | ||
9357 | + # hardcode_libdir_flag_spec is actually meaningless, as there is | ||
9358 | + # no search path for DLLs. | ||
9359 | + hardcode_libdir_flag_spec_CXX=' ' | ||
9360 | + allow_undefined_flag_CXX=unsupported | ||
9361 | + always_export_symbols_CXX=yes | ||
9362 | + file_list_spec_CXX='@' | ||
9363 | + # Tell ltmain to make .lib files, not .a files. | ||
9364 | + libext=lib | ||
9365 | + # Tell ltmain to make .dll files, not .so files. | ||
9366 | + shrext_cmds=".dll" | ||
9367 | + # FIXME: Setting linknames here is a bad hack. | ||
9368 | + archive_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' | ||
9369 | + archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then | ||
9370 | + $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; | ||
9371 | + else | ||
9372 | + $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; | ||
9373 | + fi~ | ||
9374 | + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ | ||
9375 | + linknames=' | ||
9376 | + # The linker will not automatically build a static lib if we build a DLL. | ||
9377 | + # _LT_TAGVAR(old_archive_from_new_cmds, CXX)='true' | ||
9378 | + enable_shared_with_static_runtimes_CXX=yes | ||
9379 | + # Don't use ranlib | ||
9380 | + old_postinstall_cmds_CXX='chmod 644 $oldlib' | ||
9381 | + postlink_cmds_CXX='lt_outputfile="@OUTPUT@"~ | ||
9382 | + lt_tool_outputfile="@TOOL_OUTPUT@"~ | ||
9383 | + case $lt_outputfile in | ||
9384 | + *.exe|*.EXE) ;; | ||
9385 | + *) | ||
9386 | + lt_outputfile="$lt_outputfile.exe" | ||
9387 | + lt_tool_outputfile="$lt_tool_outputfile.exe" | ||
9388 | + ;; | ||
9389 | + esac~ | ||
9390 | + func_to_tool_file "$lt_outputfile"~ | ||
9391 | + if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then | ||
9392 | + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; | ||
9393 | + $RM "$lt_outputfile.manifest"; | ||
9394 | + fi' | ||
9395 | + ;; | ||
9396 | + *) | ||
9397 | + # g++ | ||
9398 | + # _LT_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless, | ||
9399 | + # as there is no search path for DLLs. | ||
9400 | + hardcode_libdir_flag_spec_CXX='-L$libdir' | ||
9401 | + export_dynamic_flag_spec_CXX='${wl}--export-all-symbols' | ||
9402 | + allow_undefined_flag_CXX=unsupported | ||
9403 | + always_export_symbols_CXX=no | ||
9404 | + enable_shared_with_static_runtimes_CXX=yes | ||
9405 | + | ||
9406 | + if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then | ||
9407 | + archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' | ||
9408 | + # If the export-symbols file already is a .def file (1st line | ||
9409 | + # is EXPORTS), use it as is; otherwise, prepend... | ||
9410 | + archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then | ||
9411 | + cp $export_symbols $output_objdir/$soname.def; | ||
9412 | + else | ||
9413 | + echo EXPORTS > $output_objdir/$soname.def; | ||
9414 | + cat $export_symbols >> $output_objdir/$soname.def; | ||
9415 | + fi~ | ||
9416 | + $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' | ||
9417 | + else | ||
9418 | + ld_shlibs_CXX=no | ||
9419 | + fi | ||
9420 | + ;; | ||
9421 | + esac | ||
9422 | + ;; | ||
9423 | darwin* | rhapsody*) | ||
9424 | |||
9425 | |||
9426 | @@ -13332,7 +14065,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | ||
9427 | ;; | ||
9428 | *) | ||
9429 | if test "$GXX" = yes; then | ||
9430 | - archive_cmds_CXX='$RM $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' | ||
9431 | + archive_cmds_CXX='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' | ||
9432 | else | ||
9433 | # FIXME: insert proper C++ library support | ||
9434 | ld_shlibs_CXX=no | ||
9435 | @@ -13403,10 +14136,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | ||
9436 | archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' | ||
9437 | ;; | ||
9438 | ia64*) | ||
9439 | - archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' | ||
9440 | + archive_cmds_CXX='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' | ||
9441 | ;; | ||
9442 | *) | ||
9443 | - archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' | ||
9444 | + archive_cmds_CXX='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' | ||
9445 | ;; | ||
9446 | esac | ||
9447 | fi | ||
9448 | @@ -13447,9 +14180,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | ||
9449 | *) | ||
9450 | if test "$GXX" = yes; then | ||
9451 | if test "$with_gnu_ld" = no; then | ||
9452 | - archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' | ||
9453 | + archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' | ||
9454 | else | ||
9455 | - archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib' | ||
9456 | + archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib' | ||
9457 | fi | ||
9458 | fi | ||
9459 | link_all_deplibs_CXX=yes | ||
9460 | @@ -13727,7 +14460,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | ||
9461 | archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' | ||
9462 | ;; | ||
9463 | *) | ||
9464 | - archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' | ||
9465 | + archive_cmds_CXX='$CC -shared $pic_flag -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' | ||
9466 | ;; | ||
9467 | esac | ||
9468 | |||
9469 | @@ -13773,7 +14506,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | ||
9470 | |||
9471 | solaris*) | ||
9472 | case $cc_basename in | ||
9473 | - CC*) | ||
9474 | + CC* | sunCC*) | ||
9475 | # Sun C++ 4.2, 5.x and Centerline C++ | ||
9476 | archive_cmds_need_lc_CXX=yes | ||
9477 | no_undefined_flag_CXX=' -zdefs' | ||
9478 | @@ -13814,9 +14547,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | ||
9479 | if test "$GXX" = yes && test "$with_gnu_ld" = no; then | ||
9480 | no_undefined_flag_CXX=' ${wl}-z ${wl}defs' | ||
9481 | if $CC --version | $GREP -v '^2\.7' > /dev/null; then | ||
9482 | - archive_cmds_CXX='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' | ||
9483 | + archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' | ||
9484 | archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ | ||
9485 | - $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' | ||
9486 | + $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' | ||
9487 | |||
9488 | # Commands to make compiler produce verbose output that lists | ||
9489 | # what "hidden" libraries, object files and flags are used when | ||
9490 | @@ -13952,6 +14685,13 @@ private: | ||
9491 | }; | ||
9492 | _LT_EOF | ||
9493 | |||
9494 | + | ||
9495 | +_lt_libdeps_save_CFLAGS=$CFLAGS | ||
9496 | +case "$CC $CFLAGS " in #( | ||
9497 | +*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;; | ||
9498 | +*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;; | ||
9499 | +esac | ||
9500 | + | ||
9501 | if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 | ||
9502 | (eval $ac_compile) 2>&5 | ||
9503 | ac_status=$? | ||
9504 | @@ -13965,7 +14705,7 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 | ||
9505 | pre_test_object_deps_done=no | ||
9506 | |||
9507 | for p in `eval "$output_verbose_link_cmd"`; do | ||
9508 | - case $p in | ||
9509 | + case ${prev}${p} in | ||
9510 | |||
9511 | -L* | -R* | -l*) | ||
9512 | # Some compilers place space between "-{L,R}" and the path. | ||
9513 | @@ -13974,13 +14714,22 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 | ||
9514 | test $p = "-R"; then | ||
9515 | prev=$p | ||
9516 | continue | ||
9517 | - else | ||
9518 | - prev= | ||
9519 | fi | ||
9520 | |||
9521 | + # Expand the sysroot to ease extracting the directories later. | ||
9522 | + if test -z "$prev"; then | ||
9523 | + case $p in | ||
9524 | + -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;; | ||
9525 | + -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;; | ||
9526 | + -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;; | ||
9527 | + esac | ||
9528 | + fi | ||
9529 | + case $p in | ||
9530 | + =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;; | ||
9531 | + esac | ||
9532 | if test "$pre_test_object_deps_done" = no; then | ||
9533 | - case $p in | ||
9534 | - -L* | -R*) | ||
9535 | + case ${prev} in | ||
9536 | + -L | -R) | ||
9537 | # Internal compiler library paths should come after those | ||
9538 | # provided the user. The postdeps already come after the | ||
9539 | # user supplied libs so there is no need to process them. | ||
9540 | @@ -14000,8 +14749,10 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 | ||
9541 | postdeps_CXX="${postdeps_CXX} ${prev}${p}" | ||
9542 | fi | ||
9543 | fi | ||
9544 | + prev= | ||
9545 | ;; | ||
9546 | |||
9547 | + *.lto.$objext) ;; # Ignore GCC LTO objects | ||
9548 | *.$objext) | ||
9549 | # This assumes that the test object file only shows up | ||
9550 | # once in the compiler output. | ||
9551 | @@ -14037,6 +14788,7 @@ else | ||
9552 | fi | ||
9553 | |||
9554 | $RM -f confest.$objext | ||
9555 | +CFLAGS=$_lt_libdeps_save_CFLAGS | ||
9556 | |||
9557 | # PORTME: override above test on systems where it is broken | ||
9558 | case $host_os in | ||
9559 | @@ -14072,7 +14824,7 @@ linux*) | ||
9560 | |||
9561 | solaris*) | ||
9562 | case $cc_basename in | ||
9563 | - CC*) | ||
9564 | + CC* | sunCC*) | ||
9565 | # The more standards-conforming stlport4 library is | ||
9566 | # incompatible with the Cstd library. Avoid specifying | ||
9567 | # it if it's in CXXFLAGS. Ignore libCrun as | ||
9568 | @@ -14137,8 +14889,6 @@ fi | ||
9569 | lt_prog_compiler_pic_CXX= | ||
9570 | lt_prog_compiler_static_CXX= | ||
9571 | |||
9572 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 | ||
9573 | -$as_echo_n "checking for $compiler option to produce PIC... " >&6; } | ||
9574 | |||
9575 | # C++ specific cases for pic, static, wl, etc. | ||
9576 | if test "$GXX" = yes; then | ||
9577 | @@ -14243,6 +14993,11 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } | ||
9578 | ;; | ||
9579 | esac | ||
9580 | ;; | ||
9581 | + mingw* | cygwin* | os2* | pw32* | cegcc*) | ||
9582 | + # This hack is so that the source file can tell whether it is being | ||
9583 | + # built for inclusion in a dll (and should export symbols for example). | ||
9584 | + lt_prog_compiler_pic_CXX='-DDLL_EXPORT' | ||
9585 | + ;; | ||
9586 | dgux*) | ||
9587 | case $cc_basename in | ||
9588 | ec++*) | ||
9589 | @@ -14395,7 +15150,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } | ||
9590 | ;; | ||
9591 | solaris*) | ||
9592 | case $cc_basename in | ||
9593 | - CC*) | ||
9594 | + CC* | sunCC*) | ||
9595 | # Sun C++ 4.2, 5.x and Centerline C++ | ||
9596 | lt_prog_compiler_pic_CXX='-KPIC' | ||
9597 | lt_prog_compiler_static_CXX='-Bstatic' | ||
9598 | @@ -14460,10 +15215,17 @@ case $host_os in | ||
9599 | lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC" | ||
9600 | ;; | ||
9601 | esac | ||
9602 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic_CXX" >&5 | ||
9603 | -$as_echo "$lt_prog_compiler_pic_CXX" >&6; } | ||
9604 | - | ||
9605 | |||
9606 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 | ||
9607 | +$as_echo_n "checking for $compiler option to produce PIC... " >&6; } | ||
9608 | +if ${lt_cv_prog_compiler_pic_CXX+:} false; then : | ||
9609 | + $as_echo_n "(cached) " >&6 | ||
9610 | +else | ||
9611 | + lt_cv_prog_compiler_pic_CXX=$lt_prog_compiler_pic_CXX | ||
9612 | +fi | ||
9613 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_CXX" >&5 | ||
9614 | +$as_echo "$lt_cv_prog_compiler_pic_CXX" >&6; } | ||
9615 | +lt_prog_compiler_pic_CXX=$lt_cv_prog_compiler_pic_CXX | ||
9616 | |||
9617 | # | ||
9618 | # Check to make sure the PIC flag actually works. | ||
9619 | @@ -14521,6 +15283,8 @@ fi | ||
9620 | |||
9621 | |||
9622 | |||
9623 | + | ||
9624 | + | ||
9625 | # | ||
9626 | # Check to make sure the static flag actually works. | ||
9627 | # | ||
9628 | @@ -14698,6 +15462,7 @@ fi | ||
9629 | $as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } | ||
9630 | |||
9631 | export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' | ||
9632 | + exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' | ||
9633 | case $host_os in | ||
9634 | aix[4-9]*) | ||
9635 | # If we're using GNU nm, then we don't want the "-C" option. | ||
9636 | @@ -14712,15 +15477,20 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie | ||
9637 | ;; | ||
9638 | pw32*) | ||
9639 | export_symbols_cmds_CXX="$ltdll_cmds" | ||
9640 | - ;; | ||
9641 | + ;; | ||
9642 | cygwin* | mingw* | cegcc*) | ||
9643 | - export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;/^.*[ ]__nm__/s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols' | ||
9644 | - ;; | ||
9645 | + case $cc_basename in | ||
9646 | + cl*) ;; | ||
9647 | + *) | ||
9648 | + export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols' | ||
9649 | + exclude_expsyms_CXX='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' | ||
9650 | + ;; | ||
9651 | + esac | ||
9652 | + ;; | ||
9653 | *) | ||
9654 | export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' | ||
9655 | - ;; | ||
9656 | + ;; | ||
9657 | esac | ||
9658 | - exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' | ||
9659 | |||
9660 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5 | ||
9661 | $as_echo "$ld_shlibs_CXX" >&6; } | ||
9662 | @@ -14983,8 +15753,9 @@ cygwin* | mingw* | pw32* | cegcc*) | ||
9663 | need_version=no | ||
9664 | need_lib_prefix=no | ||
9665 | |||
9666 | - case $GCC,$host_os in | ||
9667 | - yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) | ||
9668 | + case $GCC,$cc_basename in | ||
9669 | + yes,*) | ||
9670 | + # gcc | ||
9671 | library_names_spec='$libname.dll.a' | ||
9672 | # DLL is installed to $(libdir)/../bin by postinstall_cmds | ||
9673 | postinstall_cmds='base_file=`basename \${file}`~ | ||
9674 | @@ -15016,13 +15787,71 @@ cygwin* | mingw* | pw32* | cegcc*) | ||
9675 | library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' | ||
9676 | ;; | ||
9677 | esac | ||
9678 | + dynamic_linker='Win32 ld.exe' | ||
9679 | + ;; | ||
9680 | + | ||
9681 | + *,cl*) | ||
9682 | + # Native MSVC | ||
9683 | + libname_spec='$name' | ||
9684 | + soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' | ||
9685 | + library_names_spec='${libname}.dll.lib' | ||
9686 | + | ||
9687 | + case $build_os in | ||
9688 | + mingw*) | ||
9689 | + sys_lib_search_path_spec= | ||
9690 | + lt_save_ifs=$IFS | ||
9691 | + IFS=';' | ||
9692 | + for lt_path in $LIB | ||
9693 | + do | ||
9694 | + IFS=$lt_save_ifs | ||
9695 | + # Let DOS variable expansion print the short 8.3 style file name. | ||
9696 | + lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` | ||
9697 | + sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" | ||
9698 | + done | ||
9699 | + IFS=$lt_save_ifs | ||
9700 | + # Convert to MSYS style. | ||
9701 | + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` | ||
9702 | + ;; | ||
9703 | + cygwin*) | ||
9704 | + # Convert to unix form, then to dos form, then back to unix form | ||
9705 | + # but this time dos style (no spaces!) so that the unix form looks | ||
9706 | + # like /cygdrive/c/PROGRA~1:/cygdr... | ||
9707 | + sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` | ||
9708 | + sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` | ||
9709 | + sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` | ||
9710 | + ;; | ||
9711 | + *) | ||
9712 | + sys_lib_search_path_spec="$LIB" | ||
9713 | + if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then | ||
9714 | + # It is most probably a Windows format PATH. | ||
9715 | + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` | ||
9716 | + else | ||
9717 | + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` | ||
9718 | + fi | ||
9719 | + # FIXME: find the short name or the path components, as spaces are | ||
9720 | + # common. (e.g. "Program Files" -> "PROGRA~1") | ||
9721 | + ;; | ||
9722 | + esac | ||
9723 | + | ||
9724 | + # DLL is installed to $(libdir)/../bin by postinstall_cmds | ||
9725 | + postinstall_cmds='base_file=`basename \${file}`~ | ||
9726 | + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ | ||
9727 | + dldir=$destdir/`dirname \$dlpath`~ | ||
9728 | + test -d \$dldir || mkdir -p \$dldir~ | ||
9729 | + $install_prog $dir/$dlname \$dldir/$dlname' | ||
9730 | + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ | ||
9731 | + dlpath=$dir/\$dldll~ | ||
9732 | + $RM \$dlpath' | ||
9733 | + shlibpath_overrides_runpath=yes | ||
9734 | + dynamic_linker='Win32 link.exe' | ||
9735 | ;; | ||
9736 | |||
9737 | *) | ||
9738 | + # Assume MSVC wrapper | ||
9739 | library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' | ||
9740 | + dynamic_linker='Win32 ld.exe' | ||
9741 | ;; | ||
9742 | esac | ||
9743 | - dynamic_linker='Win32 ld.exe' | ||
9744 | # FIXME: first we should search . and the directory the executable is in | ||
9745 | shlibpath_var=PATH | ||
9746 | ;; | ||
9747 | @@ -15586,6 +16415,7 @@ fi | ||
9748 | fi # test -n "$compiler" | ||
9749 | |||
9750 | CC=$lt_save_CC | ||
9751 | + CFLAGS=$lt_save_CFLAGS | ||
9752 | LDCXX=$LD | ||
9753 | LD=$lt_save_LD | ||
9754 | GCC=$lt_save_GCC | ||
9755 | @@ -17738,13 +18568,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' | ||
9756 | lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' | ||
9757 | lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' | ||
9758 | lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' | ||
9759 | +lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`' | ||
9760 | +lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`' | ||
9761 | reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`' | ||
9762 | reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`' | ||
9763 | OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`' | ||
9764 | deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`' | ||
9765 | file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`' | ||
9766 | +file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`' | ||
9767 | +want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`' | ||
9768 | +DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`' | ||
9769 | +sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`' | ||
9770 | AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`' | ||
9771 | AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`' | ||
9772 | +archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`' | ||
9773 | STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' | ||
9774 | RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' | ||
9775 | old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' | ||
9776 | @@ -17759,14 +18596,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de | ||
9777 | lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' | ||
9778 | lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' | ||
9779 | lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`' | ||
9780 | +nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`' | ||
9781 | +lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`' | ||
9782 | objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`' | ||
9783 | MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`' | ||
9784 | lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`' | ||
9785 | -lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' | ||
9786 | lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`' | ||
9787 | +lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' | ||
9788 | lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`' | ||
9789 | lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`' | ||
9790 | need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`' | ||
9791 | +MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`' | ||
9792 | DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' | ||
9793 | NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' | ||
9794 | LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' | ||
9795 | @@ -17799,12 +18639,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q | ||
9796 | hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' | ||
9797 | inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' | ||
9798 | link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' | ||
9799 | -fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`' | ||
9800 | always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`' | ||
9801 | export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`' | ||
9802 | exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`' | ||
9803 | include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`' | ||
9804 | prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`' | ||
9805 | +postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`' | ||
9806 | file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' | ||
9807 | variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' | ||
9808 | need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' | ||
9809 | @@ -17843,8 +18683,8 @@ old_archive_cmds_CXX='`$ECHO "$old_archive_cmds_CXX" | $SED "$delay_single_quote | ||
9810 | compiler_CXX='`$ECHO "$compiler_CXX" | $SED "$delay_single_quote_subst"`' | ||
9811 | GCC_CXX='`$ECHO "$GCC_CXX" | $SED "$delay_single_quote_subst"`' | ||
9812 | lt_prog_compiler_no_builtin_flag_CXX='`$ECHO "$lt_prog_compiler_no_builtin_flag_CXX" | $SED "$delay_single_quote_subst"`' | ||
9813 | -lt_prog_compiler_wl_CXX='`$ECHO "$lt_prog_compiler_wl_CXX" | $SED "$delay_single_quote_subst"`' | ||
9814 | lt_prog_compiler_pic_CXX='`$ECHO "$lt_prog_compiler_pic_CXX" | $SED "$delay_single_quote_subst"`' | ||
9815 | +lt_prog_compiler_wl_CXX='`$ECHO "$lt_prog_compiler_wl_CXX" | $SED "$delay_single_quote_subst"`' | ||
9816 | lt_prog_compiler_static_CXX='`$ECHO "$lt_prog_compiler_static_CXX" | $SED "$delay_single_quote_subst"`' | ||
9817 | lt_cv_prog_compiler_c_o_CXX='`$ECHO "$lt_cv_prog_compiler_c_o_CXX" | $SED "$delay_single_quote_subst"`' | ||
9818 | archive_cmds_need_lc_CXX='`$ECHO "$archive_cmds_need_lc_CXX" | $SED "$delay_single_quote_subst"`' | ||
9819 | @@ -17871,12 +18711,12 @@ hardcode_shlibpath_var_CXX='`$ECHO "$hardcode_shlibpath_var_CXX" | $SED "$delay_ | ||
9820 | hardcode_automatic_CXX='`$ECHO "$hardcode_automatic_CXX" | $SED "$delay_single_quote_subst"`' | ||
9821 | inherit_rpath_CXX='`$ECHO "$inherit_rpath_CXX" | $SED "$delay_single_quote_subst"`' | ||
9822 | link_all_deplibs_CXX='`$ECHO "$link_all_deplibs_CXX" | $SED "$delay_single_quote_subst"`' | ||
9823 | -fix_srcfile_path_CXX='`$ECHO "$fix_srcfile_path_CXX" | $SED "$delay_single_quote_subst"`' | ||
9824 | always_export_symbols_CXX='`$ECHO "$always_export_symbols_CXX" | $SED "$delay_single_quote_subst"`' | ||
9825 | export_symbols_cmds_CXX='`$ECHO "$export_symbols_cmds_CXX" | $SED "$delay_single_quote_subst"`' | ||
9826 | exclude_expsyms_CXX='`$ECHO "$exclude_expsyms_CXX" | $SED "$delay_single_quote_subst"`' | ||
9827 | include_expsyms_CXX='`$ECHO "$include_expsyms_CXX" | $SED "$delay_single_quote_subst"`' | ||
9828 | prelink_cmds_CXX='`$ECHO "$prelink_cmds_CXX" | $SED "$delay_single_quote_subst"`' | ||
9829 | +postlink_cmds_CXX='`$ECHO "$postlink_cmds_CXX" | $SED "$delay_single_quote_subst"`' | ||
9830 | file_list_spec_CXX='`$ECHO "$file_list_spec_CXX" | $SED "$delay_single_quote_subst"`' | ||
9831 | hardcode_action_CXX='`$ECHO "$hardcode_action_CXX" | $SED "$delay_single_quote_subst"`' | ||
9832 | compiler_lib_search_dirs_CXX='`$ECHO "$compiler_lib_search_dirs_CXX" | $SED "$delay_single_quote_subst"`' | ||
9833 | @@ -17914,8 +18754,13 @@ reload_flag \ | ||
9834 | OBJDUMP \ | ||
9835 | deplibs_check_method \ | ||
9836 | file_magic_cmd \ | ||
9837 | +file_magic_glob \ | ||
9838 | +want_nocaseglob \ | ||
9839 | +DLLTOOL \ | ||
9840 | +sharedlib_from_linklib_cmd \ | ||
9841 | AR \ | ||
9842 | AR_FLAGS \ | ||
9843 | +archiver_list_spec \ | ||
9844 | STRIP \ | ||
9845 | RANLIB \ | ||
9846 | CC \ | ||
9847 | @@ -17925,12 +18770,14 @@ lt_cv_sys_global_symbol_pipe \ | ||
9848 | lt_cv_sys_global_symbol_to_cdecl \ | ||
9849 | lt_cv_sys_global_symbol_to_c_name_address \ | ||
9850 | lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ | ||
9851 | +nm_file_list_spec \ | ||
9852 | lt_prog_compiler_no_builtin_flag \ | ||
9853 | -lt_prog_compiler_wl \ | ||
9854 | lt_prog_compiler_pic \ | ||
9855 | +lt_prog_compiler_wl \ | ||
9856 | lt_prog_compiler_static \ | ||
9857 | lt_cv_prog_compiler_c_o \ | ||
9858 | need_locks \ | ||
9859 | +MANIFEST_TOOL \ | ||
9860 | DSYMUTIL \ | ||
9861 | NMEDIT \ | ||
9862 | LIPO \ | ||
9863 | @@ -17946,7 +18793,6 @@ no_undefined_flag \ | ||
9864 | hardcode_libdir_flag_spec \ | ||
9865 | hardcode_libdir_flag_spec_ld \ | ||
9866 | hardcode_libdir_separator \ | ||
9867 | -fix_srcfile_path \ | ||
9868 | exclude_expsyms \ | ||
9869 | include_expsyms \ | ||
9870 | file_list_spec \ | ||
9871 | @@ -17968,8 +18814,8 @@ LD_CXX \ | ||
9872 | reload_flag_CXX \ | ||
9873 | compiler_CXX \ | ||
9874 | lt_prog_compiler_no_builtin_flag_CXX \ | ||
9875 | -lt_prog_compiler_wl_CXX \ | ||
9876 | lt_prog_compiler_pic_CXX \ | ||
9877 | +lt_prog_compiler_wl_CXX \ | ||
9878 | lt_prog_compiler_static_CXX \ | ||
9879 | lt_cv_prog_compiler_c_o_CXX \ | ||
9880 | export_dynamic_flag_spec_CXX \ | ||
9881 | @@ -17981,7 +18827,6 @@ no_undefined_flag_CXX \ | ||
9882 | hardcode_libdir_flag_spec_CXX \ | ||
9883 | hardcode_libdir_flag_spec_ld_CXX \ | ||
9884 | hardcode_libdir_separator_CXX \ | ||
9885 | -fix_srcfile_path_CXX \ | ||
9886 | exclude_expsyms_CXX \ | ||
9887 | include_expsyms_CXX \ | ||
9888 | file_list_spec_CXX \ | ||
9889 | @@ -18015,6 +18860,7 @@ module_cmds \ | ||
9890 | module_expsym_cmds \ | ||
9891 | export_symbols_cmds \ | ||
9892 | prelink_cmds \ | ||
9893 | +postlink_cmds \ | ||
9894 | postinstall_cmds \ | ||
9895 | postuninstall_cmds \ | ||
9896 | finish_cmds \ | ||
9897 | @@ -18029,7 +18875,8 @@ archive_expsym_cmds_CXX \ | ||
9898 | module_cmds_CXX \ | ||
9899 | module_expsym_cmds_CXX \ | ||
9900 | export_symbols_cmds_CXX \ | ||
9901 | -prelink_cmds_CXX; do | ||
9902 | +prelink_cmds_CXX \ | ||
9903 | +postlink_cmds_CXX; do | ||
9904 | case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in | ||
9905 | *[\\\\\\\`\\"\\\$]*) | ||
9906 | eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" | ||
9907 | @@ -18786,7 +19633,8 @@ $as_echo X"$file" | | ||
9908 | # NOTE: Changes made to this file will be lost: look at ltmain.sh. | ||
9909 | # | ||
9910 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, | ||
9911 | -# 2006, 2007, 2008, 2009 Free Software Foundation, Inc. | ||
9912 | +# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, | ||
9913 | +# Inc. | ||
9914 | # Written by Gordon Matzigkeit, 1996 | ||
9915 | # | ||
9916 | # This file is part of GNU Libtool. | ||
9917 | @@ -18889,19 +19737,42 @@ SP2NL=$lt_lt_SP2NL | ||
9918 | # turn newlines into spaces. | ||
9919 | NL2SP=$lt_lt_NL2SP | ||
9920 | |||
9921 | +# convert \$build file names to \$host format. | ||
9922 | +to_host_file_cmd=$lt_cv_to_host_file_cmd | ||
9923 | + | ||
9924 | +# convert \$build files to toolchain format. | ||
9925 | +to_tool_file_cmd=$lt_cv_to_tool_file_cmd | ||
9926 | + | ||
9927 | # An object symbol dumper. | ||
9928 | OBJDUMP=$lt_OBJDUMP | ||
9929 | |||
9930 | # Method to check whether dependent libraries are shared objects. | ||
9931 | deplibs_check_method=$lt_deplibs_check_method | ||
9932 | |||
9933 | -# Command to use when deplibs_check_method == "file_magic". | ||
9934 | +# Command to use when deplibs_check_method = "file_magic". | ||
9935 | file_magic_cmd=$lt_file_magic_cmd | ||
9936 | |||
9937 | +# How to find potential files when deplibs_check_method = "file_magic". | ||
9938 | +file_magic_glob=$lt_file_magic_glob | ||
9939 | + | ||
9940 | +# Find potential files using nocaseglob when deplibs_check_method = "file_magic". | ||
9941 | +want_nocaseglob=$lt_want_nocaseglob | ||
9942 | + | ||
9943 | +# DLL creation program. | ||
9944 | +DLLTOOL=$lt_DLLTOOL | ||
9945 | + | ||
9946 | +# Command to associate shared and link libraries. | ||
9947 | +sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd | ||
9948 | + | ||
9949 | # The archiver. | ||
9950 | AR=$lt_AR | ||
9951 | + | ||
9952 | +# Flags to create an archive. | ||
9953 | AR_FLAGS=$lt_AR_FLAGS | ||
9954 | |||
9955 | +# How to feed a file listing to the archiver. | ||
9956 | +archiver_list_spec=$lt_archiver_list_spec | ||
9957 | + | ||
9958 | # A symbol stripping program. | ||
9959 | STRIP=$lt_STRIP | ||
9960 | |||
9961 | @@ -18931,6 +19802,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address | ||
9962 | # Transform the output of nm in a C name address pair when lib prefix is needed. | ||
9963 | global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix | ||
9964 | |||
9965 | +# Specify filename containing input files for \$NM. | ||
9966 | +nm_file_list_spec=$lt_nm_file_list_spec | ||
9967 | + | ||
9968 | +# The root where to search for dependent libraries,and in which our libraries should be installed. | ||
9969 | +lt_sysroot=$lt_sysroot | ||
9970 | + | ||
9971 | # The name of the directory that contains temporary libtool files. | ||
9972 | objdir=$objdir | ||
9973 | |||
9974 | @@ -18940,6 +19817,9 @@ MAGIC_CMD=$MAGIC_CMD | ||
9975 | # Must we lock files when doing compilation? | ||
9976 | need_locks=$lt_need_locks | ||
9977 | |||
9978 | +# Manifest tool. | ||
9979 | +MANIFEST_TOOL=$lt_MANIFEST_TOOL | ||
9980 | + | ||
9981 | # Tool to manipulate archived DWARF debug symbol files on Mac OS X. | ||
9982 | DSYMUTIL=$lt_DSYMUTIL | ||
9983 | |||
9984 | @@ -19054,12 +19934,12 @@ with_gcc=$GCC | ||
9985 | # Compiler flag to turn off builtin functions. | ||
9986 | no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag | ||
9987 | |||
9988 | -# How to pass a linker flag through the compiler. | ||
9989 | -wl=$lt_lt_prog_compiler_wl | ||
9990 | - | ||
9991 | # Additional compiler flags for building library objects. | ||
9992 | pic_flag=$lt_lt_prog_compiler_pic | ||
9993 | |||
9994 | +# How to pass a linker flag through the compiler. | ||
9995 | +wl=$lt_lt_prog_compiler_wl | ||
9996 | + | ||
9997 | # Compiler flag to prevent dynamic linking. | ||
9998 | link_static_flag=$lt_lt_prog_compiler_static | ||
9999 | |||
10000 | @@ -19146,9 +20026,6 @@ inherit_rpath=$inherit_rpath | ||
10001 | # Whether libtool must link a program against all its dependency libraries. | ||
10002 | link_all_deplibs=$link_all_deplibs | ||
10003 | |||
10004 | -# Fix the shell variable \$srcfile for the compiler. | ||
10005 | -fix_srcfile_path=$lt_fix_srcfile_path | ||
10006 | - | ||
10007 | # Set to "yes" if exported symbols are required. | ||
10008 | always_export_symbols=$always_export_symbols | ||
10009 | |||
10010 | @@ -19164,6 +20041,9 @@ include_expsyms=$lt_include_expsyms | ||
10011 | # Commands necessary for linking programs (against libraries) with templates. | ||
10012 | prelink_cmds=$lt_prelink_cmds | ||
10013 | |||
10014 | +# Commands necessary for finishing linking programs. | ||
10015 | +postlink_cmds=$lt_postlink_cmds | ||
10016 | + | ||
10017 | # Specify filename containing input files. | ||
10018 | file_list_spec=$lt_file_list_spec | ||
10019 | |||
10020 | @@ -19210,210 +20090,169 @@ ltmain="$ac_aux_dir/ltmain.sh" | ||
10021 | # if finds mixed CR/LF and LF-only lines. Since sed operates in | ||
10022 | # text mode, it properly converts lines to CR/LF. This bash problem | ||
10023 | # is reportedly fixed, but why not run on old versions too? | ||
10024 | - sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ | ||
10025 | - || (rm -f "$cfgfile"; exit 1) | ||
10026 | - | ||
10027 | - case $xsi_shell in | ||
10028 | - yes) | ||
10029 | - cat << \_LT_EOF >> "$cfgfile" | ||
10030 | - | ||
10031 | -# func_dirname file append nondir_replacement | ||
10032 | -# Compute the dirname of FILE. If nonempty, add APPEND to the result, | ||
10033 | -# otherwise set result to NONDIR_REPLACEMENT. | ||
10034 | -func_dirname () | ||
10035 | -{ | ||
10036 | - case ${1} in | ||
10037 | - */*) func_dirname_result="${1%/*}${2}" ;; | ||
10038 | - * ) func_dirname_result="${3}" ;; | ||
10039 | - esac | ||
10040 | -} | ||
10041 | - | ||
10042 | -# func_basename file | ||
10043 | -func_basename () | ||
10044 | -{ | ||
10045 | - func_basename_result="${1##*/}" | ||
10046 | -} | ||
10047 | - | ||
10048 | -# func_dirname_and_basename file append nondir_replacement | ||
10049 | -# perform func_basename and func_dirname in a single function | ||
10050 | -# call: | ||
10051 | -# dirname: Compute the dirname of FILE. If nonempty, | ||
10052 | -# add APPEND to the result, otherwise set result | ||
10053 | -# to NONDIR_REPLACEMENT. | ||
10054 | -# value returned in "$func_dirname_result" | ||
10055 | -# basename: Compute filename of FILE. | ||
10056 | -# value retuned in "$func_basename_result" | ||
10057 | -# Implementation must be kept synchronized with func_dirname | ||
10058 | -# and func_basename. For efficiency, we do not delegate to | ||
10059 | -# those functions but instead duplicate the functionality here. | ||
10060 | -func_dirname_and_basename () | ||
10061 | -{ | ||
10062 | - case ${1} in | ||
10063 | - */*) func_dirname_result="${1%/*}${2}" ;; | ||
10064 | - * ) func_dirname_result="${3}" ;; | ||
10065 | - esac | ||
10066 | - func_basename_result="${1##*/}" | ||
10067 | -} | ||
10068 | - | ||
10069 | -# func_stripname prefix suffix name | ||
10070 | -# strip PREFIX and SUFFIX off of NAME. | ||
10071 | -# PREFIX and SUFFIX must not contain globbing or regex special | ||
10072 | -# characters, hashes, percent signs, but SUFFIX may contain a leading | ||
10073 | -# dot (in which case that matches only a dot). | ||
10074 | -func_stripname () | ||
10075 | -{ | ||
10076 | - # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are | ||
10077 | - # positional parameters, so assign one to ordinary parameter first. | ||
10078 | - func_stripname_result=${3} | ||
10079 | - func_stripname_result=${func_stripname_result#"${1}"} | ||
10080 | - func_stripname_result=${func_stripname_result%"${2}"} | ||
10081 | -} | ||
10082 | - | ||
10083 | -# func_opt_split | ||
10084 | -func_opt_split () | ||
10085 | -{ | ||
10086 | - func_opt_split_opt=${1%%=*} | ||
10087 | - func_opt_split_arg=${1#*=} | ||
10088 | -} | ||
10089 | - | ||
10090 | -# func_lo2o object | ||
10091 | -func_lo2o () | ||
10092 | -{ | ||
10093 | - case ${1} in | ||
10094 | - *.lo) func_lo2o_result=${1%.lo}.${objext} ;; | ||
10095 | - *) func_lo2o_result=${1} ;; | ||
10096 | - esac | ||
10097 | -} | ||
10098 | - | ||
10099 | -# func_xform libobj-or-source | ||
10100 | -func_xform () | ||
10101 | -{ | ||
10102 | - func_xform_result=${1%.*}.lo | ||
10103 | -} | ||
10104 | - | ||
10105 | -# func_arith arithmetic-term... | ||
10106 | -func_arith () | ||
10107 | -{ | ||
10108 | - func_arith_result=$(( $* )) | ||
10109 | -} | ||
10110 | - | ||
10111 | -# func_len string | ||
10112 | -# STRING may not start with a hyphen. | ||
10113 | -func_len () | ||
10114 | -{ | ||
10115 | - func_len_result=${#1} | ||
10116 | -} | ||
10117 | - | ||
10118 | -_LT_EOF | ||
10119 | - ;; | ||
10120 | - *) # Bourne compatible functions. | ||
10121 | - cat << \_LT_EOF >> "$cfgfile" | ||
10122 | - | ||
10123 | -# func_dirname file append nondir_replacement | ||
10124 | -# Compute the dirname of FILE. If nonempty, add APPEND to the result, | ||
10125 | -# otherwise set result to NONDIR_REPLACEMENT. | ||
10126 | -func_dirname () | ||
10127 | -{ | ||
10128 | - # Extract subdirectory from the argument. | ||
10129 | - func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` | ||
10130 | - if test "X$func_dirname_result" = "X${1}"; then | ||
10131 | - func_dirname_result="${3}" | ||
10132 | - else | ||
10133 | - func_dirname_result="$func_dirname_result${2}" | ||
10134 | - fi | ||
10135 | -} | ||
10136 | - | ||
10137 | -# func_basename file | ||
10138 | -func_basename () | ||
10139 | -{ | ||
10140 | - func_basename_result=`$ECHO "${1}" | $SED "$basename"` | ||
10141 | -} | ||
10142 | - | ||
10143 | - | ||
10144 | -# func_stripname prefix suffix name | ||
10145 | -# strip PREFIX and SUFFIX off of NAME. | ||
10146 | -# PREFIX and SUFFIX must not contain globbing or regex special | ||
10147 | -# characters, hashes, percent signs, but SUFFIX may contain a leading | ||
10148 | -# dot (in which case that matches only a dot). | ||
10149 | -# func_strip_suffix prefix name | ||
10150 | -func_stripname () | ||
10151 | -{ | ||
10152 | - case ${2} in | ||
10153 | - .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; | ||
10154 | - *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; | ||
10155 | - esac | ||
10156 | -} | ||
10157 | - | ||
10158 | -# sed scripts: | ||
10159 | -my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q' | ||
10160 | -my_sed_long_arg='1s/^-[^=]*=//' | ||
10161 | - | ||
10162 | -# func_opt_split | ||
10163 | -func_opt_split () | ||
10164 | -{ | ||
10165 | - func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"` | ||
10166 | - func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"` | ||
10167 | -} | ||
10168 | - | ||
10169 | -# func_lo2o object | ||
10170 | -func_lo2o () | ||
10171 | -{ | ||
10172 | - func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` | ||
10173 | -} | ||
10174 | - | ||
10175 | -# func_xform libobj-or-source | ||
10176 | -func_xform () | ||
10177 | -{ | ||
10178 | - func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'` | ||
10179 | -} | ||
10180 | - | ||
10181 | -# func_arith arithmetic-term... | ||
10182 | -func_arith () | ||
10183 | -{ | ||
10184 | - func_arith_result=`expr "$@"` | ||
10185 | -} | ||
10186 | - | ||
10187 | -# func_len string | ||
10188 | -# STRING may not start with a hyphen. | ||
10189 | -func_len () | ||
10190 | -{ | ||
10191 | - func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len` | ||
10192 | -} | ||
10193 | - | ||
10194 | -_LT_EOF | ||
10195 | -esac | ||
10196 | - | ||
10197 | -case $lt_shell_append in | ||
10198 | - yes) | ||
10199 | - cat << \_LT_EOF >> "$cfgfile" | ||
10200 | - | ||
10201 | -# func_append var value | ||
10202 | -# Append VALUE to the end of shell variable VAR. | ||
10203 | -func_append () | ||
10204 | -{ | ||
10205 | - eval "$1+=\$2" | ||
10206 | -} | ||
10207 | -_LT_EOF | ||
10208 | - ;; | ||
10209 | - *) | ||
10210 | - cat << \_LT_EOF >> "$cfgfile" | ||
10211 | - | ||
10212 | -# func_append var value | ||
10213 | -# Append VALUE to the end of shell variable VAR. | ||
10214 | -func_append () | ||
10215 | -{ | ||
10216 | - eval "$1=\$$1\$2" | ||
10217 | -} | ||
10218 | - | ||
10219 | -_LT_EOF | ||
10220 | - ;; | ||
10221 | - esac | ||
10222 | - | ||
10223 | - | ||
10224 | - sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ | ||
10225 | - || (rm -f "$cfgfile"; exit 1) | ||
10226 | - | ||
10227 | - mv -f "$cfgfile" "$ofile" || | ||
10228 | + sed '$q' "$ltmain" >> "$cfgfile" \ | ||
10229 | + || (rm -f "$cfgfile"; exit 1) | ||
10230 | + | ||
10231 | + if test x"$xsi_shell" = xyes; then | ||
10232 | + sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ | ||
10233 | +func_dirname ()\ | ||
10234 | +{\ | ||
10235 | +\ case ${1} in\ | ||
10236 | +\ */*) func_dirname_result="${1%/*}${2}" ;;\ | ||
10237 | +\ * ) func_dirname_result="${3}" ;;\ | ||
10238 | +\ esac\ | ||
10239 | +} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \ | ||
10240 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
10241 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
10242 | +test 0 -eq $? || _lt_function_replace_fail=: | ||
10243 | + | ||
10244 | + | ||
10245 | + sed -e '/^func_basename ()$/,/^} # func_basename /c\ | ||
10246 | +func_basename ()\ | ||
10247 | +{\ | ||
10248 | +\ func_basename_result="${1##*/}"\ | ||
10249 | +} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \ | ||
10250 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
10251 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
10252 | +test 0 -eq $? || _lt_function_replace_fail=: | ||
10253 | + | ||
10254 | + | ||
10255 | + sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\ | ||
10256 | +func_dirname_and_basename ()\ | ||
10257 | +{\ | ||
10258 | +\ case ${1} in\ | ||
10259 | +\ */*) func_dirname_result="${1%/*}${2}" ;;\ | ||
10260 | +\ * ) func_dirname_result="${3}" ;;\ | ||
10261 | +\ esac\ | ||
10262 | +\ func_basename_result="${1##*/}"\ | ||
10263 | +} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \ | ||
10264 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
10265 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
10266 | +test 0 -eq $? || _lt_function_replace_fail=: | ||
10267 | + | ||
10268 | + | ||
10269 | + sed -e '/^func_stripname ()$/,/^} # func_stripname /c\ | ||
10270 | +func_stripname ()\ | ||
10271 | +{\ | ||
10272 | +\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\ | ||
10273 | +\ # positional parameters, so assign one to ordinary parameter first.\ | ||
10274 | +\ func_stripname_result=${3}\ | ||
10275 | +\ func_stripname_result=${func_stripname_result#"${1}"}\ | ||
10276 | +\ func_stripname_result=${func_stripname_result%"${2}"}\ | ||
10277 | +} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \ | ||
10278 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
10279 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
10280 | +test 0 -eq $? || _lt_function_replace_fail=: | ||
10281 | + | ||
10282 | + | ||
10283 | + sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\ | ||
10284 | +func_split_long_opt ()\ | ||
10285 | +{\ | ||
10286 | +\ func_split_long_opt_name=${1%%=*}\ | ||
10287 | +\ func_split_long_opt_arg=${1#*=}\ | ||
10288 | +} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \ | ||
10289 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
10290 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
10291 | +test 0 -eq $? || _lt_function_replace_fail=: | ||
10292 | + | ||
10293 | + | ||
10294 | + sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\ | ||
10295 | +func_split_short_opt ()\ | ||
10296 | +{\ | ||
10297 | +\ func_split_short_opt_arg=${1#??}\ | ||
10298 | +\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\ | ||
10299 | +} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \ | ||
10300 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
10301 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
10302 | +test 0 -eq $? || _lt_function_replace_fail=: | ||
10303 | + | ||
10304 | + | ||
10305 | + sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\ | ||
10306 | +func_lo2o ()\ | ||
10307 | +{\ | ||
10308 | +\ case ${1} in\ | ||
10309 | +\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\ | ||
10310 | +\ *) func_lo2o_result=${1} ;;\ | ||
10311 | +\ esac\ | ||
10312 | +} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \ | ||
10313 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
10314 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
10315 | +test 0 -eq $? || _lt_function_replace_fail=: | ||
10316 | + | ||
10317 | + | ||
10318 | + sed -e '/^func_xform ()$/,/^} # func_xform /c\ | ||
10319 | +func_xform ()\ | ||
10320 | +{\ | ||
10321 | + func_xform_result=${1%.*}.lo\ | ||
10322 | +} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \ | ||
10323 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
10324 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
10325 | +test 0 -eq $? || _lt_function_replace_fail=: | ||
10326 | + | ||
10327 | + | ||
10328 | + sed -e '/^func_arith ()$/,/^} # func_arith /c\ | ||
10329 | +func_arith ()\ | ||
10330 | +{\ | ||
10331 | + func_arith_result=$(( $* ))\ | ||
10332 | +} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \ | ||
10333 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
10334 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
10335 | +test 0 -eq $? || _lt_function_replace_fail=: | ||
10336 | + | ||
10337 | + | ||
10338 | + sed -e '/^func_len ()$/,/^} # func_len /c\ | ||
10339 | +func_len ()\ | ||
10340 | +{\ | ||
10341 | + func_len_result=${#1}\ | ||
10342 | +} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \ | ||
10343 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
10344 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
10345 | +test 0 -eq $? || _lt_function_replace_fail=: | ||
10346 | + | ||
10347 | +fi | ||
10348 | + | ||
10349 | +if test x"$lt_shell_append" = xyes; then | ||
10350 | + sed -e '/^func_append ()$/,/^} # func_append /c\ | ||
10351 | +func_append ()\ | ||
10352 | +{\ | ||
10353 | + eval "${1}+=\\${2}"\ | ||
10354 | +} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \ | ||
10355 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
10356 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
10357 | +test 0 -eq $? || _lt_function_replace_fail=: | ||
10358 | + | ||
10359 | + | ||
10360 | + sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\ | ||
10361 | +func_append_quoted ()\ | ||
10362 | +{\ | ||
10363 | +\ func_quote_for_eval "${2}"\ | ||
10364 | +\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\ | ||
10365 | +} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \ | ||
10366 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
10367 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
10368 | +test 0 -eq $? || _lt_function_replace_fail=: | ||
10369 | + | ||
10370 | + | ||
10371 | + # Save a `func_append' function call where possible by direct use of '+=' | ||
10372 | + sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ | ||
10373 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
10374 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
10375 | + test 0 -eq $? || _lt_function_replace_fail=: | ||
10376 | +else | ||
10377 | + # Save a `func_append' function call even when '+=' is not available | ||
10378 | + sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ | ||
10379 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
10380 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
10381 | + test 0 -eq $? || _lt_function_replace_fail=: | ||
10382 | +fi | ||
10383 | + | ||
10384 | +if test x"$_lt_function_replace_fail" = x":"; then | ||
10385 | + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 | ||
10386 | +$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} | ||
10387 | +fi | ||
10388 | + | ||
10389 | + | ||
10390 | + mv -f "$cfgfile" "$ofile" || | ||
10391 | (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") | ||
10392 | chmod +x "$ofile" | ||
10393 | |||
10394 | @@ -19441,12 +20280,12 @@ with_gcc=$GCC_CXX | ||
10395 | # Compiler flag to turn off builtin functions. | ||
10396 | no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX | ||
10397 | |||
10398 | -# How to pass a linker flag through the compiler. | ||
10399 | -wl=$lt_lt_prog_compiler_wl_CXX | ||
10400 | - | ||
10401 | # Additional compiler flags for building library objects. | ||
10402 | pic_flag=$lt_lt_prog_compiler_pic_CXX | ||
10403 | |||
10404 | +# How to pass a linker flag through the compiler. | ||
10405 | +wl=$lt_lt_prog_compiler_wl_CXX | ||
10406 | + | ||
10407 | # Compiler flag to prevent dynamic linking. | ||
10408 | link_static_flag=$lt_lt_prog_compiler_static_CXX | ||
10409 | |||
10410 | @@ -19533,9 +20372,6 @@ inherit_rpath=$inherit_rpath_CXX | ||
10411 | # Whether libtool must link a program against all its dependency libraries. | ||
10412 | link_all_deplibs=$link_all_deplibs_CXX | ||
10413 | |||
10414 | -# Fix the shell variable \$srcfile for the compiler. | ||
10415 | -fix_srcfile_path=$lt_fix_srcfile_path_CXX | ||
10416 | - | ||
10417 | # Set to "yes" if exported symbols are required. | ||
10418 | always_export_symbols=$always_export_symbols_CXX | ||
10419 | |||
10420 | @@ -19551,6 +20387,9 @@ include_expsyms=$lt_include_expsyms_CXX | ||
10421 | # Commands necessary for linking programs (against libraries) with templates. | ||
10422 | prelink_cmds=$lt_prelink_cmds_CXX | ||
10423 | |||
10424 | +# Commands necessary for finishing linking programs. | ||
10425 | +postlink_cmds=$lt_postlink_cmds_CXX | ||
10426 | + | ||
10427 | # Specify filename containing input files. | ||
10428 | file_list_spec=$lt_file_list_spec_CXX | ||
10429 | |||
10430 | diff --git a/gprofng/doc/Makefile.in b/gprofng/doc/Makefile.in | ||
10431 | index 3306c51b31c..6ab3d9636c8 100644 | ||
10432 | --- a/gprofng/doc/Makefile.in | ||
10433 | +++ b/gprofng/doc/Makefile.in | ||
10434 | @@ -238,6 +238,7 @@ CXXFLAGS = @CXXFLAGS@ | ||
10435 | CYGPATH_W = @CYGPATH_W@ | ||
10436 | DEFS = @DEFS@ | ||
10437 | DEPDIR = @DEPDIR@ | ||
10438 | +DLLTOOL = @DLLTOOL@ | ||
10439 | DSYMUTIL = @DSYMUTIL@ | ||
10440 | DUMPBIN = @DUMPBIN@ | ||
10441 | ECHO_C = @ECHO_C@ | ||
10442 | @@ -272,6 +273,7 @@ LN_S = @LN_S@ | ||
10443 | LTLIBOBJS = @LTLIBOBJS@ | ||
10444 | MAINT = @MAINT@ | ||
10445 | MAKEINFO = @MAKEINFO@ | ||
10446 | +MANIFEST_TOOL = @MANIFEST_TOOL@ | ||
10447 | MKDIR_P = @MKDIR_P@ | ||
10448 | NM = @NM@ | ||
10449 | NMEDIT = @NMEDIT@ | ||
10450 | diff --git a/gprofng/gp-display-html/Makefile.in b/gprofng/gp-display-html/Makefile.in | ||
10451 | index 61c00cd6e46..edce3cb94c5 100644 | ||
10452 | --- a/gprofng/gp-display-html/Makefile.in | ||
10453 | +++ b/gprofng/gp-display-html/Makefile.in | ||
10454 | @@ -197,6 +197,7 @@ CXXFLAGS = @CXXFLAGS@ | ||
10455 | CYGPATH_W = @CYGPATH_W@ | ||
10456 | DEFS = @DEFS@ | ||
10457 | DEPDIR = @DEPDIR@ | ||
10458 | +DLLTOOL = @DLLTOOL@ | ||
10459 | DSYMUTIL = @DSYMUTIL@ | ||
10460 | DUMPBIN = @DUMPBIN@ | ||
10461 | ECHO_C = @ECHO_C@ | ||
10462 | @@ -231,6 +232,7 @@ LN_S = @LN_S@ | ||
10463 | LTLIBOBJS = @LTLIBOBJS@ | ||
10464 | MAINT = @MAINT@ | ||
10465 | MAKEINFO = @MAKEINFO@ | ||
10466 | +MANIFEST_TOOL = @MANIFEST_TOOL@ | ||
10467 | MKDIR_P = @MKDIR_P@ | ||
10468 | NM = @NM@ | ||
10469 | NMEDIT = @NMEDIT@ | ||
10470 | diff --git a/gprofng/libcollector/Makefile.in b/gprofng/libcollector/Makefile.in | ||
10471 | index ce8755c80c9..91e29c29ab8 100644 | ||
10472 | --- a/gprofng/libcollector/Makefile.in | ||
10473 | +++ b/gprofng/libcollector/Makefile.in | ||
10474 | @@ -316,6 +316,7 @@ CXXFLAGS = @CXXFLAGS@ | ||
10475 | CYGPATH_W = @CYGPATH_W@ | ||
10476 | DEFS = @DEFS@ | ||
10477 | DEPDIR = @DEPDIR@ | ||
10478 | +DLLTOOL = @DLLTOOL@ | ||
10479 | DSYMUTIL = @DSYMUTIL@ | ||
10480 | DUMPBIN = @DUMPBIN@ | ||
10481 | ECHO_C = @ECHO_C@ | ||
10482 | @@ -341,6 +342,7 @@ LN_S = @LN_S@ | ||
10483 | LTLIBOBJS = @LTLIBOBJS@ | ||
10484 | MAINT = @MAINT@ | ||
10485 | MAKEINFO = @MAKEINFO@ | ||
10486 | +MANIFEST_TOOL = @MANIFEST_TOOL@ | ||
10487 | MKDIR_P = @MKDIR_P@ | ||
10488 | NM = @NM@ | ||
10489 | NMEDIT = @NMEDIT@ | ||
10490 | diff --git a/gprofng/libcollector/configure b/gprofng/libcollector/configure | ||
10491 | index 8b0092433fe..a363ab1047c 100755 | ||
10492 | --- a/gprofng/libcollector/configure | ||
10493 | +++ b/gprofng/libcollector/configure | ||
10494 | @@ -640,6 +640,8 @@ OTOOL | ||
10495 | LIPO | ||
10496 | NMEDIT | ||
10497 | DSYMUTIL | ||
10498 | +MANIFEST_TOOL | ||
10499 | +DLLTOOL | ||
10500 | OBJDUMP | ||
10501 | LN_S | ||
10502 | NM | ||
10503 | @@ -769,6 +771,7 @@ enable_static | ||
10504 | with_pic | ||
10505 | enable_fast_install | ||
10506 | with_gnu_ld | ||
10507 | +with_libtool_sysroot | ||
10508 | enable_libtool_lock | ||
10509 | ' | ||
10510 | ac_precious_vars='build_alias | ||
10511 | @@ -1424,6 +1427,8 @@ Optional Packages: | ||
10512 | --with-pic try to use only PIC/non-PIC objects [default=use | ||
10513 | both] | ||
10514 | --with-gnu-ld assume the C compiler uses GNU ld [default=no] | ||
10515 | + --with-libtool-sysroot=DIR Search for dependent libraries within DIR | ||
10516 | + (or the compiler's sysroot if not specified). | ||
10517 | |||
10518 | Some influential environment variables: | ||
10519 | CC C compiler command | ||
10520 | @@ -5968,8 +5973,8 @@ esac | ||
10521 | |||
10522 | |||
10523 | |||
10524 | -macro_version='2.2.7a' | ||
10525 | -macro_revision='1.3134' | ||
10526 | +macro_version='2.4' | ||
10527 | +macro_revision='1.3293' | ||
10528 | |||
10529 | |||
10530 | |||
10531 | @@ -6009,7 +6014,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO | ||
10532 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 | ||
10533 | $as_echo_n "checking how to print strings... " >&6; } | ||
10534 | # Test print first, because it will be a builtin if present. | ||
10535 | -if test "X`print -r -- -n 2>/dev/null`" = X-n && \ | ||
10536 | +if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ | ||
10537 | test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then | ||
10538 | ECHO='print -r --' | ||
10539 | elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then | ||
10540 | @@ -6702,8 +6707,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; | ||
10541 | # Try some XSI features | ||
10542 | xsi_shell=no | ||
10543 | ( _lt_dummy="a/b/c" | ||
10544 | - test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ | ||
10545 | - = c,a/b,, \ | ||
10546 | + test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ | ||
10547 | + = c,a/b,b/c, \ | ||
10548 | && eval 'test $(( 1 + 1 )) -eq 2 \ | ||
10549 | && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ | ||
10550 | && xsi_shell=yes | ||
10551 | @@ -6752,6 +6757,80 @@ esac | ||
10552 | |||
10553 | |||
10554 | |||
10555 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5 | ||
10556 | +$as_echo_n "checking how to convert $build file names to $host format... " >&6; } | ||
10557 | +if ${lt_cv_to_host_file_cmd+:} false; then : | ||
10558 | + $as_echo_n "(cached) " >&6 | ||
10559 | +else | ||
10560 | + case $host in | ||
10561 | + *-*-mingw* ) | ||
10562 | + case $build in | ||
10563 | + *-*-mingw* ) # actually msys | ||
10564 | + lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 | ||
10565 | + ;; | ||
10566 | + *-*-cygwin* ) | ||
10567 | + lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 | ||
10568 | + ;; | ||
10569 | + * ) # otherwise, assume *nix | ||
10570 | + lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 | ||
10571 | + ;; | ||
10572 | + esac | ||
10573 | + ;; | ||
10574 | + *-*-cygwin* ) | ||
10575 | + case $build in | ||
10576 | + *-*-mingw* ) # actually msys | ||
10577 | + lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin | ||
10578 | + ;; | ||
10579 | + *-*-cygwin* ) | ||
10580 | + lt_cv_to_host_file_cmd=func_convert_file_noop | ||
10581 | + ;; | ||
10582 | + * ) # otherwise, assume *nix | ||
10583 | + lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin | ||
10584 | + ;; | ||
10585 | + esac | ||
10586 | + ;; | ||
10587 | + * ) # unhandled hosts (and "normal" native builds) | ||
10588 | + lt_cv_to_host_file_cmd=func_convert_file_noop | ||
10589 | + ;; | ||
10590 | +esac | ||
10591 | + | ||
10592 | +fi | ||
10593 | + | ||
10594 | +to_host_file_cmd=$lt_cv_to_host_file_cmd | ||
10595 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5 | ||
10596 | +$as_echo "$lt_cv_to_host_file_cmd" >&6; } | ||
10597 | + | ||
10598 | + | ||
10599 | + | ||
10600 | + | ||
10601 | + | ||
10602 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5 | ||
10603 | +$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; } | ||
10604 | +if ${lt_cv_to_tool_file_cmd+:} false; then : | ||
10605 | + $as_echo_n "(cached) " >&6 | ||
10606 | +else | ||
10607 | + #assume ordinary cross tools, or native build. | ||
10608 | +lt_cv_to_tool_file_cmd=func_convert_file_noop | ||
10609 | +case $host in | ||
10610 | + *-*-mingw* ) | ||
10611 | + case $build in | ||
10612 | + *-*-mingw* ) # actually msys | ||
10613 | + lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 | ||
10614 | + ;; | ||
10615 | + esac | ||
10616 | + ;; | ||
10617 | +esac | ||
10618 | + | ||
10619 | +fi | ||
10620 | + | ||
10621 | +to_tool_file_cmd=$lt_cv_to_tool_file_cmd | ||
10622 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5 | ||
10623 | +$as_echo "$lt_cv_to_tool_file_cmd" >&6; } | ||
10624 | + | ||
10625 | + | ||
10626 | + | ||
10627 | + | ||
10628 | + | ||
10629 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 | ||
10630 | $as_echo_n "checking for $LD option to reload object files... " >&6; } | ||
10631 | if ${lt_cv_ld_reload_flag+:} false; then : | ||
10632 | @@ -6768,6 +6847,11 @@ case $reload_flag in | ||
10633 | esac | ||
10634 | reload_cmds='$LD$reload_flag -o $output$reload_objs' | ||
10635 | case $host_os in | ||
10636 | + cygwin* | mingw* | pw32* | cegcc*) | ||
10637 | + if test "$GCC" != yes; then | ||
10638 | + reload_cmds=false | ||
10639 | + fi | ||
10640 | + ;; | ||
10641 | darwin*) | ||
10642 | if test "$GCC" = yes; then | ||
10643 | reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' | ||
10644 | @@ -6936,7 +7020,8 @@ mingw* | pw32*) | ||
10645 | lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' | ||
10646 | lt_cv_file_magic_cmd='func_win32_libid' | ||
10647 | else | ||
10648 | - lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' | ||
10649 | + # Keep this pattern in sync with the one in func_win32_libid. | ||
10650 | + lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' | ||
10651 | lt_cv_file_magic_cmd='$OBJDUMP -f' | ||
10652 | fi | ||
10653 | ;; | ||
10654 | @@ -7095,6 +7180,21 @@ esac | ||
10655 | fi | ||
10656 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 | ||
10657 | $as_echo "$lt_cv_deplibs_check_method" >&6; } | ||
10658 | + | ||
10659 | +file_magic_glob= | ||
10660 | +want_nocaseglob=no | ||
10661 | +if test "$build" = "$host"; then | ||
10662 | + case $host_os in | ||
10663 | + mingw* | pw32*) | ||
10664 | + if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then | ||
10665 | + want_nocaseglob=yes | ||
10666 | + else | ||
10667 | + file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"` | ||
10668 | + fi | ||
10669 | + ;; | ||
10670 | + esac | ||
10671 | +fi | ||
10672 | + | ||
10673 | file_magic_cmd=$lt_cv_file_magic_cmd | ||
10674 | deplibs_check_method=$lt_cv_deplibs_check_method | ||
10675 | test -z "$deplibs_check_method" && deplibs_check_method=unknown | ||
10676 | @@ -7110,6 +7210,157 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown | ||
10677 | |||
10678 | |||
10679 | |||
10680 | + | ||
10681 | + | ||
10682 | + | ||
10683 | + | ||
10684 | + | ||
10685 | + | ||
10686 | + | ||
10687 | + | ||
10688 | + | ||
10689 | + | ||
10690 | +if test -n "$ac_tool_prefix"; then | ||
10691 | + # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. | ||
10692 | +set dummy ${ac_tool_prefix}dlltool; ac_word=$2 | ||
10693 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
10694 | +$as_echo_n "checking for $ac_word... " >&6; } | ||
10695 | +if ${ac_cv_prog_DLLTOOL+:} false; then : | ||
10696 | + $as_echo_n "(cached) " >&6 | ||
10697 | +else | ||
10698 | + if test -n "$DLLTOOL"; then | ||
10699 | + ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. | ||
10700 | +else | ||
10701 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | ||
10702 | +for as_dir in $PATH | ||
10703 | +do | ||
10704 | + IFS=$as_save_IFS | ||
10705 | + test -z "$as_dir" && as_dir=. | ||
10706 | + for ac_exec_ext in '' $ac_executable_extensions; do | ||
10707 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | ||
10708 | + ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" | ||
10709 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
10710 | + break 2 | ||
10711 | + fi | ||
10712 | +done | ||
10713 | + done | ||
10714 | +IFS=$as_save_IFS | ||
10715 | + | ||
10716 | +fi | ||
10717 | +fi | ||
10718 | +DLLTOOL=$ac_cv_prog_DLLTOOL | ||
10719 | +if test -n "$DLLTOOL"; then | ||
10720 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 | ||
10721 | +$as_echo "$DLLTOOL" >&6; } | ||
10722 | +else | ||
10723 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
10724 | +$as_echo "no" >&6; } | ||
10725 | +fi | ||
10726 | + | ||
10727 | + | ||
10728 | +fi | ||
10729 | +if test -z "$ac_cv_prog_DLLTOOL"; then | ||
10730 | + ac_ct_DLLTOOL=$DLLTOOL | ||
10731 | + # Extract the first word of "dlltool", so it can be a program name with args. | ||
10732 | +set dummy dlltool; ac_word=$2 | ||
10733 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
10734 | +$as_echo_n "checking for $ac_word... " >&6; } | ||
10735 | +if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then : | ||
10736 | + $as_echo_n "(cached) " >&6 | ||
10737 | +else | ||
10738 | + if test -n "$ac_ct_DLLTOOL"; then | ||
10739 | + ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. | ||
10740 | +else | ||
10741 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | ||
10742 | +for as_dir in $PATH | ||
10743 | +do | ||
10744 | + IFS=$as_save_IFS | ||
10745 | + test -z "$as_dir" && as_dir=. | ||
10746 | + for ac_exec_ext in '' $ac_executable_extensions; do | ||
10747 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | ||
10748 | + ac_cv_prog_ac_ct_DLLTOOL="dlltool" | ||
10749 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
10750 | + break 2 | ||
10751 | + fi | ||
10752 | +done | ||
10753 | + done | ||
10754 | +IFS=$as_save_IFS | ||
10755 | + | ||
10756 | +fi | ||
10757 | +fi | ||
10758 | +ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL | ||
10759 | +if test -n "$ac_ct_DLLTOOL"; then | ||
10760 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 | ||
10761 | +$as_echo "$ac_ct_DLLTOOL" >&6; } | ||
10762 | +else | ||
10763 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
10764 | +$as_echo "no" >&6; } | ||
10765 | +fi | ||
10766 | + | ||
10767 | + if test "x$ac_ct_DLLTOOL" = x; then | ||
10768 | + DLLTOOL="false" | ||
10769 | + else | ||
10770 | + case $cross_compiling:$ac_tool_warned in | ||
10771 | +yes:) | ||
10772 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 | ||
10773 | +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} | ||
10774 | +ac_tool_warned=yes ;; | ||
10775 | +esac | ||
10776 | + DLLTOOL=$ac_ct_DLLTOOL | ||
10777 | + fi | ||
10778 | +else | ||
10779 | + DLLTOOL="$ac_cv_prog_DLLTOOL" | ||
10780 | +fi | ||
10781 | + | ||
10782 | +test -z "$DLLTOOL" && DLLTOOL=dlltool | ||
10783 | + | ||
10784 | + | ||
10785 | + | ||
10786 | + | ||
10787 | + | ||
10788 | + | ||
10789 | + | ||
10790 | + | ||
10791 | + | ||
10792 | + | ||
10793 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5 | ||
10794 | +$as_echo_n "checking how to associate runtime and link libraries... " >&6; } | ||
10795 | +if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then : | ||
10796 | + $as_echo_n "(cached) " >&6 | ||
10797 | +else | ||
10798 | + lt_cv_sharedlib_from_linklib_cmd='unknown' | ||
10799 | + | ||
10800 | +case $host_os in | ||
10801 | +cygwin* | mingw* | pw32* | cegcc*) | ||
10802 | + # two different shell functions defined in ltmain.sh | ||
10803 | + # decide which to use based on capabilities of $DLLTOOL | ||
10804 | + case `$DLLTOOL --help 2>&1` in | ||
10805 | + *--identify-strict*) | ||
10806 | + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib | ||
10807 | + ;; | ||
10808 | + *) | ||
10809 | + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback | ||
10810 | + ;; | ||
10811 | + esac | ||
10812 | + ;; | ||
10813 | +*) | ||
10814 | + # fallback: assume linklib IS sharedlib | ||
10815 | + lt_cv_sharedlib_from_linklib_cmd="$ECHO" | ||
10816 | + ;; | ||
10817 | +esac | ||
10818 | + | ||
10819 | +fi | ||
10820 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5 | ||
10821 | +$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; } | ||
10822 | +sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd | ||
10823 | +test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO | ||
10824 | + | ||
10825 | + | ||
10826 | + | ||
10827 | + | ||
10828 | + | ||
10829 | + | ||
10830 | + | ||
10831 | plugin_option= | ||
10832 | plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll" | ||
10833 | for plugin in $plugin_names; do | ||
10834 | @@ -7124,8 +7375,10 @@ for plugin in $plugin_names; do | ||
10835 | done | ||
10836 | |||
10837 | if test -n "$ac_tool_prefix"; then | ||
10838 | - # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. | ||
10839 | -set dummy ${ac_tool_prefix}ar; ac_word=$2 | ||
10840 | + for ac_prog in ar | ||
10841 | + do | ||
10842 | + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. | ||
10843 | +set dummy $ac_tool_prefix$ac_prog; ac_word=$2 | ||
10844 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
10845 | $as_echo_n "checking for $ac_word... " >&6; } | ||
10846 | if ${ac_cv_prog_AR+:} false; then : | ||
10847 | @@ -7141,7 +7394,7 @@ do | ||
10848 | test -z "$as_dir" && as_dir=. | ||
10849 | for ac_exec_ext in '' $ac_executable_extensions; do | ||
10850 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | ||
10851 | - ac_cv_prog_AR="${ac_tool_prefix}ar" | ||
10852 | + ac_cv_prog_AR="$ac_tool_prefix$ac_prog" | ||
10853 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
10854 | break 2 | ||
10855 | fi | ||
10856 | @@ -7161,11 +7414,15 @@ $as_echo "no" >&6; } | ||
10857 | fi | ||
10858 | |||
10859 | |||
10860 | + test -n "$AR" && break | ||
10861 | + done | ||
10862 | fi | ||
10863 | -if test -z "$ac_cv_prog_AR"; then | ||
10864 | +if test -z "$AR"; then | ||
10865 | ac_ct_AR=$AR | ||
10866 | - # Extract the first word of "ar", so it can be a program name with args. | ||
10867 | -set dummy ar; ac_word=$2 | ||
10868 | + for ac_prog in ar | ||
10869 | +do | ||
10870 | + # Extract the first word of "$ac_prog", so it can be a program name with args. | ||
10871 | +set dummy $ac_prog; ac_word=$2 | ||
10872 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
10873 | $as_echo_n "checking for $ac_word... " >&6; } | ||
10874 | if ${ac_cv_prog_ac_ct_AR+:} false; then : | ||
10875 | @@ -7181,7 +7438,7 @@ do | ||
10876 | test -z "$as_dir" && as_dir=. | ||
10877 | for ac_exec_ext in '' $ac_executable_extensions; do | ||
10878 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | ||
10879 | - ac_cv_prog_ac_ct_AR="ar" | ||
10880 | + ac_cv_prog_ac_ct_AR="$ac_prog" | ||
10881 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
10882 | break 2 | ||
10883 | fi | ||
10884 | @@ -7200,6 +7457,10 @@ else | ||
10885 | $as_echo "no" >&6; } | ||
10886 | fi | ||
10887 | |||
10888 | + | ||
10889 | + test -n "$ac_ct_AR" && break | ||
10890 | +done | ||
10891 | + | ||
10892 | if test "x$ac_ct_AR" = x; then | ||
10893 | AR="false" | ||
10894 | else | ||
10895 | @@ -7211,25 +7472,19 @@ ac_tool_warned=yes ;; | ||
10896 | esac | ||
10897 | AR=$ac_ct_AR | ||
10898 | fi | ||
10899 | -else | ||
10900 | - AR="$ac_cv_prog_AR" | ||
10901 | fi | ||
10902 | |||
10903 | -test -z "$AR" && AR=ar | ||
10904 | -if test -n "$plugin_option"; then | ||
10905 | - if $AR --help 2>&1 | grep -q "\--plugin"; then | ||
10906 | - touch conftest.c | ||
10907 | - $AR $plugin_option rc conftest.a conftest.c | ||
10908 | - if test "$?" != 0; then | ||
10909 | - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5 | ||
10910 | + touch conftest.c | ||
10911 | + $AR $plugin_option rc conftest.a conftest.c | ||
10912 | + if test "$?" != 0; then | ||
10913 | + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5 | ||
10914 | $as_echo "$as_me: WARNING: Failed: $AR $plugin_option rc" >&2;} | ||
10915 | - else | ||
10916 | - AR="$AR $plugin_option" | ||
10917 | - fi | ||
10918 | - rm -f conftest.* | ||
10919 | + else | ||
10920 | + AR="$AR $plugin_option" | ||
10921 | fi | ||
10922 | -fi | ||
10923 | -test -z "$AR_FLAGS" && AR_FLAGS=cru | ||
10924 | + rm -f conftest.* | ||
10925 | +: ${AR=ar} | ||
10926 | +: ${AR_FLAGS=cru} | ||
10927 | |||
10928 | |||
10929 | |||
10930 | @@ -7241,6 +7496,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru | ||
10931 | |||
10932 | |||
10933 | |||
6222 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 | 10934 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 |
6223 | +$as_echo_n "checking for archiver @FILE support... " >&6; } | 10935 | +$as_echo_n "checking for archiver @FILE support... " >&6; } |
6224 | +if ${lt_cv_ar_at_file+:} false; then : | 10936 | +if ${lt_cv_ar_at_file+:} false; then : |
@@ -6231,7 +10943,7 @@ index b12ec2e472f..57986ca995a 100755 | |||
6231 | +int | 10943 | +int |
6232 | +main () | 10944 | +main () |
6233 | +{ | 10945 | +{ |
6234 | 10946 | + | |
6235 | + ; | 10947 | + ; |
6236 | + return 0; | 10948 | + return 0; |
6237 | +} | 10949 | +} |
@@ -6257,23 +10969,30 @@ index b12ec2e472f..57986ca995a 100755 | |||
6257 | + fi | 10969 | + fi |
6258 | + fi | 10970 | + fi |
6259 | + rm -f conftest.* libconftest.a | 10971 | + rm -f conftest.* libconftest.a |
6260 | 10972 | + | |
6261 | +fi | 10973 | +fi |
6262 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | 10974 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext |
6263 | 10975 | + | |
6264 | +fi | 10976 | +fi |
6265 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 | 10977 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 |
6266 | +$as_echo "$lt_cv_ar_at_file" >&6; } | 10978 | +$as_echo "$lt_cv_ar_at_file" >&6; } |
6267 | 10979 | + | |
6268 | +if test "x$lt_cv_ar_at_file" = xno; then | 10980 | +if test "x$lt_cv_ar_at_file" = xno; then |
6269 | + archiver_list_spec= | 10981 | + archiver_list_spec= |
6270 | +else | 10982 | +else |
6271 | + archiver_list_spec=$lt_cv_ar_at_file | 10983 | + archiver_list_spec=$lt_cv_ar_at_file |
6272 | +fi | 10984 | +fi |
6273 | 10985 | + | |
6274 | 10986 | + | |
6275 | 10987 | + | |
6276 | @@ -6694,8 +7012,8 @@ esac | 10988 | + |
10989 | + | ||
10990 | + | ||
10991 | + | ||
10992 | if test -n "$ac_tool_prefix"; then | ||
10993 | # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. | ||
10994 | set dummy ${ac_tool_prefix}strip; ac_word=$2 | ||
10995 | @@ -7580,8 +7893,8 @@ esac | ||
6277 | lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" | 10996 | lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" |
6278 | 10997 | ||
6279 | # Transform an extracted symbol line into symbol name and symbol address | 10998 | # Transform an extracted symbol line into symbol name and symbol address |
@@ -6284,7 +11003,7 @@ index b12ec2e472f..57986ca995a 100755 | |||
6284 | 11003 | ||
6285 | # Handle CRLF in mingw tool chain | 11004 | # Handle CRLF in mingw tool chain |
6286 | opt_cr= | 11005 | opt_cr= |
6287 | @@ -6731,6 +7049,7 @@ for ac_symprfx in "" "_"; do | 11006 | @@ -7617,6 +7930,7 @@ for ac_symprfx in "" "_"; do |
6288 | else | 11007 | else |
6289 | lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" | 11008 | lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" |
6290 | fi | 11009 | fi |
@@ -6292,7 +11011,7 @@ index b12ec2e472f..57986ca995a 100755 | |||
6292 | 11011 | ||
6293 | # Check to see that the pipe works correctly. | 11012 | # Check to see that the pipe works correctly. |
6294 | pipe_works=no | 11013 | pipe_works=no |
6295 | @@ -6772,6 +7091,18 @@ _LT_EOF | 11014 | @@ -7658,6 +7972,18 @@ _LT_EOF |
6296 | if $GREP ' nm_test_var$' "$nlist" >/dev/null; then | 11015 | if $GREP ' nm_test_var$' "$nlist" >/dev/null; then |
6297 | if $GREP ' nm_test_func$' "$nlist" >/dev/null; then | 11016 | if $GREP ' nm_test_func$' "$nlist" >/dev/null; then |
6298 | cat <<_LT_EOF > conftest.$ac_ext | 11017 | cat <<_LT_EOF > conftest.$ac_ext |
@@ -6311,7 +11030,7 @@ index b12ec2e472f..57986ca995a 100755 | |||
6311 | #ifdef __cplusplus | 11030 | #ifdef __cplusplus |
6312 | extern "C" { | 11031 | extern "C" { |
6313 | #endif | 11032 | #endif |
6314 | @@ -6783,7 +7114,7 @@ _LT_EOF | 11033 | @@ -7669,7 +7995,7 @@ _LT_EOF |
6315 | cat <<_LT_EOF >> conftest.$ac_ext | 11034 | cat <<_LT_EOF >> conftest.$ac_ext |
6316 | 11035 | ||
6317 | /* The mapping between symbol names and symbols. */ | 11036 | /* The mapping between symbol names and symbols. */ |
@@ -6320,7 +11039,7 @@ index b12ec2e472f..57986ca995a 100755 | |||
6320 | const char *name; | 11039 | const char *name; |
6321 | void *address; | 11040 | void *address; |
6322 | } | 11041 | } |
6323 | @@ -6809,8 +7140,8 @@ static const void *lt_preloaded_setup() { | 11042 | @@ -7695,8 +8021,8 @@ static const void *lt_preloaded_setup() { |
6324 | _LT_EOF | 11043 | _LT_EOF |
6325 | # Now try linking the two files. | 11044 | # Now try linking the two files. |
6326 | mv conftest.$ac_objext conftstm.$ac_objext | 11045 | mv conftest.$ac_objext conftstm.$ac_objext |
@@ -6331,7 +11050,7 @@ index b12ec2e472f..57986ca995a 100755 | |||
6331 | LIBS="conftstm.$ac_objext" | 11050 | LIBS="conftstm.$ac_objext" |
6332 | CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" | 11051 | CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" |
6333 | if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 | 11052 | if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 |
6334 | @@ -6820,8 +7151,8 @@ _LT_EOF | 11053 | @@ -7706,8 +8032,8 @@ _LT_EOF |
6335 | test $ac_status = 0; } && test -s conftest${ac_exeext}; then | 11054 | test $ac_status = 0; } && test -s conftest${ac_exeext}; then |
6336 | pipe_works=yes | 11055 | pipe_works=yes |
6337 | fi | 11056 | fi |
@@ -6342,7 +11061,7 @@ index b12ec2e472f..57986ca995a 100755 | |||
6342 | else | 11061 | else |
6343 | echo "cannot find nm_test_func in $nlist" >&5 | 11062 | echo "cannot find nm_test_func in $nlist" >&5 |
6344 | fi | 11063 | fi |
6345 | @@ -6858,6 +7189,20 @@ else | 11064 | @@ -7744,6 +8070,13 @@ else |
6346 | $as_echo "ok" >&6; } | 11065 | $as_echo "ok" >&6; } |
6347 | fi | 11066 | fi |
6348 | 11067 | ||
@@ -6353,23 +11072,20 @@ index b12ec2e472f..57986ca995a 100755 | |||
6353 | + nm_file_list_spec='@' | 11072 | + nm_file_list_spec='@' |
6354 | +fi | 11073 | +fi |
6355 | + | 11074 | + |
6356 | + | ||
6357 | + | ||
6358 | + | ||
6359 | + | ||
6360 | + | ||
6361 | + | ||
6362 | + | ||
6363 | 11075 | ||
6364 | 11076 | ||
6365 | 11077 | ||
6366 | @@ -6874,6 +7219,41 @@ fi | 11078 | @@ -7763,6 +8096,48 @@ fi |
6367 | 11079 | ||
6368 | 11080 | ||
6369 | 11081 | ||
6370 | + | 11082 | + |
6371 | + | 11083 | + |
6372 | + | 11084 | + |
11085 | + | ||
11086 | + | ||
11087 | + | ||
11088 | + | ||
6373 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 | 11089 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 |
6374 | +$as_echo_n "checking for sysroot... " >&6; } | 11090 | +$as_echo_n "checking for sysroot... " >&6; } |
6375 | + | 11091 | + |
@@ -6402,10 +11118,13 @@ index b12ec2e472f..57986ca995a 100755 | |||
6402 | + | 11118 | + |
6403 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 | 11119 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 |
6404 | +$as_echo "${lt_sysroot:-no}" >&6; } | 11120 | +$as_echo "${lt_sysroot:-no}" >&6; } |
11121 | + | ||
11122 | + | ||
11123 | + | ||
6405 | 11124 | ||
6406 | 11125 | ||
6407 | 11126 | # Check whether --enable-libtool-lock was given. | |
6408 | @@ -7085,6 +7465,123 @@ esac | 11127 | @@ -7971,6 +8346,123 @@ esac |
6409 | 11128 | ||
6410 | need_locks="$enable_libtool_lock" | 11129 | need_locks="$enable_libtool_lock" |
6411 | 11130 | ||
@@ -6529,7 +11248,7 @@ index b12ec2e472f..57986ca995a 100755 | |||
6529 | 11248 | ||
6530 | case $host_os in | 11249 | case $host_os in |
6531 | rhapsody* | darwin*) | 11250 | rhapsody* | darwin*) |
6532 | @@ -7648,6 +8145,8 @@ _LT_EOF | 11251 | @@ -8534,6 +9026,8 @@ _LT_EOF |
6533 | $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 | 11252 | $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 |
6534 | echo "$AR cru libconftest.a conftest.o" >&5 | 11253 | echo "$AR cru libconftest.a conftest.o" >&5 |
6535 | $AR cru libconftest.a conftest.o 2>&5 | 11254 | $AR cru libconftest.a conftest.o 2>&5 |
@@ -6538,26 +11257,24 @@ index b12ec2e472f..57986ca995a 100755 | |||
6538 | cat > conftest.c << _LT_EOF | 11257 | cat > conftest.c << _LT_EOF |
6539 | int main() { return 0;} | 11258 | int main() { return 0;} |
6540 | _LT_EOF | 11259 | _LT_EOF |
6541 | @@ -7843,7 +8342,8 @@ fi | 11260 | @@ -8604,6 +9098,16 @@ done |
6542 | LIBTOOL_DEPS="$ltmain" | ||
6543 | 11261 | ||
6544 | # Always use our own libtool. | ||
6545 | -LIBTOOL='$(SHELL) $(top_builddir)/libtool' | ||
6546 | +LIBTOOL='$(SHELL) $(top_builddir)' | ||
6547 | +LIBTOOL="$LIBTOOL/${host_alias}-libtool" | ||
6548 | 11262 | ||
6549 | 11263 | ||
11264 | +func_stripname_cnf () | ||
11265 | +{ | ||
11266 | + case ${2} in | ||
11267 | + .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; | ||
11268 | + *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; | ||
11269 | + esac | ||
11270 | +} # func_stripname_cnf | ||
11271 | + | ||
11272 | + | ||
11273 | + | ||
6550 | 11274 | ||
6551 | @@ -7932,7 +8432,7 @@ aix3*) | ||
6552 | esac | ||
6553 | |||
6554 | # Global variables: | ||
6555 | -ofile=libtool | ||
6556 | +ofile=${host_alias}-libtool | ||
6557 | can_build_shared=yes | ||
6558 | 11275 | ||
6559 | # All known linkers require a `.a' archive for static linking (except MSVC, | 11276 | # Set options |
6560 | @@ -8230,8 +8730,6 @@ fi | 11277 | @@ -9119,8 +9623,6 @@ fi |
6561 | lt_prog_compiler_pic= | 11278 | lt_prog_compiler_pic= |
6562 | lt_prog_compiler_static= | 11279 | lt_prog_compiler_static= |
6563 | 11280 | ||
@@ -6566,7 +11283,7 @@ index b12ec2e472f..57986ca995a 100755 | |||
6566 | 11283 | ||
6567 | if test "$GCC" = yes; then | 11284 | if test "$GCC" = yes; then |
6568 | lt_prog_compiler_wl='-Wl,' | 11285 | lt_prog_compiler_wl='-Wl,' |
6569 | @@ -8397,6 +8895,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } | 11286 | @@ -9286,6 +9788,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } |
6570 | lt_prog_compiler_pic='--shared' | 11287 | lt_prog_compiler_pic='--shared' |
6571 | lt_prog_compiler_static='--static' | 11288 | lt_prog_compiler_static='--static' |
6572 | ;; | 11289 | ;; |
@@ -6579,7 +11296,7 @@ index b12ec2e472f..57986ca995a 100755 | |||
6579 | pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) | 11296 | pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) |
6580 | # Portland Group compilers (*not* the Pentium gcc compiler, | 11297 | # Portland Group compilers (*not* the Pentium gcc compiler, |
6581 | # which looks to be a dead project) | 11298 | # which looks to be a dead project) |
6582 | @@ -8459,7 +8963,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } | 11299 | @@ -9348,7 +9856,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } |
6583 | lt_prog_compiler_pic='-KPIC' | 11300 | lt_prog_compiler_pic='-KPIC' |
6584 | lt_prog_compiler_static='-Bstatic' | 11301 | lt_prog_compiler_static='-Bstatic' |
6585 | case $cc_basename in | 11302 | case $cc_basename in |
@@ -6588,7 +11305,7 @@ index b12ec2e472f..57986ca995a 100755 | |||
6588 | lt_prog_compiler_wl='-Qoption ld ';; | 11305 | lt_prog_compiler_wl='-Qoption ld ';; |
6589 | *) | 11306 | *) |
6590 | lt_prog_compiler_wl='-Wl,';; | 11307 | lt_prog_compiler_wl='-Wl,';; |
6591 | @@ -8516,13 +9020,17 @@ case $host_os in | 11308 | @@ -9405,13 +9913,17 @@ case $host_os in |
6592 | lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" | 11309 | lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" |
6593 | ;; | 11310 | ;; |
6594 | esac | 11311 | esac |
@@ -6612,7 +11329,7 @@ index b12ec2e472f..57986ca995a 100755 | |||
6612 | 11329 | ||
6613 | # | 11330 | # |
6614 | # Check to make sure the PIC flag actually works. | 11331 | # Check to make sure the PIC flag actually works. |
6615 | @@ -8583,6 +9091,11 @@ fi | 11332 | @@ -9472,6 +9984,11 @@ fi |
6616 | 11333 | ||
6617 | 11334 | ||
6618 | 11335 | ||
@@ -6624,7 +11341,7 @@ index b12ec2e472f..57986ca995a 100755 | |||
6624 | # | 11341 | # |
6625 | # Check to make sure the static flag actually works. | 11342 | # Check to make sure the static flag actually works. |
6626 | # | 11343 | # |
6627 | @@ -8933,7 +9446,8 @@ _LT_EOF | 11344 | @@ -9822,7 +10339,8 @@ _LT_EOF |
6628 | allow_undefined_flag=unsupported | 11345 | allow_undefined_flag=unsupported |
6629 | always_export_symbols=no | 11346 | always_export_symbols=no |
6630 | enable_shared_with_static_runtimes=yes | 11347 | enable_shared_with_static_runtimes=yes |
@@ -6634,7 +11351,7 @@ index b12ec2e472f..57986ca995a 100755 | |||
6634 | 11351 | ||
6635 | if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then | 11352 | if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then |
6636 | archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' | 11353 | archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' |
6637 | @@ -9032,12 +9546,12 @@ _LT_EOF | 11354 | @@ -9921,12 +10439,12 @@ _LT_EOF |
6638 | whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' | 11355 | whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' |
6639 | hardcode_libdir_flag_spec= | 11356 | hardcode_libdir_flag_spec= |
6640 | hardcode_libdir_flag_spec_ld='-rpath $libdir' | 11357 | hardcode_libdir_flag_spec_ld='-rpath $libdir' |
@@ -6649,7 +11366,7 @@ index b12ec2e472f..57986ca995a 100755 | |||
6649 | fi | 11366 | fi |
6650 | ;; | 11367 | ;; |
6651 | esac | 11368 | esac |
6652 | @@ -9051,8 +9565,8 @@ _LT_EOF | 11369 | @@ -9940,8 +10458,8 @@ _LT_EOF |
6653 | archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' | 11370 | archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' |
6654 | wlarc= | 11371 | wlarc= |
6655 | else | 11372 | else |
@@ -6660,7 +11377,7 @@ index b12ec2e472f..57986ca995a 100755 | |||
6660 | fi | 11377 | fi |
6661 | ;; | 11378 | ;; |
6662 | 11379 | ||
6663 | @@ -9070,8 +9584,8 @@ _LT_EOF | 11380 | @@ -9959,8 +10477,8 @@ _LT_EOF |
6664 | 11381 | ||
6665 | _LT_EOF | 11382 | _LT_EOF |
6666 | elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then | 11383 | elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then |
@@ -6671,7 +11388,7 @@ index b12ec2e472f..57986ca995a 100755 | |||
6671 | else | 11388 | else |
6672 | ld_shlibs=no | 11389 | ld_shlibs=no |
6673 | fi | 11390 | fi |
6674 | @@ -9117,8 +9631,8 @@ _LT_EOF | 11391 | @@ -10006,8 +10524,8 @@ _LT_EOF |
6675 | 11392 | ||
6676 | *) | 11393 | *) |
6677 | if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then | 11394 | if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then |
@@ -6682,7 +11399,7 @@ index b12ec2e472f..57986ca995a 100755 | |||
6682 | else | 11399 | else |
6683 | ld_shlibs=no | 11400 | ld_shlibs=no |
6684 | fi | 11401 | fi |
6685 | @@ -9248,7 +9762,13 @@ _LT_EOF | 11402 | @@ -10137,7 +10655,13 @@ _LT_EOF |
6686 | allow_undefined_flag='-berok' | 11403 | allow_undefined_flag='-berok' |
6687 | # Determine the default libpath from the value encoded in an | 11404 | # Determine the default libpath from the value encoded in an |
6688 | # empty executable. | 11405 | # empty executable. |
@@ -6697,7 +11414,7 @@ index b12ec2e472f..57986ca995a 100755 | |||
6697 | /* end confdefs.h. */ | 11414 | /* end confdefs.h. */ |
6698 | 11415 | ||
6699 | int | 11416 | int |
6700 | @@ -9261,22 +9781,29 @@ main () | 11417 | @@ -10150,22 +10674,29 @@ main () |
6701 | _ACEOF | 11418 | _ACEOF |
6702 | if ac_fn_c_try_link "$LINENO"; then : | 11419 | if ac_fn_c_try_link "$LINENO"; then : |
6703 | 11420 | ||
@@ -6740,7 +11457,7 @@ index b12ec2e472f..57986ca995a 100755 | |||
6740 | 11457 | ||
6741 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" | 11458 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" |
6742 | archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" | 11459 | archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" |
6743 | @@ -9288,7 +9815,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | 11460 | @@ -10177,7 +10708,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
6744 | else | 11461 | else |
6745 | # Determine the default libpath from the value encoded in an | 11462 | # Determine the default libpath from the value encoded in an |
6746 | # empty executable. | 11463 | # empty executable. |
@@ -6755,7 +11472,7 @@ index b12ec2e472f..57986ca995a 100755 | |||
6755 | /* end confdefs.h. */ | 11472 | /* end confdefs.h. */ |
6756 | 11473 | ||
6757 | int | 11474 | int |
6758 | @@ -9301,22 +9834,29 @@ main () | 11475 | @@ -10190,22 +10727,29 @@ main () |
6759 | _ACEOF | 11476 | _ACEOF |
6760 | if ac_fn_c_try_link "$LINENO"; then : | 11477 | if ac_fn_c_try_link "$LINENO"; then : |
6761 | 11478 | ||
@@ -6798,7 +11515,7 @@ index b12ec2e472f..57986ca995a 100755 | |||
6798 | 11515 | ||
6799 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" | 11516 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" |
6800 | # Warning - without using the other run time loading flags, | 11517 | # Warning - without using the other run time loading flags, |
6801 | @@ -9361,20 +9901,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | 11518 | @@ -10250,20 +10794,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
6802 | # Microsoft Visual C++. | 11519 | # Microsoft Visual C++. |
6803 | # hardcode_libdir_flag_spec is actually meaningless, as there is | 11520 | # hardcode_libdir_flag_spec is actually meaningless, as there is |
6804 | # no search path for DLLs. | 11521 | # no search path for DLLs. |
@@ -6876,7 +11593,7 @@ index b12ec2e472f..57986ca995a 100755 | |||
6876 | ;; | 11593 | ;; |
6877 | 11594 | ||
6878 | darwin* | rhapsody*) | 11595 | darwin* | rhapsody*) |
6879 | @@ -9435,7 +10018,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | 11596 | @@ -10324,7 +10911,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
6880 | 11597 | ||
6881 | # FreeBSD 3 and greater uses gcc -shared to do shared libraries. | 11598 | # FreeBSD 3 and greater uses gcc -shared to do shared libraries. |
6882 | freebsd* | dragonfly*) | 11599 | freebsd* | dragonfly*) |
@@ -6885,7 +11602,7 @@ index b12ec2e472f..57986ca995a 100755 | |||
6885 | hardcode_libdir_flag_spec='-R$libdir' | 11602 | hardcode_libdir_flag_spec='-R$libdir' |
6886 | hardcode_direct=yes | 11603 | hardcode_direct=yes |
6887 | hardcode_shlibpath_var=no | 11604 | hardcode_shlibpath_var=no |
6888 | @@ -9443,7 +10026,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | 11605 | @@ -10332,7 +10919,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
6889 | 11606 | ||
6890 | hpux9*) | 11607 | hpux9*) |
6891 | if test "$GCC" = yes; then | 11608 | if test "$GCC" = yes; then |
@@ -6894,7 +11611,7 @@ index b12ec2e472f..57986ca995a 100755 | |||
6894 | else | 11611 | else |
6895 | archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' | 11612 | archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' |
6896 | fi | 11613 | fi |
6897 | @@ -9459,7 +10042,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | 11614 | @@ -10348,7 +10935,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
6898 | 11615 | ||
6899 | hpux10*) | 11616 | hpux10*) |
6900 | if test "$GCC" = yes && test "$with_gnu_ld" = no; then | 11617 | if test "$GCC" = yes && test "$with_gnu_ld" = no; then |
@@ -6903,8 +11620,8 @@ index b12ec2e472f..57986ca995a 100755 | |||
6903 | else | 11620 | else |
6904 | archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' | 11621 | archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' |
6905 | fi | 11622 | fi |
6906 | @@ -9483,10 +10066,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | 11623 | @@ -10372,10 +10959,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
6907 | archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' | 11624 | archive_cmds='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' |
6908 | ;; | 11625 | ;; |
6909 | ia64*) | 11626 | ia64*) |
6910 | - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' | 11627 | - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' |
@@ -6916,7 +11633,7 @@ index b12ec2e472f..57986ca995a 100755 | |||
6916 | ;; | 11633 | ;; |
6917 | esac | 11634 | esac |
6918 | else | 11635 | else |
6919 | @@ -9565,23 +10148,36 @@ fi | 11636 | @@ -10454,23 +11041,36 @@ fi |
6920 | 11637 | ||
6921 | irix5* | irix6* | nonstopux*) | 11638 | irix5* | irix6* | nonstopux*) |
6922 | if test "$GCC" = yes; then | 11639 | if test "$GCC" = yes; then |
@@ -6961,7 +11678,7 @@ index b12ec2e472f..57986ca995a 100755 | |||
6961 | else | 11678 | else |
6962 | archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' | 11679 | archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' |
6963 | archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' | 11680 | archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' |
6964 | @@ -9666,7 +10262,7 @@ rm -f core conftest.err conftest.$ac_objext \ | 11681 | @@ -10555,7 +11155,7 @@ rm -f core conftest.err conftest.$ac_objext \ |
6965 | osf4* | osf5*) # as osf3* with the addition of -msym flag | 11682 | osf4* | osf5*) # as osf3* with the addition of -msym flag |
6966 | if test "$GCC" = yes; then | 11683 | if test "$GCC" = yes; then |
6967 | allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' | 11684 | allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' |
@@ -6970,7 +11687,7 @@ index b12ec2e472f..57986ca995a 100755 | |||
6970 | hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' | 11687 | hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' |
6971 | else | 11688 | else |
6972 | allow_undefined_flag=' -expect_unresolved \*' | 11689 | allow_undefined_flag=' -expect_unresolved \*' |
6973 | @@ -9685,9 +10281,9 @@ rm -f core conftest.err conftest.$ac_objext \ | 11690 | @@ -10574,9 +11174,9 @@ rm -f core conftest.err conftest.$ac_objext \ |
6974 | no_undefined_flag=' -z defs' | 11691 | no_undefined_flag=' -z defs' |
6975 | if test "$GCC" = yes; then | 11692 | if test "$GCC" = yes; then |
6976 | wlarc='${wl}' | 11693 | wlarc='${wl}' |
@@ -6982,7 +11699,7 @@ index b12ec2e472f..57986ca995a 100755 | |||
6982 | else | 11699 | else |
6983 | case `$CC -V 2>&1` in | 11700 | case `$CC -V 2>&1` in |
6984 | *"Compilers 5.0"*) | 11701 | *"Compilers 5.0"*) |
6985 | @@ -10263,8 +10859,9 @@ cygwin* | mingw* | pw32* | cegcc*) | 11702 | @@ -11152,8 +11752,9 @@ cygwin* | mingw* | pw32* | cegcc*) |
6986 | need_version=no | 11703 | need_version=no |
6987 | need_lib_prefix=no | 11704 | need_lib_prefix=no |
6988 | 11705 | ||
@@ -6994,7 +11711,7 @@ index b12ec2e472f..57986ca995a 100755 | |||
6994 | library_names_spec='$libname.dll.a' | 11711 | library_names_spec='$libname.dll.a' |
6995 | # DLL is installed to $(libdir)/../bin by postinstall_cmds | 11712 | # DLL is installed to $(libdir)/../bin by postinstall_cmds |
6996 | postinstall_cmds='base_file=`basename \${file}`~ | 11713 | postinstall_cmds='base_file=`basename \${file}`~ |
6997 | @@ -10297,13 +10894,71 @@ cygwin* | mingw* | pw32* | cegcc*) | 11714 | @@ -11186,13 +11787,71 @@ cygwin* | mingw* | pw32* | cegcc*) |
6998 | library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' | 11715 | library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' |
6999 | ;; | 11716 | ;; |
7000 | esac | 11717 | esac |
@@ -7067,25 +11784,16 @@ index b12ec2e472f..57986ca995a 100755 | |||
7067 | # FIXME: first we should search . and the directory the executable is in | 11784 | # FIXME: first we should search . and the directory the executable is in |
7068 | shlibpath_var=PATH | 11785 | shlibpath_var=PATH |
7069 | ;; | 11786 | ;; |
7070 | @@ -10385,7 +11040,7 @@ haiku*) | 11787 | @@ -12094,7 +12753,7 @@ else |
7071 | soname_spec='${libname}${release}${shared_ext}$major' | ||
7072 | shlibpath_var=LIBRARY_PATH | ||
7073 | shlibpath_overrides_runpath=yes | ||
7074 | - sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib' | ||
7075 | + sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' | ||
7076 | hardcode_into_libs=yes | ||
7077 | ;; | ||
7078 | |||
7079 | @@ -11181,7 +11836,7 @@ else | ||
7080 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 | 11788 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 |
7081 | lt_status=$lt_dlunknown | 11789 | lt_status=$lt_dlunknown |
7082 | cat > conftest.$ac_ext <<_LT_EOF | 11790 | cat > conftest.$ac_ext <<_LT_EOF |
7083 | -#line 11184 "configure" | 11791 | -#line 12097 "configure" |
7084 | +#line $LINENO "configure" | 11792 | +#line $LINENO "configure" |
7085 | #include "confdefs.h" | 11793 | #include "confdefs.h" |
7086 | 11794 | ||
7087 | #if HAVE_DLFCN_H | 11795 | #if HAVE_DLFCN_H |
7088 | @@ -11225,10 +11880,10 @@ else | 11796 | @@ -12138,10 +12797,10 @@ else |
7089 | /* When -fvisbility=hidden is used, assume the code has been annotated | 11797 | /* When -fvisbility=hidden is used, assume the code has been annotated |
7090 | correspondingly for the symbols needed. */ | 11798 | correspondingly for the symbols needed. */ |
7091 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) | 11799 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) |
@@ -7098,16 +11806,16 @@ index b12ec2e472f..57986ca995a 100755 | |||
7098 | int main () | 11806 | int main () |
7099 | { | 11807 | { |
7100 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); | 11808 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); |
7101 | @@ -11287,7 +11942,7 @@ else | 11809 | @@ -12200,7 +12859,7 @@ else |
7102 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 | 11810 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 |
7103 | lt_status=$lt_dlunknown | 11811 | lt_status=$lt_dlunknown |
7104 | cat > conftest.$ac_ext <<_LT_EOF | 11812 | cat > conftest.$ac_ext <<_LT_EOF |
7105 | -#line 11290 "configure" | 11813 | -#line 12203 "configure" |
7106 | +#line $LINENO "configure" | 11814 | +#line $LINENO "configure" |
7107 | #include "confdefs.h" | 11815 | #include "confdefs.h" |
7108 | 11816 | ||
7109 | #if HAVE_DLFCN_H | 11817 | #if HAVE_DLFCN_H |
7110 | @@ -11331,10 +11986,10 @@ else | 11818 | @@ -12244,10 +12903,10 @@ else |
7111 | /* When -fvisbility=hidden is used, assume the code has been annotated | 11819 | /* When -fvisbility=hidden is used, assume the code has been annotated |
7112 | correspondingly for the symbols needed. */ | 11820 | correspondingly for the symbols needed. */ |
7113 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) | 11821 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) |
@@ -7120,7 +11828,567 @@ index b12ec2e472f..57986ca995a 100755 | |||
7120 | int main () | 11828 | int main () |
7121 | { | 11829 | { |
7122 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); | 11830 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); |
7123 | @@ -13341,13 +13996,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' | 11831 | @@ -12639,6 +13298,7 @@ $RM -r conftest* |
11832 | |||
11833 | # Allow CC to be a program name with arguments. | ||
11834 | lt_save_CC=$CC | ||
11835 | + lt_save_CFLAGS=$CFLAGS | ||
11836 | lt_save_LD=$LD | ||
11837 | lt_save_GCC=$GCC | ||
11838 | GCC=$GXX | ||
11839 | @@ -12656,6 +13316,7 @@ $RM -r conftest* | ||
11840 | fi | ||
11841 | test -z "${LDCXX+set}" || LD=$LDCXX | ||
11842 | CC=${CXX-"c++"} | ||
11843 | + CFLAGS=$CXXFLAGS | ||
11844 | compiler=$CC | ||
11845 | compiler_CXX=$CC | ||
11846 | for cc_temp in $compiler""; do | ||
11847 | @@ -12938,7 +13599,13 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie | ||
11848 | allow_undefined_flag_CXX='-berok' | ||
11849 | # Determine the default libpath from the value encoded in an empty | ||
11850 | # executable. | ||
11851 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
11852 | + if test "${lt_cv_aix_libpath+set}" = set; then | ||
11853 | + aix_libpath=$lt_cv_aix_libpath | ||
11854 | +else | ||
11855 | + if ${lt_cv_aix_libpath__CXX+:} false; then : | ||
11856 | + $as_echo_n "(cached) " >&6 | ||
11857 | +else | ||
11858 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
11859 | /* end confdefs.h. */ | ||
11860 | |||
11861 | int | ||
11862 | @@ -12951,22 +13618,29 @@ main () | ||
11863 | _ACEOF | ||
11864 | if ac_fn_cxx_try_link "$LINENO"; then : | ||
11865 | |||
11866 | -lt_aix_libpath_sed=' | ||
11867 | - /Import File Strings/,/^$/ { | ||
11868 | - /^0/ { | ||
11869 | - s/^0 *\(.*\)$/\1/ | ||
11870 | - p | ||
11871 | - } | ||
11872 | - }' | ||
11873 | -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | ||
11874 | -# Check for a 64-bit object if we didn't find anything. | ||
11875 | -if test -z "$aix_libpath"; then | ||
11876 | - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | ||
11877 | -fi | ||
11878 | + lt_aix_libpath_sed=' | ||
11879 | + /Import File Strings/,/^$/ { | ||
11880 | + /^0/ { | ||
11881 | + s/^0 *\([^ ]*\) *$/\1/ | ||
11882 | + p | ||
11883 | + } | ||
11884 | + }' | ||
11885 | + lt_cv_aix_libpath__CXX=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | ||
11886 | + # Check for a 64-bit object if we didn't find anything. | ||
11887 | + if test -z "$lt_cv_aix_libpath__CXX"; then | ||
11888 | + lt_cv_aix_libpath__CXX=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | ||
11889 | + fi | ||
11890 | fi | ||
11891 | rm -f core conftest.err conftest.$ac_objext \ | ||
11892 | conftest$ac_exeext conftest.$ac_ext | ||
11893 | -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | ||
11894 | + if test -z "$lt_cv_aix_libpath__CXX"; then | ||
11895 | + lt_cv_aix_libpath__CXX="/usr/lib:/lib" | ||
11896 | + fi | ||
11897 | + | ||
11898 | +fi | ||
11899 | + | ||
11900 | + aix_libpath=$lt_cv_aix_libpath__CXX | ||
11901 | +fi | ||
11902 | |||
11903 | hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" | ||
11904 | |||
11905 | @@ -12979,7 +13653,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | ||
11906 | else | ||
11907 | # Determine the default libpath from the value encoded in an | ||
11908 | # empty executable. | ||
11909 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
11910 | + if test "${lt_cv_aix_libpath+set}" = set; then | ||
11911 | + aix_libpath=$lt_cv_aix_libpath | ||
11912 | +else | ||
11913 | + if ${lt_cv_aix_libpath__CXX+:} false; then : | ||
11914 | + $as_echo_n "(cached) " >&6 | ||
11915 | +else | ||
11916 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
11917 | /* end confdefs.h. */ | ||
11918 | |||
11919 | int | ||
11920 | @@ -12992,22 +13672,29 @@ main () | ||
11921 | _ACEOF | ||
11922 | if ac_fn_cxx_try_link "$LINENO"; then : | ||
11923 | |||
11924 | -lt_aix_libpath_sed=' | ||
11925 | - /Import File Strings/,/^$/ { | ||
11926 | - /^0/ { | ||
11927 | - s/^0 *\(.*\)$/\1/ | ||
11928 | - p | ||
11929 | - } | ||
11930 | - }' | ||
11931 | -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | ||
11932 | -# Check for a 64-bit object if we didn't find anything. | ||
11933 | -if test -z "$aix_libpath"; then | ||
11934 | - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | ||
11935 | -fi | ||
11936 | + lt_aix_libpath_sed=' | ||
11937 | + /Import File Strings/,/^$/ { | ||
11938 | + /^0/ { | ||
11939 | + s/^0 *\([^ ]*\) *$/\1/ | ||
11940 | + p | ||
11941 | + } | ||
11942 | + }' | ||
11943 | + lt_cv_aix_libpath__CXX=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | ||
11944 | + # Check for a 64-bit object if we didn't find anything. | ||
11945 | + if test -z "$lt_cv_aix_libpath__CXX"; then | ||
11946 | + lt_cv_aix_libpath__CXX=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | ||
11947 | + fi | ||
11948 | fi | ||
11949 | rm -f core conftest.err conftest.$ac_objext \ | ||
11950 | conftest$ac_exeext conftest.$ac_ext | ||
11951 | -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | ||
11952 | + if test -z "$lt_cv_aix_libpath__CXX"; then | ||
11953 | + lt_cv_aix_libpath__CXX="/usr/lib:/lib" | ||
11954 | + fi | ||
11955 | + | ||
11956 | +fi | ||
11957 | + | ||
11958 | + aix_libpath=$lt_cv_aix_libpath__CXX | ||
11959 | +fi | ||
11960 | |||
11961 | hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" | ||
11962 | # Warning - without using the other run time loading flags, | ||
11963 | @@ -13050,29 +13737,75 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | ||
11964 | ;; | ||
11965 | |||
11966 | cygwin* | mingw* | pw32* | cegcc*) | ||
11967 | - # _LT_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless, | ||
11968 | - # as there is no search path for DLLs. | ||
11969 | - hardcode_libdir_flag_spec_CXX='-L$libdir' | ||
11970 | - export_dynamic_flag_spec_CXX='${wl}--export-all-symbols' | ||
11971 | - allow_undefined_flag_CXX=unsupported | ||
11972 | - always_export_symbols_CXX=no | ||
11973 | - enable_shared_with_static_runtimes_CXX=yes | ||
11974 | - | ||
11975 | - if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then | ||
11976 | - archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' | ||
11977 | - # If the export-symbols file already is a .def file (1st line | ||
11978 | - # is EXPORTS), use it as is; otherwise, prepend... | ||
11979 | - archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then | ||
11980 | - cp $export_symbols $output_objdir/$soname.def; | ||
11981 | - else | ||
11982 | - echo EXPORTS > $output_objdir/$soname.def; | ||
11983 | - cat $export_symbols >> $output_objdir/$soname.def; | ||
11984 | - fi~ | ||
11985 | - $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' | ||
11986 | - else | ||
11987 | - ld_shlibs_CXX=no | ||
11988 | - fi | ||
11989 | - ;; | ||
11990 | + case $GXX,$cc_basename in | ||
11991 | + ,cl* | no,cl*) | ||
11992 | + # Native MSVC | ||
11993 | + # hardcode_libdir_flag_spec is actually meaningless, as there is | ||
11994 | + # no search path for DLLs. | ||
11995 | + hardcode_libdir_flag_spec_CXX=' ' | ||
11996 | + allow_undefined_flag_CXX=unsupported | ||
11997 | + always_export_symbols_CXX=yes | ||
11998 | + file_list_spec_CXX='@' | ||
11999 | + # Tell ltmain to make .lib files, not .a files. | ||
12000 | + libext=lib | ||
12001 | + # Tell ltmain to make .dll files, not .so files. | ||
12002 | + shrext_cmds=".dll" | ||
12003 | + # FIXME: Setting linknames here is a bad hack. | ||
12004 | + archive_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' | ||
12005 | + archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then | ||
12006 | + $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; | ||
12007 | + else | ||
12008 | + $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; | ||
12009 | + fi~ | ||
12010 | + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ | ||
12011 | + linknames=' | ||
12012 | + # The linker will not automatically build a static lib if we build a DLL. | ||
12013 | + # _LT_TAGVAR(old_archive_from_new_cmds, CXX)='true' | ||
12014 | + enable_shared_with_static_runtimes_CXX=yes | ||
12015 | + # Don't use ranlib | ||
12016 | + old_postinstall_cmds_CXX='chmod 644 $oldlib' | ||
12017 | + postlink_cmds_CXX='lt_outputfile="@OUTPUT@"~ | ||
12018 | + lt_tool_outputfile="@TOOL_OUTPUT@"~ | ||
12019 | + case $lt_outputfile in | ||
12020 | + *.exe|*.EXE) ;; | ||
12021 | + *) | ||
12022 | + lt_outputfile="$lt_outputfile.exe" | ||
12023 | + lt_tool_outputfile="$lt_tool_outputfile.exe" | ||
12024 | + ;; | ||
12025 | + esac~ | ||
12026 | + func_to_tool_file "$lt_outputfile"~ | ||
12027 | + if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then | ||
12028 | + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; | ||
12029 | + $RM "$lt_outputfile.manifest"; | ||
12030 | + fi' | ||
12031 | + ;; | ||
12032 | + *) | ||
12033 | + # g++ | ||
12034 | + # _LT_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless, | ||
12035 | + # as there is no search path for DLLs. | ||
12036 | + hardcode_libdir_flag_spec_CXX='-L$libdir' | ||
12037 | + export_dynamic_flag_spec_CXX='${wl}--export-all-symbols' | ||
12038 | + allow_undefined_flag_CXX=unsupported | ||
12039 | + always_export_symbols_CXX=no | ||
12040 | + enable_shared_with_static_runtimes_CXX=yes | ||
12041 | + | ||
12042 | + if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then | ||
12043 | + archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' | ||
12044 | + # If the export-symbols file already is a .def file (1st line | ||
12045 | + # is EXPORTS), use it as is; otherwise, prepend... | ||
12046 | + archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then | ||
12047 | + cp $export_symbols $output_objdir/$soname.def; | ||
12048 | + else | ||
12049 | + echo EXPORTS > $output_objdir/$soname.def; | ||
12050 | + cat $export_symbols >> $output_objdir/$soname.def; | ||
12051 | + fi~ | ||
12052 | + $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' | ||
12053 | + else | ||
12054 | + ld_shlibs_CXX=no | ||
12055 | + fi | ||
12056 | + ;; | ||
12057 | + esac | ||
12058 | + ;; | ||
12059 | darwin* | rhapsody*) | ||
12060 | |||
12061 | |||
12062 | @@ -13178,7 +13911,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | ||
12063 | ;; | ||
12064 | *) | ||
12065 | if test "$GXX" = yes; then | ||
12066 | - archive_cmds_CXX='$RM $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' | ||
12067 | + archive_cmds_CXX='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' | ||
12068 | else | ||
12069 | # FIXME: insert proper C++ library support | ||
12070 | ld_shlibs_CXX=no | ||
12071 | @@ -13249,10 +13982,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | ||
12072 | archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' | ||
12073 | ;; | ||
12074 | ia64*) | ||
12075 | - archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' | ||
12076 | + archive_cmds_CXX='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' | ||
12077 | ;; | ||
12078 | *) | ||
12079 | - archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' | ||
12080 | + archive_cmds_CXX='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' | ||
12081 | ;; | ||
12082 | esac | ||
12083 | fi | ||
12084 | @@ -13293,9 +14026,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | ||
12085 | *) | ||
12086 | if test "$GXX" = yes; then | ||
12087 | if test "$with_gnu_ld" = no; then | ||
12088 | - archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' | ||
12089 | + archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' | ||
12090 | else | ||
12091 | - archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib' | ||
12092 | + archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib' | ||
12093 | fi | ||
12094 | fi | ||
12095 | link_all_deplibs_CXX=yes | ||
12096 | @@ -13573,7 +14306,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | ||
12097 | archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' | ||
12098 | ;; | ||
12099 | *) | ||
12100 | - archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' | ||
12101 | + archive_cmds_CXX='$CC -shared $pic_flag -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' | ||
12102 | ;; | ||
12103 | esac | ||
12104 | |||
12105 | @@ -13619,7 +14352,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | ||
12106 | |||
12107 | solaris*) | ||
12108 | case $cc_basename in | ||
12109 | - CC*) | ||
12110 | + CC* | sunCC*) | ||
12111 | # Sun C++ 4.2, 5.x and Centerline C++ | ||
12112 | archive_cmds_need_lc_CXX=yes | ||
12113 | no_undefined_flag_CXX=' -zdefs' | ||
12114 | @@ -13660,9 +14393,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | ||
12115 | if test "$GXX" = yes && test "$with_gnu_ld" = no; then | ||
12116 | no_undefined_flag_CXX=' ${wl}-z ${wl}defs' | ||
12117 | if $CC --version | $GREP -v '^2\.7' > /dev/null; then | ||
12118 | - archive_cmds_CXX='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' | ||
12119 | + archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' | ||
12120 | archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ | ||
12121 | - $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' | ||
12122 | + $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' | ||
12123 | |||
12124 | # Commands to make compiler produce verbose output that lists | ||
12125 | # what "hidden" libraries, object files and flags are used when | ||
12126 | @@ -13798,6 +14531,13 @@ private: | ||
12127 | }; | ||
12128 | _LT_EOF | ||
12129 | |||
12130 | + | ||
12131 | +_lt_libdeps_save_CFLAGS=$CFLAGS | ||
12132 | +case "$CC $CFLAGS " in #( | ||
12133 | +*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;; | ||
12134 | +*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;; | ||
12135 | +esac | ||
12136 | + | ||
12137 | if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 | ||
12138 | (eval $ac_compile) 2>&5 | ||
12139 | ac_status=$? | ||
12140 | @@ -13811,7 +14551,7 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 | ||
12141 | pre_test_object_deps_done=no | ||
12142 | |||
12143 | for p in `eval "$output_verbose_link_cmd"`; do | ||
12144 | - case $p in | ||
12145 | + case ${prev}${p} in | ||
12146 | |||
12147 | -L* | -R* | -l*) | ||
12148 | # Some compilers place space between "-{L,R}" and the path. | ||
12149 | @@ -13820,13 +14560,22 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 | ||
12150 | test $p = "-R"; then | ||
12151 | prev=$p | ||
12152 | continue | ||
12153 | - else | ||
12154 | - prev= | ||
12155 | fi | ||
12156 | |||
12157 | + # Expand the sysroot to ease extracting the directories later. | ||
12158 | + if test -z "$prev"; then | ||
12159 | + case $p in | ||
12160 | + -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;; | ||
12161 | + -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;; | ||
12162 | + -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;; | ||
12163 | + esac | ||
12164 | + fi | ||
12165 | + case $p in | ||
12166 | + =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;; | ||
12167 | + esac | ||
12168 | if test "$pre_test_object_deps_done" = no; then | ||
12169 | - case $p in | ||
12170 | - -L* | -R*) | ||
12171 | + case ${prev} in | ||
12172 | + -L | -R) | ||
12173 | # Internal compiler library paths should come after those | ||
12174 | # provided the user. The postdeps already come after the | ||
12175 | # user supplied libs so there is no need to process them. | ||
12176 | @@ -13846,8 +14595,10 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 | ||
12177 | postdeps_CXX="${postdeps_CXX} ${prev}${p}" | ||
12178 | fi | ||
12179 | fi | ||
12180 | + prev= | ||
12181 | ;; | ||
12182 | |||
12183 | + *.lto.$objext) ;; # Ignore GCC LTO objects | ||
12184 | *.$objext) | ||
12185 | # This assumes that the test object file only shows up | ||
12186 | # once in the compiler output. | ||
12187 | @@ -13883,6 +14634,7 @@ else | ||
12188 | fi | ||
12189 | |||
12190 | $RM -f confest.$objext | ||
12191 | +CFLAGS=$_lt_libdeps_save_CFLAGS | ||
12192 | |||
12193 | # PORTME: override above test on systems where it is broken | ||
12194 | case $host_os in | ||
12195 | @@ -13918,7 +14670,7 @@ linux*) | ||
12196 | |||
12197 | solaris*) | ||
12198 | case $cc_basename in | ||
12199 | - CC*) | ||
12200 | + CC* | sunCC*) | ||
12201 | # The more standards-conforming stlport4 library is | ||
12202 | # incompatible with the Cstd library. Avoid specifying | ||
12203 | # it if it's in CXXFLAGS. Ignore libCrun as | ||
12204 | @@ -13983,8 +14735,6 @@ fi | ||
12205 | lt_prog_compiler_pic_CXX= | ||
12206 | lt_prog_compiler_static_CXX= | ||
12207 | |||
12208 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 | ||
12209 | -$as_echo_n "checking for $compiler option to produce PIC... " >&6; } | ||
12210 | |||
12211 | # C++ specific cases for pic, static, wl, etc. | ||
12212 | if test "$GXX" = yes; then | ||
12213 | @@ -14089,6 +14839,11 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } | ||
12214 | ;; | ||
12215 | esac | ||
12216 | ;; | ||
12217 | + mingw* | cygwin* | os2* | pw32* | cegcc*) | ||
12218 | + # This hack is so that the source file can tell whether it is being | ||
12219 | + # built for inclusion in a dll (and should export symbols for example). | ||
12220 | + lt_prog_compiler_pic_CXX='-DDLL_EXPORT' | ||
12221 | + ;; | ||
12222 | dgux*) | ||
12223 | case $cc_basename in | ||
12224 | ec++*) | ||
12225 | @@ -14241,7 +14996,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } | ||
12226 | ;; | ||
12227 | solaris*) | ||
12228 | case $cc_basename in | ||
12229 | - CC*) | ||
12230 | + CC* | sunCC*) | ||
12231 | # Sun C++ 4.2, 5.x and Centerline C++ | ||
12232 | lt_prog_compiler_pic_CXX='-KPIC' | ||
12233 | lt_prog_compiler_static_CXX='-Bstatic' | ||
12234 | @@ -14306,10 +15061,17 @@ case $host_os in | ||
12235 | lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC" | ||
12236 | ;; | ||
12237 | esac | ||
12238 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic_CXX" >&5 | ||
12239 | -$as_echo "$lt_prog_compiler_pic_CXX" >&6; } | ||
12240 | - | ||
12241 | |||
12242 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 | ||
12243 | +$as_echo_n "checking for $compiler option to produce PIC... " >&6; } | ||
12244 | +if ${lt_cv_prog_compiler_pic_CXX+:} false; then : | ||
12245 | + $as_echo_n "(cached) " >&6 | ||
12246 | +else | ||
12247 | + lt_cv_prog_compiler_pic_CXX=$lt_prog_compiler_pic_CXX | ||
12248 | +fi | ||
12249 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_CXX" >&5 | ||
12250 | +$as_echo "$lt_cv_prog_compiler_pic_CXX" >&6; } | ||
12251 | +lt_prog_compiler_pic_CXX=$lt_cv_prog_compiler_pic_CXX | ||
12252 | |||
12253 | # | ||
12254 | # Check to make sure the PIC flag actually works. | ||
12255 | @@ -14367,6 +15129,8 @@ fi | ||
12256 | |||
12257 | |||
12258 | |||
12259 | + | ||
12260 | + | ||
12261 | # | ||
12262 | # Check to make sure the static flag actually works. | ||
12263 | # | ||
12264 | @@ -14544,6 +15308,7 @@ fi | ||
12265 | $as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } | ||
12266 | |||
12267 | export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' | ||
12268 | + exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' | ||
12269 | case $host_os in | ||
12270 | aix[4-9]*) | ||
12271 | # If we're using GNU nm, then we don't want the "-C" option. | ||
12272 | @@ -14558,15 +15323,20 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie | ||
12273 | ;; | ||
12274 | pw32*) | ||
12275 | export_symbols_cmds_CXX="$ltdll_cmds" | ||
12276 | - ;; | ||
12277 | + ;; | ||
12278 | cygwin* | mingw* | cegcc*) | ||
12279 | - export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;/^.*[ ]__nm__/s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols' | ||
12280 | - ;; | ||
12281 | + case $cc_basename in | ||
12282 | + cl*) ;; | ||
12283 | + *) | ||
12284 | + export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols' | ||
12285 | + exclude_expsyms_CXX='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' | ||
12286 | + ;; | ||
12287 | + esac | ||
12288 | + ;; | ||
12289 | *) | ||
12290 | export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' | ||
12291 | - ;; | ||
12292 | + ;; | ||
12293 | esac | ||
12294 | - exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' | ||
12295 | |||
12296 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5 | ||
12297 | $as_echo "$ld_shlibs_CXX" >&6; } | ||
12298 | @@ -14829,8 +15599,9 @@ cygwin* | mingw* | pw32* | cegcc*) | ||
12299 | need_version=no | ||
12300 | need_lib_prefix=no | ||
12301 | |||
12302 | - case $GCC,$host_os in | ||
12303 | - yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) | ||
12304 | + case $GCC,$cc_basename in | ||
12305 | + yes,*) | ||
12306 | + # gcc | ||
12307 | library_names_spec='$libname.dll.a' | ||
12308 | # DLL is installed to $(libdir)/../bin by postinstall_cmds | ||
12309 | postinstall_cmds='base_file=`basename \${file}`~ | ||
12310 | @@ -14862,13 +15633,71 @@ cygwin* | mingw* | pw32* | cegcc*) | ||
12311 | library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' | ||
12312 | ;; | ||
12313 | esac | ||
12314 | + dynamic_linker='Win32 ld.exe' | ||
12315 | + ;; | ||
12316 | + | ||
12317 | + *,cl*) | ||
12318 | + # Native MSVC | ||
12319 | + libname_spec='$name' | ||
12320 | + soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' | ||
12321 | + library_names_spec='${libname}.dll.lib' | ||
12322 | + | ||
12323 | + case $build_os in | ||
12324 | + mingw*) | ||
12325 | + sys_lib_search_path_spec= | ||
12326 | + lt_save_ifs=$IFS | ||
12327 | + IFS=';' | ||
12328 | + for lt_path in $LIB | ||
12329 | + do | ||
12330 | + IFS=$lt_save_ifs | ||
12331 | + # Let DOS variable expansion print the short 8.3 style file name. | ||
12332 | + lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` | ||
12333 | + sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" | ||
12334 | + done | ||
12335 | + IFS=$lt_save_ifs | ||
12336 | + # Convert to MSYS style. | ||
12337 | + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` | ||
12338 | + ;; | ||
12339 | + cygwin*) | ||
12340 | + # Convert to unix form, then to dos form, then back to unix form | ||
12341 | + # but this time dos style (no spaces!) so that the unix form looks | ||
12342 | + # like /cygdrive/c/PROGRA~1:/cygdr... | ||
12343 | + sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` | ||
12344 | + sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` | ||
12345 | + sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` | ||
12346 | + ;; | ||
12347 | + *) | ||
12348 | + sys_lib_search_path_spec="$LIB" | ||
12349 | + if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then | ||
12350 | + # It is most probably a Windows format PATH. | ||
12351 | + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` | ||
12352 | + else | ||
12353 | + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` | ||
12354 | + fi | ||
12355 | + # FIXME: find the short name or the path components, as spaces are | ||
12356 | + # common. (e.g. "Program Files" -> "PROGRA~1") | ||
12357 | + ;; | ||
12358 | + esac | ||
12359 | + | ||
12360 | + # DLL is installed to $(libdir)/../bin by postinstall_cmds | ||
12361 | + postinstall_cmds='base_file=`basename \${file}`~ | ||
12362 | + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ | ||
12363 | + dldir=$destdir/`dirname \$dlpath`~ | ||
12364 | + test -d \$dldir || mkdir -p \$dldir~ | ||
12365 | + $install_prog $dir/$dlname \$dldir/$dlname' | ||
12366 | + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ | ||
12367 | + dlpath=$dir/\$dldll~ | ||
12368 | + $RM \$dlpath' | ||
12369 | + shlibpath_overrides_runpath=yes | ||
12370 | + dynamic_linker='Win32 link.exe' | ||
12371 | ;; | ||
12372 | |||
12373 | *) | ||
12374 | + # Assume MSVC wrapper | ||
12375 | library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' | ||
12376 | + dynamic_linker='Win32 ld.exe' | ||
12377 | ;; | ||
12378 | esac | ||
12379 | - dynamic_linker='Win32 ld.exe' | ||
12380 | # FIXME: first we should search . and the directory the executable is in | ||
12381 | shlibpath_var=PATH | ||
12382 | ;; | ||
12383 | @@ -15432,6 +16261,7 @@ fi | ||
12384 | fi # test -n "$compiler" | ||
12385 | |||
12386 | CC=$lt_save_CC | ||
12387 | + CFLAGS=$lt_save_CFLAGS | ||
12388 | LDCXX=$LD | ||
12389 | LD=$lt_save_LD | ||
12390 | GCC=$lt_save_GCC | ||
12391 | @@ -16359,13 +17189,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' | ||
7124 | lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' | 12392 | lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' |
7125 | lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' | 12393 | lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' |
7126 | lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' | 12394 | lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' |
@@ -7141,7 +12409,7 @@ index b12ec2e472f..57986ca995a 100755 | |||
7141 | STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' | 12409 | STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' |
7142 | RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' | 12410 | RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' |
7143 | old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' | 12411 | old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' |
7144 | @@ -13362,14 +14024,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de | 12412 | @@ -16380,14 +17217,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de |
7145 | lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' | 12413 | lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' |
7146 | lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' | 12414 | lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' |
7147 | lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`' | 12415 | lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`' |
@@ -7160,7 +12428,7 @@ index b12ec2e472f..57986ca995a 100755 | |||
7160 | DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' | 12428 | DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' |
7161 | NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' | 12429 | NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' |
7162 | LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' | 12430 | LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' |
7163 | @@ -13402,12 +14067,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q | 12431 | @@ -16420,12 +17260,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q |
7164 | hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' | 12432 | hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' |
7165 | inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' | 12433 | inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' |
7166 | link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' | 12434 | link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' |
@@ -7174,7 +12442,31 @@ index b12ec2e472f..57986ca995a 100755 | |||
7174 | file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' | 12442 | file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' |
7175 | variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' | 12443 | variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' |
7176 | need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' | 12444 | need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' |
7177 | @@ -13462,8 +14127,13 @@ reload_flag \ | 12445 | @@ -16464,8 +17304,8 @@ old_archive_cmds_CXX='`$ECHO "$old_archive_cmds_CXX" | $SED "$delay_single_quote |
12446 | compiler_CXX='`$ECHO "$compiler_CXX" | $SED "$delay_single_quote_subst"`' | ||
12447 | GCC_CXX='`$ECHO "$GCC_CXX" | $SED "$delay_single_quote_subst"`' | ||
12448 | lt_prog_compiler_no_builtin_flag_CXX='`$ECHO "$lt_prog_compiler_no_builtin_flag_CXX" | $SED "$delay_single_quote_subst"`' | ||
12449 | -lt_prog_compiler_wl_CXX='`$ECHO "$lt_prog_compiler_wl_CXX" | $SED "$delay_single_quote_subst"`' | ||
12450 | lt_prog_compiler_pic_CXX='`$ECHO "$lt_prog_compiler_pic_CXX" | $SED "$delay_single_quote_subst"`' | ||
12451 | +lt_prog_compiler_wl_CXX='`$ECHO "$lt_prog_compiler_wl_CXX" | $SED "$delay_single_quote_subst"`' | ||
12452 | lt_prog_compiler_static_CXX='`$ECHO "$lt_prog_compiler_static_CXX" | $SED "$delay_single_quote_subst"`' | ||
12453 | lt_cv_prog_compiler_c_o_CXX='`$ECHO "$lt_cv_prog_compiler_c_o_CXX" | $SED "$delay_single_quote_subst"`' | ||
12454 | archive_cmds_need_lc_CXX='`$ECHO "$archive_cmds_need_lc_CXX" | $SED "$delay_single_quote_subst"`' | ||
12455 | @@ -16492,12 +17332,12 @@ hardcode_shlibpath_var_CXX='`$ECHO "$hardcode_shlibpath_var_CXX" | $SED "$delay_ | ||
12456 | hardcode_automatic_CXX='`$ECHO "$hardcode_automatic_CXX" | $SED "$delay_single_quote_subst"`' | ||
12457 | inherit_rpath_CXX='`$ECHO "$inherit_rpath_CXX" | $SED "$delay_single_quote_subst"`' | ||
12458 | link_all_deplibs_CXX='`$ECHO "$link_all_deplibs_CXX" | $SED "$delay_single_quote_subst"`' | ||
12459 | -fix_srcfile_path_CXX='`$ECHO "$fix_srcfile_path_CXX" | $SED "$delay_single_quote_subst"`' | ||
12460 | always_export_symbols_CXX='`$ECHO "$always_export_symbols_CXX" | $SED "$delay_single_quote_subst"`' | ||
12461 | export_symbols_cmds_CXX='`$ECHO "$export_symbols_cmds_CXX" | $SED "$delay_single_quote_subst"`' | ||
12462 | exclude_expsyms_CXX='`$ECHO "$exclude_expsyms_CXX" | $SED "$delay_single_quote_subst"`' | ||
12463 | include_expsyms_CXX='`$ECHO "$include_expsyms_CXX" | $SED "$delay_single_quote_subst"`' | ||
12464 | prelink_cmds_CXX='`$ECHO "$prelink_cmds_CXX" | $SED "$delay_single_quote_subst"`' | ||
12465 | +postlink_cmds_CXX='`$ECHO "$postlink_cmds_CXX" | $SED "$delay_single_quote_subst"`' | ||
12466 | file_list_spec_CXX='`$ECHO "$file_list_spec_CXX" | $SED "$delay_single_quote_subst"`' | ||
12467 | hardcode_action_CXX='`$ECHO "$hardcode_action_CXX" | $SED "$delay_single_quote_subst"`' | ||
12468 | compiler_lib_search_dirs_CXX='`$ECHO "$compiler_lib_search_dirs_CXX" | $SED "$delay_single_quote_subst"`' | ||
12469 | @@ -16535,8 +17375,13 @@ reload_flag \ | ||
7178 | OBJDUMP \ | 12470 | OBJDUMP \ |
7179 | deplibs_check_method \ | 12471 | deplibs_check_method \ |
7180 | file_magic_cmd \ | 12472 | file_magic_cmd \ |
@@ -7188,7 +12480,7 @@ index b12ec2e472f..57986ca995a 100755 | |||
7188 | STRIP \ | 12480 | STRIP \ |
7189 | RANLIB \ | 12481 | RANLIB \ |
7190 | CC \ | 12482 | CC \ |
7191 | @@ -13473,12 +14143,14 @@ lt_cv_sys_global_symbol_pipe \ | 12483 | @@ -16546,12 +17391,14 @@ lt_cv_sys_global_symbol_pipe \ |
7192 | lt_cv_sys_global_symbol_to_cdecl \ | 12484 | lt_cv_sys_global_symbol_to_cdecl \ |
7193 | lt_cv_sys_global_symbol_to_c_name_address \ | 12485 | lt_cv_sys_global_symbol_to_c_name_address \ |
7194 | lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ | 12486 | lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ |
@@ -7204,7 +12496,7 @@ index b12ec2e472f..57986ca995a 100755 | |||
7204 | DSYMUTIL \ | 12496 | DSYMUTIL \ |
7205 | NMEDIT \ | 12497 | NMEDIT \ |
7206 | LIPO \ | 12498 | LIPO \ |
7207 | @@ -13494,7 +14166,6 @@ no_undefined_flag \ | 12499 | @@ -16567,7 +17414,6 @@ no_undefined_flag \ |
7208 | hardcode_libdir_flag_spec \ | 12500 | hardcode_libdir_flag_spec \ |
7209 | hardcode_libdir_flag_spec_ld \ | 12501 | hardcode_libdir_flag_spec_ld \ |
7210 | hardcode_libdir_separator \ | 12502 | hardcode_libdir_separator \ |
@@ -7212,7 +12504,25 @@ index b12ec2e472f..57986ca995a 100755 | |||
7212 | exclude_expsyms \ | 12504 | exclude_expsyms \ |
7213 | include_expsyms \ | 12505 | include_expsyms \ |
7214 | file_list_spec \ | 12506 | file_list_spec \ |
7215 | @@ -13530,6 +14201,7 @@ module_cmds \ | 12507 | @@ -16589,8 +17435,8 @@ LD_CXX \ |
12508 | reload_flag_CXX \ | ||
12509 | compiler_CXX \ | ||
12510 | lt_prog_compiler_no_builtin_flag_CXX \ | ||
12511 | -lt_prog_compiler_wl_CXX \ | ||
12512 | lt_prog_compiler_pic_CXX \ | ||
12513 | +lt_prog_compiler_wl_CXX \ | ||
12514 | lt_prog_compiler_static_CXX \ | ||
12515 | lt_cv_prog_compiler_c_o_CXX \ | ||
12516 | export_dynamic_flag_spec_CXX \ | ||
12517 | @@ -16602,7 +17448,6 @@ no_undefined_flag_CXX \ | ||
12518 | hardcode_libdir_flag_spec_CXX \ | ||
12519 | hardcode_libdir_flag_spec_ld_CXX \ | ||
12520 | hardcode_libdir_separator_CXX \ | ||
12521 | -fix_srcfile_path_CXX \ | ||
12522 | exclude_expsyms_CXX \ | ||
12523 | include_expsyms_CXX \ | ||
12524 | file_list_spec_CXX \ | ||
12525 | @@ -16636,6 +17481,7 @@ module_cmds \ | ||
7216 | module_expsym_cmds \ | 12526 | module_expsym_cmds \ |
7217 | export_symbols_cmds \ | 12527 | export_symbols_cmds \ |
7218 | prelink_cmds \ | 12528 | prelink_cmds \ |
@@ -7220,7 +12530,17 @@ index b12ec2e472f..57986ca995a 100755 | |||
7220 | postinstall_cmds \ | 12530 | postinstall_cmds \ |
7221 | postuninstall_cmds \ | 12531 | postuninstall_cmds \ |
7222 | finish_cmds \ | 12532 | finish_cmds \ |
7223 | @@ -14295,7 +14967,8 @@ $as_echo X"$file" | | 12533 | @@ -16650,7 +17496,8 @@ archive_expsym_cmds_CXX \ |
12534 | module_cmds_CXX \ | ||
12535 | module_expsym_cmds_CXX \ | ||
12536 | export_symbols_cmds_CXX \ | ||
12537 | -prelink_cmds_CXX; do | ||
12538 | +prelink_cmds_CXX \ | ||
12539 | +postlink_cmds_CXX; do | ||
12540 | case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in | ||
12541 | *[\\\\\\\`\\"\\\$]*) | ||
12542 | eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" | ||
12543 | @@ -17404,7 +18251,8 @@ $as_echo X"$file" | | ||
7224 | # NOTE: Changes made to this file will be lost: look at ltmain.sh. | 12544 | # NOTE: Changes made to this file will be lost: look at ltmain.sh. |
7225 | # | 12545 | # |
7226 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, | 12546 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, |
@@ -7230,7 +12550,7 @@ index b12ec2e472f..57986ca995a 100755 | |||
7230 | # Written by Gordon Matzigkeit, 1996 | 12550 | # Written by Gordon Matzigkeit, 1996 |
7231 | # | 12551 | # |
7232 | # This file is part of GNU Libtool. | 12552 | # This file is part of GNU Libtool. |
7233 | @@ -14398,19 +15071,42 @@ SP2NL=$lt_lt_SP2NL | 12553 | @@ -17507,19 +18355,42 @@ SP2NL=$lt_lt_SP2NL |
7234 | # turn newlines into spaces. | 12554 | # turn newlines into spaces. |
7235 | NL2SP=$lt_lt_NL2SP | 12555 | NL2SP=$lt_lt_NL2SP |
7236 | 12556 | ||
@@ -7274,7 +12594,7 @@ index b12ec2e472f..57986ca995a 100755 | |||
7274 | # A symbol stripping program. | 12594 | # A symbol stripping program. |
7275 | STRIP=$lt_STRIP | 12595 | STRIP=$lt_STRIP |
7276 | 12596 | ||
7277 | @@ -14440,6 +15136,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address | 12597 | @@ -17549,6 +18420,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address |
7278 | # Transform the output of nm in a C name address pair when lib prefix is needed. | 12598 | # Transform the output of nm in a C name address pair when lib prefix is needed. |
7279 | global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix | 12599 | global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix |
7280 | 12600 | ||
@@ -7287,7 +12607,7 @@ index b12ec2e472f..57986ca995a 100755 | |||
7287 | # The name of the directory that contains temporary libtool files. | 12607 | # The name of the directory that contains temporary libtool files. |
7288 | objdir=$objdir | 12608 | objdir=$objdir |
7289 | 12609 | ||
7290 | @@ -14449,6 +15151,9 @@ MAGIC_CMD=$MAGIC_CMD | 12610 | @@ -17558,6 +18435,9 @@ MAGIC_CMD=$MAGIC_CMD |
7291 | # Must we lock files when doing compilation? | 12611 | # Must we lock files when doing compilation? |
7292 | need_locks=$lt_need_locks | 12612 | need_locks=$lt_need_locks |
7293 | 12613 | ||
@@ -7297,7 +12617,7 @@ index b12ec2e472f..57986ca995a 100755 | |||
7297 | # Tool to manipulate archived DWARF debug symbol files on Mac OS X. | 12617 | # Tool to manipulate archived DWARF debug symbol files on Mac OS X. |
7298 | DSYMUTIL=$lt_DSYMUTIL | 12618 | DSYMUTIL=$lt_DSYMUTIL |
7299 | 12619 | ||
7300 | @@ -14563,12 +15268,12 @@ with_gcc=$GCC | 12620 | @@ -17672,12 +18552,12 @@ with_gcc=$GCC |
7301 | # Compiler flag to turn off builtin functions. | 12621 | # Compiler flag to turn off builtin functions. |
7302 | no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag | 12622 | no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag |
7303 | 12623 | ||
@@ -7313,7 +12633,7 @@ index b12ec2e472f..57986ca995a 100755 | |||
7313 | # Compiler flag to prevent dynamic linking. | 12633 | # Compiler flag to prevent dynamic linking. |
7314 | link_static_flag=$lt_lt_prog_compiler_static | 12634 | link_static_flag=$lt_lt_prog_compiler_static |
7315 | 12635 | ||
7316 | @@ -14655,9 +15360,6 @@ inherit_rpath=$inherit_rpath | 12636 | @@ -17764,9 +18644,6 @@ inherit_rpath=$inherit_rpath |
7317 | # Whether libtool must link a program against all its dependency libraries. | 12637 | # Whether libtool must link a program against all its dependency libraries. |
7318 | link_all_deplibs=$link_all_deplibs | 12638 | link_all_deplibs=$link_all_deplibs |
7319 | 12639 | ||
@@ -7323,7 +12643,7 @@ index b12ec2e472f..57986ca995a 100755 | |||
7323 | # Set to "yes" if exported symbols are required. | 12643 | # Set to "yes" if exported symbols are required. |
7324 | always_export_symbols=$always_export_symbols | 12644 | always_export_symbols=$always_export_symbols |
7325 | 12645 | ||
7326 | @@ -14673,6 +15375,9 @@ include_expsyms=$lt_include_expsyms | 12646 | @@ -17782,6 +18659,9 @@ include_expsyms=$lt_include_expsyms |
7327 | # Commands necessary for linking programs (against libraries) with templates. | 12647 | # Commands necessary for linking programs (against libraries) with templates. |
7328 | prelink_cmds=$lt_prelink_cmds | 12648 | prelink_cmds=$lt_prelink_cmds |
7329 | 12649 | ||
@@ -7333,7 +12653,7 @@ index b12ec2e472f..57986ca995a 100755 | |||
7333 | # Specify filename containing input files. | 12653 | # Specify filename containing input files. |
7334 | file_list_spec=$lt_file_list_spec | 12654 | file_list_spec=$lt_file_list_spec |
7335 | 12655 | ||
7336 | @@ -14705,210 +15410,169 @@ ltmain="$ac_aux_dir/ltmain.sh" | 12656 | @@ -17828,210 +18708,169 @@ ltmain="$ac_aux_dir/ltmain.sh" |
7337 | # if finds mixed CR/LF and LF-only lines. Since sed operates in | 12657 | # if finds mixed CR/LF and LF-only lines. Since sed operates in |
7338 | # text mode, it properly converts lines to CR/LF. This bash problem | 12658 | # text mode, it properly converts lines to CR/LF. This bash problem |
7339 | # is reportedly fixed, but why not run on old versions too? | 12659 | # is reportedly fixed, but why not run on old versions too? |
@@ -7707,11 +13027,95 @@ index b12ec2e472f..57986ca995a 100755 | |||
7707 | (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") | 13027 | (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") |
7708 | chmod +x "$ofile" | 13028 | chmod +x "$ofile" |
7709 | 13029 | ||
13030 | @@ -18059,12 +18898,12 @@ with_gcc=$GCC_CXX | ||
13031 | # Compiler flag to turn off builtin functions. | ||
13032 | no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX | ||
13033 | |||
13034 | -# How to pass a linker flag through the compiler. | ||
13035 | -wl=$lt_lt_prog_compiler_wl_CXX | ||
13036 | - | ||
13037 | # Additional compiler flags for building library objects. | ||
13038 | pic_flag=$lt_lt_prog_compiler_pic_CXX | ||
13039 | |||
13040 | +# How to pass a linker flag through the compiler. | ||
13041 | +wl=$lt_lt_prog_compiler_wl_CXX | ||
13042 | + | ||
13043 | # Compiler flag to prevent dynamic linking. | ||
13044 | link_static_flag=$lt_lt_prog_compiler_static_CXX | ||
13045 | |||
13046 | @@ -18151,9 +18990,6 @@ inherit_rpath=$inherit_rpath_CXX | ||
13047 | # Whether libtool must link a program against all its dependency libraries. | ||
13048 | link_all_deplibs=$link_all_deplibs_CXX | ||
13049 | |||
13050 | -# Fix the shell variable \$srcfile for the compiler. | ||
13051 | -fix_srcfile_path=$lt_fix_srcfile_path_CXX | ||
13052 | - | ||
13053 | # Set to "yes" if exported symbols are required. | ||
13054 | always_export_symbols=$always_export_symbols_CXX | ||
13055 | |||
13056 | @@ -18169,6 +19005,9 @@ include_expsyms=$lt_include_expsyms_CXX | ||
13057 | # Commands necessary for linking programs (against libraries) with templates. | ||
13058 | prelink_cmds=$lt_prelink_cmds_CXX | ||
13059 | |||
13060 | +# Commands necessary for finishing linking programs. | ||
13061 | +postlink_cmds=$lt_postlink_cmds_CXX | ||
13062 | + | ||
13063 | # Specify filename containing input files. | ||
13064 | file_list_spec=$lt_file_list_spec_CXX | ||
13065 | |||
13066 | diff --git a/gprofng/src/Makefile.in b/gprofng/src/Makefile.in | ||
13067 | index db763ef71b2..726dc69bf85 100644 | ||
13068 | --- a/gprofng/src/Makefile.in | ||
13069 | +++ b/gprofng/src/Makefile.in | ||
13070 | @@ -321,6 +321,7 @@ CXXFLAGS = @CXXFLAGS@ | ||
13071 | CYGPATH_W = @CYGPATH_W@ | ||
13072 | DEFS = @DEFS@ | ||
13073 | DEPDIR = @DEPDIR@ | ||
13074 | +DLLTOOL = @DLLTOOL@ | ||
13075 | DSYMUTIL = @DSYMUTIL@ | ||
13076 | DUMPBIN = @DUMPBIN@ | ||
13077 | ECHO_C = @ECHO_C@ | ||
13078 | @@ -355,6 +356,7 @@ LN_S = @LN_S@ | ||
13079 | LTLIBOBJS = @LTLIBOBJS@ | ||
13080 | MAINT = @MAINT@ | ||
13081 | MAKEINFO = @MAKEINFO@ | ||
13082 | +MANIFEST_TOOL = @MANIFEST_TOOL@ | ||
13083 | MKDIR_P = @MKDIR_P@ | ||
13084 | NM = @NM@ | ||
13085 | NMEDIT = @NMEDIT@ | ||
13086 | diff --git a/ld/Makefile.in b/ld/Makefile.in | ||
13087 | index 15311048855..71b39ee9311 100644 | ||
13088 | --- a/ld/Makefile.in | ||
13089 | +++ b/ld/Makefile.in | ||
13090 | @@ -390,6 +390,7 @@ CYGPATH_W = @CYGPATH_W@ | ||
13091 | DATADIRNAME = @DATADIRNAME@ | ||
13092 | DEFS = @DEFS@ | ||
13093 | DEPDIR = @DEPDIR@ | ||
13094 | +DLLTOOL = @DLLTOOL@ | ||
13095 | DSYMUTIL = @DSYMUTIL@ | ||
13096 | DUMPBIN = @DUMPBIN@ | ||
13097 | ECHO_C = @ECHO_C@ | ||
13098 | @@ -445,6 +446,7 @@ LTLIBINTL = @LTLIBINTL@ | ||
13099 | LTLIBOBJS = @LTLIBOBJS@ | ||
13100 | MAINT = @MAINT@ | ||
13101 | MAKEINFO = @MAKEINFO@ | ||
13102 | +MANIFEST_TOOL = @MANIFEST_TOOL@ | ||
13103 | MKDIR_P = @MKDIR_P@ | ||
13104 | MKINSTALLDIRS = @MKINSTALLDIRS@ | ||
13105 | MSGFMT = @MSGFMT@ | ||
13106 | @@ -495,6 +497,7 @@ abs_builddir = @abs_builddir@ | ||
13107 | abs_srcdir = @abs_srcdir@ | ||
13108 | abs_top_builddir = @abs_top_builddir@ | ||
13109 | abs_top_srcdir = @abs_top_srcdir@ | ||
13110 | +ac_ct_AR = @ac_ct_AR@ | ||
13111 | ac_ct_CC = @ac_ct_CC@ | ||
13112 | ac_ct_CXX = @ac_ct_CXX@ | ||
13113 | ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ | ||
7710 | diff --git a/ld/configure b/ld/configure | 13114 | diff --git a/ld/configure b/ld/configure |
7711 | index 8355c433c76..a49ab3d1f09 100755 | 13115 | index 98a76d6da7f..a4266996c44 100755 |
7712 | --- a/ld/configure | 13116 | --- a/ld/configure |
7713 | +++ b/ld/configure | 13117 | +++ b/ld/configure |
7714 | @@ -693,8 +693,11 @@ OTOOL | 13118 | @@ -705,8 +705,11 @@ OTOOL |
7715 | LIPO | 13119 | LIPO |
7716 | NMEDIT | 13120 | NMEDIT |
7717 | DSYMUTIL | 13121 | DSYMUTIL |
@@ -7723,7 +13127,7 @@ index 8355c433c76..a49ab3d1f09 100755 | |||
7723 | OBJDUMP | 13127 | OBJDUMP |
7724 | LN_S | 13128 | LN_S |
7725 | NM | 13129 | NM |
7726 | @@ -821,6 +824,7 @@ enable_static | 13130 | @@ -836,6 +839,7 @@ enable_static |
7727 | with_pic | 13131 | with_pic |
7728 | enable_fast_install | 13132 | enable_fast_install |
7729 | with_gnu_ld | 13133 | with_gnu_ld |
@@ -7731,7 +13135,7 @@ index 8355c433c76..a49ab3d1f09 100755 | |||
7731 | enable_libtool_lock | 13135 | enable_libtool_lock |
7732 | enable_plugins | 13136 | enable_plugins |
7733 | enable_largefile | 13137 | enable_largefile |
7734 | @@ -1526,6 +1530,8 @@ Optional Packages: | 13138 | @@ -1581,6 +1585,8 @@ Optional Packages: |
7735 | --with-pic try to use only PIC/non-PIC objects [default=use | 13139 | --with-pic try to use only PIC/non-PIC objects [default=use |
7736 | both] | 13140 | both] |
7737 | --with-gnu-ld assume the C compiler uses GNU ld [default=no] | 13141 | --with-gnu-ld assume the C compiler uses GNU ld [default=no] |
@@ -7739,8 +13143,8 @@ index 8355c433c76..a49ab3d1f09 100755 | |||
7739 | + (or the compiler's sysroot if not specified). | 13143 | + (or the compiler's sysroot if not specified). |
7740 | --with-lib-path=dir1:dir2... set default LIB_PATH | 13144 | --with-lib-path=dir1:dir2... set default LIB_PATH |
7741 | --with-sysroot=DIR Search for usr/lib et al within DIR. | 13145 | --with-sysroot=DIR Search for usr/lib et al within DIR. |
7742 | --with-system-zlib use installed libz | 13146 | --with-gnu-ld assume the C compiler uses GNU ld default=no |
7743 | @@ -5979,8 +5985,8 @@ esac | 13147 | @@ -5560,8 +5566,8 @@ esac |
7744 | 13148 | ||
7745 | 13149 | ||
7746 | 13150 | ||
@@ -7751,7 +13155,7 @@ index 8355c433c76..a49ab3d1f09 100755 | |||
7751 | 13155 | ||
7752 | 13156 | ||
7753 | 13157 | ||
7754 | @@ -6020,7 +6026,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO | 13158 | @@ -5601,7 +5607,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO |
7755 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 | 13159 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 |
7756 | $as_echo_n "checking how to print strings... " >&6; } | 13160 | $as_echo_n "checking how to print strings... " >&6; } |
7757 | # Test print first, because it will be a builtin if present. | 13161 | # Test print first, because it will be a builtin if present. |
@@ -7760,7 +13164,7 @@ index 8355c433c76..a49ab3d1f09 100755 | |||
7760 | test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then | 13164 | test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then |
7761 | ECHO='print -r --' | 13165 | ECHO='print -r --' |
7762 | elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then | 13166 | elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then |
7763 | @@ -6706,8 +6712,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; | 13167 | @@ -6294,8 +6300,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; |
7764 | # Try some XSI features | 13168 | # Try some XSI features |
7765 | xsi_shell=no | 13169 | xsi_shell=no |
7766 | ( _lt_dummy="a/b/c" | 13170 | ( _lt_dummy="a/b/c" |
@@ -7771,7 +13175,7 @@ index 8355c433c76..a49ab3d1f09 100755 | |||
7771 | && eval 'test $(( 1 + 1 )) -eq 2 \ | 13175 | && eval 'test $(( 1 + 1 )) -eq 2 \ |
7772 | && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ | 13176 | && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ |
7773 | && xsi_shell=yes | 13177 | && xsi_shell=yes |
7774 | @@ -6756,6 +6762,80 @@ esac | 13178 | @@ -6344,6 +6350,80 @@ esac |
7775 | 13179 | ||
7776 | 13180 | ||
7777 | 13181 | ||
@@ -7852,7 +13256,7 @@ index 8355c433c76..a49ab3d1f09 100755 | |||
7852 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 | 13256 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 |
7853 | $as_echo_n "checking for $LD option to reload object files... " >&6; } | 13257 | $as_echo_n "checking for $LD option to reload object files... " >&6; } |
7854 | if ${lt_cv_ld_reload_flag+:} false; then : | 13258 | if ${lt_cv_ld_reload_flag+:} false; then : |
7855 | @@ -6772,6 +6852,11 @@ case $reload_flag in | 13259 | @@ -6360,6 +6440,11 @@ case $reload_flag in |
7856 | esac | 13260 | esac |
7857 | reload_cmds='$LD$reload_flag -o $output$reload_objs' | 13261 | reload_cmds='$LD$reload_flag -o $output$reload_objs' |
7858 | case $host_os in | 13262 | case $host_os in |
@@ -7864,7 +13268,7 @@ index 8355c433c76..a49ab3d1f09 100755 | |||
7864 | darwin*) | 13268 | darwin*) |
7865 | if test "$GCC" = yes; then | 13269 | if test "$GCC" = yes; then |
7866 | reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' | 13270 | reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' |
7867 | @@ -6940,7 +7025,8 @@ mingw* | pw32*) | 13271 | @@ -6528,7 +6613,8 @@ mingw* | pw32*) |
7868 | lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' | 13272 | lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' |
7869 | lt_cv_file_magic_cmd='func_win32_libid' | 13273 | lt_cv_file_magic_cmd='func_win32_libid' |
7870 | else | 13274 | else |
@@ -7874,7 +13278,7 @@ index 8355c433c76..a49ab3d1f09 100755 | |||
7874 | lt_cv_file_magic_cmd='$OBJDUMP -f' | 13278 | lt_cv_file_magic_cmd='$OBJDUMP -f' |
7875 | fi | 13279 | fi |
7876 | ;; | 13280 | ;; |
7877 | @@ -7094,6 +7180,21 @@ esac | 13281 | @@ -6687,6 +6773,21 @@ esac |
7878 | fi | 13282 | fi |
7879 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 | 13283 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 |
7880 | $as_echo "$lt_cv_deplibs_check_method" >&6; } | 13284 | $as_echo "$lt_cv_deplibs_check_method" >&6; } |
@@ -7896,7 +13300,7 @@ index 8355c433c76..a49ab3d1f09 100755 | |||
7896 | file_magic_cmd=$lt_cv_file_magic_cmd | 13300 | file_magic_cmd=$lt_cv_file_magic_cmd |
7897 | deplibs_check_method=$lt_cv_deplibs_check_method | 13301 | deplibs_check_method=$lt_cv_deplibs_check_method |
7898 | test -z "$deplibs_check_method" && deplibs_check_method=unknown | 13302 | test -z "$deplibs_check_method" && deplibs_check_method=unknown |
7899 | @@ -7109,9 +7210,162 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown | 13303 | @@ -6702,6 +6803,157 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown |
7900 | 13304 | ||
7901 | 13305 | ||
7902 | 13306 | ||
@@ -8051,6 +13455,12 @@ index 8355c433c76..a49ab3d1f09 100755 | |||
8051 | + | 13455 | + |
8052 | + | 13456 | + |
8053 | + | 13457 | + |
13458 | plugin_option= | ||
13459 | plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll" | ||
13460 | for plugin in $plugin_names; do | ||
13461 | @@ -6716,8 +6968,10 @@ for plugin in $plugin_names; do | ||
13462 | done | ||
13463 | |||
8054 | if test -n "$ac_tool_prefix"; then | 13464 | if test -n "$ac_tool_prefix"; then |
8055 | - # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. | 13465 | - # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. |
8056 | -set dummy ${ac_tool_prefix}ar; ac_word=$2 | 13466 | -set dummy ${ac_tool_prefix}ar; ac_word=$2 |
@@ -8061,7 +13471,7 @@ index 8355c433c76..a49ab3d1f09 100755 | |||
8061 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | 13471 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
8062 | $as_echo_n "checking for $ac_word... " >&6; } | 13472 | $as_echo_n "checking for $ac_word... " >&6; } |
8063 | if ${ac_cv_prog_AR+:} false; then : | 13473 | if ${ac_cv_prog_AR+:} false; then : |
8064 | @@ -7127,7 +7381,7 @@ do | 13474 | @@ -6733,7 +6987,7 @@ do |
8065 | test -z "$as_dir" && as_dir=. | 13475 | test -z "$as_dir" && as_dir=. |
8066 | for ac_exec_ext in '' $ac_executable_extensions; do | 13476 | for ac_exec_ext in '' $ac_executable_extensions; do |
8067 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | 13477 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
@@ -8070,7 +13480,7 @@ index 8355c433c76..a49ab3d1f09 100755 | |||
8070 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | 13480 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
8071 | break 2 | 13481 | break 2 |
8072 | fi | 13482 | fi |
8073 | @@ -7147,11 +7401,15 @@ $as_echo "no" >&6; } | 13483 | @@ -6753,11 +7007,15 @@ $as_echo "no" >&6; } |
8074 | fi | 13484 | fi |
8075 | 13485 | ||
8076 | 13486 | ||
@@ -8089,7 +13499,7 @@ index 8355c433c76..a49ab3d1f09 100755 | |||
8089 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | 13499 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
8090 | $as_echo_n "checking for $ac_word... " >&6; } | 13500 | $as_echo_n "checking for $ac_word... " >&6; } |
8091 | if ${ac_cv_prog_ac_ct_AR+:} false; then : | 13501 | if ${ac_cv_prog_ac_ct_AR+:} false; then : |
8092 | @@ -7167,7 +7425,7 @@ do | 13502 | @@ -6773,7 +7031,7 @@ do |
8093 | test -z "$as_dir" && as_dir=. | 13503 | test -z "$as_dir" && as_dir=. |
8094 | for ac_exec_ext in '' $ac_executable_extensions; do | 13504 | for ac_exec_ext in '' $ac_executable_extensions; do |
8095 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | 13505 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
@@ -8098,7 +13508,7 @@ index 8355c433c76..a49ab3d1f09 100755 | |||
8098 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | 13508 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
8099 | break 2 | 13509 | break 2 |
8100 | fi | 13510 | fi |
8101 | @@ -7186,6 +7444,10 @@ else | 13511 | @@ -6792,6 +7050,10 @@ else |
8102 | $as_echo "no" >&6; } | 13512 | $as_echo "no" >&6; } |
8103 | fi | 13513 | fi |
8104 | 13514 | ||
@@ -8109,7 +13519,7 @@ index 8355c433c76..a49ab3d1f09 100755 | |||
8109 | if test "x$ac_ct_AR" = x; then | 13519 | if test "x$ac_ct_AR" = x; then |
8110 | AR="false" | 13520 | AR="false" |
8111 | else | 13521 | else |
8112 | @@ -7197,12 +7459,12 @@ ac_tool_warned=yes ;; | 13522 | @@ -6803,29 +7065,81 @@ ac_tool_warned=yes ;; |
8113 | esac | 13523 | esac |
8114 | AR=$ac_ct_AR | 13524 | AR=$ac_ct_AR |
8115 | fi | 13525 | fi |
@@ -8118,17 +13528,39 @@ index 8355c433c76..a49ab3d1f09 100755 | |||
8118 | fi | 13528 | fi |
8119 | 13529 | ||
8120 | -test -z "$AR" && AR=ar | 13530 | -test -z "$AR" && AR=ar |
13531 | -if test -n "$plugin_option"; then | ||
13532 | - if $AR --help 2>&1 | grep -q "\--plugin"; then | ||
13533 | - touch conftest.c | ||
13534 | - $AR $plugin_option rc conftest.a conftest.c | ||
13535 | - if test "$?" != 0; then | ||
13536 | - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5 | ||
13537 | + touch conftest.c | ||
13538 | + $AR $plugin_option rc conftest.a conftest.c | ||
13539 | + if test "$?" != 0; then | ||
13540 | + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5 | ||
13541 | $as_echo "$as_me: WARNING: Failed: $AR $plugin_option rc" >&2;} | ||
13542 | - else | ||
13543 | - AR="$AR $plugin_option" | ||
13544 | - fi | ||
13545 | - rm -f conftest.* | ||
13546 | + else | ||
13547 | + AR="$AR $plugin_option" | ||
13548 | fi | ||
13549 | -fi | ||
8121 | -test -z "$AR_FLAGS" && AR_FLAGS=cru | 13550 | -test -z "$AR_FLAGS" && AR_FLAGS=cru |
13551 | + rm -f conftest.* | ||
8122 | +: ${AR=ar} | 13552 | +: ${AR=ar} |
8123 | +: ${AR_FLAGS=cru} | 13553 | +: ${AR_FLAGS=cru} |
8124 | + | 13554 | + |
8125 | + | 13555 | + |
8126 | 13556 | + | |
8127 | 13557 | + | |
8128 | 13558 | + | |
8129 | @@ -7212,6 +7474,62 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru | 13559 | + |
8130 | 13560 | + | |
8131 | 13561 | + | |
13562 | + | ||
13563 | + | ||
8132 | 13564 | ||
8133 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 | 13565 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 |
8134 | +$as_echo_n "checking for archiver @FILE support... " >&6; } | 13566 | +$as_echo_n "checking for archiver @FILE support... " >&6; } |
@@ -8142,7 +13574,7 @@ index 8355c433c76..a49ab3d1f09 100755 | |||
8142 | +int | 13574 | +int |
8143 | +main () | 13575 | +main () |
8144 | +{ | 13576 | +{ |
8145 | + | 13577 | |
8146 | + ; | 13578 | + ; |
8147 | + return 0; | 13579 | + return 0; |
8148 | +} | 13580 | +} |
@@ -8171,25 +13603,20 @@ index 8355c433c76..a49ab3d1f09 100755 | |||
8171 | + | 13603 | + |
8172 | +fi | 13604 | +fi |
8173 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | 13605 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext |
8174 | + | 13606 | |
8175 | +fi | 13607 | +fi |
8176 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 | 13608 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 |
8177 | +$as_echo "$lt_cv_ar_at_file" >&6; } | 13609 | +$as_echo "$lt_cv_ar_at_file" >&6; } |
8178 | + | 13610 | |
8179 | +if test "x$lt_cv_ar_at_file" = xno; then | 13611 | +if test "x$lt_cv_ar_at_file" = xno; then |
8180 | + archiver_list_spec= | 13612 | + archiver_list_spec= |
8181 | +else | 13613 | +else |
8182 | + archiver_list_spec=$lt_cv_ar_at_file | 13614 | + archiver_list_spec=$lt_cv_ar_at_file |
8183 | +fi | 13615 | +fi |
8184 | + | ||
8185 | + | ||
8186 | + | ||
8187 | + | ||
8188 | + | ||
8189 | 13616 | ||
8190 | 13617 | ||
8191 | if test -n "$ac_tool_prefix"; then | 13618 | |
8192 | @@ -7548,8 +7866,8 @@ esac | 13619 | @@ -7172,8 +7486,8 @@ esac |
8193 | lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" | 13620 | lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" |
8194 | 13621 | ||
8195 | # Transform an extracted symbol line into symbol name and symbol address | 13622 | # Transform an extracted symbol line into symbol name and symbol address |
@@ -8200,7 +13627,7 @@ index 8355c433c76..a49ab3d1f09 100755 | |||
8200 | 13627 | ||
8201 | # Handle CRLF in mingw tool chain | 13628 | # Handle CRLF in mingw tool chain |
8202 | opt_cr= | 13629 | opt_cr= |
8203 | @@ -7585,6 +7903,7 @@ for ac_symprfx in "" "_"; do | 13630 | @@ -7209,6 +7523,7 @@ for ac_symprfx in "" "_"; do |
8204 | else | 13631 | else |
8205 | lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" | 13632 | lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" |
8206 | fi | 13633 | fi |
@@ -8208,7 +13635,7 @@ index 8355c433c76..a49ab3d1f09 100755 | |||
8208 | 13635 | ||
8209 | # Check to see that the pipe works correctly. | 13636 | # Check to see that the pipe works correctly. |
8210 | pipe_works=no | 13637 | pipe_works=no |
8211 | @@ -7626,6 +7945,18 @@ _LT_EOF | 13638 | @@ -7250,6 +7565,18 @@ _LT_EOF |
8212 | if $GREP ' nm_test_var$' "$nlist" >/dev/null; then | 13639 | if $GREP ' nm_test_var$' "$nlist" >/dev/null; then |
8213 | if $GREP ' nm_test_func$' "$nlist" >/dev/null; then | 13640 | if $GREP ' nm_test_func$' "$nlist" >/dev/null; then |
8214 | cat <<_LT_EOF > conftest.$ac_ext | 13641 | cat <<_LT_EOF > conftest.$ac_ext |
@@ -8227,7 +13654,7 @@ index 8355c433c76..a49ab3d1f09 100755 | |||
8227 | #ifdef __cplusplus | 13654 | #ifdef __cplusplus |
8228 | extern "C" { | 13655 | extern "C" { |
8229 | #endif | 13656 | #endif |
8230 | @@ -7637,7 +7968,7 @@ _LT_EOF | 13657 | @@ -7261,7 +7588,7 @@ _LT_EOF |
8231 | cat <<_LT_EOF >> conftest.$ac_ext | 13658 | cat <<_LT_EOF >> conftest.$ac_ext |
8232 | 13659 | ||
8233 | /* The mapping between symbol names and symbols. */ | 13660 | /* The mapping between symbol names and symbols. */ |
@@ -8236,7 +13663,7 @@ index 8355c433c76..a49ab3d1f09 100755 | |||
8236 | const char *name; | 13663 | const char *name; |
8237 | void *address; | 13664 | void *address; |
8238 | } | 13665 | } |
8239 | @@ -7663,8 +7994,8 @@ static const void *lt_preloaded_setup() { | 13666 | @@ -7287,8 +7614,8 @@ static const void *lt_preloaded_setup() { |
8240 | _LT_EOF | 13667 | _LT_EOF |
8241 | # Now try linking the two files. | 13668 | # Now try linking the two files. |
8242 | mv conftest.$ac_objext conftstm.$ac_objext | 13669 | mv conftest.$ac_objext conftstm.$ac_objext |
@@ -8247,7 +13674,7 @@ index 8355c433c76..a49ab3d1f09 100755 | |||
8247 | LIBS="conftstm.$ac_objext" | 13674 | LIBS="conftstm.$ac_objext" |
8248 | CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" | 13675 | CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" |
8249 | if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 | 13676 | if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 |
8250 | @@ -7674,8 +8005,8 @@ _LT_EOF | 13677 | @@ -7298,8 +7625,8 @@ _LT_EOF |
8251 | test $ac_status = 0; } && test -s conftest${ac_exeext}; then | 13678 | test $ac_status = 0; } && test -s conftest${ac_exeext}; then |
8252 | pipe_works=yes | 13679 | pipe_works=yes |
8253 | fi | 13680 | fi |
@@ -8258,7 +13685,7 @@ index 8355c433c76..a49ab3d1f09 100755 | |||
8258 | else | 13685 | else |
8259 | echo "cannot find nm_test_func in $nlist" >&5 | 13686 | echo "cannot find nm_test_func in $nlist" >&5 |
8260 | fi | 13687 | fi |
8261 | @@ -7712,6 +8043,19 @@ else | 13688 | @@ -7336,6 +7663,27 @@ else |
8262 | $as_echo "ok" >&6; } | 13689 | $as_echo "ok" >&6; } |
8263 | fi | 13690 | fi |
8264 | 13691 | ||
@@ -8275,28 +13702,32 @@ index 8355c433c76..a49ab3d1f09 100755 | |||
8275 | + | 13702 | + |
8276 | + | 13703 | + |
8277 | + | 13704 | + |
13705 | + | ||
13706 | + | ||
13707 | + | ||
13708 | + | ||
13709 | + | ||
13710 | + | ||
13711 | + | ||
13712 | + | ||
8278 | 13713 | ||
8279 | 13714 | ||
8280 | 13715 | ||
8281 | @@ -7728,6 +8072,42 @@ fi | 13716 | @@ -7348,10 +7696,38 @@ fi |
8282 | 13717 | ||
8283 | 13718 | ||
8284 | 13719 | ||
8285 | + | ||
8286 | + | ||
8287 | + | ||
8288 | + | ||
8289 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 | 13720 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 |
8290 | +$as_echo_n "checking for sysroot... " >&6; } | 13721 | +$as_echo_n "checking for sysroot... " >&6; } |
8291 | + | 13722 | |
8292 | +# Check whether --with-libtool-sysroot was given. | 13723 | +# Check whether --with-libtool-sysroot was given. |
8293 | +if test "${with_libtool_sysroot+set}" = set; then : | 13724 | +if test "${with_libtool_sysroot+set}" = set; then : |
8294 | + withval=$with_libtool_sysroot; | 13725 | + withval=$with_libtool_sysroot; |
8295 | +else | 13726 | +else |
8296 | + with_libtool_sysroot=no | 13727 | + with_libtool_sysroot=no |
8297 | +fi | 13728 | +fi |
8298 | + | 13729 | |
8299 | + | 13730 | |
8300 | +lt_sysroot= | 13731 | +lt_sysroot= |
8301 | +case ${with_libtool_sysroot} in #( | 13732 | +case ${with_libtool_sysroot} in #( |
8302 | + yes) | 13733 | + yes) |
@@ -8315,13 +13746,13 @@ index 8355c433c76..a49ab3d1f09 100755 | |||
8315 | + as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 | 13746 | + as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 |
8316 | + ;; | 13747 | + ;; |
8317 | +esac | 13748 | +esac |
8318 | + | 13749 | |
8319 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 | 13750 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 |
8320 | +$as_echo "${lt_sysroot:-no}" >&6; } | 13751 | +$as_echo "${lt_sysroot:-no}" >&6; } |
8321 | 13752 | ||
8322 | 13753 | ||
8323 | 13754 | ||
8324 | @@ -7939,6 +8319,123 @@ esac | 13755 | @@ -7563,6 +7939,123 @@ esac |
8325 | 13756 | ||
8326 | need_locks="$enable_libtool_lock" | 13757 | need_locks="$enable_libtool_lock" |
8327 | 13758 | ||
@@ -8445,7 +13876,7 @@ index 8355c433c76..a49ab3d1f09 100755 | |||
8445 | 13876 | ||
8446 | case $host_os in | 13877 | case $host_os in |
8447 | rhapsody* | darwin*) | 13878 | rhapsody* | darwin*) |
8448 | @@ -8502,6 +8999,8 @@ _LT_EOF | 13879 | @@ -8126,6 +8619,8 @@ _LT_EOF |
8449 | $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 | 13880 | $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 |
8450 | echo "$AR cru libconftest.a conftest.o" >&5 | 13881 | echo "$AR cru libconftest.a conftest.o" >&5 |
8451 | $AR cru libconftest.a conftest.o 2>&5 | 13882 | $AR cru libconftest.a conftest.o 2>&5 |
@@ -8454,7 +13885,7 @@ index 8355c433c76..a49ab3d1f09 100755 | |||
8454 | cat > conftest.c << _LT_EOF | 13885 | cat > conftest.c << _LT_EOF |
8455 | int main() { return 0;} | 13886 | int main() { return 0;} |
8456 | _LT_EOF | 13887 | _LT_EOF |
8457 | @@ -8570,6 +9069,16 @@ done | 13888 | @@ -8196,6 +8691,16 @@ done |
8458 | 13889 | ||
8459 | 13890 | ||
8460 | 13891 | ||
@@ -8471,26 +13902,7 @@ index 8355c433c76..a49ab3d1f09 100755 | |||
8471 | 13902 | ||
8472 | 13903 | ||
8473 | # Set options | 13904 | # Set options |
8474 | @@ -8698,7 +9207,8 @@ fi | 13905 | @@ -8711,8 +9216,6 @@ fi |
8475 | LIBTOOL_DEPS="$ltmain" | ||
8476 | |||
8477 | # Always use our own libtool. | ||
8478 | -LIBTOOL='$(SHELL) $(top_builddir)/libtool' | ||
8479 | +LIBTOOL='$(SHELL) $(top_builddir)' | ||
8480 | +LIBTOOL="$LIBTOOL/${host_alias}-libtool" | ||
8481 | |||
8482 | |||
8483 | |||
8484 | @@ -8787,7 +9297,7 @@ aix3*) | ||
8485 | esac | ||
8486 | |||
8487 | # Global variables: | ||
8488 | -ofile=libtool | ||
8489 | +ofile=${host_alias}-libtool | ||
8490 | can_build_shared=yes | ||
8491 | |||
8492 | # All known linkers require a `.a' archive for static linking (except MSVC, | ||
8493 | @@ -9085,8 +9595,6 @@ fi | ||
8494 | lt_prog_compiler_pic= | 13906 | lt_prog_compiler_pic= |
8495 | lt_prog_compiler_static= | 13907 | lt_prog_compiler_static= |
8496 | 13908 | ||
@@ -8499,7 +13911,7 @@ index 8355c433c76..a49ab3d1f09 100755 | |||
8499 | 13911 | ||
8500 | if test "$GCC" = yes; then | 13912 | if test "$GCC" = yes; then |
8501 | lt_prog_compiler_wl='-Wl,' | 13913 | lt_prog_compiler_wl='-Wl,' |
8502 | @@ -9252,6 +9760,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } | 13914 | @@ -8878,6 +9381,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } |
8503 | lt_prog_compiler_pic='--shared' | 13915 | lt_prog_compiler_pic='--shared' |
8504 | lt_prog_compiler_static='--static' | 13916 | lt_prog_compiler_static='--static' |
8505 | ;; | 13917 | ;; |
@@ -8512,7 +13924,7 @@ index 8355c433c76..a49ab3d1f09 100755 | |||
8512 | pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) | 13924 | pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) |
8513 | # Portland Group compilers (*not* the Pentium gcc compiler, | 13925 | # Portland Group compilers (*not* the Pentium gcc compiler, |
8514 | # which looks to be a dead project) | 13926 | # which looks to be a dead project) |
8515 | @@ -9314,7 +9828,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } | 13927 | @@ -8940,7 +9449,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } |
8516 | lt_prog_compiler_pic='-KPIC' | 13928 | lt_prog_compiler_pic='-KPIC' |
8517 | lt_prog_compiler_static='-Bstatic' | 13929 | lt_prog_compiler_static='-Bstatic' |
8518 | case $cc_basename in | 13930 | case $cc_basename in |
@@ -8521,7 +13933,7 @@ index 8355c433c76..a49ab3d1f09 100755 | |||
8521 | lt_prog_compiler_wl='-Qoption ld ';; | 13933 | lt_prog_compiler_wl='-Qoption ld ';; |
8522 | *) | 13934 | *) |
8523 | lt_prog_compiler_wl='-Wl,';; | 13935 | lt_prog_compiler_wl='-Wl,';; |
8524 | @@ -9371,13 +9885,17 @@ case $host_os in | 13936 | @@ -8997,13 +9506,17 @@ case $host_os in |
8525 | lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" | 13937 | lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" |
8526 | ;; | 13938 | ;; |
8527 | esac | 13939 | esac |
@@ -8545,7 +13957,7 @@ index 8355c433c76..a49ab3d1f09 100755 | |||
8545 | 13957 | ||
8546 | # | 13958 | # |
8547 | # Check to make sure the PIC flag actually works. | 13959 | # Check to make sure the PIC flag actually works. |
8548 | @@ -9438,6 +9956,11 @@ fi | 13960 | @@ -9064,6 +9577,11 @@ fi |
8549 | 13961 | ||
8550 | 13962 | ||
8551 | 13963 | ||
@@ -8557,7 +13969,7 @@ index 8355c433c76..a49ab3d1f09 100755 | |||
8557 | # | 13969 | # |
8558 | # Check to make sure the static flag actually works. | 13970 | # Check to make sure the static flag actually works. |
8559 | # | 13971 | # |
8560 | @@ -9788,7 +10311,8 @@ _LT_EOF | 13972 | @@ -9414,7 +9932,8 @@ _LT_EOF |
8561 | allow_undefined_flag=unsupported | 13973 | allow_undefined_flag=unsupported |
8562 | always_export_symbols=no | 13974 | always_export_symbols=no |
8563 | enable_shared_with_static_runtimes=yes | 13975 | enable_shared_with_static_runtimes=yes |
@@ -8567,7 +13979,7 @@ index 8355c433c76..a49ab3d1f09 100755 | |||
8567 | 13979 | ||
8568 | if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then | 13980 | if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then |
8569 | archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' | 13981 | archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' |
8570 | @@ -9887,12 +10411,12 @@ _LT_EOF | 13982 | @@ -9513,12 +10032,12 @@ _LT_EOF |
8571 | whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' | 13983 | whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' |
8572 | hardcode_libdir_flag_spec= | 13984 | hardcode_libdir_flag_spec= |
8573 | hardcode_libdir_flag_spec_ld='-rpath $libdir' | 13985 | hardcode_libdir_flag_spec_ld='-rpath $libdir' |
@@ -8582,7 +13994,7 @@ index 8355c433c76..a49ab3d1f09 100755 | |||
8582 | fi | 13994 | fi |
8583 | ;; | 13995 | ;; |
8584 | esac | 13996 | esac |
8585 | @@ -9906,8 +10430,8 @@ _LT_EOF | 13997 | @@ -9532,8 +10051,8 @@ _LT_EOF |
8586 | archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' | 13998 | archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' |
8587 | wlarc= | 13999 | wlarc= |
8588 | else | 14000 | else |
@@ -8593,7 +14005,7 @@ index 8355c433c76..a49ab3d1f09 100755 | |||
8593 | fi | 14005 | fi |
8594 | ;; | 14006 | ;; |
8595 | 14007 | ||
8596 | @@ -9925,8 +10449,8 @@ _LT_EOF | 14008 | @@ -9551,8 +10070,8 @@ _LT_EOF |
8597 | 14009 | ||
8598 | _LT_EOF | 14010 | _LT_EOF |
8599 | elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then | 14011 | elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then |
@@ -8604,7 +14016,7 @@ index 8355c433c76..a49ab3d1f09 100755 | |||
8604 | else | 14016 | else |
8605 | ld_shlibs=no | 14017 | ld_shlibs=no |
8606 | fi | 14018 | fi |
8607 | @@ -9972,8 +10496,8 @@ _LT_EOF | 14019 | @@ -9598,8 +10117,8 @@ _LT_EOF |
8608 | 14020 | ||
8609 | *) | 14021 | *) |
8610 | if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then | 14022 | if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then |
@@ -8615,7 +14027,7 @@ index 8355c433c76..a49ab3d1f09 100755 | |||
8615 | else | 14027 | else |
8616 | ld_shlibs=no | 14028 | ld_shlibs=no |
8617 | fi | 14029 | fi |
8618 | @@ -10103,7 +10627,13 @@ _LT_EOF | 14030 | @@ -9729,7 +10248,13 @@ _LT_EOF |
8619 | allow_undefined_flag='-berok' | 14031 | allow_undefined_flag='-berok' |
8620 | # Determine the default libpath from the value encoded in an | 14032 | # Determine the default libpath from the value encoded in an |
8621 | # empty executable. | 14033 | # empty executable. |
@@ -8630,7 +14042,7 @@ index 8355c433c76..a49ab3d1f09 100755 | |||
8630 | /* end confdefs.h. */ | 14042 | /* end confdefs.h. */ |
8631 | 14043 | ||
8632 | int | 14044 | int |
8633 | @@ -10116,22 +10646,29 @@ main () | 14045 | @@ -9742,22 +10267,29 @@ main () |
8634 | _ACEOF | 14046 | _ACEOF |
8635 | if ac_fn_c_try_link "$LINENO"; then : | 14047 | if ac_fn_c_try_link "$LINENO"; then : |
8636 | 14048 | ||
@@ -8673,7 +14085,7 @@ index 8355c433c76..a49ab3d1f09 100755 | |||
8673 | 14085 | ||
8674 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" | 14086 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" |
8675 | archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" | 14087 | archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" |
8676 | @@ -10143,7 +10680,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | 14088 | @@ -9769,7 +10301,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
8677 | else | 14089 | else |
8678 | # Determine the default libpath from the value encoded in an | 14090 | # Determine the default libpath from the value encoded in an |
8679 | # empty executable. | 14091 | # empty executable. |
@@ -8688,7 +14100,7 @@ index 8355c433c76..a49ab3d1f09 100755 | |||
8688 | /* end confdefs.h. */ | 14100 | /* end confdefs.h. */ |
8689 | 14101 | ||
8690 | int | 14102 | int |
8691 | @@ -10156,22 +10699,29 @@ main () | 14103 | @@ -9782,22 +10320,29 @@ main () |
8692 | _ACEOF | 14104 | _ACEOF |
8693 | if ac_fn_c_try_link "$LINENO"; then : | 14105 | if ac_fn_c_try_link "$LINENO"; then : |
8694 | 14106 | ||
@@ -8731,11 +14143,10 @@ index 8355c433c76..a49ab3d1f09 100755 | |||
8731 | 14143 | ||
8732 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" | 14144 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" |
8733 | # Warning - without using the other run time loading flags, | 14145 | # Warning - without using the other run time loading flags, |
8734 | @@ -10215,21 +10765,64 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | 14146 | @@ -9842,20 +10387,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
8735 | # When not using gcc, we currently assume that we are using | ||
8736 | # Microsoft Visual C++. | 14147 | # Microsoft Visual C++. |
8737 | # hardcode_libdir_flag_spec is actually meaningless, as there is | 14148 | # hardcode_libdir_flag_spec is actually meaningless, as there is |
8738 | - # no search path for DLLs. | 14149 | # no search path for DLLs. |
8739 | - hardcode_libdir_flag_spec=' ' | 14150 | - hardcode_libdir_flag_spec=' ' |
8740 | - allow_undefined_flag=unsupported | 14151 | - allow_undefined_flag=unsupported |
8741 | - # Tell ltmain to make .lib files, not .a files. | 14152 | - # Tell ltmain to make .lib files, not .a files. |
@@ -8750,7 +14161,6 @@ index 8355c433c76..a49ab3d1f09 100755 | |||
8750 | - old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' | 14161 | - old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' |
8751 | - fix_srcfile_path='`cygpath -w "$srcfile"`' | 14162 | - fix_srcfile_path='`cygpath -w "$srcfile"`' |
8752 | - enable_shared_with_static_runtimes=yes | 14163 | - enable_shared_with_static_runtimes=yes |
8753 | + # no search path for DLLs. | ||
8754 | + case $cc_basename in | 14164 | + case $cc_basename in |
8755 | + cl*) | 14165 | + cl*) |
8756 | + # Native MSVC | 14166 | + # Native MSVC |
@@ -8811,7 +14221,7 @@ index 8355c433c76..a49ab3d1f09 100755 | |||
8811 | ;; | 14221 | ;; |
8812 | 14222 | ||
8813 | darwin* | rhapsody*) | 14223 | darwin* | rhapsody*) |
8814 | @@ -10290,7 +10883,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | 14224 | @@ -9916,7 +10504,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
8815 | 14225 | ||
8816 | # FreeBSD 3 and greater uses gcc -shared to do shared libraries. | 14226 | # FreeBSD 3 and greater uses gcc -shared to do shared libraries. |
8817 | freebsd* | dragonfly*) | 14227 | freebsd* | dragonfly*) |
@@ -8820,7 +14230,7 @@ index 8355c433c76..a49ab3d1f09 100755 | |||
8820 | hardcode_libdir_flag_spec='-R$libdir' | 14230 | hardcode_libdir_flag_spec='-R$libdir' |
8821 | hardcode_direct=yes | 14231 | hardcode_direct=yes |
8822 | hardcode_shlibpath_var=no | 14232 | hardcode_shlibpath_var=no |
8823 | @@ -10298,7 +10891,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | 14233 | @@ -9924,7 +10512,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
8824 | 14234 | ||
8825 | hpux9*) | 14235 | hpux9*) |
8826 | if test "$GCC" = yes; then | 14236 | if test "$GCC" = yes; then |
@@ -8829,7 +14239,7 @@ index 8355c433c76..a49ab3d1f09 100755 | |||
8829 | else | 14239 | else |
8830 | archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' | 14240 | archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' |
8831 | fi | 14241 | fi |
8832 | @@ -10314,7 +10907,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | 14242 | @@ -9940,7 +10528,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
8833 | 14243 | ||
8834 | hpux10*) | 14244 | hpux10*) |
8835 | if test "$GCC" = yes && test "$with_gnu_ld" = no; then | 14245 | if test "$GCC" = yes && test "$with_gnu_ld" = no; then |
@@ -8838,8 +14248,8 @@ index 8355c433c76..a49ab3d1f09 100755 | |||
8838 | else | 14248 | else |
8839 | archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' | 14249 | archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' |
8840 | fi | 14250 | fi |
8841 | @@ -10338,10 +10931,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | 14251 | @@ -9964,10 +10552,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
8842 | archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' | 14252 | archive_cmds='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' |
8843 | ;; | 14253 | ;; |
8844 | ia64*) | 14254 | ia64*) |
8845 | - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' | 14255 | - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' |
@@ -8851,7 +14261,7 @@ index 8355c433c76..a49ab3d1f09 100755 | |||
8851 | ;; | 14261 | ;; |
8852 | esac | 14262 | esac |
8853 | else | 14263 | else |
8854 | @@ -10420,23 +11013,36 @@ fi | 14264 | @@ -10046,23 +10634,36 @@ fi |
8855 | 14265 | ||
8856 | irix5* | irix6* | nonstopux*) | 14266 | irix5* | irix6* | nonstopux*) |
8857 | if test "$GCC" = yes; then | 14267 | if test "$GCC" = yes; then |
@@ -8896,7 +14306,7 @@ index 8355c433c76..a49ab3d1f09 100755 | |||
8896 | else | 14306 | else |
8897 | archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' | 14307 | archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' |
8898 | archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' | 14308 | archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' |
8899 | @@ -10521,7 +11127,7 @@ rm -f core conftest.err conftest.$ac_objext \ | 14309 | @@ -10147,7 +10748,7 @@ rm -f core conftest.err conftest.$ac_objext \ |
8900 | osf4* | osf5*) # as osf3* with the addition of -msym flag | 14310 | osf4* | osf5*) # as osf3* with the addition of -msym flag |
8901 | if test "$GCC" = yes; then | 14311 | if test "$GCC" = yes; then |
8902 | allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' | 14312 | allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' |
@@ -8905,7 +14315,7 @@ index 8355c433c76..a49ab3d1f09 100755 | |||
8905 | hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' | 14315 | hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' |
8906 | else | 14316 | else |
8907 | allow_undefined_flag=' -expect_unresolved \*' | 14317 | allow_undefined_flag=' -expect_unresolved \*' |
8908 | @@ -10540,9 +11146,9 @@ rm -f core conftest.err conftest.$ac_objext \ | 14318 | @@ -10166,9 +10767,9 @@ rm -f core conftest.err conftest.$ac_objext \ |
8909 | no_undefined_flag=' -z defs' | 14319 | no_undefined_flag=' -z defs' |
8910 | if test "$GCC" = yes; then | 14320 | if test "$GCC" = yes; then |
8911 | wlarc='${wl}' | 14321 | wlarc='${wl}' |
@@ -8917,7 +14327,7 @@ index 8355c433c76..a49ab3d1f09 100755 | |||
8917 | else | 14327 | else |
8918 | case `$CC -V 2>&1` in | 14328 | case `$CC -V 2>&1` in |
8919 | *"Compilers 5.0"*) | 14329 | *"Compilers 5.0"*) |
8920 | @@ -11118,8 +11724,9 @@ cygwin* | mingw* | pw32* | cegcc*) | 14330 | @@ -10744,8 +11345,9 @@ cygwin* | mingw* | pw32* | cegcc*) |
8921 | need_version=no | 14331 | need_version=no |
8922 | need_lib_prefix=no | 14332 | need_lib_prefix=no |
8923 | 14333 | ||
@@ -8929,7 +14339,7 @@ index 8355c433c76..a49ab3d1f09 100755 | |||
8929 | library_names_spec='$libname.dll.a' | 14339 | library_names_spec='$libname.dll.a' |
8930 | # DLL is installed to $(libdir)/../bin by postinstall_cmds | 14340 | # DLL is installed to $(libdir)/../bin by postinstall_cmds |
8931 | postinstall_cmds='base_file=`basename \${file}`~ | 14341 | postinstall_cmds='base_file=`basename \${file}`~ |
8932 | @@ -11152,13 +11759,71 @@ cygwin* | mingw* | pw32* | cegcc*) | 14342 | @@ -10778,13 +11380,71 @@ cygwin* | mingw* | pw32* | cegcc*) |
8933 | library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' | 14343 | library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' |
8934 | ;; | 14344 | ;; |
8935 | esac | 14345 | esac |
@@ -9002,25 +14412,16 @@ index 8355c433c76..a49ab3d1f09 100755 | |||
9002 | # FIXME: first we should search . and the directory the executable is in | 14412 | # FIXME: first we should search . and the directory the executable is in |
9003 | shlibpath_var=PATH | 14413 | shlibpath_var=PATH |
9004 | ;; | 14414 | ;; |
9005 | @@ -11240,7 +11905,7 @@ haiku*) | 14415 | @@ -11686,7 +12346,7 @@ else |
9006 | soname_spec='${libname}${release}${shared_ext}$major' | ||
9007 | shlibpath_var=LIBRARY_PATH | ||
9008 | shlibpath_overrides_runpath=yes | ||
9009 | - sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib' | ||
9010 | + sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' | ||
9011 | hardcode_into_libs=yes | ||
9012 | ;; | ||
9013 | |||
9014 | @@ -12036,7 +12701,7 @@ else | ||
9015 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 | 14416 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 |
9016 | lt_status=$lt_dlunknown | 14417 | lt_status=$lt_dlunknown |
9017 | cat > conftest.$ac_ext <<_LT_EOF | 14418 | cat > conftest.$ac_ext <<_LT_EOF |
9018 | -#line 12036 "configure" | 14419 | -#line 11686 "configure" |
9019 | +#line $LINENO "configure" | 14420 | +#line $LINENO "configure" |
9020 | #include "confdefs.h" | 14421 | #include "confdefs.h" |
9021 | 14422 | ||
9022 | #if HAVE_DLFCN_H | 14423 | #if HAVE_DLFCN_H |
9023 | @@ -12080,10 +12745,10 @@ else | 14424 | @@ -11730,10 +12390,10 @@ else |
9024 | /* When -fvisbility=hidden is used, assume the code has been annotated | 14425 | /* When -fvisbility=hidden is used, assume the code has been annotated |
9025 | correspondingly for the symbols needed. */ | 14426 | correspondingly for the symbols needed. */ |
9026 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) | 14427 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) |
@@ -9033,16 +14434,16 @@ index 8355c433c76..a49ab3d1f09 100755 | |||
9033 | int main () | 14434 | int main () |
9034 | { | 14435 | { |
9035 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); | 14436 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); |
9036 | @@ -12142,7 +12807,7 @@ else | 14437 | @@ -11792,7 +12452,7 @@ else |
9037 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 | 14438 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 |
9038 | lt_status=$lt_dlunknown | 14439 | lt_status=$lt_dlunknown |
9039 | cat > conftest.$ac_ext <<_LT_EOF | 14440 | cat > conftest.$ac_ext <<_LT_EOF |
9040 | -#line 12142 "configure" | 14441 | -#line 11792 "configure" |
9041 | +#line $LINENO "configure" | 14442 | +#line $LINENO "configure" |
9042 | #include "confdefs.h" | 14443 | #include "confdefs.h" |
9043 | 14444 | ||
9044 | #if HAVE_DLFCN_H | 14445 | #if HAVE_DLFCN_H |
9045 | @@ -12186,10 +12851,10 @@ else | 14446 | @@ -11836,10 +12496,10 @@ else |
9046 | /* When -fvisbility=hidden is used, assume the code has been annotated | 14447 | /* When -fvisbility=hidden is used, assume the code has been annotated |
9047 | correspondingly for the symbols needed. */ | 14448 | correspondingly for the symbols needed. */ |
9048 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) | 14449 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) |
@@ -9055,7 +14456,7 @@ index 8355c433c76..a49ab3d1f09 100755 | |||
9055 | int main () | 14456 | int main () |
9056 | { | 14457 | { |
9057 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); | 14458 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); |
9058 | @@ -12581,6 +13246,7 @@ $RM -r conftest* | 14459 | @@ -12231,6 +12891,7 @@ $RM -r conftest* |
9059 | 14460 | ||
9060 | # Allow CC to be a program name with arguments. | 14461 | # Allow CC to be a program name with arguments. |
9061 | lt_save_CC=$CC | 14462 | lt_save_CC=$CC |
@@ -9063,7 +14464,7 @@ index 8355c433c76..a49ab3d1f09 100755 | |||
9063 | lt_save_LD=$LD | 14464 | lt_save_LD=$LD |
9064 | lt_save_GCC=$GCC | 14465 | lt_save_GCC=$GCC |
9065 | GCC=$GXX | 14466 | GCC=$GXX |
9066 | @@ -12598,6 +13264,7 @@ $RM -r conftest* | 14467 | @@ -12248,6 +12909,7 @@ $RM -r conftest* |
9067 | fi | 14468 | fi |
9068 | test -z "${LDCXX+set}" || LD=$LDCXX | 14469 | test -z "${LDCXX+set}" || LD=$LDCXX |
9069 | CC=${CXX-"c++"} | 14470 | CC=${CXX-"c++"} |
@@ -9071,7 +14472,7 @@ index 8355c433c76..a49ab3d1f09 100755 | |||
9071 | compiler=$CC | 14472 | compiler=$CC |
9072 | compiler_CXX=$CC | 14473 | compiler_CXX=$CC |
9073 | for cc_temp in $compiler""; do | 14474 | for cc_temp in $compiler""; do |
9074 | @@ -12880,7 +13547,13 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie | 14475 | @@ -12530,7 +13192,13 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie |
9075 | allow_undefined_flag_CXX='-berok' | 14476 | allow_undefined_flag_CXX='-berok' |
9076 | # Determine the default libpath from the value encoded in an empty | 14477 | # Determine the default libpath from the value encoded in an empty |
9077 | # executable. | 14478 | # executable. |
@@ -9086,7 +14487,7 @@ index 8355c433c76..a49ab3d1f09 100755 | |||
9086 | /* end confdefs.h. */ | 14487 | /* end confdefs.h. */ |
9087 | 14488 | ||
9088 | int | 14489 | int |
9089 | @@ -12893,22 +13566,29 @@ main () | 14490 | @@ -12543,22 +13211,29 @@ main () |
9090 | _ACEOF | 14491 | _ACEOF |
9091 | if ac_fn_cxx_try_link "$LINENO"; then : | 14492 | if ac_fn_cxx_try_link "$LINENO"; then : |
9092 | 14493 | ||
@@ -9129,7 +14530,7 @@ index 8355c433c76..a49ab3d1f09 100755 | |||
9129 | 14530 | ||
9130 | hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" | 14531 | hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" |
9131 | 14532 | ||
9132 | @@ -12921,7 +13601,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | 14533 | @@ -12571,7 +13246,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
9133 | else | 14534 | else |
9134 | # Determine the default libpath from the value encoded in an | 14535 | # Determine the default libpath from the value encoded in an |
9135 | # empty executable. | 14536 | # empty executable. |
@@ -9144,7 +14545,7 @@ index 8355c433c76..a49ab3d1f09 100755 | |||
9144 | /* end confdefs.h. */ | 14545 | /* end confdefs.h. */ |
9145 | 14546 | ||
9146 | int | 14547 | int |
9147 | @@ -12934,22 +13620,29 @@ main () | 14548 | @@ -12584,22 +13265,29 @@ main () |
9148 | _ACEOF | 14549 | _ACEOF |
9149 | if ac_fn_cxx_try_link "$LINENO"; then : | 14550 | if ac_fn_cxx_try_link "$LINENO"; then : |
9150 | 14551 | ||
@@ -9187,7 +14588,7 @@ index 8355c433c76..a49ab3d1f09 100755 | |||
9187 | 14588 | ||
9188 | hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" | 14589 | hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" |
9189 | # Warning - without using the other run time loading flags, | 14590 | # Warning - without using the other run time loading flags, |
9190 | @@ -12992,29 +13685,75 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | 14591 | @@ -12642,29 +13330,75 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
9191 | ;; | 14592 | ;; |
9192 | 14593 | ||
9193 | cygwin* | mingw* | pw32* | cegcc*) | 14594 | cygwin* | mingw* | pw32* | cegcc*) |
@@ -9286,7 +14687,7 @@ index 8355c433c76..a49ab3d1f09 100755 | |||
9286 | darwin* | rhapsody*) | 14687 | darwin* | rhapsody*) |
9287 | 14688 | ||
9288 | 14689 | ||
9289 | @@ -13120,7 +13859,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | 14690 | @@ -12770,7 +13504,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
9290 | ;; | 14691 | ;; |
9291 | *) | 14692 | *) |
9292 | if test "$GXX" = yes; then | 14693 | if test "$GXX" = yes; then |
@@ -9295,8 +14696,8 @@ index 8355c433c76..a49ab3d1f09 100755 | |||
9295 | else | 14696 | else |
9296 | # FIXME: insert proper C++ library support | 14697 | # FIXME: insert proper C++ library support |
9297 | ld_shlibs_CXX=no | 14698 | ld_shlibs_CXX=no |
9298 | @@ -13191,10 +13930,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | 14699 | @@ -12841,10 +13575,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
9299 | archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' | 14700 | archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' |
9300 | ;; | 14701 | ;; |
9301 | ia64*) | 14702 | ia64*) |
9302 | - archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' | 14703 | - archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' |
@@ -9308,7 +14709,7 @@ index 8355c433c76..a49ab3d1f09 100755 | |||
9308 | ;; | 14709 | ;; |
9309 | esac | 14710 | esac |
9310 | fi | 14711 | fi |
9311 | @@ -13235,9 +13974,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | 14712 | @@ -12885,9 +13619,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
9312 | *) | 14713 | *) |
9313 | if test "$GXX" = yes; then | 14714 | if test "$GXX" = yes; then |
9314 | if test "$with_gnu_ld" = no; then | 14715 | if test "$with_gnu_ld" = no; then |
@@ -9320,32 +14721,7 @@ index 8355c433c76..a49ab3d1f09 100755 | |||
9320 | fi | 14721 | fi |
9321 | fi | 14722 | fi |
9322 | link_all_deplibs_CXX=yes | 14723 | link_all_deplibs_CXX=yes |
9323 | @@ -13307,20 +14046,20 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | 14724 | @@ -13165,7 +13899,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
9324 | prelink_cmds_CXX='tpldir=Template.dir~ | ||
9325 | rm -rf $tpldir~ | ||
9326 | $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ | ||
9327 | - compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"' | ||
9328 | + compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"' | ||
9329 | old_archive_cmds_CXX='tpldir=Template.dir~ | ||
9330 | rm -rf $tpldir~ | ||
9331 | $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~ | ||
9332 | - $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~ | ||
9333 | + $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~ | ||
9334 | $RANLIB $oldlib' | ||
9335 | archive_cmds_CXX='tpldir=Template.dir~ | ||
9336 | rm -rf $tpldir~ | ||
9337 | $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ | ||
9338 | - $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' | ||
9339 | + $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' | ||
9340 | archive_expsym_cmds_CXX='tpldir=Template.dir~ | ||
9341 | rm -rf $tpldir~ | ||
9342 | $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ | ||
9343 | - $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' | ||
9344 | + $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' | ||
9345 | ;; | ||
9346 | *) # Version 6 and above use weak symbols | ||
9347 | archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' | ||
9348 | @@ -13515,7 +14254,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | ||
9349 | archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' | 14725 | archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' |
9350 | ;; | 14726 | ;; |
9351 | *) | 14727 | *) |
@@ -9354,7 +14730,7 @@ index 8355c433c76..a49ab3d1f09 100755 | |||
9354 | ;; | 14730 | ;; |
9355 | esac | 14731 | esac |
9356 | 14732 | ||
9357 | @@ -13561,7 +14300,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | 14733 | @@ -13211,7 +13945,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
9358 | 14734 | ||
9359 | solaris*) | 14735 | solaris*) |
9360 | case $cc_basename in | 14736 | case $cc_basename in |
@@ -9363,7 +14739,7 @@ index 8355c433c76..a49ab3d1f09 100755 | |||
9363 | # Sun C++ 4.2, 5.x and Centerline C++ | 14739 | # Sun C++ 4.2, 5.x and Centerline C++ |
9364 | archive_cmds_need_lc_CXX=yes | 14740 | archive_cmds_need_lc_CXX=yes |
9365 | no_undefined_flag_CXX=' -zdefs' | 14741 | no_undefined_flag_CXX=' -zdefs' |
9366 | @@ -13602,9 +14341,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | 14742 | @@ -13252,9 +13986,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
9367 | if test "$GXX" = yes && test "$with_gnu_ld" = no; then | 14743 | if test "$GXX" = yes && test "$with_gnu_ld" = no; then |
9368 | no_undefined_flag_CXX=' ${wl}-z ${wl}defs' | 14744 | no_undefined_flag_CXX=' ${wl}-z ${wl}defs' |
9369 | if $CC --version | $GREP -v '^2\.7' > /dev/null; then | 14745 | if $CC --version | $GREP -v '^2\.7' > /dev/null; then |
@@ -9375,7 +14751,7 @@ index 8355c433c76..a49ab3d1f09 100755 | |||
9375 | 14751 | ||
9376 | # Commands to make compiler produce verbose output that lists | 14752 | # Commands to make compiler produce verbose output that lists |
9377 | # what "hidden" libraries, object files and flags are used when | 14753 | # what "hidden" libraries, object files and flags are used when |
9378 | @@ -13739,6 +14478,13 @@ private: | 14754 | @@ -13390,6 +14124,13 @@ private: |
9379 | }; | 14755 | }; |
9380 | _LT_EOF | 14756 | _LT_EOF |
9381 | 14757 | ||
@@ -9389,7 +14765,7 @@ index 8355c433c76..a49ab3d1f09 100755 | |||
9389 | if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 | 14765 | if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 |
9390 | (eval $ac_compile) 2>&5 | 14766 | (eval $ac_compile) 2>&5 |
9391 | ac_status=$? | 14767 | ac_status=$? |
9392 | @@ -13752,7 +14498,7 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 | 14768 | @@ -13403,7 +14144,7 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 |
9393 | pre_test_object_deps_done=no | 14769 | pre_test_object_deps_done=no |
9394 | 14770 | ||
9395 | for p in `eval "$output_verbose_link_cmd"`; do | 14771 | for p in `eval "$output_verbose_link_cmd"`; do |
@@ -9398,7 +14774,7 @@ index 8355c433c76..a49ab3d1f09 100755 | |||
9398 | 14774 | ||
9399 | -L* | -R* | -l*) | 14775 | -L* | -R* | -l*) |
9400 | # Some compilers place space between "-{L,R}" and the path. | 14776 | # Some compilers place space between "-{L,R}" and the path. |
9401 | @@ -13761,13 +14507,22 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 | 14777 | @@ -13412,13 +14153,22 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 |
9402 | test $p = "-R"; then | 14778 | test $p = "-R"; then |
9403 | prev=$p | 14779 | prev=$p |
9404 | continue | 14780 | continue |
@@ -9425,7 +14801,7 @@ index 8355c433c76..a49ab3d1f09 100755 | |||
9425 | # Internal compiler library paths should come after those | 14801 | # Internal compiler library paths should come after those |
9426 | # provided the user. The postdeps already come after the | 14802 | # provided the user. The postdeps already come after the |
9427 | # user supplied libs so there is no need to process them. | 14803 | # user supplied libs so there is no need to process them. |
9428 | @@ -13787,8 +14542,10 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 | 14804 | @@ -13438,8 +14188,10 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 |
9429 | postdeps_CXX="${postdeps_CXX} ${prev}${p}" | 14805 | postdeps_CXX="${postdeps_CXX} ${prev}${p}" |
9430 | fi | 14806 | fi |
9431 | fi | 14807 | fi |
@@ -9436,7 +14812,7 @@ index 8355c433c76..a49ab3d1f09 100755 | |||
9436 | *.$objext) | 14812 | *.$objext) |
9437 | # This assumes that the test object file only shows up | 14813 | # This assumes that the test object file only shows up |
9438 | # once in the compiler output. | 14814 | # once in the compiler output. |
9439 | @@ -13824,6 +14581,7 @@ else | 14815 | @@ -13475,6 +14227,7 @@ else |
9440 | fi | 14816 | fi |
9441 | 14817 | ||
9442 | $RM -f confest.$objext | 14818 | $RM -f confest.$objext |
@@ -9444,7 +14820,7 @@ index 8355c433c76..a49ab3d1f09 100755 | |||
9444 | 14820 | ||
9445 | # PORTME: override above test on systems where it is broken | 14821 | # PORTME: override above test on systems where it is broken |
9446 | case $host_os in | 14822 | case $host_os in |
9447 | @@ -13859,7 +14617,7 @@ linux*) | 14823 | @@ -13510,7 +14263,7 @@ linux*) |
9448 | 14824 | ||
9449 | solaris*) | 14825 | solaris*) |
9450 | case $cc_basename in | 14826 | case $cc_basename in |
@@ -9453,7 +14829,7 @@ index 8355c433c76..a49ab3d1f09 100755 | |||
9453 | # The more standards-conforming stlport4 library is | 14829 | # The more standards-conforming stlport4 library is |
9454 | # incompatible with the Cstd library. Avoid specifying | 14830 | # incompatible with the Cstd library. Avoid specifying |
9455 | # it if it's in CXXFLAGS. Ignore libCrun as | 14831 | # it if it's in CXXFLAGS. Ignore libCrun as |
9456 | @@ -13924,8 +14682,6 @@ fi | 14832 | @@ -13575,8 +14328,6 @@ fi |
9457 | lt_prog_compiler_pic_CXX= | 14833 | lt_prog_compiler_pic_CXX= |
9458 | lt_prog_compiler_static_CXX= | 14834 | lt_prog_compiler_static_CXX= |
9459 | 14835 | ||
@@ -9462,7 +14838,7 @@ index 8355c433c76..a49ab3d1f09 100755 | |||
9462 | 14838 | ||
9463 | # C++ specific cases for pic, static, wl, etc. | 14839 | # C++ specific cases for pic, static, wl, etc. |
9464 | if test "$GXX" = yes; then | 14840 | if test "$GXX" = yes; then |
9465 | @@ -14030,6 +14786,11 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } | 14841 | @@ -13681,6 +14432,11 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } |
9466 | ;; | 14842 | ;; |
9467 | esac | 14843 | esac |
9468 | ;; | 14844 | ;; |
@@ -9474,7 +14850,7 @@ index 8355c433c76..a49ab3d1f09 100755 | |||
9474 | dgux*) | 14850 | dgux*) |
9475 | case $cc_basename in | 14851 | case $cc_basename in |
9476 | ec++*) | 14852 | ec++*) |
9477 | @@ -14182,7 +14943,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } | 14853 | @@ -13833,7 +14589,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } |
9478 | ;; | 14854 | ;; |
9479 | solaris*) | 14855 | solaris*) |
9480 | case $cc_basename in | 14856 | case $cc_basename in |
@@ -9483,7 +14859,7 @@ index 8355c433c76..a49ab3d1f09 100755 | |||
9483 | # Sun C++ 4.2, 5.x and Centerline C++ | 14859 | # Sun C++ 4.2, 5.x and Centerline C++ |
9484 | lt_prog_compiler_pic_CXX='-KPIC' | 14860 | lt_prog_compiler_pic_CXX='-KPIC' |
9485 | lt_prog_compiler_static_CXX='-Bstatic' | 14861 | lt_prog_compiler_static_CXX='-Bstatic' |
9486 | @@ -14247,10 +15008,17 @@ case $host_os in | 14862 | @@ -13898,10 +14654,17 @@ case $host_os in |
9487 | lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC" | 14863 | lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC" |
9488 | ;; | 14864 | ;; |
9489 | esac | 14865 | esac |
@@ -9504,7 +14880,7 @@ index 8355c433c76..a49ab3d1f09 100755 | |||
9504 | 14880 | ||
9505 | # | 14881 | # |
9506 | # Check to make sure the PIC flag actually works. | 14882 | # Check to make sure the PIC flag actually works. |
9507 | @@ -14308,6 +15076,8 @@ fi | 14883 | @@ -13959,6 +14722,8 @@ fi |
9508 | 14884 | ||
9509 | 14885 | ||
9510 | 14886 | ||
@@ -9513,7 +14889,7 @@ index 8355c433c76..a49ab3d1f09 100755 | |||
9513 | # | 14889 | # |
9514 | # Check to make sure the static flag actually works. | 14890 | # Check to make sure the static flag actually works. |
9515 | # | 14891 | # |
9516 | @@ -14485,6 +15255,7 @@ fi | 14892 | @@ -14136,6 +14901,7 @@ fi |
9517 | $as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } | 14893 | $as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } |
9518 | 14894 | ||
9519 | export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' | 14895 | export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' |
@@ -9521,7 +14897,7 @@ index 8355c433c76..a49ab3d1f09 100755 | |||
9521 | case $host_os in | 14897 | case $host_os in |
9522 | aix[4-9]*) | 14898 | aix[4-9]*) |
9523 | # If we're using GNU nm, then we don't want the "-C" option. | 14899 | # If we're using GNU nm, then we don't want the "-C" option. |
9524 | @@ -14499,15 +15270,20 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie | 14900 | @@ -14150,15 +14916,20 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie |
9525 | ;; | 14901 | ;; |
9526 | pw32*) | 14902 | pw32*) |
9527 | export_symbols_cmds_CXX="$ltdll_cmds" | 14903 | export_symbols_cmds_CXX="$ltdll_cmds" |
@@ -9547,7 +14923,7 @@ index 8355c433c76..a49ab3d1f09 100755 | |||
9547 | 14923 | ||
9548 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5 | 14924 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5 |
9549 | $as_echo "$ld_shlibs_CXX" >&6; } | 14925 | $as_echo "$ld_shlibs_CXX" >&6; } |
9550 | @@ -14770,8 +15546,9 @@ cygwin* | mingw* | pw32* | cegcc*) | 14926 | @@ -14421,8 +15192,9 @@ cygwin* | mingw* | pw32* | cegcc*) |
9551 | need_version=no | 14927 | need_version=no |
9552 | need_lib_prefix=no | 14928 | need_lib_prefix=no |
9553 | 14929 | ||
@@ -9559,7 +14935,7 @@ index 8355c433c76..a49ab3d1f09 100755 | |||
9559 | library_names_spec='$libname.dll.a' | 14935 | library_names_spec='$libname.dll.a' |
9560 | # DLL is installed to $(libdir)/../bin by postinstall_cmds | 14936 | # DLL is installed to $(libdir)/../bin by postinstall_cmds |
9561 | postinstall_cmds='base_file=`basename \${file}`~ | 14937 | postinstall_cmds='base_file=`basename \${file}`~ |
9562 | @@ -14803,13 +15580,71 @@ cygwin* | mingw* | pw32* | cegcc*) | 14938 | @@ -14454,13 +15226,71 @@ cygwin* | mingw* | pw32* | cegcc*) |
9563 | library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' | 14939 | library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' |
9564 | ;; | 14940 | ;; |
9565 | esac | 14941 | esac |
@@ -9632,16 +15008,7 @@ index 8355c433c76..a49ab3d1f09 100755 | |||
9632 | # FIXME: first we should search . and the directory the executable is in | 15008 | # FIXME: first we should search . and the directory the executable is in |
9633 | shlibpath_var=PATH | 15009 | shlibpath_var=PATH |
9634 | ;; | 15010 | ;; |
9635 | @@ -14890,7 +15725,7 @@ haiku*) | 15011 | @@ -15024,6 +15854,7 @@ fi |
9636 | soname_spec='${libname}${release}${shared_ext}$major' | ||
9637 | shlibpath_var=LIBRARY_PATH | ||
9638 | shlibpath_overrides_runpath=yes | ||
9639 | - sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib' | ||
9640 | + sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' | ||
9641 | hardcode_into_libs=yes | ||
9642 | ;; | ||
9643 | |||
9644 | @@ -15349,6 +16184,7 @@ fi | ||
9645 | fi # test -n "$compiler" | 15012 | fi # test -n "$compiler" |
9646 | 15013 | ||
9647 | CC=$lt_save_CC | 15014 | CC=$lt_save_CC |
@@ -9649,7 +15016,7 @@ index 8355c433c76..a49ab3d1f09 100755 | |||
9649 | LDCXX=$LD | 15016 | LDCXX=$LD |
9650 | LD=$lt_save_LD | 15017 | LD=$lt_save_LD |
9651 | GCC=$lt_save_GCC | 15018 | GCC=$lt_save_GCC |
9652 | @@ -18612,13 +19448,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' | 15019 | @@ -20310,13 +21141,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' |
9653 | lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' | 15020 | lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' |
9654 | lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' | 15021 | lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' |
9655 | lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' | 15022 | lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' |
@@ -9670,7 +15037,7 @@ index 8355c433c76..a49ab3d1f09 100755 | |||
9670 | STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' | 15037 | STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' |
9671 | RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' | 15038 | RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' |
9672 | old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' | 15039 | old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' |
9673 | @@ -18633,14 +19476,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de | 15040 | @@ -20331,14 +21169,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de |
9674 | lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' | 15041 | lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' |
9675 | lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' | 15042 | lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' |
9676 | lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`' | 15043 | lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`' |
@@ -9689,7 +15056,7 @@ index 8355c433c76..a49ab3d1f09 100755 | |||
9689 | DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' | 15056 | DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' |
9690 | NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' | 15057 | NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' |
9691 | LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' | 15058 | LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' |
9692 | @@ -18673,12 +19519,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q | 15059 | @@ -20371,12 +21212,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q |
9693 | hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' | 15060 | hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' |
9694 | inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' | 15061 | inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' |
9695 | link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' | 15062 | link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' |
@@ -9703,7 +15070,7 @@ index 8355c433c76..a49ab3d1f09 100755 | |||
9703 | file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' | 15070 | file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' |
9704 | variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' | 15071 | variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' |
9705 | need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' | 15072 | need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' |
9706 | @@ -18717,8 +19563,8 @@ old_archive_cmds_CXX='`$ECHO "$old_archive_cmds_CXX" | $SED "$delay_single_quote | 15073 | @@ -20415,8 +21256,8 @@ old_archive_cmds_CXX='`$ECHO "$old_archive_cmds_CXX" | $SED "$delay_single_quote |
9707 | compiler_CXX='`$ECHO "$compiler_CXX" | $SED "$delay_single_quote_subst"`' | 15074 | compiler_CXX='`$ECHO "$compiler_CXX" | $SED "$delay_single_quote_subst"`' |
9708 | GCC_CXX='`$ECHO "$GCC_CXX" | $SED "$delay_single_quote_subst"`' | 15075 | GCC_CXX='`$ECHO "$GCC_CXX" | $SED "$delay_single_quote_subst"`' |
9709 | lt_prog_compiler_no_builtin_flag_CXX='`$ECHO "$lt_prog_compiler_no_builtin_flag_CXX" | $SED "$delay_single_quote_subst"`' | 15076 | lt_prog_compiler_no_builtin_flag_CXX='`$ECHO "$lt_prog_compiler_no_builtin_flag_CXX" | $SED "$delay_single_quote_subst"`' |
@@ -9713,7 +15080,7 @@ index 8355c433c76..a49ab3d1f09 100755 | |||
9713 | lt_prog_compiler_static_CXX='`$ECHO "$lt_prog_compiler_static_CXX" | $SED "$delay_single_quote_subst"`' | 15080 | lt_prog_compiler_static_CXX='`$ECHO "$lt_prog_compiler_static_CXX" | $SED "$delay_single_quote_subst"`' |
9714 | lt_cv_prog_compiler_c_o_CXX='`$ECHO "$lt_cv_prog_compiler_c_o_CXX" | $SED "$delay_single_quote_subst"`' | 15081 | lt_cv_prog_compiler_c_o_CXX='`$ECHO "$lt_cv_prog_compiler_c_o_CXX" | $SED "$delay_single_quote_subst"`' |
9715 | archive_cmds_need_lc_CXX='`$ECHO "$archive_cmds_need_lc_CXX" | $SED "$delay_single_quote_subst"`' | 15082 | archive_cmds_need_lc_CXX='`$ECHO "$archive_cmds_need_lc_CXX" | $SED "$delay_single_quote_subst"`' |
9716 | @@ -18745,12 +19591,12 @@ hardcode_shlibpath_var_CXX='`$ECHO "$hardcode_shlibpath_var_CXX" | $SED "$delay_ | 15083 | @@ -20443,12 +21284,12 @@ hardcode_shlibpath_var_CXX='`$ECHO "$hardcode_shlibpath_var_CXX" | $SED "$delay_ |
9717 | hardcode_automatic_CXX='`$ECHO "$hardcode_automatic_CXX" | $SED "$delay_single_quote_subst"`' | 15084 | hardcode_automatic_CXX='`$ECHO "$hardcode_automatic_CXX" | $SED "$delay_single_quote_subst"`' |
9718 | inherit_rpath_CXX='`$ECHO "$inherit_rpath_CXX" | $SED "$delay_single_quote_subst"`' | 15085 | inherit_rpath_CXX='`$ECHO "$inherit_rpath_CXX" | $SED "$delay_single_quote_subst"`' |
9719 | link_all_deplibs_CXX='`$ECHO "$link_all_deplibs_CXX" | $SED "$delay_single_quote_subst"`' | 15086 | link_all_deplibs_CXX='`$ECHO "$link_all_deplibs_CXX" | $SED "$delay_single_quote_subst"`' |
@@ -9727,7 +15094,7 @@ index 8355c433c76..a49ab3d1f09 100755 | |||
9727 | file_list_spec_CXX='`$ECHO "$file_list_spec_CXX" | $SED "$delay_single_quote_subst"`' | 15094 | file_list_spec_CXX='`$ECHO "$file_list_spec_CXX" | $SED "$delay_single_quote_subst"`' |
9728 | hardcode_action_CXX='`$ECHO "$hardcode_action_CXX" | $SED "$delay_single_quote_subst"`' | 15095 | hardcode_action_CXX='`$ECHO "$hardcode_action_CXX" | $SED "$delay_single_quote_subst"`' |
9729 | compiler_lib_search_dirs_CXX='`$ECHO "$compiler_lib_search_dirs_CXX" | $SED "$delay_single_quote_subst"`' | 15096 | compiler_lib_search_dirs_CXX='`$ECHO "$compiler_lib_search_dirs_CXX" | $SED "$delay_single_quote_subst"`' |
9730 | @@ -18788,8 +19634,13 @@ reload_flag \ | 15097 | @@ -20486,8 +21327,13 @@ reload_flag \ |
9731 | OBJDUMP \ | 15098 | OBJDUMP \ |
9732 | deplibs_check_method \ | 15099 | deplibs_check_method \ |
9733 | file_magic_cmd \ | 15100 | file_magic_cmd \ |
@@ -9741,7 +15108,7 @@ index 8355c433c76..a49ab3d1f09 100755 | |||
9741 | STRIP \ | 15108 | STRIP \ |
9742 | RANLIB \ | 15109 | RANLIB \ |
9743 | CC \ | 15110 | CC \ |
9744 | @@ -18799,12 +19650,14 @@ lt_cv_sys_global_symbol_pipe \ | 15111 | @@ -20497,12 +21343,14 @@ lt_cv_sys_global_symbol_pipe \ |
9745 | lt_cv_sys_global_symbol_to_cdecl \ | 15112 | lt_cv_sys_global_symbol_to_cdecl \ |
9746 | lt_cv_sys_global_symbol_to_c_name_address \ | 15113 | lt_cv_sys_global_symbol_to_c_name_address \ |
9747 | lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ | 15114 | lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ |
@@ -9757,7 +15124,7 @@ index 8355c433c76..a49ab3d1f09 100755 | |||
9757 | DSYMUTIL \ | 15124 | DSYMUTIL \ |
9758 | NMEDIT \ | 15125 | NMEDIT \ |
9759 | LIPO \ | 15126 | LIPO \ |
9760 | @@ -18820,7 +19673,6 @@ no_undefined_flag \ | 15127 | @@ -20518,7 +21366,6 @@ no_undefined_flag \ |
9761 | hardcode_libdir_flag_spec \ | 15128 | hardcode_libdir_flag_spec \ |
9762 | hardcode_libdir_flag_spec_ld \ | 15129 | hardcode_libdir_flag_spec_ld \ |
9763 | hardcode_libdir_separator \ | 15130 | hardcode_libdir_separator \ |
@@ -9765,7 +15132,7 @@ index 8355c433c76..a49ab3d1f09 100755 | |||
9765 | exclude_expsyms \ | 15132 | exclude_expsyms \ |
9766 | include_expsyms \ | 15133 | include_expsyms \ |
9767 | file_list_spec \ | 15134 | file_list_spec \ |
9768 | @@ -18842,8 +19694,8 @@ LD_CXX \ | 15135 | @@ -20540,8 +21387,8 @@ LD_CXX \ |
9769 | reload_flag_CXX \ | 15136 | reload_flag_CXX \ |
9770 | compiler_CXX \ | 15137 | compiler_CXX \ |
9771 | lt_prog_compiler_no_builtin_flag_CXX \ | 15138 | lt_prog_compiler_no_builtin_flag_CXX \ |
@@ -9775,7 +15142,7 @@ index 8355c433c76..a49ab3d1f09 100755 | |||
9775 | lt_prog_compiler_static_CXX \ | 15142 | lt_prog_compiler_static_CXX \ |
9776 | lt_cv_prog_compiler_c_o_CXX \ | 15143 | lt_cv_prog_compiler_c_o_CXX \ |
9777 | export_dynamic_flag_spec_CXX \ | 15144 | export_dynamic_flag_spec_CXX \ |
9778 | @@ -18855,7 +19707,6 @@ no_undefined_flag_CXX \ | 15145 | @@ -20553,7 +21400,6 @@ no_undefined_flag_CXX \ |
9779 | hardcode_libdir_flag_spec_CXX \ | 15146 | hardcode_libdir_flag_spec_CXX \ |
9780 | hardcode_libdir_flag_spec_ld_CXX \ | 15147 | hardcode_libdir_flag_spec_ld_CXX \ |
9781 | hardcode_libdir_separator_CXX \ | 15148 | hardcode_libdir_separator_CXX \ |
@@ -9783,7 +15150,7 @@ index 8355c433c76..a49ab3d1f09 100755 | |||
9783 | exclude_expsyms_CXX \ | 15150 | exclude_expsyms_CXX \ |
9784 | include_expsyms_CXX \ | 15151 | include_expsyms_CXX \ |
9785 | file_list_spec_CXX \ | 15152 | file_list_spec_CXX \ |
9786 | @@ -18889,6 +19740,7 @@ module_cmds \ | 15153 | @@ -20587,6 +21433,7 @@ module_cmds \ |
9787 | module_expsym_cmds \ | 15154 | module_expsym_cmds \ |
9788 | export_symbols_cmds \ | 15155 | export_symbols_cmds \ |
9789 | prelink_cmds \ | 15156 | prelink_cmds \ |
@@ -9791,7 +15158,7 @@ index 8355c433c76..a49ab3d1f09 100755 | |||
9791 | postinstall_cmds \ | 15158 | postinstall_cmds \ |
9792 | postuninstall_cmds \ | 15159 | postuninstall_cmds \ |
9793 | finish_cmds \ | 15160 | finish_cmds \ |
9794 | @@ -18903,7 +19755,8 @@ archive_expsym_cmds_CXX \ | 15161 | @@ -20601,7 +21448,8 @@ archive_expsym_cmds_CXX \ |
9795 | module_cmds_CXX \ | 15162 | module_cmds_CXX \ |
9796 | module_expsym_cmds_CXX \ | 15163 | module_expsym_cmds_CXX \ |
9797 | export_symbols_cmds_CXX \ | 15164 | export_symbols_cmds_CXX \ |
@@ -9801,7 +15168,7 @@ index 8355c433c76..a49ab3d1f09 100755 | |||
9801 | case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in | 15168 | case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in |
9802 | *[\\\\\\\`\\"\\\$]*) | 15169 | *[\\\\\\\`\\"\\\$]*) |
9803 | eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" | 15170 | eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" |
9804 | @@ -19668,7 +20521,8 @@ $as_echo X"$file" | | 15171 | @@ -21374,7 +22222,8 @@ $as_echo X"$file" | |
9805 | # NOTE: Changes made to this file will be lost: look at ltmain.sh. | 15172 | # NOTE: Changes made to this file will be lost: look at ltmain.sh. |
9806 | # | 15173 | # |
9807 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, | 15174 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, |
@@ -9811,7 +15178,7 @@ index 8355c433c76..a49ab3d1f09 100755 | |||
9811 | # Written by Gordon Matzigkeit, 1996 | 15178 | # Written by Gordon Matzigkeit, 1996 |
9812 | # | 15179 | # |
9813 | # This file is part of GNU Libtool. | 15180 | # This file is part of GNU Libtool. |
9814 | @@ -19771,19 +20625,42 @@ SP2NL=$lt_lt_SP2NL | 15181 | @@ -21477,19 +22326,42 @@ SP2NL=$lt_lt_SP2NL |
9815 | # turn newlines into spaces. | 15182 | # turn newlines into spaces. |
9816 | NL2SP=$lt_lt_NL2SP | 15183 | NL2SP=$lt_lt_NL2SP |
9817 | 15184 | ||
@@ -9855,7 +15222,7 @@ index 8355c433c76..a49ab3d1f09 100755 | |||
9855 | # A symbol stripping program. | 15222 | # A symbol stripping program. |
9856 | STRIP=$lt_STRIP | 15223 | STRIP=$lt_STRIP |
9857 | 15224 | ||
9858 | @@ -19813,6 +20690,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address | 15225 | @@ -21519,6 +22391,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address |
9859 | # Transform the output of nm in a C name address pair when lib prefix is needed. | 15226 | # Transform the output of nm in a C name address pair when lib prefix is needed. |
9860 | global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix | 15227 | global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix |
9861 | 15228 | ||
@@ -9868,7 +15235,7 @@ index 8355c433c76..a49ab3d1f09 100755 | |||
9868 | # The name of the directory that contains temporary libtool files. | 15235 | # The name of the directory that contains temporary libtool files. |
9869 | objdir=$objdir | 15236 | objdir=$objdir |
9870 | 15237 | ||
9871 | @@ -19822,6 +20705,9 @@ MAGIC_CMD=$MAGIC_CMD | 15238 | @@ -21528,6 +22406,9 @@ MAGIC_CMD=$MAGIC_CMD |
9872 | # Must we lock files when doing compilation? | 15239 | # Must we lock files when doing compilation? |
9873 | need_locks=$lt_need_locks | 15240 | need_locks=$lt_need_locks |
9874 | 15241 | ||
@@ -9878,7 +15245,7 @@ index 8355c433c76..a49ab3d1f09 100755 | |||
9878 | # Tool to manipulate archived DWARF debug symbol files on Mac OS X. | 15245 | # Tool to manipulate archived DWARF debug symbol files on Mac OS X. |
9879 | DSYMUTIL=$lt_DSYMUTIL | 15246 | DSYMUTIL=$lt_DSYMUTIL |
9880 | 15247 | ||
9881 | @@ -19936,12 +20822,12 @@ with_gcc=$GCC | 15248 | @@ -21642,12 +22523,12 @@ with_gcc=$GCC |
9882 | # Compiler flag to turn off builtin functions. | 15249 | # Compiler flag to turn off builtin functions. |
9883 | no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag | 15250 | no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag |
9884 | 15251 | ||
@@ -9894,7 +15261,7 @@ index 8355c433c76..a49ab3d1f09 100755 | |||
9894 | # Compiler flag to prevent dynamic linking. | 15261 | # Compiler flag to prevent dynamic linking. |
9895 | link_static_flag=$lt_lt_prog_compiler_static | 15262 | link_static_flag=$lt_lt_prog_compiler_static |
9896 | 15263 | ||
9897 | @@ -20028,9 +20914,6 @@ inherit_rpath=$inherit_rpath | 15264 | @@ -21734,9 +22615,6 @@ inherit_rpath=$inherit_rpath |
9898 | # Whether libtool must link a program against all its dependency libraries. | 15265 | # Whether libtool must link a program against all its dependency libraries. |
9899 | link_all_deplibs=$link_all_deplibs | 15266 | link_all_deplibs=$link_all_deplibs |
9900 | 15267 | ||
@@ -9904,7 +15271,7 @@ index 8355c433c76..a49ab3d1f09 100755 | |||
9904 | # Set to "yes" if exported symbols are required. | 15271 | # Set to "yes" if exported symbols are required. |
9905 | always_export_symbols=$always_export_symbols | 15272 | always_export_symbols=$always_export_symbols |
9906 | 15273 | ||
9907 | @@ -20046,6 +20929,9 @@ include_expsyms=$lt_include_expsyms | 15274 | @@ -21752,6 +22630,9 @@ include_expsyms=$lt_include_expsyms |
9908 | # Commands necessary for linking programs (against libraries) with templates. | 15275 | # Commands necessary for linking programs (against libraries) with templates. |
9909 | prelink_cmds=$lt_prelink_cmds | 15276 | prelink_cmds=$lt_prelink_cmds |
9910 | 15277 | ||
@@ -9914,7 +15281,7 @@ index 8355c433c76..a49ab3d1f09 100755 | |||
9914 | # Specify filename containing input files. | 15281 | # Specify filename containing input files. |
9915 | file_list_spec=$lt_file_list_spec | 15282 | file_list_spec=$lt_file_list_spec |
9916 | 15283 | ||
9917 | @@ -20092,210 +20978,169 @@ ltmain="$ac_aux_dir/ltmain.sh" | 15284 | @@ -21798,210 +22679,169 @@ ltmain="$ac_aux_dir/ltmain.sh" |
9918 | # if finds mixed CR/LF and LF-only lines. Since sed operates in | 15285 | # if finds mixed CR/LF and LF-only lines. Since sed operates in |
9919 | # text mode, it properly converts lines to CR/LF. This bash problem | 15286 | # text mode, it properly converts lines to CR/LF. This bash problem |
9920 | # is reportedly fixed, but why not run on old versions too? | 15287 | # is reportedly fixed, but why not run on old versions too? |
@@ -10288,7 +15655,7 @@ index 8355c433c76..a49ab3d1f09 100755 | |||
10288 | (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") | 15655 | (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") |
10289 | chmod +x "$ofile" | 15656 | chmod +x "$ofile" |
10290 | 15657 | ||
10291 | @@ -20323,12 +21168,12 @@ with_gcc=$GCC_CXX | 15658 | @@ -22029,12 +22869,12 @@ with_gcc=$GCC_CXX |
10292 | # Compiler flag to turn off builtin functions. | 15659 | # Compiler flag to turn off builtin functions. |
10293 | no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX | 15660 | no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX |
10294 | 15661 | ||
@@ -10304,7 +15671,7 @@ index 8355c433c76..a49ab3d1f09 100755 | |||
10304 | # Compiler flag to prevent dynamic linking. | 15671 | # Compiler flag to prevent dynamic linking. |
10305 | link_static_flag=$lt_lt_prog_compiler_static_CXX | 15672 | link_static_flag=$lt_lt_prog_compiler_static_CXX |
10306 | 15673 | ||
10307 | @@ -20415,9 +21260,6 @@ inherit_rpath=$inherit_rpath_CXX | 15674 | @@ -22121,9 +22961,6 @@ inherit_rpath=$inherit_rpath_CXX |
10308 | # Whether libtool must link a program against all its dependency libraries. | 15675 | # Whether libtool must link a program against all its dependency libraries. |
10309 | link_all_deplibs=$link_all_deplibs_CXX | 15676 | link_all_deplibs=$link_all_deplibs_CXX |
10310 | 15677 | ||
@@ -10314,7 +15681,7 @@ index 8355c433c76..a49ab3d1f09 100755 | |||
10314 | # Set to "yes" if exported symbols are required. | 15681 | # Set to "yes" if exported symbols are required. |
10315 | always_export_symbols=$always_export_symbols_CXX | 15682 | always_export_symbols=$always_export_symbols_CXX |
10316 | 15683 | ||
10317 | @@ -20433,6 +21275,9 @@ include_expsyms=$lt_include_expsyms_CXX | 15684 | @@ -22139,6 +22976,9 @@ include_expsyms=$lt_include_expsyms_CXX |
10318 | # Commands necessary for linking programs (against libraries) with templates. | 15685 | # Commands necessary for linking programs (against libraries) with templates. |
10319 | prelink_cmds=$lt_prelink_cmds_CXX | 15686 | prelink_cmds=$lt_prelink_cmds_CXX |
10320 | 15687 | ||
@@ -10324,37 +15691,596 @@ index 8355c433c76..a49ab3d1f09 100755 | |||
10324 | # Specify filename containing input files. | 15691 | # Specify filename containing input files. |
10325 | file_list_spec=$lt_file_list_spec_CXX | 15692 | file_list_spec=$lt_file_list_spec_CXX |
10326 | 15693 | ||
10327 | diff --git a/libctf/configure b/libctf/configure | 15694 | diff --git a/libbacktrace/Makefile.in b/libbacktrace/Makefile.in |
10328 | index 6b294bfebfb..52a025bb848 100755 | 15695 | index 0a61880ba67..500756cd023 100644 |
10329 | --- a/libctf/configure | 15696 | --- a/libbacktrace/Makefile.in |
10330 | +++ b/libctf/configure | 15697 | +++ b/libbacktrace/Makefile.in |
10331 | @@ -663,6 +663,8 @@ OTOOL | 15698 | @@ -1,7 +1,7 @@ |
15699 | -# Makefile.in generated by automake 1.15.1 from Makefile.am. | ||
15700 | +# Makefile.in generated by automake 1.16.5 from Makefile.am. | ||
15701 | # @configure_input@ | ||
15702 | |||
15703 | -# Copyright (C) 1994-2017 Free Software Foundation, Inc. | ||
15704 | +# Copyright (C) 1994-2021 Free Software Foundation, Inc. | ||
15705 | |||
15706 | # This Makefile.in is free software; the Free Software Foundation | ||
15707 | # gives unlimited permission to copy and/or distribute it, | ||
15708 | @@ -189,6 +189,35 @@ CONFIG_HEADER = config.h | ||
15709 | CONFIG_CLEAN_FILES = backtrace-supported.h \ | ||
15710 | install-debuginfo-for-buildid.sh | ||
15711 | CONFIG_CLEAN_VPATH_FILES = | ||
15712 | +@NATIVE_TRUE@am__EXEEXT_1 = allocfail$(EXEEXT) | ||
15713 | +@HAVE_ELF_TRUE@@HAVE_OBJCOPY_DEBUGLINK_TRUE@@NATIVE_TRUE@am__EXEEXT_2 = b2test$(EXEEXT) | ||
15714 | +@HAVE_DWZ_TRUE@@HAVE_ELF_TRUE@@HAVE_OBJCOPY_DEBUGLINK_TRUE@@NATIVE_TRUE@am__EXEEXT_3 = b3test$(EXEEXT) | ||
15715 | +@NATIVE_TRUE@am__EXEEXT_4 = test_elf_32$(EXEEXT) test_elf_64$(EXEEXT) \ | ||
15716 | +@NATIVE_TRUE@ test_macho$(EXEEXT) test_xcoff_32$(EXEEXT) \ | ||
15717 | +@NATIVE_TRUE@ test_xcoff_64$(EXEEXT) test_pecoff$(EXEEXT) \ | ||
15718 | +@NATIVE_TRUE@ test_unknown$(EXEEXT) unittest$(EXEEXT) \ | ||
15719 | +@NATIVE_TRUE@ unittest_alloc$(EXEEXT) btest$(EXEEXT) | ||
15720 | +@HAVE_ELF_TRUE@@NATIVE_TRUE@am__EXEEXT_5 = btest_lto$(EXEEXT) | ||
15721 | +@NATIVE_TRUE@am__EXEEXT_6 = btest_alloc$(EXEEXT) stest$(EXEEXT) \ | ||
15722 | +@NATIVE_TRUE@ stest_alloc$(EXEEXT) | ||
15723 | +@HAVE_ELF_TRUE@@NATIVE_TRUE@am__EXEEXT_7 = ztest$(EXEEXT) \ | ||
15724 | +@HAVE_ELF_TRUE@@NATIVE_TRUE@ ztest_alloc$(EXEEXT) | ||
15725 | +@NATIVE_TRUE@am__EXEEXT_8 = edtest$(EXEEXT) edtest_alloc$(EXEEXT) | ||
15726 | +@HAVE_PTHREAD_TRUE@@NATIVE_TRUE@am__EXEEXT_9 = ttest$(EXEEXT) \ | ||
15727 | +@HAVE_PTHREAD_TRUE@@NATIVE_TRUE@ ttest_alloc$(EXEEXT) | ||
15728 | +@HAVE_COMPRESSED_DEBUG_TRUE@@NATIVE_TRUE@am__EXEEXT_10 = \ | ||
15729 | +@HAVE_COMPRESSED_DEBUG_TRUE@@NATIVE_TRUE@ ctestg$(EXEEXT) \ | ||
15730 | +@HAVE_COMPRESSED_DEBUG_TRUE@@NATIVE_TRUE@ ctesta$(EXEEXT) \ | ||
15731 | +@HAVE_COMPRESSED_DEBUG_TRUE@@NATIVE_TRUE@ ctestg_alloc$(EXEEXT) \ | ||
15732 | +@HAVE_COMPRESSED_DEBUG_TRUE@@NATIVE_TRUE@ ctesta_alloc$(EXEEXT) | ||
15733 | +@HAVE_DWARF5_TRUE@@NATIVE_TRUE@am__EXEEXT_11 = dwarf5$(EXEEXT) \ | ||
15734 | +@HAVE_DWARF5_TRUE@@NATIVE_TRUE@ dwarf5_alloc$(EXEEXT) | ||
15735 | +@NATIVE_TRUE@am__EXEEXT_12 = mtest$(EXEEXT) | ||
15736 | +@HAVE_ELF_TRUE@am__EXEEXT_13 = xztest$(EXEEXT) xztest_alloc$(EXEEXT) | ||
15737 | +am__EXEEXT_14 = $(am__EXEEXT_4) $(am__EXEEXT_5) $(am__EXEEXT_6) \ | ||
15738 | + $(am__EXEEXT_7) $(am__EXEEXT_8) $(am__EXEEXT_9) \ | ||
15739 | + $(am__EXEEXT_10) $(am__EXEEXT_11) $(am__EXEEXT_12) \ | ||
15740 | + $(am__EXEEXT_13) | ||
15741 | LTLIBRARIES = $(noinst_LTLIBRARIES) | ||
15742 | am__DEPENDENCIES_1 = | ||
15743 | am_libbacktrace_la_OBJECTS = atomic.lo dwarf.lo fileline.lo posix.lo \ | ||
15744 | @@ -220,35 +249,6 @@ libbacktrace_instrumented_alloc_la_OBJECTS = \ | ||
15745 | libbacktrace_noformat_la_OBJECTS = \ | ||
15746 | $(am_libbacktrace_noformat_la_OBJECTS) | ||
15747 | @NATIVE_TRUE@am_libbacktrace_noformat_la_rpath = | ||
15748 | -@NATIVE_TRUE@am__EXEEXT_1 = allocfail$(EXEEXT) | ||
15749 | -@HAVE_ELF_TRUE@@HAVE_OBJCOPY_DEBUGLINK_TRUE@@NATIVE_TRUE@am__EXEEXT_2 = b2test$(EXEEXT) | ||
15750 | -@HAVE_DWZ_TRUE@@HAVE_ELF_TRUE@@HAVE_OBJCOPY_DEBUGLINK_TRUE@@NATIVE_TRUE@am__EXEEXT_3 = b3test$(EXEEXT) | ||
15751 | -@NATIVE_TRUE@am__EXEEXT_4 = test_elf_32$(EXEEXT) test_elf_64$(EXEEXT) \ | ||
15752 | -@NATIVE_TRUE@ test_macho$(EXEEXT) test_xcoff_32$(EXEEXT) \ | ||
15753 | -@NATIVE_TRUE@ test_xcoff_64$(EXEEXT) test_pecoff$(EXEEXT) \ | ||
15754 | -@NATIVE_TRUE@ test_unknown$(EXEEXT) unittest$(EXEEXT) \ | ||
15755 | -@NATIVE_TRUE@ unittest_alloc$(EXEEXT) btest$(EXEEXT) | ||
15756 | -@HAVE_ELF_TRUE@@NATIVE_TRUE@am__EXEEXT_5 = btest_lto$(EXEEXT) | ||
15757 | -@NATIVE_TRUE@am__EXEEXT_6 = btest_alloc$(EXEEXT) stest$(EXEEXT) \ | ||
15758 | -@NATIVE_TRUE@ stest_alloc$(EXEEXT) | ||
15759 | -@HAVE_ELF_TRUE@@NATIVE_TRUE@am__EXEEXT_7 = ztest$(EXEEXT) \ | ||
15760 | -@HAVE_ELF_TRUE@@NATIVE_TRUE@ ztest_alloc$(EXEEXT) | ||
15761 | -@NATIVE_TRUE@am__EXEEXT_8 = edtest$(EXEEXT) edtest_alloc$(EXEEXT) | ||
15762 | -@HAVE_PTHREAD_TRUE@@NATIVE_TRUE@am__EXEEXT_9 = ttest$(EXEEXT) \ | ||
15763 | -@HAVE_PTHREAD_TRUE@@NATIVE_TRUE@ ttest_alloc$(EXEEXT) | ||
15764 | -@HAVE_COMPRESSED_DEBUG_TRUE@@NATIVE_TRUE@am__EXEEXT_10 = \ | ||
15765 | -@HAVE_COMPRESSED_DEBUG_TRUE@@NATIVE_TRUE@ ctestg$(EXEEXT) \ | ||
15766 | -@HAVE_COMPRESSED_DEBUG_TRUE@@NATIVE_TRUE@ ctesta$(EXEEXT) \ | ||
15767 | -@HAVE_COMPRESSED_DEBUG_TRUE@@NATIVE_TRUE@ ctestg_alloc$(EXEEXT) \ | ||
15768 | -@HAVE_COMPRESSED_DEBUG_TRUE@@NATIVE_TRUE@ ctesta_alloc$(EXEEXT) | ||
15769 | -@HAVE_DWARF5_TRUE@@NATIVE_TRUE@am__EXEEXT_11 = dwarf5$(EXEEXT) \ | ||
15770 | -@HAVE_DWARF5_TRUE@@NATIVE_TRUE@ dwarf5_alloc$(EXEEXT) | ||
15771 | -@NATIVE_TRUE@am__EXEEXT_12 = mtest$(EXEEXT) | ||
15772 | -@HAVE_ELF_TRUE@am__EXEEXT_13 = xztest$(EXEEXT) xztest_alloc$(EXEEXT) | ||
15773 | -am__EXEEXT_14 = $(am__EXEEXT_4) $(am__EXEEXT_5) $(am__EXEEXT_6) \ | ||
15774 | - $(am__EXEEXT_7) $(am__EXEEXT_8) $(am__EXEEXT_9) \ | ||
15775 | - $(am__EXEEXT_10) $(am__EXEEXT_11) $(am__EXEEXT_12) \ | ||
15776 | - $(am__EXEEXT_13) | ||
15777 | @NATIVE_TRUE@am_allocfail_OBJECTS = allocfail-allocfail.$(OBJEXT) \ | ||
15778 | @NATIVE_TRUE@ allocfail-testlib.$(OBJEXT) | ||
15779 | allocfail_OBJECTS = $(am_allocfail_OBJECTS) | ||
15780 | @@ -536,7 +536,7 @@ am__v_at_0 = @ | ||
15781 | am__v_at_1 = | ||
15782 | DEFAULT_INCLUDES = -I.@am__isrc@ | ||
15783 | depcomp = | ||
15784 | -am__depfiles_maybe = | ||
15785 | +am__maybe_remake_depfiles = | ||
15786 | COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ | ||
15787 | $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) | ||
15788 | LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ | ||
15789 | @@ -579,8 +579,8 @@ am__can_run_installinfo = \ | ||
15790 | n|no|NO) false;; \ | ||
15791 | *) (install-info --version) >/dev/null 2>&1;; \ | ||
15792 | esac | ||
15793 | -am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \ | ||
15794 | - $(LISP)config.h.in | ||
15795 | +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) \ | ||
15796 | + config.h.in | ||
15797 | # Read a list of newline-separated strings from the standard input, | ||
15798 | # and print each of them once, without duplicates. Input order is | ||
15799 | # *not* preserved. | ||
15800 | @@ -597,9 +597,6 @@ am__define_uniq_tagged_files = \ | ||
15801 | unique=`for i in $$list; do \ | ||
15802 | if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ | ||
15803 | done | $(am__uniquify_input)` | ||
15804 | -ETAGS = etags | ||
15805 | -CTAGS = ctags | ||
15806 | -CSCOPE = cscope | ||
15807 | AM_RECURSIVE_TARGETS = cscope check recheck | ||
15808 | am__tty_colors_dummy = \ | ||
15809 | mgn= red= grn= lgn= blu= brg= std=; \ | ||
15810 | @@ -783,6 +780,7 @@ am__set_TESTS_bases = \ | ||
15811 | bases='$(TEST_LOGS)'; \ | ||
15812 | bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \ | ||
15813 | bases=`echo $$bases` | ||
15814 | +AM_TESTSUITE_SUMMARY_HEADER = ' for $(PACKAGE_STRING)' | ||
15815 | RECHECK_LOGS = $(TEST_LOGS) | ||
15816 | TEST_SUITE_LOG = test-suite.log | ||
15817 | TEST_EXTENSIONS = @EXEEXT@ .test | ||
15818 | @@ -825,8 +823,11 @@ CLOCK_GETTIME_LINK = @CLOCK_GETTIME_LINK@ | ||
15819 | COMM = @COMM@ | ||
15820 | CPP = @CPP@ | ||
15821 | CPPFLAGS = @CPPFLAGS@ | ||
15822 | +CSCOPE = @CSCOPE@ | ||
15823 | +CTAGS = @CTAGS@ | ||
15824 | CYGPATH_W = @CYGPATH_W@ | ||
15825 | DEFS = @DEFS@ | ||
15826 | +DLLTOOL = @DLLTOOL@ | ||
15827 | DSYMUTIL = @DSYMUTIL@ | ||
15828 | DUMPBIN = @DUMPBIN@ | ||
15829 | DWZ = @DWZ@ | ||
15830 | @@ -834,6 +835,7 @@ ECHO_C = @ECHO_C@ | ||
15831 | ECHO_N = @ECHO_N@ | ||
15832 | ECHO_T = @ECHO_T@ | ||
15833 | EGREP = @EGREP@ | ||
15834 | +ETAGS = @ETAGS@ | ||
15835 | EXEEXT = @EXEEXT@ | ||
15836 | EXTRA_FLAGS = @EXTRA_FLAGS@ | ||
15837 | FGREP = @FGREP@ | ||
15838 | @@ -854,6 +856,7 @@ LN_S = @LN_S@ | ||
15839 | LTLIBOBJS = @LTLIBOBJS@ | ||
15840 | MAINT = @MAINT@ | ||
15841 | MAKEINFO = @MAKEINFO@ | ||
15842 | +MANIFEST_TOOL = @MANIFEST_TOOL@ | ||
15843 | MKDIR_P = @MKDIR_P@ | ||
15844 | NM = @NM@ | ||
15845 | NMEDIT = @NMEDIT@ | ||
15846 | @@ -886,6 +889,7 @@ abs_builddir = @abs_builddir@ | ||
15847 | abs_srcdir = @abs_srcdir@ | ||
15848 | abs_top_builddir = @abs_top_builddir@ | ||
15849 | abs_top_srcdir = @abs_top_srcdir@ | ||
15850 | +ac_ct_AR = @ac_ct_AR@ | ||
15851 | ac_ct_CC = @ac_ct_CC@ | ||
15852 | ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ | ||
15853 | am__leading_dot = @am__leading_dot@ | ||
15854 | @@ -1178,8 +1182,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status | ||
15855 | echo ' $(SHELL) ./config.status'; \ | ||
15856 | $(SHELL) ./config.status;; \ | ||
15857 | *) \ | ||
15858 | - echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \ | ||
15859 | - cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \ | ||
15860 | + echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles)'; \ | ||
15861 | + cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles);; \ | ||
15862 | esac; | ||
15863 | $(top_srcdir)/../multilib.am $(am__empty): | ||
15864 | |||
15865 | @@ -1211,6 +1215,15 @@ backtrace-supported.h: $(top_builddir)/config.status $(srcdir)/backtrace-support | ||
15866 | install-debuginfo-for-buildid.sh: $(top_builddir)/config.status $(srcdir)/install-debuginfo-for-buildid.sh.in | ||
15867 | cd $(top_builddir) && $(SHELL) ./config.status $@ | ||
15868 | |||
15869 | +clean-checkPROGRAMS: | ||
15870 | + @list='$(check_PROGRAMS)'; test -n "$$list" || exit 0; \ | ||
15871 | + echo " rm -f" $$list; \ | ||
15872 | + rm -f $$list || exit $$?; \ | ||
15873 | + test -n "$(EXEEXT)" || exit 0; \ | ||
15874 | + list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ | ||
15875 | + echo " rm -f" $$list; \ | ||
15876 | + rm -f $$list | ||
15877 | + | ||
15878 | clean-checkLTLIBRARIES: | ||
15879 | -test -z "$(check_LTLIBRARIES)" || rm -f $(check_LTLIBRARIES) | ||
15880 | @list='$(check_LTLIBRARIES)'; \ | ||
15881 | @@ -1248,15 +1261,6 @@ libbacktrace_instrumented_alloc.la: $(libbacktrace_instrumented_alloc_la_OBJECTS | ||
15882 | libbacktrace_noformat.la: $(libbacktrace_noformat_la_OBJECTS) $(libbacktrace_noformat_la_DEPENDENCIES) $(EXTRA_libbacktrace_noformat_la_DEPENDENCIES) | ||
15883 | $(AM_V_CCLD)$(LINK) $(am_libbacktrace_noformat_la_rpath) $(libbacktrace_noformat_la_OBJECTS) $(libbacktrace_noformat_la_LIBADD) $(LIBS) | ||
15884 | |||
15885 | -clean-checkPROGRAMS: | ||
15886 | - @list='$(check_PROGRAMS)'; test -n "$$list" || exit 0; \ | ||
15887 | - echo " rm -f" $$list; \ | ||
15888 | - rm -f $$list || exit $$?; \ | ||
15889 | - test -n "$(EXEEXT)" || exit 0; \ | ||
15890 | - list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ | ||
15891 | - echo " rm -f" $$list; \ | ||
15892 | - rm -f $$list | ||
15893 | - | ||
15894 | allocfail$(EXEEXT): $(allocfail_OBJECTS) $(allocfail_DEPENDENCIES) $(EXTRA_allocfail_DEPENDENCIES) | ||
15895 | @rm -f allocfail$(EXEEXT) | ||
15896 | $(AM_V_CCLD)$(allocfail_LINK) $(allocfail_OBJECTS) $(allocfail_LDADD) $(LIBS) | ||
15897 | @@ -1959,7 +1963,7 @@ $(TEST_SUITE_LOG): $(TEST_LOGS) | ||
15898 | test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG); \ | ||
15899 | fi; \ | ||
15900 | echo "$${col}$$br$${std}"; \ | ||
15901 | - echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}"; \ | ||
15902 | + echo "$${col}Testsuite summary"$(AM_TESTSUITE_SUMMARY_HEADER)"$${std}"; \ | ||
15903 | echo "$${col}$$br$${std}"; \ | ||
15904 | create_testsuite_report --maybe-color; \ | ||
15905 | echo "$$col$$br$$std"; \ | ||
15906 | @@ -1972,7 +1976,7 @@ $(TEST_SUITE_LOG): $(TEST_LOGS) | ||
15907 | fi; \ | ||
15908 | $$success || exit 1 | ||
15909 | |||
15910 | -check-TESTS: | ||
15911 | +check-TESTS: $(check_PROGRAMS) $(check_LTLIBRARIES) $(check_DATA) | ||
15912 | @list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list | ||
15913 | @list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list | ||
15914 | @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) | ||
15915 | @@ -1982,7 +1986,7 @@ check-TESTS: | ||
15916 | log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \ | ||
15917 | $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \ | ||
15918 | exit $$?; | ||
15919 | -recheck: all $(check_LTLIBRARIES) $(check_PROGRAMS) $(check_DATA) | ||
15920 | +recheck: all $(check_PROGRAMS) $(check_LTLIBRARIES) $(check_DATA) | ||
15921 | @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) | ||
15922 | @set +e; $(am__set_TESTS_bases); \ | ||
15923 | bases=`for i in $$bases; do echo $$i; done \ | ||
15924 | @@ -2260,7 +2264,7 @@ xztest_alloc.log: xztest_alloc$(EXEEXT) | ||
15925 | @am__EXEEXT_TRUE@ $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ | ||
15926 | @am__EXEEXT_TRUE@ "$$tst" $(AM_TESTS_FD_REDIRECT) | ||
15927 | check-am: all-am | ||
15928 | - $(MAKE) $(AM_MAKEFLAGS) $(check_LTLIBRARIES) $(check_PROGRAMS) \ | ||
15929 | + $(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS) $(check_LTLIBRARIES) \ | ||
15930 | $(check_DATA) | ||
15931 | $(MAKE) $(AM_MAKEFLAGS) check-TESTS | ||
15932 | check: check-am | ||
15933 | diff --git a/libbacktrace/aclocal.m4 b/libbacktrace/aclocal.m4 | ||
15934 | index 528e6173930..d88a5ec84f2 100644 | ||
15935 | --- a/libbacktrace/aclocal.m4 | ||
15936 | +++ b/libbacktrace/aclocal.m4 | ||
15937 | @@ -1,6 +1,6 @@ | ||
15938 | -# generated automatically by aclocal 1.15.1 -*- Autoconf -*- | ||
15939 | +# generated automatically by aclocal 1.16.5 -*- Autoconf -*- | ||
15940 | |||
15941 | -# Copyright (C) 1996-2017 Free Software Foundation, Inc. | ||
15942 | +# Copyright (C) 1996-2021 Free Software Foundation, Inc. | ||
15943 | |||
15944 | # This file is free software; the Free Software Foundation | ||
15945 | # gives unlimited permission to copy and/or distribute it, | ||
15946 | @@ -20,7 +20,7 @@ You have another version of autoconf. It may work, but is not guaranteed to. | ||
15947 | If you have problems, you may need to regenerate the build system entirely. | ||
15948 | To do so, use the procedure documented by the package, typically 'autoreconf'.])]) | ||
15949 | |||
15950 | -# Copyright (C) 2002-2017 Free Software Foundation, Inc. | ||
15951 | +# Copyright (C) 2002-2021 Free Software Foundation, Inc. | ||
15952 | # | ||
15953 | # This file is free software; the Free Software Foundation | ||
15954 | # gives unlimited permission to copy and/or distribute it, | ||
15955 | @@ -32,10 +32,10 @@ To do so, use the procedure documented by the package, typically 'autoreconf'.]) | ||
15956 | # generated from the m4 files accompanying Automake X.Y. | ||
15957 | # (This private macro should not be called outside this file.) | ||
15958 | AC_DEFUN([AM_AUTOMAKE_VERSION], | ||
15959 | -[am__api_version='1.15' | ||
15960 | +[am__api_version='1.16' | ||
15961 | dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to | ||
15962 | dnl require some minimum version. Point them to the right macro. | ||
15963 | -m4_if([$1], [1.15.1], [], | ||
15964 | +m4_if([$1], [1.16.5], [], | ||
15965 | [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl | ||
15966 | ]) | ||
15967 | |||
15968 | @@ -51,14 +51,14 @@ m4_define([_AM_AUTOCONF_VERSION], []) | ||
15969 | # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. | ||
15970 | # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. | ||
15971 | AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], | ||
15972 | -[AM_AUTOMAKE_VERSION([1.15.1])dnl | ||
15973 | +[AM_AUTOMAKE_VERSION([1.16.5])dnl | ||
15974 | m4_ifndef([AC_AUTOCONF_VERSION], | ||
15975 | [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl | ||
15976 | _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) | ||
15977 | |||
15978 | # AM_AUX_DIR_EXPAND -*- Autoconf -*- | ||
15979 | |||
15980 | -# Copyright (C) 2001-2017 Free Software Foundation, Inc. | ||
15981 | +# Copyright (C) 2001-2021 Free Software Foundation, Inc. | ||
15982 | # | ||
15983 | # This file is free software; the Free Software Foundation | ||
15984 | # gives unlimited permission to copy and/or distribute it, | ||
15985 | @@ -110,7 +110,7 @@ am_aux_dir=`cd "$ac_aux_dir" && pwd` | ||
15986 | |||
15987 | # AM_CONDITIONAL -*- Autoconf -*- | ||
15988 | |||
15989 | -# Copyright (C) 1997-2017 Free Software Foundation, Inc. | ||
15990 | +# Copyright (C) 1997-2021 Free Software Foundation, Inc. | ||
15991 | # | ||
15992 | # This file is free software; the Free Software Foundation | ||
15993 | # gives unlimited permission to copy and/or distribute it, | ||
15994 | @@ -143,7 +143,7 @@ fi])]) | ||
15995 | |||
15996 | # Do all the work for Automake. -*- Autoconf -*- | ||
15997 | |||
15998 | -# Copyright (C) 1996-2017 Free Software Foundation, Inc. | ||
15999 | +# Copyright (C) 1996-2021 Free Software Foundation, Inc. | ||
16000 | # | ||
16001 | # This file is free software; the Free Software Foundation | ||
16002 | # gives unlimited permission to copy and/or distribute it, | ||
16003 | @@ -171,6 +171,10 @@ m4_defn([AC_PROG_CC]) | ||
16004 | # release and drop the old call support. | ||
16005 | AC_DEFUN([AM_INIT_AUTOMAKE], | ||
16006 | [AC_PREREQ([2.65])dnl | ||
16007 | +m4_ifdef([_$0_ALREADY_INIT], | ||
16008 | + [m4_fatal([$0 expanded multiple times | ||
16009 | +]m4_defn([_$0_ALREADY_INIT]))], | ||
16010 | + [m4_define([_$0_ALREADY_INIT], m4_expansion_stack)])dnl | ||
16011 | dnl Autoconf wants to disallow AM_ names. We explicitly allow | ||
16012 | dnl the ones we care about. | ||
16013 | m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl | ||
16014 | @@ -207,7 +211,7 @@ m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl | ||
16015 | [_AM_SET_OPTIONS([$1])dnl | ||
16016 | dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT. | ||
16017 | m4_if( | ||
16018 | - m4_ifdef([AC_PACKAGE_NAME], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]), | ||
16019 | + m4_ifset([AC_PACKAGE_NAME], [ok]):m4_ifset([AC_PACKAGE_VERSION], [ok]), | ||
16020 | [ok:ok],, | ||
16021 | [m4_fatal([AC_INIT should be called with package and version arguments])])dnl | ||
16022 | AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl | ||
16023 | @@ -230,8 +234,8 @@ AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl | ||
16024 | AC_REQUIRE([AC_PROG_MKDIR_P])dnl | ||
16025 | # For better backward compatibility. To be removed once Automake 1.9.x | ||
16026 | # dies out for good. For more background, see: | ||
16027 | -# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html> | ||
16028 | -# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html> | ||
16029 | +# <https://lists.gnu.org/archive/html/automake/2012-07/msg00001.html> | ||
16030 | +# <https://lists.gnu.org/archive/html/automake/2012-07/msg00014.html> | ||
16031 | AC_SUBST([mkdir_p], ['$(MKDIR_P)']) | ||
16032 | # We need awk for the "check" target (and possibly the TAP driver). The | ||
16033 | # system "awk" is bad on some platforms. | ||
16034 | @@ -259,6 +263,20 @@ AC_PROVIDE_IFELSE([AC_PROG_OBJCXX], | ||
16035 | [m4_define([AC_PROG_OBJCXX], | ||
16036 | m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl | ||
16037 | ]) | ||
16038 | +# Variables for tags utilities; see am/tags.am | ||
16039 | +if test -z "$CTAGS"; then | ||
16040 | + CTAGS=ctags | ||
16041 | +fi | ||
16042 | +AC_SUBST([CTAGS]) | ||
16043 | +if test -z "$ETAGS"; then | ||
16044 | + ETAGS=etags | ||
16045 | +fi | ||
16046 | +AC_SUBST([ETAGS]) | ||
16047 | +if test -z "$CSCOPE"; then | ||
16048 | + CSCOPE=cscope | ||
16049 | +fi | ||
16050 | +AC_SUBST([CSCOPE]) | ||
16051 | + | ||
16052 | AC_REQUIRE([AM_SILENT_RULES])dnl | ||
16053 | dnl The testsuite driver may need to know about EXEEXT, so add the | ||
16054 | dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This | ||
16055 | @@ -298,7 +316,7 @@ END | ||
16056 | Aborting the configuration process, to ensure you take notice of the issue. | ||
16057 | |||
16058 | You can download and install GNU coreutils to get an 'rm' implementation | ||
16059 | -that behaves properly: <http://www.gnu.org/software/coreutils/>. | ||
16060 | +that behaves properly: <https://www.gnu.org/software/coreutils/>. | ||
16061 | |||
16062 | If you want to complete the configuration process using your problematic | ||
16063 | 'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM | ||
16064 | @@ -340,7 +358,7 @@ for _am_header in $config_headers :; do | ||
16065 | done | ||
16066 | echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) | ||
16067 | |||
16068 | -# Copyright (C) 2001-2017 Free Software Foundation, Inc. | ||
16069 | +# Copyright (C) 2001-2021 Free Software Foundation, Inc. | ||
16070 | # | ||
16071 | # This file is free software; the Free Software Foundation | ||
16072 | # gives unlimited permission to copy and/or distribute it, | ||
16073 | @@ -364,7 +382,7 @@ AC_SUBST([install_sh])]) | ||
16074 | # Add --enable-maintainer-mode option to configure. -*- Autoconf -*- | ||
16075 | # From Jim Meyering | ||
16076 | |||
16077 | -# Copyright (C) 1996-2017 Free Software Foundation, Inc. | ||
16078 | +# Copyright (C) 1996-2021 Free Software Foundation, Inc. | ||
16079 | # | ||
16080 | # This file is free software; the Free Software Foundation | ||
16081 | # gives unlimited permission to copy and/or distribute it, | ||
16082 | @@ -399,7 +417,7 @@ AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) | ||
16083 | |||
16084 | # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- | ||
16085 | |||
16086 | -# Copyright (C) 1997-2017 Free Software Foundation, Inc. | ||
16087 | +# Copyright (C) 1997-2021 Free Software Foundation, Inc. | ||
16088 | # | ||
16089 | # This file is free software; the Free Software Foundation | ||
16090 | # gives unlimited permission to copy and/or distribute it, | ||
16091 | @@ -420,12 +438,7 @@ AC_DEFUN([AM_MISSING_HAS_RUN], | ||
16092 | [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl | ||
16093 | AC_REQUIRE_AUX_FILE([missing])dnl | ||
16094 | if test x"${MISSING+set}" != xset; then | ||
16095 | - case $am_aux_dir in | ||
16096 | - *\ * | *\ *) | ||
16097 | - MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;; | ||
16098 | - *) | ||
16099 | - MISSING="\${SHELL} $am_aux_dir/missing" ;; | ||
16100 | - esac | ||
16101 | + MISSING="\${SHELL} '$am_aux_dir/missing'" | ||
16102 | fi | ||
16103 | # Use eval to expand $SHELL | ||
16104 | if eval "$MISSING --is-lightweight"; then | ||
16105 | @@ -438,7 +451,7 @@ fi | ||
16106 | |||
16107 | # Helper functions for option handling. -*- Autoconf -*- | ||
16108 | |||
16109 | -# Copyright (C) 2001-2017 Free Software Foundation, Inc. | ||
16110 | +# Copyright (C) 2001-2021 Free Software Foundation, Inc. | ||
16111 | # | ||
16112 | # This file is free software; the Free Software Foundation | ||
16113 | # gives unlimited permission to copy and/or distribute it, | ||
16114 | @@ -467,7 +480,7 @@ AC_DEFUN([_AM_SET_OPTIONS], | ||
16115 | AC_DEFUN([_AM_IF_OPTION], | ||
16116 | [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) | ||
16117 | |||
16118 | -# Copyright (C) 1999-2017 Free Software Foundation, Inc. | ||
16119 | +# Copyright (C) 1999-2021 Free Software Foundation, Inc. | ||
16120 | # | ||
16121 | # This file is free software; the Free Software Foundation | ||
16122 | # gives unlimited permission to copy and/or distribute it, | ||
16123 | @@ -514,7 +527,7 @@ AC_LANG_POP([C])]) | ||
16124 | # For backward compatibility. | ||
16125 | AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])]) | ||
16126 | |||
16127 | -# Copyright (C) 2001-2017 Free Software Foundation, Inc. | ||
16128 | +# Copyright (C) 2001-2021 Free Software Foundation, Inc. | ||
16129 | # | ||
16130 | # This file is free software; the Free Software Foundation | ||
16131 | # gives unlimited permission to copy and/or distribute it, | ||
16132 | @@ -533,7 +546,7 @@ AC_DEFUN([AM_RUN_LOG], | ||
16133 | |||
16134 | # Check to make sure that the build environment is sane. -*- Autoconf -*- | ||
16135 | |||
16136 | -# Copyright (C) 1996-2017 Free Software Foundation, Inc. | ||
16137 | +# Copyright (C) 1996-2021 Free Software Foundation, Inc. | ||
16138 | # | ||
16139 | # This file is free software; the Free Software Foundation | ||
16140 | # gives unlimited permission to copy and/or distribute it, | ||
16141 | @@ -614,7 +627,7 @@ AC_CONFIG_COMMANDS_PRE( | ||
16142 | rm -f conftest.file | ||
16143 | ]) | ||
16144 | |||
16145 | -# Copyright (C) 2009-2017 Free Software Foundation, Inc. | ||
16146 | +# Copyright (C) 2009-2021 Free Software Foundation, Inc. | ||
16147 | # | ||
16148 | # This file is free software; the Free Software Foundation | ||
16149 | # gives unlimited permission to copy and/or distribute it, | ||
16150 | @@ -674,7 +687,7 @@ AC_SUBST([AM_BACKSLASH])dnl | ||
16151 | _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl | ||
16152 | ]) | ||
16153 | |||
16154 | -# Copyright (C) 2001-2017 Free Software Foundation, Inc. | ||
16155 | +# Copyright (C) 2001-2021 Free Software Foundation, Inc. | ||
16156 | # | ||
16157 | # This file is free software; the Free Software Foundation | ||
16158 | # gives unlimited permission to copy and/or distribute it, | ||
16159 | @@ -702,7 +715,7 @@ fi | ||
16160 | INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" | ||
16161 | AC_SUBST([INSTALL_STRIP_PROGRAM])]) | ||
16162 | |||
16163 | -# Copyright (C) 2006-2017 Free Software Foundation, Inc. | ||
16164 | +# Copyright (C) 2006-2021 Free Software Foundation, Inc. | ||
16165 | # | ||
16166 | # This file is free software; the Free Software Foundation | ||
16167 | # gives unlimited permission to copy and/or distribute it, | ||
16168 | @@ -721,7 +734,7 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) | ||
16169 | |||
16170 | # Check how to create a tarball. -*- Autoconf -*- | ||
16171 | |||
16172 | -# Copyright (C) 2004-2017 Free Software Foundation, Inc. | ||
16173 | +# Copyright (C) 2004-2021 Free Software Foundation, Inc. | ||
16174 | # | ||
16175 | # This file is free software; the Free Software Foundation | ||
16176 | # gives unlimited permission to copy and/or distribute it, | ||
16177 | diff --git a/libbacktrace/configure b/libbacktrace/configure | ||
16178 | index e5ca8ad9379..b7c4c4be78d 100755 | ||
16179 | --- a/libbacktrace/configure | ||
16180 | +++ b/libbacktrace/configure | ||
16181 | @@ -680,7 +680,10 @@ OTOOL | ||
10332 | LIPO | 16182 | LIPO |
10333 | NMEDIT | 16183 | NMEDIT |
10334 | DSYMUTIL | 16184 | DSYMUTIL |
10335 | +MANIFEST_TOOL | 16185 | +MANIFEST_TOOL |
16186 | +ac_ct_AR | ||
16187 | AR | ||
10336 | +DLLTOOL | 16188 | +DLLTOOL |
10337 | OBJDUMP | 16189 | OBJDUMP |
10338 | LN_S | 16190 | LN_S |
10339 | NM | 16191 | NM |
10340 | @@ -790,6 +792,7 @@ enable_static | 16192 | @@ -701,6 +704,9 @@ AM_BACKSLASH |
16193 | AM_DEFAULT_VERBOSITY | ||
16194 | AM_DEFAULT_V | ||
16195 | AM_V | ||
16196 | +CSCOPE | ||
16197 | +ETAGS | ||
16198 | +CTAGS | ||
16199 | am__untar | ||
16200 | am__tar | ||
16201 | AMTAR | ||
16202 | @@ -798,6 +804,7 @@ enable_static | ||
10341 | with_pic | 16203 | with_pic |
10342 | enable_fast_install | 16204 | enable_fast_install |
10343 | with_gnu_ld | 16205 | with_gnu_ld |
10344 | +with_libtool_sysroot | 16206 | +with_libtool_sysroot |
10345 | enable_libtool_lock | 16207 | enable_libtool_lock |
10346 | enable_largefile | 16208 | enable_largefile |
10347 | enable_werror_always | 16209 | enable_cet |
10348 | @@ -1452,6 +1455,8 @@ Optional Packages: | 16210 | @@ -1458,6 +1465,8 @@ Optional Packages: |
10349 | --with-pic try to use only PIC/non-PIC objects [default=use | 16211 | --with-pic try to use only PIC/non-PIC objects [default=use |
10350 | both] | 16212 | both] |
10351 | --with-gnu-ld assume the C compiler uses GNU ld [default=no] | 16213 | --with-gnu-ld assume the C compiler uses GNU ld [default=no] |
10352 | + --with-libtool-sysroot=DIR Search for dependent libraries within DIR | 16214 | + --with-libtool-sysroot=DIR Search for dependent libraries within DIR |
10353 | + (or the compiler's sysroot if not specified). | 16215 | + (or the compiler's sysroot if not specified). |
10354 | --with-system-zlib use installed libz | 16216 | --with-system-libunwind use installed libunwind |
10355 | 16217 | ||
10356 | Some influential environment variables: | 16218 | Some influential environment variables: |
10357 | @@ -5411,8 +5416,8 @@ esac | 16219 | @@ -4047,7 +4056,7 @@ libtool_VERSION=1:0:0 |
16220 | # -Wall: Issue all automake warnings. | ||
16221 | # -Wno-portability: Don't warn about constructs supported by GNU make. | ||
16222 | # (because GCC requires GNU make anyhow). | ||
16223 | -am__api_version='1.15' | ||
16224 | +am__api_version='1.16' | ||
16225 | |||
16226 | # Find a good install program. We prefer a C program (faster), | ||
16227 | # so one script is as good as another. But avoid the broken or | ||
16228 | @@ -4220,12 +4229,7 @@ ac_script='s/[\\$]/&&/g;s/;s,x,x,$//' | ||
16229 | program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"` | ||
16230 | |||
16231 | if test x"${MISSING+set}" != xset; then | ||
16232 | - case $am_aux_dir in | ||
16233 | - *\ * | *\ *) | ||
16234 | - MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;; | ||
16235 | - *) | ||
16236 | - MISSING="\${SHELL} $am_aux_dir/missing" ;; | ||
16237 | - esac | ||
16238 | + MISSING="\${SHELL} '$am_aux_dir/missing'" | ||
16239 | fi | ||
16240 | # Use eval to expand $SHELL | ||
16241 | if eval "$MISSING --is-lightweight"; then | ||
16242 | @@ -4551,8 +4555,8 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} | ||
16243 | |||
16244 | # For better backward compatibility. To be removed once Automake 1.9.x | ||
16245 | # dies out for good. For more background, see: | ||
16246 | -# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html> | ||
16247 | -# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html> | ||
16248 | +# <https://lists.gnu.org/archive/html/automake/2012-07/msg00001.html> | ||
16249 | +# <https://lists.gnu.org/archive/html/automake/2012-07/msg00014.html> | ||
16250 | mkdir_p='$(MKDIR_P)' | ||
16251 | |||
16252 | # We need awk for the "check" target (and possibly the TAP driver). The | ||
16253 | @@ -4571,6 +4575,20 @@ am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -' | ||
16254 | |||
16255 | |||
16256 | |||
16257 | +# Variables for tags utilities; see am/tags.am | ||
16258 | +if test -z "$CTAGS"; then | ||
16259 | + CTAGS=ctags | ||
16260 | +fi | ||
16261 | + | ||
16262 | +if test -z "$ETAGS"; then | ||
16263 | + ETAGS=etags | ||
16264 | +fi | ||
16265 | + | ||
16266 | +if test -z "$CSCOPE"; then | ||
16267 | + CSCOPE=cscope | ||
16268 | +fi | ||
16269 | + | ||
16270 | + | ||
16271 | |||
16272 | # POSIX will say in a future version that running "rm -f" with no argument | ||
16273 | # is OK; and we want to be able to make that assumption in our Makefile | ||
16274 | @@ -4603,7 +4621,7 @@ END | ||
16275 | Aborting the configuration process, to ensure you take notice of the issue. | ||
16276 | |||
16277 | You can download and install GNU coreutils to get an 'rm' implementation | ||
16278 | -that behaves properly: <http://www.gnu.org/software/coreutils/>. | ||
16279 | +that behaves properly: <https://www.gnu.org/software/coreutils/>. | ||
16280 | |||
16281 | If you want to complete the configuration process using your problematic | ||
16282 | 'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM | ||
16283 | @@ -5446,8 +5464,8 @@ esac | ||
10358 | 16284 | ||
10359 | 16285 | ||
10360 | 16286 | ||
@@ -10365,7 +16291,7 @@ index 6b294bfebfb..52a025bb848 100755 | |||
10365 | 16291 | ||
10366 | 16292 | ||
10367 | 16293 | ||
10368 | @@ -5523,7 +5528,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO | 16294 | @@ -5487,7 +5505,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO |
10369 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 | 16295 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 |
10370 | $as_echo_n "checking how to print strings... " >&6; } | 16296 | $as_echo_n "checking how to print strings... " >&6; } |
10371 | # Test print first, because it will be a builtin if present. | 16297 | # Test print first, because it will be a builtin if present. |
@@ -10374,7 +16300,7 @@ index 6b294bfebfb..52a025bb848 100755 | |||
10374 | test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then | 16300 | test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then |
10375 | ECHO='print -r --' | 16301 | ECHO='print -r --' |
10376 | elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then | 16302 | elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then |
10377 | @@ -6209,8 +6214,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; | 16303 | @@ -6180,8 +6198,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; |
10378 | # Try some XSI features | 16304 | # Try some XSI features |
10379 | xsi_shell=no | 16305 | xsi_shell=no |
10380 | ( _lt_dummy="a/b/c" | 16306 | ( _lt_dummy="a/b/c" |
@@ -10385,7 +16311,7 @@ index 6b294bfebfb..52a025bb848 100755 | |||
10385 | && eval 'test $(( 1 + 1 )) -eq 2 \ | 16311 | && eval 'test $(( 1 + 1 )) -eq 2 \ |
10386 | && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ | 16312 | && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ |
10387 | && xsi_shell=yes | 16313 | && xsi_shell=yes |
10388 | @@ -6259,6 +6264,80 @@ esac | 16314 | @@ -6230,6 +6248,80 @@ esac |
10389 | 16315 | ||
10390 | 16316 | ||
10391 | 16317 | ||
@@ -10466,7 +16392,7 @@ index 6b294bfebfb..52a025bb848 100755 | |||
10466 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 | 16392 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 |
10467 | $as_echo_n "checking for $LD option to reload object files... " >&6; } | 16393 | $as_echo_n "checking for $LD option to reload object files... " >&6; } |
10468 | if ${lt_cv_ld_reload_flag+:} false; then : | 16394 | if ${lt_cv_ld_reload_flag+:} false; then : |
10469 | @@ -6275,6 +6354,11 @@ case $reload_flag in | 16395 | @@ -6246,6 +6338,11 @@ case $reload_flag in |
10470 | esac | 16396 | esac |
10471 | reload_cmds='$LD$reload_flag -o $output$reload_objs' | 16397 | reload_cmds='$LD$reload_flag -o $output$reload_objs' |
10472 | case $host_os in | 16398 | case $host_os in |
@@ -10478,7 +16404,7 @@ index 6b294bfebfb..52a025bb848 100755 | |||
10478 | darwin*) | 16404 | darwin*) |
10479 | if test "$GCC" = yes; then | 16405 | if test "$GCC" = yes; then |
10480 | reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' | 16406 | reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' |
10481 | @@ -6443,7 +6527,8 @@ mingw* | pw32*) | 16407 | @@ -6414,7 +6511,8 @@ mingw* | pw32*) |
10482 | lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' | 16408 | lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' |
10483 | lt_cv_file_magic_cmd='func_win32_libid' | 16409 | lt_cv_file_magic_cmd='func_win32_libid' |
10484 | else | 16410 | else |
@@ -10488,7 +16414,7 @@ index 6b294bfebfb..52a025bb848 100755 | |||
10488 | lt_cv_file_magic_cmd='$OBJDUMP -f' | 16414 | lt_cv_file_magic_cmd='$OBJDUMP -f' |
10489 | fi | 16415 | fi |
10490 | ;; | 16416 | ;; |
10491 | @@ -6597,6 +6682,21 @@ esac | 16417 | @@ -6573,6 +6671,21 @@ esac |
10492 | fi | 16418 | fi |
10493 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 | 16419 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 |
10494 | $as_echo "$lt_cv_deplibs_check_method" >&6; } | 16420 | $as_echo "$lt_cv_deplibs_check_method" >&6; } |
@@ -10510,7 +16436,7 @@ index 6b294bfebfb..52a025bb848 100755 | |||
10510 | file_magic_cmd=$lt_cv_file_magic_cmd | 16436 | file_magic_cmd=$lt_cv_file_magic_cmd |
10511 | deplibs_check_method=$lt_cv_deplibs_check_method | 16437 | deplibs_check_method=$lt_cv_deplibs_check_method |
10512 | test -z "$deplibs_check_method" && deplibs_check_method=unknown | 16438 | test -z "$deplibs_check_method" && deplibs_check_method=unknown |
10513 | @@ -6612,9 +6712,162 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown | 16439 | @@ -6588,6 +6701,157 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown |
10514 | 16440 | ||
10515 | 16441 | ||
10516 | 16442 | ||
@@ -10665,6 +16591,12 @@ index 6b294bfebfb..52a025bb848 100755 | |||
10665 | + | 16591 | + |
10666 | + | 16592 | + |
10667 | + | 16593 | + |
16594 | plugin_option= | ||
16595 | plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll" | ||
16596 | for plugin in $plugin_names; do | ||
16597 | @@ -6602,8 +6866,10 @@ for plugin in $plugin_names; do | ||
16598 | done | ||
16599 | |||
10668 | if test -n "$ac_tool_prefix"; then | 16600 | if test -n "$ac_tool_prefix"; then |
10669 | - # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. | 16601 | - # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. |
10670 | -set dummy ${ac_tool_prefix}ar; ac_word=$2 | 16602 | -set dummy ${ac_tool_prefix}ar; ac_word=$2 |
@@ -10675,7 +16607,7 @@ index 6b294bfebfb..52a025bb848 100755 | |||
10675 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | 16607 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
10676 | $as_echo_n "checking for $ac_word... " >&6; } | 16608 | $as_echo_n "checking for $ac_word... " >&6; } |
10677 | if ${ac_cv_prog_AR+:} false; then : | 16609 | if ${ac_cv_prog_AR+:} false; then : |
10678 | @@ -6630,7 +6883,7 @@ do | 16610 | @@ -6619,7 +6885,7 @@ do |
10679 | test -z "$as_dir" && as_dir=. | 16611 | test -z "$as_dir" && as_dir=. |
10680 | for ac_exec_ext in '' $ac_executable_extensions; do | 16612 | for ac_exec_ext in '' $ac_executable_extensions; do |
10681 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | 16613 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
@@ -10684,7 +16616,7 @@ index 6b294bfebfb..52a025bb848 100755 | |||
10684 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | 16616 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
10685 | break 2 | 16617 | break 2 |
10686 | fi | 16618 | fi |
10687 | @@ -6650,11 +6903,15 @@ $as_echo "no" >&6; } | 16619 | @@ -6639,11 +6905,15 @@ $as_echo "no" >&6; } |
10688 | fi | 16620 | fi |
10689 | 16621 | ||
10690 | 16622 | ||
@@ -10703,7 +16635,7 @@ index 6b294bfebfb..52a025bb848 100755 | |||
10703 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | 16635 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
10704 | $as_echo_n "checking for $ac_word... " >&6; } | 16636 | $as_echo_n "checking for $ac_word... " >&6; } |
10705 | if ${ac_cv_prog_ac_ct_AR+:} false; then : | 16637 | if ${ac_cv_prog_ac_ct_AR+:} false; then : |
10706 | @@ -6670,7 +6927,7 @@ do | 16638 | @@ -6659,7 +6929,7 @@ do |
10707 | test -z "$as_dir" && as_dir=. | 16639 | test -z "$as_dir" && as_dir=. |
10708 | for ac_exec_ext in '' $ac_executable_extensions; do | 16640 | for ac_exec_ext in '' $ac_executable_extensions; do |
10709 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | 16641 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
@@ -10712,7 +16644,7 @@ index 6b294bfebfb..52a025bb848 100755 | |||
10712 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | 16644 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
10713 | break 2 | 16645 | break 2 |
10714 | fi | 16646 | fi |
10715 | @@ -6689,6 +6946,10 @@ else | 16647 | @@ -6678,6 +6948,10 @@ else |
10716 | $as_echo "no" >&6; } | 16648 | $as_echo "no" >&6; } |
10717 | fi | 16649 | fi |
10718 | 16650 | ||
@@ -10723,7 +16655,7 @@ index 6b294bfebfb..52a025bb848 100755 | |||
10723 | if test "x$ac_ct_AR" = x; then | 16655 | if test "x$ac_ct_AR" = x; then |
10724 | AR="false" | 16656 | AR="false" |
10725 | else | 16657 | else |
10726 | @@ -6700,16 +6961,72 @@ ac_tool_warned=yes ;; | 16658 | @@ -6689,31 +6963,83 @@ ac_tool_warned=yes ;; |
10727 | esac | 16659 | esac |
10728 | AR=$ac_ct_AR | 16660 | AR=$ac_ct_AR |
10729 | fi | 16661 | fi |
@@ -10732,7 +16664,27 @@ index 6b294bfebfb..52a025bb848 100755 | |||
10732 | fi | 16664 | fi |
10733 | 16665 | ||
10734 | -test -z "$AR" && AR=ar | 16666 | -test -z "$AR" && AR=ar |
16667 | -if test -n "$plugin_option"; then | ||
16668 | - if $AR --help 2>&1 | grep -q "\--plugin"; then | ||
16669 | - touch conftest.c | ||
16670 | - $AR $plugin_option rc conftest.a conftest.c | ||
16671 | - if test "$?" != 0; then | ||
16672 | - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5 | ||
16673 | + touch conftest.c | ||
16674 | + $AR $plugin_option rc conftest.a conftest.c | ||
16675 | + if test "$?" != 0; then | ||
16676 | + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5 | ||
16677 | $as_echo "$as_me: WARNING: Failed: $AR $plugin_option rc" >&2;} | ||
16678 | - else | ||
16679 | - AR="$AR $plugin_option" | ||
16680 | - fi | ||
16681 | - rm -f conftest.* | ||
16682 | + else | ||
16683 | + AR="$AR $plugin_option" | ||
16684 | fi | ||
16685 | -fi | ||
10735 | -test -z "$AR_FLAGS" && AR_FLAGS=cru | 16686 | -test -z "$AR_FLAGS" && AR_FLAGS=cru |
16687 | + rm -f conftest.* | ||
10736 | +: ${AR=ar} | 16688 | +: ${AR=ar} |
10737 | +: ${AR_FLAGS=cru} | 16689 | +: ${AR_FLAGS=cru} |
10738 | + | 16690 | + |
@@ -10740,12 +16692,2021 @@ index 6b294bfebfb..52a025bb848 100755 | |||
10740 | + | 16692 | + |
10741 | + | 16693 | + |
10742 | + | 16694 | + |
16695 | |||
16696 | |||
16697 | |||
16698 | |||
16699 | |||
16700 | |||
16701 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 | ||
16702 | +$as_echo_n "checking for archiver @FILE support... " >&6; } | ||
16703 | +if ${lt_cv_ar_at_file+:} false; then : | ||
16704 | + $as_echo_n "(cached) " >&6 | ||
16705 | +else | ||
16706 | + lt_cv_ar_at_file=no | ||
16707 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
16708 | +/* end confdefs.h. */ | ||
16709 | + | ||
16710 | +int | ||
16711 | +main () | ||
16712 | +{ | ||
16713 | + | ||
16714 | + ; | ||
16715 | + return 0; | ||
16716 | +} | ||
16717 | +_ACEOF | ||
16718 | +if ac_fn_c_try_compile "$LINENO"; then : | ||
16719 | + echo conftest.$ac_objext > conftest.lst | ||
16720 | + lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5' | ||
16721 | + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 | ||
16722 | + (eval $lt_ar_try) 2>&5 | ||
16723 | + ac_status=$? | ||
16724 | + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 | ||
16725 | + test $ac_status = 0; } | ||
16726 | + if test "$ac_status" -eq 0; then | ||
16727 | + # Ensure the archiver fails upon bogus file names. | ||
16728 | + rm -f conftest.$ac_objext libconftest.a | ||
16729 | + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 | ||
16730 | + (eval $lt_ar_try) 2>&5 | ||
16731 | + ac_status=$? | ||
16732 | + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 | ||
16733 | + test $ac_status = 0; } | ||
16734 | + if test "$ac_status" -ne 0; then | ||
16735 | + lt_cv_ar_at_file=@ | ||
16736 | + fi | ||
16737 | + fi | ||
16738 | + rm -f conftest.* libconftest.a | ||
16739 | + | ||
16740 | +fi | ||
16741 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
16742 | + | ||
16743 | +fi | ||
16744 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 | ||
16745 | +$as_echo "$lt_cv_ar_at_file" >&6; } | ||
16746 | + | ||
16747 | +if test "x$lt_cv_ar_at_file" = xno; then | ||
16748 | + archiver_list_spec= | ||
16749 | +else | ||
16750 | + archiver_list_spec=$lt_cv_ar_at_file | ||
16751 | +fi | ||
16752 | + | ||
16753 | + | ||
16754 | |||
16755 | |||
16756 | |||
16757 | @@ -7058,8 +7384,8 @@ esac | ||
16758 | lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" | ||
16759 | |||
16760 | # Transform an extracted symbol line into symbol name and symbol address | ||
16761 | -lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" | ||
16762 | -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'" | ||
16763 | +lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" | ||
16764 | +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'" | ||
16765 | |||
16766 | # Handle CRLF in mingw tool chain | ||
16767 | opt_cr= | ||
16768 | @@ -7095,6 +7421,7 @@ for ac_symprfx in "" "_"; do | ||
16769 | else | ||
16770 | lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" | ||
16771 | fi | ||
16772 | + lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" | ||
16773 | |||
16774 | # Check to see that the pipe works correctly. | ||
16775 | pipe_works=no | ||
16776 | @@ -7136,6 +7463,18 @@ _LT_EOF | ||
16777 | if $GREP ' nm_test_var$' "$nlist" >/dev/null; then | ||
16778 | if $GREP ' nm_test_func$' "$nlist" >/dev/null; then | ||
16779 | cat <<_LT_EOF > conftest.$ac_ext | ||
16780 | +/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ | ||
16781 | +#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) | ||
16782 | +/* DATA imports from DLLs on WIN32 con't be const, because runtime | ||
16783 | + relocations are performed -- see ld's documentation on pseudo-relocs. */ | ||
16784 | +# define LT_DLSYM_CONST | ||
16785 | +#elif defined(__osf__) | ||
16786 | +/* This system does not cope well with relocations in const data. */ | ||
16787 | +# define LT_DLSYM_CONST | ||
16788 | +#else | ||
16789 | +# define LT_DLSYM_CONST const | ||
16790 | +#endif | ||
16791 | + | ||
16792 | #ifdef __cplusplus | ||
16793 | extern "C" { | ||
16794 | #endif | ||
16795 | @@ -7147,7 +7486,7 @@ _LT_EOF | ||
16796 | cat <<_LT_EOF >> conftest.$ac_ext | ||
16797 | |||
16798 | /* The mapping between symbol names and symbols. */ | ||
16799 | -const struct { | ||
16800 | +LT_DLSYM_CONST struct { | ||
16801 | const char *name; | ||
16802 | void *address; | ||
16803 | } | ||
16804 | @@ -7173,8 +7512,8 @@ static const void *lt_preloaded_setup() { | ||
16805 | _LT_EOF | ||
16806 | # Now try linking the two files. | ||
16807 | mv conftest.$ac_objext conftstm.$ac_objext | ||
16808 | - lt_save_LIBS="$LIBS" | ||
16809 | - lt_save_CFLAGS="$CFLAGS" | ||
16810 | + lt_globsym_save_LIBS=$LIBS | ||
16811 | + lt_globsym_save_CFLAGS=$CFLAGS | ||
16812 | LIBS="conftstm.$ac_objext" | ||
16813 | CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" | ||
16814 | if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 | ||
16815 | @@ -7184,8 +7523,8 @@ _LT_EOF | ||
16816 | test $ac_status = 0; } && test -s conftest${ac_exeext}; then | ||
16817 | pipe_works=yes | ||
16818 | fi | ||
16819 | - LIBS="$lt_save_LIBS" | ||
16820 | - CFLAGS="$lt_save_CFLAGS" | ||
16821 | + LIBS=$lt_globsym_save_LIBS | ||
16822 | + CFLAGS=$lt_globsym_save_CFLAGS | ||
16823 | else | ||
16824 | echo "cannot find nm_test_func in $nlist" >&5 | ||
16825 | fi | ||
16826 | @@ -7222,6 +7561,18 @@ else | ||
16827 | $as_echo "ok" >&6; } | ||
16828 | fi | ||
16829 | |||
16830 | +# Response file support. | ||
16831 | +if test "$lt_cv_nm_interface" = "MS dumpbin"; then | ||
16832 | + nm_file_list_spec='@' | ||
16833 | +elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then | ||
16834 | + nm_file_list_spec='@' | ||
16835 | +fi | ||
16836 | + | ||
16837 | + | ||
16838 | + | ||
16839 | + | ||
16840 | + | ||
16841 | + | ||
16842 | |||
16843 | |||
16844 | |||
16845 | @@ -7238,6 +7589,43 @@ fi | ||
16846 | |||
16847 | |||
16848 | |||
16849 | + | ||
16850 | + | ||
16851 | + | ||
16852 | + | ||
16853 | + | ||
16854 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 | ||
16855 | +$as_echo_n "checking for sysroot... " >&6; } | ||
16856 | + | ||
16857 | +# Check whether --with-libtool-sysroot was given. | ||
16858 | +if test "${with_libtool_sysroot+set}" = set; then : | ||
16859 | + withval=$with_libtool_sysroot; | ||
16860 | +else | ||
16861 | + with_libtool_sysroot=no | ||
16862 | +fi | ||
16863 | + | ||
16864 | + | ||
16865 | +lt_sysroot= | ||
16866 | +case ${with_libtool_sysroot} in #( | ||
16867 | + yes) | ||
16868 | + if test "$GCC" = yes; then | ||
16869 | + lt_sysroot=`$CC --print-sysroot 2>/dev/null` | ||
16870 | + fi | ||
16871 | + ;; #( | ||
16872 | + /*) | ||
16873 | + lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"` | ||
16874 | + ;; #( | ||
16875 | + no|'') | ||
16876 | + ;; #( | ||
16877 | + *) | ||
16878 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5 | ||
16879 | +$as_echo "${with_libtool_sysroot}" >&6; } | ||
16880 | + as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 | ||
16881 | + ;; | ||
16882 | +esac | ||
16883 | + | ||
16884 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 | ||
16885 | +$as_echo "${lt_sysroot:-no}" >&6; } | ||
16886 | |||
16887 | |||
16888 | |||
16889 | @@ -7404,50 +7792,167 @@ _ACEOF | ||
16890 | if ac_fn_c_try_link "$LINENO"; then : | ||
16891 | lt_cv_cc_needs_belf=yes | ||
16892 | else | ||
16893 | - lt_cv_cc_needs_belf=no | ||
16894 | + lt_cv_cc_needs_belf=no | ||
16895 | +fi | ||
16896 | +rm -f core conftest.err conftest.$ac_objext \ | ||
16897 | + conftest$ac_exeext conftest.$ac_ext | ||
16898 | + ac_ext=c | ||
16899 | +ac_cpp='$CPP $CPPFLAGS' | ||
16900 | +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' | ||
16901 | +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' | ||
16902 | +ac_compiler_gnu=$ac_cv_c_compiler_gnu | ||
16903 | + | ||
16904 | +fi | ||
16905 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5 | ||
16906 | +$as_echo "$lt_cv_cc_needs_belf" >&6; } | ||
16907 | + if test x"$lt_cv_cc_needs_belf" != x"yes"; then | ||
16908 | + # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf | ||
16909 | + CFLAGS="$SAVE_CFLAGS" | ||
16910 | + fi | ||
16911 | + ;; | ||
16912 | +sparc*-*solaris*) | ||
16913 | + # Find out which ABI we are using. | ||
16914 | + echo 'int i;' > conftest.$ac_ext | ||
16915 | + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 | ||
16916 | + (eval $ac_compile) 2>&5 | ||
16917 | + ac_status=$? | ||
16918 | + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 | ||
16919 | + test $ac_status = 0; }; then | ||
16920 | + case `/usr/bin/file conftest.o` in | ||
16921 | + *64-bit*) | ||
16922 | + case $lt_cv_prog_gnu_ld in | ||
16923 | + yes*) LD="${LD-ld} -m elf64_sparc" ;; | ||
16924 | + *) | ||
16925 | + if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then | ||
16926 | + LD="${LD-ld} -64" | ||
16927 | + fi | ||
16928 | + ;; | ||
16929 | + esac | ||
16930 | + ;; | ||
16931 | + esac | ||
16932 | + fi | ||
16933 | + rm -rf conftest* | ||
16934 | + ;; | ||
16935 | +esac | ||
16936 | + | ||
16937 | +need_locks="$enable_libtool_lock" | ||
16938 | + | ||
16939 | +if test -n "$ac_tool_prefix"; then | ||
16940 | + # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args. | ||
16941 | +set dummy ${ac_tool_prefix}mt; ac_word=$2 | ||
16942 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
16943 | +$as_echo_n "checking for $ac_word... " >&6; } | ||
16944 | +if ${ac_cv_prog_MANIFEST_TOOL+:} false; then : | ||
16945 | + $as_echo_n "(cached) " >&6 | ||
16946 | +else | ||
16947 | + if test -n "$MANIFEST_TOOL"; then | ||
16948 | + ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test. | ||
16949 | +else | ||
16950 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | ||
16951 | +for as_dir in $PATH | ||
16952 | +do | ||
16953 | + IFS=$as_save_IFS | ||
16954 | + test -z "$as_dir" && as_dir=. | ||
16955 | + for ac_exec_ext in '' $ac_executable_extensions; do | ||
16956 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | ||
16957 | + ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" | ||
16958 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
16959 | + break 2 | ||
16960 | + fi | ||
16961 | +done | ||
16962 | + done | ||
16963 | +IFS=$as_save_IFS | ||
16964 | + | ||
16965 | +fi | ||
16966 | +fi | ||
16967 | +MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL | ||
16968 | +if test -n "$MANIFEST_TOOL"; then | ||
16969 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5 | ||
16970 | +$as_echo "$MANIFEST_TOOL" >&6; } | ||
16971 | +else | ||
16972 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
16973 | +$as_echo "no" >&6; } | ||
16974 | +fi | ||
16975 | + | ||
16976 | + | ||
16977 | +fi | ||
16978 | +if test -z "$ac_cv_prog_MANIFEST_TOOL"; then | ||
16979 | + ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL | ||
16980 | + # Extract the first word of "mt", so it can be a program name with args. | ||
16981 | +set dummy mt; ac_word=$2 | ||
16982 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
16983 | +$as_echo_n "checking for $ac_word... " >&6; } | ||
16984 | +if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then : | ||
16985 | + $as_echo_n "(cached) " >&6 | ||
16986 | +else | ||
16987 | + if test -n "$ac_ct_MANIFEST_TOOL"; then | ||
16988 | + ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test. | ||
16989 | +else | ||
16990 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | ||
16991 | +for as_dir in $PATH | ||
16992 | +do | ||
16993 | + IFS=$as_save_IFS | ||
16994 | + test -z "$as_dir" && as_dir=. | ||
16995 | + for ac_exec_ext in '' $ac_executable_extensions; do | ||
16996 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | ||
16997 | + ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" | ||
16998 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
16999 | + break 2 | ||
17000 | + fi | ||
17001 | +done | ||
17002 | + done | ||
17003 | +IFS=$as_save_IFS | ||
17004 | + | ||
17005 | +fi | ||
17006 | +fi | ||
17007 | +ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL | ||
17008 | +if test -n "$ac_ct_MANIFEST_TOOL"; then | ||
17009 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5 | ||
17010 | +$as_echo "$ac_ct_MANIFEST_TOOL" >&6; } | ||
17011 | +else | ||
17012 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
17013 | +$as_echo "no" >&6; } | ||
17014 | fi | ||
17015 | -rm -f core conftest.err conftest.$ac_objext \ | ||
17016 | - conftest$ac_exeext conftest.$ac_ext | ||
17017 | - ac_ext=c | ||
17018 | -ac_cpp='$CPP $CPPFLAGS' | ||
17019 | -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' | ||
17020 | -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' | ||
17021 | -ac_compiler_gnu=$ac_cv_c_compiler_gnu | ||
17022 | |||
17023 | -fi | ||
17024 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5 | ||
17025 | -$as_echo "$lt_cv_cc_needs_belf" >&6; } | ||
17026 | - if test x"$lt_cv_cc_needs_belf" != x"yes"; then | ||
17027 | - # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf | ||
17028 | - CFLAGS="$SAVE_CFLAGS" | ||
17029 | + if test "x$ac_ct_MANIFEST_TOOL" = x; then | ||
17030 | + MANIFEST_TOOL=":" | ||
17031 | + else | ||
17032 | + case $cross_compiling:$ac_tool_warned in | ||
17033 | +yes:) | ||
17034 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 | ||
17035 | +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} | ||
17036 | +ac_tool_warned=yes ;; | ||
17037 | +esac | ||
17038 | + MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL | ||
17039 | fi | ||
17040 | - ;; | ||
17041 | -sparc*-*solaris*) | ||
17042 | - # Find out which ABI we are using. | ||
17043 | - echo 'int i;' > conftest.$ac_ext | ||
17044 | - if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 | ||
17045 | - (eval $ac_compile) 2>&5 | ||
17046 | - ac_status=$? | ||
17047 | - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 | ||
17048 | - test $ac_status = 0; }; then | ||
17049 | - case `/usr/bin/file conftest.o` in | ||
17050 | - *64-bit*) | ||
17051 | - case $lt_cv_prog_gnu_ld in | ||
17052 | - yes*) LD="${LD-ld} -m elf64_sparc" ;; | ||
17053 | - *) | ||
17054 | - if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then | ||
17055 | - LD="${LD-ld} -64" | ||
17056 | - fi | ||
17057 | - ;; | ||
17058 | - esac | ||
17059 | - ;; | ||
17060 | - esac | ||
17061 | +else | ||
17062 | + MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL" | ||
17063 | +fi | ||
17064 | + | ||
17065 | +test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt | ||
17066 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5 | ||
17067 | +$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; } | ||
17068 | +if ${lt_cv_path_mainfest_tool+:} false; then : | ||
17069 | + $as_echo_n "(cached) " >&6 | ||
17070 | +else | ||
17071 | + lt_cv_path_mainfest_tool=no | ||
17072 | + echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5 | ||
17073 | + $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out | ||
17074 | + cat conftest.err >&5 | ||
17075 | + if $GREP 'Manifest Tool' conftest.out > /dev/null; then | ||
17076 | + lt_cv_path_mainfest_tool=yes | ||
17077 | fi | ||
17078 | - rm -rf conftest* | ||
17079 | - ;; | ||
17080 | -esac | ||
17081 | + rm -f conftest* | ||
17082 | +fi | ||
17083 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5 | ||
17084 | +$as_echo "$lt_cv_path_mainfest_tool" >&6; } | ||
17085 | +if test "x$lt_cv_path_mainfest_tool" != xyes; then | ||
17086 | + MANIFEST_TOOL=: | ||
17087 | +fi | ||
17088 | + | ||
17089 | + | ||
17090 | + | ||
17091 | |||
17092 | -need_locks="$enable_libtool_lock" | ||
17093 | |||
17094 | |||
17095 | case $host_os in | ||
17096 | @@ -8012,6 +8517,8 @@ _LT_EOF | ||
17097 | $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 | ||
17098 | echo "$AR cru libconftest.a conftest.o" >&5 | ||
17099 | $AR cru libconftest.a conftest.o 2>&5 | ||
17100 | + echo "$RANLIB libconftest.a" >&5 | ||
17101 | + $RANLIB libconftest.a 2>&5 | ||
17102 | cat > conftest.c << _LT_EOF | ||
17103 | int main() { return 0;} | ||
17104 | _LT_EOF | ||
17105 | @@ -8596,8 +9103,6 @@ fi | ||
17106 | lt_prog_compiler_pic= | ||
17107 | lt_prog_compiler_static= | ||
17108 | |||
17109 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 | ||
17110 | -$as_echo_n "checking for $compiler option to produce PIC... " >&6; } | ||
17111 | |||
17112 | if test "$GCC" = yes; then | ||
17113 | lt_prog_compiler_wl='-Wl,' | ||
17114 | @@ -8763,6 +9268,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } | ||
17115 | lt_prog_compiler_pic='--shared' | ||
17116 | lt_prog_compiler_static='--static' | ||
17117 | ;; | ||
17118 | + nagfor*) | ||
17119 | + # NAG Fortran compiler | ||
17120 | + lt_prog_compiler_wl='-Wl,-Wl,,' | ||
17121 | + lt_prog_compiler_pic='-PIC' | ||
17122 | + lt_prog_compiler_static='-Bstatic' | ||
17123 | + ;; | ||
17124 | pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) | ||
17125 | # Portland Group compilers (*not* the Pentium gcc compiler, | ||
17126 | # which looks to be a dead project) | ||
17127 | @@ -8825,7 +9336,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } | ||
17128 | lt_prog_compiler_pic='-KPIC' | ||
17129 | lt_prog_compiler_static='-Bstatic' | ||
17130 | case $cc_basename in | ||
17131 | - f77* | f90* | f95*) | ||
17132 | + f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) | ||
17133 | lt_prog_compiler_wl='-Qoption ld ';; | ||
17134 | *) | ||
17135 | lt_prog_compiler_wl='-Wl,';; | ||
17136 | @@ -8882,13 +9393,17 @@ case $host_os in | ||
17137 | lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" | ||
17138 | ;; | ||
17139 | esac | ||
17140 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5 | ||
17141 | -$as_echo "$lt_prog_compiler_pic" >&6; } | ||
17142 | - | ||
17143 | - | ||
17144 | - | ||
17145 | - | ||
17146 | |||
17147 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 | ||
17148 | +$as_echo_n "checking for $compiler option to produce PIC... " >&6; } | ||
17149 | +if ${lt_cv_prog_compiler_pic+:} false; then : | ||
17150 | + $as_echo_n "(cached) " >&6 | ||
17151 | +else | ||
17152 | + lt_cv_prog_compiler_pic=$lt_prog_compiler_pic | ||
17153 | +fi | ||
17154 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5 | ||
17155 | +$as_echo "$lt_cv_prog_compiler_pic" >&6; } | ||
17156 | +lt_prog_compiler_pic=$lt_cv_prog_compiler_pic | ||
17157 | |||
17158 | # | ||
17159 | # Check to make sure the PIC flag actually works. | ||
17160 | @@ -8949,6 +9464,11 @@ fi | ||
17161 | |||
17162 | |||
17163 | |||
17164 | + | ||
17165 | + | ||
17166 | + | ||
17167 | + | ||
17168 | + | ||
17169 | # | ||
17170 | # Check to make sure the static flag actually works. | ||
17171 | # | ||
17172 | @@ -9299,7 +9819,8 @@ _LT_EOF | ||
17173 | allow_undefined_flag=unsupported | ||
17174 | always_export_symbols=no | ||
17175 | enable_shared_with_static_runtimes=yes | ||
17176 | - export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' | ||
17177 | + 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' | ||
17178 | + exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' | ||
17179 | |||
17180 | if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then | ||
17181 | archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' | ||
17182 | @@ -9398,12 +9919,12 @@ _LT_EOF | ||
17183 | whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' | ||
17184 | hardcode_libdir_flag_spec= | ||
17185 | hardcode_libdir_flag_spec_ld='-rpath $libdir' | ||
17186 | - archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' | ||
17187 | + archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' | ||
17188 | if test "x$supports_anon_versioning" = xyes; then | ||
17189 | archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ | ||
17190 | cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ | ||
17191 | echo "local: *; };" >> $output_objdir/$libname.ver~ | ||
17192 | - $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' | ||
17193 | + $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' | ||
17194 | fi | ||
17195 | ;; | ||
17196 | esac | ||
17197 | @@ -9417,8 +9938,8 @@ _LT_EOF | ||
17198 | archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' | ||
17199 | wlarc= | ||
17200 | else | ||
17201 | - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' | ||
17202 | - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' | ||
17203 | + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' | ||
17204 | + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' | ||
17205 | fi | ||
17206 | ;; | ||
17207 | |||
17208 | @@ -9436,8 +9957,8 @@ _LT_EOF | ||
17209 | |||
17210 | _LT_EOF | ||
17211 | elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then | ||
17212 | - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' | ||
17213 | - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' | ||
17214 | + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' | ||
17215 | + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' | ||
17216 | else | ||
17217 | ld_shlibs=no | ||
17218 | fi | ||
17219 | @@ -9483,8 +10004,8 @@ _LT_EOF | ||
17220 | |||
17221 | *) | ||
17222 | if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then | ||
17223 | - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' | ||
17224 | - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' | ||
17225 | + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' | ||
17226 | + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' | ||
17227 | else | ||
17228 | ld_shlibs=no | ||
17229 | fi | ||
17230 | @@ -9614,7 +10135,13 @@ _LT_EOF | ||
17231 | allow_undefined_flag='-berok' | ||
17232 | # Determine the default libpath from the value encoded in an | ||
17233 | # empty executable. | ||
17234 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
17235 | + if test "${lt_cv_aix_libpath+set}" = set; then | ||
17236 | + aix_libpath=$lt_cv_aix_libpath | ||
17237 | +else | ||
17238 | + if ${lt_cv_aix_libpath_+:} false; then : | ||
17239 | + $as_echo_n "(cached) " >&6 | ||
17240 | +else | ||
17241 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
17242 | /* end confdefs.h. */ | ||
17243 | |||
17244 | int | ||
17245 | @@ -9627,22 +10154,29 @@ main () | ||
17246 | _ACEOF | ||
17247 | if ac_fn_c_try_link "$LINENO"; then : | ||
17248 | |||
17249 | -lt_aix_libpath_sed=' | ||
17250 | - /Import File Strings/,/^$/ { | ||
17251 | - /^0/ { | ||
17252 | - s/^0 *\(.*\)$/\1/ | ||
17253 | - p | ||
17254 | - } | ||
17255 | - }' | ||
17256 | -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | ||
17257 | -# Check for a 64-bit object if we didn't find anything. | ||
17258 | -if test -z "$aix_libpath"; then | ||
17259 | - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | ||
17260 | -fi | ||
17261 | + lt_aix_libpath_sed=' | ||
17262 | + /Import File Strings/,/^$/ { | ||
17263 | + /^0/ { | ||
17264 | + s/^0 *\([^ ]*\) *$/\1/ | ||
17265 | + p | ||
17266 | + } | ||
17267 | + }' | ||
17268 | + lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | ||
17269 | + # Check for a 64-bit object if we didn't find anything. | ||
17270 | + if test -z "$lt_cv_aix_libpath_"; then | ||
17271 | + lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | ||
17272 | + fi | ||
17273 | fi | ||
17274 | rm -f core conftest.err conftest.$ac_objext \ | ||
17275 | conftest$ac_exeext conftest.$ac_ext | ||
17276 | -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | ||
17277 | + if test -z "$lt_cv_aix_libpath_"; then | ||
17278 | + lt_cv_aix_libpath_="/usr/lib:/lib" | ||
17279 | + fi | ||
17280 | + | ||
17281 | +fi | ||
17282 | + | ||
17283 | + aix_libpath=$lt_cv_aix_libpath_ | ||
17284 | +fi | ||
17285 | |||
17286 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" | ||
17287 | archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" | ||
17288 | @@ -9654,7 +10188,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | ||
17289 | else | ||
17290 | # Determine the default libpath from the value encoded in an | ||
17291 | # empty executable. | ||
17292 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
17293 | + if test "${lt_cv_aix_libpath+set}" = set; then | ||
17294 | + aix_libpath=$lt_cv_aix_libpath | ||
17295 | +else | ||
17296 | + if ${lt_cv_aix_libpath_+:} false; then : | ||
17297 | + $as_echo_n "(cached) " >&6 | ||
17298 | +else | ||
17299 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
17300 | /* end confdefs.h. */ | ||
17301 | |||
17302 | int | ||
17303 | @@ -9667,22 +10207,29 @@ main () | ||
17304 | _ACEOF | ||
17305 | if ac_fn_c_try_link "$LINENO"; then : | ||
17306 | |||
17307 | -lt_aix_libpath_sed=' | ||
17308 | - /Import File Strings/,/^$/ { | ||
17309 | - /^0/ { | ||
17310 | - s/^0 *\(.*\)$/\1/ | ||
17311 | - p | ||
17312 | - } | ||
17313 | - }' | ||
17314 | -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | ||
17315 | -# Check for a 64-bit object if we didn't find anything. | ||
17316 | -if test -z "$aix_libpath"; then | ||
17317 | - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | ||
17318 | -fi | ||
17319 | + lt_aix_libpath_sed=' | ||
17320 | + /Import File Strings/,/^$/ { | ||
17321 | + /^0/ { | ||
17322 | + s/^0 *\([^ ]*\) *$/\1/ | ||
17323 | + p | ||
17324 | + } | ||
17325 | + }' | ||
17326 | + lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | ||
17327 | + # Check for a 64-bit object if we didn't find anything. | ||
17328 | + if test -z "$lt_cv_aix_libpath_"; then | ||
17329 | + lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | ||
17330 | + fi | ||
17331 | fi | ||
17332 | rm -f core conftest.err conftest.$ac_objext \ | ||
17333 | conftest$ac_exeext conftest.$ac_ext | ||
17334 | -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | ||
17335 | + if test -z "$lt_cv_aix_libpath_"; then | ||
17336 | + lt_cv_aix_libpath_="/usr/lib:/lib" | ||
17337 | + fi | ||
17338 | + | ||
17339 | +fi | ||
17340 | + | ||
17341 | + aix_libpath=$lt_cv_aix_libpath_ | ||
17342 | +fi | ||
17343 | |||
17344 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" | ||
17345 | # Warning - without using the other run time loading flags, | ||
17346 | @@ -9727,20 +10274,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | ||
17347 | # Microsoft Visual C++. | ||
17348 | # hardcode_libdir_flag_spec is actually meaningless, as there is | ||
17349 | # no search path for DLLs. | ||
17350 | - hardcode_libdir_flag_spec=' ' | ||
17351 | - allow_undefined_flag=unsupported | ||
17352 | - # Tell ltmain to make .lib files, not .a files. | ||
17353 | - libext=lib | ||
17354 | - # Tell ltmain to make .dll files, not .so files. | ||
17355 | - shrext_cmds=".dll" | ||
17356 | - # FIXME: Setting linknames here is a bad hack. | ||
17357 | - archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' | ||
17358 | - # The linker will automatically build a .lib file if we build a DLL. | ||
17359 | - old_archive_from_new_cmds='true' | ||
17360 | - # FIXME: Should let the user specify the lib program. | ||
17361 | - old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' | ||
17362 | - fix_srcfile_path='`cygpath -w "$srcfile"`' | ||
17363 | - enable_shared_with_static_runtimes=yes | ||
17364 | + case $cc_basename in | ||
17365 | + cl*) | ||
17366 | + # Native MSVC | ||
17367 | + hardcode_libdir_flag_spec=' ' | ||
17368 | + allow_undefined_flag=unsupported | ||
17369 | + always_export_symbols=yes | ||
17370 | + file_list_spec='@' | ||
17371 | + # Tell ltmain to make .lib files, not .a files. | ||
17372 | + libext=lib | ||
17373 | + # Tell ltmain to make .dll files, not .so files. | ||
17374 | + shrext_cmds=".dll" | ||
17375 | + # FIXME: Setting linknames here is a bad hack. | ||
17376 | + archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' | ||
17377 | + archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then | ||
17378 | + sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; | ||
17379 | + else | ||
17380 | + sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; | ||
17381 | + fi~ | ||
17382 | + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ | ||
17383 | + linknames=' | ||
17384 | + # The linker will not automatically build a static lib if we build a DLL. | ||
17385 | + # _LT_TAGVAR(old_archive_from_new_cmds, )='true' | ||
17386 | + enable_shared_with_static_runtimes=yes | ||
17387 | + export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' | ||
17388 | + # Don't use ranlib | ||
17389 | + old_postinstall_cmds='chmod 644 $oldlib' | ||
17390 | + postlink_cmds='lt_outputfile="@OUTPUT@"~ | ||
17391 | + lt_tool_outputfile="@TOOL_OUTPUT@"~ | ||
17392 | + case $lt_outputfile in | ||
17393 | + *.exe|*.EXE) ;; | ||
17394 | + *) | ||
17395 | + lt_outputfile="$lt_outputfile.exe" | ||
17396 | + lt_tool_outputfile="$lt_tool_outputfile.exe" | ||
17397 | + ;; | ||
17398 | + esac~ | ||
17399 | + if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then | ||
17400 | + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; | ||
17401 | + $RM "$lt_outputfile.manifest"; | ||
17402 | + fi' | ||
17403 | + ;; | ||
17404 | + *) | ||
17405 | + # Assume MSVC wrapper | ||
17406 | + hardcode_libdir_flag_spec=' ' | ||
17407 | + allow_undefined_flag=unsupported | ||
17408 | + # Tell ltmain to make .lib files, not .a files. | ||
17409 | + libext=lib | ||
17410 | + # Tell ltmain to make .dll files, not .so files. | ||
17411 | + shrext_cmds=".dll" | ||
17412 | + # FIXME: Setting linknames here is a bad hack. | ||
17413 | + archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' | ||
17414 | + # The linker will automatically build a .lib file if we build a DLL. | ||
17415 | + old_archive_from_new_cmds='true' | ||
17416 | + # FIXME: Should let the user specify the lib program. | ||
17417 | + old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' | ||
17418 | + enable_shared_with_static_runtimes=yes | ||
17419 | + ;; | ||
17420 | + esac | ||
17421 | ;; | ||
17422 | |||
17423 | darwin* | rhapsody*) | ||
17424 | @@ -9801,7 +10391,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | ||
17425 | |||
17426 | # FreeBSD 3 and greater uses gcc -shared to do shared libraries. | ||
17427 | freebsd* | dragonfly*) | ||
17428 | - archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' | ||
17429 | + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' | ||
17430 | hardcode_libdir_flag_spec='-R$libdir' | ||
17431 | hardcode_direct=yes | ||
17432 | hardcode_shlibpath_var=no | ||
17433 | @@ -9809,7 +10399,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | ||
17434 | |||
17435 | hpux9*) | ||
17436 | if test "$GCC" = yes; then | ||
17437 | - 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' | ||
17438 | + 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' | ||
17439 | else | ||
17440 | archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' | ||
17441 | fi | ||
17442 | @@ -9825,7 +10415,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | ||
17443 | |||
17444 | hpux10*) | ||
17445 | if test "$GCC" = yes && test "$with_gnu_ld" = no; then | ||
17446 | - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' | ||
17447 | + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' | ||
17448 | else | ||
17449 | archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' | ||
17450 | fi | ||
17451 | @@ -9849,10 +10439,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | ||
17452 | archive_cmds='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' | ||
17453 | ;; | ||
17454 | ia64*) | ||
17455 | - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' | ||
17456 | + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' | ||
17457 | ;; | ||
17458 | *) | ||
17459 | - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' | ||
17460 | + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' | ||
17461 | ;; | ||
17462 | esac | ||
17463 | else | ||
17464 | @@ -9931,23 +10521,36 @@ fi | ||
17465 | |||
17466 | irix5* | irix6* | nonstopux*) | ||
17467 | if test "$GCC" = yes; then | ||
17468 | - 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' | ||
17469 | + 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' | ||
17470 | # Try to use the -exported_symbol ld option, if it does not | ||
17471 | # work, assume that -exports_file does not work either and | ||
17472 | # implicitly export all symbols. | ||
17473 | - save_LDFLAGS="$LDFLAGS" | ||
17474 | - LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" | ||
17475 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
17476 | + # This should be the same for all languages, so no per-tag cache variable. | ||
17477 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5 | ||
17478 | +$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; } | ||
17479 | +if ${lt_cv_irix_exported_symbol+:} false; then : | ||
17480 | + $as_echo_n "(cached) " >&6 | ||
17481 | +else | ||
17482 | + save_LDFLAGS="$LDFLAGS" | ||
17483 | + LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" | ||
17484 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
17485 | /* end confdefs.h. */ | ||
17486 | -int foo(void) {} | ||
17487 | +int foo (void) { return 0; } | ||
17488 | _ACEOF | ||
17489 | if ac_fn_c_try_link "$LINENO"; then : | ||
17490 | - 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' | ||
17491 | - | ||
17492 | + lt_cv_irix_exported_symbol=yes | ||
17493 | +else | ||
17494 | + lt_cv_irix_exported_symbol=no | ||
17495 | fi | ||
17496 | rm -f core conftest.err conftest.$ac_objext \ | ||
17497 | conftest$ac_exeext conftest.$ac_ext | ||
17498 | - LDFLAGS="$save_LDFLAGS" | ||
17499 | + LDFLAGS="$save_LDFLAGS" | ||
17500 | +fi | ||
17501 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5 | ||
17502 | +$as_echo "$lt_cv_irix_exported_symbol" >&6; } | ||
17503 | + if test "$lt_cv_irix_exported_symbol" = yes; then | ||
17504 | + 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' | ||
17505 | + fi | ||
17506 | else | ||
17507 | archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' | ||
17508 | archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' | ||
17509 | @@ -10032,7 +10635,7 @@ rm -f core conftest.err conftest.$ac_objext \ | ||
17510 | osf4* | osf5*) # as osf3* with the addition of -msym flag | ||
17511 | if test "$GCC" = yes; then | ||
17512 | allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' | ||
17513 | - 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' | ||
17514 | + 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' | ||
17515 | hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' | ||
17516 | else | ||
17517 | allow_undefined_flag=' -expect_unresolved \*' | ||
17518 | @@ -10051,9 +10654,9 @@ rm -f core conftest.err conftest.$ac_objext \ | ||
17519 | no_undefined_flag=' -z defs' | ||
17520 | if test "$GCC" = yes; then | ||
17521 | wlarc='${wl}' | ||
17522 | - archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' | ||
17523 | + archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' | ||
17524 | archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ | ||
17525 | - $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' | ||
17526 | + $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' | ||
17527 | else | ||
17528 | case `$CC -V 2>&1` in | ||
17529 | *"Compilers 5.0"*) | ||
17530 | @@ -10629,8 +11232,9 @@ cygwin* | mingw* | pw32* | cegcc*) | ||
17531 | need_version=no | ||
17532 | need_lib_prefix=no | ||
17533 | |||
17534 | - case $GCC,$host_os in | ||
17535 | - yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) | ||
17536 | + case $GCC,$cc_basename in | ||
17537 | + yes,*) | ||
17538 | + # gcc | ||
17539 | library_names_spec='$libname.dll.a' | ||
17540 | # DLL is installed to $(libdir)/../bin by postinstall_cmds | ||
17541 | postinstall_cmds='base_file=`basename \${file}`~ | ||
17542 | @@ -10663,13 +11267,71 @@ cygwin* | mingw* | pw32* | cegcc*) | ||
17543 | library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' | ||
17544 | ;; | ||
17545 | esac | ||
17546 | + dynamic_linker='Win32 ld.exe' | ||
17547 | + ;; | ||
17548 | + | ||
17549 | + *,cl*) | ||
17550 | + # Native MSVC | ||
17551 | + libname_spec='$name' | ||
17552 | + soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' | ||
17553 | + library_names_spec='${libname}.dll.lib' | ||
17554 | + | ||
17555 | + case $build_os in | ||
17556 | + mingw*) | ||
17557 | + sys_lib_search_path_spec= | ||
17558 | + lt_save_ifs=$IFS | ||
17559 | + IFS=';' | ||
17560 | + for lt_path in $LIB | ||
17561 | + do | ||
17562 | + IFS=$lt_save_ifs | ||
17563 | + # Let DOS variable expansion print the short 8.3 style file name. | ||
17564 | + lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` | ||
17565 | + sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" | ||
17566 | + done | ||
17567 | + IFS=$lt_save_ifs | ||
17568 | + # Convert to MSYS style. | ||
17569 | + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` | ||
17570 | + ;; | ||
17571 | + cygwin*) | ||
17572 | + # Convert to unix form, then to dos form, then back to unix form | ||
17573 | + # but this time dos style (no spaces!) so that the unix form looks | ||
17574 | + # like /cygdrive/c/PROGRA~1:/cygdr... | ||
17575 | + sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` | ||
17576 | + sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` | ||
17577 | + sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` | ||
17578 | + ;; | ||
17579 | + *) | ||
17580 | + sys_lib_search_path_spec="$LIB" | ||
17581 | + if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then | ||
17582 | + # It is most probably a Windows format PATH. | ||
17583 | + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` | ||
17584 | + else | ||
17585 | + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` | ||
17586 | + fi | ||
17587 | + # FIXME: find the short name or the path components, as spaces are | ||
17588 | + # common. (e.g. "Program Files" -> "PROGRA~1") | ||
17589 | + ;; | ||
17590 | + esac | ||
17591 | + | ||
17592 | + # DLL is installed to $(libdir)/../bin by postinstall_cmds | ||
17593 | + postinstall_cmds='base_file=`basename \${file}`~ | ||
17594 | + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ | ||
17595 | + dldir=$destdir/`dirname \$dlpath`~ | ||
17596 | + test -d \$dldir || mkdir -p \$dldir~ | ||
17597 | + $install_prog $dir/$dlname \$dldir/$dlname' | ||
17598 | + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ | ||
17599 | + dlpath=$dir/\$dldll~ | ||
17600 | + $RM \$dlpath' | ||
17601 | + shlibpath_overrides_runpath=yes | ||
17602 | + dynamic_linker='Win32 link.exe' | ||
17603 | ;; | ||
17604 | |||
17605 | *) | ||
17606 | + # Assume MSVC wrapper | ||
17607 | library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' | ||
17608 | + dynamic_linker='Win32 ld.exe' | ||
17609 | ;; | ||
17610 | esac | ||
17611 | - dynamic_linker='Win32 ld.exe' | ||
17612 | # FIXME: first we should search . and the directory the executable is in | ||
17613 | shlibpath_var=PATH | ||
17614 | ;; | ||
17615 | @@ -11571,7 +12233,7 @@ else | ||
17616 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 | ||
17617 | lt_status=$lt_dlunknown | ||
17618 | cat > conftest.$ac_ext <<_LT_EOF | ||
17619 | -#line 11574 "configure" | ||
17620 | +#line $LINENO "configure" | ||
17621 | #include "confdefs.h" | ||
17622 | |||
17623 | #if HAVE_DLFCN_H | ||
17624 | @@ -11615,10 +12277,10 @@ else | ||
17625 | /* When -fvisbility=hidden is used, assume the code has been annotated | ||
17626 | correspondingly for the symbols needed. */ | ||
17627 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) | ||
17628 | -void fnord () __attribute__((visibility("default"))); | ||
17629 | +int fnord () __attribute__((visibility("default"))); | ||
17630 | #endif | ||
17631 | |||
17632 | -void fnord () { int i=42; } | ||
17633 | +int fnord () { return 42; } | ||
17634 | int main () | ||
17635 | { | ||
17636 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); | ||
17637 | @@ -11677,7 +12339,7 @@ else | ||
17638 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 | ||
17639 | lt_status=$lt_dlunknown | ||
17640 | cat > conftest.$ac_ext <<_LT_EOF | ||
17641 | -#line 11680 "configure" | ||
17642 | +#line $LINENO "configure" | ||
17643 | #include "confdefs.h" | ||
17644 | |||
17645 | #if HAVE_DLFCN_H | ||
17646 | @@ -11721,10 +12383,10 @@ else | ||
17647 | /* When -fvisbility=hidden is used, assume the code has been annotated | ||
17648 | correspondingly for the symbols needed. */ | ||
17649 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) | ||
17650 | -void fnord () __attribute__((visibility("default"))); | ||
17651 | +int fnord () __attribute__((visibility("default"))); | ||
17652 | #endif | ||
17653 | |||
17654 | -void fnord () { int i=42; } | ||
17655 | +int fnord () { return 42; } | ||
17656 | int main () | ||
17657 | { | ||
17658 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); | ||
17659 | @@ -15010,13 +15672,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' | ||
17660 | lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' | ||
17661 | lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' | ||
17662 | lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' | ||
17663 | +lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`' | ||
17664 | +lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`' | ||
17665 | reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`' | ||
17666 | reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`' | ||
17667 | OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`' | ||
17668 | deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`' | ||
17669 | file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`' | ||
17670 | +file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`' | ||
17671 | +want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`' | ||
17672 | +DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`' | ||
17673 | +sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`' | ||
17674 | AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`' | ||
17675 | AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`' | ||
17676 | +archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`' | ||
17677 | STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' | ||
17678 | RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' | ||
17679 | old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' | ||
17680 | @@ -15031,14 +15700,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de | ||
17681 | lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' | ||
17682 | lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' | ||
17683 | lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`' | ||
17684 | +nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`' | ||
17685 | +lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`' | ||
17686 | objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`' | ||
17687 | MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`' | ||
17688 | lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`' | ||
17689 | -lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' | ||
17690 | lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`' | ||
17691 | +lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' | ||
17692 | lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`' | ||
17693 | lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`' | ||
17694 | need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`' | ||
17695 | +MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`' | ||
17696 | DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' | ||
17697 | NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' | ||
17698 | LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' | ||
17699 | @@ -15071,12 +15743,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q | ||
17700 | hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' | ||
17701 | inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' | ||
17702 | link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' | ||
17703 | -fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`' | ||
17704 | always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`' | ||
17705 | export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`' | ||
17706 | exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`' | ||
17707 | include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`' | ||
17708 | prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`' | ||
17709 | +postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`' | ||
17710 | file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' | ||
17711 | variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' | ||
17712 | need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' | ||
17713 | @@ -15131,8 +15803,13 @@ reload_flag \ | ||
17714 | OBJDUMP \ | ||
17715 | deplibs_check_method \ | ||
17716 | file_magic_cmd \ | ||
17717 | +file_magic_glob \ | ||
17718 | +want_nocaseglob \ | ||
17719 | +DLLTOOL \ | ||
17720 | +sharedlib_from_linklib_cmd \ | ||
17721 | AR \ | ||
17722 | AR_FLAGS \ | ||
17723 | +archiver_list_spec \ | ||
17724 | STRIP \ | ||
17725 | RANLIB \ | ||
17726 | CC \ | ||
17727 | @@ -15142,12 +15819,14 @@ lt_cv_sys_global_symbol_pipe \ | ||
17728 | lt_cv_sys_global_symbol_to_cdecl \ | ||
17729 | lt_cv_sys_global_symbol_to_c_name_address \ | ||
17730 | lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ | ||
17731 | +nm_file_list_spec \ | ||
17732 | lt_prog_compiler_no_builtin_flag \ | ||
17733 | -lt_prog_compiler_wl \ | ||
17734 | lt_prog_compiler_pic \ | ||
17735 | +lt_prog_compiler_wl \ | ||
17736 | lt_prog_compiler_static \ | ||
17737 | lt_cv_prog_compiler_c_o \ | ||
17738 | need_locks \ | ||
17739 | +MANIFEST_TOOL \ | ||
17740 | DSYMUTIL \ | ||
17741 | NMEDIT \ | ||
17742 | LIPO \ | ||
17743 | @@ -15163,7 +15842,6 @@ no_undefined_flag \ | ||
17744 | hardcode_libdir_flag_spec \ | ||
17745 | hardcode_libdir_flag_spec_ld \ | ||
17746 | hardcode_libdir_separator \ | ||
17747 | -fix_srcfile_path \ | ||
17748 | exclude_expsyms \ | ||
17749 | include_expsyms \ | ||
17750 | file_list_spec \ | ||
17751 | @@ -15199,6 +15877,7 @@ module_cmds \ | ||
17752 | module_expsym_cmds \ | ||
17753 | export_symbols_cmds \ | ||
17754 | prelink_cmds \ | ||
17755 | +postlink_cmds \ | ||
17756 | postinstall_cmds \ | ||
17757 | postuninstall_cmds \ | ||
17758 | finish_cmds \ | ||
17759 | @@ -15897,7 +16576,8 @@ esac ;; | ||
17760 | # NOTE: Changes made to this file will be lost: look at ltmain.sh. | ||
17761 | # | ||
17762 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, | ||
17763 | -# 2006, 2007, 2008, 2009 Free Software Foundation, Inc. | ||
17764 | +# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, | ||
17765 | +# Inc. | ||
17766 | # Written by Gordon Matzigkeit, 1996 | ||
17767 | # | ||
17768 | # This file is part of GNU Libtool. | ||
17769 | @@ -16000,19 +16680,42 @@ SP2NL=$lt_lt_SP2NL | ||
17770 | # turn newlines into spaces. | ||
17771 | NL2SP=$lt_lt_NL2SP | ||
17772 | |||
17773 | +# convert \$build file names to \$host format. | ||
17774 | +to_host_file_cmd=$lt_cv_to_host_file_cmd | ||
17775 | + | ||
17776 | +# convert \$build files to toolchain format. | ||
17777 | +to_tool_file_cmd=$lt_cv_to_tool_file_cmd | ||
17778 | + | ||
17779 | # An object symbol dumper. | ||
17780 | OBJDUMP=$lt_OBJDUMP | ||
17781 | |||
17782 | # Method to check whether dependent libraries are shared objects. | ||
17783 | deplibs_check_method=$lt_deplibs_check_method | ||
17784 | |||
17785 | -# Command to use when deplibs_check_method == "file_magic". | ||
17786 | +# Command to use when deplibs_check_method = "file_magic". | ||
17787 | file_magic_cmd=$lt_file_magic_cmd | ||
17788 | |||
17789 | +# How to find potential files when deplibs_check_method = "file_magic". | ||
17790 | +file_magic_glob=$lt_file_magic_glob | ||
17791 | + | ||
17792 | +# Find potential files using nocaseglob when deplibs_check_method = "file_magic". | ||
17793 | +want_nocaseglob=$lt_want_nocaseglob | ||
17794 | + | ||
17795 | +# DLL creation program. | ||
17796 | +DLLTOOL=$lt_DLLTOOL | ||
17797 | + | ||
17798 | +# Command to associate shared and link libraries. | ||
17799 | +sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd | ||
17800 | + | ||
17801 | # The archiver. | ||
17802 | AR=$lt_AR | ||
17803 | + | ||
17804 | +# Flags to create an archive. | ||
17805 | AR_FLAGS=$lt_AR_FLAGS | ||
17806 | |||
17807 | +# How to feed a file listing to the archiver. | ||
17808 | +archiver_list_spec=$lt_archiver_list_spec | ||
17809 | + | ||
17810 | # A symbol stripping program. | ||
17811 | STRIP=$lt_STRIP | ||
17812 | |||
17813 | @@ -16042,6 +16745,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address | ||
17814 | # Transform the output of nm in a C name address pair when lib prefix is needed. | ||
17815 | global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix | ||
17816 | |||
17817 | +# Specify filename containing input files for \$NM. | ||
17818 | +nm_file_list_spec=$lt_nm_file_list_spec | ||
17819 | + | ||
17820 | +# The root where to search for dependent libraries,and in which our libraries should be installed. | ||
17821 | +lt_sysroot=$lt_sysroot | ||
17822 | + | ||
17823 | # The name of the directory that contains temporary libtool files. | ||
17824 | objdir=$objdir | ||
17825 | |||
17826 | @@ -16051,6 +16760,9 @@ MAGIC_CMD=$MAGIC_CMD | ||
17827 | # Must we lock files when doing compilation? | ||
17828 | need_locks=$lt_need_locks | ||
17829 | |||
17830 | +# Manifest tool. | ||
17831 | +MANIFEST_TOOL=$lt_MANIFEST_TOOL | ||
17832 | + | ||
17833 | # Tool to manipulate archived DWARF debug symbol files on Mac OS X. | ||
17834 | DSYMUTIL=$lt_DSYMUTIL | ||
17835 | |||
17836 | @@ -16165,12 +16877,12 @@ with_gcc=$GCC | ||
17837 | # Compiler flag to turn off builtin functions. | ||
17838 | no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag | ||
17839 | |||
17840 | -# How to pass a linker flag through the compiler. | ||
17841 | -wl=$lt_lt_prog_compiler_wl | ||
17842 | - | ||
17843 | # Additional compiler flags for building library objects. | ||
17844 | pic_flag=$lt_lt_prog_compiler_pic | ||
17845 | |||
17846 | +# How to pass a linker flag through the compiler. | ||
17847 | +wl=$lt_lt_prog_compiler_wl | ||
17848 | + | ||
17849 | # Compiler flag to prevent dynamic linking. | ||
17850 | link_static_flag=$lt_lt_prog_compiler_static | ||
17851 | |||
17852 | @@ -16257,9 +16969,6 @@ inherit_rpath=$inherit_rpath | ||
17853 | # Whether libtool must link a program against all its dependency libraries. | ||
17854 | link_all_deplibs=$link_all_deplibs | ||
17855 | |||
17856 | -# Fix the shell variable \$srcfile for the compiler. | ||
17857 | -fix_srcfile_path=$lt_fix_srcfile_path | ||
17858 | - | ||
17859 | # Set to "yes" if exported symbols are required. | ||
17860 | always_export_symbols=$always_export_symbols | ||
17861 | |||
17862 | @@ -16275,6 +16984,9 @@ include_expsyms=$lt_include_expsyms | ||
17863 | # Commands necessary for linking programs (against libraries) with templates. | ||
17864 | prelink_cmds=$lt_prelink_cmds | ||
17865 | |||
17866 | +# Commands necessary for finishing linking programs. | ||
17867 | +postlink_cmds=$lt_postlink_cmds | ||
17868 | + | ||
17869 | # Specify filename containing input files. | ||
17870 | file_list_spec=$lt_file_list_spec | ||
17871 | |||
17872 | @@ -16307,210 +17019,169 @@ ltmain="$ac_aux_dir/ltmain.sh" | ||
17873 | # if finds mixed CR/LF and LF-only lines. Since sed operates in | ||
17874 | # text mode, it properly converts lines to CR/LF. This bash problem | ||
17875 | # is reportedly fixed, but why not run on old versions too? | ||
17876 | - sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ | ||
17877 | - || (rm -f "$cfgfile"; exit 1) | ||
17878 | - | ||
17879 | - case $xsi_shell in | ||
17880 | - yes) | ||
17881 | - cat << \_LT_EOF >> "$cfgfile" | ||
17882 | - | ||
17883 | -# func_dirname file append nondir_replacement | ||
17884 | -# Compute the dirname of FILE. If nonempty, add APPEND to the result, | ||
17885 | -# otherwise set result to NONDIR_REPLACEMENT. | ||
17886 | -func_dirname () | ||
17887 | -{ | ||
17888 | - case ${1} in | ||
17889 | - */*) func_dirname_result="${1%/*}${2}" ;; | ||
17890 | - * ) func_dirname_result="${3}" ;; | ||
17891 | - esac | ||
17892 | -} | ||
17893 | - | ||
17894 | -# func_basename file | ||
17895 | -func_basename () | ||
17896 | -{ | ||
17897 | - func_basename_result="${1##*/}" | ||
17898 | -} | ||
17899 | - | ||
17900 | -# func_dirname_and_basename file append nondir_replacement | ||
17901 | -# perform func_basename and func_dirname in a single function | ||
17902 | -# call: | ||
17903 | -# dirname: Compute the dirname of FILE. If nonempty, | ||
17904 | -# add APPEND to the result, otherwise set result | ||
17905 | -# to NONDIR_REPLACEMENT. | ||
17906 | -# value returned in "$func_dirname_result" | ||
17907 | -# basename: Compute filename of FILE. | ||
17908 | -# value retuned in "$func_basename_result" | ||
17909 | -# Implementation must be kept synchronized with func_dirname | ||
17910 | -# and func_basename. For efficiency, we do not delegate to | ||
17911 | -# those functions but instead duplicate the functionality here. | ||
17912 | -func_dirname_and_basename () | ||
17913 | -{ | ||
17914 | - case ${1} in | ||
17915 | - */*) func_dirname_result="${1%/*}${2}" ;; | ||
17916 | - * ) func_dirname_result="${3}" ;; | ||
17917 | - esac | ||
17918 | - func_basename_result="${1##*/}" | ||
17919 | -} | ||
17920 | - | ||
17921 | -# func_stripname prefix suffix name | ||
17922 | -# strip PREFIX and SUFFIX off of NAME. | ||
17923 | -# PREFIX and SUFFIX must not contain globbing or regex special | ||
17924 | -# characters, hashes, percent signs, but SUFFIX may contain a leading | ||
17925 | -# dot (in which case that matches only a dot). | ||
17926 | -func_stripname () | ||
17927 | -{ | ||
17928 | - # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are | ||
17929 | - # positional parameters, so assign one to ordinary parameter first. | ||
17930 | - func_stripname_result=${3} | ||
17931 | - func_stripname_result=${func_stripname_result#"${1}"} | ||
17932 | - func_stripname_result=${func_stripname_result%"${2}"} | ||
17933 | -} | ||
17934 | - | ||
17935 | -# func_opt_split | ||
17936 | -func_opt_split () | ||
17937 | -{ | ||
17938 | - func_opt_split_opt=${1%%=*} | ||
17939 | - func_opt_split_arg=${1#*=} | ||
17940 | -} | ||
17941 | - | ||
17942 | -# func_lo2o object | ||
17943 | -func_lo2o () | ||
17944 | -{ | ||
17945 | - case ${1} in | ||
17946 | - *.lo) func_lo2o_result=${1%.lo}.${objext} ;; | ||
17947 | - *) func_lo2o_result=${1} ;; | ||
17948 | - esac | ||
17949 | -} | ||
17950 | - | ||
17951 | -# func_xform libobj-or-source | ||
17952 | -func_xform () | ||
17953 | -{ | ||
17954 | - func_xform_result=${1%.*}.lo | ||
17955 | -} | ||
17956 | - | ||
17957 | -# func_arith arithmetic-term... | ||
17958 | -func_arith () | ||
17959 | -{ | ||
17960 | - func_arith_result=$(( $* )) | ||
17961 | -} | ||
17962 | - | ||
17963 | -# func_len string | ||
17964 | -# STRING may not start with a hyphen. | ||
17965 | -func_len () | ||
17966 | -{ | ||
17967 | - func_len_result=${#1} | ||
17968 | -} | ||
17969 | - | ||
17970 | -_LT_EOF | ||
17971 | - ;; | ||
17972 | - *) # Bourne compatible functions. | ||
17973 | - cat << \_LT_EOF >> "$cfgfile" | ||
17974 | - | ||
17975 | -# func_dirname file append nondir_replacement | ||
17976 | -# Compute the dirname of FILE. If nonempty, add APPEND to the result, | ||
17977 | -# otherwise set result to NONDIR_REPLACEMENT. | ||
17978 | -func_dirname () | ||
17979 | -{ | ||
17980 | - # Extract subdirectory from the argument. | ||
17981 | - func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` | ||
17982 | - if test "X$func_dirname_result" = "X${1}"; then | ||
17983 | - func_dirname_result="${3}" | ||
17984 | - else | ||
17985 | - func_dirname_result="$func_dirname_result${2}" | ||
17986 | - fi | ||
17987 | -} | ||
17988 | - | ||
17989 | -# func_basename file | ||
17990 | -func_basename () | ||
17991 | -{ | ||
17992 | - func_basename_result=`$ECHO "${1}" | $SED "$basename"` | ||
17993 | -} | ||
17994 | - | ||
17995 | - | ||
17996 | -# func_stripname prefix suffix name | ||
17997 | -# strip PREFIX and SUFFIX off of NAME. | ||
17998 | -# PREFIX and SUFFIX must not contain globbing or regex special | ||
17999 | -# characters, hashes, percent signs, but SUFFIX may contain a leading | ||
18000 | -# dot (in which case that matches only a dot). | ||
18001 | -# func_strip_suffix prefix name | ||
18002 | -func_stripname () | ||
18003 | -{ | ||
18004 | - case ${2} in | ||
18005 | - .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; | ||
18006 | - *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; | ||
18007 | - esac | ||
18008 | -} | ||
18009 | - | ||
18010 | -# sed scripts: | ||
18011 | -my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q' | ||
18012 | -my_sed_long_arg='1s/^-[^=]*=//' | ||
18013 | - | ||
18014 | -# func_opt_split | ||
18015 | -func_opt_split () | ||
18016 | -{ | ||
18017 | - func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"` | ||
18018 | - func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"` | ||
18019 | -} | ||
18020 | - | ||
18021 | -# func_lo2o object | ||
18022 | -func_lo2o () | ||
18023 | -{ | ||
18024 | - func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` | ||
18025 | -} | ||
18026 | - | ||
18027 | -# func_xform libobj-or-source | ||
18028 | -func_xform () | ||
18029 | -{ | ||
18030 | - func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'` | ||
18031 | -} | ||
18032 | - | ||
18033 | -# func_arith arithmetic-term... | ||
18034 | -func_arith () | ||
18035 | -{ | ||
18036 | - func_arith_result=`expr "$@"` | ||
18037 | -} | ||
18038 | - | ||
18039 | -# func_len string | ||
18040 | -# STRING may not start with a hyphen. | ||
18041 | -func_len () | ||
18042 | -{ | ||
18043 | - func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len` | ||
18044 | -} | ||
18045 | - | ||
18046 | -_LT_EOF | ||
18047 | -esac | ||
18048 | - | ||
18049 | -case $lt_shell_append in | ||
18050 | - yes) | ||
18051 | - cat << \_LT_EOF >> "$cfgfile" | ||
18052 | - | ||
18053 | -# func_append var value | ||
18054 | -# Append VALUE to the end of shell variable VAR. | ||
18055 | -func_append () | ||
18056 | -{ | ||
18057 | - eval "$1+=\$2" | ||
18058 | -} | ||
18059 | -_LT_EOF | ||
18060 | - ;; | ||
18061 | - *) | ||
18062 | - cat << \_LT_EOF >> "$cfgfile" | ||
18063 | - | ||
18064 | -# func_append var value | ||
18065 | -# Append VALUE to the end of shell variable VAR. | ||
18066 | -func_append () | ||
18067 | -{ | ||
18068 | - eval "$1=\$$1\$2" | ||
18069 | -} | ||
18070 | - | ||
18071 | -_LT_EOF | ||
18072 | - ;; | ||
18073 | - esac | ||
18074 | - | ||
18075 | - | ||
18076 | - sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ | ||
18077 | - || (rm -f "$cfgfile"; exit 1) | ||
18078 | - | ||
18079 | - mv -f "$cfgfile" "$ofile" || | ||
18080 | + sed '$q' "$ltmain" >> "$cfgfile" \ | ||
18081 | + || (rm -f "$cfgfile"; exit 1) | ||
18082 | + | ||
18083 | + if test x"$xsi_shell" = xyes; then | ||
18084 | + sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ | ||
18085 | +func_dirname ()\ | ||
18086 | +{\ | ||
18087 | +\ case ${1} in\ | ||
18088 | +\ */*) func_dirname_result="${1%/*}${2}" ;;\ | ||
18089 | +\ * ) func_dirname_result="${3}" ;;\ | ||
18090 | +\ esac\ | ||
18091 | +} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \ | ||
18092 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
18093 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
18094 | +test 0 -eq $? || _lt_function_replace_fail=: | ||
18095 | + | ||
18096 | + | ||
18097 | + sed -e '/^func_basename ()$/,/^} # func_basename /c\ | ||
18098 | +func_basename ()\ | ||
18099 | +{\ | ||
18100 | +\ func_basename_result="${1##*/}"\ | ||
18101 | +} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \ | ||
18102 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
18103 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
18104 | +test 0 -eq $? || _lt_function_replace_fail=: | ||
18105 | + | ||
18106 | + | ||
18107 | + sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\ | ||
18108 | +func_dirname_and_basename ()\ | ||
18109 | +{\ | ||
18110 | +\ case ${1} in\ | ||
18111 | +\ */*) func_dirname_result="${1%/*}${2}" ;;\ | ||
18112 | +\ * ) func_dirname_result="${3}" ;;\ | ||
18113 | +\ esac\ | ||
18114 | +\ func_basename_result="${1##*/}"\ | ||
18115 | +} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \ | ||
18116 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
18117 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
18118 | +test 0 -eq $? || _lt_function_replace_fail=: | ||
18119 | + | ||
18120 | + | ||
18121 | + sed -e '/^func_stripname ()$/,/^} # func_stripname /c\ | ||
18122 | +func_stripname ()\ | ||
18123 | +{\ | ||
18124 | +\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\ | ||
18125 | +\ # positional parameters, so assign one to ordinary parameter first.\ | ||
18126 | +\ func_stripname_result=${3}\ | ||
18127 | +\ func_stripname_result=${func_stripname_result#"${1}"}\ | ||
18128 | +\ func_stripname_result=${func_stripname_result%"${2}"}\ | ||
18129 | +} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \ | ||
18130 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
18131 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
18132 | +test 0 -eq $? || _lt_function_replace_fail=: | ||
18133 | + | ||
18134 | + | ||
18135 | + sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\ | ||
18136 | +func_split_long_opt ()\ | ||
18137 | +{\ | ||
18138 | +\ func_split_long_opt_name=${1%%=*}\ | ||
18139 | +\ func_split_long_opt_arg=${1#*=}\ | ||
18140 | +} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \ | ||
18141 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
18142 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
18143 | +test 0 -eq $? || _lt_function_replace_fail=: | ||
18144 | + | ||
18145 | + | ||
18146 | + sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\ | ||
18147 | +func_split_short_opt ()\ | ||
18148 | +{\ | ||
18149 | +\ func_split_short_opt_arg=${1#??}\ | ||
18150 | +\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\ | ||
18151 | +} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \ | ||
18152 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
18153 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
18154 | +test 0 -eq $? || _lt_function_replace_fail=: | ||
18155 | + | ||
18156 | + | ||
18157 | + sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\ | ||
18158 | +func_lo2o ()\ | ||
18159 | +{\ | ||
18160 | +\ case ${1} in\ | ||
18161 | +\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\ | ||
18162 | +\ *) func_lo2o_result=${1} ;;\ | ||
18163 | +\ esac\ | ||
18164 | +} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \ | ||
18165 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
18166 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
18167 | +test 0 -eq $? || _lt_function_replace_fail=: | ||
18168 | + | ||
18169 | + | ||
18170 | + sed -e '/^func_xform ()$/,/^} # func_xform /c\ | ||
18171 | +func_xform ()\ | ||
18172 | +{\ | ||
18173 | + func_xform_result=${1%.*}.lo\ | ||
18174 | +} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \ | ||
18175 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
18176 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
18177 | +test 0 -eq $? || _lt_function_replace_fail=: | ||
18178 | + | ||
18179 | + | ||
18180 | + sed -e '/^func_arith ()$/,/^} # func_arith /c\ | ||
18181 | +func_arith ()\ | ||
18182 | +{\ | ||
18183 | + func_arith_result=$(( $* ))\ | ||
18184 | +} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \ | ||
18185 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
18186 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
18187 | +test 0 -eq $? || _lt_function_replace_fail=: | ||
18188 | + | ||
18189 | + | ||
18190 | + sed -e '/^func_len ()$/,/^} # func_len /c\ | ||
18191 | +func_len ()\ | ||
18192 | +{\ | ||
18193 | + func_len_result=${#1}\ | ||
18194 | +} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \ | ||
18195 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
18196 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
18197 | +test 0 -eq $? || _lt_function_replace_fail=: | ||
18198 | + | ||
18199 | +fi | ||
18200 | + | ||
18201 | +if test x"$lt_shell_append" = xyes; then | ||
18202 | + sed -e '/^func_append ()$/,/^} # func_append /c\ | ||
18203 | +func_append ()\ | ||
18204 | +{\ | ||
18205 | + eval "${1}+=\\${2}"\ | ||
18206 | +} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \ | ||
18207 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
18208 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
18209 | +test 0 -eq $? || _lt_function_replace_fail=: | ||
18210 | + | ||
18211 | + | ||
18212 | + sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\ | ||
18213 | +func_append_quoted ()\ | ||
18214 | +{\ | ||
18215 | +\ func_quote_for_eval "${2}"\ | ||
18216 | +\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\ | ||
18217 | +} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \ | ||
18218 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
18219 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
18220 | +test 0 -eq $? || _lt_function_replace_fail=: | ||
18221 | + | ||
18222 | + | ||
18223 | + # Save a `func_append' function call where possible by direct use of '+=' | ||
18224 | + sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ | ||
18225 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
18226 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
18227 | + test 0 -eq $? || _lt_function_replace_fail=: | ||
18228 | +else | ||
18229 | + # Save a `func_append' function call even when '+=' is not available | ||
18230 | + sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ | ||
18231 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
18232 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
18233 | + test 0 -eq $? || _lt_function_replace_fail=: | ||
18234 | +fi | ||
18235 | + | ||
18236 | +if test x"$_lt_function_replace_fail" = x":"; then | ||
18237 | + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 | ||
18238 | +$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} | ||
18239 | +fi | ||
18240 | + | ||
18241 | + | ||
18242 | + mv -f "$cfgfile" "$ofile" || | ||
18243 | (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") | ||
18244 | chmod +x "$ofile" | ||
18245 | |||
18246 | diff --git a/libctf/Makefile.in b/libctf/Makefile.in | ||
18247 | index 1cdf105a323..b69d6472e86 100644 | ||
18248 | --- a/libctf/Makefile.in | ||
18249 | +++ b/libctf/Makefile.in | ||
18250 | @@ -442,6 +442,7 @@ CYGPATH_W = @CYGPATH_W@ | ||
18251 | DATADIRNAME = @DATADIRNAME@ | ||
18252 | DEFS = @DEFS@ | ||
18253 | DEPDIR = @DEPDIR@ | ||
18254 | +DLLTOOL = @DLLTOOL@ | ||
18255 | DSYMUTIL = @DSYMUTIL@ | ||
18256 | DUMPBIN = @DUMPBIN@ | ||
18257 | ECHO_C = @ECHO_C@ | ||
18258 | @@ -481,6 +482,7 @@ LTLIBINTL = @LTLIBINTL@ | ||
18259 | LTLIBOBJS = @LTLIBOBJS@ | ||
18260 | MAINT = @MAINT@ | ||
18261 | MAKEINFO = @MAKEINFO@ | ||
18262 | +MANIFEST_TOOL = @MANIFEST_TOOL@ | ||
18263 | MKDIR_P = @MKDIR_P@ | ||
18264 | MKINSTALLDIRS = @MKINSTALLDIRS@ | ||
18265 | MSGFMT = @MSGFMT@ | ||
18266 | diff --git a/libctf/configure b/libctf/configure | ||
18267 | index 3701bd8e796..9e36ae7c51c 100755 | ||
18268 | --- a/libctf/configure | ||
18269 | +++ b/libctf/configure | ||
18270 | @@ -669,6 +669,8 @@ OTOOL | ||
18271 | LIPO | ||
18272 | NMEDIT | ||
18273 | DSYMUTIL | ||
18274 | +MANIFEST_TOOL | ||
18275 | +DLLTOOL | ||
18276 | OBJDUMP | ||
18277 | LN_S | ||
18278 | NM | ||
18279 | @@ -814,6 +816,7 @@ enable_shared | ||
18280 | enable_static | ||
18281 | with_pic | ||
18282 | enable_fast_install | ||
18283 | +with_libtool_sysroot | ||
18284 | enable_libtool_lock | ||
18285 | enable_largefile | ||
18286 | enable_werror_always | ||
18287 | @@ -1486,6 +1489,8 @@ Optional Packages: | ||
18288 | --with-pic try to use only PIC/non-PIC objects [default=use | ||
18289 | both] | ||
18290 | --with-gnu-ld assume the C compiler uses GNU ld [default=no] | ||
18291 | + --with-libtool-sysroot=DIR Search for dependent libraries within DIR | ||
18292 | + (or the compiler's sysroot if not specified). | ||
18293 | --with-system-zlib use installed libz | ||
18294 | |||
18295 | Some influential environment variables: | ||
18296 | @@ -7501,8 +7506,8 @@ esac | ||
18297 | |||
18298 | |||
18299 | |||
18300 | -macro_version='2.2.7a' | ||
18301 | -macro_revision='1.3134' | ||
18302 | +macro_version='2.4' | ||
18303 | +macro_revision='1.3293' | ||
18304 | |||
18305 | |||
18306 | |||
18307 | @@ -7542,7 +7547,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO | ||
18308 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 | ||
18309 | $as_echo_n "checking how to print strings... " >&6; } | ||
18310 | # Test print first, because it will be a builtin if present. | ||
18311 | -if test "X`print -r -- -n 2>/dev/null`" = X-n && \ | ||
18312 | +if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ | ||
18313 | test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then | ||
18314 | ECHO='print -r --' | ||
18315 | elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then | ||
18316 | @@ -8235,8 +8240,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; | ||
18317 | # Try some XSI features | ||
18318 | xsi_shell=no | ||
18319 | ( _lt_dummy="a/b/c" | ||
18320 | - test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ | ||
18321 | - = c,a/b,, \ | ||
18322 | + test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ | ||
18323 | + = c,a/b,b/c, \ | ||
18324 | && eval 'test $(( 1 + 1 )) -eq 2 \ | ||
18325 | && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ | ||
18326 | && xsi_shell=yes | ||
18327 | @@ -8285,6 +8290,80 @@ esac | ||
18328 | |||
18329 | |||
18330 | |||
18331 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5 | ||
18332 | +$as_echo_n "checking how to convert $build file names to $host format... " >&6; } | ||
18333 | +if ${lt_cv_to_host_file_cmd+:} false; then : | ||
18334 | + $as_echo_n "(cached) " >&6 | ||
18335 | +else | ||
18336 | + case $host in | ||
18337 | + *-*-mingw* ) | ||
18338 | + case $build in | ||
18339 | + *-*-mingw* ) # actually msys | ||
18340 | + lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 | ||
18341 | + ;; | ||
18342 | + *-*-cygwin* ) | ||
18343 | + lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 | ||
18344 | + ;; | ||
18345 | + * ) # otherwise, assume *nix | ||
18346 | + lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 | ||
18347 | + ;; | ||
18348 | + esac | ||
18349 | + ;; | ||
18350 | + *-*-cygwin* ) | ||
18351 | + case $build in | ||
18352 | + *-*-mingw* ) # actually msys | ||
18353 | + lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin | ||
18354 | + ;; | ||
18355 | + *-*-cygwin* ) | ||
18356 | + lt_cv_to_host_file_cmd=func_convert_file_noop | ||
18357 | + ;; | ||
18358 | + * ) # otherwise, assume *nix | ||
18359 | + lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin | ||
18360 | + ;; | ||
18361 | + esac | ||
18362 | + ;; | ||
18363 | + * ) # unhandled hosts (and "normal" native builds) | ||
18364 | + lt_cv_to_host_file_cmd=func_convert_file_noop | ||
18365 | + ;; | ||
18366 | +esac | ||
18367 | + | ||
18368 | +fi | ||
18369 | + | ||
18370 | +to_host_file_cmd=$lt_cv_to_host_file_cmd | ||
18371 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5 | ||
18372 | +$as_echo "$lt_cv_to_host_file_cmd" >&6; } | ||
18373 | + | ||
18374 | + | ||
18375 | + | ||
18376 | + | ||
18377 | + | ||
18378 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5 | ||
18379 | +$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; } | ||
18380 | +if ${lt_cv_to_tool_file_cmd+:} false; then : | ||
18381 | + $as_echo_n "(cached) " >&6 | ||
18382 | +else | ||
18383 | + #assume ordinary cross tools, or native build. | ||
18384 | +lt_cv_to_tool_file_cmd=func_convert_file_noop | ||
18385 | +case $host in | ||
18386 | + *-*-mingw* ) | ||
18387 | + case $build in | ||
18388 | + *-*-mingw* ) # actually msys | ||
18389 | + lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 | ||
18390 | + ;; | ||
18391 | + esac | ||
18392 | + ;; | ||
18393 | +esac | ||
18394 | + | ||
18395 | +fi | ||
18396 | + | ||
18397 | +to_tool_file_cmd=$lt_cv_to_tool_file_cmd | ||
18398 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5 | ||
18399 | +$as_echo "$lt_cv_to_tool_file_cmd" >&6; } | ||
18400 | + | ||
18401 | + | ||
18402 | + | ||
18403 | + | ||
18404 | + | ||
18405 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 | ||
18406 | $as_echo_n "checking for $LD option to reload object files... " >&6; } | ||
18407 | if ${lt_cv_ld_reload_flag+:} false; then : | ||
18408 | @@ -8301,6 +8380,11 @@ case $reload_flag in | ||
18409 | esac | ||
18410 | reload_cmds='$LD$reload_flag -o $output$reload_objs' | ||
18411 | case $host_os in | ||
18412 | + cygwin* | mingw* | pw32* | cegcc*) | ||
18413 | + if test "$GCC" != yes; then | ||
18414 | + reload_cmds=false | ||
18415 | + fi | ||
18416 | + ;; | ||
18417 | darwin*) | ||
18418 | if test "$GCC" = yes; then | ||
18419 | reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' | ||
18420 | @@ -8469,7 +8553,8 @@ mingw* | pw32*) | ||
18421 | lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' | ||
18422 | lt_cv_file_magic_cmd='func_win32_libid' | ||
18423 | else | ||
18424 | - lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' | ||
18425 | + # Keep this pattern in sync with the one in func_win32_libid. | ||
18426 | + lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' | ||
18427 | lt_cv_file_magic_cmd='$OBJDUMP -f' | ||
18428 | fi | ||
18429 | ;; | ||
18430 | @@ -8628,6 +8713,21 @@ esac | ||
18431 | fi | ||
18432 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 | ||
18433 | $as_echo "$lt_cv_deplibs_check_method" >&6; } | ||
18434 | + | ||
18435 | +file_magic_glob= | ||
18436 | +want_nocaseglob=no | ||
18437 | +if test "$build" = "$host"; then | ||
18438 | + case $host_os in | ||
18439 | + mingw* | pw32*) | ||
18440 | + if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then | ||
18441 | + want_nocaseglob=yes | ||
18442 | + else | ||
18443 | + file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"` | ||
18444 | + fi | ||
18445 | + ;; | ||
18446 | + esac | ||
18447 | +fi | ||
18448 | + | ||
18449 | file_magic_cmd=$lt_cv_file_magic_cmd | ||
18450 | deplibs_check_method=$lt_cv_deplibs_check_method | ||
18451 | test -z "$deplibs_check_method" && deplibs_check_method=unknown | ||
18452 | @@ -8643,6 +8743,157 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown | ||
18453 | |||
18454 | |||
18455 | |||
18456 | + | ||
18457 | + | ||
18458 | + | ||
18459 | + | ||
18460 | + | ||
18461 | + | ||
18462 | + | ||
18463 | + | ||
18464 | + | ||
18465 | + | ||
18466 | +if test -n "$ac_tool_prefix"; then | ||
18467 | + # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. | ||
18468 | +set dummy ${ac_tool_prefix}dlltool; ac_word=$2 | ||
18469 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
18470 | +$as_echo_n "checking for $ac_word... " >&6; } | ||
18471 | +if ${ac_cv_prog_DLLTOOL+:} false; then : | ||
18472 | + $as_echo_n "(cached) " >&6 | ||
18473 | +else | ||
18474 | + if test -n "$DLLTOOL"; then | ||
18475 | + ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. | ||
18476 | +else | ||
18477 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | ||
18478 | +for as_dir in $PATH | ||
18479 | +do | ||
18480 | + IFS=$as_save_IFS | ||
18481 | + test -z "$as_dir" && as_dir=. | ||
18482 | + for ac_exec_ext in '' $ac_executable_extensions; do | ||
18483 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | ||
18484 | + ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" | ||
18485 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
18486 | + break 2 | ||
18487 | + fi | ||
18488 | +done | ||
18489 | + done | ||
18490 | +IFS=$as_save_IFS | ||
18491 | + | ||
18492 | +fi | ||
18493 | +fi | ||
18494 | +DLLTOOL=$ac_cv_prog_DLLTOOL | ||
18495 | +if test -n "$DLLTOOL"; then | ||
18496 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 | ||
18497 | +$as_echo "$DLLTOOL" >&6; } | ||
18498 | +else | ||
18499 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
18500 | +$as_echo "no" >&6; } | ||
18501 | +fi | ||
18502 | + | ||
18503 | + | ||
18504 | +fi | ||
18505 | +if test -z "$ac_cv_prog_DLLTOOL"; then | ||
18506 | + ac_ct_DLLTOOL=$DLLTOOL | ||
18507 | + # Extract the first word of "dlltool", so it can be a program name with args. | ||
18508 | +set dummy dlltool; ac_word=$2 | ||
18509 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
18510 | +$as_echo_n "checking for $ac_word... " >&6; } | ||
18511 | +if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then : | ||
18512 | + $as_echo_n "(cached) " >&6 | ||
18513 | +else | ||
18514 | + if test -n "$ac_ct_DLLTOOL"; then | ||
18515 | + ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. | ||
18516 | +else | ||
18517 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | ||
18518 | +for as_dir in $PATH | ||
18519 | +do | ||
18520 | + IFS=$as_save_IFS | ||
18521 | + test -z "$as_dir" && as_dir=. | ||
18522 | + for ac_exec_ext in '' $ac_executable_extensions; do | ||
18523 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | ||
18524 | + ac_cv_prog_ac_ct_DLLTOOL="dlltool" | ||
18525 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
18526 | + break 2 | ||
18527 | + fi | ||
18528 | +done | ||
18529 | + done | ||
18530 | +IFS=$as_save_IFS | ||
18531 | + | ||
18532 | +fi | ||
18533 | +fi | ||
18534 | +ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL | ||
18535 | +if test -n "$ac_ct_DLLTOOL"; then | ||
18536 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 | ||
18537 | +$as_echo "$ac_ct_DLLTOOL" >&6; } | ||
18538 | +else | ||
18539 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
18540 | +$as_echo "no" >&6; } | ||
18541 | +fi | ||
18542 | + | ||
18543 | + if test "x$ac_ct_DLLTOOL" = x; then | ||
18544 | + DLLTOOL="false" | ||
18545 | + else | ||
18546 | + case $cross_compiling:$ac_tool_warned in | ||
18547 | +yes:) | ||
18548 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 | ||
18549 | +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} | ||
18550 | +ac_tool_warned=yes ;; | ||
18551 | +esac | ||
18552 | + DLLTOOL=$ac_ct_DLLTOOL | ||
18553 | + fi | ||
18554 | +else | ||
18555 | + DLLTOOL="$ac_cv_prog_DLLTOOL" | ||
18556 | +fi | ||
18557 | + | ||
18558 | +test -z "$DLLTOOL" && DLLTOOL=dlltool | ||
18559 | + | ||
10743 | + | 18560 | + |
10744 | + | 18561 | + |
10745 | + | 18562 | + |
10746 | + | 18563 | + |
10747 | + | 18564 | + |
10748 | + | 18565 | + |
18566 | + | ||
18567 | + | ||
18568 | + | ||
18569 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5 | ||
18570 | +$as_echo_n "checking how to associate runtime and link libraries... " >&6; } | ||
18571 | +if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then : | ||
18572 | + $as_echo_n "(cached) " >&6 | ||
18573 | +else | ||
18574 | + lt_cv_sharedlib_from_linklib_cmd='unknown' | ||
18575 | + | ||
18576 | +case $host_os in | ||
18577 | +cygwin* | mingw* | pw32* | cegcc*) | ||
18578 | + # two different shell functions defined in ltmain.sh | ||
18579 | + # decide which to use based on capabilities of $DLLTOOL | ||
18580 | + case `$DLLTOOL --help 2>&1` in | ||
18581 | + *--identify-strict*) | ||
18582 | + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib | ||
18583 | + ;; | ||
18584 | + *) | ||
18585 | + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback | ||
18586 | + ;; | ||
18587 | + esac | ||
18588 | + ;; | ||
18589 | +*) | ||
18590 | + # fallback: assume linklib IS sharedlib | ||
18591 | + lt_cv_sharedlib_from_linklib_cmd="$ECHO" | ||
18592 | + ;; | ||
18593 | +esac | ||
18594 | + | ||
18595 | +fi | ||
18596 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5 | ||
18597 | +$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; } | ||
18598 | +sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd | ||
18599 | +test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO | ||
18600 | + | ||
18601 | + | ||
18602 | + | ||
18603 | + | ||
18604 | + | ||
18605 | + | ||
18606 | + | ||
18607 | plugin_option= | ||
18608 | plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll" | ||
18609 | for plugin in $plugin_names; do | ||
18610 | @@ -8657,8 +8908,10 @@ for plugin in $plugin_names; do | ||
18611 | done | ||
18612 | |||
18613 | if test -n "$ac_tool_prefix"; then | ||
18614 | - # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. | ||
18615 | -set dummy ${ac_tool_prefix}ar; ac_word=$2 | ||
18616 | + for ac_prog in ar | ||
18617 | + do | ||
18618 | + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. | ||
18619 | +set dummy $ac_tool_prefix$ac_prog; ac_word=$2 | ||
18620 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
18621 | $as_echo_n "checking for $ac_word... " >&6; } | ||
18622 | if ${ac_cv_prog_AR+:} false; then : | ||
18623 | @@ -8674,7 +8927,7 @@ do | ||
18624 | test -z "$as_dir" && as_dir=. | ||
18625 | for ac_exec_ext in '' $ac_executable_extensions; do | ||
18626 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | ||
18627 | - ac_cv_prog_AR="${ac_tool_prefix}ar" | ||
18628 | + ac_cv_prog_AR="$ac_tool_prefix$ac_prog" | ||
18629 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
18630 | break 2 | ||
18631 | fi | ||
18632 | @@ -8694,11 +8947,15 @@ $as_echo "no" >&6; } | ||
18633 | fi | ||
18634 | |||
18635 | |||
18636 | + test -n "$AR" && break | ||
18637 | + done | ||
18638 | fi | ||
18639 | -if test -z "$ac_cv_prog_AR"; then | ||
18640 | +if test -z "$AR"; then | ||
18641 | ac_ct_AR=$AR | ||
18642 | - # Extract the first word of "ar", so it can be a program name with args. | ||
18643 | -set dummy ar; ac_word=$2 | ||
18644 | + for ac_prog in ar | ||
18645 | +do | ||
18646 | + # Extract the first word of "$ac_prog", so it can be a program name with args. | ||
18647 | +set dummy $ac_prog; ac_word=$2 | ||
18648 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
18649 | $as_echo_n "checking for $ac_word... " >&6; } | ||
18650 | if ${ac_cv_prog_ac_ct_AR+:} false; then : | ||
18651 | @@ -8714,7 +8971,7 @@ do | ||
18652 | test -z "$as_dir" && as_dir=. | ||
18653 | for ac_exec_ext in '' $ac_executable_extensions; do | ||
18654 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | ||
18655 | - ac_cv_prog_ac_ct_AR="ar" | ||
18656 | + ac_cv_prog_ac_ct_AR="$ac_prog" | ||
18657 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
18658 | break 2 | ||
18659 | fi | ||
18660 | @@ -8733,6 +8990,10 @@ else | ||
18661 | $as_echo "no" >&6; } | ||
18662 | fi | ||
18663 | |||
18664 | + | ||
18665 | + test -n "$ac_ct_AR" && break | ||
18666 | +done | ||
18667 | + | ||
18668 | if test "x$ac_ct_AR" = x; then | ||
18669 | AR="false" | ||
18670 | else | ||
18671 | @@ -8744,25 +9005,19 @@ ac_tool_warned=yes ;; | ||
18672 | esac | ||
18673 | AR=$ac_ct_AR | ||
18674 | fi | ||
18675 | -else | ||
18676 | - AR="$ac_cv_prog_AR" | ||
18677 | fi | ||
18678 | |||
18679 | -test -z "$AR" && AR=ar | ||
18680 | -if test -n "$plugin_option"; then | ||
18681 | - if $AR --help 2>&1 | grep -q "\--plugin"; then | ||
18682 | - touch conftest.c | ||
18683 | - $AR $plugin_option rc conftest.a conftest.c | ||
18684 | - if test "$?" != 0; then | ||
18685 | - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5 | ||
18686 | + touch conftest.c | ||
18687 | + $AR $plugin_option rc conftest.a conftest.c | ||
18688 | + if test "$?" != 0; then | ||
18689 | + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5 | ||
18690 | $as_echo "$as_me: WARNING: Failed: $AR $plugin_option rc" >&2;} | ||
18691 | - else | ||
18692 | - AR="$AR $plugin_option" | ||
18693 | - fi | ||
18694 | - rm -f conftest.* | ||
18695 | + else | ||
18696 | + AR="$AR $plugin_option" | ||
18697 | fi | ||
18698 | -fi | ||
18699 | -test -z "$AR_FLAGS" && AR_FLAGS=cru | ||
18700 | + rm -f conftest.* | ||
18701 | +: ${AR=ar} | ||
18702 | +: ${AR_FLAGS=cru} | ||
18703 | |||
18704 | |||
18705 | |||
18706 | @@ -8774,6 +9029,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru | ||
18707 | |||
18708 | |||
18709 | |||
10749 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 | 18710 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 |
10750 | +$as_echo_n "checking for archiver @FILE support... " >&6; } | 18711 | +$as_echo_n "checking for archiver @FILE support... " >&6; } |
10751 | +if ${lt_cv_ar_at_file+:} false; then : | 18712 | +if ${lt_cv_ar_at_file+:} false; then : |
@@ -10758,7 +18719,7 @@ index 6b294bfebfb..52a025bb848 100755 | |||
10758 | +int | 18719 | +int |
10759 | +main () | 18720 | +main () |
10760 | +{ | 18721 | +{ |
10761 | 18722 | + | |
10762 | + ; | 18723 | + ; |
10763 | + return 0; | 18724 | + return 0; |
10764 | +} | 18725 | +} |
@@ -10784,23 +18745,30 @@ index 6b294bfebfb..52a025bb848 100755 | |||
10784 | + fi | 18745 | + fi |
10785 | + fi | 18746 | + fi |
10786 | + rm -f conftest.* libconftest.a | 18747 | + rm -f conftest.* libconftest.a |
10787 | 18748 | + | |
10788 | +fi | 18749 | +fi |
10789 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | 18750 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext |
10790 | 18751 | + | |
10791 | +fi | 18752 | +fi |
10792 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 | 18753 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 |
10793 | +$as_echo "$lt_cv_ar_at_file" >&6; } | 18754 | +$as_echo "$lt_cv_ar_at_file" >&6; } |
10794 | 18755 | + | |
10795 | +if test "x$lt_cv_ar_at_file" = xno; then | 18756 | +if test "x$lt_cv_ar_at_file" = xno; then |
10796 | + archiver_list_spec= | 18757 | + archiver_list_spec= |
10797 | +else | 18758 | +else |
10798 | + archiver_list_spec=$lt_cv_ar_at_file | 18759 | + archiver_list_spec=$lt_cv_ar_at_file |
10799 | +fi | 18760 | +fi |
10800 | 18761 | + | |
10801 | 18762 | + | |
10802 | 18763 | + | |
10803 | @@ -7051,8 +7368,8 @@ esac | 18764 | + |
18765 | + | ||
18766 | + | ||
18767 | + | ||
18768 | if test -n "$ac_tool_prefix"; then | ||
18769 | # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. | ||
18770 | set dummy ${ac_tool_prefix}strip; ac_word=$2 | ||
18771 | @@ -9113,8 +9426,8 @@ esac | ||
10804 | lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" | 18772 | lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" |
10805 | 18773 | ||
10806 | # Transform an extracted symbol line into symbol name and symbol address | 18774 | # Transform an extracted symbol line into symbol name and symbol address |
@@ -10811,7 +18779,7 @@ index 6b294bfebfb..52a025bb848 100755 | |||
10811 | 18779 | ||
10812 | # Handle CRLF in mingw tool chain | 18780 | # Handle CRLF in mingw tool chain |
10813 | opt_cr= | 18781 | opt_cr= |
10814 | @@ -7088,6 +7405,7 @@ for ac_symprfx in "" "_"; do | 18782 | @@ -9150,6 +9463,7 @@ for ac_symprfx in "" "_"; do |
10815 | else | 18783 | else |
10816 | lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" | 18784 | lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" |
10817 | fi | 18785 | fi |
@@ -10819,7 +18787,7 @@ index 6b294bfebfb..52a025bb848 100755 | |||
10819 | 18787 | ||
10820 | # Check to see that the pipe works correctly. | 18788 | # Check to see that the pipe works correctly. |
10821 | pipe_works=no | 18789 | pipe_works=no |
10822 | @@ -7129,6 +7447,18 @@ _LT_EOF | 18790 | @@ -9191,6 +9505,18 @@ _LT_EOF |
10823 | if $GREP ' nm_test_var$' "$nlist" >/dev/null; then | 18791 | if $GREP ' nm_test_var$' "$nlist" >/dev/null; then |
10824 | if $GREP ' nm_test_func$' "$nlist" >/dev/null; then | 18792 | if $GREP ' nm_test_func$' "$nlist" >/dev/null; then |
10825 | cat <<_LT_EOF > conftest.$ac_ext | 18793 | cat <<_LT_EOF > conftest.$ac_ext |
@@ -10838,7 +18806,7 @@ index 6b294bfebfb..52a025bb848 100755 | |||
10838 | #ifdef __cplusplus | 18806 | #ifdef __cplusplus |
10839 | extern "C" { | 18807 | extern "C" { |
10840 | #endif | 18808 | #endif |
10841 | @@ -7140,7 +7470,7 @@ _LT_EOF | 18809 | @@ -9202,7 +9528,7 @@ _LT_EOF |
10842 | cat <<_LT_EOF >> conftest.$ac_ext | 18810 | cat <<_LT_EOF >> conftest.$ac_ext |
10843 | 18811 | ||
10844 | /* The mapping between symbol names and symbols. */ | 18812 | /* The mapping between symbol names and symbols. */ |
@@ -10847,7 +18815,7 @@ index 6b294bfebfb..52a025bb848 100755 | |||
10847 | const char *name; | 18815 | const char *name; |
10848 | void *address; | 18816 | void *address; |
10849 | } | 18817 | } |
10850 | @@ -7166,8 +7496,8 @@ static const void *lt_preloaded_setup() { | 18818 | @@ -9228,8 +9554,8 @@ static const void *lt_preloaded_setup() { |
10851 | _LT_EOF | 18819 | _LT_EOF |
10852 | # Now try linking the two files. | 18820 | # Now try linking the two files. |
10853 | mv conftest.$ac_objext conftstm.$ac_objext | 18821 | mv conftest.$ac_objext conftstm.$ac_objext |
@@ -10858,7 +18826,7 @@ index 6b294bfebfb..52a025bb848 100755 | |||
10858 | LIBS="conftstm.$ac_objext" | 18826 | LIBS="conftstm.$ac_objext" |
10859 | CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" | 18827 | CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" |
10860 | if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 | 18828 | if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 |
10861 | @@ -7177,8 +7507,8 @@ _LT_EOF | 18829 | @@ -9239,8 +9565,8 @@ _LT_EOF |
10862 | test $ac_status = 0; } && test -s conftest${ac_exeext}; then | 18830 | test $ac_status = 0; } && test -s conftest${ac_exeext}; then |
10863 | pipe_works=yes | 18831 | pipe_works=yes |
10864 | fi | 18832 | fi |
@@ -10869,7 +18837,7 @@ index 6b294bfebfb..52a025bb848 100755 | |||
10869 | else | 18837 | else |
10870 | echo "cannot find nm_test_func in $nlist" >&5 | 18838 | echo "cannot find nm_test_func in $nlist" >&5 |
10871 | fi | 18839 | fi |
10872 | @@ -7215,6 +7545,16 @@ else | 18840 | @@ -9277,6 +9603,17 @@ else |
10873 | $as_echo "ok" >&6; } | 18841 | $as_echo "ok" >&6; } |
10874 | fi | 18842 | fi |
10875 | 18843 | ||
@@ -10883,10 +18851,11 @@ index 6b294bfebfb..52a025bb848 100755 | |||
10883 | + | 18851 | + |
10884 | + | 18852 | + |
10885 | + | 18853 | + |
18854 | + | ||
10886 | 18855 | ||
10887 | 18856 | ||
10888 | 18857 | ||
10889 | @@ -7231,6 +7571,45 @@ fi | 18858 | @@ -9293,6 +9630,44 @@ fi |
10890 | 18859 | ||
10891 | 18860 | ||
10892 | 18861 | ||
@@ -10896,7 +18865,6 @@ index 6b294bfebfb..52a025bb848 100755 | |||
10896 | + | 18865 | + |
10897 | + | 18866 | + |
10898 | + | 18867 | + |
10899 | + | ||
10900 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 | 18868 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 |
10901 | +$as_echo_n "checking for sysroot... " >&6; } | 18869 | +$as_echo_n "checking for sysroot... " >&6; } |
10902 | + | 18870 | + |
@@ -10932,7 +18900,7 @@ index 6b294bfebfb..52a025bb848 100755 | |||
10932 | 18900 | ||
10933 | 18901 | ||
10934 | 18902 | ||
10935 | @@ -7442,6 +7821,123 @@ esac | 18903 | @@ -9504,6 +9879,123 @@ esac |
10936 | 18904 | ||
10937 | need_locks="$enable_libtool_lock" | 18905 | need_locks="$enable_libtool_lock" |
10938 | 18906 | ||
@@ -11056,7 +19024,7 @@ index 6b294bfebfb..52a025bb848 100755 | |||
11056 | 19024 | ||
11057 | case $host_os in | 19025 | case $host_os in |
11058 | rhapsody* | darwin*) | 19026 | rhapsody* | darwin*) |
11059 | @@ -8005,6 +8501,8 @@ _LT_EOF | 19027 | @@ -10067,6 +10559,8 @@ _LT_EOF |
11060 | $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 | 19028 | $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 |
11061 | echo "$AR cru libconftest.a conftest.o" >&5 | 19029 | echo "$AR cru libconftest.a conftest.o" >&5 |
11062 | $AR cru libconftest.a conftest.o 2>&5 | 19030 | $AR cru libconftest.a conftest.o 2>&5 |
@@ -11065,26 +19033,3141 @@ index 6b294bfebfb..52a025bb848 100755 | |||
11065 | cat > conftest.c << _LT_EOF | 19033 | cat > conftest.c << _LT_EOF |
11066 | int main() { return 0;} | 19034 | int main() { return 0;} |
11067 | _LT_EOF | 19035 | _LT_EOF |
11068 | @@ -8170,7 +8668,8 @@ fi | 19036 | @@ -10621,8 +11115,6 @@ fi |
11069 | LIBTOOL_DEPS="$ltmain" | 19037 | lt_prog_compiler_pic= |
19038 | lt_prog_compiler_static= | ||
11070 | 19039 | ||
11071 | # Always use our own libtool. | 19040 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 |
11072 | -LIBTOOL='$(SHELL) $(top_builddir)/libtool' | 19041 | -$as_echo_n "checking for $compiler option to produce PIC... " >&6; } |
11073 | +LIBTOOL='$(SHELL) $(top_builddir)' | ||
11074 | +LIBTOOL="$LIBTOOL/${host_alias}-libtool" | ||
11075 | 19042 | ||
19043 | if test "$GCC" = yes; then | ||
19044 | lt_prog_compiler_wl='-Wl,' | ||
19045 | @@ -10788,6 +11280,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } | ||
19046 | lt_prog_compiler_pic='--shared' | ||
19047 | lt_prog_compiler_static='--static' | ||
19048 | ;; | ||
19049 | + nagfor*) | ||
19050 | + # NAG Fortran compiler | ||
19051 | + lt_prog_compiler_wl='-Wl,-Wl,,' | ||
19052 | + lt_prog_compiler_pic='-PIC' | ||
19053 | + lt_prog_compiler_static='-Bstatic' | ||
19054 | + ;; | ||
19055 | pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) | ||
19056 | # Portland Group compilers (*not* the Pentium gcc compiler, | ||
19057 | # which looks to be a dead project) | ||
19058 | @@ -10850,7 +11348,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } | ||
19059 | lt_prog_compiler_pic='-KPIC' | ||
19060 | lt_prog_compiler_static='-Bstatic' | ||
19061 | case $cc_basename in | ||
19062 | - f77* | f90* | f95*) | ||
19063 | + f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) | ||
19064 | lt_prog_compiler_wl='-Qoption ld ';; | ||
19065 | *) | ||
19066 | lt_prog_compiler_wl='-Wl,';; | ||
19067 | @@ -10907,13 +11405,17 @@ case $host_os in | ||
19068 | lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" | ||
19069 | ;; | ||
19070 | esac | ||
19071 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5 | ||
19072 | -$as_echo "$lt_prog_compiler_pic" >&6; } | ||
19073 | - | ||
19074 | - | ||
19075 | - | ||
19076 | - | ||
19077 | |||
19078 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 | ||
19079 | +$as_echo_n "checking for $compiler option to produce PIC... " >&6; } | ||
19080 | +if ${lt_cv_prog_compiler_pic+:} false; then : | ||
19081 | + $as_echo_n "(cached) " >&6 | ||
19082 | +else | ||
19083 | + lt_cv_prog_compiler_pic=$lt_prog_compiler_pic | ||
19084 | +fi | ||
19085 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5 | ||
19086 | +$as_echo "$lt_cv_prog_compiler_pic" >&6; } | ||
19087 | +lt_prog_compiler_pic=$lt_cv_prog_compiler_pic | ||
19088 | |||
19089 | # | ||
19090 | # Check to make sure the PIC flag actually works. | ||
19091 | @@ -10974,6 +11476,11 @@ fi | ||
11076 | 19092 | ||
11077 | 19093 | ||
11078 | @@ -8259,7 +8758,7 @@ aix3*) | 19094 | |
19095 | + | ||
19096 | + | ||
19097 | + | ||
19098 | + | ||
19099 | + | ||
19100 | # | ||
19101 | # Check to make sure the static flag actually works. | ||
19102 | # | ||
19103 | @@ -11324,7 +11831,8 @@ _LT_EOF | ||
19104 | allow_undefined_flag=unsupported | ||
19105 | always_export_symbols=no | ||
19106 | enable_shared_with_static_runtimes=yes | ||
19107 | - export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' | ||
19108 | + 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' | ||
19109 | + exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' | ||
19110 | |||
19111 | if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then | ||
19112 | archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' | ||
19113 | @@ -11423,12 +11931,12 @@ _LT_EOF | ||
19114 | whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' | ||
19115 | hardcode_libdir_flag_spec= | ||
19116 | hardcode_libdir_flag_spec_ld='-rpath $libdir' | ||
19117 | - archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' | ||
19118 | + archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' | ||
19119 | if test "x$supports_anon_versioning" = xyes; then | ||
19120 | archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ | ||
19121 | cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ | ||
19122 | echo "local: *; };" >> $output_objdir/$libname.ver~ | ||
19123 | - $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' | ||
19124 | + $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' | ||
19125 | fi | ||
19126 | ;; | ||
19127 | esac | ||
19128 | @@ -11442,8 +11950,8 @@ _LT_EOF | ||
19129 | archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' | ||
19130 | wlarc= | ||
19131 | else | ||
19132 | - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' | ||
19133 | - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' | ||
19134 | + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' | ||
19135 | + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' | ||
19136 | fi | ||
19137 | ;; | ||
19138 | |||
19139 | @@ -11461,8 +11969,8 @@ _LT_EOF | ||
19140 | |||
19141 | _LT_EOF | ||
19142 | elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then | ||
19143 | - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' | ||
19144 | - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' | ||
19145 | + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' | ||
19146 | + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' | ||
19147 | else | ||
19148 | ld_shlibs=no | ||
19149 | fi | ||
19150 | @@ -11508,8 +12016,8 @@ _LT_EOF | ||
19151 | |||
19152 | *) | ||
19153 | if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then | ||
19154 | - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' | ||
19155 | - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' | ||
19156 | + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' | ||
19157 | + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' | ||
19158 | else | ||
19159 | ld_shlibs=no | ||
19160 | fi | ||
19161 | @@ -11639,7 +12147,13 @@ _LT_EOF | ||
19162 | allow_undefined_flag='-berok' | ||
19163 | # Determine the default libpath from the value encoded in an | ||
19164 | # empty executable. | ||
19165 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
19166 | + if test "${lt_cv_aix_libpath+set}" = set; then | ||
19167 | + aix_libpath=$lt_cv_aix_libpath | ||
19168 | +else | ||
19169 | + if ${lt_cv_aix_libpath_+:} false; then : | ||
19170 | + $as_echo_n "(cached) " >&6 | ||
19171 | +else | ||
19172 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
19173 | /* end confdefs.h. */ | ||
19174 | |||
19175 | int | ||
19176 | @@ -11652,22 +12166,29 @@ main () | ||
19177 | _ACEOF | ||
19178 | if ac_fn_c_try_link "$LINENO"; then : | ||
19179 | |||
19180 | -lt_aix_libpath_sed=' | ||
19181 | - /Import File Strings/,/^$/ { | ||
19182 | - /^0/ { | ||
19183 | - s/^0 *\(.*\)$/\1/ | ||
19184 | - p | ||
19185 | - } | ||
19186 | - }' | ||
19187 | -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | ||
19188 | -# Check for a 64-bit object if we didn't find anything. | ||
19189 | -if test -z "$aix_libpath"; then | ||
19190 | - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | ||
19191 | -fi | ||
19192 | + lt_aix_libpath_sed=' | ||
19193 | + /Import File Strings/,/^$/ { | ||
19194 | + /^0/ { | ||
19195 | + s/^0 *\([^ ]*\) *$/\1/ | ||
19196 | + p | ||
19197 | + } | ||
19198 | + }' | ||
19199 | + lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | ||
19200 | + # Check for a 64-bit object if we didn't find anything. | ||
19201 | + if test -z "$lt_cv_aix_libpath_"; then | ||
19202 | + lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | ||
19203 | + fi | ||
19204 | fi | ||
19205 | rm -f core conftest.err conftest.$ac_objext \ | ||
19206 | conftest$ac_exeext conftest.$ac_ext | ||
19207 | -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | ||
19208 | + if test -z "$lt_cv_aix_libpath_"; then | ||
19209 | + lt_cv_aix_libpath_="/usr/lib:/lib" | ||
19210 | + fi | ||
19211 | + | ||
19212 | +fi | ||
19213 | + | ||
19214 | + aix_libpath=$lt_cv_aix_libpath_ | ||
19215 | +fi | ||
19216 | |||
19217 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" | ||
19218 | archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" | ||
19219 | @@ -11679,7 +12200,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | ||
19220 | else | ||
19221 | # Determine the default libpath from the value encoded in an | ||
19222 | # empty executable. | ||
19223 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
19224 | + if test "${lt_cv_aix_libpath+set}" = set; then | ||
19225 | + aix_libpath=$lt_cv_aix_libpath | ||
19226 | +else | ||
19227 | + if ${lt_cv_aix_libpath_+:} false; then : | ||
19228 | + $as_echo_n "(cached) " >&6 | ||
19229 | +else | ||
19230 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
19231 | /* end confdefs.h. */ | ||
19232 | |||
19233 | int | ||
19234 | @@ -11692,22 +12219,29 @@ main () | ||
19235 | _ACEOF | ||
19236 | if ac_fn_c_try_link "$LINENO"; then : | ||
19237 | |||
19238 | -lt_aix_libpath_sed=' | ||
19239 | - /Import File Strings/,/^$/ { | ||
19240 | - /^0/ { | ||
19241 | - s/^0 *\(.*\)$/\1/ | ||
19242 | - p | ||
19243 | - } | ||
19244 | - }' | ||
19245 | -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | ||
19246 | -# Check for a 64-bit object if we didn't find anything. | ||
19247 | -if test -z "$aix_libpath"; then | ||
19248 | - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | ||
19249 | -fi | ||
19250 | + lt_aix_libpath_sed=' | ||
19251 | + /Import File Strings/,/^$/ { | ||
19252 | + /^0/ { | ||
19253 | + s/^0 *\([^ ]*\) *$/\1/ | ||
19254 | + p | ||
19255 | + } | ||
19256 | + }' | ||
19257 | + lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | ||
19258 | + # Check for a 64-bit object if we didn't find anything. | ||
19259 | + if test -z "$lt_cv_aix_libpath_"; then | ||
19260 | + lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | ||
19261 | + fi | ||
19262 | fi | ||
19263 | rm -f core conftest.err conftest.$ac_objext \ | ||
19264 | conftest$ac_exeext conftest.$ac_ext | ||
19265 | -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | ||
19266 | + if test -z "$lt_cv_aix_libpath_"; then | ||
19267 | + lt_cv_aix_libpath_="/usr/lib:/lib" | ||
19268 | + fi | ||
19269 | + | ||
19270 | +fi | ||
19271 | + | ||
19272 | + aix_libpath=$lt_cv_aix_libpath_ | ||
19273 | +fi | ||
19274 | |||
19275 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" | ||
19276 | # Warning - without using the other run time loading flags, | ||
19277 | @@ -11752,20 +12286,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | ||
19278 | # Microsoft Visual C++. | ||
19279 | # hardcode_libdir_flag_spec is actually meaningless, as there is | ||
19280 | # no search path for DLLs. | ||
19281 | - hardcode_libdir_flag_spec=' ' | ||
19282 | - allow_undefined_flag=unsupported | ||
19283 | - # Tell ltmain to make .lib files, not .a files. | ||
19284 | - libext=lib | ||
19285 | - # Tell ltmain to make .dll files, not .so files. | ||
19286 | - shrext_cmds=".dll" | ||
19287 | - # FIXME: Setting linknames here is a bad hack. | ||
19288 | - archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' | ||
19289 | - # The linker will automatically build a .lib file if we build a DLL. | ||
19290 | - old_archive_from_new_cmds='true' | ||
19291 | - # FIXME: Should let the user specify the lib program. | ||
19292 | - old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' | ||
19293 | - fix_srcfile_path='`cygpath -w "$srcfile"`' | ||
19294 | - enable_shared_with_static_runtimes=yes | ||
19295 | + case $cc_basename in | ||
19296 | + cl*) | ||
19297 | + # Native MSVC | ||
19298 | + hardcode_libdir_flag_spec=' ' | ||
19299 | + allow_undefined_flag=unsupported | ||
19300 | + always_export_symbols=yes | ||
19301 | + file_list_spec='@' | ||
19302 | + # Tell ltmain to make .lib files, not .a files. | ||
19303 | + libext=lib | ||
19304 | + # Tell ltmain to make .dll files, not .so files. | ||
19305 | + shrext_cmds=".dll" | ||
19306 | + # FIXME: Setting linknames here is a bad hack. | ||
19307 | + archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' | ||
19308 | + archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then | ||
19309 | + sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; | ||
19310 | + else | ||
19311 | + sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; | ||
19312 | + fi~ | ||
19313 | + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ | ||
19314 | + linknames=' | ||
19315 | + # The linker will not automatically build a static lib if we build a DLL. | ||
19316 | + # _LT_TAGVAR(old_archive_from_new_cmds, )='true' | ||
19317 | + enable_shared_with_static_runtimes=yes | ||
19318 | + export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' | ||
19319 | + # Don't use ranlib | ||
19320 | + old_postinstall_cmds='chmod 644 $oldlib' | ||
19321 | + postlink_cmds='lt_outputfile="@OUTPUT@"~ | ||
19322 | + lt_tool_outputfile="@TOOL_OUTPUT@"~ | ||
19323 | + case $lt_outputfile in | ||
19324 | + *.exe|*.EXE) ;; | ||
19325 | + *) | ||
19326 | + lt_outputfile="$lt_outputfile.exe" | ||
19327 | + lt_tool_outputfile="$lt_tool_outputfile.exe" | ||
19328 | + ;; | ||
19329 | + esac~ | ||
19330 | + if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then | ||
19331 | + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; | ||
19332 | + $RM "$lt_outputfile.manifest"; | ||
19333 | + fi' | ||
19334 | + ;; | ||
19335 | + *) | ||
19336 | + # Assume MSVC wrapper | ||
19337 | + hardcode_libdir_flag_spec=' ' | ||
19338 | + allow_undefined_flag=unsupported | ||
19339 | + # Tell ltmain to make .lib files, not .a files. | ||
19340 | + libext=lib | ||
19341 | + # Tell ltmain to make .dll files, not .so files. | ||
19342 | + shrext_cmds=".dll" | ||
19343 | + # FIXME: Setting linknames here is a bad hack. | ||
19344 | + archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' | ||
19345 | + # The linker will automatically build a .lib file if we build a DLL. | ||
19346 | + old_archive_from_new_cmds='true' | ||
19347 | + # FIXME: Should let the user specify the lib program. | ||
19348 | + old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' | ||
19349 | + enable_shared_with_static_runtimes=yes | ||
19350 | + ;; | ||
19351 | + esac | ||
19352 | ;; | ||
19353 | |||
19354 | darwin* | rhapsody*) | ||
19355 | @@ -11826,7 +12403,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | ||
19356 | |||
19357 | # FreeBSD 3 and greater uses gcc -shared to do shared libraries. | ||
19358 | freebsd* | dragonfly*) | ||
19359 | - archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' | ||
19360 | + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' | ||
19361 | hardcode_libdir_flag_spec='-R$libdir' | ||
19362 | hardcode_direct=yes | ||
19363 | hardcode_shlibpath_var=no | ||
19364 | @@ -11834,7 +12411,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | ||
19365 | |||
19366 | hpux9*) | ||
19367 | if test "$GCC" = yes; then | ||
19368 | - 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' | ||
19369 | + 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' | ||
19370 | else | ||
19371 | archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' | ||
19372 | fi | ||
19373 | @@ -11850,7 +12427,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | ||
19374 | |||
19375 | hpux10*) | ||
19376 | if test "$GCC" = yes && test "$with_gnu_ld" = no; then | ||
19377 | - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' | ||
19378 | + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' | ||
19379 | else | ||
19380 | archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' | ||
19381 | fi | ||
19382 | @@ -11874,10 +12451,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | ||
19383 | archive_cmds='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' | ||
19384 | ;; | ||
19385 | ia64*) | ||
19386 | - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' | ||
19387 | + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' | ||
19388 | ;; | ||
19389 | *) | ||
19390 | - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' | ||
19391 | + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' | ||
19392 | ;; | ||
19393 | esac | ||
19394 | else | ||
19395 | @@ -11956,23 +12533,36 @@ fi | ||
19396 | |||
19397 | irix5* | irix6* | nonstopux*) | ||
19398 | if test "$GCC" = yes; then | ||
19399 | - 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' | ||
19400 | + 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' | ||
19401 | # Try to use the -exported_symbol ld option, if it does not | ||
19402 | # work, assume that -exports_file does not work either and | ||
19403 | # implicitly export all symbols. | ||
19404 | - save_LDFLAGS="$LDFLAGS" | ||
19405 | - LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" | ||
19406 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
19407 | + # This should be the same for all languages, so no per-tag cache variable. | ||
19408 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5 | ||
19409 | +$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; } | ||
19410 | +if ${lt_cv_irix_exported_symbol+:} false; then : | ||
19411 | + $as_echo_n "(cached) " >&6 | ||
19412 | +else | ||
19413 | + save_LDFLAGS="$LDFLAGS" | ||
19414 | + LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" | ||
19415 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
19416 | /* end confdefs.h. */ | ||
19417 | -int foo(void) {} | ||
19418 | +int foo (void) { return 0; } | ||
19419 | _ACEOF | ||
19420 | if ac_fn_c_try_link "$LINENO"; then : | ||
19421 | - 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' | ||
19422 | - | ||
19423 | + lt_cv_irix_exported_symbol=yes | ||
19424 | +else | ||
19425 | + lt_cv_irix_exported_symbol=no | ||
19426 | fi | ||
19427 | rm -f core conftest.err conftest.$ac_objext \ | ||
19428 | conftest$ac_exeext conftest.$ac_ext | ||
19429 | - LDFLAGS="$save_LDFLAGS" | ||
19430 | + LDFLAGS="$save_LDFLAGS" | ||
19431 | +fi | ||
19432 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5 | ||
19433 | +$as_echo "$lt_cv_irix_exported_symbol" >&6; } | ||
19434 | + if test "$lt_cv_irix_exported_symbol" = yes; then | ||
19435 | + 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' | ||
19436 | + fi | ||
19437 | else | ||
19438 | archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' | ||
19439 | archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' | ||
19440 | @@ -12057,7 +12647,7 @@ rm -f core conftest.err conftest.$ac_objext \ | ||
19441 | osf4* | osf5*) # as osf3* with the addition of -msym flag | ||
19442 | if test "$GCC" = yes; then | ||
19443 | allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' | ||
19444 | - 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' | ||
19445 | + 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' | ||
19446 | hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' | ||
19447 | else | ||
19448 | allow_undefined_flag=' -expect_unresolved \*' | ||
19449 | @@ -12076,9 +12666,9 @@ rm -f core conftest.err conftest.$ac_objext \ | ||
19450 | no_undefined_flag=' -z defs' | ||
19451 | if test "$GCC" = yes; then | ||
19452 | wlarc='${wl}' | ||
19453 | - archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' | ||
19454 | + archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' | ||
19455 | archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ | ||
19456 | - $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' | ||
19457 | + $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' | ||
19458 | else | ||
19459 | case `$CC -V 2>&1` in | ||
19460 | *"Compilers 5.0"*) | ||
19461 | @@ -12654,8 +13244,9 @@ cygwin* | mingw* | pw32* | cegcc*) | ||
19462 | need_version=no | ||
19463 | need_lib_prefix=no | ||
19464 | |||
19465 | - case $GCC,$host_os in | ||
19466 | - yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) | ||
19467 | + case $GCC,$cc_basename in | ||
19468 | + yes,*) | ||
19469 | + # gcc | ||
19470 | library_names_spec='$libname.dll.a' | ||
19471 | # DLL is installed to $(libdir)/../bin by postinstall_cmds | ||
19472 | postinstall_cmds='base_file=`basename \${file}`~ | ||
19473 | @@ -12688,13 +13279,71 @@ cygwin* | mingw* | pw32* | cegcc*) | ||
19474 | library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' | ||
19475 | ;; | ||
19476 | esac | ||
19477 | + dynamic_linker='Win32 ld.exe' | ||
19478 | + ;; | ||
19479 | + | ||
19480 | + *,cl*) | ||
19481 | + # Native MSVC | ||
19482 | + libname_spec='$name' | ||
19483 | + soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' | ||
19484 | + library_names_spec='${libname}.dll.lib' | ||
19485 | + | ||
19486 | + case $build_os in | ||
19487 | + mingw*) | ||
19488 | + sys_lib_search_path_spec= | ||
19489 | + lt_save_ifs=$IFS | ||
19490 | + IFS=';' | ||
19491 | + for lt_path in $LIB | ||
19492 | + do | ||
19493 | + IFS=$lt_save_ifs | ||
19494 | + # Let DOS variable expansion print the short 8.3 style file name. | ||
19495 | + lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` | ||
19496 | + sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" | ||
19497 | + done | ||
19498 | + IFS=$lt_save_ifs | ||
19499 | + # Convert to MSYS style. | ||
19500 | + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` | ||
19501 | + ;; | ||
19502 | + cygwin*) | ||
19503 | + # Convert to unix form, then to dos form, then back to unix form | ||
19504 | + # but this time dos style (no spaces!) so that the unix form looks | ||
19505 | + # like /cygdrive/c/PROGRA~1:/cygdr... | ||
19506 | + sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` | ||
19507 | + sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` | ||
19508 | + sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` | ||
19509 | + ;; | ||
19510 | + *) | ||
19511 | + sys_lib_search_path_spec="$LIB" | ||
19512 | + if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then | ||
19513 | + # It is most probably a Windows format PATH. | ||
19514 | + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` | ||
19515 | + else | ||
19516 | + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` | ||
19517 | + fi | ||
19518 | + # FIXME: find the short name or the path components, as spaces are | ||
19519 | + # common. (e.g. "Program Files" -> "PROGRA~1") | ||
19520 | + ;; | ||
19521 | + esac | ||
19522 | + | ||
19523 | + # DLL is installed to $(libdir)/../bin by postinstall_cmds | ||
19524 | + postinstall_cmds='base_file=`basename \${file}`~ | ||
19525 | + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ | ||
19526 | + dldir=$destdir/`dirname \$dlpath`~ | ||
19527 | + test -d \$dldir || mkdir -p \$dldir~ | ||
19528 | + $install_prog $dir/$dlname \$dldir/$dlname' | ||
19529 | + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ | ||
19530 | + dlpath=$dir/\$dldll~ | ||
19531 | + $RM \$dlpath' | ||
19532 | + shlibpath_overrides_runpath=yes | ||
19533 | + dynamic_linker='Win32 link.exe' | ||
19534 | ;; | ||
19535 | |||
19536 | *) | ||
19537 | + # Assume MSVC wrapper | ||
19538 | library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' | ||
19539 | + dynamic_linker='Win32 ld.exe' | ||
19540 | ;; | ||
19541 | esac | ||
19542 | - dynamic_linker='Win32 ld.exe' | ||
19543 | # FIXME: first we should search . and the directory the executable is in | ||
19544 | shlibpath_var=PATH | ||
19545 | ;; | ||
19546 | @@ -13640,10 +14293,10 @@ else | ||
19547 | /* When -fvisbility=hidden is used, assume the code has been annotated | ||
19548 | correspondingly for the symbols needed. */ | ||
19549 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) | ||
19550 | -void fnord () __attribute__((visibility("default"))); | ||
19551 | +int fnord () __attribute__((visibility("default"))); | ||
19552 | #endif | ||
19553 | |||
19554 | -void fnord () { int i=42; } | ||
19555 | +int fnord () { return 42; } | ||
19556 | int main () | ||
19557 | { | ||
19558 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); | ||
19559 | @@ -13746,10 +14403,10 @@ else | ||
19560 | /* When -fvisbility=hidden is used, assume the code has been annotated | ||
19561 | correspondingly for the symbols needed. */ | ||
19562 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) | ||
19563 | -void fnord () __attribute__((visibility("default"))); | ||
19564 | +int fnord () __attribute__((visibility("default"))); | ||
19565 | #endif | ||
19566 | |||
19567 | -void fnord () { int i=42; } | ||
19568 | +int fnord () { return 42; } | ||
19569 | int main () | ||
19570 | { | ||
19571 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); | ||
19572 | @@ -17797,13 +18454,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' | ||
19573 | lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' | ||
19574 | lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' | ||
19575 | lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' | ||
19576 | +lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`' | ||
19577 | +lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`' | ||
19578 | reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`' | ||
19579 | reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`' | ||
19580 | OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`' | ||
19581 | deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`' | ||
19582 | file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`' | ||
19583 | +file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`' | ||
19584 | +want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`' | ||
19585 | +DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`' | ||
19586 | +sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`' | ||
19587 | AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`' | ||
19588 | AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`' | ||
19589 | +archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`' | ||
19590 | STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' | ||
19591 | RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' | ||
19592 | old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' | ||
19593 | @@ -17818,14 +18482,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de | ||
19594 | lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' | ||
19595 | lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' | ||
19596 | lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`' | ||
19597 | +nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`' | ||
19598 | +lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`' | ||
19599 | objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`' | ||
19600 | MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`' | ||
19601 | lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`' | ||
19602 | -lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' | ||
19603 | lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`' | ||
19604 | +lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' | ||
19605 | lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`' | ||
19606 | lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`' | ||
19607 | need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`' | ||
19608 | +MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`' | ||
19609 | DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' | ||
19610 | NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' | ||
19611 | LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' | ||
19612 | @@ -17858,12 +18525,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q | ||
19613 | hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' | ||
19614 | inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' | ||
19615 | link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' | ||
19616 | -fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`' | ||
19617 | always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`' | ||
19618 | export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`' | ||
19619 | exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`' | ||
19620 | include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`' | ||
19621 | prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`' | ||
19622 | +postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`' | ||
19623 | file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' | ||
19624 | variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' | ||
19625 | need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' | ||
19626 | @@ -17918,8 +18585,13 @@ reload_flag \ | ||
19627 | OBJDUMP \ | ||
19628 | deplibs_check_method \ | ||
19629 | file_magic_cmd \ | ||
19630 | +file_magic_glob \ | ||
19631 | +want_nocaseglob \ | ||
19632 | +DLLTOOL \ | ||
19633 | +sharedlib_from_linklib_cmd \ | ||
19634 | AR \ | ||
19635 | AR_FLAGS \ | ||
19636 | +archiver_list_spec \ | ||
19637 | STRIP \ | ||
19638 | RANLIB \ | ||
19639 | CC \ | ||
19640 | @@ -17929,12 +18601,14 @@ lt_cv_sys_global_symbol_pipe \ | ||
19641 | lt_cv_sys_global_symbol_to_cdecl \ | ||
19642 | lt_cv_sys_global_symbol_to_c_name_address \ | ||
19643 | lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ | ||
19644 | +nm_file_list_spec \ | ||
19645 | lt_prog_compiler_no_builtin_flag \ | ||
19646 | -lt_prog_compiler_wl \ | ||
19647 | lt_prog_compiler_pic \ | ||
19648 | +lt_prog_compiler_wl \ | ||
19649 | lt_prog_compiler_static \ | ||
19650 | lt_cv_prog_compiler_c_o \ | ||
19651 | need_locks \ | ||
19652 | +MANIFEST_TOOL \ | ||
19653 | DSYMUTIL \ | ||
19654 | NMEDIT \ | ||
19655 | LIPO \ | ||
19656 | @@ -17950,7 +18624,6 @@ no_undefined_flag \ | ||
19657 | hardcode_libdir_flag_spec \ | ||
19658 | hardcode_libdir_flag_spec_ld \ | ||
19659 | hardcode_libdir_separator \ | ||
19660 | -fix_srcfile_path \ | ||
19661 | exclude_expsyms \ | ||
19662 | include_expsyms \ | ||
19663 | file_list_spec \ | ||
19664 | @@ -17986,6 +18659,7 @@ module_cmds \ | ||
19665 | module_expsym_cmds \ | ||
19666 | export_symbols_cmds \ | ||
19667 | prelink_cmds \ | ||
19668 | +postlink_cmds \ | ||
19669 | postinstall_cmds \ | ||
19670 | postuninstall_cmds \ | ||
19671 | finish_cmds \ | ||
19672 | @@ -18845,7 +19519,8 @@ $as_echo X"$file" | | ||
19673 | # NOTE: Changes made to this file will be lost: look at ltmain.sh. | ||
19674 | # | ||
19675 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, | ||
19676 | -# 2006, 2007, 2008, 2009 Free Software Foundation, Inc. | ||
19677 | +# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, | ||
19678 | +# Inc. | ||
19679 | # Written by Gordon Matzigkeit, 1996 | ||
19680 | # | ||
19681 | # This file is part of GNU Libtool. | ||
19682 | @@ -18948,19 +19623,42 @@ SP2NL=$lt_lt_SP2NL | ||
19683 | # turn newlines into spaces. | ||
19684 | NL2SP=$lt_lt_NL2SP | ||
19685 | |||
19686 | +# convert \$build file names to \$host format. | ||
19687 | +to_host_file_cmd=$lt_cv_to_host_file_cmd | ||
19688 | + | ||
19689 | +# convert \$build files to toolchain format. | ||
19690 | +to_tool_file_cmd=$lt_cv_to_tool_file_cmd | ||
19691 | + | ||
19692 | # An object symbol dumper. | ||
19693 | OBJDUMP=$lt_OBJDUMP | ||
19694 | |||
19695 | # Method to check whether dependent libraries are shared objects. | ||
19696 | deplibs_check_method=$lt_deplibs_check_method | ||
19697 | |||
19698 | -# Command to use when deplibs_check_method == "file_magic". | ||
19699 | +# Command to use when deplibs_check_method = "file_magic". | ||
19700 | file_magic_cmd=$lt_file_magic_cmd | ||
19701 | |||
19702 | +# How to find potential files when deplibs_check_method = "file_magic". | ||
19703 | +file_magic_glob=$lt_file_magic_glob | ||
19704 | + | ||
19705 | +# Find potential files using nocaseglob when deplibs_check_method = "file_magic". | ||
19706 | +want_nocaseglob=$lt_want_nocaseglob | ||
19707 | + | ||
19708 | +# DLL creation program. | ||
19709 | +DLLTOOL=$lt_DLLTOOL | ||
19710 | + | ||
19711 | +# Command to associate shared and link libraries. | ||
19712 | +sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd | ||
19713 | + | ||
19714 | # The archiver. | ||
19715 | AR=$lt_AR | ||
19716 | + | ||
19717 | +# Flags to create an archive. | ||
19718 | AR_FLAGS=$lt_AR_FLAGS | ||
19719 | |||
19720 | +# How to feed a file listing to the archiver. | ||
19721 | +archiver_list_spec=$lt_archiver_list_spec | ||
19722 | + | ||
19723 | # A symbol stripping program. | ||
19724 | STRIP=$lt_STRIP | ||
19725 | |||
19726 | @@ -18990,6 +19688,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address | ||
19727 | # Transform the output of nm in a C name address pair when lib prefix is needed. | ||
19728 | global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix | ||
19729 | |||
19730 | +# Specify filename containing input files for \$NM. | ||
19731 | +nm_file_list_spec=$lt_nm_file_list_spec | ||
19732 | + | ||
19733 | +# The root where to search for dependent libraries,and in which our libraries should be installed. | ||
19734 | +lt_sysroot=$lt_sysroot | ||
19735 | + | ||
19736 | # The name of the directory that contains temporary libtool files. | ||
19737 | objdir=$objdir | ||
19738 | |||
19739 | @@ -18999,6 +19703,9 @@ MAGIC_CMD=$MAGIC_CMD | ||
19740 | # Must we lock files when doing compilation? | ||
19741 | need_locks=$lt_need_locks | ||
19742 | |||
19743 | +# Manifest tool. | ||
19744 | +MANIFEST_TOOL=$lt_MANIFEST_TOOL | ||
19745 | + | ||
19746 | # Tool to manipulate archived DWARF debug symbol files on Mac OS X. | ||
19747 | DSYMUTIL=$lt_DSYMUTIL | ||
19748 | |||
19749 | @@ -19113,12 +19820,12 @@ with_gcc=$GCC | ||
19750 | # Compiler flag to turn off builtin functions. | ||
19751 | no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag | ||
19752 | |||
19753 | -# How to pass a linker flag through the compiler. | ||
19754 | -wl=$lt_lt_prog_compiler_wl | ||
19755 | - | ||
19756 | # Additional compiler flags for building library objects. | ||
19757 | pic_flag=$lt_lt_prog_compiler_pic | ||
19758 | |||
19759 | +# How to pass a linker flag through the compiler. | ||
19760 | +wl=$lt_lt_prog_compiler_wl | ||
19761 | + | ||
19762 | # Compiler flag to prevent dynamic linking. | ||
19763 | link_static_flag=$lt_lt_prog_compiler_static | ||
19764 | |||
19765 | @@ -19205,9 +19912,6 @@ inherit_rpath=$inherit_rpath | ||
19766 | # Whether libtool must link a program against all its dependency libraries. | ||
19767 | link_all_deplibs=$link_all_deplibs | ||
19768 | |||
19769 | -# Fix the shell variable \$srcfile for the compiler. | ||
19770 | -fix_srcfile_path=$lt_fix_srcfile_path | ||
19771 | - | ||
19772 | # Set to "yes" if exported symbols are required. | ||
19773 | always_export_symbols=$always_export_symbols | ||
19774 | |||
19775 | @@ -19223,6 +19927,9 @@ include_expsyms=$lt_include_expsyms | ||
19776 | # Commands necessary for linking programs (against libraries) with templates. | ||
19777 | prelink_cmds=$lt_prelink_cmds | ||
19778 | |||
19779 | +# Commands necessary for finishing linking programs. | ||
19780 | +postlink_cmds=$lt_postlink_cmds | ||
19781 | + | ||
19782 | # Specify filename containing input files. | ||
19783 | file_list_spec=$lt_file_list_spec | ||
19784 | |||
19785 | @@ -19255,210 +19962,169 @@ ltmain="$ac_aux_dir/ltmain.sh" | ||
19786 | # if finds mixed CR/LF and LF-only lines. Since sed operates in | ||
19787 | # text mode, it properly converts lines to CR/LF. This bash problem | ||
19788 | # is reportedly fixed, but why not run on old versions too? | ||
19789 | - sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ | ||
19790 | - || (rm -f "$cfgfile"; exit 1) | ||
19791 | - | ||
19792 | - case $xsi_shell in | ||
19793 | - yes) | ||
19794 | - cat << \_LT_EOF >> "$cfgfile" | ||
19795 | - | ||
19796 | -# func_dirname file append nondir_replacement | ||
19797 | -# Compute the dirname of FILE. If nonempty, add APPEND to the result, | ||
19798 | -# otherwise set result to NONDIR_REPLACEMENT. | ||
19799 | -func_dirname () | ||
19800 | -{ | ||
19801 | - case ${1} in | ||
19802 | - */*) func_dirname_result="${1%/*}${2}" ;; | ||
19803 | - * ) func_dirname_result="${3}" ;; | ||
19804 | - esac | ||
19805 | -} | ||
19806 | - | ||
19807 | -# func_basename file | ||
19808 | -func_basename () | ||
19809 | -{ | ||
19810 | - func_basename_result="${1##*/}" | ||
19811 | -} | ||
19812 | - | ||
19813 | -# func_dirname_and_basename file append nondir_replacement | ||
19814 | -# perform func_basename and func_dirname in a single function | ||
19815 | -# call: | ||
19816 | -# dirname: Compute the dirname of FILE. If nonempty, | ||
19817 | -# add APPEND to the result, otherwise set result | ||
19818 | -# to NONDIR_REPLACEMENT. | ||
19819 | -# value returned in "$func_dirname_result" | ||
19820 | -# basename: Compute filename of FILE. | ||
19821 | -# value retuned in "$func_basename_result" | ||
19822 | -# Implementation must be kept synchronized with func_dirname | ||
19823 | -# and func_basename. For efficiency, we do not delegate to | ||
19824 | -# those functions but instead duplicate the functionality here. | ||
19825 | -func_dirname_and_basename () | ||
19826 | -{ | ||
19827 | - case ${1} in | ||
19828 | - */*) func_dirname_result="${1%/*}${2}" ;; | ||
19829 | - * ) func_dirname_result="${3}" ;; | ||
19830 | - esac | ||
19831 | - func_basename_result="${1##*/}" | ||
19832 | -} | ||
19833 | - | ||
19834 | -# func_stripname prefix suffix name | ||
19835 | -# strip PREFIX and SUFFIX off of NAME. | ||
19836 | -# PREFIX and SUFFIX must not contain globbing or regex special | ||
19837 | -# characters, hashes, percent signs, but SUFFIX may contain a leading | ||
19838 | -# dot (in which case that matches only a dot). | ||
19839 | -func_stripname () | ||
19840 | -{ | ||
19841 | - # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are | ||
19842 | - # positional parameters, so assign one to ordinary parameter first. | ||
19843 | - func_stripname_result=${3} | ||
19844 | - func_stripname_result=${func_stripname_result#"${1}"} | ||
19845 | - func_stripname_result=${func_stripname_result%"${2}"} | ||
19846 | -} | ||
19847 | - | ||
19848 | -# func_opt_split | ||
19849 | -func_opt_split () | ||
19850 | -{ | ||
19851 | - func_opt_split_opt=${1%%=*} | ||
19852 | - func_opt_split_arg=${1#*=} | ||
19853 | -} | ||
19854 | - | ||
19855 | -# func_lo2o object | ||
19856 | -func_lo2o () | ||
19857 | -{ | ||
19858 | - case ${1} in | ||
19859 | - *.lo) func_lo2o_result=${1%.lo}.${objext} ;; | ||
19860 | - *) func_lo2o_result=${1} ;; | ||
19861 | - esac | ||
19862 | -} | ||
19863 | - | ||
19864 | -# func_xform libobj-or-source | ||
19865 | -func_xform () | ||
19866 | -{ | ||
19867 | - func_xform_result=${1%.*}.lo | ||
19868 | -} | ||
19869 | - | ||
19870 | -# func_arith arithmetic-term... | ||
19871 | -func_arith () | ||
19872 | -{ | ||
19873 | - func_arith_result=$(( $* )) | ||
19874 | -} | ||
19875 | - | ||
19876 | -# func_len string | ||
19877 | -# STRING may not start with a hyphen. | ||
19878 | -func_len () | ||
19879 | -{ | ||
19880 | - func_len_result=${#1} | ||
19881 | -} | ||
19882 | - | ||
19883 | -_LT_EOF | ||
19884 | - ;; | ||
19885 | - *) # Bourne compatible functions. | ||
19886 | - cat << \_LT_EOF >> "$cfgfile" | ||
19887 | - | ||
19888 | -# func_dirname file append nondir_replacement | ||
19889 | -# Compute the dirname of FILE. If nonempty, add APPEND to the result, | ||
19890 | -# otherwise set result to NONDIR_REPLACEMENT. | ||
19891 | -func_dirname () | ||
19892 | -{ | ||
19893 | - # Extract subdirectory from the argument. | ||
19894 | - func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` | ||
19895 | - if test "X$func_dirname_result" = "X${1}"; then | ||
19896 | - func_dirname_result="${3}" | ||
19897 | - else | ||
19898 | - func_dirname_result="$func_dirname_result${2}" | ||
19899 | - fi | ||
19900 | -} | ||
19901 | - | ||
19902 | -# func_basename file | ||
19903 | -func_basename () | ||
19904 | -{ | ||
19905 | - func_basename_result=`$ECHO "${1}" | $SED "$basename"` | ||
19906 | -} | ||
19907 | - | ||
19908 | - | ||
19909 | -# func_stripname prefix suffix name | ||
19910 | -# strip PREFIX and SUFFIX off of NAME. | ||
19911 | -# PREFIX and SUFFIX must not contain globbing or regex special | ||
19912 | -# characters, hashes, percent signs, but SUFFIX may contain a leading | ||
19913 | -# dot (in which case that matches only a dot). | ||
19914 | -# func_strip_suffix prefix name | ||
19915 | -func_stripname () | ||
19916 | -{ | ||
19917 | - case ${2} in | ||
19918 | - .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; | ||
19919 | - *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; | ||
19920 | - esac | ||
19921 | -} | ||
19922 | - | ||
19923 | -# sed scripts: | ||
19924 | -my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q' | ||
19925 | -my_sed_long_arg='1s/^-[^=]*=//' | ||
19926 | - | ||
19927 | -# func_opt_split | ||
19928 | -func_opt_split () | ||
19929 | -{ | ||
19930 | - func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"` | ||
19931 | - func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"` | ||
19932 | -} | ||
19933 | - | ||
19934 | -# func_lo2o object | ||
19935 | -func_lo2o () | ||
19936 | -{ | ||
19937 | - func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` | ||
19938 | -} | ||
19939 | - | ||
19940 | -# func_xform libobj-or-source | ||
19941 | -func_xform () | ||
19942 | -{ | ||
19943 | - func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'` | ||
19944 | -} | ||
19945 | - | ||
19946 | -# func_arith arithmetic-term... | ||
19947 | -func_arith () | ||
19948 | -{ | ||
19949 | - func_arith_result=`expr "$@"` | ||
19950 | -} | ||
19951 | - | ||
19952 | -# func_len string | ||
19953 | -# STRING may not start with a hyphen. | ||
19954 | -func_len () | ||
19955 | -{ | ||
19956 | - func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len` | ||
19957 | -} | ||
19958 | - | ||
19959 | -_LT_EOF | ||
19960 | -esac | ||
19961 | - | ||
19962 | -case $lt_shell_append in | ||
19963 | - yes) | ||
19964 | - cat << \_LT_EOF >> "$cfgfile" | ||
19965 | - | ||
19966 | -# func_append var value | ||
19967 | -# Append VALUE to the end of shell variable VAR. | ||
19968 | -func_append () | ||
19969 | -{ | ||
19970 | - eval "$1+=\$2" | ||
19971 | -} | ||
19972 | -_LT_EOF | ||
19973 | - ;; | ||
19974 | - *) | ||
19975 | - cat << \_LT_EOF >> "$cfgfile" | ||
19976 | - | ||
19977 | -# func_append var value | ||
19978 | -# Append VALUE to the end of shell variable VAR. | ||
19979 | -func_append () | ||
19980 | -{ | ||
19981 | - eval "$1=\$$1\$2" | ||
19982 | -} | ||
19983 | - | ||
19984 | -_LT_EOF | ||
19985 | - ;; | ||
19986 | - esac | ||
19987 | - | ||
19988 | - | ||
19989 | - sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ | ||
19990 | - || (rm -f "$cfgfile"; exit 1) | ||
19991 | - | ||
19992 | - mv -f "$cfgfile" "$ofile" || | ||
19993 | + sed '$q' "$ltmain" >> "$cfgfile" \ | ||
19994 | + || (rm -f "$cfgfile"; exit 1) | ||
19995 | + | ||
19996 | + if test x"$xsi_shell" = xyes; then | ||
19997 | + sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ | ||
19998 | +func_dirname ()\ | ||
19999 | +{\ | ||
20000 | +\ case ${1} in\ | ||
20001 | +\ */*) func_dirname_result="${1%/*}${2}" ;;\ | ||
20002 | +\ * ) func_dirname_result="${3}" ;;\ | ||
20003 | +\ esac\ | ||
20004 | +} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \ | ||
20005 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
20006 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
20007 | +test 0 -eq $? || _lt_function_replace_fail=: | ||
20008 | + | ||
20009 | + | ||
20010 | + sed -e '/^func_basename ()$/,/^} # func_basename /c\ | ||
20011 | +func_basename ()\ | ||
20012 | +{\ | ||
20013 | +\ func_basename_result="${1##*/}"\ | ||
20014 | +} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \ | ||
20015 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
20016 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
20017 | +test 0 -eq $? || _lt_function_replace_fail=: | ||
20018 | + | ||
20019 | + | ||
20020 | + sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\ | ||
20021 | +func_dirname_and_basename ()\ | ||
20022 | +{\ | ||
20023 | +\ case ${1} in\ | ||
20024 | +\ */*) func_dirname_result="${1%/*}${2}" ;;\ | ||
20025 | +\ * ) func_dirname_result="${3}" ;;\ | ||
20026 | +\ esac\ | ||
20027 | +\ func_basename_result="${1##*/}"\ | ||
20028 | +} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \ | ||
20029 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
20030 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
20031 | +test 0 -eq $? || _lt_function_replace_fail=: | ||
20032 | + | ||
20033 | + | ||
20034 | + sed -e '/^func_stripname ()$/,/^} # func_stripname /c\ | ||
20035 | +func_stripname ()\ | ||
20036 | +{\ | ||
20037 | +\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\ | ||
20038 | +\ # positional parameters, so assign one to ordinary parameter first.\ | ||
20039 | +\ func_stripname_result=${3}\ | ||
20040 | +\ func_stripname_result=${func_stripname_result#"${1}"}\ | ||
20041 | +\ func_stripname_result=${func_stripname_result%"${2}"}\ | ||
20042 | +} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \ | ||
20043 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
20044 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
20045 | +test 0 -eq $? || _lt_function_replace_fail=: | ||
20046 | + | ||
20047 | + | ||
20048 | + sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\ | ||
20049 | +func_split_long_opt ()\ | ||
20050 | +{\ | ||
20051 | +\ func_split_long_opt_name=${1%%=*}\ | ||
20052 | +\ func_split_long_opt_arg=${1#*=}\ | ||
20053 | +} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \ | ||
20054 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
20055 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
20056 | +test 0 -eq $? || _lt_function_replace_fail=: | ||
20057 | + | ||
20058 | + | ||
20059 | + sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\ | ||
20060 | +func_split_short_opt ()\ | ||
20061 | +{\ | ||
20062 | +\ func_split_short_opt_arg=${1#??}\ | ||
20063 | +\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\ | ||
20064 | +} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \ | ||
20065 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
20066 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
20067 | +test 0 -eq $? || _lt_function_replace_fail=: | ||
20068 | + | ||
20069 | + | ||
20070 | + sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\ | ||
20071 | +func_lo2o ()\ | ||
20072 | +{\ | ||
20073 | +\ case ${1} in\ | ||
20074 | +\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\ | ||
20075 | +\ *) func_lo2o_result=${1} ;;\ | ||
20076 | +\ esac\ | ||
20077 | +} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \ | ||
20078 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
20079 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
20080 | +test 0 -eq $? || _lt_function_replace_fail=: | ||
20081 | + | ||
20082 | + | ||
20083 | + sed -e '/^func_xform ()$/,/^} # func_xform /c\ | ||
20084 | +func_xform ()\ | ||
20085 | +{\ | ||
20086 | + func_xform_result=${1%.*}.lo\ | ||
20087 | +} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \ | ||
20088 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
20089 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
20090 | +test 0 -eq $? || _lt_function_replace_fail=: | ||
20091 | + | ||
20092 | + | ||
20093 | + sed -e '/^func_arith ()$/,/^} # func_arith /c\ | ||
20094 | +func_arith ()\ | ||
20095 | +{\ | ||
20096 | + func_arith_result=$(( $* ))\ | ||
20097 | +} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \ | ||
20098 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
20099 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
20100 | +test 0 -eq $? || _lt_function_replace_fail=: | ||
20101 | + | ||
20102 | + | ||
20103 | + sed -e '/^func_len ()$/,/^} # func_len /c\ | ||
20104 | +func_len ()\ | ||
20105 | +{\ | ||
20106 | + func_len_result=${#1}\ | ||
20107 | +} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \ | ||
20108 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
20109 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
20110 | +test 0 -eq $? || _lt_function_replace_fail=: | ||
20111 | + | ||
20112 | +fi | ||
20113 | + | ||
20114 | +if test x"$lt_shell_append" = xyes; then | ||
20115 | + sed -e '/^func_append ()$/,/^} # func_append /c\ | ||
20116 | +func_append ()\ | ||
20117 | +{\ | ||
20118 | + eval "${1}+=\\${2}"\ | ||
20119 | +} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \ | ||
20120 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
20121 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
20122 | +test 0 -eq $? || _lt_function_replace_fail=: | ||
20123 | + | ||
20124 | + | ||
20125 | + sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\ | ||
20126 | +func_append_quoted ()\ | ||
20127 | +{\ | ||
20128 | +\ func_quote_for_eval "${2}"\ | ||
20129 | +\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\ | ||
20130 | +} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \ | ||
20131 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
20132 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
20133 | +test 0 -eq $? || _lt_function_replace_fail=: | ||
20134 | + | ||
20135 | + | ||
20136 | + # Save a `func_append' function call where possible by direct use of '+=' | ||
20137 | + sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ | ||
20138 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
20139 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
20140 | + test 0 -eq $? || _lt_function_replace_fail=: | ||
20141 | +else | ||
20142 | + # Save a `func_append' function call even when '+=' is not available | ||
20143 | + sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ | ||
20144 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
20145 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
20146 | + test 0 -eq $? || _lt_function_replace_fail=: | ||
20147 | +fi | ||
20148 | + | ||
20149 | +if test x"$_lt_function_replace_fail" = x":"; then | ||
20150 | + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 | ||
20151 | +$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} | ||
20152 | +fi | ||
20153 | + | ||
20154 | + | ||
20155 | + mv -f "$cfgfile" "$ofile" || | ||
20156 | (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") | ||
20157 | chmod +x "$ofile" | ||
20158 | |||
20159 | diff --git a/libsframe/Makefile.in b/libsframe/Makefile.in | ||
20160 | index 9e3d268902b..c22ed33460a 100644 | ||
20161 | --- a/libsframe/Makefile.in | ||
20162 | +++ b/libsframe/Makefile.in | ||
20163 | @@ -1,7 +1,7 @@ | ||
20164 | -# Makefile.in generated by automake 1.15.1 from Makefile.am. | ||
20165 | +# Makefile.in generated by automake 1.16.5 from Makefile.am. | ||
20166 | # @configure_input@ | ||
20167 | |||
20168 | -# Copyright (C) 1994-2017 Free Software Foundation, Inc. | ||
20169 | +# Copyright (C) 1994-2021 Free Software Foundation, Inc. | ||
20170 | |||
20171 | # This Makefile.in is free software; the Free Software Foundation | ||
20172 | # gives unlimited permission to copy and/or distribute it, | ||
20173 | @@ -142,6 +142,13 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs | ||
20174 | CONFIG_HEADER = config.h | ||
20175 | CONFIG_CLEAN_FILES = | ||
20176 | CONFIG_CLEAN_VPATH_FILES = | ||
20177 | +@HAVE_COMPAT_DEJAGNU_TRUE@am__EXEEXT_1 = testsuite/libsframe.decode/be-flipping$(EXEEXT) \ | ||
20178 | +@HAVE_COMPAT_DEJAGNU_TRUE@ testsuite/libsframe.decode/frecnt-1$(EXEEXT) \ | ||
20179 | +@HAVE_COMPAT_DEJAGNU_TRUE@ testsuite/libsframe.decode/frecnt-2$(EXEEXT) \ | ||
20180 | +@HAVE_COMPAT_DEJAGNU_TRUE@ testsuite/libsframe.encode/encode-1$(EXEEXT) \ | ||
20181 | +@HAVE_COMPAT_DEJAGNU_TRUE@ testsuite/libsframe.find/findfre-1$(EXEEXT) \ | ||
20182 | +@HAVE_COMPAT_DEJAGNU_TRUE@ testsuite/libsframe.find/findfunc-1$(EXEEXT) \ | ||
20183 | +@HAVE_COMPAT_DEJAGNU_TRUE@ testsuite/libsframe.find/plt-findfre-1$(EXEEXT) | ||
20184 | am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; | ||
20185 | am__vpath_adj = case $$p in \ | ||
20186 | $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ | ||
20187 | @@ -185,45 +192,44 @@ libsframe_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ | ||
20188 | $(libsframe_la_LDFLAGS) $(LDFLAGS) -o $@ | ||
20189 | @INSTALL_LIBBFD_FALSE@am_libsframe_la_rpath = | ||
20190 | @INSTALL_LIBBFD_TRUE@am_libsframe_la_rpath = -rpath $(libdir) | ||
20191 | -@HAVE_COMPAT_DEJAGNU_TRUE@am__EXEEXT_1 = testsuite/libsframe.decode/be-flipping$(EXEEXT) \ | ||
20192 | -@HAVE_COMPAT_DEJAGNU_TRUE@ testsuite/libsframe.decode/frecnt-1$(EXEEXT) \ | ||
20193 | -@HAVE_COMPAT_DEJAGNU_TRUE@ testsuite/libsframe.decode/frecnt-2$(EXEEXT) \ | ||
20194 | -@HAVE_COMPAT_DEJAGNU_TRUE@ testsuite/libsframe.encode/encode-1$(EXEEXT) \ | ||
20195 | -@HAVE_COMPAT_DEJAGNU_TRUE@ testsuite/libsframe.find/findfre-1$(EXEEXT) \ | ||
20196 | -@HAVE_COMPAT_DEJAGNU_TRUE@ testsuite/libsframe.find/findfunc-1$(EXEEXT) \ | ||
20197 | -@HAVE_COMPAT_DEJAGNU_TRUE@ testsuite/libsframe.find/plt-findfre-1$(EXEEXT) | ||
20198 | am__dirstamp = $(am__leading_dot)dirstamp | ||
20199 | -am_testsuite_libsframe_decode_be_flipping_OBJECTS = testsuite/libsframe.decode/testsuite_libsframe_decode_be_flipping-be-flipping.$(OBJEXT) | ||
20200 | +am_testsuite_libsframe_decode_be_flipping_OBJECTS = \ | ||
20201 | + testsuite/libsframe.decode/be_flipping-be-flipping.$(OBJEXT) | ||
20202 | testsuite_libsframe_decode_be_flipping_OBJECTS = \ | ||
20203 | $(am_testsuite_libsframe_decode_be_flipping_OBJECTS) | ||
20204 | testsuite_libsframe_decode_be_flipping_DEPENDENCIES = \ | ||
20205 | ${top_builddir}/libsframe.la | ||
20206 | -am_testsuite_libsframe_decode_frecnt_1_OBJECTS = testsuite/libsframe.decode/testsuite_libsframe_decode_frecnt_1-frecnt-1.$(OBJEXT) | ||
20207 | +am_testsuite_libsframe_decode_frecnt_1_OBJECTS = \ | ||
20208 | + testsuite/libsframe.decode/frecnt_1-frecnt-1.$(OBJEXT) | ||
20209 | testsuite_libsframe_decode_frecnt_1_OBJECTS = \ | ||
20210 | $(am_testsuite_libsframe_decode_frecnt_1_OBJECTS) | ||
20211 | testsuite_libsframe_decode_frecnt_1_DEPENDENCIES = \ | ||
20212 | ${top_builddir}/libsframe.la | ||
20213 | -am_testsuite_libsframe_decode_frecnt_2_OBJECTS = testsuite/libsframe.decode/testsuite_libsframe_decode_frecnt_2-frecnt-2.$(OBJEXT) | ||
20214 | +am_testsuite_libsframe_decode_frecnt_2_OBJECTS = \ | ||
20215 | + testsuite/libsframe.decode/frecnt_2-frecnt-2.$(OBJEXT) | ||
20216 | testsuite_libsframe_decode_frecnt_2_OBJECTS = \ | ||
20217 | $(am_testsuite_libsframe_decode_frecnt_2_OBJECTS) | ||
20218 | testsuite_libsframe_decode_frecnt_2_DEPENDENCIES = \ | ||
20219 | ${top_builddir}/libsframe.la | ||
20220 | -am_testsuite_libsframe_encode_encode_1_OBJECTS = testsuite/libsframe.encode/testsuite_libsframe_encode_encode_1-encode-1.$(OBJEXT) | ||
20221 | +am_testsuite_libsframe_encode_encode_1_OBJECTS = \ | ||
20222 | + testsuite/libsframe.encode/encode_1-encode-1.$(OBJEXT) | ||
20223 | testsuite_libsframe_encode_encode_1_OBJECTS = \ | ||
20224 | $(am_testsuite_libsframe_encode_encode_1_OBJECTS) | ||
20225 | testsuite_libsframe_encode_encode_1_DEPENDENCIES = \ | ||
20226 | ${top_builddir}/libsframe.la | ||
20227 | -am_testsuite_libsframe_find_findfre_1_OBJECTS = testsuite/libsframe.find/testsuite_libsframe_find_findfre_1-findfre-1.$(OBJEXT) | ||
20228 | +am_testsuite_libsframe_find_findfre_1_OBJECTS = \ | ||
20229 | + testsuite/libsframe.find/findfre_1-findfre-1.$(OBJEXT) | ||
20230 | testsuite_libsframe_find_findfre_1_OBJECTS = \ | ||
20231 | $(am_testsuite_libsframe_find_findfre_1_OBJECTS) | ||
20232 | testsuite_libsframe_find_findfre_1_DEPENDENCIES = \ | ||
20233 | ${top_builddir}/libsframe.la | ||
20234 | -am_testsuite_libsframe_find_findfunc_1_OBJECTS = testsuite/libsframe.find/testsuite_libsframe_find_findfunc_1-findfunc-1.$(OBJEXT) | ||
20235 | +am_testsuite_libsframe_find_findfunc_1_OBJECTS = \ | ||
20236 | + testsuite/libsframe.find/findfunc_1-findfunc-1.$(OBJEXT) | ||
20237 | testsuite_libsframe_find_findfunc_1_OBJECTS = \ | ||
20238 | $(am_testsuite_libsframe_find_findfunc_1_OBJECTS) | ||
20239 | testsuite_libsframe_find_findfunc_1_DEPENDENCIES = \ | ||
20240 | ${top_builddir}/libsframe.la | ||
20241 | -am_testsuite_libsframe_find_plt_findfre_1_OBJECTS = testsuite/libsframe.find/testsuite_libsframe_find_plt_findfre_1-plt-findfre-1.$(OBJEXT) | ||
20242 | +am_testsuite_libsframe_find_plt_findfre_1_OBJECTS = testsuite/libsframe.find/plt_findfre_1-plt-findfre-1.$(OBJEXT) | ||
20243 | testsuite_libsframe_find_plt_findfre_1_OBJECTS = \ | ||
20244 | $(am_testsuite_libsframe_find_plt_findfre_1_OBJECTS) | ||
20245 | testsuite_libsframe_find_plt_findfre_1_DEPENDENCIES = \ | ||
20246 | @@ -242,7 +248,17 @@ am__v_at_0 = @ | ||
20247 | am__v_at_1 = | ||
20248 | DEFAULT_INCLUDES = -I.@am__isrc@ | ||
20249 | depcomp = $(SHELL) $(top_srcdir)/../depcomp | ||
20250 | -am__depfiles_maybe = depfiles | ||
20251 | +am__maybe_remake_depfiles = depfiles | ||
20252 | +am__depfiles_remade = ./$(DEPDIR)/libsframe_la-sframe-dump.Plo \ | ||
20253 | + ./$(DEPDIR)/libsframe_la-sframe-error.Plo \ | ||
20254 | + ./$(DEPDIR)/libsframe_la-sframe.Plo \ | ||
20255 | + testsuite/libsframe.decode/$(DEPDIR)/be_flipping-be-flipping.Po \ | ||
20256 | + testsuite/libsframe.decode/$(DEPDIR)/frecnt_1-frecnt-1.Po \ | ||
20257 | + testsuite/libsframe.decode/$(DEPDIR)/frecnt_2-frecnt-2.Po \ | ||
20258 | + testsuite/libsframe.encode/$(DEPDIR)/encode_1-encode-1.Po \ | ||
20259 | + testsuite/libsframe.find/$(DEPDIR)/findfre_1-findfre-1.Po \ | ||
20260 | + testsuite/libsframe.find/$(DEPDIR)/findfunc_1-findfunc-1.Po \ | ||
20261 | + testsuite/libsframe.find/$(DEPDIR)/plt_findfre_1-plt-findfre-1.Po | ||
20262 | am__mv = mv -f | ||
20263 | COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ | ||
20264 | $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) | ||
20265 | @@ -325,8 +341,8 @@ am__can_run_installinfo = \ | ||
20266 | esac | ||
20267 | am__include_HEADERS_DIST = $(INCDIR)/sframe.h $(INCDIR)/sframe-api.h | ||
20268 | HEADERS = $(include_HEADERS) | ||
20269 | -am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \ | ||
20270 | - $(LISP)config.h.in | ||
20271 | +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) \ | ||
20272 | + config.h.in | ||
20273 | # Read a list of newline-separated strings from the standard input, | ||
20274 | # and print each of them once, without duplicates. Input order is | ||
20275 | # *not* preserved. | ||
20276 | @@ -343,9 +359,6 @@ am__define_uniq_tagged_files = \ | ||
20277 | unique=`for i in $$list; do \ | ||
20278 | if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ | ||
20279 | done | $(am__uniquify_input)` | ||
20280 | -ETAGS = etags | ||
20281 | -CTAGS = ctags | ||
20282 | -CSCOPE = cscope | ||
20283 | AM_RECURSIVE_TARGETS = cscope | ||
20284 | DEJATOOL = $(PACKAGE) | ||
20285 | RUNTESTDEFAULTFLAGS = --tool $$tool --srcdir $$srcdir | ||
20286 | @@ -372,6 +385,8 @@ am__post_remove_distdir = $(am__remove_distdir) | ||
20287 | DIST_ARCHIVES = $(distdir).tar.gz | ||
20288 | GZIP_ENV = --best | ||
20289 | DIST_TARGETS = dist-gzip | ||
20290 | +# Exists only to be overridden by the user if desired. | ||
20291 | +AM_DISTCHECK_DVI_TARGET = dvi | ||
20292 | distuninstallcheck_listfiles = find . -type f -print | ||
20293 | am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \ | ||
20294 | | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$' | ||
20295 | @@ -390,15 +405,19 @@ CFLAGS = @CFLAGS@ | ||
20296 | COMPAT_DEJAGNU = @COMPAT_DEJAGNU@ | ||
20297 | CPP = @CPP@ | ||
20298 | CPPFLAGS = @CPPFLAGS@ | ||
20299 | +CSCOPE = @CSCOPE@ | ||
20300 | +CTAGS = @CTAGS@ | ||
20301 | CYGPATH_W = @CYGPATH_W@ | ||
20302 | DEFS = @DEFS@ | ||
20303 | DEPDIR = @DEPDIR@ | ||
20304 | +DLLTOOL = @DLLTOOL@ | ||
20305 | DSYMUTIL = @DSYMUTIL@ | ||
20306 | DUMPBIN = @DUMPBIN@ | ||
20307 | ECHO_C = @ECHO_C@ | ||
20308 | ECHO_N = @ECHO_N@ | ||
20309 | ECHO_T = @ECHO_T@ | ||
20310 | EGREP = @EGREP@ | ||
20311 | +ETAGS = @ETAGS@ | ||
20312 | EXEEXT = @EXEEXT@ | ||
20313 | FGREP = @FGREP@ | ||
20314 | GREP = @GREP@ | ||
20315 | @@ -417,6 +436,7 @@ LN_S = @LN_S@ | ||
20316 | LTLIBOBJS = @LTLIBOBJS@ | ||
20317 | MAINT = @MAINT@ | ||
20318 | MAKEINFO = @MAKEINFO@ | ||
20319 | +MANIFEST_TOOL = @MANIFEST_TOOL@ | ||
20320 | MKDIR_P = @MKDIR_P@ | ||
20321 | NM = @NM@ | ||
20322 | NMEDIT = @NMEDIT@ | ||
20323 | @@ -589,8 +609,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status | ||
20324 | echo ' $(SHELL) ./config.status'; \ | ||
20325 | $(SHELL) ./config.status;; \ | ||
20326 | *) \ | ||
20327 | - echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \ | ||
20328 | - cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \ | ||
20329 | + echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles)'; \ | ||
20330 | + cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles);; \ | ||
20331 | esac; | ||
20332 | $(srcdir)/doc/local.mk $(srcdir)/testsuite/local.mk $(srcdir)/testsuite/libsframe.decode/local.mk $(srcdir)/testsuite/libsframe.encode/local.mk $(srcdir)/testsuite/libsframe.find/local.mk $(am__empty): | ||
20333 | |||
20334 | @@ -618,6 +638,15 @@ $(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) | ||
20335 | distclean-hdr: | ||
20336 | -rm -f config.h stamp-h1 | ||
20337 | |||
20338 | +clean-checkPROGRAMS: | ||
20339 | + @list='$(check_PROGRAMS)'; test -n "$$list" || exit 0; \ | ||
20340 | + echo " rm -f" $$list; \ | ||
20341 | + rm -f $$list || exit $$?; \ | ||
20342 | + test -n "$(EXEEXT)" || exit 0; \ | ||
20343 | + list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ | ||
20344 | + echo " rm -f" $$list; \ | ||
20345 | + rm -f $$list | ||
20346 | + | ||
20347 | install-libLTLIBRARIES: $(lib_LTLIBRARIES) | ||
20348 | @$(NORMAL_INSTALL) | ||
20349 | @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ | ||
20350 | @@ -666,36 +695,27 @@ clean-noinstLTLIBRARIES: | ||
20351 | |||
20352 | libsframe.la: $(libsframe_la_OBJECTS) $(libsframe_la_DEPENDENCIES) $(EXTRA_libsframe_la_DEPENDENCIES) | ||
20353 | $(AM_V_CCLD)$(libsframe_la_LINK) $(am_libsframe_la_rpath) $(libsframe_la_OBJECTS) $(libsframe_la_LIBADD) $(LIBS) | ||
20354 | - | ||
20355 | -clean-checkPROGRAMS: | ||
20356 | - @list='$(check_PROGRAMS)'; test -n "$$list" || exit 0; \ | ||
20357 | - echo " rm -f" $$list; \ | ||
20358 | - rm -f $$list || exit $$?; \ | ||
20359 | - test -n "$(EXEEXT)" || exit 0; \ | ||
20360 | - list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ | ||
20361 | - echo " rm -f" $$list; \ | ||
20362 | - rm -f $$list | ||
20363 | testsuite/libsframe.decode/$(am__dirstamp): | ||
20364 | @$(MKDIR_P) testsuite/libsframe.decode | ||
20365 | @: > testsuite/libsframe.decode/$(am__dirstamp) | ||
20366 | testsuite/libsframe.decode/$(DEPDIR)/$(am__dirstamp): | ||
20367 | @$(MKDIR_P) testsuite/libsframe.decode/$(DEPDIR) | ||
20368 | @: > testsuite/libsframe.decode/$(DEPDIR)/$(am__dirstamp) | ||
20369 | -testsuite/libsframe.decode/testsuite_libsframe_decode_be_flipping-be-flipping.$(OBJEXT): \ | ||
20370 | +testsuite/libsframe.decode/be_flipping-be-flipping.$(OBJEXT): \ | ||
20371 | testsuite/libsframe.decode/$(am__dirstamp) \ | ||
20372 | testsuite/libsframe.decode/$(DEPDIR)/$(am__dirstamp) | ||
20373 | |||
20374 | 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) | ||
20375 | @rm -f testsuite/libsframe.decode/be-flipping$(EXEEXT) | ||
20376 | $(AM_V_CCLD)$(LINK) $(testsuite_libsframe_decode_be_flipping_OBJECTS) $(testsuite_libsframe_decode_be_flipping_LDADD) $(LIBS) | ||
20377 | -testsuite/libsframe.decode/testsuite_libsframe_decode_frecnt_1-frecnt-1.$(OBJEXT): \ | ||
20378 | +testsuite/libsframe.decode/frecnt_1-frecnt-1.$(OBJEXT): \ | ||
20379 | testsuite/libsframe.decode/$(am__dirstamp) \ | ||
20380 | testsuite/libsframe.decode/$(DEPDIR)/$(am__dirstamp) | ||
20381 | |||
20382 | 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) | ||
20383 | @rm -f testsuite/libsframe.decode/frecnt-1$(EXEEXT) | ||
20384 | $(AM_V_CCLD)$(LINK) $(testsuite_libsframe_decode_frecnt_1_OBJECTS) $(testsuite_libsframe_decode_frecnt_1_LDADD) $(LIBS) | ||
20385 | -testsuite/libsframe.decode/testsuite_libsframe_decode_frecnt_2-frecnt-2.$(OBJEXT): \ | ||
20386 | +testsuite/libsframe.decode/frecnt_2-frecnt-2.$(OBJEXT): \ | ||
20387 | testsuite/libsframe.decode/$(am__dirstamp) \ | ||
20388 | testsuite/libsframe.decode/$(DEPDIR)/$(am__dirstamp) | ||
20389 | |||
20390 | @@ -708,7 +728,7 @@ testsuite/libsframe.encode/$(am__dirstamp): | ||
20391 | testsuite/libsframe.encode/$(DEPDIR)/$(am__dirstamp): | ||
20392 | @$(MKDIR_P) testsuite/libsframe.encode/$(DEPDIR) | ||
20393 | @: > testsuite/libsframe.encode/$(DEPDIR)/$(am__dirstamp) | ||
20394 | -testsuite/libsframe.encode/testsuite_libsframe_encode_encode_1-encode-1.$(OBJEXT): \ | ||
20395 | +testsuite/libsframe.encode/encode_1-encode-1.$(OBJEXT): \ | ||
20396 | testsuite/libsframe.encode/$(am__dirstamp) \ | ||
20397 | testsuite/libsframe.encode/$(DEPDIR)/$(am__dirstamp) | ||
20398 | |||
20399 | @@ -721,21 +741,21 @@ testsuite/libsframe.find/$(am__dirstamp): | ||
20400 | testsuite/libsframe.find/$(DEPDIR)/$(am__dirstamp): | ||
20401 | @$(MKDIR_P) testsuite/libsframe.find/$(DEPDIR) | ||
20402 | @: > testsuite/libsframe.find/$(DEPDIR)/$(am__dirstamp) | ||
20403 | -testsuite/libsframe.find/testsuite_libsframe_find_findfre_1-findfre-1.$(OBJEXT): \ | ||
20404 | +testsuite/libsframe.find/findfre_1-findfre-1.$(OBJEXT): \ | ||
20405 | testsuite/libsframe.find/$(am__dirstamp) \ | ||
20406 | testsuite/libsframe.find/$(DEPDIR)/$(am__dirstamp) | ||
20407 | |||
20408 | testsuite/libsframe.find/findfre-1$(EXEEXT): $(testsuite_libsframe_find_findfre_1_OBJECTS) $(testsuite_libsframe_find_findfre_1_DEPENDENCIES) $(EXTRA_testsuite_libsframe_find_findfre_1_DEPENDENCIES) testsuite/libsframe.find/$(am__dirstamp) | ||
20409 | @rm -f testsuite/libsframe.find/findfre-1$(EXEEXT) | ||
20410 | $(AM_V_CCLD)$(LINK) $(testsuite_libsframe_find_findfre_1_OBJECTS) $(testsuite_libsframe_find_findfre_1_LDADD) $(LIBS) | ||
20411 | -testsuite/libsframe.find/testsuite_libsframe_find_findfunc_1-findfunc-1.$(OBJEXT): \ | ||
20412 | +testsuite/libsframe.find/findfunc_1-findfunc-1.$(OBJEXT): \ | ||
20413 | testsuite/libsframe.find/$(am__dirstamp) \ | ||
20414 | testsuite/libsframe.find/$(DEPDIR)/$(am__dirstamp) | ||
20415 | |||
20416 | testsuite/libsframe.find/findfunc-1$(EXEEXT): $(testsuite_libsframe_find_findfunc_1_OBJECTS) $(testsuite_libsframe_find_findfunc_1_DEPENDENCIES) $(EXTRA_testsuite_libsframe_find_findfunc_1_DEPENDENCIES) testsuite/libsframe.find/$(am__dirstamp) | ||
20417 | @rm -f testsuite/libsframe.find/findfunc-1$(EXEEXT) | ||
20418 | $(AM_V_CCLD)$(LINK) $(testsuite_libsframe_find_findfunc_1_OBJECTS) $(testsuite_libsframe_find_findfunc_1_LDADD) $(LIBS) | ||
20419 | -testsuite/libsframe.find/testsuite_libsframe_find_plt_findfre_1-plt-findfre-1.$(OBJEXT): \ | ||
20420 | +testsuite/libsframe.find/plt_findfre_1-plt-findfre-1.$(OBJEXT): \ | ||
20421 | testsuite/libsframe.find/$(am__dirstamp) \ | ||
20422 | testsuite/libsframe.find/$(DEPDIR)/$(am__dirstamp) | ||
20423 | |||
20424 | @@ -752,16 +772,22 @@ mostlyclean-compile: | ||
20425 | distclean-compile: | ||
20426 | -rm -f *.tab.c | ||
20427 | |||
20428 | -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsframe_la-sframe-dump.Plo@am__quote@ | ||
20429 | -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsframe_la-sframe-error.Plo@am__quote@ | ||
20430 | -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsframe_la-sframe.Plo@am__quote@ | ||
20431 | -@AMDEP_TRUE@@am__include@ @am__quote@testsuite/libsframe.decode/$(DEPDIR)/testsuite_libsframe_decode_be_flipping-be-flipping.Po@am__quote@ | ||
20432 | -@AMDEP_TRUE@@am__include@ @am__quote@testsuite/libsframe.decode/$(DEPDIR)/testsuite_libsframe_decode_frecnt_1-frecnt-1.Po@am__quote@ | ||
20433 | -@AMDEP_TRUE@@am__include@ @am__quote@testsuite/libsframe.decode/$(DEPDIR)/testsuite_libsframe_decode_frecnt_2-frecnt-2.Po@am__quote@ | ||
20434 | -@AMDEP_TRUE@@am__include@ @am__quote@testsuite/libsframe.encode/$(DEPDIR)/testsuite_libsframe_encode_encode_1-encode-1.Po@am__quote@ | ||
20435 | -@AMDEP_TRUE@@am__include@ @am__quote@testsuite/libsframe.find/$(DEPDIR)/testsuite_libsframe_find_findfre_1-findfre-1.Po@am__quote@ | ||
20436 | -@AMDEP_TRUE@@am__include@ @am__quote@testsuite/libsframe.find/$(DEPDIR)/testsuite_libsframe_find_findfunc_1-findfunc-1.Po@am__quote@ | ||
20437 | -@AMDEP_TRUE@@am__include@ @am__quote@testsuite/libsframe.find/$(DEPDIR)/testsuite_libsframe_find_plt_findfre_1-plt-findfre-1.Po@am__quote@ | ||
20438 | +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsframe_la-sframe-dump.Plo@am__quote@ # am--include-marker | ||
20439 | +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsframe_la-sframe-error.Plo@am__quote@ # am--include-marker | ||
20440 | +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsframe_la-sframe.Plo@am__quote@ # am--include-marker | ||
20441 | +@AMDEP_TRUE@@am__include@ @am__quote@testsuite/libsframe.decode/$(DEPDIR)/be_flipping-be-flipping.Po@am__quote@ # am--include-marker | ||
20442 | +@AMDEP_TRUE@@am__include@ @am__quote@testsuite/libsframe.decode/$(DEPDIR)/frecnt_1-frecnt-1.Po@am__quote@ # am--include-marker | ||
20443 | +@AMDEP_TRUE@@am__include@ @am__quote@testsuite/libsframe.decode/$(DEPDIR)/frecnt_2-frecnt-2.Po@am__quote@ # am--include-marker | ||
20444 | +@AMDEP_TRUE@@am__include@ @am__quote@testsuite/libsframe.encode/$(DEPDIR)/encode_1-encode-1.Po@am__quote@ # am--include-marker | ||
20445 | +@AMDEP_TRUE@@am__include@ @am__quote@testsuite/libsframe.find/$(DEPDIR)/findfre_1-findfre-1.Po@am__quote@ # am--include-marker | ||
20446 | +@AMDEP_TRUE@@am__include@ @am__quote@testsuite/libsframe.find/$(DEPDIR)/findfunc_1-findfunc-1.Po@am__quote@ # am--include-marker | ||
20447 | +@AMDEP_TRUE@@am__include@ @am__quote@testsuite/libsframe.find/$(DEPDIR)/plt_findfre_1-plt-findfre-1.Po@am__quote@ # am--include-marker | ||
20448 | + | ||
20449 | +$(am__depfiles_remade): | ||
20450 | + @$(MKDIR_P) $(@D) | ||
20451 | + @echo '# dummy' >$@-t && $(am__mv) $@-t $@ | ||
20452 | + | ||
20453 | +am--depfiles: $(am__depfiles_remade) | ||
20454 | |||
20455 | .c.o: | ||
20456 | @am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ | ||
20457 | @@ -808,103 +834,103 @@ libsframe_la-sframe-error.lo: sframe-error.c | ||
20458 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
20459 | @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsframe_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libsframe_la-sframe-error.lo `test -f 'sframe-error.c' || echo '$(srcdir)/'`sframe-error.c | ||
20460 | |||
20461 | -testsuite/libsframe.decode/testsuite_libsframe_decode_be_flipping-be-flipping.o: testsuite/libsframe.decode/be-flipping.c | ||
20462 | -@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 | ||
20463 | -@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 | ||
20464 | -@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@ | ||
20465 | +testsuite/libsframe.decode/be_flipping-be-flipping.o: testsuite/libsframe.decode/be-flipping.c | ||
20466 | +@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 | ||
20467 | +@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 | ||
20468 | +@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@ | ||
20469 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
20470 | -@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 | ||
20471 | +@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 | ||
20472 | |||
20473 | -testsuite/libsframe.decode/testsuite_libsframe_decode_be_flipping-be-flipping.obj: testsuite/libsframe.decode/be-flipping.c | ||
20474 | -@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` | ||
20475 | -@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 | ||
20476 | -@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@ | ||
20477 | +testsuite/libsframe.decode/be_flipping-be-flipping.obj: testsuite/libsframe.decode/be-flipping.c | ||
20478 | +@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` | ||
20479 | +@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 | ||
20480 | +@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@ | ||
20481 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
20482 | -@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` | ||
20483 | +@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` | ||
20484 | |||
20485 | -testsuite/libsframe.decode/testsuite_libsframe_decode_frecnt_1-frecnt-1.o: testsuite/libsframe.decode/frecnt-1.c | ||
20486 | -@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 | ||
20487 | -@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 | ||
20488 | -@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@ | ||
20489 | +testsuite/libsframe.decode/frecnt_1-frecnt-1.o: testsuite/libsframe.decode/frecnt-1.c | ||
20490 | +@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 | ||
20491 | +@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 | ||
20492 | +@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@ | ||
20493 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
20494 | -@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 | ||
20495 | +@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 | ||
20496 | |||
20497 | -testsuite/libsframe.decode/testsuite_libsframe_decode_frecnt_1-frecnt-1.obj: testsuite/libsframe.decode/frecnt-1.c | ||
20498 | -@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` | ||
20499 | -@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 | ||
20500 | -@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@ | ||
20501 | +testsuite/libsframe.decode/frecnt_1-frecnt-1.obj: testsuite/libsframe.decode/frecnt-1.c | ||
20502 | +@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` | ||
20503 | +@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 | ||
20504 | +@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@ | ||
20505 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
20506 | -@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` | ||
20507 | +@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` | ||
20508 | |||
20509 | -testsuite/libsframe.decode/testsuite_libsframe_decode_frecnt_2-frecnt-2.o: testsuite/libsframe.decode/frecnt-2.c | ||
20510 | -@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 | ||
20511 | -@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 | ||
20512 | -@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@ | ||
20513 | +testsuite/libsframe.decode/frecnt_2-frecnt-2.o: testsuite/libsframe.decode/frecnt-2.c | ||
20514 | +@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 | ||
20515 | +@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 | ||
20516 | +@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@ | ||
20517 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
20518 | -@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 | ||
20519 | +@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 | ||
20520 | |||
20521 | -testsuite/libsframe.decode/testsuite_libsframe_decode_frecnt_2-frecnt-2.obj: testsuite/libsframe.decode/frecnt-2.c | ||
20522 | -@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` | ||
20523 | -@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 | ||
20524 | -@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@ | ||
20525 | +testsuite/libsframe.decode/frecnt_2-frecnt-2.obj: testsuite/libsframe.decode/frecnt-2.c | ||
20526 | +@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` | ||
20527 | +@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 | ||
20528 | +@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@ | ||
20529 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
20530 | -@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` | ||
20531 | +@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` | ||
20532 | |||
20533 | -testsuite/libsframe.encode/testsuite_libsframe_encode_encode_1-encode-1.o: testsuite/libsframe.encode/encode-1.c | ||
20534 | -@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 | ||
20535 | -@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 | ||
20536 | -@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@ | ||
20537 | +testsuite/libsframe.encode/encode_1-encode-1.o: testsuite/libsframe.encode/encode-1.c | ||
20538 | +@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 | ||
20539 | +@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 | ||
20540 | +@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@ | ||
20541 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
20542 | -@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 | ||
20543 | +@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 | ||
20544 | |||
20545 | -testsuite/libsframe.encode/testsuite_libsframe_encode_encode_1-encode-1.obj: testsuite/libsframe.encode/encode-1.c | ||
20546 | -@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` | ||
20547 | -@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 | ||
20548 | -@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@ | ||
20549 | +testsuite/libsframe.encode/encode_1-encode-1.obj: testsuite/libsframe.encode/encode-1.c | ||
20550 | +@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` | ||
20551 | +@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 | ||
20552 | +@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@ | ||
20553 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
20554 | -@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` | ||
20555 | +@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` | ||
20556 | |||
20557 | -testsuite/libsframe.find/testsuite_libsframe_find_findfre_1-findfre-1.o: testsuite/libsframe.find/findfre-1.c | ||
20558 | -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_find_findfre_1_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT testsuite/libsframe.find/testsuite_libsframe_find_findfre_1-findfre-1.o -MD -MP -MF testsuite/libsframe.find/$(DEPDIR)/testsuite_libsframe_find_findfre_1-findfre-1.Tpo -c -o testsuite/libsframe.find/testsuite_libsframe_find_findfre_1-findfre-1.o `test -f 'testsuite/libsframe.find/findfre-1.c' || echo '$(srcdir)/'`testsuite/libsframe.find/findfre-1.c | ||
20559 | -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) testsuite/libsframe.find/$(DEPDIR)/testsuite_libsframe_find_findfre_1-findfre-1.Tpo testsuite/libsframe.find/$(DEPDIR)/testsuite_libsframe_find_findfre_1-findfre-1.Po | ||
20560 | -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='testsuite/libsframe.find/findfre-1.c' object='testsuite/libsframe.find/testsuite_libsframe_find_findfre_1-findfre-1.o' libtool=no @AMDEPBACKSLASH@ | ||
20561 | +testsuite/libsframe.find/findfre_1-findfre-1.o: testsuite/libsframe.find/findfre-1.c | ||
20562 | +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_find_findfre_1_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT testsuite/libsframe.find/findfre_1-findfre-1.o -MD -MP -MF testsuite/libsframe.find/$(DEPDIR)/findfre_1-findfre-1.Tpo -c -o testsuite/libsframe.find/findfre_1-findfre-1.o `test -f 'testsuite/libsframe.find/findfre-1.c' || echo '$(srcdir)/'`testsuite/libsframe.find/findfre-1.c | ||
20563 | +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) testsuite/libsframe.find/$(DEPDIR)/findfre_1-findfre-1.Tpo testsuite/libsframe.find/$(DEPDIR)/findfre_1-findfre-1.Po | ||
20564 | +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='testsuite/libsframe.find/findfre-1.c' object='testsuite/libsframe.find/findfre_1-findfre-1.o' libtool=no @AMDEPBACKSLASH@ | ||
20565 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
20566 | -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_find_findfre_1_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o testsuite/libsframe.find/testsuite_libsframe_find_findfre_1-findfre-1.o `test -f 'testsuite/libsframe.find/findfre-1.c' || echo '$(srcdir)/'`testsuite/libsframe.find/findfre-1.c | ||
20567 | +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_find_findfre_1_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o testsuite/libsframe.find/findfre_1-findfre-1.o `test -f 'testsuite/libsframe.find/findfre-1.c' || echo '$(srcdir)/'`testsuite/libsframe.find/findfre-1.c | ||
20568 | |||
20569 | -testsuite/libsframe.find/testsuite_libsframe_find_findfre_1-findfre-1.obj: testsuite/libsframe.find/findfre-1.c | ||
20570 | -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_find_findfre_1_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT testsuite/libsframe.find/testsuite_libsframe_find_findfre_1-findfre-1.obj -MD -MP -MF testsuite/libsframe.find/$(DEPDIR)/testsuite_libsframe_find_findfre_1-findfre-1.Tpo -c -o testsuite/libsframe.find/testsuite_libsframe_find_findfre_1-findfre-1.obj `if test -f 'testsuite/libsframe.find/findfre-1.c'; then $(CYGPATH_W) 'testsuite/libsframe.find/findfre-1.c'; else $(CYGPATH_W) '$(srcdir)/testsuite/libsframe.find/findfre-1.c'; fi` | ||
20571 | -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) testsuite/libsframe.find/$(DEPDIR)/testsuite_libsframe_find_findfre_1-findfre-1.Tpo testsuite/libsframe.find/$(DEPDIR)/testsuite_libsframe_find_findfre_1-findfre-1.Po | ||
20572 | -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='testsuite/libsframe.find/findfre-1.c' object='testsuite/libsframe.find/testsuite_libsframe_find_findfre_1-findfre-1.obj' libtool=no @AMDEPBACKSLASH@ | ||
20573 | +testsuite/libsframe.find/findfre_1-findfre-1.obj: testsuite/libsframe.find/findfre-1.c | ||
20574 | +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_find_findfre_1_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT testsuite/libsframe.find/findfre_1-findfre-1.obj -MD -MP -MF testsuite/libsframe.find/$(DEPDIR)/findfre_1-findfre-1.Tpo -c -o testsuite/libsframe.find/findfre_1-findfre-1.obj `if test -f 'testsuite/libsframe.find/findfre-1.c'; then $(CYGPATH_W) 'testsuite/libsframe.find/findfre-1.c'; else $(CYGPATH_W) '$(srcdir)/testsuite/libsframe.find/findfre-1.c'; fi` | ||
20575 | +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) testsuite/libsframe.find/$(DEPDIR)/findfre_1-findfre-1.Tpo testsuite/libsframe.find/$(DEPDIR)/findfre_1-findfre-1.Po | ||
20576 | +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='testsuite/libsframe.find/findfre-1.c' object='testsuite/libsframe.find/findfre_1-findfre-1.obj' libtool=no @AMDEPBACKSLASH@ | ||
20577 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
20578 | -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_find_findfre_1_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o testsuite/libsframe.find/testsuite_libsframe_find_findfre_1-findfre-1.obj `if test -f 'testsuite/libsframe.find/findfre-1.c'; then $(CYGPATH_W) 'testsuite/libsframe.find/findfre-1.c'; else $(CYGPATH_W) '$(srcdir)/testsuite/libsframe.find/findfre-1.c'; fi` | ||
20579 | +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_find_findfre_1_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o testsuite/libsframe.find/findfre_1-findfre-1.obj `if test -f 'testsuite/libsframe.find/findfre-1.c'; then $(CYGPATH_W) 'testsuite/libsframe.find/findfre-1.c'; else $(CYGPATH_W) '$(srcdir)/testsuite/libsframe.find/findfre-1.c'; fi` | ||
20580 | |||
20581 | -testsuite/libsframe.find/testsuite_libsframe_find_findfunc_1-findfunc-1.o: testsuite/libsframe.find/findfunc-1.c | ||
20582 | -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_find_findfunc_1_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT testsuite/libsframe.find/testsuite_libsframe_find_findfunc_1-findfunc-1.o -MD -MP -MF testsuite/libsframe.find/$(DEPDIR)/testsuite_libsframe_find_findfunc_1-findfunc-1.Tpo -c -o testsuite/libsframe.find/testsuite_libsframe_find_findfunc_1-findfunc-1.o `test -f 'testsuite/libsframe.find/findfunc-1.c' || echo '$(srcdir)/'`testsuite/libsframe.find/findfunc-1.c | ||
20583 | -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) testsuite/libsframe.find/$(DEPDIR)/testsuite_libsframe_find_findfunc_1-findfunc-1.Tpo testsuite/libsframe.find/$(DEPDIR)/testsuite_libsframe_find_findfunc_1-findfunc-1.Po | ||
20584 | -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='testsuite/libsframe.find/findfunc-1.c' object='testsuite/libsframe.find/testsuite_libsframe_find_findfunc_1-findfunc-1.o' libtool=no @AMDEPBACKSLASH@ | ||
20585 | +testsuite/libsframe.find/findfunc_1-findfunc-1.o: testsuite/libsframe.find/findfunc-1.c | ||
20586 | +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_find_findfunc_1_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT testsuite/libsframe.find/findfunc_1-findfunc-1.o -MD -MP -MF testsuite/libsframe.find/$(DEPDIR)/findfunc_1-findfunc-1.Tpo -c -o testsuite/libsframe.find/findfunc_1-findfunc-1.o `test -f 'testsuite/libsframe.find/findfunc-1.c' || echo '$(srcdir)/'`testsuite/libsframe.find/findfunc-1.c | ||
20587 | +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) testsuite/libsframe.find/$(DEPDIR)/findfunc_1-findfunc-1.Tpo testsuite/libsframe.find/$(DEPDIR)/findfunc_1-findfunc-1.Po | ||
20588 | +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='testsuite/libsframe.find/findfunc-1.c' object='testsuite/libsframe.find/findfunc_1-findfunc-1.o' libtool=no @AMDEPBACKSLASH@ | ||
20589 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
20590 | -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_find_findfunc_1_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o testsuite/libsframe.find/testsuite_libsframe_find_findfunc_1-findfunc-1.o `test -f 'testsuite/libsframe.find/findfunc-1.c' || echo '$(srcdir)/'`testsuite/libsframe.find/findfunc-1.c | ||
20591 | +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_find_findfunc_1_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o testsuite/libsframe.find/findfunc_1-findfunc-1.o `test -f 'testsuite/libsframe.find/findfunc-1.c' || echo '$(srcdir)/'`testsuite/libsframe.find/findfunc-1.c | ||
20592 | |||
20593 | -testsuite/libsframe.find/testsuite_libsframe_find_findfunc_1-findfunc-1.obj: testsuite/libsframe.find/findfunc-1.c | ||
20594 | -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_find_findfunc_1_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT testsuite/libsframe.find/testsuite_libsframe_find_findfunc_1-findfunc-1.obj -MD -MP -MF testsuite/libsframe.find/$(DEPDIR)/testsuite_libsframe_find_findfunc_1-findfunc-1.Tpo -c -o testsuite/libsframe.find/testsuite_libsframe_find_findfunc_1-findfunc-1.obj `if test -f 'testsuite/libsframe.find/findfunc-1.c'; then $(CYGPATH_W) 'testsuite/libsframe.find/findfunc-1.c'; else $(CYGPATH_W) '$(srcdir)/testsuite/libsframe.find/findfunc-1.c'; fi` | ||
20595 | -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) testsuite/libsframe.find/$(DEPDIR)/testsuite_libsframe_find_findfunc_1-findfunc-1.Tpo testsuite/libsframe.find/$(DEPDIR)/testsuite_libsframe_find_findfunc_1-findfunc-1.Po | ||
20596 | -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='testsuite/libsframe.find/findfunc-1.c' object='testsuite/libsframe.find/testsuite_libsframe_find_findfunc_1-findfunc-1.obj' libtool=no @AMDEPBACKSLASH@ | ||
20597 | +testsuite/libsframe.find/findfunc_1-findfunc-1.obj: testsuite/libsframe.find/findfunc-1.c | ||
20598 | +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_find_findfunc_1_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT testsuite/libsframe.find/findfunc_1-findfunc-1.obj -MD -MP -MF testsuite/libsframe.find/$(DEPDIR)/findfunc_1-findfunc-1.Tpo -c -o testsuite/libsframe.find/findfunc_1-findfunc-1.obj `if test -f 'testsuite/libsframe.find/findfunc-1.c'; then $(CYGPATH_W) 'testsuite/libsframe.find/findfunc-1.c'; else $(CYGPATH_W) '$(srcdir)/testsuite/libsframe.find/findfunc-1.c'; fi` | ||
20599 | +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) testsuite/libsframe.find/$(DEPDIR)/findfunc_1-findfunc-1.Tpo testsuite/libsframe.find/$(DEPDIR)/findfunc_1-findfunc-1.Po | ||
20600 | +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='testsuite/libsframe.find/findfunc-1.c' object='testsuite/libsframe.find/findfunc_1-findfunc-1.obj' libtool=no @AMDEPBACKSLASH@ | ||
20601 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
20602 | -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_find_findfunc_1_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o testsuite/libsframe.find/testsuite_libsframe_find_findfunc_1-findfunc-1.obj `if test -f 'testsuite/libsframe.find/findfunc-1.c'; then $(CYGPATH_W) 'testsuite/libsframe.find/findfunc-1.c'; else $(CYGPATH_W) '$(srcdir)/testsuite/libsframe.find/findfunc-1.c'; fi` | ||
20603 | +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_find_findfunc_1_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o testsuite/libsframe.find/findfunc_1-findfunc-1.obj `if test -f 'testsuite/libsframe.find/findfunc-1.c'; then $(CYGPATH_W) 'testsuite/libsframe.find/findfunc-1.c'; else $(CYGPATH_W) '$(srcdir)/testsuite/libsframe.find/findfunc-1.c'; fi` | ||
20604 | |||
20605 | -testsuite/libsframe.find/testsuite_libsframe_find_plt_findfre_1-plt-findfre-1.o: testsuite/libsframe.find/plt-findfre-1.c | ||
20606 | -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_find_plt_findfre_1_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT testsuite/libsframe.find/testsuite_libsframe_find_plt_findfre_1-plt-findfre-1.o -MD -MP -MF testsuite/libsframe.find/$(DEPDIR)/testsuite_libsframe_find_plt_findfre_1-plt-findfre-1.Tpo -c -o testsuite/libsframe.find/testsuite_libsframe_find_plt_findfre_1-plt-findfre-1.o `test -f 'testsuite/libsframe.find/plt-findfre-1.c' || echo '$(srcdir)/'`testsuite/libsframe.find/plt-findfre-1.c | ||
20607 | -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) testsuite/libsframe.find/$(DEPDIR)/testsuite_libsframe_find_plt_findfre_1-plt-findfre-1.Tpo testsuite/libsframe.find/$(DEPDIR)/testsuite_libsframe_find_plt_findfre_1-plt-findfre-1.Po | ||
20608 | -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='testsuite/libsframe.find/plt-findfre-1.c' object='testsuite/libsframe.find/testsuite_libsframe_find_plt_findfre_1-plt-findfre-1.o' libtool=no @AMDEPBACKSLASH@ | ||
20609 | +testsuite/libsframe.find/plt_findfre_1-plt-findfre-1.o: testsuite/libsframe.find/plt-findfre-1.c | ||
20610 | +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_find_plt_findfre_1_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT testsuite/libsframe.find/plt_findfre_1-plt-findfre-1.o -MD -MP -MF testsuite/libsframe.find/$(DEPDIR)/plt_findfre_1-plt-findfre-1.Tpo -c -o testsuite/libsframe.find/plt_findfre_1-plt-findfre-1.o `test -f 'testsuite/libsframe.find/plt-findfre-1.c' || echo '$(srcdir)/'`testsuite/libsframe.find/plt-findfre-1.c | ||
20611 | +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) testsuite/libsframe.find/$(DEPDIR)/plt_findfre_1-plt-findfre-1.Tpo testsuite/libsframe.find/$(DEPDIR)/plt_findfre_1-plt-findfre-1.Po | ||
20612 | +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='testsuite/libsframe.find/plt-findfre-1.c' object='testsuite/libsframe.find/plt_findfre_1-plt-findfre-1.o' libtool=no @AMDEPBACKSLASH@ | ||
20613 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
20614 | -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_find_plt_findfre_1_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o testsuite/libsframe.find/testsuite_libsframe_find_plt_findfre_1-plt-findfre-1.o `test -f 'testsuite/libsframe.find/plt-findfre-1.c' || echo '$(srcdir)/'`testsuite/libsframe.find/plt-findfre-1.c | ||
20615 | +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_find_plt_findfre_1_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o testsuite/libsframe.find/plt_findfre_1-plt-findfre-1.o `test -f 'testsuite/libsframe.find/plt-findfre-1.c' || echo '$(srcdir)/'`testsuite/libsframe.find/plt-findfre-1.c | ||
20616 | |||
20617 | -testsuite/libsframe.find/testsuite_libsframe_find_plt_findfre_1-plt-findfre-1.obj: testsuite/libsframe.find/plt-findfre-1.c | ||
20618 | -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_find_plt_findfre_1_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT testsuite/libsframe.find/testsuite_libsframe_find_plt_findfre_1-plt-findfre-1.obj -MD -MP -MF testsuite/libsframe.find/$(DEPDIR)/testsuite_libsframe_find_plt_findfre_1-plt-findfre-1.Tpo -c -o testsuite/libsframe.find/testsuite_libsframe_find_plt_findfre_1-plt-findfre-1.obj `if test -f 'testsuite/libsframe.find/plt-findfre-1.c'; then $(CYGPATH_W) 'testsuite/libsframe.find/plt-findfre-1.c'; else $(CYGPATH_W) '$(srcdir)/testsuite/libsframe.find/plt-findfre-1.c'; fi` | ||
20619 | -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) testsuite/libsframe.find/$(DEPDIR)/testsuite_libsframe_find_plt_findfre_1-plt-findfre-1.Tpo testsuite/libsframe.find/$(DEPDIR)/testsuite_libsframe_find_plt_findfre_1-plt-findfre-1.Po | ||
20620 | -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='testsuite/libsframe.find/plt-findfre-1.c' object='testsuite/libsframe.find/testsuite_libsframe_find_plt_findfre_1-plt-findfre-1.obj' libtool=no @AMDEPBACKSLASH@ | ||
20621 | +testsuite/libsframe.find/plt_findfre_1-plt-findfre-1.obj: testsuite/libsframe.find/plt-findfre-1.c | ||
20622 | +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_find_plt_findfre_1_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT testsuite/libsframe.find/plt_findfre_1-plt-findfre-1.obj -MD -MP -MF testsuite/libsframe.find/$(DEPDIR)/plt_findfre_1-plt-findfre-1.Tpo -c -o testsuite/libsframe.find/plt_findfre_1-plt-findfre-1.obj `if test -f 'testsuite/libsframe.find/plt-findfre-1.c'; then $(CYGPATH_W) 'testsuite/libsframe.find/plt-findfre-1.c'; else $(CYGPATH_W) '$(srcdir)/testsuite/libsframe.find/plt-findfre-1.c'; fi` | ||
20623 | +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) testsuite/libsframe.find/$(DEPDIR)/plt_findfre_1-plt-findfre-1.Tpo testsuite/libsframe.find/$(DEPDIR)/plt_findfre_1-plt-findfre-1.Po | ||
20624 | +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='testsuite/libsframe.find/plt-findfre-1.c' object='testsuite/libsframe.find/plt_findfre_1-plt-findfre-1.obj' libtool=no @AMDEPBACKSLASH@ | ||
20625 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
20626 | -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_find_plt_findfre_1_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o testsuite/libsframe.find/testsuite_libsframe_find_plt_findfre_1-plt-findfre-1.obj `if test -f 'testsuite/libsframe.find/plt-findfre-1.c'; then $(CYGPATH_W) 'testsuite/libsframe.find/plt-findfre-1.c'; else $(CYGPATH_W) '$(srcdir)/testsuite/libsframe.find/plt-findfre-1.c'; fi` | ||
20627 | +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_find_plt_findfre_1_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o testsuite/libsframe.find/plt_findfre_1-plt-findfre-1.obj `if test -f 'testsuite/libsframe.find/plt-findfre-1.c'; then $(CYGPATH_W) 'testsuite/libsframe.find/plt-findfre-1.c'; else $(CYGPATH_W) '$(srcdir)/testsuite/libsframe.find/plt-findfre-1.c'; fi` | ||
20628 | |||
20629 | mostlyclean-libtool: | ||
20630 | -rm -f *.lo | ||
20631 | @@ -1142,7 +1168,7 @@ site.exp: Makefile $(EXTRA_DEJAGNU_SITE_CONFIG) | ||
20632 | @echo '# Do not edit here. If you wish to override these values' >>site.tmp | ||
20633 | @echo '# edit the last section' >>site.tmp | ||
20634 | @echo 'set srcdir "$(srcdir)"' >>site.tmp | ||
20635 | - @echo "set objdir `pwd`" >>site.tmp | ||
20636 | + @echo "set objdir \"`pwd`\"" >>site.tmp | ||
20637 | @echo 'set build_alias "$(build_alias)"' >>site.tmp | ||
20638 | @echo 'set build_triplet $(build_triplet)' >>site.tmp | ||
20639 | @echo 'set host_alias "$(host_alias)"' >>site.tmp | ||
20640 | @@ -1166,8 +1192,10 @@ distclean-DEJAGNU: | ||
20641 | -l='$(DEJATOOL)'; for tool in $$l; do \ | ||
20642 | rm -f $$tool.sum $$tool.log; \ | ||
20643 | done | ||
20644 | +distdir: $(BUILT_SOURCES) | ||
20645 | + $(MAKE) $(AM_MAKEFLAGS) distdir-am | ||
20646 | |||
20647 | -distdir: $(DISTFILES) | ||
20648 | +distdir-am: $(DISTFILES) | ||
20649 | $(am__remove_distdir) | ||
20650 | test -d "$(distdir)" || mkdir "$(distdir)" | ||
20651 | @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ | ||
20652 | @@ -1225,6 +1253,10 @@ dist-xz: distdir | ||
20653 | tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz | ||
20654 | $(am__post_remove_distdir) | ||
20655 | |||
20656 | +dist-zstd: distdir | ||
20657 | + tardir=$(distdir) && $(am__tar) | zstd -c $${ZSTD_CLEVEL-$${ZSTD_OPT--19}} >$(distdir).tar.zst | ||
20658 | + $(am__post_remove_distdir) | ||
20659 | + | ||
20660 | dist-tarZ: distdir | ||
20661 | @echo WARNING: "Support for distribution archives compressed with" \ | ||
20662 | "legacy program 'compress' is deprecated." >&2 | ||
20663 | @@ -1267,6 +1299,8 @@ distcheck: dist | ||
20664 | eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\ | ||
20665 | *.zip*) \ | ||
20666 | unzip $(distdir).zip ;;\ | ||
20667 | + *.tar.zst*) \ | ||
20668 | + zstd -dc $(distdir).tar.zst | $(am__untar) ;;\ | ||
20669 | esac | ||
20670 | chmod -R a-w $(distdir) | ||
20671 | chmod u+w $(distdir) | ||
20672 | @@ -1282,7 +1316,7 @@ distcheck: dist | ||
20673 | $(DISTCHECK_CONFIGURE_FLAGS) \ | ||
20674 | --srcdir=../.. --prefix="$$dc_install_base" \ | ||
20675 | && $(MAKE) $(AM_MAKEFLAGS) \ | ||
20676 | - && $(MAKE) $(AM_MAKEFLAGS) dvi \ | ||
20677 | + && $(MAKE) $(AM_MAKEFLAGS) $(AM_DISTCHECK_DVI_TARGET) \ | ||
20678 | && $(MAKE) $(AM_MAKEFLAGS) check \ | ||
20679 | && $(MAKE) $(AM_MAKEFLAGS) install \ | ||
20680 | && $(MAKE) $(AM_MAKEFLAGS) installcheck \ | ||
20681 | @@ -1338,6 +1372,8 @@ check-am: all-am | ||
20682 | $(MAKE) $(AM_MAKEFLAGS) check-DEJAGNU | ||
20683 | check: check-am | ||
20684 | all-am: Makefile $(INFO_DEPS) $(LTLIBRARIES) $(HEADERS) config.h | ||
20685 | +install-checkPROGRAMS: install-libLTLIBRARIES | ||
20686 | + | ||
20687 | installdirs: | ||
20688 | for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(infodir)" "$(DESTDIR)$(includedir)"; do \ | ||
20689 | test -z "$$dir" || $(MKDIR_P) "$$dir"; \ | ||
20690 | @@ -1390,7 +1426,16 @@ clean-am: clean-aminfo clean-checkPROGRAMS clean-generic \ | ||
20691 | |||
20692 | distclean: distclean-am | ||
20693 | -rm -f $(am__CONFIG_DISTCLEAN_FILES) | ||
20694 | - -rm -rf ./$(DEPDIR) testsuite/libsframe.decode/$(DEPDIR) testsuite/libsframe.encode/$(DEPDIR) testsuite/libsframe.find/$(DEPDIR) | ||
20695 | + -rm -f ./$(DEPDIR)/libsframe_la-sframe-dump.Plo | ||
20696 | + -rm -f ./$(DEPDIR)/libsframe_la-sframe-error.Plo | ||
20697 | + -rm -f ./$(DEPDIR)/libsframe_la-sframe.Plo | ||
20698 | + -rm -f testsuite/libsframe.decode/$(DEPDIR)/be_flipping-be-flipping.Po | ||
20699 | + -rm -f testsuite/libsframe.decode/$(DEPDIR)/frecnt_1-frecnt-1.Po | ||
20700 | + -rm -f testsuite/libsframe.decode/$(DEPDIR)/frecnt_2-frecnt-2.Po | ||
20701 | + -rm -f testsuite/libsframe.encode/$(DEPDIR)/encode_1-encode-1.Po | ||
20702 | + -rm -f testsuite/libsframe.find/$(DEPDIR)/findfre_1-findfre-1.Po | ||
20703 | + -rm -f testsuite/libsframe.find/$(DEPDIR)/findfunc_1-findfunc-1.Po | ||
20704 | + -rm -f testsuite/libsframe.find/$(DEPDIR)/plt_findfre_1-plt-findfre-1.Po | ||
20705 | -rm -f Makefile | ||
20706 | distclean-am: clean-am distclean-DEJAGNU distclean-compile \ | ||
20707 | distclean-generic distclean-hdr distclean-libtool \ | ||
20708 | @@ -1530,7 +1575,16 @@ installcheck-am: | ||
20709 | maintainer-clean: maintainer-clean-am | ||
20710 | -rm -f $(am__CONFIG_DISTCLEAN_FILES) | ||
20711 | -rm -rf $(top_srcdir)/autom4te.cache | ||
20712 | - -rm -rf ./$(DEPDIR) testsuite/libsframe.decode/$(DEPDIR) testsuite/libsframe.encode/$(DEPDIR) testsuite/libsframe.find/$(DEPDIR) | ||
20713 | + -rm -f ./$(DEPDIR)/libsframe_la-sframe-dump.Plo | ||
20714 | + -rm -f ./$(DEPDIR)/libsframe_la-sframe-error.Plo | ||
20715 | + -rm -f ./$(DEPDIR)/libsframe_la-sframe.Plo | ||
20716 | + -rm -f testsuite/libsframe.decode/$(DEPDIR)/be_flipping-be-flipping.Po | ||
20717 | + -rm -f testsuite/libsframe.decode/$(DEPDIR)/frecnt_1-frecnt-1.Po | ||
20718 | + -rm -f testsuite/libsframe.decode/$(DEPDIR)/frecnt_2-frecnt-2.Po | ||
20719 | + -rm -f testsuite/libsframe.encode/$(DEPDIR)/encode_1-encode-1.Po | ||
20720 | + -rm -f testsuite/libsframe.find/$(DEPDIR)/findfre_1-findfre-1.Po | ||
20721 | + -rm -f testsuite/libsframe.find/$(DEPDIR)/findfunc_1-findfunc-1.Po | ||
20722 | + -rm -f testsuite/libsframe.find/$(DEPDIR)/plt_findfre_1-plt-findfre-1.Po | ||
20723 | -rm -f Makefile | ||
20724 | maintainer-clean-am: distclean-am maintainer-clean-aminfo \ | ||
20725 | maintainer-clean-generic | ||
20726 | @@ -1554,28 +1608,28 @@ uninstall-am: uninstall-dvi-am uninstall-html-am \ | ||
20727 | |||
20728 | .MAKE: all check-am install-am install-strip | ||
20729 | |||
20730 | -.PHONY: CTAGS GTAGS TAGS all all-am am--refresh check check-DEJAGNU \ | ||
20731 | - check-am clean clean-aminfo clean-checkPROGRAMS clean-cscope \ | ||
20732 | - clean-generic clean-libLTLIBRARIES clean-libtool \ | ||
20733 | +.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles am--refresh check \ | ||
20734 | + check-DEJAGNU check-am clean clean-aminfo clean-checkPROGRAMS \ | ||
20735 | + clean-cscope clean-generic clean-libLTLIBRARIES clean-libtool \ | ||
20736 | clean-noinstLTLIBRARIES cscope cscopelist-am ctags ctags-am \ | ||
20737 | dist dist-all dist-bzip2 dist-gzip dist-info dist-lzip \ | ||
20738 | - dist-shar dist-tarZ dist-xz dist-zip distcheck distclean \ | ||
20739 | - distclean-DEJAGNU distclean-compile distclean-generic \ | ||
20740 | - distclean-hdr distclean-libtool distclean-tags distcleancheck \ | ||
20741 | - distdir distuninstallcheck dvi dvi-am html html-am html-local \ | ||
20742 | - info info-am install install-am install-data install-data-am \ | ||
20743 | - install-dvi install-dvi-am install-exec install-exec-am \ | ||
20744 | - install-html install-html-am install-includeHEADERS \ | ||
20745 | - install-info install-info-am install-libLTLIBRARIES \ | ||
20746 | - install-man install-pdf install-pdf-am install-ps \ | ||
20747 | - install-ps-am install-strip installcheck installcheck-am \ | ||
20748 | - installdirs maintainer-clean maintainer-clean-aminfo \ | ||
20749 | - maintainer-clean-generic mostlyclean mostlyclean-aminfo \ | ||
20750 | - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ | ||
20751 | - pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \ | ||
20752 | - uninstall-dvi-am uninstall-html-am uninstall-includeHEADERS \ | ||
20753 | - uninstall-info-am uninstall-libLTLIBRARIES uninstall-pdf-am \ | ||
20754 | - uninstall-ps-am | ||
20755 | + dist-shar dist-tarZ dist-xz dist-zip dist-zstd distcheck \ | ||
20756 | + distclean distclean-DEJAGNU distclean-compile \ | ||
20757 | + distclean-generic distclean-hdr distclean-libtool \ | ||
20758 | + distclean-tags distcleancheck distdir distuninstallcheck dvi \ | ||
20759 | + dvi-am html html-am html-local info info-am install install-am \ | ||
20760 | + install-data install-data-am install-dvi install-dvi-am \ | ||
20761 | + install-exec install-exec-am install-html install-html-am \ | ||
20762 | + install-includeHEADERS install-info install-info-am \ | ||
20763 | + install-libLTLIBRARIES install-man install-pdf install-pdf-am \ | ||
20764 | + install-ps install-ps-am install-strip installcheck \ | ||
20765 | + installcheck-am installdirs maintainer-clean \ | ||
20766 | + maintainer-clean-aminfo maintainer-clean-generic mostlyclean \ | ||
20767 | + mostlyclean-aminfo mostlyclean-compile mostlyclean-generic \ | ||
20768 | + mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \ | ||
20769 | + uninstall-am uninstall-dvi-am uninstall-html-am \ | ||
20770 | + uninstall-includeHEADERS uninstall-info-am \ | ||
20771 | + uninstall-libLTLIBRARIES uninstall-pdf-am uninstall-ps-am | ||
20772 | |||
20773 | .PRECIOUS: Makefile | ||
20774 | |||
20775 | diff --git a/libsframe/aclocal.m4 b/libsframe/aclocal.m4 | ||
20776 | index b0cdd6b184d..c83d4f62ece 100644 | ||
20777 | --- a/libsframe/aclocal.m4 | ||
20778 | +++ b/libsframe/aclocal.m4 | ||
20779 | @@ -1,6 +1,6 @@ | ||
20780 | -# generated automatically by aclocal 1.15.1 -*- Autoconf -*- | ||
20781 | +# generated automatically by aclocal 1.16.5 -*- Autoconf -*- | ||
20782 | |||
20783 | -# Copyright (C) 1996-2017 Free Software Foundation, Inc. | ||
20784 | +# Copyright (C) 1996-2021 Free Software Foundation, Inc. | ||
20785 | |||
20786 | # This file is free software; the Free Software Foundation | ||
20787 | # gives unlimited permission to copy and/or distribute it, | ||
20788 | @@ -20,7 +20,7 @@ You have another version of autoconf. It may work, but is not guaranteed to. | ||
20789 | If you have problems, you may need to regenerate the build system entirely. | ||
20790 | To do so, use the procedure documented by the package, typically 'autoreconf'.])]) | ||
20791 | |||
20792 | -# Copyright (C) 2002-2017 Free Software Foundation, Inc. | ||
20793 | +# Copyright (C) 2002-2021 Free Software Foundation, Inc. | ||
20794 | # | ||
20795 | # This file is free software; the Free Software Foundation | ||
20796 | # gives unlimited permission to copy and/or distribute it, | ||
20797 | @@ -32,10 +32,10 @@ To do so, use the procedure documented by the package, typically 'autoreconf'.]) | ||
20798 | # generated from the m4 files accompanying Automake X.Y. | ||
20799 | # (This private macro should not be called outside this file.) | ||
20800 | AC_DEFUN([AM_AUTOMAKE_VERSION], | ||
20801 | -[am__api_version='1.15' | ||
20802 | +[am__api_version='1.16' | ||
20803 | dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to | ||
20804 | dnl require some minimum version. Point them to the right macro. | ||
20805 | -m4_if([$1], [1.15.1], [], | ||
20806 | +m4_if([$1], [1.16.5], [], | ||
20807 | [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl | ||
20808 | ]) | ||
20809 | |||
20810 | @@ -51,12 +51,12 @@ m4_define([_AM_AUTOCONF_VERSION], []) | ||
20811 | # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. | ||
20812 | # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. | ||
20813 | AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], | ||
20814 | -[AM_AUTOMAKE_VERSION([1.15.1])dnl | ||
20815 | +[AM_AUTOMAKE_VERSION([1.16.5])dnl | ||
20816 | m4_ifndef([AC_AUTOCONF_VERSION], | ||
20817 | [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl | ||
20818 | _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) | ||
20819 | |||
20820 | -# Copyright (C) 2011-2017 Free Software Foundation, Inc. | ||
20821 | +# Copyright (C) 2011-2021 Free Software Foundation, Inc. | ||
20822 | # | ||
20823 | # This file is free software; the Free Software Foundation | ||
20824 | # gives unlimited permission to copy and/or distribute it, | ||
20825 | @@ -118,7 +118,7 @@ AC_SUBST([AR])dnl | ||
20826 | |||
20827 | # AM_AUX_DIR_EXPAND -*- Autoconf -*- | ||
20828 | |||
20829 | -# Copyright (C) 2001-2017 Free Software Foundation, Inc. | ||
20830 | +# Copyright (C) 2001-2021 Free Software Foundation, Inc. | ||
20831 | # | ||
20832 | # This file is free software; the Free Software Foundation | ||
20833 | # gives unlimited permission to copy and/or distribute it, | ||
20834 | @@ -170,7 +170,7 @@ am_aux_dir=`cd "$ac_aux_dir" && pwd` | ||
20835 | |||
20836 | # AM_CONDITIONAL -*- Autoconf -*- | ||
20837 | |||
20838 | -# Copyright (C) 1997-2017 Free Software Foundation, Inc. | ||
20839 | +# Copyright (C) 1997-2021 Free Software Foundation, Inc. | ||
20840 | # | ||
20841 | # This file is free software; the Free Software Foundation | ||
20842 | # gives unlimited permission to copy and/or distribute it, | ||
20843 | @@ -201,7 +201,7 @@ AC_CONFIG_COMMANDS_PRE( | ||
20844 | Usually this means the macro was only invoked conditionally.]]) | ||
20845 | fi])]) | ||
20846 | |||
20847 | -# Copyright (C) 1999-2017 Free Software Foundation, Inc. | ||
20848 | +# Copyright (C) 1999-2021 Free Software Foundation, Inc. | ||
20849 | # | ||
20850 | # This file is free software; the Free Software Foundation | ||
20851 | # gives unlimited permission to copy and/or distribute it, | ||
20852 | @@ -392,13 +392,12 @@ _AM_SUBST_NOTMAKE([am__nodep])dnl | ||
20853 | |||
20854 | # Generate code to set up dependency tracking. -*- Autoconf -*- | ||
20855 | |||
20856 | -# Copyright (C) 1999-2017 Free Software Foundation, Inc. | ||
20857 | +# Copyright (C) 1999-2021 Free Software Foundation, Inc. | ||
20858 | # | ||
20859 | # This file is free software; the Free Software Foundation | ||
20860 | # gives unlimited permission to copy and/or distribute it, | ||
20861 | # with or without modifications, as long as this notice is preserved. | ||
20862 | |||
20863 | - | ||
20864 | # _AM_OUTPUT_DEPENDENCY_COMMANDS | ||
20865 | # ------------------------------ | ||
20866 | AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], | ||
20867 | @@ -406,49 +405,43 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], | ||
20868 | # Older Autoconf quotes --file arguments for eval, but not when files | ||
20869 | # are listed without --file. Let's play safe and only enable the eval | ||
20870 | # if we detect the quoting. | ||
20871 | - case $CONFIG_FILES in | ||
20872 | - *\'*) eval set x "$CONFIG_FILES" ;; | ||
20873 | - *) set x $CONFIG_FILES ;; | ||
20874 | - esac | ||
20875 | + # TODO: see whether this extra hack can be removed once we start | ||
20876 | + # requiring Autoconf 2.70 or later. | ||
20877 | + AS_CASE([$CONFIG_FILES], | ||
20878 | + [*\'*], [eval set x "$CONFIG_FILES"], | ||
20879 | + [*], [set x $CONFIG_FILES]) | ||
20880 | shift | ||
20881 | - for mf | ||
20882 | + # Used to flag and report bootstrapping failures. | ||
20883 | + am_rc=0 | ||
20884 | + for am_mf | ||
20885 | do | ||
20886 | # Strip MF so we end up with the name of the file. | ||
20887 | - mf=`echo "$mf" | sed -e 's/:.*$//'` | ||
20888 | - # Check whether this is an Automake generated Makefile or not. | ||
20889 | - # We used to match only the files named 'Makefile.in', but | ||
20890 | - # some people rename them; so instead we look at the file content. | ||
20891 | - # Grep'ing the first line is not enough: some people post-process | ||
20892 | - # each Makefile.in and add a new line on top of each file to say so. | ||
20893 | - # Grep'ing the whole file is not good either: AIX grep has a line | ||
20894 | + am_mf=`AS_ECHO(["$am_mf"]) | sed -e 's/:.*$//'` | ||
20895 | + # Check whether this is an Automake generated Makefile which includes | ||
20896 | + # dependency-tracking related rules and includes. | ||
20897 | + # Grep'ing the whole file directly is not great: AIX grep has a line | ||
20898 | # limit of 2048, but all sed's we know have understand at least 4000. | ||
20899 | - if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then | ||
20900 | - dirpart=`AS_DIRNAME("$mf")` | ||
20901 | - else | ||
20902 | - continue | ||
20903 | - fi | ||
20904 | - # Extract the definition of DEPDIR, am__include, and am__quote | ||
20905 | - # from the Makefile without running 'make'. | ||
20906 | - DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` | ||
20907 | - test -z "$DEPDIR" && continue | ||
20908 | - am__include=`sed -n 's/^am__include = //p' < "$mf"` | ||
20909 | - test -z "$am__include" && continue | ||
20910 | - am__quote=`sed -n 's/^am__quote = //p' < "$mf"` | ||
20911 | - # Find all dependency output files, they are included files with | ||
20912 | - # $(DEPDIR) in their names. We invoke sed twice because it is the | ||
20913 | - # simplest approach to changing $(DEPDIR) to its actual value in the | ||
20914 | - # expansion. | ||
20915 | - for file in `sed -n " | ||
20916 | - s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ | ||
20917 | - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do | ||
20918 | - # Make sure the directory exists. | ||
20919 | - test -f "$dirpart/$file" && continue | ||
20920 | - fdir=`AS_DIRNAME(["$file"])` | ||
20921 | - AS_MKDIR_P([$dirpart/$fdir]) | ||
20922 | - # echo "creating $dirpart/$file" | ||
20923 | - echo '# dummy' > "$dirpart/$file" | ||
20924 | - done | ||
20925 | + sed -n 's,^am--depfiles:.*,X,p' "$am_mf" | grep X >/dev/null 2>&1 \ | ||
20926 | + || continue | ||
20927 | + am_dirpart=`AS_DIRNAME(["$am_mf"])` | ||
20928 | + am_filepart=`AS_BASENAME(["$am_mf"])` | ||
20929 | + AM_RUN_LOG([cd "$am_dirpart" \ | ||
20930 | + && sed -e '/# am--include-marker/d' "$am_filepart" \ | ||
20931 | + | $MAKE -f - am--depfiles]) || am_rc=$? | ||
20932 | done | ||
20933 | + if test $am_rc -ne 0; then | ||
20934 | + AC_MSG_FAILURE([Something went wrong bootstrapping makefile fragments | ||
20935 | + for automatic dependency tracking. If GNU make was not used, consider | ||
20936 | + re-running the configure script with MAKE="gmake" (or whatever is | ||
20937 | + necessary). You can also try re-running configure with the | ||
20938 | + '--disable-dependency-tracking' option to at least be able to build | ||
20939 | + the package (albeit without support for automatic dependency tracking).]) | ||
20940 | + fi | ||
20941 | + AS_UNSET([am_dirpart]) | ||
20942 | + AS_UNSET([am_filepart]) | ||
20943 | + AS_UNSET([am_mf]) | ||
20944 | + AS_UNSET([am_rc]) | ||
20945 | + rm -f conftest-deps.mk | ||
20946 | } | ||
20947 | ])# _AM_OUTPUT_DEPENDENCY_COMMANDS | ||
20948 | |||
20949 | @@ -457,18 +450,17 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], | ||
20950 | # ----------------------------- | ||
20951 | # This macro should only be invoked once -- use via AC_REQUIRE. | ||
20952 | # | ||
20953 | -# This code is only required when automatic dependency tracking | ||
20954 | -# is enabled. FIXME. This creates each '.P' file that we will | ||
20955 | -# need in order to bootstrap the dependency handling code. | ||
20956 | +# This code is only required when automatic dependency tracking is enabled. | ||
20957 | +# This creates each '.Po' and '.Plo' makefile fragment that we'll need in | ||
20958 | +# order to bootstrap the dependency handling code. | ||
20959 | AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], | ||
20960 | [AC_CONFIG_COMMANDS([depfiles], | ||
20961 | [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS], | ||
20962 | - [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) | ||
20963 | -]) | ||
20964 | + [AMDEP_TRUE="$AMDEP_TRUE" MAKE="${MAKE-make}"])]) | ||
20965 | |||
20966 | # Do all the work for Automake. -*- Autoconf -*- | ||
20967 | |||
20968 | -# Copyright (C) 1996-2017 Free Software Foundation, Inc. | ||
20969 | +# Copyright (C) 1996-2021 Free Software Foundation, Inc. | ||
20970 | # | ||
20971 | # This file is free software; the Free Software Foundation | ||
20972 | # gives unlimited permission to copy and/or distribute it, | ||
20973 | @@ -496,6 +488,10 @@ m4_defn([AC_PROG_CC]) | ||
20974 | # release and drop the old call support. | ||
20975 | AC_DEFUN([AM_INIT_AUTOMAKE], | ||
20976 | [AC_PREREQ([2.65])dnl | ||
20977 | +m4_ifdef([_$0_ALREADY_INIT], | ||
20978 | + [m4_fatal([$0 expanded multiple times | ||
20979 | +]m4_defn([_$0_ALREADY_INIT]))], | ||
20980 | + [m4_define([_$0_ALREADY_INIT], m4_expansion_stack)])dnl | ||
20981 | dnl Autoconf wants to disallow AM_ names. We explicitly allow | ||
20982 | dnl the ones we care about. | ||
20983 | m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl | ||
20984 | @@ -532,7 +528,7 @@ m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl | ||
20985 | [_AM_SET_OPTIONS([$1])dnl | ||
20986 | dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT. | ||
20987 | m4_if( | ||
20988 | - m4_ifdef([AC_PACKAGE_NAME], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]), | ||
20989 | + m4_ifset([AC_PACKAGE_NAME], [ok]):m4_ifset([AC_PACKAGE_VERSION], [ok]), | ||
20990 | [ok:ok],, | ||
20991 | [m4_fatal([AC_INIT should be called with package and version arguments])])dnl | ||
20992 | AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl | ||
20993 | @@ -555,8 +551,8 @@ AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl | ||
20994 | AC_REQUIRE([AC_PROG_MKDIR_P])dnl | ||
20995 | # For better backward compatibility. To be removed once Automake 1.9.x | ||
20996 | # dies out for good. For more background, see: | ||
20997 | -# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html> | ||
20998 | -# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html> | ||
20999 | +# <https://lists.gnu.org/archive/html/automake/2012-07/msg00001.html> | ||
21000 | +# <https://lists.gnu.org/archive/html/automake/2012-07/msg00014.html> | ||
21001 | AC_SUBST([mkdir_p], ['$(MKDIR_P)']) | ||
21002 | # We need awk for the "check" target (and possibly the TAP driver). The | ||
21003 | # system "awk" is bad on some platforms. | ||
21004 | @@ -584,6 +580,20 @@ AC_PROVIDE_IFELSE([AC_PROG_OBJCXX], | ||
21005 | [m4_define([AC_PROG_OBJCXX], | ||
21006 | m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl | ||
21007 | ]) | ||
21008 | +# Variables for tags utilities; see am/tags.am | ||
21009 | +if test -z "$CTAGS"; then | ||
21010 | + CTAGS=ctags | ||
21011 | +fi | ||
21012 | +AC_SUBST([CTAGS]) | ||
21013 | +if test -z "$ETAGS"; then | ||
21014 | + ETAGS=etags | ||
21015 | +fi | ||
21016 | +AC_SUBST([ETAGS]) | ||
21017 | +if test -z "$CSCOPE"; then | ||
21018 | + CSCOPE=cscope | ||
21019 | +fi | ||
21020 | +AC_SUBST([CSCOPE]) | ||
21021 | + | ||
21022 | AC_REQUIRE([AM_SILENT_RULES])dnl | ||
21023 | dnl The testsuite driver may need to know about EXEEXT, so add the | ||
21024 | dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This | ||
21025 | @@ -623,7 +633,7 @@ END | ||
21026 | Aborting the configuration process, to ensure you take notice of the issue. | ||
21027 | |||
21028 | You can download and install GNU coreutils to get an 'rm' implementation | ||
21029 | -that behaves properly: <http://www.gnu.org/software/coreutils/>. | ||
21030 | +that behaves properly: <https://www.gnu.org/software/coreutils/>. | ||
21031 | |||
21032 | If you want to complete the configuration process using your problematic | ||
21033 | 'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM | ||
21034 | @@ -665,7 +675,7 @@ for _am_header in $config_headers :; do | ||
21035 | done | ||
21036 | echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) | ||
21037 | |||
21038 | -# Copyright (C) 2001-2017 Free Software Foundation, Inc. | ||
21039 | +# Copyright (C) 2001-2021 Free Software Foundation, Inc. | ||
21040 | # | ||
21041 | # This file is free software; the Free Software Foundation | ||
21042 | # gives unlimited permission to copy and/or distribute it, | ||
21043 | @@ -689,7 +699,7 @@ AC_SUBST([install_sh])]) | ||
21044 | # Add --enable-maintainer-mode option to configure. -*- Autoconf -*- | ||
21045 | # From Jim Meyering | ||
21046 | |||
21047 | -# Copyright (C) 1996-2017 Free Software Foundation, Inc. | ||
21048 | +# Copyright (C) 1996-2021 Free Software Foundation, Inc. | ||
21049 | # | ||
21050 | # This file is free software; the Free Software Foundation | ||
21051 | # gives unlimited permission to copy and/or distribute it, | ||
21052 | @@ -724,7 +734,7 @@ AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) | ||
21053 | |||
21054 | # Check to see how 'make' treats includes. -*- Autoconf -*- | ||
21055 | |||
21056 | -# Copyright (C) 2001-2017 Free Software Foundation, Inc. | ||
21057 | +# Copyright (C) 2001-2021 Free Software Foundation, Inc. | ||
21058 | # | ||
21059 | # This file is free software; the Free Software Foundation | ||
21060 | # gives unlimited permission to copy and/or distribute it, | ||
21061 | @@ -732,49 +742,42 @@ AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) | ||
21062 | |||
21063 | # AM_MAKE_INCLUDE() | ||
21064 | # ----------------- | ||
21065 | -# Check to see how make treats includes. | ||
21066 | +# Check whether make has an 'include' directive that can support all | ||
21067 | +# the idioms we need for our automatic dependency tracking code. | ||
21068 | AC_DEFUN([AM_MAKE_INCLUDE], | ||
21069 | -[am_make=${MAKE-make} | ||
21070 | -cat > confinc << 'END' | ||
21071 | +[AC_MSG_CHECKING([whether ${MAKE-make} supports the include directive]) | ||
21072 | +cat > confinc.mk << 'END' | ||
21073 | am__doit: | ||
21074 | - @echo this is the am__doit target | ||
21075 | + @echo this is the am__doit target >confinc.out | ||
21076 | .PHONY: am__doit | ||
21077 | END | ||
21078 | -# If we don't find an include directive, just comment out the code. | ||
21079 | -AC_MSG_CHECKING([for style of include used by $am_make]) | ||
21080 | am__include="#" | ||
21081 | am__quote= | ||
21082 | -_am_result=none | ||
21083 | -# First try GNU make style include. | ||
21084 | -echo "include confinc" > confmf | ||
21085 | -# Ignore all kinds of additional output from 'make'. | ||
21086 | -case `$am_make -s -f confmf 2> /dev/null` in #( | ||
21087 | -*the\ am__doit\ target*) | ||
21088 | - am__include=include | ||
21089 | - am__quote= | ||
21090 | - _am_result=GNU | ||
21091 | - ;; | ||
21092 | -esac | ||
21093 | -# Now try BSD make style include. | ||
21094 | -if test "$am__include" = "#"; then | ||
21095 | - echo '.include "confinc"' > confmf | ||
21096 | - case `$am_make -s -f confmf 2> /dev/null` in #( | ||
21097 | - *the\ am__doit\ target*) | ||
21098 | - am__include=.include | ||
21099 | - am__quote="\"" | ||
21100 | - _am_result=BSD | ||
21101 | - ;; | ||
21102 | - esac | ||
21103 | -fi | ||
21104 | -AC_SUBST([am__include]) | ||
21105 | -AC_SUBST([am__quote]) | ||
21106 | -AC_MSG_RESULT([$_am_result]) | ||
21107 | -rm -f confinc confmf | ||
21108 | -]) | ||
21109 | +# BSD make does it like this. | ||
21110 | +echo '.include "confinc.mk" # ignored' > confmf.BSD | ||
21111 | +# Other make implementations (GNU, Solaris 10, AIX) do it like this. | ||
21112 | +echo 'include confinc.mk # ignored' > confmf.GNU | ||
21113 | +_am_result=no | ||
21114 | +for s in GNU BSD; do | ||
21115 | + AM_RUN_LOG([${MAKE-make} -f confmf.$s && cat confinc.out]) | ||
21116 | + AS_CASE([$?:`cat confinc.out 2>/dev/null`], | ||
21117 | + ['0:this is the am__doit target'], | ||
21118 | + [AS_CASE([$s], | ||
21119 | + [BSD], [am__include='.include' am__quote='"'], | ||
21120 | + [am__include='include' am__quote=''])]) | ||
21121 | + if test "$am__include" != "#"; then | ||
21122 | + _am_result="yes ($s style)" | ||
21123 | + break | ||
21124 | + fi | ||
21125 | +done | ||
21126 | +rm -f confinc.* confmf.* | ||
21127 | +AC_MSG_RESULT([${_am_result}]) | ||
21128 | +AC_SUBST([am__include])]) | ||
21129 | +AC_SUBST([am__quote])]) | ||
21130 | |||
21131 | # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- | ||
21132 | |||
21133 | -# Copyright (C) 1997-2017 Free Software Foundation, Inc. | ||
21134 | +# Copyright (C) 1997-2021 Free Software Foundation, Inc. | ||
21135 | # | ||
21136 | # This file is free software; the Free Software Foundation | ||
21137 | # gives unlimited permission to copy and/or distribute it, | ||
21138 | @@ -795,12 +798,7 @@ AC_DEFUN([AM_MISSING_HAS_RUN], | ||
21139 | [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl | ||
21140 | AC_REQUIRE_AUX_FILE([missing])dnl | ||
21141 | if test x"${MISSING+set}" != xset; then | ||
21142 | - case $am_aux_dir in | ||
21143 | - *\ * | *\ *) | ||
21144 | - MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;; | ||
21145 | - *) | ||
21146 | - MISSING="\${SHELL} $am_aux_dir/missing" ;; | ||
21147 | - esac | ||
21148 | + MISSING="\${SHELL} '$am_aux_dir/missing'" | ||
21149 | fi | ||
21150 | # Use eval to expand $SHELL | ||
21151 | if eval "$MISSING --is-lightweight"; then | ||
21152 | @@ -813,7 +811,7 @@ fi | ||
21153 | |||
21154 | # Helper functions for option handling. -*- Autoconf -*- | ||
21155 | |||
21156 | -# Copyright (C) 2001-2017 Free Software Foundation, Inc. | ||
21157 | +# Copyright (C) 2001-2021 Free Software Foundation, Inc. | ||
21158 | # | ||
21159 | # This file is free software; the Free Software Foundation | ||
21160 | # gives unlimited permission to copy and/or distribute it, | ||
21161 | @@ -842,7 +840,7 @@ AC_DEFUN([_AM_SET_OPTIONS], | ||
21162 | AC_DEFUN([_AM_IF_OPTION], | ||
21163 | [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) | ||
21164 | |||
21165 | -# Copyright (C) 1999-2017 Free Software Foundation, Inc. | ||
21166 | +# Copyright (C) 1999-2021 Free Software Foundation, Inc. | ||
21167 | # | ||
21168 | # This file is free software; the Free Software Foundation | ||
21169 | # gives unlimited permission to copy and/or distribute it, | ||
21170 | @@ -889,7 +887,7 @@ AC_LANG_POP([C])]) | ||
21171 | # For backward compatibility. | ||
21172 | AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])]) | ||
21173 | |||
21174 | -# Copyright (C) 2001-2017 Free Software Foundation, Inc. | ||
21175 | +# Copyright (C) 2001-2021 Free Software Foundation, Inc. | ||
21176 | # | ||
21177 | # This file is free software; the Free Software Foundation | ||
21178 | # gives unlimited permission to copy and/or distribute it, | ||
21179 | @@ -908,7 +906,7 @@ AC_DEFUN([AM_RUN_LOG], | ||
21180 | |||
21181 | # Check to make sure that the build environment is sane. -*- Autoconf -*- | ||
21182 | |||
21183 | -# Copyright (C) 1996-2017 Free Software Foundation, Inc. | ||
21184 | +# Copyright (C) 1996-2021 Free Software Foundation, Inc. | ||
21185 | # | ||
21186 | # This file is free software; the Free Software Foundation | ||
21187 | # gives unlimited permission to copy and/or distribute it, | ||
21188 | @@ -989,7 +987,7 @@ AC_CONFIG_COMMANDS_PRE( | ||
21189 | rm -f conftest.file | ||
21190 | ]) | ||
21191 | |||
21192 | -# Copyright (C) 2009-2017 Free Software Foundation, Inc. | ||
21193 | +# Copyright (C) 2009-2021 Free Software Foundation, Inc. | ||
21194 | # | ||
21195 | # This file is free software; the Free Software Foundation | ||
21196 | # gives unlimited permission to copy and/or distribute it, | ||
21197 | @@ -1049,7 +1047,7 @@ AC_SUBST([AM_BACKSLASH])dnl | ||
21198 | _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl | ||
21199 | ]) | ||
21200 | |||
21201 | -# Copyright (C) 2001-2017 Free Software Foundation, Inc. | ||
21202 | +# Copyright (C) 2001-2021 Free Software Foundation, Inc. | ||
21203 | # | ||
21204 | # This file is free software; the Free Software Foundation | ||
21205 | # gives unlimited permission to copy and/or distribute it, | ||
21206 | @@ -1077,7 +1075,7 @@ fi | ||
21207 | INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" | ||
21208 | AC_SUBST([INSTALL_STRIP_PROGRAM])]) | ||
21209 | |||
21210 | -# Copyright (C) 2006-2017 Free Software Foundation, Inc. | ||
21211 | +# Copyright (C) 2006-2021 Free Software Foundation, Inc. | ||
21212 | # | ||
21213 | # This file is free software; the Free Software Foundation | ||
21214 | # gives unlimited permission to copy and/or distribute it, | ||
21215 | @@ -1096,7 +1094,7 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) | ||
21216 | |||
21217 | # Check how to create a tarball. -*- Autoconf -*- | ||
21218 | |||
21219 | -# Copyright (C) 2004-2017 Free Software Foundation, Inc. | ||
21220 | +# Copyright (C) 2004-2021 Free Software Foundation, Inc. | ||
21221 | # | ||
21222 | # This file is free software; the Free Software Foundation | ||
21223 | # gives unlimited permission to copy and/or distribute it, | ||
21224 | diff --git a/libsframe/configure b/libsframe/configure | ||
21225 | index 1d9e5e10695..a234c4815b1 100755 | ||
21226 | --- a/libsframe/configure | ||
21227 | +++ b/libsframe/configure | ||
21228 | @@ -658,6 +658,8 @@ OTOOL | ||
21229 | LIPO | ||
21230 | NMEDIT | ||
21231 | DSYMUTIL | ||
21232 | +MANIFEST_TOOL | ||
21233 | +DLLTOOL | ||
21234 | OBJDUMP | ||
21235 | LN_S | ||
21236 | NM | ||
21237 | @@ -682,6 +684,9 @@ AM_BACKSLASH | ||
21238 | AM_DEFAULT_VERBOSITY | ||
21239 | AM_DEFAULT_V | ||
21240 | AM_V | ||
21241 | +CSCOPE | ||
21242 | +ETAGS | ||
21243 | +CTAGS | ||
21244 | am__fastdepCC_FALSE | ||
21245 | am__fastdepCC_TRUE | ||
21246 | CCDEPMODE | ||
21247 | @@ -689,7 +694,6 @@ am__nodep | ||
21248 | AMDEPBACKSLASH | ||
21249 | AMDEP_FALSE | ||
21250 | AMDEP_TRUE | ||
21251 | -am__quote | ||
21252 | am__include | ||
21253 | DEPDIR | ||
21254 | am__untar | ||
21255 | @@ -762,7 +766,8 @@ PACKAGE_VERSION | ||
21256 | PACKAGE_TARNAME | ||
21257 | PACKAGE_NAME | ||
21258 | PATH_SEPARATOR | ||
21259 | -SHELL' | ||
21260 | +SHELL | ||
21261 | +am__quote' | ||
21262 | ac_subst_files='' | ||
21263 | ac_user_opts=' | ||
21264 | enable_option_checking | ||
21265 | @@ -773,6 +778,7 @@ enable_static | ||
21266 | with_pic | ||
21267 | enable_fast_install | ||
21268 | with_gnu_ld | ||
21269 | +with_libtool_sysroot | ||
21270 | enable_libtool_lock | ||
21271 | enable_largefile | ||
21272 | enable_maintainer_mode | ||
21273 | @@ -1428,6 +1434,8 @@ Optional Packages: | ||
21274 | --with-pic try to use only PIC/non-PIC objects [default=use | ||
21275 | both] | ||
21276 | --with-gnu-ld assume the C compiler uses GNU ld [default=no] | ||
21277 | + --with-libtool-sysroot=DIR Search for dependent libraries within DIR | ||
21278 | + (or the compiler's sysroot if not specified). | ||
21279 | |||
21280 | Some influential environment variables: | ||
21281 | CC C compiler command | ||
21282 | @@ -3610,7 +3618,7 @@ $as_echo "$ac_cv_safe_to_define___extensions__" >&6; } | ||
21283 | $as_echo "#define _TANDEM_SOURCE 1" >>confdefs.h | ||
21284 | |||
21285 | |||
21286 | -am__api_version='1.15' | ||
21287 | +am__api_version='1.16' | ||
21288 | |||
21289 | # Find a good install program. We prefer a C program (faster), | ||
21290 | # so one script is as good as another. But avoid the broken or | ||
21291 | @@ -3783,12 +3791,7 @@ ac_script='s/[\\$]/&&/g;s/;s,x,x,$//' | ||
21292 | program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"` | ||
21293 | |||
21294 | if test x"${MISSING+set}" != xset; then | ||
21295 | - case $am_aux_dir in | ||
21296 | - *\ * | *\ *) | ||
21297 | - MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;; | ||
21298 | - *) | ||
21299 | - MISSING="\${SHELL} $am_aux_dir/missing" ;; | ||
21300 | - esac | ||
21301 | + MISSING="\${SHELL} '$am_aux_dir/missing'" | ||
21302 | fi | ||
21303 | # Use eval to expand $SHELL | ||
21304 | if eval "$MISSING --is-lightweight"; then | ||
21305 | @@ -4036,45 +4039,45 @@ DEPDIR="${am__leading_dot}deps" | ||
21306 | |||
21307 | ac_config_commands="$ac_config_commands depfiles" | ||
21308 | |||
21309 | - | ||
21310 | -am_make=${MAKE-make} | ||
21311 | -cat > confinc << 'END' | ||
21312 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} supports the include directive" >&5 | ||
21313 | +$as_echo_n "checking whether ${MAKE-make} supports the include directive... " >&6; } | ||
21314 | +cat > confinc.mk << 'END' | ||
21315 | am__doit: | ||
21316 | - @echo this is the am__doit target | ||
21317 | + @echo this is the am__doit target >confinc.out | ||
21318 | .PHONY: am__doit | ||
21319 | END | ||
21320 | -# If we don't find an include directive, just comment out the code. | ||
21321 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5 | ||
21322 | -$as_echo_n "checking for style of include used by $am_make... " >&6; } | ||
21323 | am__include="#" | ||
21324 | am__quote= | ||
21325 | -_am_result=none | ||
21326 | -# First try GNU make style include. | ||
21327 | -echo "include confinc" > confmf | ||
21328 | -# Ignore all kinds of additional output from 'make'. | ||
21329 | -case `$am_make -s -f confmf 2> /dev/null` in #( | ||
21330 | -*the\ am__doit\ target*) | ||
21331 | - am__include=include | ||
21332 | - am__quote= | ||
21333 | - _am_result=GNU | ||
21334 | - ;; | ||
21335 | -esac | ||
21336 | -# Now try BSD make style include. | ||
21337 | -if test "$am__include" = "#"; then | ||
21338 | - echo '.include "confinc"' > confmf | ||
21339 | - case `$am_make -s -f confmf 2> /dev/null` in #( | ||
21340 | - *the\ am__doit\ target*) | ||
21341 | - am__include=.include | ||
21342 | - am__quote="\"" | ||
21343 | - _am_result=BSD | ||
21344 | +# BSD make does it like this. | ||
21345 | +echo '.include "confinc.mk" # ignored' > confmf.BSD | ||
21346 | +# Other make implementations (GNU, Solaris 10, AIX) do it like this. | ||
21347 | +echo 'include confinc.mk # ignored' > confmf.GNU | ||
21348 | +_am_result=no | ||
21349 | +for s in GNU BSD; do | ||
21350 | + { echo "$as_me:$LINENO: ${MAKE-make} -f confmf.$s && cat confinc.out" >&5 | ||
21351 | + (${MAKE-make} -f confmf.$s && cat confinc.out) >&5 2>&5 | ||
21352 | + ac_status=$? | ||
21353 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
21354 | + (exit $ac_status); } | ||
21355 | + case $?:`cat confinc.out 2>/dev/null` in #( | ||
21356 | + '0:this is the am__doit target') : | ||
21357 | + case $s in #( | ||
21358 | + BSD) : | ||
21359 | + am__include='.include' am__quote='"' ;; #( | ||
21360 | + *) : | ||
21361 | + am__include='include' am__quote='' ;; | ||
21362 | +esac ;; #( | ||
21363 | + *) : | ||
21364 | ;; | ||
21365 | - esac | ||
21366 | -fi | ||
21367 | - | ||
21368 | - | ||
21369 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5 | ||
21370 | -$as_echo "$_am_result" >&6; } | ||
21371 | -rm -f confinc confmf | ||
21372 | +esac | ||
21373 | + if test "$am__include" != "#"; then | ||
21374 | + _am_result="yes ($s style)" | ||
21375 | + break | ||
21376 | + fi | ||
21377 | +done | ||
21378 | +rm -f confinc.* confmf.* | ||
21379 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${_am_result}" >&5 | ||
21380 | +$as_echo "${_am_result}" >&6; } | ||
21381 | |||
21382 | # Check whether --enable-dependency-tracking was given. | ||
21383 | if test "${enable_dependency_tracking+set}" = set; then : | ||
21384 | @@ -4186,8 +4189,8 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} | ||
21385 | |||
21386 | # For better backward compatibility. To be removed once Automake 1.9.x | ||
21387 | # dies out for good. For more background, see: | ||
21388 | -# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html> | ||
21389 | -# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html> | ||
21390 | +# <https://lists.gnu.org/archive/html/automake/2012-07/msg00001.html> | ||
21391 | +# <https://lists.gnu.org/archive/html/automake/2012-07/msg00014.html> | ||
21392 | mkdir_p='$(MKDIR_P)' | ||
21393 | |||
21394 | # We need awk for the "check" target (and possibly the TAP driver). The | ||
21395 | @@ -4334,6 +4337,20 @@ else | ||
21396 | fi | ||
21397 | |||
21398 | |||
21399 | +# Variables for tags utilities; see am/tags.am | ||
21400 | +if test -z "$CTAGS"; then | ||
21401 | + CTAGS=ctags | ||
21402 | +fi | ||
21403 | + | ||
21404 | +if test -z "$ETAGS"; then | ||
21405 | + ETAGS=etags | ||
21406 | +fi | ||
21407 | + | ||
21408 | +if test -z "$CSCOPE"; then | ||
21409 | + CSCOPE=cscope | ||
21410 | +fi | ||
21411 | + | ||
21412 | + | ||
21413 | |||
21414 | # POSIX will say in a future version that running "rm -f" with no argument | ||
21415 | # is OK; and we want to be able to make that assumption in our Makefile | ||
21416 | @@ -4366,7 +4383,7 @@ END | ||
21417 | Aborting the configuration process, to ensure you take notice of the issue. | ||
21418 | |||
21419 | You can download and install GNU coreutils to get an 'rm' implementation | ||
21420 | -that behaves properly: <http://www.gnu.org/software/coreutils/>. | ||
21421 | +that behaves properly: <https://www.gnu.org/software/coreutils/>. | ||
21422 | |||
21423 | If you want to complete the configuration process using your problematic | ||
21424 | 'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM | ||
21425 | @@ -5351,8 +5368,8 @@ esac | ||
21426 | |||
21427 | |||
21428 | |||
21429 | -macro_version='2.2.7a' | ||
21430 | -macro_revision='1.3134' | ||
21431 | +macro_version='2.4' | ||
21432 | +macro_revision='1.3293' | ||
21433 | |||
21434 | |||
21435 | |||
21436 | @@ -5463,7 +5480,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO | ||
21437 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 | ||
21438 | $as_echo_n "checking how to print strings... " >&6; } | ||
21439 | # Test print first, because it will be a builtin if present. | ||
21440 | -if test "X`print -r -- -n 2>/dev/null`" = X-n && \ | ||
21441 | +if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ | ||
21442 | test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then | ||
21443 | ECHO='print -r --' | ||
21444 | elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then | ||
21445 | @@ -6156,8 +6173,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; | ||
21446 | # Try some XSI features | ||
21447 | xsi_shell=no | ||
21448 | ( _lt_dummy="a/b/c" | ||
21449 | - test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ | ||
21450 | - = c,a/b,, \ | ||
21451 | + test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ | ||
21452 | + = c,a/b,b/c, \ | ||
21453 | && eval 'test $(( 1 + 1 )) -eq 2 \ | ||
21454 | && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ | ||
21455 | && xsi_shell=yes | ||
21456 | @@ -6206,6 +6223,80 @@ esac | ||
21457 | |||
21458 | |||
21459 | |||
21460 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5 | ||
21461 | +$as_echo_n "checking how to convert $build file names to $host format... " >&6; } | ||
21462 | +if ${lt_cv_to_host_file_cmd+:} false; then : | ||
21463 | + $as_echo_n "(cached) " >&6 | ||
21464 | +else | ||
21465 | + case $host in | ||
21466 | + *-*-mingw* ) | ||
21467 | + case $build in | ||
21468 | + *-*-mingw* ) # actually msys | ||
21469 | + lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 | ||
21470 | + ;; | ||
21471 | + *-*-cygwin* ) | ||
21472 | + lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 | ||
21473 | + ;; | ||
21474 | + * ) # otherwise, assume *nix | ||
21475 | + lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 | ||
21476 | + ;; | ||
21477 | + esac | ||
21478 | + ;; | ||
21479 | + *-*-cygwin* ) | ||
21480 | + case $build in | ||
21481 | + *-*-mingw* ) # actually msys | ||
21482 | + lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin | ||
21483 | + ;; | ||
21484 | + *-*-cygwin* ) | ||
21485 | + lt_cv_to_host_file_cmd=func_convert_file_noop | ||
21486 | + ;; | ||
21487 | + * ) # otherwise, assume *nix | ||
21488 | + lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin | ||
21489 | + ;; | ||
21490 | + esac | ||
21491 | + ;; | ||
21492 | + * ) # unhandled hosts (and "normal" native builds) | ||
21493 | + lt_cv_to_host_file_cmd=func_convert_file_noop | ||
21494 | + ;; | ||
21495 | +esac | ||
21496 | + | ||
21497 | +fi | ||
21498 | + | ||
21499 | +to_host_file_cmd=$lt_cv_to_host_file_cmd | ||
21500 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5 | ||
21501 | +$as_echo "$lt_cv_to_host_file_cmd" >&6; } | ||
21502 | + | ||
21503 | + | ||
21504 | + | ||
21505 | + | ||
21506 | + | ||
21507 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5 | ||
21508 | +$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; } | ||
21509 | +if ${lt_cv_to_tool_file_cmd+:} false; then : | ||
21510 | + $as_echo_n "(cached) " >&6 | ||
21511 | +else | ||
21512 | + #assume ordinary cross tools, or native build. | ||
21513 | +lt_cv_to_tool_file_cmd=func_convert_file_noop | ||
21514 | +case $host in | ||
21515 | + *-*-mingw* ) | ||
21516 | + case $build in | ||
21517 | + *-*-mingw* ) # actually msys | ||
21518 | + lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 | ||
21519 | + ;; | ||
21520 | + esac | ||
21521 | + ;; | ||
21522 | +esac | ||
21523 | + | ||
21524 | +fi | ||
21525 | + | ||
21526 | +to_tool_file_cmd=$lt_cv_to_tool_file_cmd | ||
21527 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5 | ||
21528 | +$as_echo "$lt_cv_to_tool_file_cmd" >&6; } | ||
21529 | + | ||
21530 | + | ||
21531 | + | ||
21532 | + | ||
21533 | + | ||
21534 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 | ||
21535 | $as_echo_n "checking for $LD option to reload object files... " >&6; } | ||
21536 | if ${lt_cv_ld_reload_flag+:} false; then : | ||
21537 | @@ -6222,6 +6313,11 @@ case $reload_flag in | ||
21538 | esac | ||
21539 | reload_cmds='$LD$reload_flag -o $output$reload_objs' | ||
21540 | case $host_os in | ||
21541 | + cygwin* | mingw* | pw32* | cegcc*) | ||
21542 | + if test "$GCC" != yes; then | ||
21543 | + reload_cmds=false | ||
21544 | + fi | ||
21545 | + ;; | ||
21546 | darwin*) | ||
21547 | if test "$GCC" = yes; then | ||
21548 | reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' | ||
21549 | @@ -6390,7 +6486,8 @@ mingw* | pw32*) | ||
21550 | lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' | ||
21551 | lt_cv_file_magic_cmd='func_win32_libid' | ||
21552 | else | ||
21553 | - lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' | ||
21554 | + # Keep this pattern in sync with the one in func_win32_libid. | ||
21555 | + lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' | ||
21556 | lt_cv_file_magic_cmd='$OBJDUMP -f' | ||
21557 | fi | ||
21558 | ;; | ||
21559 | @@ -6549,6 +6646,21 @@ esac | ||
21560 | fi | ||
21561 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 | ||
21562 | $as_echo "$lt_cv_deplibs_check_method" >&6; } | ||
21563 | + | ||
21564 | +file_magic_glob= | ||
21565 | +want_nocaseglob=no | ||
21566 | +if test "$build" = "$host"; then | ||
21567 | + case $host_os in | ||
21568 | + mingw* | pw32*) | ||
21569 | + if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then | ||
21570 | + want_nocaseglob=yes | ||
21571 | + else | ||
21572 | + file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"` | ||
21573 | + fi | ||
21574 | + ;; | ||
21575 | + esac | ||
21576 | +fi | ||
21577 | + | ||
21578 | file_magic_cmd=$lt_cv_file_magic_cmd | ||
21579 | deplibs_check_method=$lt_cv_deplibs_check_method | ||
21580 | test -z "$deplibs_check_method" && deplibs_check_method=unknown | ||
21581 | @@ -6564,6 +6676,157 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown | ||
21582 | |||
21583 | |||
21584 | |||
21585 | + | ||
21586 | + | ||
21587 | + | ||
21588 | + | ||
21589 | + | ||
21590 | + | ||
21591 | + | ||
21592 | + | ||
21593 | + | ||
21594 | + | ||
21595 | +if test -n "$ac_tool_prefix"; then | ||
21596 | + # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. | ||
21597 | +set dummy ${ac_tool_prefix}dlltool; ac_word=$2 | ||
21598 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
21599 | +$as_echo_n "checking for $ac_word... " >&6; } | ||
21600 | +if ${ac_cv_prog_DLLTOOL+:} false; then : | ||
21601 | + $as_echo_n "(cached) " >&6 | ||
21602 | +else | ||
21603 | + if test -n "$DLLTOOL"; then | ||
21604 | + ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. | ||
21605 | +else | ||
21606 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | ||
21607 | +for as_dir in $PATH | ||
21608 | +do | ||
21609 | + IFS=$as_save_IFS | ||
21610 | + test -z "$as_dir" && as_dir=. | ||
21611 | + for ac_exec_ext in '' $ac_executable_extensions; do | ||
21612 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | ||
21613 | + ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" | ||
21614 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
21615 | + break 2 | ||
21616 | + fi | ||
21617 | +done | ||
21618 | + done | ||
21619 | +IFS=$as_save_IFS | ||
21620 | + | ||
21621 | +fi | ||
21622 | +fi | ||
21623 | +DLLTOOL=$ac_cv_prog_DLLTOOL | ||
21624 | +if test -n "$DLLTOOL"; then | ||
21625 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 | ||
21626 | +$as_echo "$DLLTOOL" >&6; } | ||
21627 | +else | ||
21628 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
21629 | +$as_echo "no" >&6; } | ||
21630 | +fi | ||
21631 | + | ||
21632 | + | ||
21633 | +fi | ||
21634 | +if test -z "$ac_cv_prog_DLLTOOL"; then | ||
21635 | + ac_ct_DLLTOOL=$DLLTOOL | ||
21636 | + # Extract the first word of "dlltool", so it can be a program name with args. | ||
21637 | +set dummy dlltool; ac_word=$2 | ||
21638 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
21639 | +$as_echo_n "checking for $ac_word... " >&6; } | ||
21640 | +if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then : | ||
21641 | + $as_echo_n "(cached) " >&6 | ||
21642 | +else | ||
21643 | + if test -n "$ac_ct_DLLTOOL"; then | ||
21644 | + ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. | ||
21645 | +else | ||
21646 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | ||
21647 | +for as_dir in $PATH | ||
21648 | +do | ||
21649 | + IFS=$as_save_IFS | ||
21650 | + test -z "$as_dir" && as_dir=. | ||
21651 | + for ac_exec_ext in '' $ac_executable_extensions; do | ||
21652 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | ||
21653 | + ac_cv_prog_ac_ct_DLLTOOL="dlltool" | ||
21654 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
21655 | + break 2 | ||
21656 | + fi | ||
21657 | +done | ||
21658 | + done | ||
21659 | +IFS=$as_save_IFS | ||
21660 | + | ||
21661 | +fi | ||
21662 | +fi | ||
21663 | +ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL | ||
21664 | +if test -n "$ac_ct_DLLTOOL"; then | ||
21665 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 | ||
21666 | +$as_echo "$ac_ct_DLLTOOL" >&6; } | ||
21667 | +else | ||
21668 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
21669 | +$as_echo "no" >&6; } | ||
21670 | +fi | ||
21671 | + | ||
21672 | + if test "x$ac_ct_DLLTOOL" = x; then | ||
21673 | + DLLTOOL="false" | ||
21674 | + else | ||
21675 | + case $cross_compiling:$ac_tool_warned in | ||
21676 | +yes:) | ||
21677 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 | ||
21678 | +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} | ||
21679 | +ac_tool_warned=yes ;; | ||
21680 | +esac | ||
21681 | + DLLTOOL=$ac_ct_DLLTOOL | ||
21682 | + fi | ||
21683 | +else | ||
21684 | + DLLTOOL="$ac_cv_prog_DLLTOOL" | ||
21685 | +fi | ||
21686 | + | ||
21687 | +test -z "$DLLTOOL" && DLLTOOL=dlltool | ||
21688 | + | ||
21689 | + | ||
21690 | + | ||
21691 | + | ||
21692 | + | ||
21693 | + | ||
21694 | + | ||
21695 | + | ||
21696 | + | ||
21697 | + | ||
21698 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5 | ||
21699 | +$as_echo_n "checking how to associate runtime and link libraries... " >&6; } | ||
21700 | +if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then : | ||
21701 | + $as_echo_n "(cached) " >&6 | ||
21702 | +else | ||
21703 | + lt_cv_sharedlib_from_linklib_cmd='unknown' | ||
21704 | + | ||
21705 | +case $host_os in | ||
21706 | +cygwin* | mingw* | pw32* | cegcc*) | ||
21707 | + # two different shell functions defined in ltmain.sh | ||
21708 | + # decide which to use based on capabilities of $DLLTOOL | ||
21709 | + case `$DLLTOOL --help 2>&1` in | ||
21710 | + *--identify-strict*) | ||
21711 | + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib | ||
21712 | + ;; | ||
21713 | + *) | ||
21714 | + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback | ||
21715 | + ;; | ||
21716 | + esac | ||
21717 | + ;; | ||
21718 | +*) | ||
21719 | + # fallback: assume linklib IS sharedlib | ||
21720 | + lt_cv_sharedlib_from_linklib_cmd="$ECHO" | ||
21721 | + ;; | ||
21722 | +esac | ||
21723 | + | ||
21724 | +fi | ||
21725 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5 | ||
21726 | +$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; } | ||
21727 | +sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd | ||
21728 | +test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO | ||
21729 | + | ||
21730 | + | ||
21731 | + | ||
21732 | + | ||
21733 | + | ||
21734 | + | ||
21735 | + | ||
21736 | plugin_option= | ||
21737 | plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll" | ||
21738 | for plugin in $plugin_names; do | ||
21739 | @@ -6578,8 +6841,10 @@ for plugin in $plugin_names; do | ||
21740 | done | ||
21741 | |||
21742 | if test -n "$ac_tool_prefix"; then | ||
21743 | - # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. | ||
21744 | -set dummy ${ac_tool_prefix}ar; ac_word=$2 | ||
21745 | + for ac_prog in ar | ||
21746 | + do | ||
21747 | + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. | ||
21748 | +set dummy $ac_tool_prefix$ac_prog; ac_word=$2 | ||
21749 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
21750 | $as_echo_n "checking for $ac_word... " >&6; } | ||
21751 | if ${ac_cv_prog_AR+:} false; then : | ||
21752 | @@ -6595,7 +6860,7 @@ do | ||
21753 | test -z "$as_dir" && as_dir=. | ||
21754 | for ac_exec_ext in '' $ac_executable_extensions; do | ||
21755 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | ||
21756 | - ac_cv_prog_AR="${ac_tool_prefix}ar" | ||
21757 | + ac_cv_prog_AR="$ac_tool_prefix$ac_prog" | ||
21758 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
21759 | break 2 | ||
21760 | fi | ||
21761 | @@ -6615,11 +6880,15 @@ $as_echo "no" >&6; } | ||
21762 | fi | ||
21763 | |||
21764 | |||
21765 | + test -n "$AR" && break | ||
21766 | + done | ||
21767 | fi | ||
21768 | -if test -z "$ac_cv_prog_AR"; then | ||
21769 | +if test -z "$AR"; then | ||
21770 | ac_ct_AR=$AR | ||
21771 | - # Extract the first word of "ar", so it can be a program name with args. | ||
21772 | -set dummy ar; ac_word=$2 | ||
21773 | + for ac_prog in ar | ||
21774 | +do | ||
21775 | + # Extract the first word of "$ac_prog", so it can be a program name with args. | ||
21776 | +set dummy $ac_prog; ac_word=$2 | ||
21777 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
21778 | $as_echo_n "checking for $ac_word... " >&6; } | ||
21779 | if ${ac_cv_prog_ac_ct_AR+:} false; then : | ||
21780 | @@ -6635,7 +6904,7 @@ do | ||
21781 | test -z "$as_dir" && as_dir=. | ||
21782 | for ac_exec_ext in '' $ac_executable_extensions; do | ||
21783 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | ||
21784 | - ac_cv_prog_ac_ct_AR="ar" | ||
21785 | + ac_cv_prog_ac_ct_AR="$ac_prog" | ||
21786 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
21787 | break 2 | ||
21788 | fi | ||
21789 | @@ -6654,6 +6923,10 @@ else | ||
21790 | $as_echo "no" >&6; } | ||
21791 | fi | ||
21792 | |||
21793 | + | ||
21794 | + test -n "$ac_ct_AR" && break | ||
21795 | +done | ||
21796 | + | ||
21797 | if test "x$ac_ct_AR" = x; then | ||
21798 | AR="false" | ||
21799 | else | ||
21800 | @@ -6665,29 +6938,81 @@ ac_tool_warned=yes ;; | ||
21801 | esac | ||
21802 | AR=$ac_ct_AR | ||
21803 | fi | ||
21804 | -else | ||
21805 | - AR="$ac_cv_prog_AR" | ||
21806 | fi | ||
21807 | |||
21808 | -test -z "$AR" && AR=ar | ||
21809 | -if test -n "$plugin_option"; then | ||
21810 | - if $AR --help 2>&1 | grep -q "\--plugin"; then | ||
21811 | - touch conftest.c | ||
21812 | - $AR $plugin_option rc conftest.a conftest.c | ||
21813 | - if test "$?" != 0; then | ||
21814 | - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5 | ||
21815 | + touch conftest.c | ||
21816 | + $AR $plugin_option rc conftest.a conftest.c | ||
21817 | + if test "$?" != 0; then | ||
21818 | + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5 | ||
21819 | $as_echo "$as_me: WARNING: Failed: $AR $plugin_option rc" >&2;} | ||
21820 | - else | ||
21821 | - AR="$AR $plugin_option" | ||
21822 | - fi | ||
21823 | - rm -f conftest.* | ||
21824 | + else | ||
21825 | + AR="$AR $plugin_option" | ||
21826 | fi | ||
21827 | -fi | ||
21828 | -test -z "$AR_FLAGS" && AR_FLAGS=cru | ||
21829 | + rm -f conftest.* | ||
21830 | +: ${AR=ar} | ||
21831 | +: ${AR_FLAGS=cru} | ||
21832 | + | ||
21833 | + | ||
21834 | + | ||
21835 | + | ||
21836 | + | ||
21837 | + | ||
21838 | + | ||
21839 | |||
21840 | |||
21841 | |||
21842 | |||
21843 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 | ||
21844 | +$as_echo_n "checking for archiver @FILE support... " >&6; } | ||
21845 | +if ${lt_cv_ar_at_file+:} false; then : | ||
21846 | + $as_echo_n "(cached) " >&6 | ||
21847 | +else | ||
21848 | + lt_cv_ar_at_file=no | ||
21849 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
21850 | +/* end confdefs.h. */ | ||
21851 | + | ||
21852 | +int | ||
21853 | +main () | ||
21854 | +{ | ||
21855 | + | ||
21856 | + ; | ||
21857 | + return 0; | ||
21858 | +} | ||
21859 | +_ACEOF | ||
21860 | +if ac_fn_c_try_compile "$LINENO"; then : | ||
21861 | + echo conftest.$ac_objext > conftest.lst | ||
21862 | + lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5' | ||
21863 | + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 | ||
21864 | + (eval $lt_ar_try) 2>&5 | ||
21865 | + ac_status=$? | ||
21866 | + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 | ||
21867 | + test $ac_status = 0; } | ||
21868 | + if test "$ac_status" -eq 0; then | ||
21869 | + # Ensure the archiver fails upon bogus file names. | ||
21870 | + rm -f conftest.$ac_objext libconftest.a | ||
21871 | + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 | ||
21872 | + (eval $lt_ar_try) 2>&5 | ||
21873 | + ac_status=$? | ||
21874 | + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 | ||
21875 | + test $ac_status = 0; } | ||
21876 | + if test "$ac_status" -ne 0; then | ||
21877 | + lt_cv_ar_at_file=@ | ||
21878 | + fi | ||
21879 | + fi | ||
21880 | + rm -f conftest.* libconftest.a | ||
21881 | + | ||
21882 | +fi | ||
21883 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
21884 | + | ||
21885 | +fi | ||
21886 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 | ||
21887 | +$as_echo "$lt_cv_ar_at_file" >&6; } | ||
21888 | + | ||
21889 | +if test "x$lt_cv_ar_at_file" = xno; then | ||
21890 | + archiver_list_spec= | ||
21891 | +else | ||
21892 | + archiver_list_spec=$lt_cv_ar_at_file | ||
21893 | +fi | ||
21894 | |||
21895 | |||
21896 | |||
21897 | @@ -7034,8 +7359,8 @@ esac | ||
21898 | lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" | ||
21899 | |||
21900 | # Transform an extracted symbol line into symbol name and symbol address | ||
21901 | -lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" | ||
21902 | -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'" | ||
21903 | +lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" | ||
21904 | +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'" | ||
21905 | |||
21906 | # Handle CRLF in mingw tool chain | ||
21907 | opt_cr= | ||
21908 | @@ -7071,6 +7396,7 @@ for ac_symprfx in "" "_"; do | ||
21909 | else | ||
21910 | lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" | ||
21911 | fi | ||
21912 | + lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" | ||
21913 | |||
21914 | # Check to see that the pipe works correctly. | ||
21915 | pipe_works=no | ||
21916 | @@ -7112,6 +7438,18 @@ _LT_EOF | ||
21917 | if $GREP ' nm_test_var$' "$nlist" >/dev/null; then | ||
21918 | if $GREP ' nm_test_func$' "$nlist" >/dev/null; then | ||
21919 | cat <<_LT_EOF > conftest.$ac_ext | ||
21920 | +/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ | ||
21921 | +#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) | ||
21922 | +/* DATA imports from DLLs on WIN32 con't be const, because runtime | ||
21923 | + relocations are performed -- see ld's documentation on pseudo-relocs. */ | ||
21924 | +# define LT_DLSYM_CONST | ||
21925 | +#elif defined(__osf__) | ||
21926 | +/* This system does not cope well with relocations in const data. */ | ||
21927 | +# define LT_DLSYM_CONST | ||
21928 | +#else | ||
21929 | +# define LT_DLSYM_CONST const | ||
21930 | +#endif | ||
21931 | + | ||
21932 | #ifdef __cplusplus | ||
21933 | extern "C" { | ||
21934 | #endif | ||
21935 | @@ -7123,7 +7461,7 @@ _LT_EOF | ||
21936 | cat <<_LT_EOF >> conftest.$ac_ext | ||
21937 | |||
21938 | /* The mapping between symbol names and symbols. */ | ||
21939 | -const struct { | ||
21940 | +LT_DLSYM_CONST struct { | ||
21941 | const char *name; | ||
21942 | void *address; | ||
21943 | } | ||
21944 | @@ -7149,8 +7487,8 @@ static const void *lt_preloaded_setup() { | ||
21945 | _LT_EOF | ||
21946 | # Now try linking the two files. | ||
21947 | mv conftest.$ac_objext conftstm.$ac_objext | ||
21948 | - lt_save_LIBS="$LIBS" | ||
21949 | - lt_save_CFLAGS="$CFLAGS" | ||
21950 | + lt_globsym_save_LIBS=$LIBS | ||
21951 | + lt_globsym_save_CFLAGS=$CFLAGS | ||
21952 | LIBS="conftstm.$ac_objext" | ||
21953 | CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" | ||
21954 | if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 | ||
21955 | @@ -7160,8 +7498,8 @@ _LT_EOF | ||
21956 | test $ac_status = 0; } && test -s conftest${ac_exeext}; then | ||
21957 | pipe_works=yes | ||
21958 | fi | ||
21959 | - LIBS="$lt_save_LIBS" | ||
21960 | - CFLAGS="$lt_save_CFLAGS" | ||
21961 | + LIBS=$lt_globsym_save_LIBS | ||
21962 | + CFLAGS=$lt_globsym_save_CFLAGS | ||
21963 | else | ||
21964 | echo "cannot find nm_test_func in $nlist" >&5 | ||
21965 | fi | ||
21966 | @@ -7198,6 +7536,16 @@ else | ||
21967 | $as_echo "ok" >&6; } | ||
21968 | fi | ||
21969 | |||
21970 | +# Response file support. | ||
21971 | +if test "$lt_cv_nm_interface" = "MS dumpbin"; then | ||
21972 | + nm_file_list_spec='@' | ||
21973 | +elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then | ||
21974 | + nm_file_list_spec='@' | ||
21975 | +fi | ||
21976 | + | ||
21977 | + | ||
21978 | + | ||
21979 | + | ||
21980 | |||
21981 | |||
21982 | |||
21983 | @@ -7214,6 +7562,45 @@ fi | ||
21984 | |||
21985 | |||
21986 | |||
21987 | + | ||
21988 | + | ||
21989 | + | ||
21990 | + | ||
21991 | + | ||
21992 | + | ||
21993 | + | ||
21994 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 | ||
21995 | +$as_echo_n "checking for sysroot... " >&6; } | ||
21996 | + | ||
21997 | +# Check whether --with-libtool-sysroot was given. | ||
21998 | +if test "${with_libtool_sysroot+set}" = set; then : | ||
21999 | + withval=$with_libtool_sysroot; | ||
22000 | +else | ||
22001 | + with_libtool_sysroot=no | ||
22002 | +fi | ||
22003 | + | ||
22004 | + | ||
22005 | +lt_sysroot= | ||
22006 | +case ${with_libtool_sysroot} in #( | ||
22007 | + yes) | ||
22008 | + if test "$GCC" = yes; then | ||
22009 | + lt_sysroot=`$CC --print-sysroot 2>/dev/null` | ||
22010 | + fi | ||
22011 | + ;; #( | ||
22012 | + /*) | ||
22013 | + lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"` | ||
22014 | + ;; #( | ||
22015 | + no|'') | ||
22016 | + ;; #( | ||
22017 | + *) | ||
22018 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5 | ||
22019 | +$as_echo "${with_libtool_sysroot}" >&6; } | ||
22020 | + as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 | ||
22021 | + ;; | ||
22022 | +esac | ||
22023 | + | ||
22024 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 | ||
22025 | +$as_echo "${lt_sysroot:-no}" >&6; } | ||
22026 | |||
22027 | |||
22028 | |||
22029 | @@ -7419,11 +7806,128 @@ sparc*-*solaris*) | ||
22030 | ;; | ||
22031 | esac | ||
22032 | fi | ||
22033 | - rm -rf conftest* | ||
22034 | - ;; | ||
22035 | + rm -rf conftest* | ||
22036 | + ;; | ||
22037 | +esac | ||
22038 | + | ||
22039 | +need_locks="$enable_libtool_lock" | ||
22040 | + | ||
22041 | +if test -n "$ac_tool_prefix"; then | ||
22042 | + # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args. | ||
22043 | +set dummy ${ac_tool_prefix}mt; ac_word=$2 | ||
22044 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
22045 | +$as_echo_n "checking for $ac_word... " >&6; } | ||
22046 | +if ${ac_cv_prog_MANIFEST_TOOL+:} false; then : | ||
22047 | + $as_echo_n "(cached) " >&6 | ||
22048 | +else | ||
22049 | + if test -n "$MANIFEST_TOOL"; then | ||
22050 | + ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test. | ||
22051 | +else | ||
22052 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | ||
22053 | +for as_dir in $PATH | ||
22054 | +do | ||
22055 | + IFS=$as_save_IFS | ||
22056 | + test -z "$as_dir" && as_dir=. | ||
22057 | + for ac_exec_ext in '' $ac_executable_extensions; do | ||
22058 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | ||
22059 | + ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" | ||
22060 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
22061 | + break 2 | ||
22062 | + fi | ||
22063 | +done | ||
22064 | + done | ||
22065 | +IFS=$as_save_IFS | ||
22066 | + | ||
22067 | +fi | ||
22068 | +fi | ||
22069 | +MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL | ||
22070 | +if test -n "$MANIFEST_TOOL"; then | ||
22071 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5 | ||
22072 | +$as_echo "$MANIFEST_TOOL" >&6; } | ||
22073 | +else | ||
22074 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
22075 | +$as_echo "no" >&6; } | ||
22076 | +fi | ||
22077 | + | ||
22078 | + | ||
22079 | +fi | ||
22080 | +if test -z "$ac_cv_prog_MANIFEST_TOOL"; then | ||
22081 | + ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL | ||
22082 | + # Extract the first word of "mt", so it can be a program name with args. | ||
22083 | +set dummy mt; ac_word=$2 | ||
22084 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
22085 | +$as_echo_n "checking for $ac_word... " >&6; } | ||
22086 | +if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then : | ||
22087 | + $as_echo_n "(cached) " >&6 | ||
22088 | +else | ||
22089 | + if test -n "$ac_ct_MANIFEST_TOOL"; then | ||
22090 | + ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test. | ||
22091 | +else | ||
22092 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | ||
22093 | +for as_dir in $PATH | ||
22094 | +do | ||
22095 | + IFS=$as_save_IFS | ||
22096 | + test -z "$as_dir" && as_dir=. | ||
22097 | + for ac_exec_ext in '' $ac_executable_extensions; do | ||
22098 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | ||
22099 | + ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" | ||
22100 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
22101 | + break 2 | ||
22102 | + fi | ||
22103 | +done | ||
22104 | + done | ||
22105 | +IFS=$as_save_IFS | ||
22106 | + | ||
22107 | +fi | ||
22108 | +fi | ||
22109 | +ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL | ||
22110 | +if test -n "$ac_ct_MANIFEST_TOOL"; then | ||
22111 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5 | ||
22112 | +$as_echo "$ac_ct_MANIFEST_TOOL" >&6; } | ||
22113 | +else | ||
22114 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
22115 | +$as_echo "no" >&6; } | ||
22116 | +fi | ||
22117 | + | ||
22118 | + if test "x$ac_ct_MANIFEST_TOOL" = x; then | ||
22119 | + MANIFEST_TOOL=":" | ||
22120 | + else | ||
22121 | + case $cross_compiling:$ac_tool_warned in | ||
22122 | +yes:) | ||
22123 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 | ||
22124 | +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} | ||
22125 | +ac_tool_warned=yes ;; | ||
11079 | esac | 22126 | esac |
22127 | + MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL | ||
22128 | + fi | ||
22129 | +else | ||
22130 | + MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL" | ||
22131 | +fi | ||
22132 | + | ||
22133 | +test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt | ||
22134 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5 | ||
22135 | +$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; } | ||
22136 | +if ${lt_cv_path_mainfest_tool+:} false; then : | ||
22137 | + $as_echo_n "(cached) " >&6 | ||
22138 | +else | ||
22139 | + lt_cv_path_mainfest_tool=no | ||
22140 | + echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5 | ||
22141 | + $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out | ||
22142 | + cat conftest.err >&5 | ||
22143 | + if $GREP 'Manifest Tool' conftest.out > /dev/null; then | ||
22144 | + lt_cv_path_mainfest_tool=yes | ||
22145 | + fi | ||
22146 | + rm -f conftest* | ||
22147 | +fi | ||
22148 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5 | ||
22149 | +$as_echo "$lt_cv_path_mainfest_tool" >&6; } | ||
22150 | +if test "x$lt_cv_path_mainfest_tool" != xyes; then | ||
22151 | + MANIFEST_TOOL=: | ||
22152 | +fi | ||
22153 | + | ||
22154 | + | ||
22155 | + | ||
22156 | |||
22157 | -need_locks="$enable_libtool_lock" | ||
11080 | 22158 | ||
11081 | # Global variables: | ||
11082 | -ofile=libtool | ||
11083 | +ofile=${host_alias}-libtool | ||
11084 | can_build_shared=yes | ||
11085 | 22159 | ||
11086 | # All known linkers require a `.a' archive for static linking (except MSVC, | 22160 | case $host_os in |
11087 | @@ -8557,8 +9056,6 @@ fi | 22161 | @@ -7988,6 +8492,8 @@ _LT_EOF |
22162 | $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 | ||
22163 | echo "$AR cru libconftest.a conftest.o" >&5 | ||
22164 | $AR cru libconftest.a conftest.o 2>&5 | ||
22165 | + echo "$RANLIB libconftest.a" >&5 | ||
22166 | + $RANLIB libconftest.a 2>&5 | ||
22167 | cat > conftest.c << _LT_EOF | ||
22168 | int main() { return 0;} | ||
22169 | _LT_EOF | ||
22170 | @@ -8542,8 +9048,6 @@ fi | ||
11088 | lt_prog_compiler_pic= | 22171 | lt_prog_compiler_pic= |
11089 | lt_prog_compiler_static= | 22172 | lt_prog_compiler_static= |
11090 | 22173 | ||
@@ -11093,7 +22176,7 @@ index 6b294bfebfb..52a025bb848 100755 | |||
11093 | 22176 | ||
11094 | if test "$GCC" = yes; then | 22177 | if test "$GCC" = yes; then |
11095 | lt_prog_compiler_wl='-Wl,' | 22178 | lt_prog_compiler_wl='-Wl,' |
11096 | @@ -8724,6 +9221,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } | 22179 | @@ -8709,6 +9213,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } |
11097 | lt_prog_compiler_pic='--shared' | 22180 | lt_prog_compiler_pic='--shared' |
11098 | lt_prog_compiler_static='--static' | 22181 | lt_prog_compiler_static='--static' |
11099 | ;; | 22182 | ;; |
@@ -11106,7 +22189,7 @@ index 6b294bfebfb..52a025bb848 100755 | |||
11106 | pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) | 22189 | pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) |
11107 | # Portland Group compilers (*not* the Pentium gcc compiler, | 22190 | # Portland Group compilers (*not* the Pentium gcc compiler, |
11108 | # which looks to be a dead project) | 22191 | # which looks to be a dead project) |
11109 | @@ -8786,7 +9289,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } | 22192 | @@ -8771,7 +9281,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } |
11110 | lt_prog_compiler_pic='-KPIC' | 22193 | lt_prog_compiler_pic='-KPIC' |
11111 | lt_prog_compiler_static='-Bstatic' | 22194 | lt_prog_compiler_static='-Bstatic' |
11112 | case $cc_basename in | 22195 | case $cc_basename in |
@@ -11115,7 +22198,7 @@ index 6b294bfebfb..52a025bb848 100755 | |||
11115 | lt_prog_compiler_wl='-Qoption ld ';; | 22198 | lt_prog_compiler_wl='-Qoption ld ';; |
11116 | *) | 22199 | *) |
11117 | lt_prog_compiler_wl='-Wl,';; | 22200 | lt_prog_compiler_wl='-Wl,';; |
11118 | @@ -8843,13 +9346,17 @@ case $host_os in | 22201 | @@ -8828,13 +9338,17 @@ case $host_os in |
11119 | lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" | 22202 | lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" |
11120 | ;; | 22203 | ;; |
11121 | esac | 22204 | esac |
@@ -11139,7 +22222,7 @@ index 6b294bfebfb..52a025bb848 100755 | |||
11139 | 22222 | ||
11140 | # | 22223 | # |
11141 | # Check to make sure the PIC flag actually works. | 22224 | # Check to make sure the PIC flag actually works. |
11142 | @@ -8910,6 +9417,11 @@ fi | 22225 | @@ -8895,6 +9409,11 @@ fi |
11143 | 22226 | ||
11144 | 22227 | ||
11145 | 22228 | ||
@@ -11151,7 +22234,7 @@ index 6b294bfebfb..52a025bb848 100755 | |||
11151 | # | 22234 | # |
11152 | # Check to make sure the static flag actually works. | 22235 | # Check to make sure the static flag actually works. |
11153 | # | 22236 | # |
11154 | @@ -9260,7 +9772,8 @@ _LT_EOF | 22237 | @@ -9245,7 +9764,8 @@ _LT_EOF |
11155 | allow_undefined_flag=unsupported | 22238 | allow_undefined_flag=unsupported |
11156 | always_export_symbols=no | 22239 | always_export_symbols=no |
11157 | enable_shared_with_static_runtimes=yes | 22240 | enable_shared_with_static_runtimes=yes |
@@ -11161,7 +22244,7 @@ index 6b294bfebfb..52a025bb848 100755 | |||
11161 | 22244 | ||
11162 | if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then | 22245 | if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then |
11163 | archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' | 22246 | archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' |
11164 | @@ -9359,12 +9872,12 @@ _LT_EOF | 22247 | @@ -9344,12 +9864,12 @@ _LT_EOF |
11165 | whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' | 22248 | whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' |
11166 | hardcode_libdir_flag_spec= | 22249 | hardcode_libdir_flag_spec= |
11167 | hardcode_libdir_flag_spec_ld='-rpath $libdir' | 22250 | hardcode_libdir_flag_spec_ld='-rpath $libdir' |
@@ -11176,7 +22259,7 @@ index 6b294bfebfb..52a025bb848 100755 | |||
11176 | fi | 22259 | fi |
11177 | ;; | 22260 | ;; |
11178 | esac | 22261 | esac |
11179 | @@ -9378,8 +9891,8 @@ _LT_EOF | 22262 | @@ -9363,8 +9883,8 @@ _LT_EOF |
11180 | archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' | 22263 | archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' |
11181 | wlarc= | 22264 | wlarc= |
11182 | else | 22265 | else |
@@ -11187,7 +22270,7 @@ index 6b294bfebfb..52a025bb848 100755 | |||
11187 | fi | 22270 | fi |
11188 | ;; | 22271 | ;; |
11189 | 22272 | ||
11190 | @@ -9397,8 +9910,8 @@ _LT_EOF | 22273 | @@ -9382,8 +9902,8 @@ _LT_EOF |
11191 | 22274 | ||
11192 | _LT_EOF | 22275 | _LT_EOF |
11193 | elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then | 22276 | elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then |
@@ -11198,7 +22281,7 @@ index 6b294bfebfb..52a025bb848 100755 | |||
11198 | else | 22281 | else |
11199 | ld_shlibs=no | 22282 | ld_shlibs=no |
11200 | fi | 22283 | fi |
11201 | @@ -9444,8 +9957,8 @@ _LT_EOF | 22284 | @@ -9429,8 +9949,8 @@ _LT_EOF |
11202 | 22285 | ||
11203 | *) | 22286 | *) |
11204 | if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then | 22287 | if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then |
@@ -11209,7 +22292,7 @@ index 6b294bfebfb..52a025bb848 100755 | |||
11209 | else | 22292 | else |
11210 | ld_shlibs=no | 22293 | ld_shlibs=no |
11211 | fi | 22294 | fi |
11212 | @@ -9575,7 +10088,13 @@ _LT_EOF | 22295 | @@ -9560,7 +10080,13 @@ _LT_EOF |
11213 | allow_undefined_flag='-berok' | 22296 | allow_undefined_flag='-berok' |
11214 | # Determine the default libpath from the value encoded in an | 22297 | # Determine the default libpath from the value encoded in an |
11215 | # empty executable. | 22298 | # empty executable. |
@@ -11224,7 +22307,7 @@ index 6b294bfebfb..52a025bb848 100755 | |||
11224 | /* end confdefs.h. */ | 22307 | /* end confdefs.h. */ |
11225 | 22308 | ||
11226 | int | 22309 | int |
11227 | @@ -9588,22 +10107,29 @@ main () | 22310 | @@ -9573,22 +10099,29 @@ main () |
11228 | _ACEOF | 22311 | _ACEOF |
11229 | if ac_fn_c_try_link "$LINENO"; then : | 22312 | if ac_fn_c_try_link "$LINENO"; then : |
11230 | 22313 | ||
@@ -11267,7 +22350,7 @@ index 6b294bfebfb..52a025bb848 100755 | |||
11267 | 22350 | ||
11268 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" | 22351 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" |
11269 | 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" | 22352 | archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" |
11270 | @@ -9615,7 +10141,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | 22353 | @@ -9600,7 +10133,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
11271 | else | 22354 | else |
11272 | # Determine the default libpath from the value encoded in an | 22355 | # Determine the default libpath from the value encoded in an |
11273 | # empty executable. | 22356 | # empty executable. |
@@ -11282,7 +22365,7 @@ index 6b294bfebfb..52a025bb848 100755 | |||
11282 | /* end confdefs.h. */ | 22365 | /* end confdefs.h. */ |
11283 | 22366 | ||
11284 | int | 22367 | int |
11285 | @@ -9628,22 +10160,29 @@ main () | 22368 | @@ -9613,22 +10152,29 @@ main () |
11286 | _ACEOF | 22369 | _ACEOF |
11287 | if ac_fn_c_try_link "$LINENO"; then : | 22370 | if ac_fn_c_try_link "$LINENO"; then : |
11288 | 22371 | ||
@@ -11325,7 +22408,7 @@ index 6b294bfebfb..52a025bb848 100755 | |||
11325 | 22408 | ||
11326 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" | 22409 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" |
11327 | # Warning - without using the other run time loading flags, | 22410 | # Warning - without using the other run time loading flags, |
11328 | @@ -9688,20 +10227,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | 22411 | @@ -9673,20 +10219,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
11329 | # Microsoft Visual C++. | 22412 | # Microsoft Visual C++. |
11330 | # hardcode_libdir_flag_spec is actually meaningless, as there is | 22413 | # hardcode_libdir_flag_spec is actually meaningless, as there is |
11331 | # no search path for DLLs. | 22414 | # no search path for DLLs. |
@@ -11403,7 +22486,7 @@ index 6b294bfebfb..52a025bb848 100755 | |||
11403 | ;; | 22486 | ;; |
11404 | 22487 | ||
11405 | darwin* | rhapsody*) | 22488 | darwin* | rhapsody*) |
11406 | @@ -9762,7 +10344,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | 22489 | @@ -9747,7 +10336,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
11407 | 22490 | ||
11408 | # FreeBSD 3 and greater uses gcc -shared to do shared libraries. | 22491 | # FreeBSD 3 and greater uses gcc -shared to do shared libraries. |
11409 | freebsd* | dragonfly*) | 22492 | freebsd* | dragonfly*) |
@@ -11412,7 +22495,7 @@ index 6b294bfebfb..52a025bb848 100755 | |||
11412 | hardcode_libdir_flag_spec='-R$libdir' | 22495 | hardcode_libdir_flag_spec='-R$libdir' |
11413 | hardcode_direct=yes | 22496 | hardcode_direct=yes |
11414 | hardcode_shlibpath_var=no | 22497 | hardcode_shlibpath_var=no |
11415 | @@ -9770,7 +10352,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | 22498 | @@ -9755,7 +10344,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
11416 | 22499 | ||
11417 | hpux9*) | 22500 | hpux9*) |
11418 | if test "$GCC" = yes; then | 22501 | if test "$GCC" = yes; then |
@@ -11421,7 +22504,7 @@ index 6b294bfebfb..52a025bb848 100755 | |||
11421 | else | 22504 | else |
11422 | 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' | 22505 | archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' |
11423 | fi | 22506 | fi |
11424 | @@ -9786,7 +10368,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | 22507 | @@ -9771,7 +10360,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
11425 | 22508 | ||
11426 | hpux10*) | 22509 | hpux10*) |
11427 | if test "$GCC" = yes && test "$with_gnu_ld" = no; then | 22510 | if test "$GCC" = yes && test "$with_gnu_ld" = no; then |
@@ -11430,8 +22513,8 @@ index 6b294bfebfb..52a025bb848 100755 | |||
11430 | else | 22513 | else |
11431 | archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' | 22514 | archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' |
11432 | fi | 22515 | fi |
11433 | @@ -9810,10 +10392,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | 22516 | @@ -9795,10 +10384,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
11434 | archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' | 22517 | archive_cmds='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' |
11435 | ;; | 22518 | ;; |
11436 | ia64*) | 22519 | ia64*) |
11437 | - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' | 22520 | - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' |
@@ -11443,7 +22526,7 @@ index 6b294bfebfb..52a025bb848 100755 | |||
11443 | ;; | 22526 | ;; |
11444 | esac | 22527 | esac |
11445 | else | 22528 | else |
11446 | @@ -9892,23 +10474,36 @@ fi | 22529 | @@ -9877,23 +10466,36 @@ fi |
11447 | 22530 | ||
11448 | irix5* | irix6* | nonstopux*) | 22531 | irix5* | irix6* | nonstopux*) |
11449 | if test "$GCC" = yes; then | 22532 | if test "$GCC" = yes; then |
@@ -11488,7 +22571,7 @@ index 6b294bfebfb..52a025bb848 100755 | |||
11488 | else | 22571 | else |
11489 | 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' | 22572 | archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' |
11490 | 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' | 22573 | archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' |
11491 | @@ -9993,7 +10588,7 @@ rm -f core conftest.err conftest.$ac_objext \ | 22574 | @@ -9978,7 +10580,7 @@ rm -f core conftest.err conftest.$ac_objext \ |
11492 | osf4* | osf5*) # as osf3* with the addition of -msym flag | 22575 | osf4* | osf5*) # as osf3* with the addition of -msym flag |
11493 | if test "$GCC" = yes; then | 22576 | if test "$GCC" = yes; then |
11494 | allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' | 22577 | allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' |
@@ -11497,7 +22580,7 @@ index 6b294bfebfb..52a025bb848 100755 | |||
11497 | hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' | 22580 | hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' |
11498 | else | 22581 | else |
11499 | allow_undefined_flag=' -expect_unresolved \*' | 22582 | allow_undefined_flag=' -expect_unresolved \*' |
11500 | @@ -10012,9 +10607,9 @@ rm -f core conftest.err conftest.$ac_objext \ | 22583 | @@ -9997,9 +10599,9 @@ rm -f core conftest.err conftest.$ac_objext \ |
11501 | no_undefined_flag=' -z defs' | 22584 | no_undefined_flag=' -z defs' |
11502 | if test "$GCC" = yes; then | 22585 | if test "$GCC" = yes; then |
11503 | wlarc='${wl}' | 22586 | wlarc='${wl}' |
@@ -11509,7 +22592,7 @@ index 6b294bfebfb..52a025bb848 100755 | |||
11509 | else | 22592 | else |
11510 | case `$CC -V 2>&1` in | 22593 | case `$CC -V 2>&1` in |
11511 | *"Compilers 5.0"*) | 22594 | *"Compilers 5.0"*) |
11512 | @@ -10590,8 +11185,9 @@ cygwin* | mingw* | pw32* | cegcc*) | 22595 | @@ -10575,8 +11177,9 @@ cygwin* | mingw* | pw32* | cegcc*) |
11513 | need_version=no | 22596 | need_version=no |
11514 | need_lib_prefix=no | 22597 | need_lib_prefix=no |
11515 | 22598 | ||
@@ -11521,7 +22604,7 @@ index 6b294bfebfb..52a025bb848 100755 | |||
11521 | library_names_spec='$libname.dll.a' | 22604 | library_names_spec='$libname.dll.a' |
11522 | # DLL is installed to $(libdir)/../bin by postinstall_cmds | 22605 | # DLL is installed to $(libdir)/../bin by postinstall_cmds |
11523 | postinstall_cmds='base_file=`basename \${file}`~ | 22606 | postinstall_cmds='base_file=`basename \${file}`~ |
11524 | @@ -10624,13 +11220,71 @@ cygwin* | mingw* | pw32* | cegcc*) | 22607 | @@ -10609,13 +11212,71 @@ cygwin* | mingw* | pw32* | cegcc*) |
11525 | library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' | 22608 | library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' |
11526 | ;; | 22609 | ;; |
11527 | esac | 22610 | esac |
@@ -11594,25 +22677,16 @@ index 6b294bfebfb..52a025bb848 100755 | |||
11594 | # FIXME: first we should search . and the directory the executable is in | 22677 | # FIXME: first we should search . and the directory the executable is in |
11595 | shlibpath_var=PATH | 22678 | shlibpath_var=PATH |
11596 | ;; | 22679 | ;; |
11597 | @@ -10712,7 +11366,7 @@ haiku*) | 22680 | @@ -11517,7 +12178,7 @@ else |
11598 | soname_spec='${libname}${release}${shared_ext}$major' | ||
11599 | shlibpath_var=LIBRARY_PATH | ||
11600 | shlibpath_overrides_runpath=yes | ||
11601 | - sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib' | ||
11602 | + sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' | ||
11603 | hardcode_into_libs=yes | ||
11604 | ;; | ||
11605 | |||
11606 | @@ -11508,7 +12162,7 @@ else | ||
11607 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 | 22681 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 |
11608 | lt_status=$lt_dlunknown | 22682 | lt_status=$lt_dlunknown |
11609 | cat > conftest.$ac_ext <<_LT_EOF | 22683 | cat > conftest.$ac_ext <<_LT_EOF |
11610 | -#line 11511 "configure" | 22684 | -#line 11520 "configure" |
11611 | +#line $LINENO "configure" | 22685 | +#line $LINENO "configure" |
11612 | #include "confdefs.h" | 22686 | #include "confdefs.h" |
11613 | 22687 | ||
11614 | #if HAVE_DLFCN_H | 22688 | #if HAVE_DLFCN_H |
11615 | @@ -11552,10 +12206,10 @@ else | 22689 | @@ -11561,10 +12222,10 @@ else |
11616 | /* When -fvisbility=hidden is used, assume the code has been annotated | 22690 | /* When -fvisbility=hidden is used, assume the code has been annotated |
11617 | correspondingly for the symbols needed. */ | 22691 | correspondingly for the symbols needed. */ |
11618 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) | 22692 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) |
@@ -11625,16 +22699,16 @@ index 6b294bfebfb..52a025bb848 100755 | |||
11625 | int main () | 22699 | int main () |
11626 | { | 22700 | { |
11627 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); | 22701 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); |
11628 | @@ -11614,7 +12268,7 @@ else | 22702 | @@ -11623,7 +12284,7 @@ else |
11629 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 | 22703 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 |
11630 | lt_status=$lt_dlunknown | 22704 | lt_status=$lt_dlunknown |
11631 | cat > conftest.$ac_ext <<_LT_EOF | 22705 | cat > conftest.$ac_ext <<_LT_EOF |
11632 | -#line 11617 "configure" | 22706 | -#line 11626 "configure" |
11633 | +#line $LINENO "configure" | 22707 | +#line $LINENO "configure" |
11634 | #include "confdefs.h" | 22708 | #include "confdefs.h" |
11635 | 22709 | ||
11636 | #if HAVE_DLFCN_H | 22710 | #if HAVE_DLFCN_H |
11637 | @@ -11658,10 +12312,10 @@ else | 22711 | @@ -11667,10 +12328,10 @@ else |
11638 | /* When -fvisbility=hidden is used, assume the code has been annotated | 22712 | /* When -fvisbility=hidden is used, assume the code has been annotated |
11639 | correspondingly for the symbols needed. */ | 22713 | correspondingly for the symbols needed. */ |
11640 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) | 22714 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) |
@@ -11647,7 +22721,16 @@ index 6b294bfebfb..52a025bb848 100755 | |||
11647 | int main () | 22721 | int main () |
11648 | { | 22722 | { |
11649 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); | 22723 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); |
11650 | @@ -14136,13 +14790,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' | 22724 | @@ -13490,7 +14151,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 |
22725 | # | ||
22726 | # INIT-COMMANDS | ||
22727 | # | ||
22728 | -AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir" | ||
22729 | +AMDEP_TRUE="$AMDEP_TRUE" MAKE="${MAKE-make}" | ||
22730 | |||
22731 | |||
22732 | # The HP-UX ksh and POSIX shell print the target directory to stdout | ||
22733 | @@ -13528,13 +14189,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' | ||
11651 | lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' | 22734 | lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' |
11652 | lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' | 22735 | lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' |
11653 | lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' | 22736 | lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' |
@@ -11668,7 +22751,7 @@ index 6b294bfebfb..52a025bb848 100755 | |||
11668 | STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' | 22751 | STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' |
11669 | RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' | 22752 | RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' |
11670 | old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' | 22753 | old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' |
11671 | @@ -14157,14 +14818,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de | 22754 | @@ -13549,14 +14217,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de |
11672 | lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' | 22755 | lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' |
11673 | lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' | 22756 | lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' |
11674 | 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"`' | 22757 | lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`' |
@@ -11687,7 +22770,7 @@ index 6b294bfebfb..52a025bb848 100755 | |||
11687 | DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' | 22770 | DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' |
11688 | NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' | 22771 | NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' |
11689 | LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' | 22772 | LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' |
11690 | @@ -14197,12 +14861,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q | 22773 | @@ -13589,12 +14260,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q |
11691 | hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' | 22774 | hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' |
11692 | inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' | 22775 | inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' |
11693 | link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' | 22776 | link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' |
@@ -11701,7 +22784,7 @@ index 6b294bfebfb..52a025bb848 100755 | |||
11701 | file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' | 22784 | file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' |
11702 | variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' | 22785 | variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' |
11703 | need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' | 22786 | need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' |
11704 | @@ -14257,8 +14921,13 @@ reload_flag \ | 22787 | @@ -13649,8 +14320,13 @@ reload_flag \ |
11705 | OBJDUMP \ | 22788 | OBJDUMP \ |
11706 | deplibs_check_method \ | 22789 | deplibs_check_method \ |
11707 | file_magic_cmd \ | 22790 | file_magic_cmd \ |
@@ -11715,7 +22798,7 @@ index 6b294bfebfb..52a025bb848 100755 | |||
11715 | STRIP \ | 22798 | STRIP \ |
11716 | RANLIB \ | 22799 | RANLIB \ |
11717 | CC \ | 22800 | CC \ |
11718 | @@ -14268,12 +14937,14 @@ lt_cv_sys_global_symbol_pipe \ | 22801 | @@ -13660,12 +14336,14 @@ lt_cv_sys_global_symbol_pipe \ |
11719 | lt_cv_sys_global_symbol_to_cdecl \ | 22802 | lt_cv_sys_global_symbol_to_cdecl \ |
11720 | lt_cv_sys_global_symbol_to_c_name_address \ | 22803 | lt_cv_sys_global_symbol_to_c_name_address \ |
11721 | lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ | 22804 | lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ |
@@ -11731,7 +22814,7 @@ index 6b294bfebfb..52a025bb848 100755 | |||
11731 | DSYMUTIL \ | 22814 | DSYMUTIL \ |
11732 | NMEDIT \ | 22815 | NMEDIT \ |
11733 | LIPO \ | 22816 | LIPO \ |
11734 | @@ -14289,7 +14960,6 @@ no_undefined_flag \ | 22817 | @@ -13681,7 +14359,6 @@ no_undefined_flag \ |
11735 | hardcode_libdir_flag_spec \ | 22818 | hardcode_libdir_flag_spec \ |
11736 | hardcode_libdir_flag_spec_ld \ | 22819 | hardcode_libdir_flag_spec_ld \ |
11737 | hardcode_libdir_separator \ | 22820 | hardcode_libdir_separator \ |
@@ -11739,7 +22822,7 @@ index 6b294bfebfb..52a025bb848 100755 | |||
11739 | exclude_expsyms \ | 22822 | exclude_expsyms \ |
11740 | include_expsyms \ | 22823 | include_expsyms \ |
11741 | file_list_spec \ | 22824 | file_list_spec \ |
11742 | @@ -14325,6 +14995,7 @@ module_cmds \ | 22825 | @@ -13717,6 +14394,7 @@ module_cmds \ |
11743 | module_expsym_cmds \ | 22826 | module_expsym_cmds \ |
11744 | export_symbols_cmds \ | 22827 | export_symbols_cmds \ |
11745 | prelink_cmds \ | 22828 | prelink_cmds \ |
@@ -11747,7 +22830,149 @@ index 6b294bfebfb..52a025bb848 100755 | |||
11747 | postinstall_cmds \ | 22830 | postinstall_cmds \ |
11748 | postuninstall_cmds \ | 22831 | postuninstall_cmds \ |
11749 | finish_cmds \ | 22832 | finish_cmds \ |
11750 | @@ -15081,7 +15752,8 @@ $as_echo X"$file" | | 22833 | @@ -14363,29 +15041,35 @@ $as_echo "$as_me: executing $ac_file commands" >&6;} |
22834 | # Older Autoconf quotes --file arguments for eval, but not when files | ||
22835 | # are listed without --file. Let's play safe and only enable the eval | ||
22836 | # if we detect the quoting. | ||
22837 | - case $CONFIG_FILES in | ||
22838 | - *\'*) eval set x "$CONFIG_FILES" ;; | ||
22839 | - *) set x $CONFIG_FILES ;; | ||
22840 | - esac | ||
22841 | + # TODO: see whether this extra hack can be removed once we start | ||
22842 | + # requiring Autoconf 2.70 or later. | ||
22843 | + case $CONFIG_FILES in #( | ||
22844 | + *\'*) : | ||
22845 | + eval set x "$CONFIG_FILES" ;; #( | ||
22846 | + *) : | ||
22847 | + set x $CONFIG_FILES ;; #( | ||
22848 | + *) : | ||
22849 | + ;; | ||
22850 | +esac | ||
22851 | shift | ||
22852 | - for mf | ||
22853 | + # Used to flag and report bootstrapping failures. | ||
22854 | + am_rc=0 | ||
22855 | + for am_mf | ||
22856 | do | ||
22857 | # Strip MF so we end up with the name of the file. | ||
22858 | - mf=`echo "$mf" | sed -e 's/:.*$//'` | ||
22859 | - # Check whether this is an Automake generated Makefile or not. | ||
22860 | - # We used to match only the files named 'Makefile.in', but | ||
22861 | - # some people rename them; so instead we look at the file content. | ||
22862 | - # Grep'ing the first line is not enough: some people post-process | ||
22863 | - # each Makefile.in and add a new line on top of each file to say so. | ||
22864 | - # Grep'ing the whole file is not good either: AIX grep has a line | ||
22865 | + am_mf=`$as_echo "$am_mf" | sed -e 's/:.*$//'` | ||
22866 | + # Check whether this is an Automake generated Makefile which includes | ||
22867 | + # dependency-tracking related rules and includes. | ||
22868 | + # Grep'ing the whole file directly is not great: AIX grep has a line | ||
22869 | # limit of 2048, but all sed's we know have understand at least 4000. | ||
22870 | - if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then | ||
22871 | - dirpart=`$as_dirname -- "$mf" || | ||
22872 | -$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ | ||
22873 | - X"$mf" : 'X\(//\)[^/]' \| \ | ||
22874 | - X"$mf" : 'X\(//\)$' \| \ | ||
22875 | - X"$mf" : 'X\(/\)' \| . 2>/dev/null || | ||
22876 | -$as_echo X"$mf" | | ||
22877 | + sed -n 's,^am--depfiles:.*,X,p' "$am_mf" | grep X >/dev/null 2>&1 \ | ||
22878 | + || continue | ||
22879 | + am_dirpart=`$as_dirname -- "$am_mf" || | ||
22880 | +$as_expr X"$am_mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ | ||
22881 | + X"$am_mf" : 'X\(//\)[^/]' \| \ | ||
22882 | + X"$am_mf" : 'X\(//\)$' \| \ | ||
22883 | + X"$am_mf" : 'X\(/\)' \| . 2>/dev/null || | ||
22884 | +$as_echo X"$am_mf" | | ||
22885 | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ | ||
22886 | s//\1/ | ||
22887 | q | ||
22888 | @@ -14403,53 +15087,50 @@ $as_echo X"$mf" | | ||
22889 | q | ||
22890 | } | ||
22891 | s/.*/./; q'` | ||
22892 | - else | ||
22893 | - continue | ||
22894 | - fi | ||
22895 | - # Extract the definition of DEPDIR, am__include, and am__quote | ||
22896 | - # from the Makefile without running 'make'. | ||
22897 | - DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` | ||
22898 | - test -z "$DEPDIR" && continue | ||
22899 | - am__include=`sed -n 's/^am__include = //p' < "$mf"` | ||
22900 | - test -z "$am__include" && continue | ||
22901 | - am__quote=`sed -n 's/^am__quote = //p' < "$mf"` | ||
22902 | - # Find all dependency output files, they are included files with | ||
22903 | - # $(DEPDIR) in their names. We invoke sed twice because it is the | ||
22904 | - # simplest approach to changing $(DEPDIR) to its actual value in the | ||
22905 | - # expansion. | ||
22906 | - for file in `sed -n " | ||
22907 | - s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ | ||
22908 | - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do | ||
22909 | - # Make sure the directory exists. | ||
22910 | - test -f "$dirpart/$file" && continue | ||
22911 | - fdir=`$as_dirname -- "$file" || | ||
22912 | -$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ | ||
22913 | - X"$file" : 'X\(//\)[^/]' \| \ | ||
22914 | - X"$file" : 'X\(//\)$' \| \ | ||
22915 | - X"$file" : 'X\(/\)' \| . 2>/dev/null || | ||
22916 | -$as_echo X"$file" | | ||
22917 | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ | ||
22918 | - s//\1/ | ||
22919 | - q | ||
22920 | - } | ||
22921 | - /^X\(\/\/\)[^/].*/{ | ||
22922 | + am_filepart=`$as_basename -- "$am_mf" || | ||
22923 | +$as_expr X/"$am_mf" : '.*/\([^/][^/]*\)/*$' \| \ | ||
22924 | + X"$am_mf" : 'X\(//\)$' \| \ | ||
22925 | + X"$am_mf" : 'X\(/\)' \| . 2>/dev/null || | ||
22926 | +$as_echo X/"$am_mf" | | ||
22927 | + sed '/^.*\/\([^/][^/]*\)\/*$/{ | ||
22928 | s//\1/ | ||
22929 | q | ||
22930 | } | ||
22931 | - /^X\(\/\/\)$/{ | ||
22932 | + /^X\/\(\/\/\)$/{ | ||
22933 | s//\1/ | ||
22934 | q | ||
22935 | } | ||
22936 | - /^X\(\/\).*/{ | ||
22937 | + /^X\/\(\/\).*/{ | ||
22938 | s//\1/ | ||
22939 | q | ||
22940 | } | ||
22941 | s/.*/./; q'` | ||
22942 | - as_dir=$dirpart/$fdir; as_fn_mkdir_p | ||
22943 | - # echo "creating $dirpart/$file" | ||
22944 | - echo '# dummy' > "$dirpart/$file" | ||
22945 | - done | ||
22946 | + { echo "$as_me:$LINENO: cd "$am_dirpart" \ | ||
22947 | + && sed -e '/# am--include-marker/d' "$am_filepart" \ | ||
22948 | + | $MAKE -f - am--depfiles" >&5 | ||
22949 | + (cd "$am_dirpart" \ | ||
22950 | + && sed -e '/# am--include-marker/d' "$am_filepart" \ | ||
22951 | + | $MAKE -f - am--depfiles) >&5 2>&5 | ||
22952 | + ac_status=$? | ||
22953 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
22954 | + (exit $ac_status); } || am_rc=$? | ||
22955 | done | ||
22956 | + if test $am_rc -ne 0; then | ||
22957 | + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 | ||
22958 | +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} | ||
22959 | +as_fn_error $? "Something went wrong bootstrapping makefile fragments | ||
22960 | + for automatic dependency tracking. If GNU make was not used, consider | ||
22961 | + re-running the configure script with MAKE=\"gmake\" (or whatever is | ||
22962 | + necessary). You can also try re-running configure with the | ||
22963 | + '--disable-dependency-tracking' option to at least be able to build | ||
22964 | + the package (albeit without support for automatic dependency tracking). | ||
22965 | +See \`config.log' for more details" "$LINENO" 5; } | ||
22966 | + fi | ||
22967 | + { am_dirpart=; unset am_dirpart;} | ||
22968 | + { am_filepart=; unset am_filepart;} | ||
22969 | + { am_mf=; unset am_mf;} | ||
22970 | + { am_rc=; unset am_rc;} | ||
22971 | + rm -f conftest-deps.mk | ||
22972 | } | ||
22973 | ;; | ||
22974 | "libtool":C) | ||
22975 | @@ -14473,7 +15154,8 @@ $as_echo X"$file" | | ||
11751 | # NOTE: Changes made to this file will be lost: look at ltmain.sh. | 22976 | # NOTE: Changes made to this file will be lost: look at ltmain.sh. |
11752 | # | 22977 | # |
11753 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, | 22978 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, |
@@ -11757,7 +22982,7 @@ index 6b294bfebfb..52a025bb848 100755 | |||
11757 | # Written by Gordon Matzigkeit, 1996 | 22982 | # Written by Gordon Matzigkeit, 1996 |
11758 | # | 22983 | # |
11759 | # This file is part of GNU Libtool. | 22984 | # This file is part of GNU Libtool. |
11760 | @@ -15184,19 +15856,42 @@ SP2NL=$lt_lt_SP2NL | 22985 | @@ -14576,19 +15258,42 @@ SP2NL=$lt_lt_SP2NL |
11761 | # turn newlines into spaces. | 22986 | # turn newlines into spaces. |
11762 | NL2SP=$lt_lt_NL2SP | 22987 | NL2SP=$lt_lt_NL2SP |
11763 | 22988 | ||
@@ -11801,7 +23026,7 @@ index 6b294bfebfb..52a025bb848 100755 | |||
11801 | # A symbol stripping program. | 23026 | # A symbol stripping program. |
11802 | STRIP=$lt_STRIP | 23027 | STRIP=$lt_STRIP |
11803 | 23028 | ||
11804 | @@ -15226,6 +15921,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address | 23029 | @@ -14618,6 +15323,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address |
11805 | # Transform the output of nm in a C name address pair when lib prefix is needed. | 23030 | # Transform the output of nm in a C name address pair when lib prefix is needed. |
11806 | global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix | 23031 | global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix |
11807 | 23032 | ||
@@ -11814,7 +23039,7 @@ index 6b294bfebfb..52a025bb848 100755 | |||
11814 | # The name of the directory that contains temporary libtool files. | 23039 | # The name of the directory that contains temporary libtool files. |
11815 | objdir=$objdir | 23040 | objdir=$objdir |
11816 | 23041 | ||
11817 | @@ -15235,6 +15936,9 @@ MAGIC_CMD=$MAGIC_CMD | 23042 | @@ -14627,6 +15338,9 @@ MAGIC_CMD=$MAGIC_CMD |
11818 | # Must we lock files when doing compilation? | 23043 | # Must we lock files when doing compilation? |
11819 | need_locks=$lt_need_locks | 23044 | need_locks=$lt_need_locks |
11820 | 23045 | ||
@@ -11824,7 +23049,7 @@ index 6b294bfebfb..52a025bb848 100755 | |||
11824 | # Tool to manipulate archived DWARF debug symbol files on Mac OS X. | 23049 | # Tool to manipulate archived DWARF debug symbol files on Mac OS X. |
11825 | DSYMUTIL=$lt_DSYMUTIL | 23050 | DSYMUTIL=$lt_DSYMUTIL |
11826 | 23051 | ||
11827 | @@ -15349,12 +16053,12 @@ with_gcc=$GCC | 23052 | @@ -14741,12 +15455,12 @@ with_gcc=$GCC |
11828 | # Compiler flag to turn off builtin functions. | 23053 | # Compiler flag to turn off builtin functions. |
11829 | no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag | 23054 | no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag |
11830 | 23055 | ||
@@ -11840,7 +23065,7 @@ index 6b294bfebfb..52a025bb848 100755 | |||
11840 | # Compiler flag to prevent dynamic linking. | 23065 | # Compiler flag to prevent dynamic linking. |
11841 | link_static_flag=$lt_lt_prog_compiler_static | 23066 | link_static_flag=$lt_lt_prog_compiler_static |
11842 | 23067 | ||
11843 | @@ -15441,9 +16145,6 @@ inherit_rpath=$inherit_rpath | 23068 | @@ -14833,9 +15547,6 @@ inherit_rpath=$inherit_rpath |
11844 | # Whether libtool must link a program against all its dependency libraries. | 23069 | # Whether libtool must link a program against all its dependency libraries. |
11845 | link_all_deplibs=$link_all_deplibs | 23070 | link_all_deplibs=$link_all_deplibs |
11846 | 23071 | ||
@@ -11850,7 +23075,7 @@ index 6b294bfebfb..52a025bb848 100755 | |||
11850 | # Set to "yes" if exported symbols are required. | 23075 | # Set to "yes" if exported symbols are required. |
11851 | always_export_symbols=$always_export_symbols | 23076 | always_export_symbols=$always_export_symbols |
11852 | 23077 | ||
11853 | @@ -15459,6 +16160,9 @@ include_expsyms=$lt_include_expsyms | 23078 | @@ -14851,6 +15562,9 @@ include_expsyms=$lt_include_expsyms |
11854 | # Commands necessary for linking programs (against libraries) with templates. | 23079 | # Commands necessary for linking programs (against libraries) with templates. |
11855 | prelink_cmds=$lt_prelink_cmds | 23080 | prelink_cmds=$lt_prelink_cmds |
11856 | 23081 | ||
@@ -11860,7 +23085,7 @@ index 6b294bfebfb..52a025bb848 100755 | |||
11860 | # Specify filename containing input files. | 23085 | # Specify filename containing input files. |
11861 | file_list_spec=$lt_file_list_spec | 23086 | file_list_spec=$lt_file_list_spec |
11862 | 23087 | ||
11863 | @@ -15491,210 +16195,169 @@ ltmain="$ac_aux_dir/ltmain.sh" | 23088 | @@ -14883,210 +15597,169 @@ ltmain="$ac_aux_dir/ltmain.sh" |
11864 | # if finds mixed CR/LF and LF-only lines. Since sed operates in | 23089 | # if finds mixed CR/LF and LF-only lines. Since sed operates in |
11865 | # text mode, it properly converts lines to CR/LF. This bash problem | 23090 | # text mode, it properly converts lines to CR/LF. This bash problem |
11866 | # is reportedly fixed, but why not run on old versions too? | 23091 | # is reportedly fixed, but why not run on old versions too? |
@@ -12235,7 +23460,7 @@ index 6b294bfebfb..52a025bb848 100755 | |||
12235 | chmod +x "$ofile" | 23460 | chmod +x "$ofile" |
12236 | 23461 | ||
12237 | diff --git a/libtool.m4 b/libtool.m4 | 23462 | diff --git a/libtool.m4 b/libtool.m4 |
12238 | index e993b621ac2..7715af647f4 100644 | 23463 | index e36fdd3c0e2..4acf9d67956 100644 |
12239 | --- a/libtool.m4 | 23464 | --- a/libtool.m4 |
12240 | +++ b/libtool.m4 | 23465 | +++ b/libtool.m4 |
12241 | @@ -1,7 +1,8 @@ | 23466 | @@ -1,7 +1,8 @@ |
@@ -12267,17 +23492,7 @@ index e993b621ac2..7715af647f4 100644 | |||
12267 | 23492 | ||
12268 | 23493 | ||
12269 | # LT_PREREQ(VERSION) | 23494 | # LT_PREREQ(VERSION) |
12270 | @@ -92,7 +94,8 @@ _LT_SET_OPTIONS([$0], [$1]) | 23495 | @@ -166,10 +168,13 @@ _LT_DECL([], [exeext], [0], [Executable file suffix (normally "")])dnl |
12271 | LIBTOOL_DEPS="$ltmain" | ||
12272 | |||
12273 | # Always use our own libtool. | ||
12274 | -LIBTOOL='$(SHELL) $(top_builddir)/libtool' | ||
12275 | +LIBTOOL='$(SHELL) $(top_builddir)' | ||
12276 | +LIBTOOL="$LIBTOOL/${host_alias}-libtool" | ||
12277 | AC_SUBST(LIBTOOL)dnl | ||
12278 | |||
12279 | _LT_SETUP | ||
12280 | @@ -166,10 +169,13 @@ _LT_DECL([], [exeext], [0], [Executable file suffix (normally "")])dnl | ||
12281 | dnl | 23496 | dnl |
12282 | m4_require([_LT_FILEUTILS_DEFAULTS])dnl | 23497 | m4_require([_LT_FILEUTILS_DEFAULTS])dnl |
12283 | m4_require([_LT_CHECK_SHELL_FEATURES])dnl | 23498 | m4_require([_LT_CHECK_SHELL_FEATURES])dnl |
@@ -12291,16 +23506,7 @@ index e993b621ac2..7715af647f4 100644 | |||
12291 | 23506 | ||
12292 | _LT_CONFIG_LIBTOOL_INIT([ | 23507 | _LT_CONFIG_LIBTOOL_INIT([ |
12293 | # See if we are running on zsh, and set the options which allow our | 23508 | # See if we are running on zsh, and set the options which allow our |
12294 | @@ -199,7 +205,7 @@ aix3*) | 23509 | @@ -632,7 +637,7 @@ m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])config.lt[]dnl |
12295 | esac | ||
12296 | |||
12297 | # Global variables: | ||
12298 | -ofile=libtool | ||
12299 | +ofile=${host_alias}-libtool | ||
12300 | can_build_shared=yes | ||
12301 | |||
12302 | # All known linkers require a `.a' archive for static linking (except MSVC, | ||
12303 | @@ -632,7 +638,7 @@ m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])config.lt[]dnl | ||
12304 | m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION]) | 23510 | m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION]) |
12305 | configured by $[0], generated by m4_PACKAGE_STRING. | 23511 | configured by $[0], generated by m4_PACKAGE_STRING. |
12306 | 23512 | ||
@@ -12309,7 +23515,7 @@ index e993b621ac2..7715af647f4 100644 | |||
12309 | This config.lt script is free software; the Free Software Foundation | 23515 | This config.lt script is free software; the Free Software Foundation |
12310 | gives unlimited permision to copy, distribute and modify it." | 23516 | gives unlimited permision to copy, distribute and modify it." |
12311 | 23517 | ||
12312 | @@ -746,15 +752,12 @@ _LT_EOF | 23518 | @@ -746,15 +751,12 @@ _LT_EOF |
12313 | # if finds mixed CR/LF and LF-only lines. Since sed operates in | 23519 | # if finds mixed CR/LF and LF-only lines. Since sed operates in |
12314 | # text mode, it properly converts lines to CR/LF. This bash problem | 23520 | # text mode, it properly converts lines to CR/LF. This bash problem |
12315 | # is reportedly fixed, but why not run on old versions too? | 23521 | # is reportedly fixed, but why not run on old versions too? |
@@ -12329,7 +23535,7 @@ index e993b621ac2..7715af647f4 100644 | |||
12329 | (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") | 23535 | (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") |
12330 | chmod +x "$ofile" | 23536 | chmod +x "$ofile" |
12331 | ], | 23537 | ], |
12332 | @@ -980,6 +983,8 @@ _LT_EOF | 23538 | @@ -980,6 +982,8 @@ _LT_EOF |
12333 | $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD | 23539 | $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD |
12334 | echo "$AR cru libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD | 23540 | echo "$AR cru libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD |
12335 | $AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD | 23541 | $AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD |
@@ -12338,7 +23544,7 @@ index e993b621ac2..7715af647f4 100644 | |||
12338 | cat > conftest.c << _LT_EOF | 23544 | cat > conftest.c << _LT_EOF |
12339 | int main() { return 0;} | 23545 | int main() { return 0;} |
12340 | _LT_EOF | 23546 | _LT_EOF |
12341 | @@ -1069,30 +1074,41 @@ m4_defun([_LT_DARWIN_LINKER_FEATURES], | 23547 | @@ -1071,30 +1075,41 @@ m4_defun([_LT_DARWIN_LINKER_FEATURES], |
12342 | fi | 23548 | fi |
12343 | ]) | 23549 | ]) |
12344 | 23550 | ||
@@ -12396,7 +23602,7 @@ index e993b621ac2..7715af647f4 100644 | |||
12396 | ])# _LT_SYS_MODULE_PATH_AIX | 23602 | ])# _LT_SYS_MODULE_PATH_AIX |
12397 | 23603 | ||
12398 | 23604 | ||
12399 | @@ -1117,7 +1133,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO | 23605 | @@ -1119,7 +1134,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO |
12400 | 23606 | ||
12401 | AC_MSG_CHECKING([how to print strings]) | 23607 | AC_MSG_CHECKING([how to print strings]) |
12402 | # Test print first, because it will be a builtin if present. | 23608 | # Test print first, because it will be a builtin if present. |
@@ -12405,7 +23611,7 @@ index e993b621ac2..7715af647f4 100644 | |||
12405 | test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then | 23611 | test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then |
12406 | ECHO='print -r --' | 23612 | ECHO='print -r --' |
12407 | elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then | 23613 | elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then |
12408 | @@ -1161,6 +1177,39 @@ _LT_DECL([], [ECHO], [1], [An echo program that protects backslashes]) | 23614 | @@ -1163,6 +1178,39 @@ _LT_DECL([], [ECHO], [1], [An echo program that protects backslashes]) |
12409 | ])# _LT_PROG_ECHO_BACKSLASH | 23615 | ])# _LT_PROG_ECHO_BACKSLASH |
12410 | 23616 | ||
12411 | 23617 | ||
@@ -12445,7 +23651,7 @@ index e993b621ac2..7715af647f4 100644 | |||
12445 | # _LT_ENABLE_LOCK | 23651 | # _LT_ENABLE_LOCK |
12446 | # --------------- | 23652 | # --------------- |
12447 | m4_defun([_LT_ENABLE_LOCK], | 23653 | m4_defun([_LT_ENABLE_LOCK], |
12448 | @@ -1320,14 +1369,47 @@ need_locks="$enable_libtool_lock" | 23654 | @@ -1322,6 +1370,51 @@ need_locks="$enable_libtool_lock" |
12449 | ])# _LT_ENABLE_LOCK | 23655 | ])# _LT_ENABLE_LOCK |
12450 | 23656 | ||
12451 | 23657 | ||
@@ -12453,6 +23659,14 @@ index e993b621ac2..7715af647f4 100644 | |||
12453 | +# ----------- | 23659 | +# ----------- |
12454 | +m4_defun([_LT_PROG_AR], | 23660 | +m4_defun([_LT_PROG_AR], |
12455 | +[AC_CHECK_TOOLS(AR, [ar], false) | 23661 | +[AC_CHECK_TOOLS(AR, [ar], false) |
23662 | + touch conftest.c | ||
23663 | + $AR $plugin_option rc conftest.a conftest.c | ||
23664 | + if test "$?" != 0; then | ||
23665 | + AC_MSG_WARN([Failed: $AR $plugin_option rc]) | ||
23666 | + else | ||
23667 | + AR="$AR $plugin_option" | ||
23668 | + fi | ||
23669 | + rm -f conftest.* | ||
12456 | +: ${AR=ar} | 23670 | +: ${AR=ar} |
12457 | +: ${AR_FLAGS=cru} | 23671 | +: ${AR_FLAGS=cru} |
12458 | +_LT_DECL([], [AR], [1], [The archiver]) | 23672 | +_LT_DECL([], [AR], [1], [The archiver]) |
@@ -12489,16 +23703,32 @@ index e993b621ac2..7715af647f4 100644 | |||
12489 | # _LT_CMD_OLD_ARCHIVE | 23703 | # _LT_CMD_OLD_ARCHIVE |
12490 | # ------------------- | 23704 | # ------------------- |
12491 | m4_defun([_LT_CMD_OLD_ARCHIVE], | 23705 | m4_defun([_LT_CMD_OLD_ARCHIVE], |
12492 | -[AC_CHECK_TOOL(AR, ar, false) | 23706 | @@ -1338,23 +1431,7 @@ for plugin in $plugin_names; do |
23707 | fi | ||
23708 | done | ||
23709 | |||
23710 | -AC_CHECK_TOOL(AR, ar, false) | ||
12493 | -test -z "$AR" && AR=ar | 23711 | -test -z "$AR" && AR=ar |
23712 | -if test -n "$plugin_option"; then | ||
23713 | - if $AR --help 2>&1 | grep -q "\--plugin"; then | ||
23714 | - touch conftest.c | ||
23715 | - $AR $plugin_option rc conftest.a conftest.c | ||
23716 | - if test "$?" != 0; then | ||
23717 | - AC_MSG_WARN([Failed: $AR $plugin_option rc]) | ||
23718 | - else | ||
23719 | - AR="$AR $plugin_option" | ||
23720 | - fi | ||
23721 | - rm -f conftest.* | ||
23722 | - fi | ||
23723 | -fi | ||
12494 | -test -z "$AR_FLAGS" && AR_FLAGS=cru | 23724 | -test -z "$AR_FLAGS" && AR_FLAGS=cru |
12495 | -_LT_DECL([], [AR], [1], [The archiver]) | 23725 | -_LT_DECL([], [AR], [1], [The archiver]) |
12496 | -_LT_DECL([], [AR_FLAGS], [1]) | 23726 | -_LT_DECL([], [AR_FLAGS], [1]) |
12497 | +[_LT_PROG_AR | 23727 | +_LT_PROG_AR |
12498 | 23728 | ||
12499 | AC_CHECK_TOOL(STRIP, strip, :) | 23729 | AC_CHECK_TOOL(STRIP, strip, :) |
12500 | test -z "$STRIP" && STRIP=: | 23730 | test -z "$STRIP" && STRIP=: |
12501 | @@ -1623,7 +1705,7 @@ else | 23731 | @@ -1655,7 +1732,7 @@ else |
12502 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 | 23732 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 |
12503 | lt_status=$lt_dlunknown | 23733 | lt_status=$lt_dlunknown |
12504 | cat > conftest.$ac_ext <<_LT_EOF | 23734 | cat > conftest.$ac_ext <<_LT_EOF |
@@ -12507,7 +23737,7 @@ index e993b621ac2..7715af647f4 100644 | |||
12507 | #include "confdefs.h" | 23737 | #include "confdefs.h" |
12508 | 23738 | ||
12509 | #if HAVE_DLFCN_H | 23739 | #if HAVE_DLFCN_H |
12510 | @@ -1667,10 +1749,10 @@ else | 23740 | @@ -1699,10 +1776,10 @@ else |
12511 | /* When -fvisbility=hidden is used, assume the code has been annotated | 23741 | /* When -fvisbility=hidden is used, assume the code has been annotated |
12512 | correspondingly for the symbols needed. */ | 23742 | correspondingly for the symbols needed. */ |
12513 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) | 23743 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) |
@@ -12520,7 +23750,7 @@ index e993b621ac2..7715af647f4 100644 | |||
12520 | int main () | 23750 | int main () |
12521 | { | 23751 | { |
12522 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); | 23752 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); |
12523 | @@ -2210,8 +2292,9 @@ cygwin* | mingw* | pw32* | cegcc*) | 23753 | @@ -2242,8 +2319,9 @@ cygwin* | mingw* | pw32* | cegcc*) |
12524 | need_version=no | 23754 | need_version=no |
12525 | need_lib_prefix=no | 23755 | need_lib_prefix=no |
12526 | 23756 | ||
@@ -12532,7 +23762,7 @@ index e993b621ac2..7715af647f4 100644 | |||
12532 | library_names_spec='$libname.dll.a' | 23762 | library_names_spec='$libname.dll.a' |
12533 | # DLL is installed to $(libdir)/../bin by postinstall_cmds | 23763 | # DLL is installed to $(libdir)/../bin by postinstall_cmds |
12534 | postinstall_cmds='base_file=`basename \${file}`~ | 23764 | postinstall_cmds='base_file=`basename \${file}`~ |
12535 | @@ -2244,13 +2327,71 @@ m4_if([$1], [],[ | 23765 | @@ -2276,13 +2354,71 @@ m4_if([$1], [],[ |
12536 | library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' | 23766 | library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' |
12537 | ;; | 23767 | ;; |
12538 | esac | 23768 | esac |
@@ -12605,16 +23835,7 @@ index e993b621ac2..7715af647f4 100644 | |||
12605 | # FIXME: first we should search . and the directory the executable is in | 23835 | # FIXME: first we should search . and the directory the executable is in |
12606 | shlibpath_var=PATH | 23836 | shlibpath_var=PATH |
12607 | ;; | 23837 | ;; |
12608 | @@ -2332,7 +2473,7 @@ haiku*) | 23838 | @@ -2996,6 +3132,11 @@ case $reload_flag in |
12609 | soname_spec='${libname}${release}${shared_ext}$major' | ||
12610 | shlibpath_var=LIBRARY_PATH | ||
12611 | shlibpath_overrides_runpath=yes | ||
12612 | - sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib' | ||
12613 | + sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' | ||
12614 | hardcode_into_libs=yes | ||
12615 | ;; | ||
12616 | |||
12617 | @@ -2940,6 +3081,11 @@ case $reload_flag in | ||
12618 | esac | 23839 | esac |
12619 | reload_cmds='$LD$reload_flag -o $output$reload_objs' | 23840 | reload_cmds='$LD$reload_flag -o $output$reload_objs' |
12620 | case $host_os in | 23841 | case $host_os in |
@@ -12626,7 +23847,7 @@ index e993b621ac2..7715af647f4 100644 | |||
12626 | darwin*) | 23847 | darwin*) |
12627 | if test "$GCC" = yes; then | 23848 | if test "$GCC" = yes; then |
12628 | reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' | 23849 | reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' |
12629 | @@ -3006,7 +3152,8 @@ mingw* | pw32*) | 23850 | @@ -3062,7 +3203,8 @@ mingw* | pw32*) |
12630 | lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' | 23851 | lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' |
12631 | lt_cv_file_magic_cmd='func_win32_libid' | 23852 | lt_cv_file_magic_cmd='func_win32_libid' |
12632 | else | 23853 | else |
@@ -12636,7 +23857,7 @@ index e993b621ac2..7715af647f4 100644 | |||
12636 | lt_cv_file_magic_cmd='$OBJDUMP -f' | 23857 | lt_cv_file_magic_cmd='$OBJDUMP -f' |
12637 | fi | 23858 | fi |
12638 | ;; | 23859 | ;; |
12639 | @@ -3157,6 +3304,21 @@ tpf*) | 23860 | @@ -3218,6 +3360,21 @@ vxworks*) |
12640 | ;; | 23861 | ;; |
12641 | esac | 23862 | esac |
12642 | ]) | 23863 | ]) |
@@ -12658,7 +23879,7 @@ index e993b621ac2..7715af647f4 100644 | |||
12658 | file_magic_cmd=$lt_cv_file_magic_cmd | 23879 | file_magic_cmd=$lt_cv_file_magic_cmd |
12659 | deplibs_check_method=$lt_cv_deplibs_check_method | 23880 | deplibs_check_method=$lt_cv_deplibs_check_method |
12660 | test -z "$deplibs_check_method" && deplibs_check_method=unknown | 23881 | test -z "$deplibs_check_method" && deplibs_check_method=unknown |
12661 | @@ -3164,7 +3326,11 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown | 23882 | @@ -3225,7 +3382,11 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown |
12662 | _LT_DECL([], [deplibs_check_method], [1], | 23883 | _LT_DECL([], [deplibs_check_method], [1], |
12663 | [Method to check whether dependent libraries are shared objects]) | 23884 | [Method to check whether dependent libraries are shared objects]) |
12664 | _LT_DECL([], [file_magic_cmd], [1], | 23885 | _LT_DECL([], [file_magic_cmd], [1], |
@@ -12671,7 +23892,7 @@ index e993b621ac2..7715af647f4 100644 | |||
12671 | ])# _LT_CHECK_MAGIC_METHOD | 23892 | ])# _LT_CHECK_MAGIC_METHOD |
12672 | 23893 | ||
12673 | 23894 | ||
12674 | @@ -3267,6 +3433,67 @@ dnl aclocal-1.4 backwards compatibility: | 23895 | @@ -3336,6 +3497,67 @@ dnl aclocal-1.4 backwards compatibility: |
12675 | dnl AC_DEFUN([AM_PROG_NM], []) | 23896 | dnl AC_DEFUN([AM_PROG_NM], []) |
12676 | dnl AC_DEFUN([AC_PROG_NM], []) | 23897 | dnl AC_DEFUN([AC_PROG_NM], []) |
12677 | 23898 | ||
@@ -12739,7 +23960,7 @@ index e993b621ac2..7715af647f4 100644 | |||
12739 | 23960 | ||
12740 | # LT_LIB_M | 23961 | # LT_LIB_M |
12741 | # -------- | 23962 | # -------- |
12742 | @@ -3393,8 +3620,8 @@ esac | 23963 | @@ -3462,8 +3684,8 @@ esac |
12743 | lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" | 23964 | lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" |
12744 | 23965 | ||
12745 | # Transform an extracted symbol line into symbol name and symbol address | 23966 | # Transform an extracted symbol line into symbol name and symbol address |
@@ -12750,7 +23971,7 @@ index e993b621ac2..7715af647f4 100644 | |||
12750 | 23971 | ||
12751 | # Handle CRLF in mingw tool chain | 23972 | # Handle CRLF in mingw tool chain |
12752 | opt_cr= | 23973 | opt_cr= |
12753 | @@ -3430,6 +3657,7 @@ for ac_symprfx in "" "_"; do | 23974 | @@ -3499,6 +3721,7 @@ for ac_symprfx in "" "_"; do |
12754 | else | 23975 | else |
12755 | lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" | 23976 | lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" |
12756 | fi | 23977 | fi |
@@ -12758,7 +23979,7 @@ index e993b621ac2..7715af647f4 100644 | |||
12758 | 23979 | ||
12759 | # Check to see that the pipe works correctly. | 23980 | # Check to see that the pipe works correctly. |
12760 | pipe_works=no | 23981 | pipe_works=no |
12761 | @@ -3463,6 +3691,18 @@ _LT_EOF | 23982 | @@ -3532,6 +3755,18 @@ _LT_EOF |
12762 | if $GREP ' nm_test_var$' "$nlist" >/dev/null; then | 23983 | if $GREP ' nm_test_var$' "$nlist" >/dev/null; then |
12763 | if $GREP ' nm_test_func$' "$nlist" >/dev/null; then | 23984 | if $GREP ' nm_test_func$' "$nlist" >/dev/null; then |
12764 | cat <<_LT_EOF > conftest.$ac_ext | 23985 | cat <<_LT_EOF > conftest.$ac_ext |
@@ -12777,7 +23998,7 @@ index e993b621ac2..7715af647f4 100644 | |||
12777 | #ifdef __cplusplus | 23998 | #ifdef __cplusplus |
12778 | extern "C" { | 23999 | extern "C" { |
12779 | #endif | 24000 | #endif |
12780 | @@ -3474,7 +3714,7 @@ _LT_EOF | 24001 | @@ -3543,7 +3778,7 @@ _LT_EOF |
12781 | cat <<_LT_EOF >> conftest.$ac_ext | 24002 | cat <<_LT_EOF >> conftest.$ac_ext |
12782 | 24003 | ||
12783 | /* The mapping between symbol names and symbols. */ | 24004 | /* The mapping between symbol names and symbols. */ |
@@ -12786,7 +24007,7 @@ index e993b621ac2..7715af647f4 100644 | |||
12786 | const char *name; | 24007 | const char *name; |
12787 | void *address; | 24008 | void *address; |
12788 | } | 24009 | } |
12789 | @@ -3500,15 +3740,15 @@ static const void *lt_preloaded_setup() { | 24010 | @@ -3569,15 +3804,15 @@ static const void *lt_preloaded_setup() { |
12790 | _LT_EOF | 24011 | _LT_EOF |
12791 | # Now try linking the two files. | 24012 | # Now try linking the two files. |
12792 | mv conftest.$ac_objext conftstm.$ac_objext | 24013 | mv conftest.$ac_objext conftstm.$ac_objext |
@@ -12806,7 +24027,7 @@ index e993b621ac2..7715af647f4 100644 | |||
12806 | else | 24027 | else |
12807 | echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD | 24028 | echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD |
12808 | fi | 24029 | fi |
12809 | @@ -3541,6 +3781,13 @@ else | 24030 | @@ -3610,6 +3845,13 @@ else |
12810 | AC_MSG_RESULT(ok) | 24031 | AC_MSG_RESULT(ok) |
12811 | fi | 24032 | fi |
12812 | 24033 | ||
@@ -12820,7 +24041,7 @@ index e993b621ac2..7715af647f4 100644 | |||
12820 | _LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1], | 24041 | _LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1], |
12821 | [Take the output of nm and produce a listing of raw symbols and C names]) | 24042 | [Take the output of nm and produce a listing of raw symbols and C names]) |
12822 | _LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1], | 24043 | _LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1], |
12823 | @@ -3551,6 +3798,8 @@ _LT_DECL([global_symbol_to_c_name_address], | 24044 | @@ -3620,6 +3862,8 @@ _LT_DECL([global_symbol_to_c_name_address], |
12824 | _LT_DECL([global_symbol_to_c_name_address_lib_prefix], | 24045 | _LT_DECL([global_symbol_to_c_name_address_lib_prefix], |
12825 | [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1], | 24046 | [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1], |
12826 | [Transform the output of nm in a C name address pair when lib prefix is needed]) | 24047 | [Transform the output of nm in a C name address pair when lib prefix is needed]) |
@@ -12829,7 +24050,7 @@ index e993b621ac2..7715af647f4 100644 | |||
12829 | ]) # _LT_CMD_GLOBAL_SYMBOLS | 24050 | ]) # _LT_CMD_GLOBAL_SYMBOLS |
12830 | 24051 | ||
12831 | 24052 | ||
12832 | @@ -3562,7 +3811,6 @@ _LT_TAGVAR(lt_prog_compiler_wl, $1)= | 24053 | @@ -3631,7 +3875,6 @@ _LT_TAGVAR(lt_prog_compiler_wl, $1)= |
12833 | _LT_TAGVAR(lt_prog_compiler_pic, $1)= | 24054 | _LT_TAGVAR(lt_prog_compiler_pic, $1)= |
12834 | _LT_TAGVAR(lt_prog_compiler_static, $1)= | 24055 | _LT_TAGVAR(lt_prog_compiler_static, $1)= |
12835 | 24056 | ||
@@ -12837,7 +24058,7 @@ index e993b621ac2..7715af647f4 100644 | |||
12837 | m4_if([$1], [CXX], [ | 24058 | m4_if([$1], [CXX], [ |
12838 | # C++ specific cases for pic, static, wl, etc. | 24059 | # C++ specific cases for pic, static, wl, etc. |
12839 | if test "$GXX" = yes; then | 24060 | if test "$GXX" = yes; then |
12840 | @@ -3668,6 +3916,12 @@ m4_if([$1], [CXX], [ | 24061 | @@ -3737,6 +3980,12 @@ m4_if([$1], [CXX], [ |
12841 | ;; | 24062 | ;; |
12842 | esac | 24063 | esac |
12843 | ;; | 24064 | ;; |
@@ -12850,7 +24071,7 @@ index e993b621ac2..7715af647f4 100644 | |||
12850 | dgux*) | 24071 | dgux*) |
12851 | case $cc_basename in | 24072 | case $cc_basename in |
12852 | ec++*) | 24073 | ec++*) |
12853 | @@ -3820,7 +4074,7 @@ m4_if([$1], [CXX], [ | 24074 | @@ -3889,7 +4138,7 @@ m4_if([$1], [CXX], [ |
12854 | ;; | 24075 | ;; |
12855 | solaris*) | 24076 | solaris*) |
12856 | case $cc_basename in | 24077 | case $cc_basename in |
@@ -12859,7 +24080,7 @@ index e993b621ac2..7715af647f4 100644 | |||
12859 | # Sun C++ 4.2, 5.x and Centerline C++ | 24080 | # Sun C++ 4.2, 5.x and Centerline C++ |
12860 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' | 24081 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' |
12861 | _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' | 24082 | _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' |
12862 | @@ -4043,6 +4297,12 @@ m4_if([$1], [CXX], [ | 24083 | @@ -4112,6 +4361,12 @@ m4_if([$1], [CXX], [ |
12863 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared' | 24084 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared' |
12864 | _LT_TAGVAR(lt_prog_compiler_static, $1)='--static' | 24085 | _LT_TAGVAR(lt_prog_compiler_static, $1)='--static' |
12865 | ;; | 24086 | ;; |
@@ -12872,7 +24093,7 @@ index e993b621ac2..7715af647f4 100644 | |||
12872 | pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) | 24093 | pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) |
12873 | # Portland Group compilers (*not* the Pentium gcc compiler, | 24094 | # Portland Group compilers (*not* the Pentium gcc compiler, |
12874 | # which looks to be a dead project) | 24095 | # which looks to be a dead project) |
12875 | @@ -4105,7 +4365,7 @@ m4_if([$1], [CXX], [ | 24096 | @@ -4174,7 +4429,7 @@ m4_if([$1], [CXX], [ |
12876 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' | 24097 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' |
12877 | _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' | 24098 | _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' |
12878 | case $cc_basename in | 24099 | case $cc_basename in |
@@ -12881,7 +24102,7 @@ index e993b621ac2..7715af647f4 100644 | |||
12881 | _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';; | 24102 | _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';; |
12882 | *) | 24103 | *) |
12883 | _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';; | 24104 | _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';; |
12884 | @@ -4162,9 +4422,11 @@ case $host_os in | 24105 | @@ -4231,9 +4486,11 @@ case $host_os in |
12885 | _LT_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])" | 24106 | _LT_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])" |
12886 | ;; | 24107 | ;; |
12887 | esac | 24108 | esac |
@@ -12896,7 +24117,7 @@ index e993b621ac2..7715af647f4 100644 | |||
12896 | 24117 | ||
12897 | # | 24118 | # |
12898 | # Check to make sure the PIC flag actually works. | 24119 | # Check to make sure the PIC flag actually works. |
12899 | @@ -4183,6 +4445,8 @@ fi | 24120 | @@ -4252,6 +4509,8 @@ fi |
12900 | _LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1], | 24121 | _LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1], |
12901 | [Additional compiler flags for building library objects]) | 24122 | [Additional compiler flags for building library objects]) |
12902 | 24123 | ||
@@ -12905,7 +24126,7 @@ index e993b621ac2..7715af647f4 100644 | |||
12905 | # | 24126 | # |
12906 | # Check to make sure the static flag actually works. | 24127 | # Check to make sure the static flag actually works. |
12907 | # | 24128 | # |
12908 | @@ -4203,6 +4467,7 @@ _LT_TAGDECL([link_static_flag], [lt_prog_compiler_static], [1], | 24129 | @@ -4272,6 +4531,7 @@ _LT_TAGDECL([link_static_flag], [lt_prog_compiler_static], [1], |
12909 | m4_defun([_LT_LINKER_SHLIBS], | 24130 | m4_defun([_LT_LINKER_SHLIBS], |
12910 | [AC_REQUIRE([LT_PATH_LD])dnl | 24131 | [AC_REQUIRE([LT_PATH_LD])dnl |
12911 | AC_REQUIRE([LT_PATH_NM])dnl | 24132 | AC_REQUIRE([LT_PATH_NM])dnl |
@@ -12913,7 +24134,7 @@ index e993b621ac2..7715af647f4 100644 | |||
12913 | m4_require([_LT_FILEUTILS_DEFAULTS])dnl | 24134 | m4_require([_LT_FILEUTILS_DEFAULTS])dnl |
12914 | m4_require([_LT_DECL_EGREP])dnl | 24135 | m4_require([_LT_DECL_EGREP])dnl |
12915 | m4_require([_LT_DECL_SED])dnl | 24136 | m4_require([_LT_DECL_SED])dnl |
12916 | @@ -4211,6 +4476,7 @@ m4_require([_LT_TAG_COMPILER])dnl | 24137 | @@ -4280,6 +4540,7 @@ m4_require([_LT_TAG_COMPILER])dnl |
12917 | AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) | 24138 | AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) |
12918 | m4_if([$1], [CXX], [ | 24139 | m4_if([$1], [CXX], [ |
12919 | _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' | 24140 | _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' |
@@ -12921,7 +24142,7 @@ index e993b621ac2..7715af647f4 100644 | |||
12921 | case $host_os in | 24142 | case $host_os in |
12922 | aix[[4-9]]*) | 24143 | aix[[4-9]]*) |
12923 | # If we're using GNU nm, then we don't want the "-C" option. | 24144 | # If we're using GNU nm, then we don't want the "-C" option. |
12924 | @@ -4225,15 +4491,20 @@ m4_if([$1], [CXX], [ | 24145 | @@ -4294,15 +4555,20 @@ m4_if([$1], [CXX], [ |
12925 | ;; | 24146 | ;; |
12926 | pw32*) | 24147 | pw32*) |
12927 | _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds" | 24148 | _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds" |
@@ -12947,7 +24168,7 @@ index e993b621ac2..7715af647f4 100644 | |||
12947 | ], [ | 24168 | ], [ |
12948 | runpath_var= | 24169 | runpath_var= |
12949 | _LT_TAGVAR(allow_undefined_flag, $1)= | 24170 | _LT_TAGVAR(allow_undefined_flag, $1)= |
12950 | @@ -4401,7 +4672,8 @@ _LT_EOF | 24171 | @@ -4470,7 +4736,8 @@ _LT_EOF |
12951 | _LT_TAGVAR(allow_undefined_flag, $1)=unsupported | 24172 | _LT_TAGVAR(allow_undefined_flag, $1)=unsupported |
12952 | _LT_TAGVAR(always_export_symbols, $1)=no | 24173 | _LT_TAGVAR(always_export_symbols, $1)=no |
12953 | _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes | 24174 | _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes |
@@ -12957,7 +24178,7 @@ index e993b621ac2..7715af647f4 100644 | |||
12957 | 24178 | ||
12958 | if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then | 24179 | if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then |
12959 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' | 24180 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' |
12960 | @@ -4500,12 +4772,12 @@ _LT_EOF | 24181 | @@ -4569,12 +4836,12 @@ _LT_EOF |
12961 | _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive' | 24182 | _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive' |
12962 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= | 24183 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= |
12963 | _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir' | 24184 | _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir' |
@@ -12972,7 +24193,7 @@ index e993b621ac2..7715af647f4 100644 | |||
12972 | fi | 24193 | fi |
12973 | ;; | 24194 | ;; |
12974 | esac | 24195 | esac |
12975 | @@ -4519,8 +4791,8 @@ _LT_EOF | 24196 | @@ -4588,8 +4855,8 @@ _LT_EOF |
12976 | _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' | 24197 | _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' |
12977 | wlarc= | 24198 | wlarc= |
12978 | else | 24199 | else |
@@ -12983,7 +24204,7 @@ index e993b621ac2..7715af647f4 100644 | |||
12983 | fi | 24204 | fi |
12984 | ;; | 24205 | ;; |
12985 | 24206 | ||
12986 | @@ -4538,8 +4810,8 @@ _LT_EOF | 24207 | @@ -4607,8 +4874,8 @@ _LT_EOF |
12987 | 24208 | ||
12988 | _LT_EOF | 24209 | _LT_EOF |
12989 | elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then | 24210 | elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then |
@@ -12994,7 +24215,7 @@ index e993b621ac2..7715af647f4 100644 | |||
12994 | else | 24215 | else |
12995 | _LT_TAGVAR(ld_shlibs, $1)=no | 24216 | _LT_TAGVAR(ld_shlibs, $1)=no |
12996 | fi | 24217 | fi |
12997 | @@ -4585,8 +4857,8 @@ _LT_EOF | 24218 | @@ -4654,8 +4921,8 @@ _LT_EOF |
12998 | 24219 | ||
12999 | *) | 24220 | *) |
13000 | if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then | 24221 | if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then |
@@ -13005,7 +24226,7 @@ index e993b621ac2..7715af647f4 100644 | |||
13005 | else | 24226 | else |
13006 | _LT_TAGVAR(ld_shlibs, $1)=no | 24227 | _LT_TAGVAR(ld_shlibs, $1)=no |
13007 | fi | 24228 | fi |
13008 | @@ -4716,7 +4988,7 @@ _LT_EOF | 24229 | @@ -4785,7 +5052,7 @@ _LT_EOF |
13009 | _LT_TAGVAR(allow_undefined_flag, $1)='-berok' | 24230 | _LT_TAGVAR(allow_undefined_flag, $1)='-berok' |
13010 | # Determine the default libpath from the value encoded in an | 24231 | # Determine the default libpath from the value encoded in an |
13011 | # empty executable. | 24232 | # empty executable. |
@@ -13014,7 +24235,7 @@ index e993b621ac2..7715af647f4 100644 | |||
13014 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" | 24235 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" |
13015 | _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" | 24236 | _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" |
13016 | else | 24237 | else |
13017 | @@ -4727,7 +4999,7 @@ _LT_EOF | 24238 | @@ -4796,7 +5063,7 @@ _LT_EOF |
13018 | else | 24239 | else |
13019 | # Determine the default libpath from the value encoded in an | 24240 | # Determine the default libpath from the value encoded in an |
13020 | # empty executable. | 24241 | # empty executable. |
@@ -13023,7 +24244,7 @@ index e993b621ac2..7715af647f4 100644 | |||
13023 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" | 24244 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" |
13024 | # Warning - without using the other run time loading flags, | 24245 | # Warning - without using the other run time loading flags, |
13025 | # -berok will link without error, but may produce a broken library. | 24246 | # -berok will link without error, but may produce a broken library. |
13026 | @@ -4771,20 +5043,63 @@ _LT_EOF | 24247 | @@ -4840,20 +5107,63 @@ _LT_EOF |
13027 | # Microsoft Visual C++. | 24248 | # Microsoft Visual C++. |
13028 | # hardcode_libdir_flag_spec is actually meaningless, as there is | 24249 | # hardcode_libdir_flag_spec is actually meaningless, as there is |
13029 | # no search path for DLLs. | 24250 | # no search path for DLLs. |
@@ -13101,7 +24322,7 @@ index e993b621ac2..7715af647f4 100644 | |||
13101 | ;; | 24322 | ;; |
13102 | 24323 | ||
13103 | darwin* | rhapsody*) | 24324 | darwin* | rhapsody*) |
13104 | @@ -4818,7 +5133,7 @@ _LT_EOF | 24325 | @@ -4887,7 +5197,7 @@ _LT_EOF |
13105 | 24326 | ||
13106 | # FreeBSD 3 and greater uses gcc -shared to do shared libraries. | 24327 | # FreeBSD 3 and greater uses gcc -shared to do shared libraries. |
13107 | freebsd* | dragonfly*) | 24328 | freebsd* | dragonfly*) |
@@ -13110,7 +24331,7 @@ index e993b621ac2..7715af647f4 100644 | |||
13110 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' | 24331 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' |
13111 | _LT_TAGVAR(hardcode_direct, $1)=yes | 24332 | _LT_TAGVAR(hardcode_direct, $1)=yes |
13112 | _LT_TAGVAR(hardcode_shlibpath_var, $1)=no | 24333 | _LT_TAGVAR(hardcode_shlibpath_var, $1)=no |
13113 | @@ -4826,7 +5141,7 @@ _LT_EOF | 24334 | @@ -4895,7 +5205,7 @@ _LT_EOF |
13114 | 24335 | ||
13115 | hpux9*) | 24336 | hpux9*) |
13116 | if test "$GCC" = yes; then | 24337 | if test "$GCC" = yes; then |
@@ -13119,7 +24340,7 @@ index e993b621ac2..7715af647f4 100644 | |||
13119 | else | 24340 | else |
13120 | _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' | 24341 | _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' |
13121 | fi | 24342 | fi |
13122 | @@ -4842,7 +5157,7 @@ _LT_EOF | 24343 | @@ -4911,7 +5221,7 @@ _LT_EOF |
13123 | 24344 | ||
13124 | hpux10*) | 24345 | hpux10*) |
13125 | if test "$GCC" = yes && test "$with_gnu_ld" = no; then | 24346 | if test "$GCC" = yes && test "$with_gnu_ld" = no; then |
@@ -13128,8 +24349,8 @@ index e993b621ac2..7715af647f4 100644 | |||
13128 | else | 24349 | else |
13129 | _LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' | 24350 | _LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' |
13130 | fi | 24351 | fi |
13131 | @@ -4866,10 +5181,10 @@ _LT_EOF | 24352 | @@ -4935,10 +5245,10 @@ _LT_EOF |
13132 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' | 24353 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' |
13133 | ;; | 24354 | ;; |
13134 | ia64*) | 24355 | ia64*) |
13135 | - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' | 24356 | - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' |
@@ -13141,7 +24362,7 @@ index e993b621ac2..7715af647f4 100644 | |||
13141 | ;; | 24362 | ;; |
13142 | esac | 24363 | esac |
13143 | else | 24364 | else |
13144 | @@ -4916,16 +5231,31 @@ _LT_EOF | 24365 | @@ -4985,16 +5295,31 @@ _LT_EOF |
13145 | 24366 | ||
13146 | irix5* | irix6* | nonstopux*) | 24367 | irix5* | irix6* | nonstopux*) |
13147 | if test "$GCC" = yes; then | 24368 | if test "$GCC" = yes; then |
@@ -13180,7 +24401,7 @@ index e993b621ac2..7715af647f4 100644 | |||
13180 | else | 24401 | else |
13181 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' | 24402 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' |
13182 | _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' | 24403 | _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' |
13183 | @@ -5010,7 +5340,7 @@ _LT_EOF | 24404 | @@ -5079,7 +5404,7 @@ _LT_EOF |
13184 | osf4* | osf5*) # as osf3* with the addition of -msym flag | 24405 | osf4* | osf5*) # as osf3* with the addition of -msym flag |
13185 | if test "$GCC" = yes; then | 24406 | if test "$GCC" = yes; then |
13186 | _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' | 24407 | _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' |
@@ -13189,7 +24410,7 @@ index e993b621ac2..7715af647f4 100644 | |||
13189 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' | 24410 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' |
13190 | else | 24411 | else |
13191 | _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' | 24412 | _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' |
13192 | @@ -5029,9 +5359,9 @@ _LT_EOF | 24413 | @@ -5098,9 +5423,9 @@ _LT_EOF |
13193 | _LT_TAGVAR(no_undefined_flag, $1)=' -z defs' | 24414 | _LT_TAGVAR(no_undefined_flag, $1)=' -z defs' |
13194 | if test "$GCC" = yes; then | 24415 | if test "$GCC" = yes; then |
13195 | wlarc='${wl}' | 24416 | wlarc='${wl}' |
@@ -13201,7 +24422,7 @@ index e993b621ac2..7715af647f4 100644 | |||
13201 | else | 24422 | else |
13202 | case `$CC -V 2>&1` in | 24423 | case `$CC -V 2>&1` in |
13203 | *"Compilers 5.0"*) | 24424 | *"Compilers 5.0"*) |
13204 | @@ -5303,8 +5633,6 @@ _LT_TAGDECL([], [inherit_rpath], [0], | 24425 | @@ -5372,8 +5697,6 @@ _LT_TAGDECL([], [inherit_rpath], [0], |
13205 | to runtime path list]) | 24426 | to runtime path list]) |
13206 | _LT_TAGDECL([], [link_all_deplibs], [0], | 24427 | _LT_TAGDECL([], [link_all_deplibs], [0], |
13207 | [Whether libtool must link a program against all its dependency libraries]) | 24428 | [Whether libtool must link a program against all its dependency libraries]) |
@@ -13210,7 +24431,7 @@ index e993b621ac2..7715af647f4 100644 | |||
13210 | _LT_TAGDECL([], [always_export_symbols], [0], | 24431 | _LT_TAGDECL([], [always_export_symbols], [0], |
13211 | [Set to "yes" if exported symbols are required]) | 24432 | [Set to "yes" if exported symbols are required]) |
13212 | _LT_TAGDECL([], [export_symbols_cmds], [2], | 24433 | _LT_TAGDECL([], [export_symbols_cmds], [2], |
13213 | @@ -5315,6 +5643,8 @@ _LT_TAGDECL([], [include_expsyms], [1], | 24434 | @@ -5384,6 +5707,8 @@ _LT_TAGDECL([], [include_expsyms], [1], |
13214 | [Symbols that must always be exported]) | 24435 | [Symbols that must always be exported]) |
13215 | _LT_TAGDECL([], [prelink_cmds], [2], | 24436 | _LT_TAGDECL([], [prelink_cmds], [2], |
13216 | [Commands necessary for linking programs (against libraries) with templates]) | 24437 | [Commands necessary for linking programs (against libraries) with templates]) |
@@ -13219,7 +24440,7 @@ index e993b621ac2..7715af647f4 100644 | |||
13219 | _LT_TAGDECL([], [file_list_spec], [1], | 24440 | _LT_TAGDECL([], [file_list_spec], [1], |
13220 | [Specify filename containing input files]) | 24441 | [Specify filename containing input files]) |
13221 | dnl FIXME: Not yet implemented | 24442 | dnl FIXME: Not yet implemented |
13222 | @@ -5416,6 +5746,7 @@ CC="$lt_save_CC" | 24443 | @@ -5485,6 +5810,7 @@ CC="$lt_save_CC" |
13223 | m4_defun([_LT_LANG_CXX_CONFIG], | 24444 | m4_defun([_LT_LANG_CXX_CONFIG], |
13224 | [m4_require([_LT_FILEUTILS_DEFAULTS])dnl | 24445 | [m4_require([_LT_FILEUTILS_DEFAULTS])dnl |
13225 | m4_require([_LT_DECL_EGREP])dnl | 24446 | m4_require([_LT_DECL_EGREP])dnl |
@@ -13227,7 +24448,7 @@ index e993b621ac2..7715af647f4 100644 | |||
13227 | if test -n "$CXX" && ( test "X$CXX" != "Xno" && | 24448 | if test -n "$CXX" && ( test "X$CXX" != "Xno" && |
13228 | ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || | 24449 | ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || |
13229 | (test "X$CXX" != "Xg++"))) ; then | 24450 | (test "X$CXX" != "Xg++"))) ; then |
13230 | @@ -5477,6 +5808,7 @@ if test "$_lt_caught_CXX_error" != yes; then | 24451 | @@ -5546,6 +5872,7 @@ if test "$_lt_caught_CXX_error" != yes; then |
13231 | 24452 | ||
13232 | # Allow CC to be a program name with arguments. | 24453 | # Allow CC to be a program name with arguments. |
13233 | lt_save_CC=$CC | 24454 | lt_save_CC=$CC |
@@ -13235,7 +24456,7 @@ index e993b621ac2..7715af647f4 100644 | |||
13235 | lt_save_LD=$LD | 24456 | lt_save_LD=$LD |
13236 | lt_save_GCC=$GCC | 24457 | lt_save_GCC=$GCC |
13237 | GCC=$GXX | 24458 | GCC=$GXX |
13238 | @@ -5494,6 +5826,7 @@ if test "$_lt_caught_CXX_error" != yes; then | 24459 | @@ -5563,6 +5890,7 @@ if test "$_lt_caught_CXX_error" != yes; then |
13239 | fi | 24460 | fi |
13240 | test -z "${LDCXX+set}" || LD=$LDCXX | 24461 | test -z "${LDCXX+set}" || LD=$LDCXX |
13241 | CC=${CXX-"c++"} | 24462 | CC=${CXX-"c++"} |
@@ -13243,7 +24464,7 @@ index e993b621ac2..7715af647f4 100644 | |||
13243 | compiler=$CC | 24464 | compiler=$CC |
13244 | _LT_TAGVAR(compiler, $1)=$CC | 24465 | _LT_TAGVAR(compiler, $1)=$CC |
13245 | _LT_CC_BASENAME([$compiler]) | 24466 | _LT_CC_BASENAME([$compiler]) |
13246 | @@ -5657,7 +5990,7 @@ if test "$_lt_caught_CXX_error" != yes; then | 24467 | @@ -5726,7 +6054,7 @@ if test "$_lt_caught_CXX_error" != yes; then |
13247 | _LT_TAGVAR(allow_undefined_flag, $1)='-berok' | 24468 | _LT_TAGVAR(allow_undefined_flag, $1)='-berok' |
13248 | # Determine the default libpath from the value encoded in an empty | 24469 | # Determine the default libpath from the value encoded in an empty |
13249 | # executable. | 24470 | # executable. |
@@ -13252,7 +24473,7 @@ index e993b621ac2..7715af647f4 100644 | |||
13252 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" | 24473 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" |
13253 | 24474 | ||
13254 | _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" | 24475 | _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" |
13255 | @@ -5669,7 +6002,7 @@ if test "$_lt_caught_CXX_error" != yes; then | 24476 | @@ -5738,7 +6066,7 @@ if test "$_lt_caught_CXX_error" != yes; then |
13256 | else | 24477 | else |
13257 | # Determine the default libpath from the value encoded in an | 24478 | # Determine the default libpath from the value encoded in an |
13258 | # empty executable. | 24479 | # empty executable. |
@@ -13261,7 +24482,7 @@ index e993b621ac2..7715af647f4 100644 | |||
13261 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" | 24482 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" |
13262 | # Warning - without using the other run time loading flags, | 24483 | # Warning - without using the other run time loading flags, |
13263 | # -berok will link without error, but may produce a broken library. | 24484 | # -berok will link without error, but may produce a broken library. |
13264 | @@ -5711,29 +6044,75 @@ if test "$_lt_caught_CXX_error" != yes; then | 24485 | @@ -5780,29 +6108,75 @@ if test "$_lt_caught_CXX_error" != yes; then |
13265 | ;; | 24486 | ;; |
13266 | 24487 | ||
13267 | cygwin* | mingw* | pw32* | cegcc*) | 24488 | cygwin* | mingw* | pw32* | cegcc*) |
@@ -13360,7 +24581,7 @@ index e993b621ac2..7715af647f4 100644 | |||
13360 | darwin* | rhapsody*) | 24581 | darwin* | rhapsody*) |
13361 | _LT_DARWIN_LINKER_FEATURES($1) | 24582 | _LT_DARWIN_LINKER_FEATURES($1) |
13362 | ;; | 24583 | ;; |
13363 | @@ -5808,7 +6187,7 @@ if test "$_lt_caught_CXX_error" != yes; then | 24584 | @@ -5877,7 +6251,7 @@ if test "$_lt_caught_CXX_error" != yes; then |
13364 | ;; | 24585 | ;; |
13365 | *) | 24586 | *) |
13366 | if test "$GXX" = yes; then | 24587 | if test "$GXX" = yes; then |
@@ -13369,8 +24590,8 @@ index e993b621ac2..7715af647f4 100644 | |||
13369 | else | 24590 | else |
13370 | # FIXME: insert proper C++ library support | 24591 | # FIXME: insert proper C++ library support |
13371 | _LT_TAGVAR(ld_shlibs, $1)=no | 24592 | _LT_TAGVAR(ld_shlibs, $1)=no |
13372 | @@ -5879,10 +6258,10 @@ if test "$_lt_caught_CXX_error" != yes; then | 24593 | @@ -5948,10 +6322,10 @@ if test "$_lt_caught_CXX_error" != yes; then |
13373 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' | 24594 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' |
13374 | ;; | 24595 | ;; |
13375 | ia64*) | 24596 | ia64*) |
13376 | - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' | 24597 | - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' |
@@ -13382,7 +24603,7 @@ index e993b621ac2..7715af647f4 100644 | |||
13382 | ;; | 24603 | ;; |
13383 | esac | 24604 | esac |
13384 | fi | 24605 | fi |
13385 | @@ -5923,9 +6302,9 @@ if test "$_lt_caught_CXX_error" != yes; then | 24606 | @@ -5992,9 +6366,9 @@ if test "$_lt_caught_CXX_error" != yes; then |
13386 | *) | 24607 | *) |
13387 | if test "$GXX" = yes; then | 24608 | if test "$GXX" = yes; then |
13388 | if test "$with_gnu_ld" = no; then | 24609 | if test "$with_gnu_ld" = no; then |
@@ -13394,32 +24615,7 @@ index e993b621ac2..7715af647f4 100644 | |||
13394 | fi | 24615 | fi |
13395 | fi | 24616 | fi |
13396 | _LT_TAGVAR(link_all_deplibs, $1)=yes | 24617 | _LT_TAGVAR(link_all_deplibs, $1)=yes |
13397 | @@ -5995,20 +6374,20 @@ if test "$_lt_caught_CXX_error" != yes; then | 24618 | @@ -6272,7 +6646,7 @@ if test "$_lt_caught_CXX_error" != yes; then |
13398 | _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~ | ||
13399 | rm -rf $tpldir~ | ||
13400 | $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ | ||
13401 | - compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"' | ||
13402 | + compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"' | ||
13403 | _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~ | ||
13404 | rm -rf $tpldir~ | ||
13405 | $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~ | ||
13406 | - $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~ | ||
13407 | + $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~ | ||
13408 | $RANLIB $oldlib' | ||
13409 | _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~ | ||
13410 | rm -rf $tpldir~ | ||
13411 | $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ | ||
13412 | - $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' | ||
13413 | + $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' | ||
13414 | _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~ | ||
13415 | rm -rf $tpldir~ | ||
13416 | $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ | ||
13417 | - $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' | ||
13418 | + $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' | ||
13419 | ;; | ||
13420 | *) # Version 6 and above use weak symbols | ||
13421 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' | ||
13422 | @@ -6203,7 +6582,7 @@ if test "$_lt_caught_CXX_error" != yes; then | ||
13423 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' | 24619 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' |
13424 | ;; | 24620 | ;; |
13425 | *) | 24621 | *) |
@@ -13428,7 +24624,7 @@ index e993b621ac2..7715af647f4 100644 | |||
13428 | ;; | 24624 | ;; |
13429 | esac | 24625 | esac |
13430 | 24626 | ||
13431 | @@ -6249,7 +6628,7 @@ if test "$_lt_caught_CXX_error" != yes; then | 24627 | @@ -6318,7 +6692,7 @@ if test "$_lt_caught_CXX_error" != yes; then |
13432 | 24628 | ||
13433 | solaris*) | 24629 | solaris*) |
13434 | case $cc_basename in | 24630 | case $cc_basename in |
@@ -13437,7 +24633,7 @@ index e993b621ac2..7715af647f4 100644 | |||
13437 | # Sun C++ 4.2, 5.x and Centerline C++ | 24633 | # Sun C++ 4.2, 5.x and Centerline C++ |
13438 | _LT_TAGVAR(archive_cmds_need_lc,$1)=yes | 24634 | _LT_TAGVAR(archive_cmds_need_lc,$1)=yes |
13439 | _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs' | 24635 | _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs' |
13440 | @@ -6290,9 +6669,9 @@ if test "$_lt_caught_CXX_error" != yes; then | 24636 | @@ -6359,9 +6733,9 @@ if test "$_lt_caught_CXX_error" != yes; then |
13441 | if test "$GXX" = yes && test "$with_gnu_ld" = no; then | 24637 | if test "$GXX" = yes && test "$with_gnu_ld" = no; then |
13442 | _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs' | 24638 | _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs' |
13443 | if $CC --version | $GREP -v '^2\.7' > /dev/null; then | 24639 | if $CC --version | $GREP -v '^2\.7' > /dev/null; then |
@@ -13449,7 +24645,7 @@ index e993b621ac2..7715af647f4 100644 | |||
13449 | 24645 | ||
13450 | # Commands to make compiler produce verbose output that lists | 24646 | # Commands to make compiler produce verbose output that lists |
13451 | # what "hidden" libraries, object files and flags are used when | 24647 | # what "hidden" libraries, object files and flags are used when |
13452 | @@ -6421,6 +6800,7 @@ if test "$_lt_caught_CXX_error" != yes; then | 24648 | @@ -6491,6 +6865,7 @@ if test "$_lt_caught_CXX_error" != yes; then |
13453 | fi # test -n "$compiler" | 24649 | fi # test -n "$compiler" |
13454 | 24650 | ||
13455 | CC=$lt_save_CC | 24651 | CC=$lt_save_CC |
@@ -13457,7 +24653,7 @@ index e993b621ac2..7715af647f4 100644 | |||
13457 | LDCXX=$LD | 24653 | LDCXX=$LD |
13458 | LD=$lt_save_LD | 24654 | LD=$lt_save_LD |
13459 | GCC=$lt_save_GCC | 24655 | GCC=$lt_save_GCC |
13460 | @@ -6435,6 +6815,29 @@ AC_LANG_POP | 24656 | @@ -6505,6 +6880,29 @@ AC_LANG_POP |
13461 | ])# _LT_LANG_CXX_CONFIG | 24657 | ])# _LT_LANG_CXX_CONFIG |
13462 | 24658 | ||
13463 | 24659 | ||
@@ -13487,7 +24683,7 @@ index e993b621ac2..7715af647f4 100644 | |||
13487 | # _LT_SYS_HIDDEN_LIBDEPS([TAGNAME]) | 24683 | # _LT_SYS_HIDDEN_LIBDEPS([TAGNAME]) |
13488 | # --------------------------------- | 24684 | # --------------------------------- |
13489 | # Figure out "hidden" library dependencies from verbose | 24685 | # Figure out "hidden" library dependencies from verbose |
13490 | @@ -6443,6 +6846,7 @@ AC_LANG_POP | 24686 | @@ -6513,6 +6911,7 @@ AC_LANG_POP |
13491 | # objects, libraries and library flags. | 24687 | # objects, libraries and library flags. |
13492 | m4_defun([_LT_SYS_HIDDEN_LIBDEPS], | 24688 | m4_defun([_LT_SYS_HIDDEN_LIBDEPS], |
13493 | [m4_require([_LT_FILEUTILS_DEFAULTS])dnl | 24689 | [m4_require([_LT_FILEUTILS_DEFAULTS])dnl |
@@ -13495,7 +24691,7 @@ index e993b621ac2..7715af647f4 100644 | |||
13495 | # Dependencies to place before and after the object being linked: | 24691 | # Dependencies to place before and after the object being linked: |
13496 | _LT_TAGVAR(predep_objects, $1)= | 24692 | _LT_TAGVAR(predep_objects, $1)= |
13497 | _LT_TAGVAR(postdep_objects, $1)= | 24693 | _LT_TAGVAR(postdep_objects, $1)= |
13498 | @@ -6493,6 +6897,13 @@ public class foo { | 24694 | @@ -6563,6 +6962,13 @@ public class foo { |
13499 | }; | 24695 | }; |
13500 | _LT_EOF | 24696 | _LT_EOF |
13501 | ]) | 24697 | ]) |
@@ -13509,7 +24705,7 @@ index e993b621ac2..7715af647f4 100644 | |||
13509 | dnl Parse the compiler output and extract the necessary | 24705 | dnl Parse the compiler output and extract the necessary |
13510 | dnl objects, libraries and library flags. | 24706 | dnl objects, libraries and library flags. |
13511 | if AC_TRY_EVAL(ac_compile); then | 24707 | if AC_TRY_EVAL(ac_compile); then |
13512 | @@ -6504,7 +6915,7 @@ if AC_TRY_EVAL(ac_compile); then | 24708 | @@ -6574,7 +6980,7 @@ if AC_TRY_EVAL(ac_compile); then |
13513 | pre_test_object_deps_done=no | 24709 | pre_test_object_deps_done=no |
13514 | 24710 | ||
13515 | for p in `eval "$output_verbose_link_cmd"`; do | 24711 | for p in `eval "$output_verbose_link_cmd"`; do |
@@ -13518,7 +24714,7 @@ index e993b621ac2..7715af647f4 100644 | |||
13518 | 24714 | ||
13519 | -L* | -R* | -l*) | 24715 | -L* | -R* | -l*) |
13520 | # Some compilers place space between "-{L,R}" and the path. | 24716 | # Some compilers place space between "-{L,R}" and the path. |
13521 | @@ -6513,13 +6924,22 @@ if AC_TRY_EVAL(ac_compile); then | 24717 | @@ -6583,13 +6989,22 @@ if AC_TRY_EVAL(ac_compile); then |
13522 | test $p = "-R"; then | 24718 | test $p = "-R"; then |
13523 | prev=$p | 24719 | prev=$p |
13524 | continue | 24720 | continue |
@@ -13545,7 +24741,7 @@ index e993b621ac2..7715af647f4 100644 | |||
13545 | # Internal compiler library paths should come after those | 24741 | # Internal compiler library paths should come after those |
13546 | # provided the user. The postdeps already come after the | 24742 | # provided the user. The postdeps already come after the |
13547 | # user supplied libs so there is no need to process them. | 24743 | # user supplied libs so there is no need to process them. |
13548 | @@ -6539,8 +6959,10 @@ if AC_TRY_EVAL(ac_compile); then | 24744 | @@ -6609,8 +7024,10 @@ if AC_TRY_EVAL(ac_compile); then |
13549 | _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}" | 24745 | _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}" |
13550 | fi | 24746 | fi |
13551 | fi | 24747 | fi |
@@ -13556,7 +24752,7 @@ index e993b621ac2..7715af647f4 100644 | |||
13556 | *.$objext) | 24752 | *.$objext) |
13557 | # This assumes that the test object file only shows up | 24753 | # This assumes that the test object file only shows up |
13558 | # once in the compiler output. | 24754 | # once in the compiler output. |
13559 | @@ -6576,6 +6998,7 @@ else | 24755 | @@ -6646,6 +7063,7 @@ else |
13560 | fi | 24756 | fi |
13561 | 24757 | ||
13562 | $RM -f confest.$objext | 24758 | $RM -f confest.$objext |
@@ -13564,7 +24760,7 @@ index e993b621ac2..7715af647f4 100644 | |||
13564 | 24760 | ||
13565 | # PORTME: override above test on systems where it is broken | 24761 | # PORTME: override above test on systems where it is broken |
13566 | m4_if([$1], [CXX], | 24762 | m4_if([$1], [CXX], |
13567 | @@ -6612,7 +7035,7 @@ linux*) | 24763 | @@ -6682,7 +7100,7 @@ linux*) |
13568 | 24764 | ||
13569 | solaris*) | 24765 | solaris*) |
13570 | case $cc_basename in | 24766 | case $cc_basename in |
@@ -13573,7 +24769,7 @@ index e993b621ac2..7715af647f4 100644 | |||
13573 | # The more standards-conforming stlport4 library is | 24769 | # The more standards-conforming stlport4 library is |
13574 | # incompatible with the Cstd library. Avoid specifying | 24770 | # incompatible with the Cstd library. Avoid specifying |
13575 | # it if it's in CXXFLAGS. Ignore libCrun as | 24771 | # it if it's in CXXFLAGS. Ignore libCrun as |
13576 | @@ -6725,7 +7148,9 @@ if test "$_lt_disable_F77" != yes; then | 24772 | @@ -6795,7 +7213,9 @@ if test "$_lt_disable_F77" != yes; then |
13577 | # Allow CC to be a program name with arguments. | 24773 | # Allow CC to be a program name with arguments. |
13578 | lt_save_CC="$CC" | 24774 | lt_save_CC="$CC" |
13579 | lt_save_GCC=$GCC | 24775 | lt_save_GCC=$GCC |
@@ -13583,7 +24779,7 @@ index e993b621ac2..7715af647f4 100644 | |||
13583 | compiler=$CC | 24779 | compiler=$CC |
13584 | _LT_TAGVAR(compiler, $1)=$CC | 24780 | _LT_TAGVAR(compiler, $1)=$CC |
13585 | _LT_CC_BASENAME([$compiler]) | 24781 | _LT_CC_BASENAME([$compiler]) |
13586 | @@ -6779,6 +7204,7 @@ if test "$_lt_disable_F77" != yes; then | 24782 | @@ -6849,6 +7269,7 @@ if test "$_lt_disable_F77" != yes; then |
13587 | 24783 | ||
13588 | GCC=$lt_save_GCC | 24784 | GCC=$lt_save_GCC |
13589 | CC="$lt_save_CC" | 24785 | CC="$lt_save_CC" |
@@ -13591,7 +24787,7 @@ index e993b621ac2..7715af647f4 100644 | |||
13591 | fi # test "$_lt_disable_F77" != yes | 24787 | fi # test "$_lt_disable_F77" != yes |
13592 | 24788 | ||
13593 | AC_LANG_POP | 24789 | AC_LANG_POP |
13594 | @@ -6855,7 +7281,9 @@ if test "$_lt_disable_FC" != yes; then | 24790 | @@ -6925,7 +7346,9 @@ if test "$_lt_disable_FC" != yes; then |
13595 | # Allow CC to be a program name with arguments. | 24791 | # Allow CC to be a program name with arguments. |
13596 | lt_save_CC="$CC" | 24792 | lt_save_CC="$CC" |
13597 | lt_save_GCC=$GCC | 24793 | lt_save_GCC=$GCC |
@@ -13601,7 +24797,7 @@ index e993b621ac2..7715af647f4 100644 | |||
13601 | compiler=$CC | 24797 | compiler=$CC |
13602 | GCC=$ac_cv_fc_compiler_gnu | 24798 | GCC=$ac_cv_fc_compiler_gnu |
13603 | 24799 | ||
13604 | @@ -6911,7 +7339,8 @@ if test "$_lt_disable_FC" != yes; then | 24800 | @@ -6981,7 +7404,8 @@ if test "$_lt_disable_FC" != yes; then |
13605 | fi # test -n "$compiler" | 24801 | fi # test -n "$compiler" |
13606 | 24802 | ||
13607 | GCC=$lt_save_GCC | 24803 | GCC=$lt_save_GCC |
@@ -13611,7 +24807,7 @@ index e993b621ac2..7715af647f4 100644 | |||
13611 | fi # test "$_lt_disable_FC" != yes | 24807 | fi # test "$_lt_disable_FC" != yes |
13612 | 24808 | ||
13613 | AC_LANG_POP | 24809 | AC_LANG_POP |
13614 | @@ -6948,10 +7377,12 @@ _LT_COMPILER_BOILERPLATE | 24810 | @@ -7018,10 +7442,12 @@ _LT_COMPILER_BOILERPLATE |
13615 | _LT_LINKER_BOILERPLATE | 24811 | _LT_LINKER_BOILERPLATE |
13616 | 24812 | ||
13617 | # Allow CC to be a program name with arguments. | 24813 | # Allow CC to be a program name with arguments. |
@@ -13625,7 +24821,7 @@ index e993b621ac2..7715af647f4 100644 | |||
13625 | compiler=$CC | 24821 | compiler=$CC |
13626 | _LT_TAGVAR(compiler, $1)=$CC | 24822 | _LT_TAGVAR(compiler, $1)=$CC |
13627 | _LT_TAGVAR(LD, $1)="$LD" | 24823 | _LT_TAGVAR(LD, $1)="$LD" |
13628 | @@ -6982,7 +7413,8 @@ fi | 24824 | @@ -7052,7 +7478,8 @@ fi |
13629 | AC_LANG_RESTORE | 24825 | AC_LANG_RESTORE |
13630 | 24826 | ||
13631 | GCC=$lt_save_GCC | 24827 | GCC=$lt_save_GCC |
@@ -13635,7 +24831,7 @@ index e993b621ac2..7715af647f4 100644 | |||
13635 | ])# _LT_LANG_GCJ_CONFIG | 24831 | ])# _LT_LANG_GCJ_CONFIG |
13636 | 24832 | ||
13637 | 24833 | ||
13638 | @@ -7017,9 +7449,11 @@ _LT_LINKER_BOILERPLATE | 24834 | @@ -7087,9 +7514,11 @@ _LT_LINKER_BOILERPLATE |
13639 | 24835 | ||
13640 | # Allow CC to be a program name with arguments. | 24836 | # Allow CC to be a program name with arguments. |
13641 | lt_save_CC="$CC" | 24837 | lt_save_CC="$CC" |
@@ -13647,7 +24843,7 @@ index e993b621ac2..7715af647f4 100644 | |||
13647 | compiler=$CC | 24843 | compiler=$CC |
13648 | _LT_TAGVAR(compiler, $1)=$CC | 24844 | _LT_TAGVAR(compiler, $1)=$CC |
13649 | _LT_CC_BASENAME([$compiler]) | 24845 | _LT_CC_BASENAME([$compiler]) |
13650 | @@ -7032,7 +7466,8 @@ fi | 24846 | @@ -7102,7 +7531,8 @@ fi |
13651 | 24847 | ||
13652 | GCC=$lt_save_GCC | 24848 | GCC=$lt_save_GCC |
13653 | AC_LANG_RESTORE | 24849 | AC_LANG_RESTORE |
@@ -13657,7 +24853,7 @@ index e993b621ac2..7715af647f4 100644 | |||
13657 | ])# _LT_LANG_RC_CONFIG | 24853 | ])# _LT_LANG_RC_CONFIG |
13658 | 24854 | ||
13659 | 24855 | ||
13660 | @@ -7091,6 +7526,15 @@ _LT_DECL([], [OBJDUMP], [1], [An object symbol dumper]) | 24856 | @@ -7161,6 +7591,15 @@ _LT_DECL([], [OBJDUMP], [1], [An object symbol dumper]) |
13661 | AC_SUBST([OBJDUMP]) | 24857 | AC_SUBST([OBJDUMP]) |
13662 | ]) | 24858 | ]) |
13663 | 24859 | ||
@@ -13673,7 +24869,7 @@ index e993b621ac2..7715af647f4 100644 | |||
13673 | 24869 | ||
13674 | # _LT_DECL_SED | 24870 | # _LT_DECL_SED |
13675 | # ------------ | 24871 | # ------------ |
13676 | @@ -7184,8 +7628,8 @@ m4_defun([_LT_CHECK_SHELL_FEATURES], | 24872 | @@ -7254,8 +7693,8 @@ m4_defun([_LT_CHECK_SHELL_FEATURES], |
13677 | # Try some XSI features | 24873 | # Try some XSI features |
13678 | xsi_shell=no | 24874 | xsi_shell=no |
13679 | ( _lt_dummy="a/b/c" | 24875 | ( _lt_dummy="a/b/c" |
@@ -13684,7 +24880,7 @@ index e993b621ac2..7715af647f4 100644 | |||
13684 | && eval 'test $(( 1 + 1 )) -eq 2 \ | 24880 | && eval 'test $(( 1 + 1 )) -eq 2 \ |
13685 | && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ | 24881 | && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ |
13686 | && xsi_shell=yes | 24882 | && xsi_shell=yes |
13687 | @@ -7224,206 +7668,162 @@ _LT_DECL([NL2SP], [lt_NL2SP], [1], [turn newlines into spaces])dnl | 24883 | @@ -7294,206 +7733,162 @@ _LT_DECL([NL2SP], [lt_NL2SP], [1], [turn newlines into spaces])dnl |
13688 | ])# _LT_CHECK_SHELL_FEATURES | 24884 | ])# _LT_CHECK_SHELL_FEATURES |
13689 | 24885 | ||
13690 | 24886 | ||
@@ -14034,7 +25230,7 @@ index e993b621ac2..7715af647f4 100644 | |||
14034 | + [0], [convert $build files to toolchain format])dnl | 25230 | + [0], [convert $build files to toolchain format])dnl |
14035 | +])# _LT_PATH_CONVERSION_FUNCTIONS | 25231 | +])# _LT_PATH_CONVERSION_FUNCTIONS |
14036 | diff --git a/ltmain.sh b/ltmain.sh | 25232 | diff --git a/ltmain.sh b/ltmain.sh |
14037 | index 9503ec85d70..70e856e0659 100644 | 25233 | index 70990740b6c..7f7104ffc82 100644 |
14038 | --- a/ltmain.sh | 25234 | --- a/ltmain.sh |
14039 | +++ b/ltmain.sh | 25235 | +++ b/ltmain.sh |
14040 | @@ -1,10 +1,9 @@ | 25236 | @@ -1,10 +1,9 @@ |
@@ -16211,24 +27407,6 @@ index 9503ec85d70..70e856e0659 100644 | |||
16211 | 27407 | ||
16212 | 27408 | ||
16213 | # func_extract_an_archive dir oldlib | 27409 | # func_extract_an_archive dir oldlib |
16214 | @@ -2917,7 +3801,7 @@ func_extract_archives () | ||
16215 | darwin_file= | ||
16216 | darwin_files= | ||
16217 | for darwin_file in $darwin_filelist; do | ||
16218 | - darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP` | ||
16219 | + darwin_files=`find unfat-$$ -name $darwin_file -print | sort | $NL2SP` | ||
16220 | $LIPO -create -output "$darwin_file" $darwin_files | ||
16221 | done # $darwin_filelist | ||
16222 | $RM -rf unfat-$$ | ||
16223 | @@ -2932,7 +3816,7 @@ func_extract_archives () | ||
16224 | func_extract_an_archive "$my_xdir" "$my_xabs" | ||
16225 | ;; | ||
16226 | esac | ||
16227 | - my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP` | ||
16228 | + my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | sort | $NL2SP` | ||
16229 | done | ||
16230 | |||
16231 | func_extract_archives_result="$my_oldobjs" | ||
16232 | @@ -3014,7 +3898,110 @@ func_fallback_echo () | 27410 | @@ -3014,7 +3898,110 @@ func_fallback_echo () |
16233 | _LTECHO_EOF' | 27411 | _LTECHO_EOF' |
16234 | } | 27412 | } |
@@ -19317,11 +30495,39 @@ index bf92b5e0790..c573da90c5c 100644 | |||
19317 | 30495 | ||
19318 | # These exist entirely to fool aclocal when bootstrapping libtool. | 30496 | # These exist entirely to fool aclocal when bootstrapping libtool. |
19319 | # | 30497 | # |
30498 | diff --git a/opcodes/Makefile.in b/opcodes/Makefile.in | ||
30499 | index 245479140c9..bfed90449bf 100644 | ||
30500 | --- a/opcodes/Makefile.in | ||
30501 | +++ b/opcodes/Makefile.in | ||
30502 | @@ -298,6 +298,7 @@ CYGPATH_W = @CYGPATH_W@ | ||
30503 | DATADIRNAME = @DATADIRNAME@ | ||
30504 | DEFS = @DEFS@ | ||
30505 | DEPDIR = @DEPDIR@ | ||
30506 | +DLLTOOL = @DLLTOOL@ | ||
30507 | DSYMUTIL = @DSYMUTIL@ | ||
30508 | DUMPBIN = @DUMPBIN@ | ||
30509 | ECHO_C = @ECHO_C@ | ||
30510 | @@ -336,6 +337,7 @@ LTLIBINTL = @LTLIBINTL@ | ||
30511 | LTLIBOBJS = @LTLIBOBJS@ | ||
30512 | MAINT = @MAINT@ | ||
30513 | MAKEINFO = @MAKEINFO@ | ||
30514 | +MANIFEST_TOOL = @MANIFEST_TOOL@ | ||
30515 | MKDIR_P = @MKDIR_P@ | ||
30516 | MKINSTALLDIRS = @MKINSTALLDIRS@ | ||
30517 | MSGFMT = @MSGFMT@ | ||
30518 | @@ -374,6 +376,7 @@ abs_builddir = @abs_builddir@ | ||
30519 | abs_srcdir = @abs_srcdir@ | ||
30520 | abs_top_builddir = @abs_top_builddir@ | ||
30521 | abs_top_srcdir = @abs_top_srcdir@ | ||
30522 | +ac_ct_AR = @ac_ct_AR@ | ||
30523 | ac_ct_CC = @ac_ct_CC@ | ||
30524 | ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ | ||
30525 | am__include = @am__include@ | ||
19320 | diff --git a/opcodes/configure b/opcodes/configure | 30526 | diff --git a/opcodes/configure b/opcodes/configure |
19321 | index dca94db9c3f..26dcc4b82dd 100755 | 30527 | index 1660c3266a3..a1b84ed81f9 100755 |
19322 | --- a/opcodes/configure | 30528 | --- a/opcodes/configure |
19323 | +++ b/opcodes/configure | 30529 | +++ b/opcodes/configure |
19324 | @@ -680,6 +680,9 @@ OTOOL | 30530 | @@ -688,6 +688,9 @@ OTOOL |
19325 | LIPO | 30531 | LIPO |
19326 | NMEDIT | 30532 | NMEDIT |
19327 | DSYMUTIL | 30533 | DSYMUTIL |
@@ -19331,24 +30537,24 @@ index dca94db9c3f..26dcc4b82dd 100755 | |||
19331 | OBJDUMP | 30537 | OBJDUMP |
19332 | LN_S | 30538 | LN_S |
19333 | NM | 30539 | NM |
19334 | @@ -798,6 +801,7 @@ enable_static | 30540 | @@ -806,6 +809,7 @@ enable_static |
19335 | with_pic | 30541 | with_pic |
19336 | enable_fast_install | 30542 | enable_fast_install |
19337 | with_gnu_ld | 30543 | with_gnu_ld |
19338 | +with_libtool_sysroot | 30544 | +with_libtool_sysroot |
19339 | enable_libtool_lock | 30545 | enable_libtool_lock |
30546 | enable_checking | ||
19340 | enable_targets | 30547 | enable_targets |
19341 | enable_werror | 30548 | @@ -1487,6 +1491,8 @@ Optional Packages: |
19342 | @@ -1462,6 +1466,8 @@ Optional Packages: | 30549 | --with-libintl-prefix[=DIR] search for libintl in DIR/include and DIR/lib |
19343 | --with-pic try to use only PIC/non-PIC objects [default=use | 30550 | --without-libintl-prefix don't search for libintl in includedir and libdir |
19344 | both] | 30551 | --with-libintl-type=TYPE type of library to search for (auto/static/shared) |
19345 | --with-gnu-ld assume the C compiler uses GNU ld [default=no] | ||
19346 | + --with-libtool-sysroot=DIR Search for dependent libraries within DIR | 30552 | + --with-libtool-sysroot=DIR Search for dependent libraries within DIR |
19347 | + (or the compiler's sysroot if not specified). | 30553 | + (or the compiler's sysroot if not specified). |
19348 | 30554 | ||
19349 | Some influential environment variables: | 30555 | Some influential environment variables: |
19350 | CC C compiler command | 30556 | CC C compiler command |
19351 | @@ -5403,8 +5409,8 @@ esac | 30557 | @@ -4997,8 +5003,8 @@ esac |
19352 | 30558 | ||
19353 | 30559 | ||
19354 | 30560 | ||
@@ -19359,7 +30565,7 @@ index dca94db9c3f..26dcc4b82dd 100755 | |||
19359 | 30565 | ||
19360 | 30566 | ||
19361 | 30567 | ||
19362 | @@ -5444,7 +5450,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO | 30568 | @@ -5038,7 +5044,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO |
19363 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 | 30569 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 |
19364 | $as_echo_n "checking how to print strings... " >&6; } | 30570 | $as_echo_n "checking how to print strings... " >&6; } |
19365 | # Test print first, because it will be a builtin if present. | 30571 | # Test print first, because it will be a builtin if present. |
@@ -19368,7 +30574,7 @@ index dca94db9c3f..26dcc4b82dd 100755 | |||
19368 | test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then | 30574 | test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then |
19369 | ECHO='print -r --' | 30575 | ECHO='print -r --' |
19370 | elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then | 30576 | elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then |
19371 | @@ -6130,8 +6136,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; | 30577 | @@ -5731,8 +5737,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; |
19372 | # Try some XSI features | 30578 | # Try some XSI features |
19373 | xsi_shell=no | 30579 | xsi_shell=no |
19374 | ( _lt_dummy="a/b/c" | 30580 | ( _lt_dummy="a/b/c" |
@@ -19379,7 +30585,7 @@ index dca94db9c3f..26dcc4b82dd 100755 | |||
19379 | && eval 'test $(( 1 + 1 )) -eq 2 \ | 30585 | && eval 'test $(( 1 + 1 )) -eq 2 \ |
19380 | && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ | 30586 | && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ |
19381 | && xsi_shell=yes | 30587 | && xsi_shell=yes |
19382 | @@ -6180,6 +6186,80 @@ esac | 30588 | @@ -5781,6 +5787,80 @@ esac |
19383 | 30589 | ||
19384 | 30590 | ||
19385 | 30591 | ||
@@ -19460,7 +30666,7 @@ index dca94db9c3f..26dcc4b82dd 100755 | |||
19460 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 | 30666 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 |
19461 | $as_echo_n "checking for $LD option to reload object files... " >&6; } | 30667 | $as_echo_n "checking for $LD option to reload object files... " >&6; } |
19462 | if ${lt_cv_ld_reload_flag+:} false; then : | 30668 | if ${lt_cv_ld_reload_flag+:} false; then : |
19463 | @@ -6196,6 +6276,11 @@ case $reload_flag in | 30669 | @@ -5797,6 +5877,11 @@ case $reload_flag in |
19464 | esac | 30670 | esac |
19465 | reload_cmds='$LD$reload_flag -o $output$reload_objs' | 30671 | reload_cmds='$LD$reload_flag -o $output$reload_objs' |
19466 | case $host_os in | 30672 | case $host_os in |
@@ -19472,7 +30678,7 @@ index dca94db9c3f..26dcc4b82dd 100755 | |||
19472 | darwin*) | 30678 | darwin*) |
19473 | if test "$GCC" = yes; then | 30679 | if test "$GCC" = yes; then |
19474 | reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' | 30680 | reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' |
19475 | @@ -6364,7 +6449,8 @@ mingw* | pw32*) | 30681 | @@ -5965,7 +6050,8 @@ mingw* | pw32*) |
19476 | lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' | 30682 | lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' |
19477 | lt_cv_file_magic_cmd='func_win32_libid' | 30683 | lt_cv_file_magic_cmd='func_win32_libid' |
19478 | else | 30684 | else |
@@ -19482,7 +30688,7 @@ index dca94db9c3f..26dcc4b82dd 100755 | |||
19482 | lt_cv_file_magic_cmd='$OBJDUMP -f' | 30688 | lt_cv_file_magic_cmd='$OBJDUMP -f' |
19483 | fi | 30689 | fi |
19484 | ;; | 30690 | ;; |
19485 | @@ -6518,6 +6604,21 @@ esac | 30691 | @@ -6124,6 +6210,21 @@ esac |
19486 | fi | 30692 | fi |
19487 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 | 30693 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 |
19488 | $as_echo "$lt_cv_deplibs_check_method" >&6; } | 30694 | $as_echo "$lt_cv_deplibs_check_method" >&6; } |
@@ -19504,7 +30710,7 @@ index dca94db9c3f..26dcc4b82dd 100755 | |||
19504 | file_magic_cmd=$lt_cv_file_magic_cmd | 30710 | file_magic_cmd=$lt_cv_file_magic_cmd |
19505 | deplibs_check_method=$lt_cv_deplibs_check_method | 30711 | deplibs_check_method=$lt_cv_deplibs_check_method |
19506 | test -z "$deplibs_check_method" && deplibs_check_method=unknown | 30712 | test -z "$deplibs_check_method" && deplibs_check_method=unknown |
19507 | @@ -6531,11 +6632,164 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown | 30713 | @@ -6139,6 +6240,157 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown |
19508 | 30714 | ||
19509 | 30715 | ||
19510 | 30716 | ||
@@ -19518,11 +30724,7 @@ index dca94db9c3f..26dcc4b82dd 100755 | |||
19518 | + | 30724 | + |
19519 | + | 30725 | + |
19520 | + | 30726 | + |
19521 | 30727 | +if test -n "$ac_tool_prefix"; then | |
19522 | |||
19523 | if test -n "$ac_tool_prefix"; then | ||
19524 | - # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. | ||
19525 | -set dummy ${ac_tool_prefix}ar; ac_word=$2 | ||
19526 | + # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. | 30728 | + # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. |
19527 | +set dummy ${ac_tool_prefix}dlltool; ac_word=$2 | 30729 | +set dummy ${ac_tool_prefix}dlltool; ac_word=$2 |
19528 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | 30730 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
@@ -19663,7 +30865,15 @@ index dca94db9c3f..26dcc4b82dd 100755 | |||
19663 | + | 30865 | + |
19664 | + | 30866 | + |
19665 | + | 30867 | + |
19666 | +if test -n "$ac_tool_prefix"; then | 30868 | plugin_option= |
30869 | plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll" | ||
30870 | for plugin in $plugin_names; do | ||
30871 | @@ -6153,8 +6405,10 @@ for plugin in $plugin_names; do | ||
30872 | done | ||
30873 | |||
30874 | if test -n "$ac_tool_prefix"; then | ||
30875 | - # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. | ||
30876 | -set dummy ${ac_tool_prefix}ar; ac_word=$2 | ||
19667 | + for ac_prog in ar | 30877 | + for ac_prog in ar |
19668 | + do | 30878 | + do |
19669 | + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. | 30879 | + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. |
@@ -19671,7 +30881,7 @@ index dca94db9c3f..26dcc4b82dd 100755 | |||
19671 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | 30881 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
19672 | $as_echo_n "checking for $ac_word... " >&6; } | 30882 | $as_echo_n "checking for $ac_word... " >&6; } |
19673 | if ${ac_cv_prog_AR+:} false; then : | 30883 | if ${ac_cv_prog_AR+:} false; then : |
19674 | @@ -6551,7 +6805,7 @@ do | 30884 | @@ -6170,7 +6424,7 @@ do |
19675 | test -z "$as_dir" && as_dir=. | 30885 | test -z "$as_dir" && as_dir=. |
19676 | for ac_exec_ext in '' $ac_executable_extensions; do | 30886 | for ac_exec_ext in '' $ac_executable_extensions; do |
19677 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | 30887 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
@@ -19680,7 +30890,7 @@ index dca94db9c3f..26dcc4b82dd 100755 | |||
19680 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | 30890 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
19681 | break 2 | 30891 | break 2 |
19682 | fi | 30892 | fi |
19683 | @@ -6571,11 +6825,15 @@ $as_echo "no" >&6; } | 30893 | @@ -6190,11 +6444,15 @@ $as_echo "no" >&6; } |
19684 | fi | 30894 | fi |
19685 | 30895 | ||
19686 | 30896 | ||
@@ -19699,7 +30909,7 @@ index dca94db9c3f..26dcc4b82dd 100755 | |||
19699 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | 30909 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
19700 | $as_echo_n "checking for $ac_word... " >&6; } | 30910 | $as_echo_n "checking for $ac_word... " >&6; } |
19701 | if ${ac_cv_prog_ac_ct_AR+:} false; then : | 30911 | if ${ac_cv_prog_ac_ct_AR+:} false; then : |
19702 | @@ -6591,7 +6849,7 @@ do | 30912 | @@ -6210,7 +6468,7 @@ do |
19703 | test -z "$as_dir" && as_dir=. | 30913 | test -z "$as_dir" && as_dir=. |
19704 | for ac_exec_ext in '' $ac_executable_extensions; do | 30914 | for ac_exec_ext in '' $ac_executable_extensions; do |
19705 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | 30915 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
@@ -19708,7 +30918,7 @@ index dca94db9c3f..26dcc4b82dd 100755 | |||
19708 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | 30918 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
19709 | break 2 | 30919 | break 2 |
19710 | fi | 30920 | fi |
19711 | @@ -6610,6 +6868,10 @@ else | 30921 | @@ -6229,6 +6487,10 @@ else |
19712 | $as_echo "no" >&6; } | 30922 | $as_echo "no" >&6; } |
19713 | fi | 30923 | fi |
19714 | 30924 | ||
@@ -19719,7 +30929,7 @@ index dca94db9c3f..26dcc4b82dd 100755 | |||
19719 | if test "x$ac_ct_AR" = x; then | 30929 | if test "x$ac_ct_AR" = x; then |
19720 | AR="false" | 30930 | AR="false" |
19721 | else | 30931 | else |
19722 | @@ -6621,16 +6883,72 @@ ac_tool_warned=yes ;; | 30932 | @@ -6240,25 +6502,20 @@ ac_tool_warned=yes ;; |
19723 | esac | 30933 | esac |
19724 | AR=$ac_ct_AR | 30934 | AR=$ac_ct_AR |
19725 | fi | 30935 | fi |
@@ -19728,20 +30938,37 @@ index dca94db9c3f..26dcc4b82dd 100755 | |||
19728 | fi | 30938 | fi |
19729 | 30939 | ||
19730 | -test -z "$AR" && AR=ar | 30940 | -test -z "$AR" && AR=ar |
30941 | -if test -n "$plugin_option"; then | ||
30942 | - if $AR --help 2>&1 | grep -q "\--plugin"; then | ||
30943 | - touch conftest.c | ||
30944 | - $AR $plugin_option rc conftest.a conftest.c | ||
30945 | - if test "$?" != 0; then | ||
30946 | - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5 | ||
30947 | + touch conftest.c | ||
30948 | + $AR $plugin_option rc conftest.a conftest.c | ||
30949 | + if test "$?" != 0; then | ||
30950 | + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5 | ||
30951 | $as_echo "$as_me: WARNING: Failed: $AR $plugin_option rc" >&2;} | ||
30952 | - else | ||
30953 | - AR="$AR $plugin_option" | ||
30954 | - fi | ||
30955 | - rm -f conftest.* | ||
30956 | + else | ||
30957 | + AR="$AR $plugin_option" | ||
30958 | fi | ||
30959 | -fi | ||
19731 | -test -z "$AR_FLAGS" && AR_FLAGS=cru | 30960 | -test -z "$AR_FLAGS" && AR_FLAGS=cru |
30961 | + rm -f conftest.* | ||
19732 | +: ${AR=ar} | 30962 | +: ${AR=ar} |
19733 | +: ${AR_FLAGS=cru} | 30963 | +: ${AR_FLAGS=cru} |
19734 | + | 30964 | + |
19735 | + | 30965 | |
19736 | + | 30966 | |
19737 | + | 30967 | |
19738 | + | 30968 | @@ -6269,6 +6526,63 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru |
19739 | + | 30969 | |
19740 | + | 30970 | |
19741 | + | 30971 | |
19742 | + | ||
19743 | + | ||
19744 | + | ||
19745 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 | 30972 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 |
19746 | +$as_echo_n "checking for archiver @FILE support... " >&6; } | 30973 | +$as_echo_n "checking for archiver @FILE support... " >&6; } |
19747 | +if ${lt_cv_ar_at_file+:} false; then : | 30974 | +if ${lt_cv_ar_at_file+:} false; then : |
@@ -19754,7 +30981,7 @@ index dca94db9c3f..26dcc4b82dd 100755 | |||
19754 | +int | 30981 | +int |
19755 | +main () | 30982 | +main () |
19756 | +{ | 30983 | +{ |
19757 | 30984 | + | |
19758 | + ; | 30985 | + ; |
19759 | + return 0; | 30986 | + return 0; |
19760 | +} | 30987 | +} |
@@ -19780,23 +31007,29 @@ index dca94db9c3f..26dcc4b82dd 100755 | |||
19780 | + fi | 31007 | + fi |
19781 | + fi | 31008 | + fi |
19782 | + rm -f conftest.* libconftest.a | 31009 | + rm -f conftest.* libconftest.a |
19783 | 31010 | + | |
19784 | +fi | 31011 | +fi |
19785 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | 31012 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext |
19786 | 31013 | + | |
19787 | +fi | 31014 | +fi |
19788 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 | 31015 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 |
19789 | +$as_echo "$lt_cv_ar_at_file" >&6; } | 31016 | +$as_echo "$lt_cv_ar_at_file" >&6; } |
19790 | 31017 | + | |
19791 | +if test "x$lt_cv_ar_at_file" = xno; then | 31018 | +if test "x$lt_cv_ar_at_file" = xno; then |
19792 | + archiver_list_spec= | 31019 | + archiver_list_spec= |
19793 | +else | 31020 | +else |
19794 | + archiver_list_spec=$lt_cv_ar_at_file | 31021 | + archiver_list_spec=$lt_cv_ar_at_file |
19795 | +fi | 31022 | +fi |
31023 | + | ||
31024 | + | ||
31025 | + | ||
31026 | + | ||
31027 | + | ||
31028 | + | ||
19796 | 31029 | ||
19797 | 31030 | if test -n "$ac_tool_prefix"; then | |
19798 | 31031 | # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. | |
19799 | @@ -6972,8 +7290,8 @@ esac | 31032 | @@ -6609,8 +6923,8 @@ esac |
19800 | lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" | 31033 | lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" |
19801 | 31034 | ||
19802 | # Transform an extracted symbol line into symbol name and symbol address | 31035 | # Transform an extracted symbol line into symbol name and symbol address |
@@ -19807,7 +31040,7 @@ index dca94db9c3f..26dcc4b82dd 100755 | |||
19807 | 31040 | ||
19808 | # Handle CRLF in mingw tool chain | 31041 | # Handle CRLF in mingw tool chain |
19809 | opt_cr= | 31042 | opt_cr= |
19810 | @@ -7009,6 +7327,7 @@ for ac_symprfx in "" "_"; do | 31043 | @@ -6646,6 +6960,7 @@ for ac_symprfx in "" "_"; do |
19811 | else | 31044 | else |
19812 | lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" | 31045 | lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" |
19813 | fi | 31046 | fi |
@@ -19815,7 +31048,7 @@ index dca94db9c3f..26dcc4b82dd 100755 | |||
19815 | 31048 | ||
19816 | # Check to see that the pipe works correctly. | 31049 | # Check to see that the pipe works correctly. |
19817 | pipe_works=no | 31050 | pipe_works=no |
19818 | @@ -7050,6 +7369,18 @@ _LT_EOF | 31051 | @@ -6687,6 +7002,18 @@ _LT_EOF |
19819 | if $GREP ' nm_test_var$' "$nlist" >/dev/null; then | 31052 | if $GREP ' nm_test_var$' "$nlist" >/dev/null; then |
19820 | if $GREP ' nm_test_func$' "$nlist" >/dev/null; then | 31053 | if $GREP ' nm_test_func$' "$nlist" >/dev/null; then |
19821 | cat <<_LT_EOF > conftest.$ac_ext | 31054 | cat <<_LT_EOF > conftest.$ac_ext |
@@ -19834,7 +31067,7 @@ index dca94db9c3f..26dcc4b82dd 100755 | |||
19834 | #ifdef __cplusplus | 31067 | #ifdef __cplusplus |
19835 | extern "C" { | 31068 | extern "C" { |
19836 | #endif | 31069 | #endif |
19837 | @@ -7061,7 +7392,7 @@ _LT_EOF | 31070 | @@ -6698,7 +7025,7 @@ _LT_EOF |
19838 | cat <<_LT_EOF >> conftest.$ac_ext | 31071 | cat <<_LT_EOF >> conftest.$ac_ext |
19839 | 31072 | ||
19840 | /* The mapping between symbol names and symbols. */ | 31073 | /* The mapping between symbol names and symbols. */ |
@@ -19843,7 +31076,7 @@ index dca94db9c3f..26dcc4b82dd 100755 | |||
19843 | const char *name; | 31076 | const char *name; |
19844 | void *address; | 31077 | void *address; |
19845 | } | 31078 | } |
19846 | @@ -7087,8 +7418,8 @@ static const void *lt_preloaded_setup() { | 31079 | @@ -6724,8 +7051,8 @@ static const void *lt_preloaded_setup() { |
19847 | _LT_EOF | 31080 | _LT_EOF |
19848 | # Now try linking the two files. | 31081 | # Now try linking the two files. |
19849 | mv conftest.$ac_objext conftstm.$ac_objext | 31082 | mv conftest.$ac_objext conftstm.$ac_objext |
@@ -19854,7 +31087,7 @@ index dca94db9c3f..26dcc4b82dd 100755 | |||
19854 | LIBS="conftstm.$ac_objext" | 31087 | LIBS="conftstm.$ac_objext" |
19855 | CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" | 31088 | CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" |
19856 | if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 | 31089 | if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 |
19857 | @@ -7098,8 +7429,8 @@ _LT_EOF | 31090 | @@ -6735,8 +7062,8 @@ _LT_EOF |
19858 | test $ac_status = 0; } && test -s conftest${ac_exeext}; then | 31091 | test $ac_status = 0; } && test -s conftest${ac_exeext}; then |
19859 | pipe_works=yes | 31092 | pipe_works=yes |
19860 | fi | 31093 | fi |
@@ -19865,7 +31098,7 @@ index dca94db9c3f..26dcc4b82dd 100755 | |||
19865 | else | 31098 | else |
19866 | echo "cannot find nm_test_func in $nlist" >&5 | 31099 | echo "cannot find nm_test_func in $nlist" >&5 |
19867 | fi | 31100 | fi |
19868 | @@ -7136,6 +7467,16 @@ else | 31101 | @@ -6773,6 +7100,14 @@ else |
19869 | $as_echo "ok" >&6; } | 31102 | $as_echo "ok" >&6; } |
19870 | fi | 31103 | fi |
19871 | 31104 | ||
@@ -19877,12 +31110,10 @@ index dca94db9c3f..26dcc4b82dd 100755 | |||
19877 | +fi | 31110 | +fi |
19878 | + | 31111 | + |
19879 | + | 31112 | + |
19880 | + | ||
19881 | + | ||
19882 | 31113 | ||
19883 | 31114 | ||
19884 | 31115 | ||
19885 | @@ -7152,6 +7493,45 @@ fi | 31116 | @@ -6791,6 +7126,47 @@ fi |
19886 | 31117 | ||
19887 | 31118 | ||
19888 | 31119 | ||
@@ -19925,10 +31156,12 @@ index dca94db9c3f..26dcc4b82dd 100755 | |||
19925 | + | 31156 | + |
19926 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 | 31157 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 |
19927 | +$as_echo "${lt_sysroot:-no}" >&6; } | 31158 | +$as_echo "${lt_sysroot:-no}" >&6; } |
31159 | + | ||
31160 | + | ||
19928 | 31161 | ||
19929 | 31162 | ||
19930 | 31163 | ||
19931 | @@ -7363,6 +7743,123 @@ esac | 31164 | @@ -7000,6 +7376,123 @@ esac |
19932 | 31165 | ||
19933 | need_locks="$enable_libtool_lock" | 31166 | need_locks="$enable_libtool_lock" |
19934 | 31167 | ||
@@ -20052,7 +31285,7 @@ index dca94db9c3f..26dcc4b82dd 100755 | |||
20052 | 31285 | ||
20053 | case $host_os in | 31286 | case $host_os in |
20054 | rhapsody* | darwin*) | 31287 | rhapsody* | darwin*) |
20055 | @@ -7926,6 +8423,8 @@ _LT_EOF | 31288 | @@ -7563,6 +8056,8 @@ _LT_EOF |
20056 | $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 | 31289 | $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 |
20057 | echo "$AR cru libconftest.a conftest.o" >&5 | 31290 | echo "$AR cru libconftest.a conftest.o" >&5 |
20058 | $AR cru libconftest.a conftest.o 2>&5 | 31291 | $AR cru libconftest.a conftest.o 2>&5 |
@@ -20061,26 +31294,7 @@ index dca94db9c3f..26dcc4b82dd 100755 | |||
20061 | cat > conftest.c << _LT_EOF | 31294 | cat > conftest.c << _LT_EOF |
20062 | int main() { return 0;} | 31295 | int main() { return 0;} |
20063 | _LT_EOF | 31296 | _LT_EOF |
20064 | @@ -8091,7 +8590,8 @@ fi | 31297 | @@ -8117,8 +8612,6 @@ fi |
20065 | LIBTOOL_DEPS="$ltmain" | ||
20066 | |||
20067 | # Always use our own libtool. | ||
20068 | -LIBTOOL='$(SHELL) $(top_builddir)/libtool' | ||
20069 | +LIBTOOL='$(SHELL) $(top_builddir)' | ||
20070 | +LIBTOOL="$LIBTOOL/${host_alias}-libtool" | ||
20071 | |||
20072 | |||
20073 | |||
20074 | @@ -8180,7 +8680,7 @@ aix3*) | ||
20075 | esac | ||
20076 | |||
20077 | # Global variables: | ||
20078 | -ofile=libtool | ||
20079 | +ofile=${host_alias}-libtool | ||
20080 | can_build_shared=yes | ||
20081 | |||
20082 | # All known linkers require a `.a' archive for static linking (except MSVC, | ||
20083 | @@ -8478,8 +8978,6 @@ fi | ||
20084 | lt_prog_compiler_pic= | 31298 | lt_prog_compiler_pic= |
20085 | lt_prog_compiler_static= | 31299 | lt_prog_compiler_static= |
20086 | 31300 | ||
@@ -20089,7 +31303,7 @@ index dca94db9c3f..26dcc4b82dd 100755 | |||
20089 | 31303 | ||
20090 | if test "$GCC" = yes; then | 31304 | if test "$GCC" = yes; then |
20091 | lt_prog_compiler_wl='-Wl,' | 31305 | lt_prog_compiler_wl='-Wl,' |
20092 | @@ -8645,6 +9143,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } | 31306 | @@ -8284,6 +8777,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } |
20093 | lt_prog_compiler_pic='--shared' | 31307 | lt_prog_compiler_pic='--shared' |
20094 | lt_prog_compiler_static='--static' | 31308 | lt_prog_compiler_static='--static' |
20095 | ;; | 31309 | ;; |
@@ -20102,7 +31316,7 @@ index dca94db9c3f..26dcc4b82dd 100755 | |||
20102 | pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) | 31316 | pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) |
20103 | # Portland Group compilers (*not* the Pentium gcc compiler, | 31317 | # Portland Group compilers (*not* the Pentium gcc compiler, |
20104 | # which looks to be a dead project) | 31318 | # which looks to be a dead project) |
20105 | @@ -8707,7 +9211,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } | 31319 | @@ -8346,7 +8845,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } |
20106 | lt_prog_compiler_pic='-KPIC' | 31320 | lt_prog_compiler_pic='-KPIC' |
20107 | lt_prog_compiler_static='-Bstatic' | 31321 | lt_prog_compiler_static='-Bstatic' |
20108 | case $cc_basename in | 31322 | case $cc_basename in |
@@ -20111,7 +31325,7 @@ index dca94db9c3f..26dcc4b82dd 100755 | |||
20111 | lt_prog_compiler_wl='-Qoption ld ';; | 31325 | lt_prog_compiler_wl='-Qoption ld ';; |
20112 | *) | 31326 | *) |
20113 | lt_prog_compiler_wl='-Wl,';; | 31327 | lt_prog_compiler_wl='-Wl,';; |
20114 | @@ -8764,13 +9268,17 @@ case $host_os in | 31328 | @@ -8403,13 +8902,17 @@ case $host_os in |
20115 | lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" | 31329 | lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" |
20116 | ;; | 31330 | ;; |
20117 | esac | 31331 | esac |
@@ -20135,7 +31349,7 @@ index dca94db9c3f..26dcc4b82dd 100755 | |||
20135 | 31349 | ||
20136 | # | 31350 | # |
20137 | # Check to make sure the PIC flag actually works. | 31351 | # Check to make sure the PIC flag actually works. |
20138 | @@ -8831,6 +9339,11 @@ fi | 31352 | @@ -8470,6 +8973,11 @@ fi |
20139 | 31353 | ||
20140 | 31354 | ||
20141 | 31355 | ||
@@ -20147,7 +31361,7 @@ index dca94db9c3f..26dcc4b82dd 100755 | |||
20147 | # | 31361 | # |
20148 | # Check to make sure the static flag actually works. | 31362 | # Check to make sure the static flag actually works. |
20149 | # | 31363 | # |
20150 | @@ -9181,7 +9694,8 @@ _LT_EOF | 31364 | @@ -8820,7 +9328,8 @@ _LT_EOF |
20151 | allow_undefined_flag=unsupported | 31365 | allow_undefined_flag=unsupported |
20152 | always_export_symbols=no | 31366 | always_export_symbols=no |
20153 | enable_shared_with_static_runtimes=yes | 31367 | enable_shared_with_static_runtimes=yes |
@@ -20157,7 +31371,7 @@ index dca94db9c3f..26dcc4b82dd 100755 | |||
20157 | 31371 | ||
20158 | if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then | 31372 | if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then |
20159 | archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' | 31373 | archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' |
20160 | @@ -9280,12 +9794,12 @@ _LT_EOF | 31374 | @@ -8919,12 +9428,12 @@ _LT_EOF |
20161 | whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' | 31375 | whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' |
20162 | hardcode_libdir_flag_spec= | 31376 | hardcode_libdir_flag_spec= |
20163 | hardcode_libdir_flag_spec_ld='-rpath $libdir' | 31377 | hardcode_libdir_flag_spec_ld='-rpath $libdir' |
@@ -20172,7 +31386,7 @@ index dca94db9c3f..26dcc4b82dd 100755 | |||
20172 | fi | 31386 | fi |
20173 | ;; | 31387 | ;; |
20174 | esac | 31388 | esac |
20175 | @@ -9299,8 +9813,8 @@ _LT_EOF | 31389 | @@ -8938,8 +9447,8 @@ _LT_EOF |
20176 | archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' | 31390 | archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' |
20177 | wlarc= | 31391 | wlarc= |
20178 | else | 31392 | else |
@@ -20183,7 +31397,7 @@ index dca94db9c3f..26dcc4b82dd 100755 | |||
20183 | fi | 31397 | fi |
20184 | ;; | 31398 | ;; |
20185 | 31399 | ||
20186 | @@ -9318,8 +9832,8 @@ _LT_EOF | 31400 | @@ -8957,8 +9466,8 @@ _LT_EOF |
20187 | 31401 | ||
20188 | _LT_EOF | 31402 | _LT_EOF |
20189 | elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then | 31403 | elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then |
@@ -20194,7 +31408,7 @@ index dca94db9c3f..26dcc4b82dd 100755 | |||
20194 | else | 31408 | else |
20195 | ld_shlibs=no | 31409 | ld_shlibs=no |
20196 | fi | 31410 | fi |
20197 | @@ -9365,8 +9879,8 @@ _LT_EOF | 31411 | @@ -9004,8 +9513,8 @@ _LT_EOF |
20198 | 31412 | ||
20199 | *) | 31413 | *) |
20200 | if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then | 31414 | if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then |
@@ -20205,7 +31419,7 @@ index dca94db9c3f..26dcc4b82dd 100755 | |||
20205 | else | 31419 | else |
20206 | ld_shlibs=no | 31420 | ld_shlibs=no |
20207 | fi | 31421 | fi |
20208 | @@ -9496,7 +10010,13 @@ _LT_EOF | 31422 | @@ -9135,7 +9644,13 @@ _LT_EOF |
20209 | allow_undefined_flag='-berok' | 31423 | allow_undefined_flag='-berok' |
20210 | # Determine the default libpath from the value encoded in an | 31424 | # Determine the default libpath from the value encoded in an |
20211 | # empty executable. | 31425 | # empty executable. |
@@ -20220,7 +31434,7 @@ index dca94db9c3f..26dcc4b82dd 100755 | |||
20220 | /* end confdefs.h. */ | 31434 | /* end confdefs.h. */ |
20221 | 31435 | ||
20222 | int | 31436 | int |
20223 | @@ -9509,22 +10029,29 @@ main () | 31437 | @@ -9148,22 +9663,29 @@ main () |
20224 | _ACEOF | 31438 | _ACEOF |
20225 | if ac_fn_c_try_link "$LINENO"; then : | 31439 | if ac_fn_c_try_link "$LINENO"; then : |
20226 | 31440 | ||
@@ -20263,7 +31477,7 @@ index dca94db9c3f..26dcc4b82dd 100755 | |||
20263 | 31477 | ||
20264 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" | 31478 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" |
20265 | 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" | 31479 | archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" |
20266 | @@ -9536,7 +10063,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | 31480 | @@ -9175,7 +9697,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
20267 | else | 31481 | else |
20268 | # Determine the default libpath from the value encoded in an | 31482 | # Determine the default libpath from the value encoded in an |
20269 | # empty executable. | 31483 | # empty executable. |
@@ -20278,7 +31492,7 @@ index dca94db9c3f..26dcc4b82dd 100755 | |||
20278 | /* end confdefs.h. */ | 31492 | /* end confdefs.h. */ |
20279 | 31493 | ||
20280 | int | 31494 | int |
20281 | @@ -9549,22 +10082,29 @@ main () | 31495 | @@ -9188,22 +9716,29 @@ main () |
20282 | _ACEOF | 31496 | _ACEOF |
20283 | if ac_fn_c_try_link "$LINENO"; then : | 31497 | if ac_fn_c_try_link "$LINENO"; then : |
20284 | 31498 | ||
@@ -20321,7 +31535,7 @@ index dca94db9c3f..26dcc4b82dd 100755 | |||
20321 | 31535 | ||
20322 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" | 31536 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" |
20323 | # Warning - without using the other run time loading flags, | 31537 | # Warning - without using the other run time loading flags, |
20324 | @@ -9609,20 +10149,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | 31538 | @@ -9248,20 +9783,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
20325 | # Microsoft Visual C++. | 31539 | # Microsoft Visual C++. |
20326 | # hardcode_libdir_flag_spec is actually meaningless, as there is | 31540 | # hardcode_libdir_flag_spec is actually meaningless, as there is |
20327 | # no search path for DLLs. | 31541 | # no search path for DLLs. |
@@ -20399,7 +31613,7 @@ index dca94db9c3f..26dcc4b82dd 100755 | |||
20399 | ;; | 31613 | ;; |
20400 | 31614 | ||
20401 | darwin* | rhapsody*) | 31615 | darwin* | rhapsody*) |
20402 | @@ -9683,7 +10266,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | 31616 | @@ -9322,7 +9900,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
20403 | 31617 | ||
20404 | # FreeBSD 3 and greater uses gcc -shared to do shared libraries. | 31618 | # FreeBSD 3 and greater uses gcc -shared to do shared libraries. |
20405 | freebsd* | dragonfly*) | 31619 | freebsd* | dragonfly*) |
@@ -20408,7 +31622,7 @@ index dca94db9c3f..26dcc4b82dd 100755 | |||
20408 | hardcode_libdir_flag_spec='-R$libdir' | 31622 | hardcode_libdir_flag_spec='-R$libdir' |
20409 | hardcode_direct=yes | 31623 | hardcode_direct=yes |
20410 | hardcode_shlibpath_var=no | 31624 | hardcode_shlibpath_var=no |
20411 | @@ -9691,7 +10274,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | 31625 | @@ -9330,7 +9908,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
20412 | 31626 | ||
20413 | hpux9*) | 31627 | hpux9*) |
20414 | if test "$GCC" = yes; then | 31628 | if test "$GCC" = yes; then |
@@ -20417,7 +31631,7 @@ index dca94db9c3f..26dcc4b82dd 100755 | |||
20417 | else | 31631 | else |
20418 | 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' | 31632 | archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' |
20419 | fi | 31633 | fi |
20420 | @@ -9707,7 +10290,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | 31634 | @@ -9346,7 +9924,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
20421 | 31635 | ||
20422 | hpux10*) | 31636 | hpux10*) |
20423 | if test "$GCC" = yes && test "$with_gnu_ld" = no; then | 31637 | if test "$GCC" = yes && test "$with_gnu_ld" = no; then |
@@ -20426,8 +31640,8 @@ index dca94db9c3f..26dcc4b82dd 100755 | |||
20426 | else | 31640 | else |
20427 | archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' | 31641 | archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' |
20428 | fi | 31642 | fi |
20429 | @@ -9731,10 +10314,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | 31643 | @@ -9370,10 +9948,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
20430 | archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' | 31644 | archive_cmds='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' |
20431 | ;; | 31645 | ;; |
20432 | ia64*) | 31646 | ia64*) |
20433 | - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' | 31647 | - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' |
@@ -20439,7 +31653,7 @@ index dca94db9c3f..26dcc4b82dd 100755 | |||
20439 | ;; | 31653 | ;; |
20440 | esac | 31654 | esac |
20441 | else | 31655 | else |
20442 | @@ -9813,23 +10396,36 @@ fi | 31656 | @@ -9452,23 +10030,36 @@ fi |
20443 | 31657 | ||
20444 | irix5* | irix6* | nonstopux*) | 31658 | irix5* | irix6* | nonstopux*) |
20445 | if test "$GCC" = yes; then | 31659 | if test "$GCC" = yes; then |
@@ -20484,7 +31698,7 @@ index dca94db9c3f..26dcc4b82dd 100755 | |||
20484 | else | 31698 | else |
20485 | 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' | 31699 | archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' |
20486 | 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' | 31700 | archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' |
20487 | @@ -9914,7 +10510,7 @@ rm -f core conftest.err conftest.$ac_objext \ | 31701 | @@ -9553,7 +10144,7 @@ rm -f core conftest.err conftest.$ac_objext \ |
20488 | osf4* | osf5*) # as osf3* with the addition of -msym flag | 31702 | osf4* | osf5*) # as osf3* with the addition of -msym flag |
20489 | if test "$GCC" = yes; then | 31703 | if test "$GCC" = yes; then |
20490 | allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' | 31704 | allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' |
@@ -20493,7 +31707,7 @@ index dca94db9c3f..26dcc4b82dd 100755 | |||
20493 | hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' | 31707 | hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' |
20494 | else | 31708 | else |
20495 | allow_undefined_flag=' -expect_unresolved \*' | 31709 | allow_undefined_flag=' -expect_unresolved \*' |
20496 | @@ -9933,9 +10529,9 @@ rm -f core conftest.err conftest.$ac_objext \ | 31710 | @@ -9572,9 +10163,9 @@ rm -f core conftest.err conftest.$ac_objext \ |
20497 | no_undefined_flag=' -z defs' | 31711 | no_undefined_flag=' -z defs' |
20498 | if test "$GCC" = yes; then | 31712 | if test "$GCC" = yes; then |
20499 | wlarc='${wl}' | 31713 | wlarc='${wl}' |
@@ -20505,7 +31719,7 @@ index dca94db9c3f..26dcc4b82dd 100755 | |||
20505 | else | 31719 | else |
20506 | case `$CC -V 2>&1` in | 31720 | case `$CC -V 2>&1` in |
20507 | *"Compilers 5.0"*) | 31721 | *"Compilers 5.0"*) |
20508 | @@ -10511,8 +11107,9 @@ cygwin* | mingw* | pw32* | cegcc*) | 31722 | @@ -10150,8 +10741,9 @@ cygwin* | mingw* | pw32* | cegcc*) |
20509 | need_version=no | 31723 | need_version=no |
20510 | need_lib_prefix=no | 31724 | need_lib_prefix=no |
20511 | 31725 | ||
@@ -20517,7 +31731,7 @@ index dca94db9c3f..26dcc4b82dd 100755 | |||
20517 | library_names_spec='$libname.dll.a' | 31731 | library_names_spec='$libname.dll.a' |
20518 | # DLL is installed to $(libdir)/../bin by postinstall_cmds | 31732 | # DLL is installed to $(libdir)/../bin by postinstall_cmds |
20519 | postinstall_cmds='base_file=`basename \${file}`~ | 31733 | postinstall_cmds='base_file=`basename \${file}`~ |
20520 | @@ -10545,13 +11142,71 @@ cygwin* | mingw* | pw32* | cegcc*) | 31734 | @@ -10184,13 +10776,71 @@ cygwin* | mingw* | pw32* | cegcc*) |
20521 | library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' | 31735 | library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' |
20522 | ;; | 31736 | ;; |
20523 | esac | 31737 | esac |
@@ -20590,25 +31804,16 @@ index dca94db9c3f..26dcc4b82dd 100755 | |||
20590 | # FIXME: first we should search . and the directory the executable is in | 31804 | # FIXME: first we should search . and the directory the executable is in |
20591 | shlibpath_var=PATH | 31805 | shlibpath_var=PATH |
20592 | ;; | 31806 | ;; |
20593 | @@ -10633,7 +11288,7 @@ haiku*) | 31807 | @@ -11092,7 +11742,7 @@ else |
20594 | soname_spec='${libname}${release}${shared_ext}$major' | ||
20595 | shlibpath_var=LIBRARY_PATH | ||
20596 | shlibpath_overrides_runpath=yes | ||
20597 | - sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib' | ||
20598 | + sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' | ||
20599 | hardcode_into_libs=yes | ||
20600 | ;; | ||
20601 | |||
20602 | @@ -11429,7 +12084,7 @@ else | ||
20603 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 | 31808 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 |
20604 | lt_status=$lt_dlunknown | 31809 | lt_status=$lt_dlunknown |
20605 | cat > conftest.$ac_ext <<_LT_EOF | 31810 | cat > conftest.$ac_ext <<_LT_EOF |
20606 | -#line 11432 "configure" | 31811 | -#line 11095 "configure" |
20607 | +#line $LINENO "configure" | 31812 | +#line $LINENO "configure" |
20608 | #include "confdefs.h" | 31813 | #include "confdefs.h" |
20609 | 31814 | ||
20610 | #if HAVE_DLFCN_H | 31815 | #if HAVE_DLFCN_H |
20611 | @@ -11473,10 +12128,10 @@ else | 31816 | @@ -11136,10 +11786,10 @@ else |
20612 | /* When -fvisbility=hidden is used, assume the code has been annotated | 31817 | /* When -fvisbility=hidden is used, assume the code has been annotated |
20613 | correspondingly for the symbols needed. */ | 31818 | correspondingly for the symbols needed. */ |
20614 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) | 31819 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) |
@@ -20621,16 +31826,16 @@ index dca94db9c3f..26dcc4b82dd 100755 | |||
20621 | int main () | 31826 | int main () |
20622 | { | 31827 | { |
20623 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); | 31828 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); |
20624 | @@ -11535,7 +12190,7 @@ else | 31829 | @@ -11198,7 +11848,7 @@ else |
20625 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 | 31830 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 |
20626 | lt_status=$lt_dlunknown | 31831 | lt_status=$lt_dlunknown |
20627 | cat > conftest.$ac_ext <<_LT_EOF | 31832 | cat > conftest.$ac_ext <<_LT_EOF |
20628 | -#line 11538 "configure" | 31833 | -#line 11201 "configure" |
20629 | +#line $LINENO "configure" | 31834 | +#line $LINENO "configure" |
20630 | #include "confdefs.h" | 31835 | #include "confdefs.h" |
20631 | 31836 | ||
20632 | #if HAVE_DLFCN_H | 31837 | #if HAVE_DLFCN_H |
20633 | @@ -11579,10 +12234,10 @@ else | 31838 | @@ -11242,10 +11892,10 @@ else |
20634 | /* When -fvisbility=hidden is used, assume the code has been annotated | 31839 | /* When -fvisbility=hidden is used, assume the code has been annotated |
20635 | correspondingly for the symbols needed. */ | 31840 | correspondingly for the symbols needed. */ |
20636 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) | 31841 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) |
@@ -20643,7 +31848,7 @@ index dca94db9c3f..26dcc4b82dd 100755 | |||
20643 | int main () | 31848 | int main () |
20644 | { | 31849 | { |
20645 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); | 31850 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); |
20646 | @@ -13746,13 +14401,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' | 31851 | @@ -15351,13 +16001,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' |
20647 | lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' | 31852 | lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' |
20648 | lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' | 31853 | lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' |
20649 | lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' | 31854 | lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' |
@@ -20664,7 +31869,7 @@ index dca94db9c3f..26dcc4b82dd 100755 | |||
20664 | STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' | 31869 | STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' |
20665 | RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' | 31870 | RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' |
20666 | old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' | 31871 | old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' |
20667 | @@ -13767,14 +14429,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de | 31872 | @@ -15372,14 +16029,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de |
20668 | lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' | 31873 | lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' |
20669 | lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' | 31874 | lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' |
20670 | 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"`' | 31875 | lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`' |
@@ -20683,7 +31888,7 @@ index dca94db9c3f..26dcc4b82dd 100755 | |||
20683 | DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' | 31888 | DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' |
20684 | NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' | 31889 | NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' |
20685 | LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' | 31890 | LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' |
20686 | @@ -13807,12 +14472,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q | 31891 | @@ -15412,12 +16072,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q |
20687 | hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' | 31892 | hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' |
20688 | inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' | 31893 | inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' |
20689 | link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' | 31894 | link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' |
@@ -20697,7 +31902,7 @@ index dca94db9c3f..26dcc4b82dd 100755 | |||
20697 | file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' | 31902 | file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' |
20698 | variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' | 31903 | variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' |
20699 | need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' | 31904 | need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' |
20700 | @@ -13867,8 +14532,13 @@ reload_flag \ | 31905 | @@ -15472,8 +16132,13 @@ reload_flag \ |
20701 | OBJDUMP \ | 31906 | OBJDUMP \ |
20702 | deplibs_check_method \ | 31907 | deplibs_check_method \ |
20703 | file_magic_cmd \ | 31908 | file_magic_cmd \ |
@@ -20711,7 +31916,7 @@ index dca94db9c3f..26dcc4b82dd 100755 | |||
20711 | STRIP \ | 31916 | STRIP \ |
20712 | RANLIB \ | 31917 | RANLIB \ |
20713 | CC \ | 31918 | CC \ |
20714 | @@ -13878,12 +14548,14 @@ lt_cv_sys_global_symbol_pipe \ | 31919 | @@ -15483,12 +16148,14 @@ lt_cv_sys_global_symbol_pipe \ |
20715 | lt_cv_sys_global_symbol_to_cdecl \ | 31920 | lt_cv_sys_global_symbol_to_cdecl \ |
20716 | lt_cv_sys_global_symbol_to_c_name_address \ | 31921 | lt_cv_sys_global_symbol_to_c_name_address \ |
20717 | lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ | 31922 | lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ |
@@ -20727,7 +31932,7 @@ index dca94db9c3f..26dcc4b82dd 100755 | |||
20727 | DSYMUTIL \ | 31932 | DSYMUTIL \ |
20728 | NMEDIT \ | 31933 | NMEDIT \ |
20729 | LIPO \ | 31934 | LIPO \ |
20730 | @@ -13899,7 +14571,6 @@ no_undefined_flag \ | 31935 | @@ -15504,7 +16171,6 @@ no_undefined_flag \ |
20731 | hardcode_libdir_flag_spec \ | 31936 | hardcode_libdir_flag_spec \ |
20732 | hardcode_libdir_flag_spec_ld \ | 31937 | hardcode_libdir_flag_spec_ld \ |
20733 | hardcode_libdir_separator \ | 31938 | hardcode_libdir_separator \ |
@@ -20735,7 +31940,7 @@ index dca94db9c3f..26dcc4b82dd 100755 | |||
20735 | exclude_expsyms \ | 31940 | exclude_expsyms \ |
20736 | include_expsyms \ | 31941 | include_expsyms \ |
20737 | file_list_spec \ | 31942 | file_list_spec \ |
20738 | @@ -13935,6 +14606,7 @@ module_cmds \ | 31943 | @@ -15540,6 +16206,7 @@ module_cmds \ |
20739 | module_expsym_cmds \ | 31944 | module_expsym_cmds \ |
20740 | export_symbols_cmds \ | 31945 | export_symbols_cmds \ |
20741 | prelink_cmds \ | 31946 | prelink_cmds \ |
@@ -20743,7 +31948,7 @@ index dca94db9c3f..26dcc4b82dd 100755 | |||
20743 | postinstall_cmds \ | 31948 | postinstall_cmds \ |
20744 | postuninstall_cmds \ | 31949 | postuninstall_cmds \ |
20745 | finish_cmds \ | 31950 | finish_cmds \ |
20746 | @@ -14700,7 +15372,8 @@ $as_echo X"$file" | | 31951 | @@ -16313,7 +16980,8 @@ $as_echo X"$file" | |
20747 | # NOTE: Changes made to this file will be lost: look at ltmain.sh. | 31952 | # NOTE: Changes made to this file will be lost: look at ltmain.sh. |
20748 | # | 31953 | # |
20749 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, | 31954 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, |
@@ -20753,7 +31958,7 @@ index dca94db9c3f..26dcc4b82dd 100755 | |||
20753 | # Written by Gordon Matzigkeit, 1996 | 31958 | # Written by Gordon Matzigkeit, 1996 |
20754 | # | 31959 | # |
20755 | # This file is part of GNU Libtool. | 31960 | # This file is part of GNU Libtool. |
20756 | @@ -14803,19 +15476,42 @@ SP2NL=$lt_lt_SP2NL | 31961 | @@ -16416,19 +17084,42 @@ SP2NL=$lt_lt_SP2NL |
20757 | # turn newlines into spaces. | 31962 | # turn newlines into spaces. |
20758 | NL2SP=$lt_lt_NL2SP | 31963 | NL2SP=$lt_lt_NL2SP |
20759 | 31964 | ||
@@ -20797,7 +32002,7 @@ index dca94db9c3f..26dcc4b82dd 100755 | |||
20797 | # A symbol stripping program. | 32002 | # A symbol stripping program. |
20798 | STRIP=$lt_STRIP | 32003 | STRIP=$lt_STRIP |
20799 | 32004 | ||
20800 | @@ -14845,6 +15541,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address | 32005 | @@ -16458,6 +17149,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address |
20801 | # Transform the output of nm in a C name address pair when lib prefix is needed. | 32006 | # Transform the output of nm in a C name address pair when lib prefix is needed. |
20802 | global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix | 32007 | global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix |
20803 | 32008 | ||
@@ -20810,7 +32015,7 @@ index dca94db9c3f..26dcc4b82dd 100755 | |||
20810 | # The name of the directory that contains temporary libtool files. | 32015 | # The name of the directory that contains temporary libtool files. |
20811 | objdir=$objdir | 32016 | objdir=$objdir |
20812 | 32017 | ||
20813 | @@ -14854,6 +15556,9 @@ MAGIC_CMD=$MAGIC_CMD | 32018 | @@ -16467,6 +17164,9 @@ MAGIC_CMD=$MAGIC_CMD |
20814 | # Must we lock files when doing compilation? | 32019 | # Must we lock files when doing compilation? |
20815 | need_locks=$lt_need_locks | 32020 | need_locks=$lt_need_locks |
20816 | 32021 | ||
@@ -20820,7 +32025,7 @@ index dca94db9c3f..26dcc4b82dd 100755 | |||
20820 | # Tool to manipulate archived DWARF debug symbol files on Mac OS X. | 32025 | # Tool to manipulate archived DWARF debug symbol files on Mac OS X. |
20821 | DSYMUTIL=$lt_DSYMUTIL | 32026 | DSYMUTIL=$lt_DSYMUTIL |
20822 | 32027 | ||
20823 | @@ -14968,12 +15673,12 @@ with_gcc=$GCC | 32028 | @@ -16581,12 +17281,12 @@ with_gcc=$GCC |
20824 | # Compiler flag to turn off builtin functions. | 32029 | # Compiler flag to turn off builtin functions. |
20825 | no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag | 32030 | no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag |
20826 | 32031 | ||
@@ -20836,7 +32041,7 @@ index dca94db9c3f..26dcc4b82dd 100755 | |||
20836 | # Compiler flag to prevent dynamic linking. | 32041 | # Compiler flag to prevent dynamic linking. |
20837 | link_static_flag=$lt_lt_prog_compiler_static | 32042 | link_static_flag=$lt_lt_prog_compiler_static |
20838 | 32043 | ||
20839 | @@ -15060,9 +15765,6 @@ inherit_rpath=$inherit_rpath | 32044 | @@ -16673,9 +17373,6 @@ inherit_rpath=$inherit_rpath |
20840 | # Whether libtool must link a program against all its dependency libraries. | 32045 | # Whether libtool must link a program against all its dependency libraries. |
20841 | link_all_deplibs=$link_all_deplibs | 32046 | link_all_deplibs=$link_all_deplibs |
20842 | 32047 | ||
@@ -20846,7 +32051,7 @@ index dca94db9c3f..26dcc4b82dd 100755 | |||
20846 | # Set to "yes" if exported symbols are required. | 32051 | # Set to "yes" if exported symbols are required. |
20847 | always_export_symbols=$always_export_symbols | 32052 | always_export_symbols=$always_export_symbols |
20848 | 32053 | ||
20849 | @@ -15078,6 +15780,9 @@ include_expsyms=$lt_include_expsyms | 32054 | @@ -16691,6 +17388,9 @@ include_expsyms=$lt_include_expsyms |
20850 | # Commands necessary for linking programs (against libraries) with templates. | 32055 | # Commands necessary for linking programs (against libraries) with templates. |
20851 | prelink_cmds=$lt_prelink_cmds | 32056 | prelink_cmds=$lt_prelink_cmds |
20852 | 32057 | ||
@@ -20856,7 +32061,7 @@ index dca94db9c3f..26dcc4b82dd 100755 | |||
20856 | # Specify filename containing input files. | 32061 | # Specify filename containing input files. |
20857 | file_list_spec=$lt_file_list_spec | 32062 | file_list_spec=$lt_file_list_spec |
20858 | 32063 | ||
20859 | @@ -15110,210 +15815,169 @@ ltmain="$ac_aux_dir/ltmain.sh" | 32064 | @@ -16723,210 +17423,169 @@ ltmain="$ac_aux_dir/ltmain.sh" |
20860 | # if finds mixed CR/LF and LF-only lines. Since sed operates in | 32065 | # if finds mixed CR/LF and LF-only lines. Since sed operates in |
20861 | # text mode, it properly converts lines to CR/LF. This bash problem | 32066 | # text mode, it properly converts lines to CR/LF. This bash problem |
20862 | # is reportedly fixed, but why not run on old versions too? | 32067 | # is reportedly fixed, but why not run on old versions too? |
@@ -21230,11 +32435,39 @@ index dca94db9c3f..26dcc4b82dd 100755 | |||
21230 | (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") | 32435 | (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") |
21231 | chmod +x "$ofile" | 32436 | chmod +x "$ofile" |
21232 | 32437 | ||
32438 | diff --git a/zlib/Makefile.in b/zlib/Makefile.in | ||
32439 | index dd8a21deba1..28628282c56 100644 | ||
32440 | --- a/zlib/Makefile.in | ||
32441 | +++ b/zlib/Makefile.in | ||
32442 | @@ -281,6 +281,7 @@ CPPFLAGS = @CPPFLAGS@ | ||
32443 | CYGPATH_W = @CYGPATH_W@ | ||
32444 | DEFS = @DEFS@ | ||
32445 | DEPDIR = @DEPDIR@ | ||
32446 | +DLLTOOL = @DLLTOOL@ | ||
32447 | DSYMUTIL = @DSYMUTIL@ | ||
32448 | DUMPBIN = @DUMPBIN@ | ||
32449 | ECHO_C = @ECHO_C@ | ||
32450 | @@ -305,6 +306,7 @@ LN_S = @LN_S@ | ||
32451 | LTLIBOBJS = @LTLIBOBJS@ | ||
32452 | MAINT = @MAINT@ | ||
32453 | MAKEINFO = @MAKEINFO@ | ||
32454 | +MANIFEST_TOOL = @MANIFEST_TOOL@ | ||
32455 | MKDIR_P = @MKDIR_P@ | ||
32456 | NM = @NM@ | ||
32457 | NMEDIT = @NMEDIT@ | ||
32458 | @@ -331,6 +333,7 @@ abs_builddir = @abs_builddir@ | ||
32459 | abs_srcdir = @abs_srcdir@ | ||
32460 | abs_top_builddir = @abs_top_builddir@ | ||
32461 | abs_top_srcdir = @abs_top_srcdir@ | ||
32462 | +ac_ct_AR = @ac_ct_AR@ | ||
32463 | ac_ct_CC = @ac_ct_CC@ | ||
32464 | ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ | ||
32465 | am__include = @am__include@ | ||
21233 | diff --git a/zlib/configure b/zlib/configure | 32466 | diff --git a/zlib/configure b/zlib/configure |
21234 | index b124acf9259..e4075ef3a2c 100755 | 32467 | index 2d551360683..e01d0a70438 100755 |
21235 | --- a/zlib/configure | 32468 | --- a/zlib/configure |
21236 | +++ b/zlib/configure | 32469 | +++ b/zlib/configure |
21237 | @@ -646,8 +646,11 @@ OTOOL | 32470 | @@ -648,8 +648,11 @@ OTOOL |
21238 | LIPO | 32471 | LIPO |
21239 | NMEDIT | 32472 | NMEDIT |
21240 | DSYMUTIL | 32473 | DSYMUTIL |
@@ -21246,15 +32479,15 @@ index b124acf9259..e4075ef3a2c 100755 | |||
21246 | OBJDUMP | 32479 | OBJDUMP |
21247 | LN_S | 32480 | LN_S |
21248 | NM | 32481 | NM |
21249 | @@ -774,6 +777,7 @@ enable_static | 32482 | @@ -776,6 +779,7 @@ enable_static |
21250 | with_pic | 32483 | with_pic |
21251 | enable_fast_install | 32484 | enable_fast_install |
21252 | with_gnu_ld | 32485 | with_gnu_ld |
21253 | +with_libtool_sysroot | 32486 | +with_libtool_sysroot |
21254 | enable_libtool_lock | 32487 | enable_libtool_lock |
21255 | enable_host_shared | 32488 | enable_host_shared |
21256 | ' | 32489 | enable_host_pie |
21257 | @@ -1428,6 +1432,8 @@ Optional Packages: | 32490 | @@ -1432,6 +1436,8 @@ Optional Packages: |
21258 | --with-pic try to use only PIC/non-PIC objects [default=use | 32491 | --with-pic try to use only PIC/non-PIC objects [default=use |
21259 | both] | 32492 | both] |
21260 | --with-gnu-ld assume the C compiler uses GNU ld [default=no] | 32493 | --with-gnu-ld assume the C compiler uses GNU ld [default=no] |
@@ -21263,7 +32496,7 @@ index b124acf9259..e4075ef3a2c 100755 | |||
21263 | 32496 | ||
21264 | Some influential environment variables: | 32497 | Some influential environment variables: |
21265 | CC C compiler command | 32498 | CC C compiler command |
21266 | @@ -4147,8 +4153,8 @@ esac | 32499 | @@ -4190,8 +4196,8 @@ esac |
21267 | 32500 | ||
21268 | 32501 | ||
21269 | 32502 | ||
@@ -21274,7 +32507,7 @@ index b124acf9259..e4075ef3a2c 100755 | |||
21274 | 32507 | ||
21275 | 32508 | ||
21276 | 32509 | ||
21277 | @@ -4188,7 +4194,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO | 32510 | @@ -4231,7 +4237,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO |
21278 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 | 32511 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 |
21279 | $as_echo_n "checking how to print strings... " >&6; } | 32512 | $as_echo_n "checking how to print strings... " >&6; } |
21280 | # Test print first, because it will be a builtin if present. | 32513 | # Test print first, because it will be a builtin if present. |
@@ -21283,7 +32516,7 @@ index b124acf9259..e4075ef3a2c 100755 | |||
21283 | test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then | 32516 | test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then |
21284 | ECHO='print -r --' | 32517 | ECHO='print -r --' |
21285 | elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then | 32518 | elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then |
21286 | @@ -5004,8 +5010,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; | 32519 | @@ -5054,8 +5060,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; |
21287 | # Try some XSI features | 32520 | # Try some XSI features |
21288 | xsi_shell=no | 32521 | xsi_shell=no |
21289 | ( _lt_dummy="a/b/c" | 32522 | ( _lt_dummy="a/b/c" |
@@ -21294,7 +32527,7 @@ index b124acf9259..e4075ef3a2c 100755 | |||
21294 | && eval 'test $(( 1 + 1 )) -eq 2 \ | 32527 | && eval 'test $(( 1 + 1 )) -eq 2 \ |
21295 | && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ | 32528 | && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ |
21296 | && xsi_shell=yes | 32529 | && xsi_shell=yes |
21297 | @@ -5054,6 +5060,80 @@ esac | 32530 | @@ -5104,6 +5110,80 @@ esac |
21298 | 32531 | ||
21299 | 32532 | ||
21300 | 32533 | ||
@@ -21375,7 +32608,7 @@ index b124acf9259..e4075ef3a2c 100755 | |||
21375 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 | 32608 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 |
21376 | $as_echo_n "checking for $LD option to reload object files... " >&6; } | 32609 | $as_echo_n "checking for $LD option to reload object files... " >&6; } |
21377 | if ${lt_cv_ld_reload_flag+:} false; then : | 32610 | if ${lt_cv_ld_reload_flag+:} false; then : |
21378 | @@ -5070,6 +5150,11 @@ case $reload_flag in | 32611 | @@ -5120,6 +5200,11 @@ case $reload_flag in |
21379 | esac | 32612 | esac |
21380 | reload_cmds='$LD$reload_flag -o $output$reload_objs' | 32613 | reload_cmds='$LD$reload_flag -o $output$reload_objs' |
21381 | case $host_os in | 32614 | case $host_os in |
@@ -21387,7 +32620,7 @@ index b124acf9259..e4075ef3a2c 100755 | |||
21387 | darwin*) | 32620 | darwin*) |
21388 | if test "$GCC" = yes; then | 32621 | if test "$GCC" = yes; then |
21389 | reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' | 32622 | reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' |
21390 | @@ -5238,7 +5323,8 @@ mingw* | pw32*) | 32623 | @@ -5288,7 +5373,8 @@ mingw* | pw32*) |
21391 | lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' | 32624 | lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' |
21392 | lt_cv_file_magic_cmd='func_win32_libid' | 32625 | lt_cv_file_magic_cmd='func_win32_libid' |
21393 | else | 32626 | else |
@@ -21397,7 +32630,7 @@ index b124acf9259..e4075ef3a2c 100755 | |||
21397 | lt_cv_file_magic_cmd='$OBJDUMP -f' | 32630 | lt_cv_file_magic_cmd='$OBJDUMP -f' |
21398 | fi | 32631 | fi |
21399 | ;; | 32632 | ;; |
21400 | @@ -5392,6 +5478,21 @@ esac | 32633 | @@ -5447,6 +5533,21 @@ esac |
21401 | fi | 32634 | fi |
21402 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 | 32635 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 |
21403 | $as_echo "$lt_cv_deplibs_check_method" >&6; } | 32636 | $as_echo "$lt_cv_deplibs_check_method" >&6; } |
@@ -21419,7 +32652,7 @@ index b124acf9259..e4075ef3a2c 100755 | |||
21419 | file_magic_cmd=$lt_cv_file_magic_cmd | 32652 | file_magic_cmd=$lt_cv_file_magic_cmd |
21420 | deplibs_check_method=$lt_cv_deplibs_check_method | 32653 | deplibs_check_method=$lt_cv_deplibs_check_method |
21421 | test -z "$deplibs_check_method" && deplibs_check_method=unknown | 32654 | test -z "$deplibs_check_method" && deplibs_check_method=unknown |
21422 | @@ -5405,11 +5506,165 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown | 32655 | @@ -5462,6 +5563,158 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown |
21423 | 32656 | ||
21424 | 32657 | ||
21425 | 32658 | ||
@@ -21433,11 +32666,7 @@ index b124acf9259..e4075ef3a2c 100755 | |||
21433 | + | 32666 | + |
21434 | + | 32667 | + |
21435 | + | 32668 | + |
21436 | 32669 | +if test -n "$ac_tool_prefix"; then | |
21437 | |||
21438 | if test -n "$ac_tool_prefix"; then | ||
21439 | - # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. | ||
21440 | -set dummy ${ac_tool_prefix}ar; ac_word=$2 | ||
21441 | + # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. | 32670 | + # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. |
21442 | +set dummy ${ac_tool_prefix}dlltool; ac_word=$2 | 32671 | +set dummy ${ac_tool_prefix}dlltool; ac_word=$2 |
21443 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | 32672 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
@@ -21579,7 +32808,15 @@ index b124acf9259..e4075ef3a2c 100755 | |||
21579 | + | 32808 | + |
21580 | + | 32809 | + |
21581 | + | 32810 | + |
21582 | +if test -n "$ac_tool_prefix"; then | 32811 | plugin_option= |
32812 | plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll" | ||
32813 | for plugin in $plugin_names; do | ||
32814 | @@ -5476,8 +5729,10 @@ for plugin in $plugin_names; do | ||
32815 | done | ||
32816 | |||
32817 | if test -n "$ac_tool_prefix"; then | ||
32818 | - # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. | ||
32819 | -set dummy ${ac_tool_prefix}ar; ac_word=$2 | ||
21583 | + for ac_prog in ar | 32820 | + for ac_prog in ar |
21584 | + do | 32821 | + do |
21585 | + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. | 32822 | + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. |
@@ -21587,7 +32824,7 @@ index b124acf9259..e4075ef3a2c 100755 | |||
21587 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | 32824 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
21588 | $as_echo_n "checking for $ac_word... " >&6; } | 32825 | $as_echo_n "checking for $ac_word... " >&6; } |
21589 | if ${ac_cv_prog_AR+:} false; then : | 32826 | if ${ac_cv_prog_AR+:} false; then : |
21590 | @@ -5425,7 +5680,7 @@ do | 32827 | @@ -5493,7 +5748,7 @@ do |
21591 | test -z "$as_dir" && as_dir=. | 32828 | test -z "$as_dir" && as_dir=. |
21592 | for ac_exec_ext in '' $ac_executable_extensions; do | 32829 | for ac_exec_ext in '' $ac_executable_extensions; do |
21593 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | 32830 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
@@ -21596,7 +32833,7 @@ index b124acf9259..e4075ef3a2c 100755 | |||
21596 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | 32833 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
21597 | break 2 | 32834 | break 2 |
21598 | fi | 32835 | fi |
21599 | @@ -5445,11 +5700,15 @@ $as_echo "no" >&6; } | 32836 | @@ -5513,11 +5768,15 @@ $as_echo "no" >&6; } |
21600 | fi | 32837 | fi |
21601 | 32838 | ||
21602 | 32839 | ||
@@ -21615,7 +32852,7 @@ index b124acf9259..e4075ef3a2c 100755 | |||
21615 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | 32852 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
21616 | $as_echo_n "checking for $ac_word... " >&6; } | 32853 | $as_echo_n "checking for $ac_word... " >&6; } |
21617 | if ${ac_cv_prog_ac_ct_AR+:} false; then : | 32854 | if ${ac_cv_prog_ac_ct_AR+:} false; then : |
21618 | @@ -5465,7 +5724,7 @@ do | 32855 | @@ -5533,7 +5792,7 @@ do |
21619 | test -z "$as_dir" && as_dir=. | 32856 | test -z "$as_dir" && as_dir=. |
21620 | for ac_exec_ext in '' $ac_executable_extensions; do | 32857 | for ac_exec_ext in '' $ac_executable_extensions; do |
21621 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | 32858 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
@@ -21624,7 +32861,7 @@ index b124acf9259..e4075ef3a2c 100755 | |||
21624 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | 32861 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
21625 | break 2 | 32862 | break 2 |
21626 | fi | 32863 | fi |
21627 | @@ -5484,6 +5743,10 @@ else | 32864 | @@ -5552,6 +5811,10 @@ else |
21628 | $as_echo "no" >&6; } | 32865 | $as_echo "no" >&6; } |
21629 | fi | 32866 | fi |
21630 | 32867 | ||
@@ -21635,7 +32872,7 @@ index b124acf9259..e4075ef3a2c 100755 | |||
21635 | if test "x$ac_ct_AR" = x; then | 32872 | if test "x$ac_ct_AR" = x; then |
21636 | AR="false" | 32873 | AR="false" |
21637 | else | 32874 | else |
21638 | @@ -5495,16 +5758,72 @@ ac_tool_warned=yes ;; | 32875 | @@ -5563,25 +5826,19 @@ ac_tool_warned=yes ;; |
21639 | esac | 32876 | esac |
21640 | AR=$ac_ct_AR | 32877 | AR=$ac_ct_AR |
21641 | fi | 32878 | fi |
@@ -21644,20 +32881,36 @@ index b124acf9259..e4075ef3a2c 100755 | |||
21644 | fi | 32881 | fi |
21645 | 32882 | ||
21646 | -test -z "$AR" && AR=ar | 32883 | -test -z "$AR" && AR=ar |
32884 | -if test -n "$plugin_option"; then | ||
32885 | - if $AR --help 2>&1 | grep -q "\--plugin"; then | ||
32886 | - touch conftest.c | ||
32887 | - $AR $plugin_option rc conftest.a conftest.c | ||
32888 | - if test "$?" != 0; then | ||
32889 | - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5 | ||
32890 | + touch conftest.c | ||
32891 | + $AR $plugin_option rc conftest.a conftest.c | ||
32892 | + if test "$?" != 0; then | ||
32893 | + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5 | ||
32894 | $as_echo "$as_me: WARNING: Failed: $AR $plugin_option rc" >&2;} | ||
32895 | - else | ||
32896 | - AR="$AR $plugin_option" | ||
32897 | - fi | ||
32898 | - rm -f conftest.* | ||
32899 | + else | ||
32900 | + AR="$AR $plugin_option" | ||
32901 | fi | ||
32902 | -fi | ||
21647 | -test -z "$AR_FLAGS" && AR_FLAGS=cru | 32903 | -test -z "$AR_FLAGS" && AR_FLAGS=cru |
32904 | + rm -f conftest.* | ||
21648 | +: ${AR=ar} | 32905 | +: ${AR=ar} |
21649 | +: ${AR_FLAGS=cru} | 32906 | +: ${AR_FLAGS=cru} |
21650 | + | 32907 | |
21651 | + | 32908 | |
21652 | + | 32909 | |
21653 | + | 32910 | @@ -5593,6 +5850,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru |
21654 | + | 32911 | |
21655 | + | 32912 | |
21656 | + | 32913 | |
21657 | + | ||
21658 | + | ||
21659 | + | ||
21660 | + | ||
21661 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 | 32914 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 |
21662 | +$as_echo_n "checking for archiver @FILE support... " >&6; } | 32915 | +$as_echo_n "checking for archiver @FILE support... " >&6; } |
21663 | +if ${lt_cv_ar_at_file+:} false; then : | 32916 | +if ${lt_cv_ar_at_file+:} false; then : |
@@ -21670,7 +32923,7 @@ index b124acf9259..e4075ef3a2c 100755 | |||
21670 | +int | 32923 | +int |
21671 | +main () | 32924 | +main () |
21672 | +{ | 32925 | +{ |
21673 | 32926 | + | |
21674 | + ; | 32927 | + ; |
21675 | + return 0; | 32928 | + return 0; |
21676 | +} | 32929 | +} |
@@ -21696,23 +32949,30 @@ index b124acf9259..e4075ef3a2c 100755 | |||
21696 | + fi | 32949 | + fi |
21697 | + fi | 32950 | + fi |
21698 | + rm -f conftest.* libconftest.a | 32951 | + rm -f conftest.* libconftest.a |
21699 | 32952 | + | |
21700 | +fi | 32953 | +fi |
21701 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | 32954 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext |
21702 | 32955 | + | |
21703 | +fi | 32956 | +fi |
21704 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 | 32957 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 |
21705 | +$as_echo "$lt_cv_ar_at_file" >&6; } | 32958 | +$as_echo "$lt_cv_ar_at_file" >&6; } |
21706 | 32959 | + | |
21707 | +if test "x$lt_cv_ar_at_file" = xno; then | 32960 | +if test "x$lt_cv_ar_at_file" = xno; then |
21708 | + archiver_list_spec= | 32961 | + archiver_list_spec= |
21709 | +else | 32962 | +else |
21710 | + archiver_list_spec=$lt_cv_ar_at_file | 32963 | + archiver_list_spec=$lt_cv_ar_at_file |
21711 | +fi | 32964 | +fi |
21712 | 32965 | + | |
21713 | 32966 | + | |
21714 | 32967 | + | |
21715 | @@ -5846,8 +6165,8 @@ esac | 32968 | + |
32969 | + | ||
32970 | + | ||
32971 | + | ||
32972 | if test -n "$ac_tool_prefix"; then | ||
32973 | # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. | ||
32974 | set dummy ${ac_tool_prefix}strip; ac_word=$2 | ||
32975 | @@ -5932,8 +6247,8 @@ esac | ||
21716 | lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" | 32976 | lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" |
21717 | 32977 | ||
21718 | # Transform an extracted symbol line into symbol name and symbol address | 32978 | # Transform an extracted symbol line into symbol name and symbol address |
@@ -21723,7 +32983,7 @@ index b124acf9259..e4075ef3a2c 100755 | |||
21723 | 32983 | ||
21724 | # Handle CRLF in mingw tool chain | 32984 | # Handle CRLF in mingw tool chain |
21725 | opt_cr= | 32985 | opt_cr= |
21726 | @@ -5883,6 +6202,7 @@ for ac_symprfx in "" "_"; do | 32986 | @@ -5969,6 +6284,7 @@ for ac_symprfx in "" "_"; do |
21727 | else | 32987 | else |
21728 | lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" | 32988 | lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" |
21729 | fi | 32989 | fi |
@@ -21731,7 +32991,7 @@ index b124acf9259..e4075ef3a2c 100755 | |||
21731 | 32991 | ||
21732 | # Check to see that the pipe works correctly. | 32992 | # Check to see that the pipe works correctly. |
21733 | pipe_works=no | 32993 | pipe_works=no |
21734 | @@ -5924,6 +6244,18 @@ _LT_EOF | 32994 | @@ -6010,6 +6326,18 @@ _LT_EOF |
21735 | if $GREP ' nm_test_var$' "$nlist" >/dev/null; then | 32995 | if $GREP ' nm_test_var$' "$nlist" >/dev/null; then |
21736 | if $GREP ' nm_test_func$' "$nlist" >/dev/null; then | 32996 | if $GREP ' nm_test_func$' "$nlist" >/dev/null; then |
21737 | cat <<_LT_EOF > conftest.$ac_ext | 32997 | cat <<_LT_EOF > conftest.$ac_ext |
@@ -21750,7 +33010,7 @@ index b124acf9259..e4075ef3a2c 100755 | |||
21750 | #ifdef __cplusplus | 33010 | #ifdef __cplusplus |
21751 | extern "C" { | 33011 | extern "C" { |
21752 | #endif | 33012 | #endif |
21753 | @@ -5935,7 +6267,7 @@ _LT_EOF | 33013 | @@ -6021,7 +6349,7 @@ _LT_EOF |
21754 | cat <<_LT_EOF >> conftest.$ac_ext | 33014 | cat <<_LT_EOF >> conftest.$ac_ext |
21755 | 33015 | ||
21756 | /* The mapping between symbol names and symbols. */ | 33016 | /* The mapping between symbol names and symbols. */ |
@@ -21759,7 +33019,7 @@ index b124acf9259..e4075ef3a2c 100755 | |||
21759 | const char *name; | 33019 | const char *name; |
21760 | void *address; | 33020 | void *address; |
21761 | } | 33021 | } |
21762 | @@ -5961,8 +6293,8 @@ static const void *lt_preloaded_setup() { | 33022 | @@ -6047,8 +6375,8 @@ static const void *lt_preloaded_setup() { |
21763 | _LT_EOF | 33023 | _LT_EOF |
21764 | # Now try linking the two files. | 33024 | # Now try linking the two files. |
21765 | mv conftest.$ac_objext conftstm.$ac_objext | 33025 | mv conftest.$ac_objext conftstm.$ac_objext |
@@ -21770,7 +33030,7 @@ index b124acf9259..e4075ef3a2c 100755 | |||
21770 | LIBS="conftstm.$ac_objext" | 33030 | LIBS="conftstm.$ac_objext" |
21771 | CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" | 33031 | CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" |
21772 | if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 | 33032 | if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 |
21773 | @@ -5972,8 +6304,8 @@ _LT_EOF | 33033 | @@ -6058,8 +6386,8 @@ _LT_EOF |
21774 | test $ac_status = 0; } && test -s conftest${ac_exeext}; then | 33034 | test $ac_status = 0; } && test -s conftest${ac_exeext}; then |
21775 | pipe_works=yes | 33035 | pipe_works=yes |
21776 | fi | 33036 | fi |
@@ -21781,7 +33041,7 @@ index b124acf9259..e4075ef3a2c 100755 | |||
21781 | else | 33041 | else |
21782 | echo "cannot find nm_test_func in $nlist" >&5 | 33042 | echo "cannot find nm_test_func in $nlist" >&5 |
21783 | fi | 33043 | fi |
21784 | @@ -6010,6 +6342,19 @@ else | 33044 | @@ -6096,6 +6424,17 @@ else |
21785 | $as_echo "ok" >&6; } | 33045 | $as_echo "ok" >&6; } |
21786 | fi | 33046 | fi |
21787 | 33047 | ||
@@ -21796,18 +33056,18 @@ index b124acf9259..e4075ef3a2c 100755 | |||
21796 | + | 33056 | + |
21797 | + | 33057 | + |
21798 | + | 33058 | + |
21799 | + | ||
21800 | + | ||
21801 | 33059 | ||
21802 | 33060 | ||
21803 | 33061 | ||
21804 | @@ -6027,6 +6372,41 @@ fi | 33062 | @@ -6113,6 +6452,43 @@ fi |
21805 | 33063 | ||
21806 | 33064 | ||
21807 | 33065 | ||
21808 | + | 33066 | + |
21809 | + | 33067 | + |
21810 | + | 33068 | + |
33069 | + | ||
33070 | + | ||
21811 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 | 33071 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 |
21812 | +$as_echo_n "checking for sysroot... " >&6; } | 33072 | +$as_echo_n "checking for sysroot... " >&6; } |
21813 | + | 33073 | + |
@@ -21843,7 +33103,7 @@ index b124acf9259..e4075ef3a2c 100755 | |||
21843 | 33103 | ||
21844 | 33104 | ||
21845 | 33105 | ||
21846 | @@ -6241,6 +6621,123 @@ esac | 33106 | @@ -6327,6 +6703,123 @@ esac |
21847 | 33107 | ||
21848 | need_locks="$enable_libtool_lock" | 33108 | need_locks="$enable_libtool_lock" |
21849 | 33109 | ||
@@ -21967,7 +33227,7 @@ index b124acf9259..e4075ef3a2c 100755 | |||
21967 | 33227 | ||
21968 | case $host_os in | 33228 | case $host_os in |
21969 | rhapsody* | darwin*) | 33229 | rhapsody* | darwin*) |
21970 | @@ -6807,6 +7304,8 @@ _LT_EOF | 33230 | @@ -6893,6 +7386,8 @@ _LT_EOF |
21971 | $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 | 33231 | $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 |
21972 | echo "$AR cru libconftest.a conftest.o" >&5 | 33232 | echo "$AR cru libconftest.a conftest.o" >&5 |
21973 | $AR cru libconftest.a conftest.o 2>&5 | 33233 | $AR cru libconftest.a conftest.o 2>&5 |
@@ -21976,26 +33236,7 @@ index b124acf9259..e4075ef3a2c 100755 | |||
21976 | cat > conftest.c << _LT_EOF | 33236 | cat > conftest.c << _LT_EOF |
21977 | int main() { return 0;} | 33237 | int main() { return 0;} |
21978 | _LT_EOF | 33238 | _LT_EOF |
21979 | @@ -7269,7 +7768,8 @@ fi | 33239 | @@ -7744,8 +8239,6 @@ fi |
21980 | LIBTOOL_DEPS="$ltmain" | ||
21981 | |||
21982 | # Always use our own libtool. | ||
21983 | -LIBTOOL='$(SHELL) $(top_builddir)/libtool' | ||
21984 | +LIBTOOL='$(SHELL) $(top_builddir)' | ||
21985 | +LIBTOOL="$LIBTOOL/${host_alias}-libtool" | ||
21986 | |||
21987 | |||
21988 | |||
21989 | @@ -7358,7 +7858,7 @@ aix3*) | ||
21990 | esac | ||
21991 | |||
21992 | # Global variables: | ||
21993 | -ofile=libtool | ||
21994 | +ofile=${host_alias}-libtool | ||
21995 | can_build_shared=yes | ||
21996 | |||
21997 | # All known linkers require a `.a' archive for static linking (except MSVC, | ||
21998 | @@ -7656,8 +8156,6 @@ fi | ||
21999 | lt_prog_compiler_pic= | 33240 | lt_prog_compiler_pic= |
22000 | lt_prog_compiler_static= | 33241 | lt_prog_compiler_static= |
22001 | 33242 | ||
@@ -22004,7 +33245,7 @@ index b124acf9259..e4075ef3a2c 100755 | |||
22004 | 33245 | ||
22005 | if test "$GCC" = yes; then | 33246 | if test "$GCC" = yes; then |
22006 | lt_prog_compiler_wl='-Wl,' | 33247 | lt_prog_compiler_wl='-Wl,' |
22007 | @@ -7823,6 +8321,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } | 33248 | @@ -7911,6 +8404,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } |
22008 | lt_prog_compiler_pic='--shared' | 33249 | lt_prog_compiler_pic='--shared' |
22009 | lt_prog_compiler_static='--static' | 33250 | lt_prog_compiler_static='--static' |
22010 | ;; | 33251 | ;; |
@@ -22017,7 +33258,7 @@ index b124acf9259..e4075ef3a2c 100755 | |||
22017 | pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) | 33258 | pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) |
22018 | # Portland Group compilers (*not* the Pentium gcc compiler, | 33259 | # Portland Group compilers (*not* the Pentium gcc compiler, |
22019 | # which looks to be a dead project) | 33260 | # which looks to be a dead project) |
22020 | @@ -7885,7 +8389,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } | 33261 | @@ -7973,7 +8472,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } |
22021 | lt_prog_compiler_pic='-KPIC' | 33262 | lt_prog_compiler_pic='-KPIC' |
22022 | lt_prog_compiler_static='-Bstatic' | 33263 | lt_prog_compiler_static='-Bstatic' |
22023 | case $cc_basename in | 33264 | case $cc_basename in |
@@ -22026,7 +33267,7 @@ index b124acf9259..e4075ef3a2c 100755 | |||
22026 | lt_prog_compiler_wl='-Qoption ld ';; | 33267 | lt_prog_compiler_wl='-Qoption ld ';; |
22027 | *) | 33268 | *) |
22028 | lt_prog_compiler_wl='-Wl,';; | 33269 | lt_prog_compiler_wl='-Wl,';; |
22029 | @@ -7942,13 +8446,17 @@ case $host_os in | 33270 | @@ -8030,13 +8529,17 @@ case $host_os in |
22030 | lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" | 33271 | lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" |
22031 | ;; | 33272 | ;; |
22032 | esac | 33273 | esac |
@@ -22050,7 +33291,7 @@ index b124acf9259..e4075ef3a2c 100755 | |||
22050 | 33291 | ||
22051 | # | 33292 | # |
22052 | # Check to make sure the PIC flag actually works. | 33293 | # Check to make sure the PIC flag actually works. |
22053 | @@ -8009,6 +8517,11 @@ fi | 33294 | @@ -8097,6 +8600,11 @@ fi |
22054 | 33295 | ||
22055 | 33296 | ||
22056 | 33297 | ||
@@ -22062,7 +33303,7 @@ index b124acf9259..e4075ef3a2c 100755 | |||
22062 | # | 33303 | # |
22063 | # Check to make sure the static flag actually works. | 33304 | # Check to make sure the static flag actually works. |
22064 | # | 33305 | # |
22065 | @@ -8359,7 +8872,8 @@ _LT_EOF | 33306 | @@ -8447,7 +8955,8 @@ _LT_EOF |
22066 | allow_undefined_flag=unsupported | 33307 | allow_undefined_flag=unsupported |
22067 | always_export_symbols=no | 33308 | always_export_symbols=no |
22068 | enable_shared_with_static_runtimes=yes | 33309 | enable_shared_with_static_runtimes=yes |
@@ -22072,7 +33313,7 @@ index b124acf9259..e4075ef3a2c 100755 | |||
22072 | 33313 | ||
22073 | if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then | 33314 | if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then |
22074 | archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' | 33315 | archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' |
22075 | @@ -8458,12 +8972,12 @@ _LT_EOF | 33316 | @@ -8546,12 +9055,12 @@ _LT_EOF |
22076 | whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' | 33317 | whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' |
22077 | hardcode_libdir_flag_spec= | 33318 | hardcode_libdir_flag_spec= |
22078 | hardcode_libdir_flag_spec_ld='-rpath $libdir' | 33319 | hardcode_libdir_flag_spec_ld='-rpath $libdir' |
@@ -22087,7 +33328,7 @@ index b124acf9259..e4075ef3a2c 100755 | |||
22087 | fi | 33328 | fi |
22088 | ;; | 33329 | ;; |
22089 | esac | 33330 | esac |
22090 | @@ -8477,8 +8991,8 @@ _LT_EOF | 33331 | @@ -8565,8 +9074,8 @@ _LT_EOF |
22091 | archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' | 33332 | archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' |
22092 | wlarc= | 33333 | wlarc= |
22093 | else | 33334 | else |
@@ -22098,7 +33339,7 @@ index b124acf9259..e4075ef3a2c 100755 | |||
22098 | fi | 33339 | fi |
22099 | ;; | 33340 | ;; |
22100 | 33341 | ||
22101 | @@ -8496,8 +9010,8 @@ _LT_EOF | 33342 | @@ -8584,8 +9093,8 @@ _LT_EOF |
22102 | 33343 | ||
22103 | _LT_EOF | 33344 | _LT_EOF |
22104 | elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then | 33345 | elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then |
@@ -22109,7 +33350,7 @@ index b124acf9259..e4075ef3a2c 100755 | |||
22109 | else | 33350 | else |
22110 | ld_shlibs=no | 33351 | ld_shlibs=no |
22111 | fi | 33352 | fi |
22112 | @@ -8543,8 +9057,8 @@ _LT_EOF | 33353 | @@ -8631,8 +9140,8 @@ _LT_EOF |
22113 | 33354 | ||
22114 | *) | 33355 | *) |
22115 | if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then | 33356 | if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then |
@@ -22120,7 +33361,7 @@ index b124acf9259..e4075ef3a2c 100755 | |||
22120 | else | 33361 | else |
22121 | ld_shlibs=no | 33362 | ld_shlibs=no |
22122 | fi | 33363 | fi |
22123 | @@ -8674,7 +9188,13 @@ _LT_EOF | 33364 | @@ -8762,7 +9271,13 @@ _LT_EOF |
22124 | allow_undefined_flag='-berok' | 33365 | allow_undefined_flag='-berok' |
22125 | # Determine the default libpath from the value encoded in an | 33366 | # Determine the default libpath from the value encoded in an |
22126 | # empty executable. | 33367 | # empty executable. |
@@ -22135,7 +33376,7 @@ index b124acf9259..e4075ef3a2c 100755 | |||
22135 | as_fn_error $? "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5 | 33376 | as_fn_error $? "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5 |
22136 | fi | 33377 | fi |
22137 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext | 33378 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
22138 | @@ -8690,22 +9210,29 @@ main () | 33379 | @@ -8778,22 +9293,29 @@ main () |
22139 | _ACEOF | 33380 | _ACEOF |
22140 | if ac_fn_c_try_link "$LINENO"; then : | 33381 | if ac_fn_c_try_link "$LINENO"; then : |
22141 | 33382 | ||
@@ -22178,7 +33419,7 @@ index b124acf9259..e4075ef3a2c 100755 | |||
22178 | 33419 | ||
22179 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" | 33420 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" |
22180 | 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" | 33421 | archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" |
22181 | @@ -8717,7 +9244,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | 33422 | @@ -8805,7 +9327,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
22182 | else | 33423 | else |
22183 | # Determine the default libpath from the value encoded in an | 33424 | # Determine the default libpath from the value encoded in an |
22184 | # empty executable. | 33425 | # empty executable. |
@@ -22193,7 +33434,7 @@ index b124acf9259..e4075ef3a2c 100755 | |||
22193 | as_fn_error $? "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5 | 33434 | as_fn_error $? "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5 |
22194 | fi | 33435 | fi |
22195 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext | 33436 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
22196 | @@ -8733,22 +9266,29 @@ main () | 33437 | @@ -8821,22 +9349,29 @@ main () |
22197 | _ACEOF | 33438 | _ACEOF |
22198 | if ac_fn_c_try_link "$LINENO"; then : | 33439 | if ac_fn_c_try_link "$LINENO"; then : |
22199 | 33440 | ||
@@ -22236,7 +33477,7 @@ index b124acf9259..e4075ef3a2c 100755 | |||
22236 | 33477 | ||
22237 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" | 33478 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" |
22238 | # Warning - without using the other run time loading flags, | 33479 | # Warning - without using the other run time loading flags, |
22239 | @@ -8793,20 +9333,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | 33480 | @@ -8881,20 +9416,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
22240 | # Microsoft Visual C++. | 33481 | # Microsoft Visual C++. |
22241 | # hardcode_libdir_flag_spec is actually meaningless, as there is | 33482 | # hardcode_libdir_flag_spec is actually meaningless, as there is |
22242 | # no search path for DLLs. | 33483 | # no search path for DLLs. |
@@ -22314,7 +33555,7 @@ index b124acf9259..e4075ef3a2c 100755 | |||
22314 | ;; | 33555 | ;; |
22315 | 33556 | ||
22316 | darwin* | rhapsody*) | 33557 | darwin* | rhapsody*) |
22317 | @@ -8867,7 +9450,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | 33558 | @@ -8955,7 +9533,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
22318 | 33559 | ||
22319 | # FreeBSD 3 and greater uses gcc -shared to do shared libraries. | 33560 | # FreeBSD 3 and greater uses gcc -shared to do shared libraries. |
22320 | freebsd* | dragonfly*) | 33561 | freebsd* | dragonfly*) |
@@ -22323,7 +33564,7 @@ index b124acf9259..e4075ef3a2c 100755 | |||
22323 | hardcode_libdir_flag_spec='-R$libdir' | 33564 | hardcode_libdir_flag_spec='-R$libdir' |
22324 | hardcode_direct=yes | 33565 | hardcode_direct=yes |
22325 | hardcode_shlibpath_var=no | 33566 | hardcode_shlibpath_var=no |
22326 | @@ -8875,7 +9458,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | 33567 | @@ -8963,7 +9541,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
22327 | 33568 | ||
22328 | hpux9*) | 33569 | hpux9*) |
22329 | if test "$GCC" = yes; then | 33570 | if test "$GCC" = yes; then |
@@ -22332,7 +33573,7 @@ index b124acf9259..e4075ef3a2c 100755 | |||
22332 | else | 33573 | else |
22333 | 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' | 33574 | archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' |
22334 | fi | 33575 | fi |
22335 | @@ -8891,7 +9474,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | 33576 | @@ -8979,7 +9557,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
22336 | 33577 | ||
22337 | hpux10*) | 33578 | hpux10*) |
22338 | if test "$GCC" = yes && test "$with_gnu_ld" = no; then | 33579 | if test "$GCC" = yes && test "$with_gnu_ld" = no; then |
@@ -22341,8 +33582,8 @@ index b124acf9259..e4075ef3a2c 100755 | |||
22341 | else | 33582 | else |
22342 | archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' | 33583 | archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' |
22343 | fi | 33584 | fi |
22344 | @@ -8915,10 +9498,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | 33585 | @@ -9003,10 +9581,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
22345 | archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' | 33586 | archive_cmds='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' |
22346 | ;; | 33587 | ;; |
22347 | ia64*) | 33588 | ia64*) |
22348 | - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' | 33589 | - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' |
@@ -22354,7 +33595,7 @@ index b124acf9259..e4075ef3a2c 100755 | |||
22354 | ;; | 33595 | ;; |
22355 | esac | 33596 | esac |
22356 | else | 33597 | else |
22357 | @@ -8997,26 +9580,39 @@ fi | 33598 | @@ -9085,26 +9663,39 @@ fi |
22358 | 33599 | ||
22359 | irix5* | irix6* | nonstopux*) | 33600 | irix5* | irix6* | nonstopux*) |
22360 | if test "$GCC" = yes; then | 33601 | if test "$GCC" = yes; then |
@@ -22402,7 +33643,7 @@ index b124acf9259..e4075ef3a2c 100755 | |||
22402 | else | 33643 | else |
22403 | 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' | 33644 | archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' |
22404 | 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' | 33645 | archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' |
22405 | @@ -9101,7 +9697,7 @@ rm -f core conftest.err conftest.$ac_objext \ | 33646 | @@ -9189,7 +9780,7 @@ rm -f core conftest.err conftest.$ac_objext \ |
22406 | osf4* | osf5*) # as osf3* with the addition of -msym flag | 33647 | osf4* | osf5*) # as osf3* with the addition of -msym flag |
22407 | if test "$GCC" = yes; then | 33648 | if test "$GCC" = yes; then |
22408 | allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' | 33649 | allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' |
@@ -22411,7 +33652,7 @@ index b124acf9259..e4075ef3a2c 100755 | |||
22411 | hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' | 33652 | hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' |
22412 | else | 33653 | else |
22413 | allow_undefined_flag=' -expect_unresolved \*' | 33654 | allow_undefined_flag=' -expect_unresolved \*' |
22414 | @@ -9120,9 +9716,9 @@ rm -f core conftest.err conftest.$ac_objext \ | 33655 | @@ -9208,9 +9799,9 @@ rm -f core conftest.err conftest.$ac_objext \ |
22415 | no_undefined_flag=' -z defs' | 33656 | no_undefined_flag=' -z defs' |
22416 | if test "$GCC" = yes; then | 33657 | if test "$GCC" = yes; then |
22417 | wlarc='${wl}' | 33658 | wlarc='${wl}' |
@@ -22423,7 +33664,7 @@ index b124acf9259..e4075ef3a2c 100755 | |||
22423 | else | 33664 | else |
22424 | case `$CC -V 2>&1` in | 33665 | case `$CC -V 2>&1` in |
22425 | *"Compilers 5.0"*) | 33666 | *"Compilers 5.0"*) |
22426 | @@ -9698,8 +10294,9 @@ cygwin* | mingw* | pw32* | cegcc*) | 33667 | @@ -9786,8 +10377,9 @@ cygwin* | mingw* | pw32* | cegcc*) |
22427 | need_version=no | 33668 | need_version=no |
22428 | need_lib_prefix=no | 33669 | need_lib_prefix=no |
22429 | 33670 | ||
@@ -22435,7 +33676,7 @@ index b124acf9259..e4075ef3a2c 100755 | |||
22435 | library_names_spec='$libname.dll.a' | 33676 | library_names_spec='$libname.dll.a' |
22436 | # DLL is installed to $(libdir)/../bin by postinstall_cmds | 33677 | # DLL is installed to $(libdir)/../bin by postinstall_cmds |
22437 | postinstall_cmds='base_file=`basename \${file}`~ | 33678 | postinstall_cmds='base_file=`basename \${file}`~ |
22438 | @@ -9732,13 +10329,71 @@ cygwin* | mingw* | pw32* | cegcc*) | 33679 | @@ -9820,13 +10412,71 @@ cygwin* | mingw* | pw32* | cegcc*) |
22439 | library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' | 33680 | library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' |
22440 | ;; | 33681 | ;; |
22441 | esac | 33682 | esac |
@@ -22508,25 +33749,16 @@ index b124acf9259..e4075ef3a2c 100755 | |||
22508 | # FIXME: first we should search . and the directory the executable is in | 33749 | # FIXME: first we should search . and the directory the executable is in |
22509 | shlibpath_var=PATH | 33750 | shlibpath_var=PATH |
22510 | ;; | 33751 | ;; |
22511 | @@ -9820,7 +10475,7 @@ haiku*) | 33752 | @@ -10746,7 +11396,7 @@ else |
22512 | soname_spec='${libname}${release}${shared_ext}$major' | ||
22513 | shlibpath_var=LIBRARY_PATH | ||
22514 | shlibpath_overrides_runpath=yes | ||
22515 | - sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib' | ||
22516 | + sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' | ||
22517 | hardcode_into_libs=yes | ||
22518 | ;; | ||
22519 | |||
22520 | @@ -10634,7 +11289,7 @@ else | ||
22521 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 | 33753 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 |
22522 | lt_status=$lt_dlunknown | 33754 | lt_status=$lt_dlunknown |
22523 | cat > conftest.$ac_ext <<_LT_EOF | 33755 | cat > conftest.$ac_ext <<_LT_EOF |
22524 | -#line 10637 "configure" | 33756 | -#line 10749 "configure" |
22525 | +#line $LINENO "configure" | 33757 | +#line $LINENO "configure" |
22526 | #include "confdefs.h" | 33758 | #include "confdefs.h" |
22527 | 33759 | ||
22528 | #if HAVE_DLFCN_H | 33760 | #if HAVE_DLFCN_H |
22529 | @@ -10678,10 +11333,10 @@ else | 33761 | @@ -10790,10 +11440,10 @@ else |
22530 | /* When -fvisbility=hidden is used, assume the code has been annotated | 33762 | /* When -fvisbility=hidden is used, assume the code has been annotated |
22531 | correspondingly for the symbols needed. */ | 33763 | correspondingly for the symbols needed. */ |
22532 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) | 33764 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) |
@@ -22539,16 +33771,16 @@ index b124acf9259..e4075ef3a2c 100755 | |||
22539 | int main () | 33771 | int main () |
22540 | { | 33772 | { |
22541 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); | 33773 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); |
22542 | @@ -10740,7 +11395,7 @@ else | 33774 | @@ -10852,7 +11502,7 @@ else |
22543 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 | 33775 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 |
22544 | lt_status=$lt_dlunknown | 33776 | lt_status=$lt_dlunknown |
22545 | cat > conftest.$ac_ext <<_LT_EOF | 33777 | cat > conftest.$ac_ext <<_LT_EOF |
22546 | -#line 10743 "configure" | 33778 | -#line 10855 "configure" |
22547 | +#line $LINENO "configure" | 33779 | +#line $LINENO "configure" |
22548 | #include "confdefs.h" | 33780 | #include "confdefs.h" |
22549 | 33781 | ||
22550 | #if HAVE_DLFCN_H | 33782 | #if HAVE_DLFCN_H |
22551 | @@ -10784,10 +11439,10 @@ else | 33783 | @@ -10896,10 +11546,10 @@ else |
22552 | /* When -fvisbility=hidden is used, assume the code has been annotated | 33784 | /* When -fvisbility=hidden is used, assume the code has been annotated |
22553 | correspondingly for the symbols needed. */ | 33785 | correspondingly for the symbols needed. */ |
22554 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) | 33786 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) |
@@ -22561,7 +33793,7 @@ index b124acf9259..e4075ef3a2c 100755 | |||
22561 | int main () | 33793 | int main () |
22562 | { | 33794 | { |
22563 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); | 33795 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); |
22564 | @@ -12257,13 +12912,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' | 33796 | @@ -12385,13 +13035,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' |
22565 | lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' | 33797 | lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' |
22566 | lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' | 33798 | lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' |
22567 | lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' | 33799 | lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' |
@@ -22582,7 +33814,7 @@ index b124acf9259..e4075ef3a2c 100755 | |||
22582 | STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' | 33814 | STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' |
22583 | RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' | 33815 | RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' |
22584 | old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' | 33816 | old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' |
22585 | @@ -12278,14 +12940,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de | 33817 | @@ -12406,14 +13063,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de |
22586 | lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' | 33818 | lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' |
22587 | lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' | 33819 | lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' |
22588 | 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"`' | 33820 | lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`' |
@@ -22601,7 +33833,7 @@ index b124acf9259..e4075ef3a2c 100755 | |||
22601 | DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' | 33833 | DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' |
22602 | NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' | 33834 | NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' |
22603 | LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' | 33835 | LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' |
22604 | @@ -12318,12 +12983,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q | 33836 | @@ -12446,12 +13106,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q |
22605 | hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' | 33837 | hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' |
22606 | inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' | 33838 | inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' |
22607 | link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' | 33839 | link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' |
@@ -22615,7 +33847,7 @@ index b124acf9259..e4075ef3a2c 100755 | |||
22615 | file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' | 33847 | file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' |
22616 | variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' | 33848 | variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' |
22617 | need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' | 33849 | need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' |
22618 | @@ -12378,8 +13043,13 @@ reload_flag \ | 33850 | @@ -12506,8 +13166,13 @@ reload_flag \ |
22619 | OBJDUMP \ | 33851 | OBJDUMP \ |
22620 | deplibs_check_method \ | 33852 | deplibs_check_method \ |
22621 | file_magic_cmd \ | 33853 | file_magic_cmd \ |
@@ -22629,7 +33861,7 @@ index b124acf9259..e4075ef3a2c 100755 | |||
22629 | STRIP \ | 33861 | STRIP \ |
22630 | RANLIB \ | 33862 | RANLIB \ |
22631 | CC \ | 33863 | CC \ |
22632 | @@ -12389,12 +13059,14 @@ lt_cv_sys_global_symbol_pipe \ | 33864 | @@ -12517,12 +13182,14 @@ lt_cv_sys_global_symbol_pipe \ |
22633 | lt_cv_sys_global_symbol_to_cdecl \ | 33865 | lt_cv_sys_global_symbol_to_cdecl \ |
22634 | lt_cv_sys_global_symbol_to_c_name_address \ | 33866 | lt_cv_sys_global_symbol_to_c_name_address \ |
22635 | lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ | 33867 | lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ |
@@ -22645,7 +33877,7 @@ index b124acf9259..e4075ef3a2c 100755 | |||
22645 | DSYMUTIL \ | 33877 | DSYMUTIL \ |
22646 | NMEDIT \ | 33878 | NMEDIT \ |
22647 | LIPO \ | 33879 | LIPO \ |
22648 | @@ -12410,7 +13082,6 @@ no_undefined_flag \ | 33880 | @@ -12538,7 +13205,6 @@ no_undefined_flag \ |
22649 | hardcode_libdir_flag_spec \ | 33881 | hardcode_libdir_flag_spec \ |
22650 | hardcode_libdir_flag_spec_ld \ | 33882 | hardcode_libdir_flag_spec_ld \ |
22651 | hardcode_libdir_separator \ | 33883 | hardcode_libdir_separator \ |
@@ -22653,7 +33885,7 @@ index b124acf9259..e4075ef3a2c 100755 | |||
22653 | exclude_expsyms \ | 33885 | exclude_expsyms \ |
22654 | include_expsyms \ | 33886 | include_expsyms \ |
22655 | file_list_spec \ | 33887 | file_list_spec \ |
22656 | @@ -12446,6 +13117,7 @@ module_cmds \ | 33888 | @@ -12574,6 +13240,7 @@ module_cmds \ |
22657 | module_expsym_cmds \ | 33889 | module_expsym_cmds \ |
22658 | export_symbols_cmds \ | 33890 | export_symbols_cmds \ |
22659 | prelink_cmds \ | 33891 | prelink_cmds \ |
@@ -22661,7 +33893,7 @@ index b124acf9259..e4075ef3a2c 100755 | |||
22661 | postinstall_cmds \ | 33893 | postinstall_cmds \ |
22662 | postuninstall_cmds \ | 33894 | postuninstall_cmds \ |
22663 | finish_cmds \ | 33895 | finish_cmds \ |
22664 | @@ -13044,7 +13716,8 @@ $as_echo X"$file" | | 33896 | @@ -13172,7 +13839,8 @@ $as_echo X"$file" | |
22665 | # NOTE: Changes made to this file will be lost: look at ltmain.sh. | 33897 | # NOTE: Changes made to this file will be lost: look at ltmain.sh. |
22666 | # | 33898 | # |
22667 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, | 33899 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, |
@@ -22671,7 +33903,7 @@ index b124acf9259..e4075ef3a2c 100755 | |||
22671 | # Written by Gordon Matzigkeit, 1996 | 33903 | # Written by Gordon Matzigkeit, 1996 |
22672 | # | 33904 | # |
22673 | # This file is part of GNU Libtool. | 33905 | # This file is part of GNU Libtool. |
22674 | @@ -13147,19 +13820,42 @@ SP2NL=$lt_lt_SP2NL | 33906 | @@ -13275,19 +13943,42 @@ SP2NL=$lt_lt_SP2NL |
22675 | # turn newlines into spaces. | 33907 | # turn newlines into spaces. |
22676 | NL2SP=$lt_lt_NL2SP | 33908 | NL2SP=$lt_lt_NL2SP |
22677 | 33909 | ||
@@ -22715,7 +33947,7 @@ index b124acf9259..e4075ef3a2c 100755 | |||
22715 | # A symbol stripping program. | 33947 | # A symbol stripping program. |
22716 | STRIP=$lt_STRIP | 33948 | STRIP=$lt_STRIP |
22717 | 33949 | ||
22718 | @@ -13189,6 +13885,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address | 33950 | @@ -13317,6 +14008,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address |
22719 | # Transform the output of nm in a C name address pair when lib prefix is needed. | 33951 | # Transform the output of nm in a C name address pair when lib prefix is needed. |
22720 | global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix | 33952 | global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix |
22721 | 33953 | ||
@@ -22728,7 +33960,7 @@ index b124acf9259..e4075ef3a2c 100755 | |||
22728 | # The name of the directory that contains temporary libtool files. | 33960 | # The name of the directory that contains temporary libtool files. |
22729 | objdir=$objdir | 33961 | objdir=$objdir |
22730 | 33962 | ||
22731 | @@ -13198,6 +13900,9 @@ MAGIC_CMD=$MAGIC_CMD | 33963 | @@ -13326,6 +14023,9 @@ MAGIC_CMD=$MAGIC_CMD |
22732 | # Must we lock files when doing compilation? | 33964 | # Must we lock files when doing compilation? |
22733 | need_locks=$lt_need_locks | 33965 | need_locks=$lt_need_locks |
22734 | 33966 | ||
@@ -22738,7 +33970,7 @@ index b124acf9259..e4075ef3a2c 100755 | |||
22738 | # Tool to manipulate archived DWARF debug symbol files on Mac OS X. | 33970 | # Tool to manipulate archived DWARF debug symbol files on Mac OS X. |
22739 | DSYMUTIL=$lt_DSYMUTIL | 33971 | DSYMUTIL=$lt_DSYMUTIL |
22740 | 33972 | ||
22741 | @@ -13312,12 +14017,12 @@ with_gcc=$GCC | 33973 | @@ -13440,12 +14140,12 @@ with_gcc=$GCC |
22742 | # Compiler flag to turn off builtin functions. | 33974 | # Compiler flag to turn off builtin functions. |
22743 | no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag | 33975 | no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag |
22744 | 33976 | ||
@@ -22754,7 +33986,7 @@ index b124acf9259..e4075ef3a2c 100755 | |||
22754 | # Compiler flag to prevent dynamic linking. | 33986 | # Compiler flag to prevent dynamic linking. |
22755 | link_static_flag=$lt_lt_prog_compiler_static | 33987 | link_static_flag=$lt_lt_prog_compiler_static |
22756 | 33988 | ||
22757 | @@ -13404,9 +14109,6 @@ inherit_rpath=$inherit_rpath | 33989 | @@ -13532,9 +14232,6 @@ inherit_rpath=$inherit_rpath |
22758 | # Whether libtool must link a program against all its dependency libraries. | 33990 | # Whether libtool must link a program against all its dependency libraries. |
22759 | link_all_deplibs=$link_all_deplibs | 33991 | link_all_deplibs=$link_all_deplibs |
22760 | 33992 | ||
@@ -22764,7 +33996,7 @@ index b124acf9259..e4075ef3a2c 100755 | |||
22764 | # Set to "yes" if exported symbols are required. | 33996 | # Set to "yes" if exported symbols are required. |
22765 | always_export_symbols=$always_export_symbols | 33997 | always_export_symbols=$always_export_symbols |
22766 | 33998 | ||
22767 | @@ -13422,6 +14124,9 @@ include_expsyms=$lt_include_expsyms | 33999 | @@ -13550,6 +14247,9 @@ include_expsyms=$lt_include_expsyms |
22768 | # Commands necessary for linking programs (against libraries) with templates. | 34000 | # Commands necessary for linking programs (against libraries) with templates. |
22769 | prelink_cmds=$lt_prelink_cmds | 34001 | prelink_cmds=$lt_prelink_cmds |
22770 | 34002 | ||
@@ -22774,7 +34006,7 @@ index b124acf9259..e4075ef3a2c 100755 | |||
22774 | # Specify filename containing input files. | 34006 | # Specify filename containing input files. |
22775 | file_list_spec=$lt_file_list_spec | 34007 | file_list_spec=$lt_file_list_spec |
22776 | 34008 | ||
22777 | @@ -13454,210 +14159,169 @@ ltmain="$ac_aux_dir/ltmain.sh" | 34009 | @@ -13582,210 +14282,169 @@ ltmain="$ac_aux_dir/ltmain.sh" |
22778 | # if finds mixed CR/LF and LF-only lines. Since sed operates in | 34010 | # if finds mixed CR/LF and LF-only lines. Since sed operates in |
22779 | # text mode, it properly converts lines to CR/LF. This bash problem | 34011 | # text mode, it properly converts lines to CR/LF. This bash problem |
22780 | # is reportedly fixed, but why not run on old versions too? | 34012 | # is reportedly fixed, but why not run on old versions too? |
diff --git a/meta/recipes-devtools/binutils/binutils/0009-Change-default-emulation-for-mips64-linux.patch b/meta/recipes-devtools/binutils/binutils/0009-Change-default-emulation-for-mips64-linux.patch deleted file mode 100644 index b8a1939d36..0000000000 --- a/meta/recipes-devtools/binutils/binutils/0009-Change-default-emulation-for-mips64-linux.patch +++ /dev/null | |||
@@ -1,57 +0,0 @@ | |||
1 | From 5bd94030de598d3a13091dafaed3b956e0ab708f Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Mon, 2 Mar 2015 01:44:14 +0000 | ||
4 | Subject: [PATCH] Change default emulation for mips64*-*-linux | ||
5 | |||
6 | we change the default emulations to be N64 instead of N32 | ||
7 | |||
8 | Upstream-Status: Inappropriate [ OE configuration Specific] | ||
9 | |||
10 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
11 | --- | ||
12 | bfd/config.bfd | 8 ++++---- | ||
13 | ld/configure.tgt | 8 ++++---- | ||
14 | 2 files changed, 8 insertions(+), 8 deletions(-) | ||
15 | |||
16 | diff --git a/bfd/config.bfd b/bfd/config.bfd | ||
17 | index e7b55b0dd78..2caf492e172 100644 | ||
18 | --- a/bfd/config.bfd | ||
19 | +++ b/bfd/config.bfd | ||
20 | @@ -896,12 +896,12 @@ case "${targ}" in | ||
21 | targ_selvecs="mips_elf32_le_vec mips_elf64_be_vec mips_elf64_le_vec mips_ecoff_be_vec mips_ecoff_le_vec" | ||
22 | ;; | ||
23 | mips64*el-*-linux*) | ||
24 | - targ_defvec=mips_elf32_ntrad_le_vec | ||
25 | - targ_selvecs="mips_elf32_ntrad_be_vec mips_elf32_trad_le_vec mips_elf32_trad_be_vec mips_elf64_trad_le_vec mips_elf64_trad_be_vec" | ||
26 | + targ_defvec=mips_elf64_trad_le_vec | ||
27 | + targ_selvecs="mips_elf32_ntrad_be_vec mips_elf32_ntrad_le_vec mips_elf32_trad_le_vec mips_elf32_trad_be_vec mips_elf64_trad_be_vec" | ||
28 | ;; | ||
29 | mips64*-*-linux*) | ||
30 | - targ_defvec=mips_elf32_ntrad_be_vec | ||
31 | - targ_selvecs="mips_elf32_ntrad_le_vec mips_elf32_trad_be_vec mips_elf32_trad_le_vec mips_elf64_trad_be_vec mips_elf64_trad_le_vec" | ||
32 | + targ_defvec=mips_elf64_trad_be_vec | ||
33 | + targ_selvecs="mips_elf32_ntrad_be_vec mips_elf32_ntrad_be_vec mips_elf32_trad_be_vec mips_elf32_trad_le_vec mips_elf64_trad_le_vec" | ||
34 | ;; | ||
35 | mips*el-*-linux*) | ||
36 | targ_defvec=mips_elf32_trad_le_vec | ||
37 | diff --git a/ld/configure.tgt b/ld/configure.tgt | ||
38 | index 0c780b24d57..47431770a17 100644 | ||
39 | --- a/ld/configure.tgt | ||
40 | +++ b/ld/configure.tgt | ||
41 | @@ -531,12 +531,12 @@ mips*-*-vxworks*) targ_emul=elf32ebmipvxworks | ||
42 | ;; | ||
43 | mips*-*-windiss) targ_emul=elf32mipswindiss | ||
44 | ;; | ||
45 | -mips64*el-*-linux-*) targ_emul=elf32ltsmipn32 | ||
46 | - targ_extra_emuls="elf32btsmipn32 elf32ltsmip elf32btsmip elf64ltsmip elf64btsmip" | ||
47 | +mips64*el-*-linux-*) targ_emul=elf64ltsmip | ||
48 | + targ_extra_emuls="elf32btsmipn32 elf32ltsmipn32 elf32ltsmip elf32btsmip elf64btsmip" | ||
49 | targ_extra_libpath=$targ_extra_emuls | ||
50 | ;; | ||
51 | -mips64*-*-linux-*) targ_emul=elf32btsmipn32 | ||
52 | - targ_extra_emuls="elf32ltsmipn32 elf32btsmip elf32ltsmip elf64btsmip elf64ltsmip" | ||
53 | +mips64*-*-linux-*) targ_emul=elf64btsmip | ||
54 | + targ_extra_emuls="elf32btsmipn32 elf32ltsmipn32 elf32btsmip elf32ltsmip elf64ltsmip" | ||
55 | targ_extra_libpath=$targ_extra_emuls | ||
56 | ;; | ||
57 | mips*el-*-linux-*) targ_emul=elf32ltsmip | ||
diff --git a/meta/recipes-devtools/binutils/binutils/0014-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 c3a95e653a..50201fb6b6 100644 --- a/meta/recipes-devtools/binutils/binutils/0014-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 0e026a8758a5416b548de21d5245477cf8e33ed2 Mon Sep 17 00:00:00 2001 | 1 | From c9e810840d95554046b7132e3e2c98bf99cb2d89 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 |
@@ -19,7 +19,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
19 | 1 file changed, 8 insertions(+), 2 deletions(-) | 19 | 1 file changed, 8 insertions(+), 2 deletions(-) |
20 | 20 | ||
21 | diff --git a/ltmain.sh b/ltmain.sh | 21 | diff --git a/ltmain.sh b/ltmain.sh |
22 | index 70e856e0659..11ee684cccf 100644 | 22 | index 7f7104ffc82..f59eb4aa631 100644 |
23 | --- a/ltmain.sh | 23 | --- a/ltmain.sh |
24 | +++ b/ltmain.sh | 24 | +++ b/ltmain.sh |
25 | @@ -8035,9 +8035,11 @@ EOF | 25 | @@ -8035,9 +8035,11 @@ EOF |
diff --git a/meta/recipes-devtools/binutils/binutils/0010-Add-support-for-Netlogic-XLP.patch b/meta/recipes-devtools/binutils/binutils/0010-Add-support-for-Netlogic-XLP.patch deleted file mode 100644 index fe2d02f29d..0000000000 --- a/meta/recipes-devtools/binutils/binutils/0010-Add-support-for-Netlogic-XLP.patch +++ /dev/null | |||
@@ -1,406 +0,0 @@ | |||
1 | From c64a5ca02a55b748311032e2c7d9c4f87bd74c63 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Sun, 14 Feb 2016 17:06:19 +0000 | ||
4 | Subject: [PATCH] Add support for Netlogic XLP | ||
5 | |||
6 | Patch From: Nebu Philips <nphilips@netlogicmicro.com> | ||
7 | |||
8 | Using the mipsisa64r2nlm target, add support for XLP from | ||
9 | Netlogic. Also, update vendor name to NLM wherever applicable. | ||
10 | |||
11 | Use 0x00000080 for INSN_XLP, the value 0x00000040 has already been | ||
12 | assigned to INSN_OCTEON3 | ||
13 | |||
14 | Upstream-Status: Pending | ||
15 | |||
16 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
17 | Signed-off-by: Baoshan Pang <baoshan.pang@windriver.com> | ||
18 | Signed-off-by: Mark Hatle <mark.hatle@windriver.com> | ||
19 | --- | ||
20 | bfd/aoutx.h | 1 + | ||
21 | bfd/archures.c | 1 + | ||
22 | bfd/bfd-in2.h | 1 + | ||
23 | bfd/config.bfd | 5 +++++ | ||
24 | bfd/cpu-mips.c | 6 ++++-- | ||
25 | bfd/elfxx-mips.c | 8 ++++++++ | ||
26 | binutils/readelf.c | 1 + | ||
27 | gas/config/tc-mips.c | 4 +++- | ||
28 | gas/configure | 3 +++ | ||
29 | gas/configure.ac | 3 +++ | ||
30 | include/elf/mips.h | 1 + | ||
31 | include/opcode/mips.h | 6 ++++++ | ||
32 | ld/configure.tgt | 3 +++ | ||
33 | opcodes/mips-dis.c | 12 +++++------- | ||
34 | opcodes/mips-opc.c | 31 ++++++++++++++++++++----------- | ||
35 | 15 files changed, 65 insertions(+), 21 deletions(-) | ||
36 | |||
37 | diff --git a/bfd/aoutx.h b/bfd/aoutx.h | ||
38 | index 8025b8c5241..cdcb7876896 100644 | ||
39 | --- a/bfd/aoutx.h | ||
40 | +++ b/bfd/aoutx.h | ||
41 | @@ -810,6 +810,7 @@ NAME (aout, machine_type) (enum bfd_architecture arch, | ||
42 | case bfd_mach_mipsisa64r6: | ||
43 | case bfd_mach_mips_sb1: | ||
44 | case bfd_mach_mips_xlr: | ||
45 | + case bfd_mach_mips_xlp: | ||
46 | /* FIXME: These should be MIPS3, MIPS4, MIPS16, MIPS32, etc. */ | ||
47 | arch_flags = M_MIPS2; | ||
48 | break; | ||
49 | diff --git a/bfd/archures.c b/bfd/archures.c | ||
50 | index 8c1d32ca930..b4b2927ebc0 100644 | ||
51 | --- a/bfd/archures.c | ||
52 | +++ b/bfd/archures.c | ||
53 | @@ -185,6 +185,7 @@ DESCRIPTION | ||
54 | .#define bfd_mach_mips_octeon3 6503 | ||
55 | .#define bfd_mach_mips_xlr 887682 {* decimal 'XLR'. *} | ||
56 | .#define bfd_mach_mips_interaptiv_mr2 736550 {* decimal 'IA2'. *} | ||
57 | +.#define bfd_mach_mips_xlp 887680 {* decimal 'XLP'. *} | ||
58 | .#define bfd_mach_mipsisa32 32 | ||
59 | .#define bfd_mach_mipsisa32r2 33 | ||
60 | .#define bfd_mach_mipsisa32r3 34 | ||
61 | diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h | ||
62 | index 7eff85b7eaa..6c9eb12865e 100644 | ||
63 | --- a/bfd/bfd-in2.h | ||
64 | +++ b/bfd/bfd-in2.h | ||
65 | @@ -1590,6 +1590,7 @@ enum bfd_architecture | ||
66 | #define bfd_mach_mips_octeon3 6503 | ||
67 | #define bfd_mach_mips_xlr 887682 /* decimal 'XLR'. */ | ||
68 | #define bfd_mach_mips_interaptiv_mr2 736550 /* decimal 'IA2'. */ | ||
69 | +#define bfd_mach_mips_xlp 887680 /* decimal 'XLP'. */ | ||
70 | #define bfd_mach_mipsisa32 32 | ||
71 | #define bfd_mach_mipsisa32r2 33 | ||
72 | #define bfd_mach_mipsisa32r3 34 | ||
73 | diff --git a/bfd/config.bfd b/bfd/config.bfd | ||
74 | index 2caf492e172..e75417da4d8 100644 | ||
75 | --- a/bfd/config.bfd | ||
76 | +++ b/bfd/config.bfd | ||
77 | @@ -879,6 +879,11 @@ case "${targ}" in | ||
78 | targ_defvec=mips_elf32_le_vec | ||
79 | targ_selvecs="mips_elf32_be_vec mips_elf64_be_vec mips_elf64_le_vec" | ||
80 | ;; | ||
81 | + mipsisa64*-*-elf*) | ||
82 | + targ_defvec=mips_elf32_trad_be_vec | ||
83 | + targ_selvecs="mips_elf32_trad_le_vec mips_elf64_trad_be_vec mips_elf64_trad_le_vec" | ||
84 | + want64=true | ||
85 | + ;; | ||
86 | mips*-*-elf* | mips*-*-rtems* | mips*-*-windiss | mips*-*-none) | ||
87 | targ_defvec=mips_elf32_be_vec | ||
88 | targ_selvecs="mips_elf32_le_vec mips_elf64_be_vec mips_elf64_le_vec" | ||
89 | diff --git a/bfd/cpu-mips.c b/bfd/cpu-mips.c | ||
90 | index 5a944ceee81..c57d12ba3dd 100644 | ||
91 | --- a/bfd/cpu-mips.c | ||
92 | +++ b/bfd/cpu-mips.c | ||
93 | @@ -108,7 +108,8 @@ enum | ||
94 | I_mipsocteon3, | ||
95 | I_xlr, | ||
96 | I_interaptiv_mr2, | ||
97 | - I_micromips | ||
98 | + I_micromips, | ||
99 | + I_xlp | ||
100 | }; | ||
101 | |||
102 | #define NN(index) (&arch_info_struct[(index) + 1]) | ||
103 | @@ -163,7 +164,8 @@ static const bfd_arch_info_type arch_info_struct[] = | ||
104 | N (64, 64, bfd_mach_mips_xlr, "mips:xlr", FALSE, NN(I_xlr)), | ||
105 | N (32, 32, bfd_mach_mips_interaptiv_mr2, "mips:interaptiv-mr2", FALSE, | ||
106 | NN(I_interaptiv_mr2)), | ||
107 | - N (64, 64, bfd_mach_mips_micromips, "mips:micromips", FALSE, NULL) | ||
108 | + N (64, 64, bfd_mach_mips_micromips, "mips:micromips", FALSE, NN(I_micromips)), | ||
109 | + N (64, 64, bfd_mach_mips_xlp, "mips:xlp", FALSE, NULL) | ||
110 | }; | ||
111 | |||
112 | /* The default architecture is mips:3000, but with a machine number of | ||
113 | diff --git a/bfd/elfxx-mips.c b/bfd/elfxx-mips.c | ||
114 | index 3cbb3cf9495..0c6cd47b40c 100644 | ||
115 | --- a/bfd/elfxx-mips.c | ||
116 | +++ b/bfd/elfxx-mips.c | ||
117 | @@ -6980,6 +6980,9 @@ _bfd_elf_mips_mach (flagword flags) | ||
118 | case E_MIPS_MACH_IAMR2: | ||
119 | return bfd_mach_mips_interaptiv_mr2; | ||
120 | |||
121 | + case E_MIPS_MACH_XLP: | ||
122 | + return bfd_mach_mips_xlp; | ||
123 | + | ||
124 | default: | ||
125 | switch (flags & EF_MIPS_ARCH) | ||
126 | { | ||
127 | @@ -12335,6 +12338,10 @@ mips_set_isa_flags (bfd *abfd) | ||
128 | val = E_MIPS_ARCH_64R2 | E_MIPS_MACH_OCTEON2; | ||
129 | break; | ||
130 | |||
131 | + case bfd_mach_mips_xlp: | ||
132 | + val = E_MIPS_ARCH_64R2 | E_MIPS_MACH_XLP; | ||
133 | + break; | ||
134 | + | ||
135 | case bfd_mach_mipsisa32: | ||
136 | val = E_MIPS_ARCH_32; | ||
137 | break; | ||
138 | @@ -14352,6 +14359,7 @@ static const struct mips_mach_extension mips_mach_extensions[] = | ||
139 | { bfd_mach_mips_gs264e, bfd_mach_mips_gs464e }, | ||
140 | { bfd_mach_mips_gs464e, bfd_mach_mips_gs464 }, | ||
141 | { bfd_mach_mips_gs464, bfd_mach_mipsisa64r2 }, | ||
142 | + { bfd_mach_mips_xlp, bfd_mach_mipsisa64r2 }, | ||
143 | |||
144 | /* MIPS64 extensions. */ | ||
145 | { bfd_mach_mipsisa64r2, bfd_mach_mipsisa64 }, | ||
146 | diff --git a/binutils/readelf.c b/binutils/readelf.c | ||
147 | index ad16b4571c9..4bf2b732502 100644 | ||
148 | --- a/binutils/readelf.c | ||
149 | +++ b/binutils/readelf.c | ||
150 | @@ -3502,6 +3502,7 @@ get_machine_flags (Filedata * filedata, unsigned e_flags, unsigned e_machine) | ||
151 | case E_MIPS_MACH_OCTEON3: strcat (buf, ", octeon3"); break; | ||
152 | case E_MIPS_MACH_XLR: strcat (buf, ", xlr"); break; | ||
153 | case E_MIPS_MACH_IAMR2: strcat (buf, ", interaptiv-mr2"); break; | ||
154 | + case E_MIPS_MACH_XLP: strcat (buf, ", xlp"); break; | ||
155 | case 0: | ||
156 | /* We simply ignore the field in this case to avoid confusion: | ||
157 | MIPS ELF does not specify EF_MIPS_MACH, it is a GNU | ||
158 | diff --git a/gas/config/tc-mips.c b/gas/config/tc-mips.c | ||
159 | index 538b69710f5..b021b64f14b 100644 | ||
160 | --- a/gas/config/tc-mips.c | ||
161 | +++ b/gas/config/tc-mips.c | ||
162 | @@ -568,6 +568,7 @@ static int mips_32bitmode = 0; | ||
163 | || mips_opts.arch == CPU_RM7000 \ | ||
164 | || mips_opts.arch == CPU_VR5500 \ | ||
165 | || mips_opts.micromips \ | ||
166 | + || mips_opts.arch == CPU_XLP \ | ||
167 | ) | ||
168 | |||
169 | /* Whether the processor uses hardware interlocks to protect reads | ||
170 | @@ -597,6 +598,7 @@ static int mips_32bitmode = 0; | ||
171 | && mips_opts.isa != ISA_MIPS3) \ | ||
172 | || mips_opts.arch == CPU_R4300 \ | ||
173 | || mips_opts.micromips \ | ||
174 | + || mips_opts.arch == CPU_XLP \ | ||
175 | ) | ||
176 | |||
177 | /* Whether the processor uses hardware interlocks to protect reads | ||
178 | @@ -20156,7 +20158,7 @@ static const struct mips_cpu_info mips_cpu_info_table[] = | ||
179 | /* Broadcom XLP. | ||
180 | XLP is mostly like XLR, with the prominent exception that it is | ||
181 | MIPS64R2 rather than MIPS64. */ | ||
182 | - { "xlp", 0, 0, ISA_MIPS64R2, CPU_XLR }, | ||
183 | + { "xlp", 0, 0, ISA_MIPS64R2, CPU_XLP }, | ||
184 | |||
185 | /* MIPS 64 Release 6. */ | ||
186 | { "i6400", 0, ASE_VIRT | ASE_MSA, ISA_MIPS64R6, CPU_MIPS64R6}, | ||
187 | diff --git a/gas/configure b/gas/configure | ||
188 | index d03432c6dc6..d5ae54925e9 100755 | ||
189 | --- a/gas/configure | ||
190 | +++ b/gas/configure | ||
191 | @@ -12761,6 +12761,9 @@ _ACEOF | ||
192 | mipsisa64r6 | mipsisa64r6el) | ||
193 | mips_cpu=mips64r6 | ||
194 | ;; | ||
195 | + mipsisa64r2nlm | mipsisa64r2nlmel) | ||
196 | + mips_cpu=xlp | ||
197 | + ;; | ||
198 | mipstx39 | mipstx39el) | ||
199 | mips_cpu=r3900 | ||
200 | ;; | ||
201 | diff --git a/gas/configure.ac b/gas/configure.ac | ||
202 | index 82706561886..f1c27bf2878 100644 | ||
203 | --- a/gas/configure.ac | ||
204 | +++ b/gas/configure.ac | ||
205 | @@ -332,6 +332,9 @@ changequote([,])dnl | ||
206 | mipsisa64r6 | mipsisa64r6el) | ||
207 | mips_cpu=mips64r6 | ||
208 | ;; | ||
209 | + mipsisa64r2nlm | mipsisa64r2nlmel) | ||
210 | + mips_cpu=xlp | ||
211 | + ;; | ||
212 | mipstx39 | mipstx39el) | ||
213 | mips_cpu=r3900 | ||
214 | ;; | ||
215 | diff --git a/include/elf/mips.h b/include/elf/mips.h | ||
216 | index 4bd86307120..2d7df22abf2 100644 | ||
217 | --- a/include/elf/mips.h | ||
218 | +++ b/include/elf/mips.h | ||
219 | @@ -290,6 +290,7 @@ END_RELOC_NUMBERS (R_MIPS_maxext) | ||
220 | #define E_MIPS_MACH_SB1 0x008a0000 | ||
221 | #define E_MIPS_MACH_OCTEON 0x008b0000 | ||
222 | #define E_MIPS_MACH_XLR 0x008c0000 | ||
223 | +#define E_MIPS_MACH_XLP 0x008f0000 | ||
224 | #define E_MIPS_MACH_OCTEON2 0x008d0000 | ||
225 | #define E_MIPS_MACH_OCTEON3 0x008e0000 | ||
226 | #define E_MIPS_MACH_5400 0x00910000 | ||
227 | diff --git a/include/opcode/mips.h b/include/opcode/mips.h | ||
228 | index d1b4a2574ac..879c68fcfd4 100644 | ||
229 | --- a/include/opcode/mips.h | ||
230 | +++ b/include/opcode/mips.h | ||
231 | @@ -1260,6 +1260,8 @@ static const unsigned int mips_isa_table[] = { | ||
232 | #define INSN_XLR 0x00000020 | ||
233 | /* Imagination interAptiv MR2. */ | ||
234 | #define INSN_INTERAPTIV_MR2 0x04000000 | ||
235 | +/* Netlogic XlP instruction */ | ||
236 | +#define INSN_XLP 0x00000080 | ||
237 | |||
238 | /* DSP ASE */ | ||
239 | #define ASE_DSP 0x00000001 | ||
240 | @@ -1384,6 +1386,7 @@ static const unsigned int mips_isa_table[] = { | ||
241 | #define CPU_OCTEON3 6503 | ||
242 | #define CPU_XLR 887682 /* decimal 'XLR' */ | ||
243 | #define CPU_INTERAPTIV_MR2 736550 /* decimal 'IA2' */ | ||
244 | +#define CPU_XLP 887680 /* decimal 'XLP' */ | ||
245 | |||
246 | /* Return true if the given CPU is included in INSN_* mask MASK. */ | ||
247 | |||
248 | @@ -1461,6 +1464,9 @@ cpu_is_member (int cpu, unsigned int mask) | ||
249 | return ((mask & INSN_ISA_MASK) == INSN_ISA32R6) | ||
250 | || ((mask & INSN_ISA_MASK) == INSN_ISA64R6); | ||
251 | |||
252 | + case CPU_XLP: | ||
253 | + return (mask & INSN_XLP) != 0; | ||
254 | + | ||
255 | default: | ||
256 | return FALSE; | ||
257 | } | ||
258 | diff --git a/ld/configure.tgt b/ld/configure.tgt | ||
259 | index 47431770a17..f714744eab3 100644 | ||
260 | --- a/ld/configure.tgt | ||
261 | +++ b/ld/configure.tgt | ||
262 | @@ -510,6 +510,9 @@ mips*-sde-elf* | mips*-mti-elf* | mips*-img-elf*) | ||
263 | targ_emul=elf32btsmip | ||
264 | targ_extra_emuls="elf32ltsmip elf32btsmipn32 elf64btsmip elf32ltsmipn32 elf64ltsmip" | ||
265 | ;; | ||
266 | +mipsisa64*-*-elf*) targ_emul=elf32btsmip | ||
267 | + targ_extra_emuls="elf32ltsmip elf64btsmip elf64ltsmip" | ||
268 | + ;; | ||
269 | mips64*el-ps2-elf*) targ_emul=elf32lr5900n32 | ||
270 | targ_extra_emuls="elf32lr5900" | ||
271 | targ_extra_libpath=$targ_extra_emuls | ||
272 | diff --git a/opcodes/mips-dis.c b/opcodes/mips-dis.c | ||
273 | index 317ced51204..6869f890656 100644 | ||
274 | --- a/opcodes/mips-dis.c | ||
275 | +++ b/opcodes/mips-dis.c | ||
276 | @@ -674,13 +674,11 @@ const struct mips_arch_choice mips_arch_choices[] = | ||
277 | mips_cp0sel_names_xlr, ARRAY_SIZE (mips_cp0sel_names_xlr), | ||
278 | mips_cp1_names_mips3264, mips_hwr_names_numeric }, | ||
279 | |||
280 | - /* XLP is mostly like XLR, with the prominent exception it is being | ||
281 | - MIPS64R2. */ | ||
282 | - { "xlp", 1, bfd_mach_mips_xlr, CPU_XLR, | ||
283 | - ISA_MIPS64R2 | INSN_XLR, 0, | ||
284 | - mips_cp0_names_xlr, | ||
285 | - mips_cp0sel_names_xlr, ARRAY_SIZE (mips_cp0sel_names_xlr), | ||
286 | - mips_cp1_names_mips3264, mips_hwr_names_numeric }, | ||
287 | + { "xlp", 1, bfd_mach_mips_xlp, CPU_XLP, | ||
288 | + ISA_MIPS64R2 | INSN_XLP, 0, | ||
289 | + mips_cp0_names_mips3264r2, | ||
290 | + mips_cp0sel_names_mips3264r2, ARRAY_SIZE (mips_cp0sel_names_mips3264r2), | ||
291 | + mips_cp1_names_mips3264, mips_hwr_names_mips3264r2 }, | ||
292 | |||
293 | /* This entry, mips16, is here only for ISA/processor selection; do | ||
294 | not print its name. */ | ||
295 | diff --git a/opcodes/mips-opc.c b/opcodes/mips-opc.c | ||
296 | index b45eb40bf69..2f4eb5c0354 100644 | ||
297 | --- a/opcodes/mips-opc.c | ||
298 | +++ b/opcodes/mips-opc.c | ||
299 | @@ -328,6 +328,7 @@ decode_mips_operand (const char *p) | ||
300 | #define IOCT3 INSN_OCTEON3 | ||
301 | #define XLR INSN_XLR | ||
302 | #define IAMR2 INSN_INTERAPTIV_MR2 | ||
303 | +#define XLP INSN_XLP | ||
304 | #define IVIRT ASE_VIRT | ||
305 | #define IVIRT64 ASE_VIRT64 | ||
306 | |||
307 | @@ -990,6 +991,7 @@ const struct mips_opcode mips_builtin_opcodes[] = | ||
308 | {"clo", "U,s", 0x70000021, 0xfc0007ff, WR_1|RD_2, 0, I32|N55, 0, I37 }, | ||
309 | {"clz", "d,s", 0x00000050, 0xfc1f07ff, WR_1|RD_2, 0, I37, 0, 0 }, | ||
310 | {"clz", "U,s", 0x70000020, 0xfc0007ff, WR_1|RD_2, 0, I32|N55, 0, I37 }, | ||
311 | +{"crc", "d,s,t", 0x7000001c, 0xfc0007ff, WR_1|RD_2|RD_3, 0, XLP, 0, 0 }, | ||
312 | /* ctc0 is at the bottom of the table. */ | ||
313 | {"ctc1", "t,G", 0x44c00000, 0xffe007ff, RD_1|WR_CC|CM, 0, I1, 0, 0 }, | ||
314 | {"ctc1", "t,S", 0x44c00000, 0xffe007ff, RD_1|WR_CC|CM, 0, I1, 0, 0 }, | ||
315 | @@ -1022,12 +1024,13 @@ const struct mips_opcode mips_builtin_opcodes[] = | ||
316 | {"daddiu", "t,r,j", 0x64000000, 0xfc000000, WR_1|RD_2, 0, I3, 0, 0 }, | ||
317 | {"daddu", "d,v,t", 0x0000002d, 0xfc0007ff, WR_1|RD_2|RD_3, 0, I3, 0, 0 }, | ||
318 | {"daddu", "t,r,I", 0, (int) M_DADDU_I, INSN_MACRO, 0, I3, 0, 0 }, | ||
319 | -{"daddwc", "d,s,t", 0x70000038, 0xfc0007ff, WR_1|RD_2|RD_3|WR_C0|RD_C0, 0, XLR, 0, 0 }, | ||
320 | +{"daddwc", "d,s,t", 0x70000038, 0xfc0007ff, WR_1|RD_2|RD_3|WR_C0|RD_C0, 0, XLR|XLP, 0, 0 }, | ||
321 | {"dbreak", "", 0x7000003f, 0xffffffff, 0, 0, N5, 0, 0 }, | ||
322 | {"dclo", "d,s", 0x00000053, 0xfc1f07ff, WR_1|RD_2, 0, I69, 0, 0 }, | ||
323 | {"dclo", "U,s", 0x70000025, 0xfc0007ff, WR_1|RD_2, 0, I64|N55, 0, I69 }, | ||
324 | {"dclz", "d,s", 0x00000052, 0xfc1f07ff, WR_1|RD_2, 0, I69, 0, 0 }, | ||
325 | {"dclz", "U,s", 0x70000024, 0xfc0007ff, WR_1|RD_2, 0, I64|N55, 0, I69 }, | ||
326 | +{"dcrc", "d,s,t", 0x7000001d, 0xfc0007ff, WR_1|RD_2|RD_3, 0, XLP, 0, 0 }, | ||
327 | /* dctr and dctw are used on the r5000. */ | ||
328 | {"dctr", "o(b)", 0xbc050000, 0xfc1f0000, RD_2, 0, I3, 0, 0 }, | ||
329 | {"dctw", "o(b)", 0xbc090000, 0xfc1f0000, RD_2, 0, I3, 0, 0 }, | ||
330 | @@ -1099,6 +1102,7 @@ const struct mips_opcode mips_builtin_opcodes[] = | ||
331 | {"dmfc0", "t,G,H", 0x40200000, 0xffe007f8, WR_1|RD_C0|LC, 0, I64, 0, 0 }, | ||
332 | {"dmfgc0", "t,G", 0x40600100, 0xffe007ff, WR_1|RD_C0|LC, 0, 0, IVIRT64, 0 }, | ||
333 | {"dmfgc0", "t,G,H", 0x40600100, 0xffe007f8, WR_1|RD_C0|LC, 0, 0, IVIRT64, 0 }, | ||
334 | +{"dmfur", "t,d", 0x7000001e, 0xffe007ff, WR_1, 0, XLP, 0, 0 }, | ||
335 | {"dmt", "", 0x41600bc1, 0xffffffff, TRAP, 0, 0, MT32, 0 }, | ||
336 | {"dmt", "t", 0x41600bc1, 0xffe0ffff, WR_1|TRAP, 0, 0, MT32, 0 }, | ||
337 | {"dmtc0", "t,G", 0x40a00000, 0xffe007ff, RD_1|WR_C0|WR_CC|CM, 0, I3, 0, EE }, | ||
338 | @@ -1114,6 +1118,8 @@ const struct mips_opcode mips_builtin_opcodes[] = | ||
339 | /* dmfc3 is at the bottom of the table. */ | ||
340 | /* dmtc3 is at the bottom of the table. */ | ||
341 | {"dmuh", "d,s,t", 0x000000dc, 0xfc0007ff, WR_1|RD_2|RD_3, 0, I69, 0, 0 }, | ||
342 | +{"dmtur", "t,d", 0x7000001f, 0xffe007ff, RD_1, 0, XLP, 0, 0 }, | ||
343 | +{"dmul", "d,s,t", 0x70000006, 0xfc0007ff, WR_1|RD_2|RD_3, 0, XLP, 0, 0 }, | ||
344 | {"dmul", "d,s,t", 0x0000009c, 0xfc0007ff, WR_1|RD_2|RD_3, 0, I69, 0, 0 }, | ||
345 | {"dmul", "d,v,t", 0x70000003, 0xfc0007ff, WR_1|RD_2|RD_3|WR_HILO, 0, IOCT, 0, 0 }, | ||
346 | {"dmul", "d,v,t", 0, (int) M_DMUL, INSN_MACRO, 0, I3, 0, M32|I69 }, | ||
347 | @@ -1267,9 +1273,9 @@ const struct mips_opcode mips_builtin_opcodes[] = | ||
348 | {"ld", "s,-b(+R)", 0xec180000, 0xfc1c0000, WR_1, RD_pc, I69, 0, 0 }, | ||
349 | {"ld", "t,A(b)", 0, (int) M_LD_AB, INSN_MACRO, 0, I1, 0, 0 }, | ||
350 | {"ld", "t,o(b)", 0xdc000000, 0xfc000000, WR_1|RD_3|LM, 0, I3, 0, 0 }, | ||
351 | -{"ldaddw", "t,b", 0x70000010, 0xfc00ffff, MOD_1|RD_2|LM|SM, 0, XLR, 0, 0 }, | ||
352 | -{"ldaddwu", "t,b", 0x70000011, 0xfc00ffff, MOD_1|RD_2|LM|SM, 0, XLR, 0, 0 }, | ||
353 | -{"ldaddd", "t,b", 0x70000012, 0xfc00ffff, MOD_1|RD_2|LM|SM, 0, XLR, 0, 0 }, | ||
354 | +{"ldaddw", "t,b", 0x70000010, 0xfc00ffff, MOD_1|RD_2|SM, 0, XLR|XLP, 0, 0 }, | ||
355 | +{"ldaddwu", "t,b", 0x70000011, 0xfc00ffff, MOD_1|RD_2|SM, 0, XLR|XLP, 0, 0 }, | ||
356 | +{"ldaddd", "t,b", 0x70000012, 0xfc00ffff, MOD_1|RD_2|SM, 0, XLR|XLP, 0, 0 }, | ||
357 | {"ldc1", "T,o(b)", 0xd4000000, 0xfc000000, WR_1|RD_3|CLD|FP_D, 0, I2, 0, SF }, | ||
358 | {"ldc1", "E,o(b)", 0xd4000000, 0xfc000000, WR_1|RD_3|CLD|FP_D, 0, I2, 0, SF }, | ||
359 | {"ldc1", "T,A(b)", 0, (int) M_LDC1_AB, INSN_MACRO, INSN2_M_FP_D, I2, 0, SF }, | ||
360 | @@ -1438,7 +1444,7 @@ const struct mips_opcode mips_builtin_opcodes[] = | ||
361 | {"mflo", "d,9", 0x00000012, 0xff9f07ff, WR_1|RD_LO, 0, 0, D32, 0 }, | ||
362 | {"mflo1", "d", 0x70000012, 0xffff07ff, WR_1|RD_LO, 0, EE, 0, 0 }, | ||
363 | {"mflhxu", "d", 0x00000052, 0xffff07ff, WR_1|MOD_HILO, 0, 0, SMT, 0 }, | ||
364 | -{"mfcr", "t,s", 0x70000018, 0xfc00ffff, WR_1|RD_2, 0, XLR, 0, 0 }, | ||
365 | +{"mfcr", "t,s", 0x70000018, 0xfc00ffff, WR_1, 0, XLR|XLP, 0, 0 }, | ||
366 | {"mfsa", "d", 0x00000028, 0xffff07ff, WR_1, 0, EE, 0, 0 }, | ||
367 | {"min.ob", "X,Y,Q", 0x78000006, 0xfc20003f, WR_1|RD_2|RD_3|FP_D, 0, SB1, MX, 0 }, | ||
368 | {"min.ob", "D,S,Q", 0x48000006, 0xfc20003f, WR_1|RD_2|RD_3|FP_D, 0, N54, 0, 0 }, | ||
369 | @@ -1483,10 +1489,13 @@ const struct mips_opcode mips_builtin_opcodes[] = | ||
370 | /* move is at the top of the table. */ | ||
371 | {"msgn.qh", "X,Y,Q", 0x78200000, 0xfc20003f, WR_1|RD_2|RD_3|FP_D, 0, 0, MX, 0 }, | ||
372 | {"msgsnd", "t", 0, (int) M_MSGSND, INSN_MACRO, 0, XLR, 0, 0 }, | ||
373 | +{"msgsnds", "d,t", 0x4a000001, 0xffe007ff, WR_1|RD_2|RD_C0|WR_C0, 0, XLP, 0, 0 }, | ||
374 | {"msgld", "", 0, (int) M_MSGLD, INSN_MACRO, 0, XLR, 0, 0 }, | ||
375 | {"msgld", "t", 0, (int) M_MSGLD_T, INSN_MACRO, 0, XLR, 0, 0 }, | ||
376 | -{"msgwait", "", 0, (int) M_MSGWAIT, INSN_MACRO, 0, XLR, 0, 0 }, | ||
377 | -{"msgwait", "t", 0, (int) M_MSGWAIT_T,INSN_MACRO, 0, XLR, 0, 0 }, | ||
378 | +{"msglds", "d,t", 0x4a000002, 0xffe007ff, WR_1|RD_2|RD_C0|WR_C0, 0, XLP, 0, 0 }, | ||
379 | +{"msgwait", "", 0, (int) M_MSGWAIT, INSN_MACRO, 0, XLR|XLP, 0, 0 }, | ||
380 | +{"msgwait", "t", 0, (int) M_MSGWAIT_T,INSN_MACRO, 0, XLR|XLP, 0, 0 }, | ||
381 | +{"msgsync", "", 0x4a000004, 0xffffffff,0, 0, XLP, 0, 0 }, | ||
382 | {"msub.d", "D,R,S,T", 0x4c000029, 0xfc00003f, WR_1|RD_2|RD_3|RD_4|FP_D, 0, I4_33, 0, I37 }, | ||
383 | {"msub.d", "D,S,T", 0x46200019, 0xffe0003f, WR_1|RD_2|RD_3|FP_D, 0, IL2E, 0, 0 }, | ||
384 | {"msub.d", "D,S,T", 0x72200019, 0xffe0003f, WR_1|RD_2|RD_3|FP_D, 0, IL2F, 0, 0 }, | ||
385 | @@ -1536,7 +1545,7 @@ const struct mips_opcode mips_builtin_opcodes[] = | ||
386 | {"mtlo", "s,7", 0x00000013, 0xfc1fe7ff, RD_1|WR_LO, 0, 0, D32, 0 }, | ||
387 | {"mtlo1", "s", 0x70000013, 0xfc1fffff, RD_1|WR_LO, 0, EE, 0, 0 }, | ||
388 | {"mtlhx", "s", 0x00000053, 0xfc1fffff, RD_1|MOD_HILO, 0, 0, SMT, 0 }, | ||
389 | -{"mtcr", "t,s", 0x70000019, 0xfc00ffff, RD_1|RD_2, 0, XLR, 0, 0 }, | ||
390 | +{"mtcr", "t,s", 0x70000019, 0xfc00ffff, RD_1, 0, XLR|XLP, 0, 0 }, | ||
391 | {"mtm0", "s", 0x70000008, 0xfc1fffff, RD_1, 0, IOCT, 0, 0 }, | ||
392 | {"mtm0", "s,t", 0x70000008, 0xfc00ffff, RD_1|RD_2, 0, IOCT3, 0, 0 }, | ||
393 | {"mtm1", "s", 0x7000000c, 0xfc1fffff, RD_1, 0, IOCT, 0, 0 }, | ||
394 | @@ -1978,9 +1987,9 @@ const struct mips_opcode mips_builtin_opcodes[] = | ||
395 | {"suxc1", "S,t(b)", 0x4c00000d, 0xfc0007ff, RD_1|RD_2|RD_3|SM|FP_D, 0, I5_33|N55, 0, I37}, | ||
396 | {"sw", "t,o(b)", 0xac000000, 0xfc000000, RD_1|RD_3|SM, 0, I1, 0, 0 }, | ||
397 | {"sw", "t,A(b)", 0, (int) M_SW_AB, INSN_MACRO, 0, I1, 0, 0 }, | ||
398 | -{"swapw", "t,b", 0x70000014, 0xfc00ffff, MOD_1|RD_2|LM|SM, 0, XLR, 0, 0 }, | ||
399 | -{"swapwu", "t,b", 0x70000015, 0xfc00ffff, MOD_1|RD_2|LM|SM, 0, XLR, 0, 0 }, | ||
400 | -{"swapd", "t,b", 0x70000016, 0xfc00ffff, MOD_1|RD_2|LM|SM, 0, XLR, 0, 0 }, | ||
401 | +{"swapw", "t,b", 0x70000014, 0xfc00ffff, MOD_1|RD_2|SM, 0, XLR|XLP, 0, 0 }, | ||
402 | +{"swapwu", "t,b", 0x70000015, 0xfc00ffff, MOD_1|RD_2|SM, 0, XLR|XLP, 0, 0 }, | ||
403 | +{"swapd", "t,b", 0x70000016, 0xfc00ffff, MOD_1|RD_2|SM, 0, XLR|XLP, 0, 0 }, | ||
404 | {"swc0", "E,o(b)", 0xe0000000, 0xfc000000, RD_3|RD_C0|SM, 0, I1, 0, IOCT|IOCTP|IOCT2|I37 }, | ||
405 | {"swc0", "E,A(b)", 0, (int) M_SWC0_AB, INSN_MACRO, 0, I1, 0, IOCT|IOCTP|IOCT2|I37 }, | ||
406 | {"swc1", "T,o(b)", 0xe4000000, 0xfc000000, RD_1|RD_3|SM|FP_S, 0, I1, 0, 0 }, | ||
diff --git a/meta/recipes-devtools/binutils/binutils/0015-sync-with-OE-libtool-changes.patch b/meta/recipes-devtools/binutils/binutils/0010-sync-with-OE-libtool-changes.patch index 824d9d4605..57d9ac5f27 100644 --- a/meta/recipes-devtools/binutils/binutils/0015-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 9d41698ca97b2c5c20ac83147de1f02d385fa66f Mon Sep 17 00:00:00 2001 | 1 | From befc176c209bbb4c32b57c2068e813c88b1ab6b1 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 |
@@ -26,7 +26,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
26 | 1 file changed, 28 insertions(+), 6 deletions(-) | 26 | 1 file changed, 28 insertions(+), 6 deletions(-) |
27 | 27 | ||
28 | diff --git a/ltmain.sh b/ltmain.sh | 28 | diff --git a/ltmain.sh b/ltmain.sh |
29 | index 11ee684cccf..3b19ac15328 100644 | 29 | index f59eb4aa631..ce97db42ce7 100644 |
30 | --- a/ltmain.sh | 30 | --- a/ltmain.sh |
31 | +++ b/ltmain.sh | 31 | +++ b/ltmain.sh |
32 | @@ -8053,8 +8053,16 @@ EOF | 32 | @@ -8053,8 +8053,16 @@ EOF |
diff --git a/meta/recipes-devtools/binutils/binutils/0016-Check-for-clang-before-checking-gcc-version.patch b/meta/recipes-devtools/binutils/binutils/0011-Check-for-clang-before-checking-gcc-version.patch index 0602c803db..c47f41f5ca 100644 --- a/meta/recipes-devtools/binutils/binutils/0016-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 805e3ce0c20bee5049ff167ab6f620a230c6db51 Mon Sep 17 00:00:00 2001 | 1 | From cad852e0ed46a1c26607f9e7d17cc5974b05e38a 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 7b369071141..7da69e27ce9 100755 | 21 | index 670684d83d1..f9ba1c0a4f7 100755 |
22 | --- a/configure | 22 | --- a/configure |
23 | +++ b/configure | 23 | +++ b/configure |
24 | @@ -5093,7 +5093,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu | 24 | @@ -5432,7 +5432,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu |
25 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext | 25 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
26 | /* end confdefs.h. */ | 26 | /* end confdefs.h. */ |
27 | 27 | ||
@@ -31,10 +31,10 @@ index 7b369071141..7da69e27ce9 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 92f01fb3ed7..e99d67ab86b 100644 | 34 | index 88b4800e298..6cd4530db56 100644 |
35 | --- a/configure.ac | 35 | --- a/configure.ac |
36 | +++ b/configure.ac | 36 | +++ b/configure.ac |
37 | @@ -1311,7 +1311,7 @@ if test "$GCC" = yes; then | 37 | @@ -1410,7 +1410,7 @@ if test "$GCC" = yes; then |
38 | AC_MSG_CHECKING([whether g++ accepts -static-libstdc++ -static-libgcc]) | 38 | AC_MSG_CHECKING([whether g++ accepts -static-libstdc++ -static-libgcc]) |
39 | AC_LANG_PUSH(C++) | 39 | AC_LANG_PUSH(C++) |
40 | AC_LINK_IFELSE([AC_LANG_SOURCE([ | 40 | AC_LINK_IFELSE([AC_LANG_SOURCE([ |
diff --git a/meta/recipes-devtools/binutils/binutils/0012-Detect-64-bit-MIPS-targets.patch b/meta/recipes-devtools/binutils/binutils/0012-Detect-64-bit-MIPS-targets.patch deleted file mode 100644 index 659ae799ad..0000000000 --- a/meta/recipes-devtools/binutils/binutils/0012-Detect-64-bit-MIPS-targets.patch +++ /dev/null | |||
@@ -1,47 +0,0 @@ | |||
1 | From bb229568e505f2276ca58b72fef6781034fa839f Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Fri, 31 Mar 2017 11:42:03 -0700 | ||
4 | Subject: [PATCH] Detect 64-bit MIPS targets | ||
5 | |||
6 | Add mips64 target triplets and default to N64 | ||
7 | |||
8 | Upstream-Status: Submitted | ||
9 | https://sourceware.org/ml/binutils/2016-08/msg00048.html | ||
10 | |||
11 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
12 | --- | ||
13 | gold/configure.tgt | 14 ++++++++++++++ | ||
14 | 1 file changed, 14 insertions(+) | ||
15 | |||
16 | diff --git a/gold/configure.tgt b/gold/configure.tgt | ||
17 | index cac0866e628..24fbf641456 100644 | ||
18 | --- a/gold/configure.tgt | ||
19 | +++ b/gold/configure.tgt | ||
20 | @@ -153,6 +153,13 @@ aarch64*-*) | ||
21 | targ_big_endian=false | ||
22 | targ_extra_big_endian=true | ||
23 | ;; | ||
24 | +mips*64*el*-*-*|mips*64*le*-*-*) | ||
25 | + targ_obj=mips | ||
26 | + targ_machine=EM_MIPS_RS3_LE | ||
27 | + targ_size=64 | ||
28 | + targ_big_endian=false | ||
29 | + targ_extra_big_endian=true | ||
30 | + ;; | ||
31 | mips*el*-*-*|mips*le*-*-*) | ||
32 | targ_obj=mips | ||
33 | targ_machine=EM_MIPS_RS3_LE | ||
34 | @@ -160,6 +167,13 @@ mips*el*-*-*|mips*le*-*-*) | ||
35 | targ_big_endian=false | ||
36 | targ_extra_big_endian=true | ||
37 | ;; | ||
38 | +mips*64*-*-*) | ||
39 | + targ_obj=mips | ||
40 | + targ_machine=EM_MIPS | ||
41 | + targ_size=64 | ||
42 | + targ_big_endian=true | ||
43 | + targ_extra_big_endian=false | ||
44 | + ;; | ||
45 | mips*-*-*) | ||
46 | targ_obj=mips | ||
47 | targ_machine=EM_MIPS | ||
diff --git a/meta/recipes-devtools/binutils/binutils/0006-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 caa5f0bdd3..985911aab1 100644 --- a/meta/recipes-devtools/binutils/binutils/0006-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch +++ b/meta/recipes-devtools/binutils/binutils/0012-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch | |||
@@ -1,6 +1,6 @@ | |||
1 | From 8ad249270414a23a3e65c74fd67a8e4adaebec78 Mon Sep 17 00:00:00 2001 | 1 | From 47e53916e3112391d8bff2b2257dcec0a2426d66 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:27:17 +0000 | 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 |
5 | 5 | ||
6 | for cases where -rpath isn't specified. debian (#151024) | 6 | for cases where -rpath isn't specified. debian (#151024) |
@@ -10,23 +10,24 @@ Upstream-Status: Pending | |||
10 | Signed-off-by: Chris Chimelis <chris@debian.org> | 10 | Signed-off-by: Chris Chimelis <chris@debian.org> |
11 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 11 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
12 | --- | 12 | --- |
13 | ld/ldelf.c | 4 ++++ | 13 | ld/ldelf.c | 5 +++++ |
14 | 1 file changed, 4 insertions(+) | 14 | 1 file changed, 5 insertions(+) |
15 | 15 | ||
16 | diff --git a/ld/ldelf.c b/ld/ldelf.c | 16 | diff --git a/ld/ldelf.c b/ld/ldelf.c |
17 | index b25781cc0c4..77d7fb8ff03 100644 | 17 | index 187b359af86..ad792f02d63 100644 |
18 | --- a/ld/ldelf.c | 18 | --- a/ld/ldelf.c |
19 | +++ b/ld/ldelf.c | 19 | +++ b/ld/ldelf.c |
20 | @@ -1248,6 +1248,8 @@ ldelf_after_open (int use_libpath, int native, int is_linux, int is_freebsd, | 20 | @@ -1130,6 +1130,9 @@ ldelf_handle_dt_needed (struct elf_link_hash_table *htab, |
21 | && command_line.rpath == NULL) | 21 | && command_line.rpath == NULL) |
22 | { | 22 | { |
23 | path = (const char *) getenv ("LD_RUN_PATH"); | 23 | path = (const char *) getenv ("LD_RUN_PATH"); |
24 | + if ((path) && (strlen (path) == 0)) | 24 | + if ((path) && (strlen (path) == 0)) |
25 | + path = NULL; | 25 | + path = NULL; |
26 | + | ||
26 | if (path | 27 | if (path |
27 | && ldelf_search_needed (path, &n, force, | 28 | && ldelf_search_needed (path, &n, force, |
28 | is_linux, elfsize)) | 29 | is_linux, elfsize)) |
29 | @@ -1608,6 +1610,8 @@ ldelf_before_allocation (char *audit, char *depaudit, | 30 | @@ -1805,6 +1808,8 @@ ldelf_before_allocation (char *audit, char *depaudit, |
30 | rpath = command_line.rpath; | 31 | rpath = command_line.rpath; |
31 | if (rpath == NULL) | 32 | if (rpath == NULL) |
32 | rpath = (const char *) getenv ("LD_RUN_PATH"); | 33 | rpath = (const char *) getenv ("LD_RUN_PATH"); |
diff --git a/meta/recipes-devtools/binutils/binutils/0013-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..0cb2f46a07 --- /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 d479020609329cdc7fa3675bc3daf072401fefae 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 49e8e0b6c2b..72de5cc8ad6 100644 | ||
29 | --- a/libiberty/sha1.c | ||
30 | +++ b/libiberty/sha1.c | ||
31 | @@ -234,7 +234,17 @@ sha1_process_bytes (const void *buffer, size_t len, struct sha1_ctx *ctx) | ||
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-Remove-duplicate-pe-dll.o-entry-deom-targ_extra_ofil.patch b/meta/recipes-devtools/binutils/binutils/0014-Remove-duplicate-pe-dll.o-entry-deom-targ_extra_ofil.patch new file mode 100644 index 0000000000..8aef2cc710 --- /dev/null +++ b/meta/recipes-devtools/binutils/binutils/0014-Remove-duplicate-pe-dll.o-entry-deom-targ_extra_ofil.patch | |||
@@ -0,0 +1,32 @@ | |||
1 | From ddd941856582a82171626cbe609325b11e223704 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 | 2 +- | ||
18 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
19 | |||
20 | diff --git a/ld/configure.tgt b/ld/configure.tgt | ||
21 | index f937f78b876..830613744c2 100644 | ||
22 | --- a/ld/configure.tgt | ||
23 | +++ b/ld/configure.tgt | ||
24 | @@ -1067,7 +1067,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/0015-gprofng-change-use-of-bignum-to-bigint.patch b/meta/recipes-devtools/binutils/binutils/0015-gprofng-change-use-of-bignum-to-bigint.patch new file mode 100644 index 0000000000..0d3d289eba --- /dev/null +++ b/meta/recipes-devtools/binutils/binutils/0015-gprofng-change-use-of-bignum-to-bigint.patch | |||
@@ -0,0 +1,17 @@ | |||
1 | Upstream-Status: Backport [https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=3243d790ee32aa8eda69226d81b1e79dbd1dcd87] | ||
2 | |||
3 | Signed-off-by: Harish Sadineni <Harish.Sadineni@windriver.com> | ||
4 | |||
5 | diff --git a/gprofng/gp-display-html/gp-display-html.in b/gprofng/gp-display-html/gp-display-html.in | ||
6 | index 6f37ca282e7..306c99a0ec3 100644 | ||
7 | --- a/gprofng/gp-display-html/gp-display-html.in | ||
8 | +++ b/gprofng/gp-display-html/gp-display-html.in | ||
9 | @@ -25,7 +25,7 @@ use warnings; | ||
10 | # Disable before release | ||
11 | # use Perl::Critic; | ||
12 | |||
13 | -use bignum; | ||
14 | +use bigint; | ||
15 | use List::Util qw (max); | ||
16 | use Cwd qw (abs_path cwd); | ||
17 | use File::Basename; | ||