diff options
author | Mark Hatle <mark.hatle@xilinx.com> | 2021-10-12 14:07:24 -0700 |
---|---|---|
committer | Mark Hatle <mark.hatle@xilinx.com> | 2021-10-25 14:53:19 -0700 |
commit | 294443d89dd53435fc0ccc6113c7ec5aff326612 (patch) | |
tree | dfcaac0abd30ee7438baad7b3f1eca2f123816ec /meta-microblaze/recipes-devtools | |
parent | 0e54230906b44aa9f0187ac221b04cb0c1ec178d (diff) | |
download | meta-xilinx-294443d89dd53435fc0ccc6113c7ec5aff326612.tar.gz |
binutils: Import gatesgarth version, converted to new variable syntax
Signed-off-by: Mark Hatle <mark.hatle@xilinx.com>
Diffstat (limited to 'meta-microblaze/recipes-devtools')
29 files changed, 25355 insertions, 0 deletions
diff --git a/meta-microblaze/recipes-devtools/binutils/binutils-2.35.1.inc b/meta-microblaze/recipes-devtools/binutils/binutils-2.35.1.inc new file mode 100644 index 00000000..6290d5b1 --- /dev/null +++ b/meta-microblaze/recipes-devtools/binutils/binutils-2.35.1.inc | |||
@@ -0,0 +1,49 @@ | |||
1 | LIC_FILES_CHKSUM="\ | ||
2 | file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552\ | ||
3 | file://COPYING.LIB;md5=9f604d8a4f8e74f4f5140845a21b6674\ | ||
4 | file://COPYING3;md5=d32239bcb673463ab874e80d47fae504\ | ||
5 | file://COPYING3.LIB;md5=6a6a8e020838b23406c81b19c1d46df6\ | ||
6 | file://gas/COPYING;md5=d32239bcb673463ab874e80d47fae504\ | ||
7 | file://include/COPYING;md5=59530bdf33659b29e73d4adb9f9f6552\ | ||
8 | file://include/COPYING3;md5=d32239bcb673463ab874e80d47fae504\ | ||
9 | file://libiberty/COPYING.LIB;md5=a916467b91076e631dd8edb7424769c7\ | ||
10 | file://bfd/COPYING;md5=d32239bcb673463ab874e80d47fae504\ | ||
11 | " | ||
12 | |||
13 | def binutils_branch_version(d): | ||
14 | pvsplit = d.getVar('PV').split('.') | ||
15 | return pvsplit[0] + "_" + pvsplit[1] | ||
16 | |||
17 | # When upgrading to 2.35, please make sure there is no trailing .0, so | ||
18 | # that upstream version check can work correctly. | ||
19 | PV = "2.35.1" | ||
20 | CVE_VERSION = "2.35.1" | ||
21 | BINUPV = "${@binutils_branch_version(d)}" | ||
22 | #BRANCH = "binutils-${BINUPV}-branch" | ||
23 | BRANCH ?= "binutils-2_35-branch" | ||
24 | |||
25 | UPSTREAM_CHECK_GITTAGREGEX = "binutils-(?P<pver>\d+_(\d_?)*)" | ||
26 | |||
27 | SRCREV ?= "7e46a74aa3713c563940960e361e08defda019c2" | ||
28 | BINUTILS_GIT_URI ?= "git://sourceware.org/git/binutils-gdb.git;branch=${BRANCH};protocol=git" | ||
29 | SRC_URI = "\ | ||
30 | ${BINUTILS_GIT_URI} \ | ||
31 | file://0004-configure-widen-the-regexp-for-SH-architectures.patch \ | ||
32 | file://0005-Point-scripts-location-to-libdir.patch \ | ||
33 | file://0006-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch \ | ||
34 | file://0007-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch \ | ||
35 | file://0008-warn-for-uses-of-system-directories-when-cross-linki.patch \ | ||
36 | file://0009-Change-default-emulation-for-mips64-linux.patch \ | ||
37 | file://0010-Add-support-for-Netlogic-XLP.patch \ | ||
38 | file://0011-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch \ | ||
39 | file://0012-Detect-64-bit-MIPS-targets.patch \ | ||
40 | file://0013-Use-libtool-2.4.patch \ | ||
41 | file://0014-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch \ | ||
42 | file://0015-sync-with-OE-libtool-changes.patch \ | ||
43 | file://0016-Check-for-clang-before-checking-gcc-version.patch \ | ||
44 | file://0017-gas-improve-reproducibility-for-stabs-debugging-data.patch \ | ||
45 | file://0001-aarch64-Return-an-error-on-conditional-branch-to-an-.patch \ | ||
46 | file://CVE-2020-35448.patch \ | ||
47 | file://0001-gold-ensure-file_counts_lock-is-initialized-before-u.patch \ | ||
48 | " | ||
49 | S = "${WORKDIR}/git" | ||
diff --git a/meta-microblaze/recipes-devtools/binutils/binutils-cross-canadian.inc b/meta-microblaze/recipes-devtools/binutils/binutils-cross-canadian.inc new file mode 100644 index 00000000..f44f4660 --- /dev/null +++ b/meta-microblaze/recipes-devtools/binutils/binutils-cross-canadian.inc | |||
@@ -0,0 +1,32 @@ | |||
1 | inherit cross-canadian | ||
2 | |||
3 | SUMMARY = "GNU binary utilities (cross-canadian for ${TARGET_ARCH} target)" | ||
4 | PN = "binutils-cross-canadian-${TRANSLATED_TARGET_ARCH}" | ||
5 | BPN = "binutils" | ||
6 | |||
7 | DEPENDS = "flex-native bison-native virtual/${HOST_PREFIX}gcc-crosssdk virtual/nativesdk-libc nativesdk-zlib nativesdk-gettext nativesdk-flex" | ||
8 | EXTRA_OECONF += "--with-sysroot=${SDKPATH}/sysroots/${TUNE_PKGARCH}${TARGET_VENDOR}-${TARGET_OS} \ | ||
9 | --enable-poison-system-directories \ | ||
10 | " | ||
11 | |||
12 | # We have to point binutils at a sysroot but we don't need to rebuild if this changes | ||
13 | # e.g. we switch between different machines with different tunes. | ||
14 | EXTRA_OECONF[vardepsexclude] = "TUNE_PKGARCH" | ||
15 | |||
16 | LDGOLD:sdkmingw32 = "" | ||
17 | |||
18 | do_install () { | ||
19 | autotools_do_install | ||
20 | |||
21 | # We're not interested in the libs or headers, these would come from the | ||
22 | # nativesdk or target version of the binutils recipe | ||
23 | rm -rf ${D}${prefix}/${TARGET_SYS} | ||
24 | rm -f ${D}${libdir}/libbfd* | ||
25 | rm -f ${D}${libdir}/libiberty* | ||
26 | rm -f ${D}${libdir}/libopcodes* | ||
27 | rm -f ${D}${includedir}/*.h | ||
28 | |||
29 | cross_canadian_bindirlinks | ||
30 | } | ||
31 | |||
32 | BBCLASSEXTEND = "" | ||
diff --git a/meta-microblaze/recipes-devtools/binutils/binutils-cross-canadian_2.35.1.bb b/meta-microblaze/recipes-devtools/binutils/binutils-cross-canadian_2.35.1.bb new file mode 100644 index 00000000..5dbaa030 --- /dev/null +++ b/meta-microblaze/recipes-devtools/binutils/binutils-cross-canadian_2.35.1.bb | |||
@@ -0,0 +1,3 @@ | |||
1 | require binutils.inc | ||
2 | require binutils-${PV}.inc | ||
3 | require binutils-cross-canadian.inc | ||
diff --git a/meta-microblaze/recipes-devtools/binutils/binutils-cross-testsuite_2.35.1.bb b/meta-microblaze/recipes-devtools/binutils/binutils-cross-testsuite_2.35.1.bb new file mode 100644 index 00000000..07a8e7c4 --- /dev/null +++ b/meta-microblaze/recipes-devtools/binutils/binutils-cross-testsuite_2.35.1.bb | |||
@@ -0,0 +1,85 @@ | |||
1 | require binutils.inc | ||
2 | require binutils-${PV}.inc | ||
3 | |||
4 | BPN = "binutils" | ||
5 | |||
6 | DEPENDS += "dejagnu-native expect-native" | ||
7 | DEPENDS += "binutils-native" | ||
8 | |||
9 | deltask do_compile | ||
10 | deltask do_install | ||
11 | |||
12 | inherit nopackages | ||
13 | |||
14 | do_configure[dirs] += "${B}/ld ${B}/bfd" | ||
15 | do_configure() { | ||
16 | # create config.h, oe enables initfini-array by default | ||
17 | echo "#define HAVE_INITFINI_ARRAY" > ${B}/ld/config.h | ||
18 | # use the bfd_stdint.h from binutils-native, this is the same of the one | ||
19 | # generated by binutils-cross | ||
20 | cp ${RECIPE_SYSROOT_NATIVE}/usr/include/bfd_stdint.h ${B}/bfd/ | ||
21 | } | ||
22 | |||
23 | # target depends | ||
24 | DEPENDS += "virtual/${MLPREFIX}${TARGET_PREFIX}binutils" | ||
25 | DEPENDS += "virtual/${MLPREFIX}${TARGET_PREFIX}gcc" | ||
26 | DEPENDS += "virtual/${MLPREFIX}${TARGET_PREFIX}compilerlibs" | ||
27 | DEPENDS += "virtual/${MLPREFIX}libc" | ||
28 | |||
29 | python check_prepare() { | ||
30 | def suffix_sys(sys): | ||
31 | if sys.endswith("-linux"): | ||
32 | return sys + "-gnu" | ||
33 | return sys | ||
34 | |||
35 | def generate_site_exp(d, suite): | ||
36 | content = [] | ||
37 | content.append('set srcdir "{0}/{1}"'.format(d.getVar("S"), suite)) | ||
38 | content.append('set objdir "{0}/{1}"'.format(d.getVar("B"), suite)) | ||
39 | content.append('set build_alias "{0}"'.format(d.getVar("BUILD_SYS"))) | ||
40 | content.append('set build_triplet {0}'.format(d.getVar("BUILD_SYS"))) | ||
41 | # use BUILD here since HOST=TARGET | ||
42 | content.append('set host_alias "{0}"'.format(d.getVar("BUILD_SYS"))) | ||
43 | content.append('set host_triplet {0}'.format(d.getVar("BUILD_SYS"))) | ||
44 | content.append('set target_alias "{0}"'.format(d.getVar("TARGET_SYS"))) | ||
45 | content.append('set target_triplet {0}'.format(suffix_sys(d.getVar("TARGET_SYS")))) | ||
46 | content.append("set development true") | ||
47 | content.append("set experimental false") | ||
48 | |||
49 | content.append(d.expand('set CXXFILT "${TARGET_PREFIX}c++filt"')) | ||
50 | content.append(d.expand('set CC "${TARGET_PREFIX}gcc --sysroot=${STAGING_DIR_TARGET} ${TUNE_CCARGS}"')) | ||
51 | content.append(d.expand('set CXX "${TARGET_PREFIX}g++ --sysroot=${STAGING_DIR_TARGET} ${TUNE_CCARGS}"')) | ||
52 | content.append(d.expand('set CFLAGS_FOR_TARGET "--sysroot=${STAGING_DIR_TARGET} ${TUNE_CCARGS}"')) | ||
53 | |||
54 | if suite == "ld" and d.getVar("TUNE_ARCH") == "mips64": | ||
55 | # oe patches binutils to have the default mips64 abi as 64bit, but | ||
56 | # skips gas causing issues with the ld test suite (which uses gas) | ||
57 | content.append('set ASFLAGS "-64"') | ||
58 | |||
59 | return "\n".join(content) | ||
60 | |||
61 | for i in ["binutils", "gas", "ld"]: | ||
62 | builddir = os.path.join(d.getVar("B"), i) | ||
63 | if not os.path.isdir(builddir): | ||
64 | os.makedirs(builddir) | ||
65 | with open(os.path.join(builddir, "site.exp"), "w") as f: | ||
66 | f.write(generate_site_exp(d, i)) | ||
67 | } | ||
68 | |||
69 | CHECK_TARGETS ??= "binutils gas ld" | ||
70 | |||
71 | do_check[dirs] = "${B} ${B}/binutils ${B}/gas ${B}/ld" | ||
72 | do_check[prefuncs] += "check_prepare" | ||
73 | do_check[nostamp] = "1" | ||
74 | do_check() { | ||
75 | export LC_ALL=C | ||
76 | for i in ${CHECK_TARGETS}; do | ||
77 | (cd ${B}/$i; runtest \ | ||
78 | --tool $i \ | ||
79 | --srcdir ${S}/$i/testsuite \ | ||
80 | --ignore 'plugin.exp' \ | ||
81 | || true) | ||
82 | done | ||
83 | } | ||
84 | addtask check after do_configure | ||
85 | |||
diff --git a/meta-microblaze/recipes-devtools/binutils/binutils-cross.inc b/meta-microblaze/recipes-devtools/binutils/binutils-cross.inc new file mode 100644 index 00000000..02ec8916 --- /dev/null +++ b/meta-microblaze/recipes-devtools/binutils/binutils-cross.inc | |||
@@ -0,0 +1,38 @@ | |||
1 | inherit cross | ||
2 | PROVIDES = "virtual/${TARGET_PREFIX}binutils" | ||
3 | |||
4 | PN = "binutils-cross-${TARGET_ARCH}" | ||
5 | BPN = "binutils" | ||
6 | |||
7 | # Ignore how TARGET_ARCH is computed. | ||
8 | TARGET_ARCH[vardepvalue] = "${TARGET_ARCH}" | ||
9 | |||
10 | INHIBIT_DEFAULT_DEPS = "1" | ||
11 | INHIBIT_AUTOTOOLS_DEPS = "1" | ||
12 | |||
13 | SRC_URI += "file://0002-binutils-cross-Do-not-generate-linker-script-directo.patch" | ||
14 | |||
15 | # Specify lib-path else we use a load of search dirs which we don't use | ||
16 | # and mean the linker scripts have to be relocated. | ||
17 | EXTRA_OECONF += "--with-sysroot=${STAGING_DIR_TARGET} \ | ||
18 | --disable-install-libbfd \ | ||
19 | --enable-poison-system-directories \ | ||
20 | --with-lib-path==${target_base_libdir}:=${target_libdir} \ | ||
21 | " | ||
22 | do_install () { | ||
23 | oe_runmake 'DESTDIR=${D}' install | ||
24 | |||
25 | # We don't really need these, so we'll remove them... | ||
26 | rm -rf ${D}${STAGING_DIR_NATIVE}${libdir_native}/libiberty.a | ||
27 | rm -rf ${D}${STAGING_DIR_NATIVE}${prefix_native}/${TARGET_SYS} | ||
28 | rm -rf ${D}${STAGING_DIR_NATIVE}${prefix_native}/lib/ldscripts | ||
29 | rm -rf ${D}${STAGING_DIR_NATIVE}${prefix_native}/share/info | ||
30 | rm -rf ${D}${STAGING_DIR_NATIVE}${prefix_native}/share/locale | ||
31 | rm -rf ${D}${STAGING_DIR_NATIVE}${prefix_native}/share/man | ||
32 | rmdir ${D}${STAGING_DIR_NATIVE}${prefix_native}/share || : | ||
33 | rmdir ${D}${STAGING_DIR_NATIVE}${prefix_native}/${libdir}/gcc-lib || : | ||
34 | rmdir ${D}${STAGING_DIR_NATIVE}${prefix_native}/${libdir}64/gcc-lib || : | ||
35 | rmdir ${D}${STAGING_DIR_NATIVE}${prefix_native}/${libdir} || : | ||
36 | rmdir ${D}${STAGING_DIR_NATIVE}${prefix_native}/${libdir}64 || : | ||
37 | rmdir ${D}${STAGING_DIR_NATIVE}${prefix_native}/${prefix} || : | ||
38 | } | ||
diff --git a/meta-microblaze/recipes-devtools/binutils/binutils-cross_2.35.1.bb b/meta-microblaze/recipes-devtools/binutils/binutils-cross_2.35.1.bb new file mode 100644 index 00000000..fbd1f7d2 --- /dev/null +++ b/meta-microblaze/recipes-devtools/binutils/binutils-cross_2.35.1.bb | |||
@@ -0,0 +1,3 @@ | |||
1 | require binutils.inc | ||
2 | require binutils-${PV}.inc | ||
3 | require binutils-cross.inc | ||
diff --git a/meta-microblaze/recipes-devtools/binutils/binutils-crosssdk_2.35.1.bb b/meta-microblaze/recipes-devtools/binutils/binutils-crosssdk_2.35.1.bb new file mode 100644 index 00000000..5bd036fd --- /dev/null +++ b/meta-microblaze/recipes-devtools/binutils/binutils-crosssdk_2.35.1.bb | |||
@@ -0,0 +1,13 @@ | |||
1 | require binutils-cross_${PV}.bb | ||
2 | |||
3 | inherit crosssdk | ||
4 | |||
5 | PN = "binutils-crosssdk-${SDK_SYS}" | ||
6 | |||
7 | PROVIDES = "virtual/${TARGET_PREFIX}binutils-crosssdk" | ||
8 | |||
9 | SRC_URI += "file://0001-binutils-crosssdk-Generate-relocatable-SDKs.patch" | ||
10 | |||
11 | do_configure:prepend () { | ||
12 | sed -i 's#/usr/local/lib /lib /usr/lib#${SDKPATHNATIVE}/lib ${SDKPATHNATIVE}/usr/lib /usr/local/lib /lib /usr/lib#' ${S}/ld/configure.tgt | ||
13 | } | ||
diff --git a/meta-microblaze/recipes-devtools/binutils/binutils.inc b/meta-microblaze/recipes-devtools/binutils/binutils.inc new file mode 100644 index 00000000..0024edfc --- /dev/null +++ b/meta-microblaze/recipes-devtools/binutils/binutils.inc | |||
@@ -0,0 +1,185 @@ | |||
1 | SUMMARY = "GNU binary utilities" | ||
2 | DESCRIPTION = "The GNU Binutils are a collection of binary tools. \ | ||
3 | The main ones are ld (GNU Linker), and as (GNU Assembler). This \ | ||
4 | package also includes addition tools such as addr2line (Converts \ | ||
5 | addresses into filenames and line numbers), ar (utility for creating, \ | ||
6 | modifying and extracting archives), nm (list symbols in object \ | ||
7 | files), objcopy (copy and translate object files), objdump (Display \ | ||
8 | object information), and other tools and related libraries." | ||
9 | HOMEPAGE = "http://www.gnu.org/software/binutils/" | ||
10 | BUGTRACKER = "http://sourceware.org/bugzilla/" | ||
11 | SECTION = "devel" | ||
12 | LICENSE = "GPLv3" | ||
13 | |||
14 | DEPENDS = "flex-native bison-native zlib-native gnu-config-native autoconf-native" | ||
15 | |||
16 | inherit autotools gettext multilib_header texinfo | ||
17 | |||
18 | FILES:${PN} = " \ | ||
19 | ${bindir}/${TARGET_PREFIX}* \ | ||
20 | ${libdir}/lib*.so.* \ | ||
21 | ${libdir}/lib*-${PV}*.so \ | ||
22 | ${prefix}/${TARGET_SYS}/bin/* \ | ||
23 | ${bindir}/embedspu" | ||
24 | |||
25 | RPROVIDES:${PN} += "${PN}-symlinks" | ||
26 | |||
27 | FILES:${PN}-dev = " \ | ||
28 | ${includedir} \ | ||
29 | ${libdir}/*.la \ | ||
30 | ${libdir}/libbfd.so \ | ||
31 | ${libdir}/libctf.so \ | ||
32 | ${libdir}/libctf-nobfd.so \ | ||
33 | ${libdir}/libopcodes.so" | ||
34 | |||
35 | # Rather than duplicating multiple entries for these, make one | ||
36 | # list and reuse it. | ||
37 | |||
38 | LDGOLD_ALTS ?= "ld.gold dwp" | ||
39 | LDGOLD_ALTS:riscv64 = "" | ||
40 | LDGOLD_ALTS:riscv32 = "" | ||
41 | LDGOLD_ALTS:libc-glibc:mipsarch = "" | ||
42 | |||
43 | USE_ALTERNATIVES_FOR = " \ | ||
44 | addr2line \ | ||
45 | ar \ | ||
46 | as \ | ||
47 | c++filt \ | ||
48 | elfedit \ | ||
49 | gprof \ | ||
50 | ld \ | ||
51 | ld.bfd \ | ||
52 | ${LDGOLD_ALTS} \ | ||
53 | nm \ | ||
54 | objcopy \ | ||
55 | objdump \ | ||
56 | ranlib \ | ||
57 | readelf \ | ||
58 | size \ | ||
59 | strings \ | ||
60 | strip \ | ||
61 | " | ||
62 | |||
63 | python do_package:prepend() { | ||
64 | make_alts = d.getVar("USE_ALTERNATIVES_FOR") or "" | ||
65 | prefix = d.getVar("TARGET_PREFIX") | ||
66 | bindir = d.getVar("bindir") | ||
67 | for alt in make_alts.split(): | ||
68 | d.setVarFlag('ALTERNATIVE_TARGET', alt, bindir + "/" + prefix + alt) | ||
69 | d.setVarFlag('ALTERNATIVE_LINK_NAME', alt, bindir + "/" + alt) | ||
70 | } | ||
71 | |||
72 | B = "${S}/build.${HOST_SYS}.${TARGET_SYS}" | ||
73 | |||
74 | EXTRA_OECONF = "--program-prefix=${TARGET_PREFIX} \ | ||
75 | --disable-werror \ | ||
76 | --enable-deterministic-archives \ | ||
77 | --enable-plugins \ | ||
78 | --disable-gdb \ | ||
79 | --disable-gdbserver \ | ||
80 | --disable-libdecnumber \ | ||
81 | --disable-readline \ | ||
82 | --disable-sim \ | ||
83 | ${LDGOLD} \ | ||
84 | ${EXTRA_TARGETS} \ | ||
85 | ${@bb.utils.contains('DISTRO_FEATURES', 'multiarch', '--enable-64-bit-bfd', '', d)}" | ||
86 | |||
87 | EXTRA_TARGETS = "" | ||
88 | EXTRA_TARGETS:x86-64 = " --enable-targets=x86_64-pe,x86_64-pep " | ||
89 | EXTRA_TARGETS:class-native = "" | ||
90 | |||
91 | LDGOLD:class-native = "" | ||
92 | LDGOLD:class-crosssdk = "" | ||
93 | LDGOLD:libc-glibc:mipsarch = "" | ||
94 | LDGOLD ?= "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', '--enable-gold=default --enable-threads', '--enable-gold --enable-ld=default --enable-threads', d)}" | ||
95 | |||
96 | |||
97 | # This is necessary due to a bug in the binutils Makefiles | ||
98 | # EXTRA_OEMAKE = "configure-build-libiberty all" | ||
99 | |||
100 | export AR = "${HOST_PREFIX}ar" | ||
101 | export AS = "${HOST_PREFIX}as" | ||
102 | export LD = "${HOST_PREFIX}ld" | ||
103 | export NM = "${HOST_PREFIX}nm" | ||
104 | export RANLIB = "${HOST_PREFIX}ranlib" | ||
105 | export OBJCOPY = "${HOST_PREFIX}objcopy" | ||
106 | export OBJDUMP = "${HOST_PREFIX}objdump" | ||
107 | |||
108 | export AR_FOR_TARGET = "${TARGET_PREFIX}ar" | ||
109 | export AS_FOR_TARGET = "${TARGET_PREFIX}as" | ||
110 | export LD_FOR_TARGET = "${TARGET_PREFIX}ld" | ||
111 | export NM_FOR_TARGET = "${TARGET_PREFIX}nm" | ||
112 | export RANLIB_FOR_TARGET = "${TARGET_PREFIX}ranlib" | ||
113 | |||
114 | export CC_FOR_HOST = "${CCACHE}${HOST_PREFIX}gcc ${HOST_CC_ARCH}" | ||
115 | export CXX_FOR_HOST = "${CCACHE}${HOST_PREFIX}gcc ${HOST_CC_ARCH}" | ||
116 | |||
117 | # autotools.bbclass sets the _FOR_BUILD variables, but for some reason we need | ||
118 | # to unset LD_LIBRARY_PATH. | ||
119 | export CC_FOR_BUILD = "LD_LIBRARY_PATH= ${BUILD_CC}" | ||
120 | |||
121 | MULTIARCH := "${@bb.utils.contains("DISTRO_FEATURES", "multiarch", "yes", "no", d)}" | ||
122 | do_configure[vardeps] += "MULTIARCH" | ||
123 | do_configure () { | ||
124 | (cd ${S} && gnu-configize) | ||
125 | |||
126 | oe_runconf | ||
127 | # | ||
128 | # must prime config.cache to ensure the build of libiberty | ||
129 | # | ||
130 | mkdir -p ${B}/build-${BUILD_SYS} | ||
131 | for i in ${CONFIG_SITE}; do | ||
132 | cat $i >> ${B}/build-${BUILD_SYS}/config.cache || true | ||
133 | done | ||
134 | } | ||
135 | |||
136 | do_install () { | ||
137 | autotools_do_install | ||
138 | |||
139 | # We don't really need these, so we'll remove them... | ||
140 | rm -rf ${D}${libdir}/ldscripts | ||
141 | |||
142 | bindir_rel=${@os.path.relpath('${bindir}', '${prefix}/${TARGET_SYS}/bin')} | ||
143 | |||
144 | # Fix the /usr/${TARGET_SYS}/bin/* links | ||
145 | for l in ${D}${prefix}/${TARGET_SYS}/bin/*; do | ||
146 | rm -f $l | ||
147 | ln -sf $bindir_rel/${TARGET_PREFIX}`basename $l` $l | ||
148 | done | ||
149 | |||
150 | # Install the libiberty header | ||
151 | install -d ${D}${includedir} | ||
152 | install -m 644 ${S}/include/ansidecl.h ${D}${includedir} | ||
153 | install -m 644 ${S}/include/libiberty.h ${D}${includedir} | ||
154 | |||
155 | # insall pic version of libiberty if available | ||
156 | if [ -e ${B}/libiberty/pic/libiberty.a ]; then | ||
157 | install -Dm 0644 ${B}/libiberty/pic/libiberty.a ${D}${libdir}/libiberty.a | ||
158 | fi | ||
159 | |||
160 | cd ${D}${bindir} | ||
161 | |||
162 | # Symlinks for ease of running these on the native target | ||
163 | for p in ${TARGET_PREFIX}* ; do | ||
164 | ln -sf $p `echo $p | sed -e s,${TARGET_PREFIX},,` | ||
165 | done | ||
166 | |||
167 | for alt in ${USE_ALTERNATIVES_FOR}; do | ||
168 | rm -f ${D}${bindir}/$alt | ||
169 | done | ||
170 | |||
171 | oe_multilib_header bfd.h | ||
172 | # bfd_stdint.h encodes the compiler name in the header | ||
173 | sed -i ${D}${includedir}/bfd_stdint.h -e "s,${TARGET_PREFIX},," | ||
174 | } | ||
175 | |||
176 | inherit update-alternatives | ||
177 | |||
178 | ALTERNATIVE_PRIORITY = "100" | ||
179 | |||
180 | ALTERNATIVE:${PN}:class-target = "${USE_ALTERNATIVES_FOR}" | ||
181 | |||
182 | python () { | ||
183 | if bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', True, False, d) and bb.utils.contains_any('TARGET_ARCH', 'riscv32 riscv64', True, False, d): | ||
184 | bb.fatal("Gold linker does not _yet_ support RISC-V architecture please remove ld-is-gold from DISTRO_FEATURES") | ||
185 | } | ||
diff --git a/meta-microblaze/recipes-devtools/binutils/binutils/0001-aarch64-Return-an-error-on-conditional-branch-to-an-.patch b/meta-microblaze/recipes-devtools/binutils/binutils/0001-aarch64-Return-an-error-on-conditional-branch-to-an-.patch new file mode 100644 index 00000000..f46ddab4 --- /dev/null +++ b/meta-microblaze/recipes-devtools/binutils/binutils/0001-aarch64-Return-an-error-on-conditional-branch-to-an-.patch | |||
@@ -0,0 +1,135 @@ | |||
1 | From c7cd291722779c9d4703ed0010388fe394c644c8 Mon Sep 17 00:00:00 2001 | ||
2 | From: Siddhesh Poyarekar <siddesh.poyarekar@arm.com> | ||
3 | Date: Tue, 1 Sep 2020 14:25:52 +0530 | ||
4 | Subject: [PATCH] aarch64: Return an error on conditional branch to an undefined symbol | ||
5 | |||
6 | The fix in 7e05773767820b441b23a16628b55c98cb1aef46 introduced a PLT | ||
7 | for conditional jumps when the target symbol is undefined. This is | ||
8 | incorrect because conditional branch relocations are not allowed to | ||
9 | clobber IP0/IP1 and hence, should not result in a dynamic relocation. | ||
10 | |||
11 | Revert that change and in its place, issue an error when the target | ||
12 | symbol is undefined. | ||
13 | |||
14 | bfd/ | ||
15 | |||
16 | 2020-09-10 Siddhesh Poyarekar <siddesh.poyarekar@arm.com> | ||
17 | |||
18 | * elfnn-aarch64.c (elfNN_aarch64_final_link_relocate): Revert | ||
19 | changes in 7e05773767820b441b23a16628b55c98cb1aef46. Set | ||
20 | error for undefined symbol in BFD_RELOC_AARCH64_BRANCH19 and | ||
21 | BFD_RELOC_AARCH64_TSTBR14 relocations. | ||
22 | |||
23 | ld/ | ||
24 | |||
25 | 2020-09-10 Siddhesh Poyarekar <siddesh.poyarekar@arm.com> | ||
26 | |||
27 | * testsuite/ld-aarch64/emit-relocs-560.d: Expect error instead | ||
28 | of valid output. | ||
29 | --- | ||
30 | Upstream-Status: Backport [https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=c7cd291722779c9d4703ed0010388fe394c644c8] | ||
31 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
32 | |||
33 | bfd/ChangeLog | 7 +++++ | ||
34 | bfd/elfnn-aarch64.c | 37 ++++++++++++----------- | ||
35 | ld/ChangeLog | 5 +++ | ||
36 | ld/testsuite/ld-aarch64/emit-relocs-560.d | 7 +---- | ||
37 | 4 files changed, 32 insertions(+), 24 deletions(-) | ||
38 | |||
39 | diff --git a/bfd/elfnn-aarch64.c b/bfd/elfnn-aarch64.c | ||
40 | index 5b4c189b593..a9924e7ec56 100644 | ||
41 | --- a/bfd/elfnn-aarch64.c | ||
42 | +++ b/bfd/elfnn-aarch64.c | ||
43 | @@ -5447,7 +5447,6 @@ elfNN_aarch64_final_link_relocate (reloc_howto_type *howto, | ||
44 | bfd_vma orig_value = value; | ||
45 | bfd_boolean resolved_to_zero; | ||
46 | bfd_boolean abs_symbol_p; | ||
47 | - bfd_boolean via_plt_p; | ||
48 | |||
49 | globals = elf_aarch64_hash_table (info); | ||
50 | |||
51 | @@ -5469,8 +5468,6 @@ elfNN_aarch64_final_link_relocate (reloc_howto_type *howto, | ||
52 | : bfd_is_und_section (sym_sec)); | ||
53 | abs_symbol_p = h != NULL && bfd_is_abs_symbol (&h->root); | ||
54 | |||
55 | - via_plt_p = (globals->root.splt != NULL && h != NULL | ||
56 | - && h->plt.offset != (bfd_vma) - 1); | ||
57 | |||
58 | /* Since STT_GNU_IFUNC symbol must go through PLT, we handle | ||
59 | it here if it is defined in a non-shared object. */ | ||
60 | @@ -5806,23 +5803,12 @@ elfNN_aarch64_final_link_relocate (reloc_howto_type *howto, | ||
61 | value += signed_addend; | ||
62 | break; | ||
63 | |||
64 | - case BFD_RELOC_AARCH64_BRANCH19: | ||
65 | - case BFD_RELOC_AARCH64_TSTBR14: | ||
66 | - /* A conditional branch to an undefined weak symbol is converted to a | ||
67 | - branch to itself. */ | ||
68 | - if (weak_undef_p && !via_plt_p) | ||
69 | - { | ||
70 | - value = _bfd_aarch64_elf_resolve_relocation (input_bfd, bfd_r_type, | ||
71 | - place, value, | ||
72 | - signed_addend, | ||
73 | - weak_undef_p); | ||
74 | - break; | ||
75 | - } | ||
76 | - /* Fall through. */ | ||
77 | case BFD_RELOC_AARCH64_CALL26: | ||
78 | case BFD_RELOC_AARCH64_JUMP26: | ||
79 | { | ||
80 | asection *splt = globals->root.splt; | ||
81 | + bfd_boolean via_plt_p = | ||
82 | + splt != NULL && h != NULL && h->plt.offset != (bfd_vma) - 1; | ||
83 | |||
84 | /* A call to an undefined weak symbol is converted to a jump to | ||
85 | the next instruction unless a PLT entry will be created. | ||
86 | @@ -5903,6 +5889,23 @@ elfNN_aarch64_final_link_relocate (reloc_howto_type *howto, | ||
87 | bfd_set_error (bfd_error_bad_value); | ||
88 | return bfd_reloc_notsupported; | ||
89 | } | ||
90 | + value = _bfd_aarch64_elf_resolve_relocation (input_bfd, bfd_r_type, | ||
91 | + place, value, | ||
92 | + signed_addend, | ||
93 | + weak_undef_p); | ||
94 | + break; | ||
95 | + | ||
96 | + case BFD_RELOC_AARCH64_BRANCH19: | ||
97 | + case BFD_RELOC_AARCH64_TSTBR14: | ||
98 | + if (h && h->root.type == bfd_link_hash_undefined) | ||
99 | + { | ||
100 | + _bfd_error_handler | ||
101 | + /* xgettext:c-format */ | ||
102 | + (_("%pB: conditional branch to undefined symbol `%s' " | ||
103 | + "not allowed"), input_bfd, h->root.root.string); | ||
104 | + bfd_set_error (bfd_error_bad_value); | ||
105 | + return bfd_reloc_notsupported; | ||
106 | + } | ||
107 | /* Fall through. */ | ||
108 | |||
109 | case BFD_RELOC_AARCH64_16: | ||
110 | @@ -7968,8 +7971,6 @@ elfNN_aarch64_check_relocs (bfd *abfd, struct bfd_link_info *info, | ||
111 | break; | ||
112 | } | ||
113 | |||
114 | - case BFD_RELOC_AARCH64_BRANCH19: | ||
115 | - case BFD_RELOC_AARCH64_TSTBR14: | ||
116 | case BFD_RELOC_AARCH64_CALL26: | ||
117 | case BFD_RELOC_AARCH64_JUMP26: | ||
118 | /* If this is a local symbol then we resolve it | ||
119 | diff --git a/ld/testsuite/ld-aarch64/emit-relocs-560.d b/ld/testsuite/ld-aarch64/emit-relocs-560.d | ||
120 | index 153532457b4..8751b743bd4 100644 | ||
121 | --- a/ld/testsuite/ld-aarch64/emit-relocs-560.d | ||
122 | +++ b/ld/testsuite/ld-aarch64/emit-relocs-560.d | ||
123 | @@ -1,8 +1,3 @@ | ||
124 | #source: emit-relocs-560.s | ||
125 | #ld: -shared | ||
126 | -#readelf: -r | ||
127 | - | ||
128 | -Relocation section '.rela.plt' at offset 0x[0-9a-f]+ contains 2 entries: | ||
129 | - Offset Info Type Sym. Value Sym. Name \+ Addend | ||
130 | -[0-9a-f]+ 000100000402 R_AARCH64_JUMP_SL 0000000000000000 baz \+ 0 | ||
131 | -[0-9a-f]+ 000200000402 R_AARCH64_JUMP_SL 0000000000000000 bar \+ 0 | ||
132 | +#error: .*: conditional branch to undefined symbol `bar' not allowed | ||
133 | -- | ||
134 | 2.29.2 | ||
135 | |||
diff --git a/meta-microblaze/recipes-devtools/binutils/binutils/0001-binutils-crosssdk-Generate-relocatable-SDKs.patch b/meta-microblaze/recipes-devtools/binutils/binutils/0001-binutils-crosssdk-Generate-relocatable-SDKs.patch new file mode 100644 index 00000000..4c1d1129 --- /dev/null +++ b/meta-microblaze/recipes-devtools/binutils/binutils/0001-binutils-crosssdk-Generate-relocatable-SDKs.patch | |||
@@ -0,0 +1,78 @@ | |||
1 | From a0b23b160d6cfa7be4437c6e623633d76395f2ad Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Mon, 2 Mar 2015 01:58:54 +0000 | ||
4 | Subject: [PATCH 01/16] binutils-crosssdk: Generate relocatable SDKs | ||
5 | |||
6 | This patch will modify the ELF linker scripts so that the crosssdk | ||
7 | linker will generate binaries with a 4096 bytes PT_INTERP section. When the binaries | ||
8 | will be relocated, at SDK install time, the interpreter path can be easily | ||
9 | changed by the relocating script. | ||
10 | |||
11 | generate larger .interp section for gold linker as well | ||
12 | |||
13 | Upstream-Status: Inappropriate [SDK specific] | ||
14 | |||
15 | Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com> | ||
16 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
17 | --- | ||
18 | gold/layout.cc | 2 +- | ||
19 | ld/genscripts.sh | 3 +++ | ||
20 | ld/scripttempl/elf.sc | 4 ++-- | ||
21 | 3 files changed, 6 insertions(+), 3 deletions(-) | ||
22 | |||
23 | diff --git a/gold/layout.cc b/gold/layout.cc | ||
24 | index 13e533aaf21..b0afff16e2e 100644 | ||
25 | --- a/gold/layout.cc | ||
26 | +++ b/gold/layout.cc | ||
27 | @@ -5019,7 +5019,7 @@ Layout::create_interp(const Target* target) | ||
28 | gold_assert(interp != NULL); | ||
29 | } | ||
30 | |||
31 | - size_t len = strlen(interp) + 1; | ||
32 | + size_t len = 4096; | ||
33 | |||
34 | Output_section_data* odata = new Output_data_const(interp, len, 1); | ||
35 | |||
36 | diff --git a/ld/genscripts.sh b/ld/genscripts.sh | ||
37 | index 03392d265c7..435689ea144 100755 | ||
38 | --- a/ld/genscripts.sh | ||
39 | +++ b/ld/genscripts.sh | ||
40 | @@ -304,6 +304,7 @@ DATA_ALIGNMENT_u="${DATA_ALIGNMENT_u-${DATA_ALIGNMENT_r}}" | ||
41 | LD_FLAG=r | ||
42 | DATA_ALIGNMENT=${DATA_ALIGNMENT_r} | ||
43 | DEFAULT_DATA_ALIGNMENT="ALIGN(${SEGMENT_SIZE})" | ||
44 | +PARTIAL_LINKING=" " | ||
45 | ( echo "/* Script for -r */" | ||
46 | source_sh ${CUSTOMIZER_SCRIPT} | ||
47 | source_sh ${srcdir}/scripttempl/${SCRIPT_NAME}.sc | ||
48 | @@ -312,10 +313,12 @@ DEFAULT_DATA_ALIGNMENT="ALIGN(${SEGMENT_SIZE})" | ||
49 | LD_FLAG=u | ||
50 | DATA_ALIGNMENT=${DATA_ALIGNMENT_u} | ||
51 | CONSTRUCTING=" " | ||
52 | +PARTIAL_LINKING=" " | ||
53 | ( echo "/* Script for -Ur */" | ||
54 | source_sh ${CUSTOMIZER_SCRIPT} | ||
55 | source_sh ${srcdir}/scripttempl/${SCRIPT_NAME}.sc | ||
56 | ) | sed -e '/^ *$/d;s/[ ]*$//' > ldscripts/${EMULATION_NAME}.xu | ||
57 | +unset PARTIAL_LINKING | ||
58 | |||
59 | DATA_ALIGNMENT=${DATA_ALIGNMENT_} | ||
60 | RELOCATING=" " | ||
61 | diff --git a/ld/scripttempl/elf.sc b/ld/scripttempl/elf.sc | ||
62 | index eb74743e5c3..c9a8a47615f 100644 | ||
63 | --- a/ld/scripttempl/elf.sc | ||
64 | +++ b/ld/scripttempl/elf.sc | ||
65 | @@ -143,8 +143,8 @@ if test -z "$DATA_SEGMENT_ALIGN"; then | ||
66 | DATA_SEGMENT_RELRO_END=". = DATA_SEGMENT_RELRO_END (${SEPARATE_GOTPLT-0}, .);" | ||
67 | fi | ||
68 | fi | ||
69 | -if test -z "${INITIAL_READONLY_SECTIONS}${CREATE_SHLIB}"; then | ||
70 | - INITIAL_READONLY_SECTIONS=".interp ${RELOCATING-0} : { *(.interp) }" | ||
71 | +if test -z "${INITIAL_READONLY_SECTIONS}${CREATE_SHLIB}${PARTIAL_LINKING}"; then | ||
72 | + INITIAL_READONLY_SECTIONS=".interp ${RELOCATING-0} : { *(.interp); . = 0x1000; }" | ||
73 | fi | ||
74 | if test -z "$PLT"; then | ||
75 | IPLT=".iplt ${RELOCATING-0} : { *(.iplt) }" | ||
76 | -- | ||
77 | 2.28.0 | ||
78 | |||
diff --git a/meta-microblaze/recipes-devtools/binutils/binutils/0001-gold-ensure-file_counts_lock-is-initialized-before-u.patch b/meta-microblaze/recipes-devtools/binutils/binutils/0001-gold-ensure-file_counts_lock-is-initialized-before-u.patch new file mode 100644 index 00000000..f46415f4 --- /dev/null +++ b/meta-microblaze/recipes-devtools/binutils/binutils/0001-gold-ensure-file_counts_lock-is-initialized-before-u.patch | |||
@@ -0,0 +1,41 @@ | |||
1 | From de24fc96bf24fca470a9ca13176ad9ad9cc4d5a9 Mon Sep 17 00:00:00 2001 | ||
2 | From: Nick Gasson <nick.gasson@arm.com> | ||
3 | Date: Mon, 2 Nov 2020 12:02:05 +0800 | ||
4 | Subject: [PATCH] gold: ensure file_counts_lock is initialized before using | ||
5 | |||
6 | Since upgrading to binutils 2.35 I've been experiencing random memory | ||
7 | corruption related crashes with ld.gold --threads. It's caused by | ||
8 | multiple threads concurrently pushing elements onto the shared | ||
9 | std::vector in File_read::record_file_read(). This vector is supposed to | ||
10 | be protected by file_counts_lock, but that is initialized lazily and | ||
11 | might be NULL when File_read::open() is called, in which case | ||
12 | Hold_optional_lock silently skips locking it. | ||
13 | |||
14 | Fix by calling the initialize() method before attempting to acquire the | ||
15 | lock, the same as other places that use file_counts_lock. | ||
16 | |||
17 | PR 26827 | ||
18 | * fileread.cc (File_read::open): Ensure file_counts_lock is | ||
19 | initialized. | ||
20 | * testsuite/Makefile.am (check_PROGRAMS): Add a test that passes | ||
21 | -Wl,--threads. | ||
22 | * testsuite/Makefile.in: Regenerate. | ||
23 | |||
24 | Upstream-Status: Backport [af61e84fd2d from 2.36.0] | ||
25 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
26 | --- | ||
27 | gold/fileread.cc | 1 + | ||
28 | 1 file changed, 1 insertion(+) | ||
29 | |||
30 | diff --git a/gold/fileread.cc b/gold/fileread.cc | ||
31 | index f5ca719360d..0b5228e2afd 100644 | ||
32 | --- a/gold/fileread.cc | ||
33 | +++ b/gold/fileread.cc | ||
34 | @@ -212,6 +212,7 @@ File_read::open(const Task* task, const std::string& name) | ||
35 | gold_debug(DEBUG_FILES, "Attempt to open %s succeeded", | ||
36 | this->name_.c_str()); | ||
37 | this->token_.add_writer(task); | ||
38 | + file_counts_initialize_lock.initialize(); | ||
39 | Hold_optional_lock hl(file_counts_lock); | ||
40 | record_file_read(this->name_); | ||
41 | } | ||
diff --git a/meta-microblaze/recipes-devtools/binutils/binutils/0002-binutils-cross-Do-not-generate-linker-script-directo.patch b/meta-microblaze/recipes-devtools/binutils/binutils/0002-binutils-cross-Do-not-generate-linker-script-directo.patch new file mode 100644 index 00000000..41dff05b --- /dev/null +++ b/meta-microblaze/recipes-devtools/binutils/binutils/0002-binutils-cross-Do-not-generate-linker-script-directo.patch | |||
@@ -0,0 +1,63 @@ | |||
1 | From 0d14f8f333a9b519202246ce779f3e380491826c Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Mon, 6 Mar 2017 23:37:05 -0800 | ||
4 | Subject: [PATCH 02/17] binutils-cross: Do not generate linker script | ||
5 | directories | ||
6 | |||
7 | We don't place target libraries within ${exec_prefix}, we'd always place these | ||
8 | within the target sysroot within the standard library directories. Worse, the | ||
9 | append_to_lib_path code prefixes these paths with the sysroot which makes even | ||
10 | less sense. | ||
11 | |||
12 | These directories therefore don't make sense in our case and mean we have to | ||
13 | relocate all the linker scripts if they're present. Dropping them | ||
14 | gives a reasonable performance improvement/simplification. | ||
15 | |||
16 | Upstream-Status: Inappropriate | ||
17 | |||
18 | RP 2017/01/30 | ||
19 | |||
20 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
21 | --- | ||
22 | ld/genscripts.sh | 25 ------------------------- | ||
23 | 1 file changed, 25 deletions(-) | ||
24 | |||
25 | diff --git a/ld/genscripts.sh b/ld/genscripts.sh | ||
26 | index 435689ea144..cff8a1467f9 100755 | ||
27 | --- a/ld/genscripts.sh | ||
28 | +++ b/ld/genscripts.sh | ||
29 | @@ -235,31 +235,6 @@ append_to_lib_path() | ||
30 | fi | ||
31 | } | ||
32 | |||
33 | -# Always search $(tooldir)/lib, aka /usr/local/TARGET/lib when native | ||
34 | -# except when LIBPATH=":". | ||
35 | -if [ "${LIB_PATH}" != ":" ] ; then | ||
36 | - libs= | ||
37 | - if [ "x${TOOL_LIB}" = "x" ] ; then | ||
38 | - if [ "x${NATIVE}" = "xyes" ] ; then | ||
39 | - libs="${exec_prefix}/${target_alias}/lib" | ||
40 | - fi | ||
41 | - else | ||
42 | - # For multilib'ed targets, ensure both ${target_alias}/lib${LIBPATH_SUFFIX} | ||
43 | - # and ${TOOL_LIB}/lib${LIBPATH_SUFFIX} are in the default search path, | ||
44 | - # because 64bit libraries may be in both places, depending on | ||
45 | - # cross-development setup method (e.g.: /usr/s390x-linux/lib64 | ||
46 | - # vs. /usr/s390-linux/lib64) | ||
47 | - for libpath_suffix in ${LIBPATH_SUFFIX}; do | ||
48 | - case "${NATIVE}:${libpath_suffix}:${TOOL_LIB}" in | ||
49 | - :* | *::* | *:*:*${libpath_suffix}) ;; | ||
50 | - *) libs="${exec_prefix}/${target_alias}/lib${libpath_suffix}" ;; | ||
51 | - esac | ||
52 | - done | ||
53 | - libs="${exec_prefix}/${TOOL_LIB}/lib ${libs}" | ||
54 | - fi | ||
55 | - append_to_lib_path ${libs} | ||
56 | -fi | ||
57 | - | ||
58 | if [ "x${LIB_PATH}" = "x" ] && [ "x${USE_LIBPATH}" = xyes ] ; then | ||
59 | libs=${NATIVE_LIB_DIRS} | ||
60 | if [ "x${NATIVE}" = "xyes" ] ; then | ||
61 | -- | ||
62 | 2.28.0 | ||
63 | |||
diff --git a/meta-microblaze/recipes-devtools/binutils/binutils/0003-binutils-nativesdk-Search-for-alternative-ld.so.conf.patch b/meta-microblaze/recipes-devtools/binutils/binutils/0003-binutils-nativesdk-Search-for-alternative-ld.so.conf.patch new file mode 100644 index 00000000..28daf58f --- /dev/null +++ b/meta-microblaze/recipes-devtools/binutils/binutils/0003-binutils-nativesdk-Search-for-alternative-ld.so.conf.patch | |||
@@ -0,0 +1,98 @@ | |||
1 | From 3bbec749ec9fe681ade6812c48c541a752fcffd5 Mon Sep 17 00:00:00 2001 | ||
2 | From: Richard Purdie <richard.purdie@linuxfoundation.org> | ||
3 | Date: Wed, 19 Feb 2020 09:51:16 -0800 | ||
4 | Subject: [PATCH 03/17] binutils-nativesdk: Search for alternative ld.so.conf | ||
5 | in SDK installation | ||
6 | |||
7 | We need binutils to look at our ld.so.conf file within the SDK to ensure | ||
8 | we search the SDK's libdirs as well as those from the host system. | ||
9 | |||
10 | We therefore pass in the directory to the code using a define, then add | ||
11 | it to a section we relocate in a similar way to the way we relocate the | ||
12 | gcc internal paths. This ensures that ld works correctly in our buildtools | ||
13 | tarball. | ||
14 | |||
15 | Standard sysroot relocation doesn't work since we're not in a sysroot, | ||
16 | we want to use both the host system and SDK libs. | ||
17 | |||
18 | Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> | ||
19 | 2020/1/17 | ||
20 | Upstream-Status: Inappropriate [OE specific tweak] | ||
21 | |||
22 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
23 | --- | ||
24 | ld/Makefile.am | 3 ++- | ||
25 | ld/Makefile.in | 3 ++- | ||
26 | ld/ldelf.c | 2 +- | ||
27 | ld/ldmain.c | 1 + | ||
28 | ld/ldmain.h | 1 + | ||
29 | 5 files changed, 7 insertions(+), 3 deletions(-) | ||
30 | |||
31 | diff --git a/ld/Makefile.am b/ld/Makefile.am | ||
32 | index 02c4fc16395..a5762227f0a 100644 | ||
33 | --- a/ld/Makefile.am | ||
34 | +++ b/ld/Makefile.am | ||
35 | @@ -42,7 +42,8 @@ ZLIBINC = @zlibinc@ | ||
36 | |||
37 | ELF_CLFAGS=-DELF_LIST_OPTIONS=@elf_list_options@ \ | ||
38 | -DELF_SHLIB_LIST_OPTIONS=@elf_shlib_list_options@ \ | ||
39 | - -DELF_PLT_UNWIND_LIST_OPTIONS=@elf_plt_unwind_list_options@ | ||
40 | + -DELF_PLT_UNWIND_LIST_OPTIONS=@elf_plt_unwind_list_options@ \ | ||
41 | + -DSYSCONFDIR="\"$(sysconfdir)\"" | ||
42 | WARN_CFLAGS = @WARN_CFLAGS@ | ||
43 | NO_WERROR = @NO_WERROR@ | ||
44 | AM_CFLAGS = $(WARN_CFLAGS) $(ELF_CLFAGS) | ||
45 | diff --git a/ld/Makefile.in b/ld/Makefile.in | ||
46 | index 2fe12e14f63..8f0c83ac8d2 100644 | ||
47 | --- a/ld/Makefile.in | ||
48 | +++ b/ld/Makefile.in | ||
49 | @@ -548,7 +548,8 @@ ZLIB = @zlibdir@ -lz | ||
50 | ZLIBINC = @zlibinc@ | ||
51 | ELF_CLFAGS = -DELF_LIST_OPTIONS=@elf_list_options@ \ | ||
52 | -DELF_SHLIB_LIST_OPTIONS=@elf_shlib_list_options@ \ | ||
53 | - -DELF_PLT_UNWIND_LIST_OPTIONS=@elf_plt_unwind_list_options@ | ||
54 | + -DELF_PLT_UNWIND_LIST_OPTIONS=@elf_plt_unwind_list_options@ \ | ||
55 | + -DSYSCONFDIR="\"$(sysconfdir)\"" | ||
56 | |||
57 | AM_CFLAGS = $(WARN_CFLAGS) $(ELF_CLFAGS) | ||
58 | |||
59 | diff --git a/ld/ldelf.c b/ld/ldelf.c | ||
60 | index bada3ade2d7..b4784009d7a 100644 | ||
61 | --- a/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, | ||
64 | |||
65 | info.path = NULL; | ||
66 | info.len = info.alloc = 0; | ||
67 | - tmppath = concat (ld_sysroot, prefix, "/etc/ld.so.conf", | ||
68 | + tmppath = concat (ld_sysconfdir, "/etc/ld.so.conf", | ||
69 | (const char *) NULL); | ||
70 | if (!ldelf_parse_ld_so_conf (&info, tmppath)) | ||
71 | { | ||
72 | diff --git a/ld/ldmain.c b/ld/ldmain.c | ||
73 | index 08be9030cb5..f5c5a336320 100644 | ||
74 | --- a/ld/ldmain.c | ||
75 | +++ b/ld/ldmain.c | ||
76 | @@ -70,6 +70,7 @@ char *program_name; | ||
77 | |||
78 | /* The prefix for system library directories. */ | ||
79 | const char *ld_sysroot; | ||
80 | +char ld_sysconfdir[4096] __attribute__ ((section (".gccrelocprefix"))) = SYSCONFDIR; | ||
81 | |||
82 | /* The canonical representation of ld_sysroot. */ | ||
83 | char *ld_canon_sysroot; | ||
84 | diff --git a/ld/ldmain.h b/ld/ldmain.h | ||
85 | index ac7db5720d5..1cbe1771912 100644 | ||
86 | --- a/ld/ldmain.h | ||
87 | +++ b/ld/ldmain.h | ||
88 | @@ -23,6 +23,7 @@ | ||
89 | |||
90 | extern char *program_name; | ||
91 | extern const char *ld_sysroot; | ||
92 | +extern char ld_sysconfdir[4096]; | ||
93 | extern char *ld_canon_sysroot; | ||
94 | extern int ld_canon_sysroot_len; | ||
95 | extern FILE *saved_script_handle; | ||
96 | -- | ||
97 | 2.28.0 | ||
98 | |||
diff --git a/meta-microblaze/recipes-devtools/binutils/binutils/0004-configure-widen-the-regexp-for-SH-architectures.patch b/meta-microblaze/recipes-devtools/binutils/binutils/0004-configure-widen-the-regexp-for-SH-architectures.patch new file mode 100644 index 00000000..2381c7b8 --- /dev/null +++ b/meta-microblaze/recipes-devtools/binutils/binutils/0004-configure-widen-the-regexp-for-SH-architectures.patch | |||
@@ -0,0 +1,44 @@ | |||
1 | From 361c2c313196c095d12d17cecf0a069107dd629b 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 04/17] 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 54d0339ab9e..6782f8b6ab8 100755 | ||
18 | --- a/configure | ||
19 | +++ b/configure | ||
20 | @@ -3937,7 +3937,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 a910c4fd6ba..55beb1dea46 100644 | ||
31 | --- a/configure.ac | ||
32 | +++ b/configure.ac | ||
33 | @@ -1178,7 +1178,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 | ;; | ||
42 | -- | ||
43 | 2.28.0 | ||
44 | |||
diff --git a/meta-microblaze/recipes-devtools/binutils/binutils/0005-Point-scripts-location-to-libdir.patch b/meta-microblaze/recipes-devtools/binutils/binutils/0005-Point-scripts-location-to-libdir.patch new file mode 100644 index 00000000..c31a0bc9 --- /dev/null +++ b/meta-microblaze/recipes-devtools/binutils/binutils/0005-Point-scripts-location-to-libdir.patch | |||
@@ -0,0 +1,42 @@ | |||
1 | From 39b478b7e52fb1b892a392f3c3750b9023cfabc8 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Mon, 2 Mar 2015 01:09:58 +0000 | ||
4 | Subject: [PATCH 05/17] Point scripts location to libdir | ||
5 | |||
6 | Upstream-Status: Inappropriate [debian patch] | ||
7 | |||
8 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
9 | --- | ||
10 | ld/Makefile.am | 2 +- | ||
11 | ld/Makefile.in | 2 +- | ||
12 | 2 files changed, 2 insertions(+), 2 deletions(-) | ||
13 | |||
14 | diff --git a/ld/Makefile.am b/ld/Makefile.am | ||
15 | index a5762227f0a..e1c665898f3 100644 | ||
16 | --- a/ld/Makefile.am | ||
17 | +++ b/ld/Makefile.am | ||
18 | @@ -51,7 +51,7 @@ AM_CFLAGS = $(WARN_CFLAGS) $(ELF_CLFAGS) | ||
19 | # We put the scripts in the directory $(scriptdir)/ldscripts. | ||
20 | # We can't put the scripts in $(datadir) because the SEARCH_DIR | ||
21 | # directives need to be different for native and cross linkers. | ||
22 | -scriptdir = $(tooldir)/lib | ||
23 | +scriptdir = $(libdir) | ||
24 | |||
25 | EMUL = @EMUL@ | ||
26 | EMULATION_OFILES = @EMULATION_OFILES@ | ||
27 | diff --git a/ld/Makefile.in b/ld/Makefile.in | ||
28 | index 8f0c83ac8d2..acc24ec4130 100644 | ||
29 | --- a/ld/Makefile.in | ||
30 | +++ b/ld/Makefile.in | ||
31 | @@ -556,7 +556,7 @@ AM_CFLAGS = $(WARN_CFLAGS) $(ELF_CLFAGS) | ||
32 | # We put the scripts in the directory $(scriptdir)/ldscripts. | ||
33 | # We can't put the scripts in $(datadir) because the SEARCH_DIR | ||
34 | # directives need to be different for native and cross linkers. | ||
35 | -scriptdir = $(tooldir)/lib | ||
36 | +scriptdir = $(libdir) | ||
37 | BASEDIR = $(srcdir)/.. | ||
38 | BFDDIR = $(BASEDIR)/bfd | ||
39 | INCDIR = $(BASEDIR)/include | ||
40 | -- | ||
41 | 2.28.0 | ||
42 | |||
diff --git a/meta-microblaze/recipes-devtools/binutils/binutils/0006-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch b/meta-microblaze/recipes-devtools/binutils/binutils/0006-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch new file mode 100644 index 00000000..654b64ff --- /dev/null +++ b/meta-microblaze/recipes-devtools/binutils/binutils/0006-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch | |||
@@ -0,0 +1,41 @@ | |||
1 | From 59640ddf11104a604ccf7c078a48359d711c2f9c Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Mon, 2 Mar 2015 01:27:17 +0000 | ||
4 | Subject: [PATCH 06/17] Only generate an RPATH entry if LD_RUN_PATH is not | ||
5 | empty | ||
6 | |||
7 | for cases where -rpath isn't specified. debian (#151024) | ||
8 | |||
9 | Upstream-Status: Pending | ||
10 | |||
11 | Signed-off-by: Chris Chimelis <chris@debian.org> | ||
12 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
13 | --- | ||
14 | ld/ldelf.c | 4 ++++ | ||
15 | 1 file changed, 4 insertions(+) | ||
16 | |||
17 | diff --git a/ld/ldelf.c b/ld/ldelf.c | ||
18 | index b4784009d7a..541772f4604 100644 | ||
19 | --- a/ld/ldelf.c | ||
20 | +++ b/ld/ldelf.c | ||
21 | @@ -1247,6 +1247,8 @@ ldelf_after_open (int use_libpath, int native, int is_linux, int is_freebsd, | ||
22 | && command_line.rpath == NULL) | ||
23 | { | ||
24 | path = (const char *) getenv ("LD_RUN_PATH"); | ||
25 | + if ((path) && (strlen (path) == 0)) | ||
26 | + path = NULL; | ||
27 | if (path | ||
28 | && ldelf_search_needed (path, &n, force, | ||
29 | is_linux, elfsize)) | ||
30 | @@ -1605,6 +1607,8 @@ ldelf_before_allocation (char *audit, char *depaudit, | ||
31 | rpath = command_line.rpath; | ||
32 | if (rpath == NULL) | ||
33 | rpath = (const char *) getenv ("LD_RUN_PATH"); | ||
34 | + if ((rpath) && (strlen (rpath) == 0)) | ||
35 | + rpath = NULL; | ||
36 | |||
37 | for (abfd = link_info.input_bfds; abfd; abfd = abfd->link.next) | ||
38 | if (bfd_get_flavour (abfd) == bfd_target_elf_flavour) | ||
39 | -- | ||
40 | 2.28.0 | ||
41 | |||
diff --git a/meta-microblaze/recipes-devtools/binutils/binutils/0007-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch b/meta-microblaze/recipes-devtools/binutils/binutils/0007-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch new file mode 100644 index 00000000..7f8fc9a5 --- /dev/null +++ b/meta-microblaze/recipes-devtools/binutils/binutils/0007-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch | |||
@@ -0,0 +1,35 @@ | |||
1 | From 2b81508b9af76db292cd756432b03035cb8157e0 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Mon, 2 Mar 2015 01:39:01 +0000 | ||
4 | Subject: [PATCH 07/17] don't let the distro compiler point to the wrong | ||
5 | installation location | ||
6 | |||
7 | Thanks to RP for helping find the source code causing the issue. | ||
8 | |||
9 | 2010/08/13 | ||
10 | Nitin A Kamble <nitin.a.kamble@intel.com> | ||
11 | |||
12 | Upstream-Status: Inappropriate [embedded specific] | ||
13 | |||
14 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
15 | --- | ||
16 | libiberty/Makefile.in | 3 ++- | ||
17 | 1 file changed, 2 insertions(+), 1 deletion(-) | ||
18 | |||
19 | diff --git a/libiberty/Makefile.in b/libiberty/Makefile.in | ||
20 | index 895f701bcd0..97a53f15bb6 100644 | ||
21 | --- a/libiberty/Makefile.in | ||
22 | +++ b/libiberty/Makefile.in | ||
23 | @@ -367,7 +367,8 @@ install-strip: install | ||
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, | ||
26 | # since it will be passed the multilib flags. | ||
27 | -MULTIOSDIR = `$(CC) $(CFLAGS) -print-multi-os-directory` | ||
28 | +#MULTIOSDIR = `$(CC) $(CFLAGS) -print-multi-os-directory` | ||
29 | +MULTIOSDIR = "" | ||
30 | install_to_libdir: all | ||
31 | if test -n "${target_header_dir}"; then \ | ||
32 | ${mkinstalldirs} $(DESTDIR)$(libdir)/$(MULTIOSDIR); \ | ||
33 | -- | ||
34 | 2.28.0 | ||
35 | |||
diff --git a/meta-microblaze/recipes-devtools/binutils/binutils/0008-warn-for-uses-of-system-directories-when-cross-linki.patch b/meta-microblaze/recipes-devtools/binutils/binutils/0008-warn-for-uses-of-system-directories-when-cross-linki.patch new file mode 100644 index 00000000..2356c6a6 --- /dev/null +++ b/meta-microblaze/recipes-devtools/binutils/binutils/0008-warn-for-uses-of-system-directories-when-cross-linki.patch | |||
@@ -0,0 +1,287 @@ | |||
1 | From 413075afbdb16e7cc05511682ca9e3c880acb5a7 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Fri, 15 Jan 2016 06:31:09 +0000 | ||
4 | Subject: [PATCH 08/17] warn for uses of system directories when cross linking | ||
5 | |||
6 | 2008-07-02 Joseph Myers <joseph@codesourcery.com> | ||
7 | |||
8 | ld/ | ||
9 | * ld.h (args_type): Add error_poison_system_directories. | ||
10 | * ld.texinfo (--error-poison-system-directories): Document. | ||
11 | * ldfile.c (ldfile_add_library_path): Check | ||
12 | command_line.error_poison_system_directories. | ||
13 | * ldmain.c (main): Initialize | ||
14 | command_line.error_poison_system_directories. | ||
15 | * lexsup.c (enum option_values): Add | ||
16 | OPTION_ERROR_POISON_SYSTEM_DIRECTORIES. | ||
17 | (ld_options): Add --error-poison-system-directories. | ||
18 | (parse_args): Handle new option. | ||
19 | |||
20 | 2007-06-13 Joseph Myers <joseph@codesourcery.com> | ||
21 | |||
22 | ld/ | ||
23 | * config.in: Regenerate. | ||
24 | * ld.h (args_type): Add poison_system_directories. | ||
25 | * ld.texinfo (--no-poison-system-directories): Document. | ||
26 | * ldfile.c (ldfile_add_library_path): Check | ||
27 | command_line.poison_system_directories. | ||
28 | * ldmain.c (main): Initialize | ||
29 | command_line.poison_system_directories. | ||
30 | * lexsup.c (enum option_values): Add | ||
31 | OPTION_NO_POISON_SYSTEM_DIRECTORIES. | ||
32 | (ld_options): Add --no-poison-system-directories. | ||
33 | (parse_args): Handle new option. | ||
34 | |||
35 | 2007-04-20 Joseph Myers <joseph@codesourcery.com> | ||
36 | |||
37 | Merge from Sourcery G++ binutils 2.17: | ||
38 | |||
39 | 2007-03-20 Joseph Myers <joseph@codesourcery.com> | ||
40 | Based on patch by Mark Hatle <mark.hatle@windriver.com>. | ||
41 | ld/ | ||
42 | * configure.in (--enable-poison-system-directories): New option. | ||
43 | * configure, config.in: Regenerate. | ||
44 | * ldfile.c (ldfile_add_library_path): If | ||
45 | ENABLE_POISON_SYSTEM_DIRECTORIES defined, warn for use of /lib, | ||
46 | /usr/lib, /usr/local/lib or /usr/X11R6/lib. | ||
47 | |||
48 | Upstream-Status: Pending | ||
49 | |||
50 | Signed-off-by: Mark Hatle <mark.hatle@windriver.com> | ||
51 | Signed-off-by: Scott Garman <scott.a.garman@intel.com> | ||
52 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
53 | --- | ||
54 | ld/config.in | 3 +++ | ||
55 | ld/configure | 16 ++++++++++++++++ | ||
56 | ld/configure.ac | 10 ++++++++++ | ||
57 | ld/ld.h | 8 ++++++++ | ||
58 | ld/ld.texi | 12 ++++++++++++ | ||
59 | ld/ldfile.c | 17 +++++++++++++++++ | ||
60 | ld/ldlex.h | 5 +++++ | ||
61 | ld/ldmain.c | 2 ++ | ||
62 | ld/lexsup.c | 27 +++++++++++++++++++++++++++ | ||
63 | 9 files changed, 100 insertions(+) | ||
64 | |||
65 | diff --git a/ld/config.in b/ld/config.in | ||
66 | index f1712107367..308e0173c16 100644 | ||
67 | --- a/ld/config.in | ||
68 | +++ b/ld/config.in | ||
69 | @@ -40,6 +40,9 @@ | ||
70 | language is requested. */ | ||
71 | #undef ENABLE_NLS | ||
72 | |||
73 | +/* Define to warn for use of native system library directories */ | ||
74 | +#undef ENABLE_POISON_SYSTEM_DIRECTORIES | ||
75 | + | ||
76 | /* Additional extension a shared object might have. */ | ||
77 | #undef EXTRA_SHLIB_EXTENSION | ||
78 | |||
79 | diff --git a/ld/configure b/ld/configure | ||
80 | index f08ce9969ea..1c872c0db5f 100755 | ||
81 | --- a/ld/configure | ||
82 | +++ b/ld/configure | ||
83 | @@ -826,6 +826,7 @@ with_lib_path | ||
84 | enable_targets | ||
85 | enable_64_bit_bfd | ||
86 | with_sysroot | ||
87 | +enable_poison_system_directories | ||
88 | enable_gold | ||
89 | enable_got | ||
90 | enable_compressed_debug_sections | ||
91 | @@ -1493,6 +1494,8 @@ Optional Features: | ||
92 | --disable-largefile omit support for large files | ||
93 | --enable-targets alternative target configurations | ||
94 | --enable-64-bit-bfd 64-bit support (on hosts with narrower word sizes) | ||
95 | + --enable-poison-system-directories | ||
96 | + warn for use of native system library directories | ||
97 | --enable-gold[=ARG] build gold [ARG={default,yes,no}] | ||
98 | --enable-got=<type> GOT handling scheme (target, single, negative, | ||
99 | multigot) | ||
100 | @@ -15793,6 +15796,19 @@ fi | ||
101 | |||
102 | |||
103 | |||
104 | +# Check whether --enable-poison-system-directories was given. | ||
105 | +if test "${enable_poison_system_directories+set}" = set; then : | ||
106 | + enableval=$enable_poison_system_directories; | ||
107 | +else | ||
108 | + enable_poison_system_directories=no | ||
109 | +fi | ||
110 | + | ||
111 | +if test "x${enable_poison_system_directories}" = "xyes"; then | ||
112 | + | ||
113 | +$as_echo "#define ENABLE_POISON_SYSTEM_DIRECTORIES 1" >>confdefs.h | ||
114 | + | ||
115 | +fi | ||
116 | + | ||
117 | # Check whether --enable-gold was given. | ||
118 | if test "${enable_gold+set}" = set; then : | ||
119 | enableval=$enable_gold; case "${enableval}" in | ||
120 | diff --git a/ld/configure.ac b/ld/configure.ac | ||
121 | index 5a4938afdb0..dbbbde74b04 100644 | ||
122 | --- a/ld/configure.ac | ||
123 | +++ b/ld/configure.ac | ||
124 | @@ -94,6 +94,16 @@ AC_SUBST(use_sysroot) | ||
125 | AC_SUBST(TARGET_SYSTEM_ROOT) | ||
126 | AC_SUBST(TARGET_SYSTEM_ROOT_DEFINE) | ||
127 | |||
128 | +AC_ARG_ENABLE([poison-system-directories], | ||
129 | + AS_HELP_STRING([--enable-poison-system-directories], | ||
130 | + [warn for use of native system library directories]),, | ||
131 | + [enable_poison_system_directories=no]) | ||
132 | +if test "x${enable_poison_system_directories}" = "xyes"; then | ||
133 | + AC_DEFINE([ENABLE_POISON_SYSTEM_DIRECTORIES], | ||
134 | + [1], | ||
135 | + [Define to warn for use of native system library directories]) | ||
136 | +fi | ||
137 | + | ||
138 | dnl Use --enable-gold to decide if this linker should be the default. | ||
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. | ||
141 | diff --git a/ld/ld.h b/ld/ld.h | ||
142 | index 1790dc81a66..73f832eb169 100644 | ||
143 | --- a/ld/ld.h | ||
144 | +++ b/ld/ld.h | ||
145 | @@ -166,6 +166,14 @@ typedef struct | ||
146 | in the linker script. */ | ||
147 | bfd_boolean force_group_allocation; | ||
148 | |||
149 | + /* If TRUE (the default) warn for uses of system directories when | ||
150 | + cross linking. */ | ||
151 | + bfd_boolean poison_system_directories; | ||
152 | + | ||
153 | + /* If TRUE (default FALSE) give an error for uses of system | ||
154 | + directories when cross linking instead of a warning. */ | ||
155 | + bfd_boolean error_poison_system_directories; | ||
156 | + | ||
157 | /* Big or little endian as set on command line. */ | ||
158 | enum endian_enum endian; | ||
159 | |||
160 | diff --git a/ld/ld.texi b/ld/ld.texi | ||
161 | index 2a93e9456ac..3eeb70607fd 100644 | ||
162 | --- a/ld/ld.texi | ||
163 | +++ b/ld/ld.texi | ||
164 | @@ -2655,6 +2655,18 @@ string identifying the original linked file does not change. | ||
165 | |||
166 | Passing @code{none} for @var{style} disables the setting from any | ||
167 | @code{--build-id} options earlier on the command line. | ||
168 | + | ||
169 | +@kindex --no-poison-system-directories | ||
170 | +@item --no-poison-system-directories | ||
171 | +Do not warn for @option{-L} options using system directories such as | ||
172 | +@file{/usr/lib} when cross linking. This option is intended for use | ||
173 | +in chroot environments when such directories contain the correct | ||
174 | +libraries for the target system rather than the host. | ||
175 | + | ||
176 | +@kindex --error-poison-system-directories | ||
177 | +@item --error-poison-system-directories | ||
178 | +Give an error instead of a warning for @option{-L} options using | ||
179 | +system directories when cross linking. | ||
180 | @end table | ||
181 | |||
182 | @c man end | ||
183 | diff --git a/ld/ldfile.c b/ld/ldfile.c | ||
184 | index e39170b5d94..fadc248a140 100644 | ||
185 | --- a/ld/ldfile.c | ||
186 | +++ b/ld/ldfile.c | ||
187 | @@ -117,6 +117,23 @@ ldfile_add_library_path (const char *name, bfd_boolean cmdline) | ||
188 | new_dirs->name = concat (ld_sysroot, name + strlen ("$SYSROOT"), (const char *) NULL); | ||
189 | else | ||
190 | new_dirs->name = xstrdup (name); | ||
191 | + | ||
192 | +#ifdef ENABLE_POISON_SYSTEM_DIRECTORIES | ||
193 | + if (command_line.poison_system_directories | ||
194 | + && ((!strncmp (name, "/lib", 4)) | ||
195 | + || (!strncmp (name, "/usr/lib", 8)) | ||
196 | + || (!strncmp (name, "/usr/local/lib", 14)) | ||
197 | + || (!strncmp (name, "/usr/X11R6/lib", 14)))) | ||
198 | + { | ||
199 | + if (command_line.error_poison_system_directories) | ||
200 | + einfo (_("%X%P: error: library search path \"%s\" is unsafe for " | ||
201 | + "cross-compilation\n"), name); | ||
202 | + else | ||
203 | + einfo (_("%P: warning: library search path \"%s\" is unsafe for " | ||
204 | + "cross-compilation\n"), name); | ||
205 | + } | ||
206 | +#endif | ||
207 | + | ||
208 | } | ||
209 | |||
210 | /* Try to open a BFD for a lang_input_statement. */ | ||
211 | diff --git a/ld/ldlex.h b/ld/ldlex.h | ||
212 | index 5ea083ebeb3..941dc5f3dc8 100644 | ||
213 | --- a/ld/ldlex.h | ||
214 | +++ b/ld/ldlex.h | ||
215 | @@ -155,6 +155,11 @@ enum option_values | ||
216 | OPTION_NON_CONTIGUOUS_REGIONS, | ||
217 | OPTION_NON_CONTIGUOUS_REGIONS_WARNINGS, | ||
218 | OPTION_DEPENDENCY_FILE, | ||
219 | + OPTION_CTF_VARIABLES, | ||
220 | + OPTION_NO_CTF_VARIABLES, | ||
221 | + OPTION_CTF_SHARE_TYPES, | ||
222 | + OPTION_NO_POISON_SYSTEM_DIRECTORIES, | ||
223 | + OPTION_ERROR_POISON_SYSTEM_DIRECTORIES, | ||
224 | }; | ||
225 | |||
226 | /* The initial parser states. */ | ||
227 | diff --git a/ld/ldmain.c b/ld/ldmain.c | ||
228 | index f5c5a336320..516ba0360e2 100644 | ||
229 | --- a/ld/ldmain.c | ||
230 | +++ b/ld/ldmain.c | ||
231 | @@ -322,6 +322,8 @@ main (int argc, char **argv) | ||
232 | command_line.warn_mismatch = TRUE; | ||
233 | command_line.warn_search_mismatch = TRUE; | ||
234 | command_line.check_section_addresses = -1; | ||
235 | + command_line.poison_system_directories = TRUE; | ||
236 | + command_line.error_poison_system_directories = FALSE; | ||
237 | |||
238 | /* We initialize DEMANGLING based on the environment variable | ||
239 | COLLECT_NO_DEMANGLE. The gcc collect2 program will demangle the | ||
240 | diff --git a/ld/lexsup.c b/ld/lexsup.c | ||
241 | index 58c6c078325..879e7bb7658 100644 | ||
242 | --- a/ld/lexsup.c | ||
243 | +++ b/ld/lexsup.c | ||
244 | @@ -572,6 +572,26 @@ static const struct ld_option ld_options[] = | ||
245 | { {"no-print-map-discarded", no_argument, NULL, OPTION_NO_PRINT_MAP_DISCARDED}, | ||
246 | '\0', NULL, N_("Do not show discarded sections in map file output"), | ||
247 | TWO_DASHES }, | ||
248 | + { {"ctf-variables", no_argument, NULL, OPTION_CTF_VARIABLES}, | ||
249 | + '\0', NULL, N_("Emit names and types of static variables in CTF"), | ||
250 | + TWO_DASHES }, | ||
251 | + { {"no-ctf-variables", no_argument, NULL, OPTION_NO_CTF_VARIABLES}, | ||
252 | + '\0', NULL, N_("Do not emit names and types of static variables in CTF"), | ||
253 | + TWO_DASHES }, | ||
254 | + { {"ctf-share-types=<method>", required_argument, NULL, | ||
255 | + OPTION_CTF_SHARE_TYPES}, | ||
256 | + '\0', NULL, N_("How to share CTF types between translation units.\n" | ||
257 | + " <method> is: share-unconflicted (default),\n" | ||
258 | + " share-duplicated"), | ||
259 | + TWO_DASHES }, | ||
260 | + { {"no-poison-system-directories", no_argument, NULL, | ||
261 | + OPTION_NO_POISON_SYSTEM_DIRECTORIES}, | ||
262 | + '\0', NULL, N_("Do not warn for -L options using system directories"), | ||
263 | + TWO_DASHES }, | ||
264 | + { {"error-poison-system-directories", no_argument, NULL, | ||
265 | + + OPTION_ERROR_POISON_SYSTEM_DIRECTORIES}, | ||
266 | + '\0', NULL, N_("Give an error for -L options using system directories"), | ||
267 | + TWO_DASHES }, | ||
268 | }; | ||
269 | |||
270 | #define OPTION_COUNT ARRAY_SIZE (ld_options) | ||
271 | @@ -1632,6 +1652,13 @@ parse_args (unsigned argc, char **argv) | ||
272 | |||
273 | case OPTION_PRINT_MAP_DISCARDED: | ||
274 | config.print_map_discarded = TRUE; | ||
275 | + | ||
276 | + case OPTION_NO_POISON_SYSTEM_DIRECTORIES: | ||
277 | + command_line.poison_system_directories = FALSE; | ||
278 | + break; | ||
279 | + | ||
280 | + case OPTION_ERROR_POISON_SYSTEM_DIRECTORIES: | ||
281 | + command_line.error_poison_system_directories = TRUE; | ||
282 | break; | ||
283 | |||
284 | case OPTION_DEPENDENCY_FILE: | ||
285 | -- | ||
286 | 2.28.0 | ||
287 | |||
diff --git a/meta-microblaze/recipes-devtools/binutils/binutils/0009-Change-default-emulation-for-mips64-linux.patch b/meta-microblaze/recipes-devtools/binutils/binutils/0009-Change-default-emulation-for-mips64-linux.patch new file mode 100644 index 00000000..fb5276e1 --- /dev/null +++ b/meta-microblaze/recipes-devtools/binutils/binutils/0009-Change-default-emulation-for-mips64-linux.patch | |||
@@ -0,0 +1,60 @@ | |||
1 | From 13a67e9040c01abd284fe506471e0eab668ee3dc 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 09/17] 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 14523caf0c5..e5233cd1f7e 100644 | ||
18 | --- a/bfd/config.bfd | ||
19 | +++ b/bfd/config.bfd | ||
20 | @@ -894,12 +894,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 87c7d9a4cad..9b4bf2ca964 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 | ||
58 | -- | ||
59 | 2.28.0 | ||
60 | |||
diff --git a/meta-microblaze/recipes-devtools/binutils/binutils/0010-Add-support-for-Netlogic-XLP.patch b/meta-microblaze/recipes-devtools/binutils/binutils/0010-Add-support-for-Netlogic-XLP.patch new file mode 100644 index 00000000..277db4ec --- /dev/null +++ b/meta-microblaze/recipes-devtools/binutils/binutils/0010-Add-support-for-Netlogic-XLP.patch | |||
@@ -0,0 +1,409 @@ | |||
1 | From 69ab45c16f80f18fa78121f6e774750b9e9a200b 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 10/17] 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 d352a1a3e44..2e2c3c1af86 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 551ec8732f0..2665b378623 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 35ef4d755bb..48db00af80b 100644 | ||
63 | --- a/bfd/bfd-in2.h | ||
64 | +++ b/bfd/bfd-in2.h | ||
65 | @@ -1585,6 +1585,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 e5233cd1f7e..2e4ae6bbdff 100644 | ||
75 | --- a/bfd/config.bfd | ||
76 | +++ b/bfd/config.bfd | ||
77 | @@ -877,6 +877,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 802acb45f1e..fd9ec4c0ad4 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 160febec94c..4c9499cc2cf 100644 | ||
115 | --- a/bfd/elfxx-mips.c | ||
116 | +++ b/bfd/elfxx-mips.c | ||
117 | @@ -6982,6 +6982,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 | @@ -12356,6 +12359,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 | @@ -14373,6 +14380,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 6057515a89b..ea119b0b254 100644 | ||
148 | --- a/binutils/readelf.c | ||
149 | +++ b/binutils/readelf.c | ||
150 | @@ -3483,6 +3483,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 31acb77d78a..0ead168d51e 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 | @@ -20174,7 +20176,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 5bccfd9d1b7..d4b13e6fc8b 100755 | ||
189 | --- a/gas/configure | ||
190 | +++ b/gas/configure | ||
191 | @@ -12722,6 +12722,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 b65108fecb2..ce1f2dad9bc 100644 | ||
203 | --- a/gas/configure.ac | ||
204 | +++ b/gas/configure.ac | ||
205 | @@ -325,6 +325,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 cc08ebd4318..bb518575ce1 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 fd031f37588..a96a44df840 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 9b4bf2ca964..f6d7171dff7 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 755bbe294bd..ce22ef683a6 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 5270aeefa80..d17dc78cd71 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 }, | ||
407 | -- | ||
408 | 2.28.0 | ||
409 | |||
diff --git a/meta-microblaze/recipes-devtools/binutils/binutils/0011-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch b/meta-microblaze/recipes-devtools/binutils/binutils/0011-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch new file mode 100644 index 00000000..10c3d808 --- /dev/null +++ b/meta-microblaze/recipes-devtools/binutils/binutils/0011-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch | |||
@@ -0,0 +1,37 @@ | |||
1 | From 7836f8aa56ef0f18c8658dc7e4952a9d097ba7e8 Mon Sep 17 00:00:00 2001 | ||
2 | From: Zhenhua Luo <zhenhua.luo@nxp.com> | ||
3 | Date: Sat, 11 Jun 2016 22:08:29 -0500 | ||
4 | Subject: [PATCH 11/17] fix the incorrect assembling for ppc wait mnemonic | ||
5 | |||
6 | Signed-off-by: Zhenhua Luo <zhenhua.luo@nxp.com> | ||
7 | |||
8 | Upstream-Status: Pending | ||
9 | --- | ||
10 | opcodes/ppc-opc.c | 4 +--- | ||
11 | 1 file changed, 1 insertion(+), 3 deletions(-) | ||
12 | |||
13 | diff --git a/opcodes/ppc-opc.c b/opcodes/ppc-opc.c | ||
14 | index 5e20d617664..4c9656ecf08 100644 | ||
15 | --- a/opcodes/ppc-opc.c | ||
16 | +++ b/opcodes/ppc-opc.c | ||
17 | @@ -6265,8 +6265,6 @@ const struct powerpc_opcode powerpc_opcodes[] = { | ||
18 | {"waitasec", X(31,30), XRTRARB_MASK, POWER8, POWER9, {0}}, | ||
19 | {"waitrsv", XWCPL(31,30,1,0),0xffffffff, POWER10, 0, {0}}, | ||
20 | {"pause_short", XWCPL(31,30,2,0),0xffffffff, POWER10, 0, {0}}, | ||
21 | -{"wait", X(31,30), XWCPL_MASK, POWER10, 0, {WC, PL}}, | ||
22 | -{"wait", X(31,30), XWC_MASK, POWER9, POWER10, {WC}}, | ||
23 | |||
24 | {"lwepx", X(31,31), X_MASK, E500MC|PPCA2, 0, {RT, RA0, RB}}, | ||
25 | |||
26 | @@ -6326,7 +6324,7 @@ const struct powerpc_opcode powerpc_opcodes[] = { | ||
27 | |||
28 | {"waitrsv", X(31,62)|(1<<21), 0xffffffff, E500MC|PPCA2, 0, {0}}, | ||
29 | {"waitimpl", X(31,62)|(2<<21), 0xffffffff, E500MC|PPCA2, 0, {0}}, | ||
30 | -{"wait", X(31,62), XWC_MASK, E500MC|PPCA2, 0, {WC}}, | ||
31 | +{"wait", X(31,62), XWC_MASK, E500MC|PPCA2|POWER9|POWER10, 0, {WC}}, | ||
32 | |||
33 | {"dcbstep", XRT(31,63,0), XRT_MASK, E500MC|PPCA2, 0, {RA0, RB}}, | ||
34 | |||
35 | -- | ||
36 | 2.28.0 | ||
37 | |||
diff --git a/meta-microblaze/recipes-devtools/binutils/binutils/0012-Detect-64-bit-MIPS-targets.patch b/meta-microblaze/recipes-devtools/binutils/binutils/0012-Detect-64-bit-MIPS-targets.patch new file mode 100644 index 00000000..ef8b253b --- /dev/null +++ b/meta-microblaze/recipes-devtools/binutils/binutils/0012-Detect-64-bit-MIPS-targets.patch | |||
@@ -0,0 +1,50 @@ | |||
1 | From dbff6bdf2123f5495b8be930304d9aa5e88006a7 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 12/17] 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 aa7ec552aec..470515062e4 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 | ||
48 | -- | ||
49 | 2.28.0 | ||
50 | |||
diff --git a/meta-microblaze/recipes-devtools/binutils/binutils/0013-Use-libtool-2.4.patch b/meta-microblaze/recipes-devtools/binutils/binutils/0013-Use-libtool-2.4.patch new file mode 100644 index 00000000..987a96f4 --- /dev/null +++ b/meta-microblaze/recipes-devtools/binutils/binutils/0013-Use-libtool-2.4.patch | |||
@@ -0,0 +1,23153 @@ | |||
1 | From 7e2ddee8704c9c3b73760dd9464b18fade563d85 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Sun, 14 Feb 2016 17:04:07 +0000 | ||
4 | Subject: [PATCH 13/17] Use libtool 2.4 | ||
5 | |||
6 | get libtool sysroot support | ||
7 | |||
8 | Upstream-Status: Pending | ||
9 | |||
10 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
11 | --- | ||
12 | bfd/configure | 1322 +++++++++++++++----- | ||
13 | bfd/configure.ac | 2 +- | ||
14 | binutils/configure | 1320 +++++++++++++++----- | ||
15 | gas/configure | 1320 +++++++++++++++----- | ||
16 | gprof/configure | 1320 +++++++++++++++----- | ||
17 | ld/configure | 1695 ++++++++++++++++++------- | ||
18 | libctf/configure | 1319 +++++++++++++++----- | ||
19 | libtool.m4 | 1080 +++++++++++----- | ||
20 | ltmain.sh | 2925 +++++++++++++++++++++++++++++--------------- | ||
21 | ltoptions.m4 | 2 +- | ||
22 | ltversion.m4 | 12 +- | ||
23 | lt~obsolete.m4 | 2 +- | ||
24 | opcodes/configure | 1320 +++++++++++++++----- | ||
25 | zlib/configure | 1320 +++++++++++++++----- | ||
26 | 14 files changed, 10931 insertions(+), 4028 deletions(-) | ||
27 | |||
28 | diff --git a/bfd/configure b/bfd/configure | ||
29 | index 0340ed541b5..2012656b3b7 100755 | ||
30 | --- a/bfd/configure | ||
31 | +++ b/bfd/configure | ||
32 | @@ -704,6 +704,9 @@ OTOOL | ||
33 | LIPO | ||
34 | NMEDIT | ||
35 | DSYMUTIL | ||
36 | +MANIFEST_TOOL | ||
37 | +ac_ct_AR | ||
38 | +DLLTOOL | ||
39 | OBJDUMP | ||
40 | LN_S | ||
41 | NM | ||
42 | @@ -822,6 +825,7 @@ enable_static | ||
43 | with_pic | ||
44 | enable_fast_install | ||
45 | with_gnu_ld | ||
46 | +with_libtool_sysroot | ||
47 | enable_libtool_lock | ||
48 | enable_plugins | ||
49 | enable_largefile | ||
50 | @@ -1504,6 +1508,8 @@ Optional Packages: | ||
51 | --with-pic try to use only PIC/non-PIC objects [default=use | ||
52 | both] | ||
53 | --with-gnu-ld assume the C compiler uses GNU ld [default=no] | ||
54 | + --with-libtool-sysroot=DIR Search for dependent libraries within DIR | ||
55 | + (or the compiler's sysroot if not specified). | ||
56 | --with-mmap try using mmap for BFD input files if available | ||
57 | --with-separate-debug-dir=DIR | ||
58 | Look for global separate debug info in DIR | ||
59 | @@ -5693,8 +5699,8 @@ esac | ||
60 | |||
61 | |||
62 | |||
63 | -macro_version='2.2.7a' | ||
64 | -macro_revision='1.3134' | ||
65 | +macro_version='2.4' | ||
66 | +macro_revision='1.3293' | ||
67 | |||
68 | |||
69 | |||
70 | @@ -5734,7 +5740,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO | ||
71 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 | ||
72 | $as_echo_n "checking how to print strings... " >&6; } | ||
73 | # Test print first, because it will be a builtin if present. | ||
74 | -if test "X`print -r -- -n 2>/dev/null`" = X-n && \ | ||
75 | +if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ | ||
76 | test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then | ||
77 | ECHO='print -r --' | ||
78 | elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then | ||
79 | @@ -6420,8 +6426,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; | ||
80 | # Try some XSI features | ||
81 | xsi_shell=no | ||
82 | ( _lt_dummy="a/b/c" | ||
83 | - test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ | ||
84 | - = c,a/b,, \ | ||
85 | + test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ | ||
86 | + = c,a/b,b/c, \ | ||
87 | && eval 'test $(( 1 + 1 )) -eq 2 \ | ||
88 | && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ | ||
89 | && xsi_shell=yes | ||
90 | @@ -6470,6 +6476,80 @@ esac | ||
91 | |||
92 | |||
93 | |||
94 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5 | ||
95 | +$as_echo_n "checking how to convert $build file names to $host format... " >&6; } | ||
96 | +if ${lt_cv_to_host_file_cmd+:} false; then : | ||
97 | + $as_echo_n "(cached) " >&6 | ||
98 | +else | ||
99 | + case $host in | ||
100 | + *-*-mingw* ) | ||
101 | + case $build in | ||
102 | + *-*-mingw* ) # actually msys | ||
103 | + lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 | ||
104 | + ;; | ||
105 | + *-*-cygwin* ) | ||
106 | + lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 | ||
107 | + ;; | ||
108 | + * ) # otherwise, assume *nix | ||
109 | + lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 | ||
110 | + ;; | ||
111 | + esac | ||
112 | + ;; | ||
113 | + *-*-cygwin* ) | ||
114 | + case $build in | ||
115 | + *-*-mingw* ) # actually msys | ||
116 | + lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin | ||
117 | + ;; | ||
118 | + *-*-cygwin* ) | ||
119 | + lt_cv_to_host_file_cmd=func_convert_file_noop | ||
120 | + ;; | ||
121 | + * ) # otherwise, assume *nix | ||
122 | + lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin | ||
123 | + ;; | ||
124 | + esac | ||
125 | + ;; | ||
126 | + * ) # unhandled hosts (and "normal" native builds) | ||
127 | + lt_cv_to_host_file_cmd=func_convert_file_noop | ||
128 | + ;; | ||
129 | +esac | ||
130 | + | ||
131 | +fi | ||
132 | + | ||
133 | +to_host_file_cmd=$lt_cv_to_host_file_cmd | ||
134 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5 | ||
135 | +$as_echo "$lt_cv_to_host_file_cmd" >&6; } | ||
136 | + | ||
137 | + | ||
138 | + | ||
139 | + | ||
140 | + | ||
141 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5 | ||
142 | +$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; } | ||
143 | +if ${lt_cv_to_tool_file_cmd+:} false; then : | ||
144 | + $as_echo_n "(cached) " >&6 | ||
145 | +else | ||
146 | + #assume ordinary cross tools, or native build. | ||
147 | +lt_cv_to_tool_file_cmd=func_convert_file_noop | ||
148 | +case $host in | ||
149 | + *-*-mingw* ) | ||
150 | + case $build in | ||
151 | + *-*-mingw* ) # actually msys | ||
152 | + lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 | ||
153 | + ;; | ||
154 | + esac | ||
155 | + ;; | ||
156 | +esac | ||
157 | + | ||
158 | +fi | ||
159 | + | ||
160 | +to_tool_file_cmd=$lt_cv_to_tool_file_cmd | ||
161 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5 | ||
162 | +$as_echo "$lt_cv_to_tool_file_cmd" >&6; } | ||
163 | + | ||
164 | + | ||
165 | + | ||
166 | + | ||
167 | + | ||
168 | { $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; } | ||
170 | if ${lt_cv_ld_reload_flag+:} false; then : | ||
171 | @@ -6486,6 +6566,11 @@ case $reload_flag in | ||
172 | esac | ||
173 | reload_cmds='$LD$reload_flag -o $output$reload_objs' | ||
174 | case $host_os in | ||
175 | + cygwin* | mingw* | pw32* | cegcc*) | ||
176 | + if test "$GCC" != yes; then | ||
177 | + reload_cmds=false | ||
178 | + fi | ||
179 | + ;; | ||
180 | darwin*) | ||
181 | if test "$GCC" = yes; then | ||
182 | reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' | ||
183 | @@ -6654,7 +6739,8 @@ mingw* | pw32*) | ||
184 | lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' | ||
185 | lt_cv_file_magic_cmd='func_win32_libid' | ||
186 | else | ||
187 | - lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' | ||
188 | + # Keep this pattern in sync with the one in func_win32_libid. | ||
189 | + lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' | ||
190 | lt_cv_file_magic_cmd='$OBJDUMP -f' | ||
191 | fi | ||
192 | ;; | ||
193 | @@ -6808,6 +6894,21 @@ esac | ||
194 | fi | ||
195 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 | ||
196 | $as_echo "$lt_cv_deplibs_check_method" >&6; } | ||
197 | + | ||
198 | +file_magic_glob= | ||
199 | +want_nocaseglob=no | ||
200 | +if test "$build" = "$host"; then | ||
201 | + case $host_os in | ||
202 | + mingw* | pw32*) | ||
203 | + if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then | ||
204 | + want_nocaseglob=yes | ||
205 | + else | ||
206 | + file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"` | ||
207 | + fi | ||
208 | + ;; | ||
209 | + esac | ||
210 | +fi | ||
211 | + | ||
212 | file_magic_cmd=$lt_cv_file_magic_cmd | ||
213 | deplibs_check_method=$lt_cv_deplibs_check_method | ||
214 | test -z "$deplibs_check_method" && deplibs_check_method=unknown | ||
215 | @@ -6821,11 +6922,164 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown | ||
216 | |||
217 | |||
218 | |||
219 | + | ||
220 | + | ||
221 | + | ||
222 | + | ||
223 | + | ||
224 | + | ||
225 | + | ||
226 | + | ||
227 | + | ||
228 | + | ||
229 | |||
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. | ||
235 | +set dummy ${ac_tool_prefix}dlltool; ac_word=$2 | ||
236 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
237 | +$as_echo_n "checking for $ac_word... " >&6; } | ||
238 | +if ${ac_cv_prog_DLLTOOL+:} false; then : | ||
239 | + $as_echo_n "(cached) " >&6 | ||
240 | +else | ||
241 | + if test -n "$DLLTOOL"; then | ||
242 | + ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. | ||
243 | +else | ||
244 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | ||
245 | +for as_dir in $PATH | ||
246 | +do | ||
247 | + IFS=$as_save_IFS | ||
248 | + test -z "$as_dir" && as_dir=. | ||
249 | + for ac_exec_ext in '' $ac_executable_extensions; do | ||
250 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | ||
251 | + ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" | ||
252 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
253 | + break 2 | ||
254 | + fi | ||
255 | +done | ||
256 | + done | ||
257 | +IFS=$as_save_IFS | ||
258 | + | ||
259 | +fi | ||
260 | +fi | ||
261 | +DLLTOOL=$ac_cv_prog_DLLTOOL | ||
262 | +if test -n "$DLLTOOL"; then | ||
263 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 | ||
264 | +$as_echo "$DLLTOOL" >&6; } | ||
265 | +else | ||
266 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
267 | +$as_echo "no" >&6; } | ||
268 | +fi | ||
269 | + | ||
270 | + | ||
271 | +fi | ||
272 | +if test -z "$ac_cv_prog_DLLTOOL"; then | ||
273 | + ac_ct_DLLTOOL=$DLLTOOL | ||
274 | + # Extract the first word of "dlltool", so it can be a program name with args. | ||
275 | +set dummy dlltool; ac_word=$2 | ||
276 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
277 | +$as_echo_n "checking for $ac_word... " >&6; } | ||
278 | +if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then : | ||
279 | + $as_echo_n "(cached) " >&6 | ||
280 | +else | ||
281 | + if test -n "$ac_ct_DLLTOOL"; then | ||
282 | + ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. | ||
283 | +else | ||
284 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | ||
285 | +for as_dir in $PATH | ||
286 | +do | ||
287 | + IFS=$as_save_IFS | ||
288 | + test -z "$as_dir" && as_dir=. | ||
289 | + for ac_exec_ext in '' $ac_executable_extensions; do | ||
290 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | ||
291 | + ac_cv_prog_ac_ct_DLLTOOL="dlltool" | ||
292 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
293 | + break 2 | ||
294 | + fi | ||
295 | +done | ||
296 | + done | ||
297 | +IFS=$as_save_IFS | ||
298 | + | ||
299 | +fi | ||
300 | +fi | ||
301 | +ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL | ||
302 | +if test -n "$ac_ct_DLLTOOL"; then | ||
303 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 | ||
304 | +$as_echo "$ac_ct_DLLTOOL" >&6; } | ||
305 | +else | ||
306 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
307 | +$as_echo "no" >&6; } | ||
308 | +fi | ||
309 | + | ||
310 | + if test "x$ac_ct_DLLTOOL" = x; then | ||
311 | + DLLTOOL="false" | ||
312 | + else | ||
313 | + case $cross_compiling:$ac_tool_warned in | ||
314 | +yes:) | ||
315 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 | ||
316 | +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} | ||
317 | +ac_tool_warned=yes ;; | ||
318 | +esac | ||
319 | + DLLTOOL=$ac_ct_DLLTOOL | ||
320 | + fi | ||
321 | +else | ||
322 | + DLLTOOL="$ac_cv_prog_DLLTOOL" | ||
323 | +fi | ||
324 | + | ||
325 | +test -z "$DLLTOOL" && DLLTOOL=dlltool | ||
326 | + | ||
327 | + | ||
328 | + | ||
329 | + | ||
330 | + | ||
331 | + | ||
332 | + | ||
333 | + | ||
334 | + | ||
335 | + | ||
336 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5 | ||
337 | +$as_echo_n "checking how to associate runtime and link libraries... " >&6; } | ||
338 | +if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then : | ||
339 | + $as_echo_n "(cached) " >&6 | ||
340 | +else | ||
341 | + lt_cv_sharedlib_from_linklib_cmd='unknown' | ||
342 | + | ||
343 | +case $host_os in | ||
344 | +cygwin* | mingw* | pw32* | cegcc*) | ||
345 | + # two different shell functions defined in ltmain.sh | ||
346 | + # decide which to use based on capabilities of $DLLTOOL | ||
347 | + case `$DLLTOOL --help 2>&1` in | ||
348 | + *--identify-strict*) | ||
349 | + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib | ||
350 | + ;; | ||
351 | + *) | ||
352 | + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback | ||
353 | + ;; | ||
354 | + esac | ||
355 | + ;; | ||
356 | +*) | ||
357 | + # fallback: assume linklib IS sharedlib | ||
358 | + lt_cv_sharedlib_from_linklib_cmd="$ECHO" | ||
359 | + ;; | ||
360 | +esac | ||
361 | + | ||
362 | +fi | ||
363 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5 | ||
364 | +$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; } | ||
365 | +sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd | ||
366 | +test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO | ||
367 | + | ||
368 | + | ||
369 | + | ||
370 | + | ||
371 | + | ||
372 | + | ||
373 | + | ||
374 | +if test -n "$ac_tool_prefix"; then | ||
375 | + for ac_prog in ar | ||
376 | + do | ||
377 | + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. | ||
378 | +set dummy $ac_tool_prefix$ac_prog; ac_word=$2 | ||
379 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
380 | $as_echo_n "checking for $ac_word... " >&6; } | ||
381 | if ${ac_cv_prog_AR+:} false; then : | ||
382 | @@ -6841,7 +7095,7 @@ do | ||
383 | test -z "$as_dir" && as_dir=. | ||
384 | for ac_exec_ext in '' $ac_executable_extensions; do | ||
385 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | ||
386 | - ac_cv_prog_AR="${ac_tool_prefix}ar" | ||
387 | + ac_cv_prog_AR="$ac_tool_prefix$ac_prog" | ||
388 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
389 | break 2 | ||
390 | fi | ||
391 | @@ -6861,11 +7115,15 @@ $as_echo "no" >&6; } | ||
392 | fi | ||
393 | |||
394 | |||
395 | + test -n "$AR" && break | ||
396 | + done | ||
397 | fi | ||
398 | -if test -z "$ac_cv_prog_AR"; then | ||
399 | +if test -z "$AR"; then | ||
400 | ac_ct_AR=$AR | ||
401 | - # Extract the first word of "ar", so it can be a program name with args. | ||
402 | -set dummy ar; ac_word=$2 | ||
403 | + for ac_prog in ar | ||
404 | +do | ||
405 | + # Extract the first word of "$ac_prog", so it can be a program name with args. | ||
406 | +set dummy $ac_prog; ac_word=$2 | ||
407 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
408 | $as_echo_n "checking for $ac_word... " >&6; } | ||
409 | if ${ac_cv_prog_ac_ct_AR+:} false; then : | ||
410 | @@ -6881,7 +7139,7 @@ do | ||
411 | test -z "$as_dir" && as_dir=. | ||
412 | for ac_exec_ext in '' $ac_executable_extensions; do | ||
413 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | ||
414 | - ac_cv_prog_ac_ct_AR="ar" | ||
415 | + ac_cv_prog_ac_ct_AR="$ac_prog" | ||
416 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
417 | break 2 | ||
418 | fi | ||
419 | @@ -6900,6 +7158,10 @@ else | ||
420 | $as_echo "no" >&6; } | ||
421 | fi | ||
422 | |||
423 | + | ||
424 | + test -n "$ac_ct_AR" && break | ||
425 | +done | ||
426 | + | ||
427 | if test "x$ac_ct_AR" = x; then | ||
428 | AR="false" | ||
429 | else | ||
430 | @@ -6911,16 +7173,72 @@ ac_tool_warned=yes ;; | ||
431 | esac | ||
432 | AR=$ac_ct_AR | ||
433 | fi | ||
434 | -else | ||
435 | - AR="$ac_cv_prog_AR" | ||
436 | fi | ||
437 | |||
438 | -test -z "$AR" && AR=ar | ||
439 | -test -z "$AR_FLAGS" && AR_FLAGS=cru | ||
440 | +: ${AR=ar} | ||
441 | +: ${AR_FLAGS=cru} | ||
442 | + | ||
443 | + | ||
444 | + | ||
445 | + | ||
446 | + | ||
447 | + | ||
448 | + | ||
449 | + | ||
450 | + | ||
451 | + | ||
452 | + | ||
453 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 | ||
454 | +$as_echo_n "checking for archiver @FILE support... " >&6; } | ||
455 | +if ${lt_cv_ar_at_file+:} false; then : | ||
456 | + $as_echo_n "(cached) " >&6 | ||
457 | +else | ||
458 | + lt_cv_ar_at_file=no | ||
459 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
460 | +/* end confdefs.h. */ | ||
461 | + | ||
462 | +int | ||
463 | +main () | ||
464 | +{ | ||
465 | |||
466 | + ; | ||
467 | + return 0; | ||
468 | +} | ||
469 | +_ACEOF | ||
470 | +if ac_fn_c_try_compile "$LINENO"; then : | ||
471 | + echo conftest.$ac_objext > conftest.lst | ||
472 | + lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5' | ||
473 | + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 | ||
474 | + (eval $lt_ar_try) 2>&5 | ||
475 | + ac_status=$? | ||
476 | + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 | ||
477 | + test $ac_status = 0; } | ||
478 | + if test "$ac_status" -eq 0; then | ||
479 | + # Ensure the archiver fails upon bogus file names. | ||
480 | + rm -f conftest.$ac_objext libconftest.a | ||
481 | + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 | ||
482 | + (eval $lt_ar_try) 2>&5 | ||
483 | + ac_status=$? | ||
484 | + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 | ||
485 | + test $ac_status = 0; } | ||
486 | + if test "$ac_status" -ne 0; then | ||
487 | + lt_cv_ar_at_file=@ | ||
488 | + fi | ||
489 | + fi | ||
490 | + rm -f conftest.* libconftest.a | ||
491 | |||
492 | +fi | ||
493 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
494 | |||
495 | +fi | ||
496 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 | ||
497 | +$as_echo "$lt_cv_ar_at_file" >&6; } | ||
498 | |||
499 | +if test "x$lt_cv_ar_at_file" = xno; then | ||
500 | + archiver_list_spec= | ||
501 | +else | ||
502 | + archiver_list_spec=$lt_cv_ar_at_file | ||
503 | +fi | ||
504 | |||
505 | |||
506 | |||
507 | @@ -7262,8 +7580,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'" | ||
509 | |||
510 | # Transform an extracted symbol line into symbol name and symbol address | ||
511 | -lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" | ||
512 | -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'" | ||
513 | +lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" | ||
514 | +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'" | ||
515 | |||
516 | # Handle CRLF in mingw tool chain | ||
517 | opt_cr= | ||
518 | @@ -7299,6 +7617,7 @@ for ac_symprfx in "" "_"; do | ||
519 | else | ||
520 | lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" | ||
521 | fi | ||
522 | + lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" | ||
523 | |||
524 | # Check to see that the pipe works correctly. | ||
525 | pipe_works=no | ||
526 | @@ -7340,6 +7659,18 @@ _LT_EOF | ||
527 | if $GREP ' nm_test_var$' "$nlist" >/dev/null; then | ||
528 | if $GREP ' nm_test_func$' "$nlist" >/dev/null; then | ||
529 | cat <<_LT_EOF > conftest.$ac_ext | ||
530 | +/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ | ||
531 | +#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) | ||
532 | +/* DATA imports from DLLs on WIN32 con't be const, because runtime | ||
533 | + relocations are performed -- see ld's documentation on pseudo-relocs. */ | ||
534 | +# define LT_DLSYM_CONST | ||
535 | +#elif defined(__osf__) | ||
536 | +/* This system does not cope well with relocations in const data. */ | ||
537 | +# define LT_DLSYM_CONST | ||
538 | +#else | ||
539 | +# define LT_DLSYM_CONST const | ||
540 | +#endif | ||
541 | + | ||
542 | #ifdef __cplusplus | ||
543 | extern "C" { | ||
544 | #endif | ||
545 | @@ -7351,7 +7682,7 @@ _LT_EOF | ||
546 | cat <<_LT_EOF >> conftest.$ac_ext | ||
547 | |||
548 | /* The mapping between symbol names and symbols. */ | ||
549 | -const struct { | ||
550 | +LT_DLSYM_CONST struct { | ||
551 | const char *name; | ||
552 | void *address; | ||
553 | } | ||
554 | @@ -7377,8 +7708,8 @@ static const void *lt_preloaded_setup() { | ||
555 | _LT_EOF | ||
556 | # Now try linking the two files. | ||
557 | mv conftest.$ac_objext conftstm.$ac_objext | ||
558 | - lt_save_LIBS="$LIBS" | ||
559 | - lt_save_CFLAGS="$CFLAGS" | ||
560 | + lt_globsym_save_LIBS=$LIBS | ||
561 | + lt_globsym_save_CFLAGS=$CFLAGS | ||
562 | LIBS="conftstm.$ac_objext" | ||
563 | CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" | ||
564 | if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 | ||
565 | @@ -7388,8 +7719,8 @@ _LT_EOF | ||
566 | test $ac_status = 0; } && test -s conftest${ac_exeext}; then | ||
567 | pipe_works=yes | ||
568 | fi | ||
569 | - LIBS="$lt_save_LIBS" | ||
570 | - CFLAGS="$lt_save_CFLAGS" | ||
571 | + LIBS=$lt_globsym_save_LIBS | ||
572 | + CFLAGS=$lt_globsym_save_CFLAGS | ||
573 | else | ||
574 | echo "cannot find nm_test_func in $nlist" >&5 | ||
575 | fi | ||
576 | @@ -7426,6 +7757,16 @@ else | ||
577 | $as_echo "ok" >&6; } | ||
578 | fi | ||
579 | |||
580 | +# Response file support. | ||
581 | +if test "$lt_cv_nm_interface" = "MS dumpbin"; then | ||
582 | + nm_file_list_spec='@' | ||
583 | +elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then | ||
584 | + nm_file_list_spec='@' | ||
585 | +fi | ||
586 | + | ||
587 | + | ||
588 | + | ||
589 | + | ||
590 | |||
591 | |||
592 | |||
593 | @@ -7442,6 +7783,45 @@ fi | ||
594 | |||
595 | |||
596 | |||
597 | + | ||
598 | + | ||
599 | + | ||
600 | + | ||
601 | + | ||
602 | + | ||
603 | + | ||
604 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 | ||
605 | +$as_echo_n "checking for sysroot... " >&6; } | ||
606 | + | ||
607 | +# Check whether --with-libtool-sysroot was given. | ||
608 | +if test "${with_libtool_sysroot+set}" = set; then : | ||
609 | + withval=$with_libtool_sysroot; | ||
610 | +else | ||
611 | + with_libtool_sysroot=no | ||
612 | +fi | ||
613 | + | ||
614 | + | ||
615 | +lt_sysroot= | ||
616 | +case ${with_libtool_sysroot} in #( | ||
617 | + yes) | ||
618 | + if test "$GCC" = yes; then | ||
619 | + lt_sysroot=`$CC --print-sysroot 2>/dev/null` | ||
620 | + fi | ||
621 | + ;; #( | ||
622 | + /*) | ||
623 | + lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"` | ||
624 | + ;; #( | ||
625 | + no|'') | ||
626 | + ;; #( | ||
627 | + *) | ||
628 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5 | ||
629 | +$as_echo "${with_libtool_sysroot}" >&6; } | ||
630 | + as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 | ||
631 | + ;; | ||
632 | +esac | ||
633 | + | ||
634 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 | ||
635 | +$as_echo "${lt_sysroot:-no}" >&6; } | ||
636 | |||
637 | |||
638 | |||
639 | @@ -7653,6 +8033,123 @@ esac | ||
640 | |||
641 | need_locks="$enable_libtool_lock" | ||
642 | |||
643 | +if test -n "$ac_tool_prefix"; then | ||
644 | + # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args. | ||
645 | +set dummy ${ac_tool_prefix}mt; ac_word=$2 | ||
646 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
647 | +$as_echo_n "checking for $ac_word... " >&6; } | ||
648 | +if ${ac_cv_prog_MANIFEST_TOOL+:} false; then : | ||
649 | + $as_echo_n "(cached) " >&6 | ||
650 | +else | ||
651 | + if test -n "$MANIFEST_TOOL"; then | ||
652 | + ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test. | ||
653 | +else | ||
654 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | ||
655 | +for as_dir in $PATH | ||
656 | +do | ||
657 | + IFS=$as_save_IFS | ||
658 | + test -z "$as_dir" && as_dir=. | ||
659 | + for ac_exec_ext in '' $ac_executable_extensions; do | ||
660 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | ||
661 | + ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" | ||
662 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
663 | + break 2 | ||
664 | + fi | ||
665 | +done | ||
666 | + done | ||
667 | +IFS=$as_save_IFS | ||
668 | + | ||
669 | +fi | ||
670 | +fi | ||
671 | +MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL | ||
672 | +if test -n "$MANIFEST_TOOL"; then | ||
673 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5 | ||
674 | +$as_echo "$MANIFEST_TOOL" >&6; } | ||
675 | +else | ||
676 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
677 | +$as_echo "no" >&6; } | ||
678 | +fi | ||
679 | + | ||
680 | + | ||
681 | +fi | ||
682 | +if test -z "$ac_cv_prog_MANIFEST_TOOL"; then | ||
683 | + ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL | ||
684 | + # Extract the first word of "mt", so it can be a program name with args. | ||
685 | +set dummy mt; ac_word=$2 | ||
686 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
687 | +$as_echo_n "checking for $ac_word... " >&6; } | ||
688 | +if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then : | ||
689 | + $as_echo_n "(cached) " >&6 | ||
690 | +else | ||
691 | + if test -n "$ac_ct_MANIFEST_TOOL"; then | ||
692 | + ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test. | ||
693 | +else | ||
694 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | ||
695 | +for as_dir in $PATH | ||
696 | +do | ||
697 | + IFS=$as_save_IFS | ||
698 | + test -z "$as_dir" && as_dir=. | ||
699 | + for ac_exec_ext in '' $ac_executable_extensions; do | ||
700 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | ||
701 | + ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" | ||
702 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
703 | + break 2 | ||
704 | + fi | ||
705 | +done | ||
706 | + done | ||
707 | +IFS=$as_save_IFS | ||
708 | + | ||
709 | +fi | ||
710 | +fi | ||
711 | +ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL | ||
712 | +if test -n "$ac_ct_MANIFEST_TOOL"; then | ||
713 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5 | ||
714 | +$as_echo "$ac_ct_MANIFEST_TOOL" >&6; } | ||
715 | +else | ||
716 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
717 | +$as_echo "no" >&6; } | ||
718 | +fi | ||
719 | + | ||
720 | + if test "x$ac_ct_MANIFEST_TOOL" = x; then | ||
721 | + MANIFEST_TOOL=":" | ||
722 | + else | ||
723 | + case $cross_compiling:$ac_tool_warned in | ||
724 | +yes:) | ||
725 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 | ||
726 | +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} | ||
727 | +ac_tool_warned=yes ;; | ||
728 | +esac | ||
729 | + MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL | ||
730 | + fi | ||
731 | +else | ||
732 | + MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL" | ||
733 | +fi | ||
734 | + | ||
735 | +test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt | ||
736 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5 | ||
737 | +$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; } | ||
738 | +if ${lt_cv_path_mainfest_tool+:} false; then : | ||
739 | + $as_echo_n "(cached) " >&6 | ||
740 | +else | ||
741 | + lt_cv_path_mainfest_tool=no | ||
742 | + echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5 | ||
743 | + $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out | ||
744 | + cat conftest.err >&5 | ||
745 | + if $GREP 'Manifest Tool' conftest.out > /dev/null; then | ||
746 | + lt_cv_path_mainfest_tool=yes | ||
747 | + fi | ||
748 | + rm -f conftest* | ||
749 | +fi | ||
750 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5 | ||
751 | +$as_echo "$lt_cv_path_mainfest_tool" >&6; } | ||
752 | +if test "x$lt_cv_path_mainfest_tool" != xyes; then | ||
753 | + MANIFEST_TOOL=: | ||
754 | +fi | ||
755 | + | ||
756 | + | ||
757 | + | ||
758 | + | ||
759 | + | ||
760 | |||
761 | case $host_os in | ||
762 | rhapsody* | darwin*) | ||
763 | @@ -8216,6 +8713,8 @@ _LT_EOF | ||
764 | $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 | ||
765 | echo "$AR cru libconftest.a conftest.o" >&5 | ||
766 | $AR cru libconftest.a conftest.o 2>&5 | ||
767 | + echo "$RANLIB libconftest.a" >&5 | ||
768 | + $RANLIB libconftest.a 2>&5 | ||
769 | cat > conftest.c << _LT_EOF | ||
770 | int main() { return 0;} | ||
771 | _LT_EOF | ||
772 | @@ -8380,7 +8879,8 @@ 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 | @@ -8469,7 +8969,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 | @@ -8767,8 +9267,6 @@ fi | ||
792 | lt_prog_compiler_pic= | ||
793 | lt_prog_compiler_static= | ||
794 | |||
795 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 | ||
796 | -$as_echo_n "checking for $compiler option to produce PIC... " >&6; } | ||
797 | |||
798 | if test "$GCC" = yes; then | ||
799 | lt_prog_compiler_wl='-Wl,' | ||
800 | @@ -8934,6 +9432,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } | ||
801 | lt_prog_compiler_pic='--shared' | ||
802 | lt_prog_compiler_static='--static' | ||
803 | ;; | ||
804 | + nagfor*) | ||
805 | + # NAG Fortran compiler | ||
806 | + lt_prog_compiler_wl='-Wl,-Wl,,' | ||
807 | + lt_prog_compiler_pic='-PIC' | ||
808 | + lt_prog_compiler_static='-Bstatic' | ||
809 | + ;; | ||
810 | pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) | ||
811 | # Portland Group compilers (*not* the Pentium gcc compiler, | ||
812 | # which looks to be a dead project) | ||
813 | @@ -8996,7 +9500,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } | ||
814 | lt_prog_compiler_pic='-KPIC' | ||
815 | lt_prog_compiler_static='-Bstatic' | ||
816 | case $cc_basename in | ||
817 | - f77* | f90* | f95*) | ||
818 | + f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) | ||
819 | lt_prog_compiler_wl='-Qoption ld ';; | ||
820 | *) | ||
821 | lt_prog_compiler_wl='-Wl,';; | ||
822 | @@ -9053,13 +9557,17 @@ case $host_os in | ||
823 | lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" | ||
824 | ;; | ||
825 | esac | ||
826 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5 | ||
827 | -$as_echo "$lt_prog_compiler_pic" >&6; } | ||
828 | - | ||
829 | - | ||
830 | - | ||
831 | - | ||
832 | |||
833 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 | ||
834 | +$as_echo_n "checking for $compiler option to produce PIC... " >&6; } | ||
835 | +if ${lt_cv_prog_compiler_pic+:} false; then : | ||
836 | + $as_echo_n "(cached) " >&6 | ||
837 | +else | ||
838 | + lt_cv_prog_compiler_pic=$lt_prog_compiler_pic | ||
839 | +fi | ||
840 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5 | ||
841 | +$as_echo "$lt_cv_prog_compiler_pic" >&6; } | ||
842 | +lt_prog_compiler_pic=$lt_cv_prog_compiler_pic | ||
843 | |||
844 | # | ||
845 | # Check to make sure the PIC flag actually works. | ||
846 | @@ -9120,6 +9628,11 @@ fi | ||
847 | |||
848 | |||
849 | |||
850 | + | ||
851 | + | ||
852 | + | ||
853 | + | ||
854 | + | ||
855 | # | ||
856 | # Check to make sure the static flag actually works. | ||
857 | # | ||
858 | @@ -9470,7 +9983,8 @@ _LT_EOF | ||
859 | allow_undefined_flag=unsupported | ||
860 | always_export_symbols=no | ||
861 | enable_shared_with_static_runtimes=yes | ||
862 | - export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' | ||
863 | + 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' | ||
864 | + exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' | ||
865 | |||
866 | 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' | ||
868 | @@ -9569,12 +10083,12 @@ _LT_EOF | ||
869 | whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' | ||
870 | hardcode_libdir_flag_spec= | ||
871 | hardcode_libdir_flag_spec_ld='-rpath $libdir' | ||
872 | - archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' | ||
873 | + archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' | ||
874 | if test "x$supports_anon_versioning" = xyes; then | ||
875 | archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ | ||
876 | cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ | ||
877 | echo "local: *; };" >> $output_objdir/$libname.ver~ | ||
878 | - $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' | ||
879 | + $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' | ||
880 | fi | ||
881 | ;; | ||
882 | esac | ||
883 | @@ -9588,8 +10102,8 @@ _LT_EOF | ||
884 | archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' | ||
885 | wlarc= | ||
886 | else | ||
887 | - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' | ||
888 | - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' | ||
889 | + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' | ||
890 | + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' | ||
891 | fi | ||
892 | ;; | ||
893 | |||
894 | @@ -9607,8 +10121,8 @@ _LT_EOF | ||
895 | |||
896 | _LT_EOF | ||
897 | elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then | ||
898 | - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' | ||
899 | - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' | ||
900 | + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' | ||
901 | + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' | ||
902 | else | ||
903 | ld_shlibs=no | ||
904 | fi | ||
905 | @@ -9654,8 +10168,8 @@ _LT_EOF | ||
906 | |||
907 | *) | ||
908 | if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then | ||
909 | - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' | ||
910 | - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' | ||
911 | + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' | ||
912 | + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' | ||
913 | else | ||
914 | ld_shlibs=no | ||
915 | fi | ||
916 | @@ -9785,7 +10299,13 @@ _LT_EOF | ||
917 | allow_undefined_flag='-berok' | ||
918 | # Determine the default libpath from the value encoded in an | ||
919 | # empty executable. | ||
920 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
921 | + if test "${lt_cv_aix_libpath+set}" = set; then | ||
922 | + aix_libpath=$lt_cv_aix_libpath | ||
923 | +else | ||
924 | + if ${lt_cv_aix_libpath_+:} false; then : | ||
925 | + $as_echo_n "(cached) " >&6 | ||
926 | +else | ||
927 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
928 | /* end confdefs.h. */ | ||
929 | |||
930 | int | ||
931 | @@ -9798,22 +10318,29 @@ main () | ||
932 | _ACEOF | ||
933 | if ac_fn_c_try_link "$LINENO"; then : | ||
934 | |||
935 | -lt_aix_libpath_sed=' | ||
936 | - /Import File Strings/,/^$/ { | ||
937 | - /^0/ { | ||
938 | - s/^0 *\(.*\)$/\1/ | ||
939 | - p | ||
940 | - } | ||
941 | - }' | ||
942 | -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | ||
943 | -# Check for a 64-bit object if we didn't find anything. | ||
944 | -if test -z "$aix_libpath"; then | ||
945 | - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | ||
946 | -fi | ||
947 | + lt_aix_libpath_sed=' | ||
948 | + /Import File Strings/,/^$/ { | ||
949 | + /^0/ { | ||
950 | + s/^0 *\([^ ]*\) *$/\1/ | ||
951 | + p | ||
952 | + } | ||
953 | + }' | ||
954 | + lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | ||
955 | + # Check for a 64-bit object if we didn't find anything. | ||
956 | + if test -z "$lt_cv_aix_libpath_"; then | ||
957 | + lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | ||
958 | + fi | ||
959 | fi | ||
960 | rm -f core conftest.err conftest.$ac_objext \ | ||
961 | conftest$ac_exeext conftest.$ac_ext | ||
962 | -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | ||
963 | + if test -z "$lt_cv_aix_libpath_"; then | ||
964 | + lt_cv_aix_libpath_="/usr/lib:/lib" | ||
965 | + fi | ||
966 | + | ||
967 | +fi | ||
968 | + | ||
969 | + aix_libpath=$lt_cv_aix_libpath_ | ||
970 | +fi | ||
971 | |||
972 | 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" | ||
974 | @@ -9825,7 +10352,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | ||
975 | else | ||
976 | # Determine the default libpath from the value encoded in an | ||
977 | # empty executable. | ||
978 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
979 | + if test "${lt_cv_aix_libpath+set}" = set; then | ||
980 | + aix_libpath=$lt_cv_aix_libpath | ||
981 | +else | ||
982 | + if ${lt_cv_aix_libpath_+:} false; then : | ||
983 | + $as_echo_n "(cached) " >&6 | ||
984 | +else | ||
985 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
986 | /* end confdefs.h. */ | ||
987 | |||
988 | int | ||
989 | @@ -9838,22 +10371,29 @@ main () | ||
990 | _ACEOF | ||
991 | if ac_fn_c_try_link "$LINENO"; then : | ||
992 | |||
993 | -lt_aix_libpath_sed=' | ||
994 | - /Import File Strings/,/^$/ { | ||
995 | - /^0/ { | ||
996 | - s/^0 *\(.*\)$/\1/ | ||
997 | - p | ||
998 | - } | ||
999 | - }' | ||
1000 | -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | ||
1001 | -# Check for a 64-bit object if we didn't find anything. | ||
1002 | -if test -z "$aix_libpath"; then | ||
1003 | - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | ||
1004 | -fi | ||
1005 | + lt_aix_libpath_sed=' | ||
1006 | + /Import File Strings/,/^$/ { | ||
1007 | + /^0/ { | ||
1008 | + s/^0 *\([^ ]*\) *$/\1/ | ||
1009 | + p | ||
1010 | + } | ||
1011 | + }' | ||
1012 | + lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | ||
1013 | + # Check for a 64-bit object if we didn't find anything. | ||
1014 | + if test -z "$lt_cv_aix_libpath_"; then | ||
1015 | + lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | ||
1016 | + fi | ||
1017 | fi | ||
1018 | rm -f core conftest.err conftest.$ac_objext \ | ||
1019 | conftest$ac_exeext conftest.$ac_ext | ||
1020 | -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | ||
1021 | + if test -z "$lt_cv_aix_libpath_"; then | ||
1022 | + lt_cv_aix_libpath_="/usr/lib:/lib" | ||
1023 | + fi | ||
1024 | + | ||
1025 | +fi | ||
1026 | + | ||
1027 | + aix_libpath=$lt_cv_aix_libpath_ | ||
1028 | +fi | ||
1029 | |||
1030 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" | ||
1031 | # Warning - without using the other run time loading flags, | ||
1032 | @@ -9898,20 +10438,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | ||
1033 | # Microsoft Visual C++. | ||
1034 | # hardcode_libdir_flag_spec is actually meaningless, as there is | ||
1035 | # no search path for DLLs. | ||
1036 | - hardcode_libdir_flag_spec=' ' | ||
1037 | - allow_undefined_flag=unsupported | ||
1038 | - # Tell ltmain to make .lib files, not .a files. | ||
1039 | - libext=lib | ||
1040 | - # Tell ltmain to make .dll files, not .so files. | ||
1041 | - shrext_cmds=".dll" | ||
1042 | - # FIXME: Setting linknames here is a bad hack. | ||
1043 | - archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' | ||
1044 | - # The linker will automatically build a .lib file if we build a DLL. | ||
1045 | - old_archive_from_new_cmds='true' | ||
1046 | - # FIXME: Should let the user specify the lib program. | ||
1047 | - old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' | ||
1048 | - fix_srcfile_path='`cygpath -w "$srcfile"`' | ||
1049 | - enable_shared_with_static_runtimes=yes | ||
1050 | + case $cc_basename in | ||
1051 | + cl*) | ||
1052 | + # Native MSVC | ||
1053 | + hardcode_libdir_flag_spec=' ' | ||
1054 | + allow_undefined_flag=unsupported | ||
1055 | + always_export_symbols=yes | ||
1056 | + file_list_spec='@' | ||
1057 | + # Tell ltmain to make .lib files, not .a files. | ||
1058 | + libext=lib | ||
1059 | + # Tell ltmain to make .dll files, not .so files. | ||
1060 | + shrext_cmds=".dll" | ||
1061 | + # FIXME: Setting linknames here is a bad hack. | ||
1062 | + archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' | ||
1063 | + archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then | ||
1064 | + sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; | ||
1065 | + else | ||
1066 | + sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; | ||
1067 | + fi~ | ||
1068 | + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ | ||
1069 | + linknames=' | ||
1070 | + # The linker will not automatically build a static lib if we build a DLL. | ||
1071 | + # _LT_TAGVAR(old_archive_from_new_cmds, )='true' | ||
1072 | + enable_shared_with_static_runtimes=yes | ||
1073 | + export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' | ||
1074 | + # Don't use ranlib | ||
1075 | + old_postinstall_cmds='chmod 644 $oldlib' | ||
1076 | + postlink_cmds='lt_outputfile="@OUTPUT@"~ | ||
1077 | + lt_tool_outputfile="@TOOL_OUTPUT@"~ | ||
1078 | + case $lt_outputfile in | ||
1079 | + *.exe|*.EXE) ;; | ||
1080 | + *) | ||
1081 | + lt_outputfile="$lt_outputfile.exe" | ||
1082 | + lt_tool_outputfile="$lt_tool_outputfile.exe" | ||
1083 | + ;; | ||
1084 | + esac~ | ||
1085 | + if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then | ||
1086 | + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; | ||
1087 | + $RM "$lt_outputfile.manifest"; | ||
1088 | + fi' | ||
1089 | + ;; | ||
1090 | + *) | ||
1091 | + # Assume MSVC wrapper | ||
1092 | + hardcode_libdir_flag_spec=' ' | ||
1093 | + allow_undefined_flag=unsupported | ||
1094 | + # Tell ltmain to make .lib files, not .a files. | ||
1095 | + libext=lib | ||
1096 | + # Tell ltmain to make .dll files, not .so files. | ||
1097 | + shrext_cmds=".dll" | ||
1098 | + # FIXME: Setting linknames here is a bad hack. | ||
1099 | + archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' | ||
1100 | + # The linker will automatically build a .lib file if we build a DLL. | ||
1101 | + old_archive_from_new_cmds='true' | ||
1102 | + # FIXME: Should let the user specify the lib program. | ||
1103 | + old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' | ||
1104 | + enable_shared_with_static_runtimes=yes | ||
1105 | + ;; | ||
1106 | + esac | ||
1107 | ;; | ||
1108 | |||
1109 | darwin* | rhapsody*) | ||
1110 | @@ -9972,7 +10555,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | ||
1111 | |||
1112 | # FreeBSD 3 and greater uses gcc -shared to do shared libraries. | ||
1113 | freebsd* | dragonfly*) | ||
1114 | - archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' | ||
1115 | + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' | ||
1116 | hardcode_libdir_flag_spec='-R$libdir' | ||
1117 | hardcode_direct=yes | ||
1118 | hardcode_shlibpath_var=no | ||
1119 | @@ -9980,7 +10563,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | ||
1120 | |||
1121 | hpux9*) | ||
1122 | if test "$GCC" = yes; then | ||
1123 | - 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' | ||
1124 | + 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' | ||
1125 | 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' | ||
1127 | fi | ||
1128 | @@ -9996,7 +10579,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | ||
1129 | |||
1130 | hpux10*) | ||
1131 | if test "$GCC" = yes && test "$with_gnu_ld" = no; then | ||
1132 | - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' | ||
1133 | + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' | ||
1134 | else | ||
1135 | archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' | ||
1136 | fi | ||
1137 | @@ -10020,10 +10603,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' | ||
1139 | ;; | ||
1140 | ia64*) | ||
1141 | - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' | ||
1142 | + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' | ||
1143 | ;; | ||
1144 | *) | ||
1145 | - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' | ||
1146 | + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' | ||
1147 | ;; | ||
1148 | esac | ||
1149 | else | ||
1150 | @@ -10102,23 +10685,36 @@ fi | ||
1151 | |||
1152 | irix5* | irix6* | nonstopux*) | ||
1153 | if test "$GCC" = yes; then | ||
1154 | - 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' | ||
1155 | + 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' | ||
1156 | # Try to use the -exported_symbol ld option, if it does not | ||
1157 | # work, assume that -exports_file does not work either and | ||
1158 | # implicitly export all symbols. | ||
1159 | - save_LDFLAGS="$LDFLAGS" | ||
1160 | - LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" | ||
1161 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
1162 | + # This should be the same for all languages, so no per-tag cache variable. | ||
1163 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5 | ||
1164 | +$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; } | ||
1165 | +if ${lt_cv_irix_exported_symbol+:} false; then : | ||
1166 | + $as_echo_n "(cached) " >&6 | ||
1167 | +else | ||
1168 | + save_LDFLAGS="$LDFLAGS" | ||
1169 | + LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" | ||
1170 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
1171 | /* end confdefs.h. */ | ||
1172 | -int foo(void) {} | ||
1173 | +int foo (void) { return 0; } | ||
1174 | _ACEOF | ||
1175 | if ac_fn_c_try_link "$LINENO"; then : | ||
1176 | - 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' | ||
1177 | - | ||
1178 | + lt_cv_irix_exported_symbol=yes | ||
1179 | +else | ||
1180 | + lt_cv_irix_exported_symbol=no | ||
1181 | fi | ||
1182 | rm -f core conftest.err conftest.$ac_objext \ | ||
1183 | conftest$ac_exeext conftest.$ac_ext | ||
1184 | - LDFLAGS="$save_LDFLAGS" | ||
1185 | + LDFLAGS="$save_LDFLAGS" | ||
1186 | +fi | ||
1187 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5 | ||
1188 | +$as_echo "$lt_cv_irix_exported_symbol" >&6; } | ||
1189 | + if test "$lt_cv_irix_exported_symbol" = yes; then | ||
1190 | + 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' | ||
1191 | + fi | ||
1192 | 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' | ||
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' | ||
1195 | @@ -10203,7 +10799,7 @@ rm -f core conftest.err conftest.$ac_objext \ | ||
1196 | osf4* | osf5*) # as osf3* with the addition of -msym flag | ||
1197 | if test "$GCC" = yes; then | ||
1198 | allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' | ||
1199 | - 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' | ||
1200 | + 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' | ||
1201 | hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' | ||
1202 | else | ||
1203 | allow_undefined_flag=' -expect_unresolved \*' | ||
1204 | @@ -10222,9 +10818,9 @@ rm -f core conftest.err conftest.$ac_objext \ | ||
1205 | no_undefined_flag=' -z defs' | ||
1206 | if test "$GCC" = yes; then | ||
1207 | wlarc='${wl}' | ||
1208 | - archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' | ||
1209 | + archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' | ||
1210 | archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ | ||
1211 | - $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' | ||
1212 | + $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' | ||
1213 | else | ||
1214 | case `$CC -V 2>&1` in | ||
1215 | *"Compilers 5.0"*) | ||
1216 | @@ -10800,8 +11396,9 @@ cygwin* | mingw* | pw32* | cegcc*) | ||
1217 | need_version=no | ||
1218 | need_lib_prefix=no | ||
1219 | |||
1220 | - case $GCC,$host_os in | ||
1221 | - yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) | ||
1222 | + case $GCC,$cc_basename in | ||
1223 | + yes,*) | ||
1224 | + # gcc | ||
1225 | library_names_spec='$libname.dll.a' | ||
1226 | # DLL is installed to $(libdir)/../bin by postinstall_cmds | ||
1227 | postinstall_cmds='base_file=`basename \${file}`~ | ||
1228 | @@ -10834,13 +11431,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}' | ||
1230 | ;; | ||
1231 | esac | ||
1232 | + dynamic_linker='Win32 ld.exe' | ||
1233 | + ;; | ||
1234 | + | ||
1235 | + *,cl*) | ||
1236 | + # Native MSVC | ||
1237 | + libname_spec='$name' | ||
1238 | + soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' | ||
1239 | + library_names_spec='${libname}.dll.lib' | ||
1240 | + | ||
1241 | + case $build_os in | ||
1242 | + mingw*) | ||
1243 | + sys_lib_search_path_spec= | ||
1244 | + lt_save_ifs=$IFS | ||
1245 | + IFS=';' | ||
1246 | + for lt_path in $LIB | ||
1247 | + do | ||
1248 | + IFS=$lt_save_ifs | ||
1249 | + # Let DOS variable expansion print the short 8.3 style file name. | ||
1250 | + lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` | ||
1251 | + sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" | ||
1252 | + done | ||
1253 | + IFS=$lt_save_ifs | ||
1254 | + # Convert to MSYS style. | ||
1255 | + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` | ||
1256 | + ;; | ||
1257 | + cygwin*) | ||
1258 | + # Convert to unix form, then to dos form, then back to unix form | ||
1259 | + # but this time dos style (no spaces!) so that the unix form looks | ||
1260 | + # like /cygdrive/c/PROGRA~1:/cygdr... | ||
1261 | + sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` | ||
1262 | + sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` | ||
1263 | + sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` | ||
1264 | + ;; | ||
1265 | + *) | ||
1266 | + sys_lib_search_path_spec="$LIB" | ||
1267 | + if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then | ||
1268 | + # It is most probably a Windows format PATH. | ||
1269 | + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` | ||
1270 | + else | ||
1271 | + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` | ||
1272 | + fi | ||
1273 | + # FIXME: find the short name or the path components, as spaces are | ||
1274 | + # common. (e.g. "Program Files" -> "PROGRA~1") | ||
1275 | + ;; | ||
1276 | + esac | ||
1277 | + | ||
1278 | + # DLL is installed to $(libdir)/../bin by postinstall_cmds | ||
1279 | + postinstall_cmds='base_file=`basename \${file}`~ | ||
1280 | + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ | ||
1281 | + dldir=$destdir/`dirname \$dlpath`~ | ||
1282 | + test -d \$dldir || mkdir -p \$dldir~ | ||
1283 | + $install_prog $dir/$dlname \$dldir/$dlname' | ||
1284 | + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ | ||
1285 | + dlpath=$dir/\$dldll~ | ||
1286 | + $RM \$dlpath' | ||
1287 | + shlibpath_overrides_runpath=yes | ||
1288 | + dynamic_linker='Win32 link.exe' | ||
1289 | ;; | ||
1290 | |||
1291 | *) | ||
1292 | + # Assume MSVC wrapper | ||
1293 | library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' | ||
1294 | + dynamic_linker='Win32 ld.exe' | ||
1295 | ;; | ||
1296 | esac | ||
1297 | - dynamic_linker='Win32 ld.exe' | ||
1298 | # FIXME: first we should search . and the directory the executable is in | ||
1299 | shlibpath_var=PATH | ||
1300 | ;; | ||
1301 | @@ -10932,7 +11587,7 @@ haiku*) | ||
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 | @@ -11728,7 +12383,7 @@ else | ||
1311 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 | ||
1312 | lt_status=$lt_dlunknown | ||
1313 | cat > conftest.$ac_ext <<_LT_EOF | ||
1314 | -#line 11731 "configure" | ||
1315 | +#line $LINENO "configure" | ||
1316 | #include "confdefs.h" | ||
1317 | |||
1318 | #if HAVE_DLFCN_H | ||
1319 | @@ -11772,10 +12427,10 @@ else | ||
1320 | /* When -fvisbility=hidden is used, assume the code has been annotated | ||
1321 | correspondingly for the symbols needed. */ | ||
1322 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) | ||
1323 | -void fnord () __attribute__((visibility("default"))); | ||
1324 | +int fnord () __attribute__((visibility("default"))); | ||
1325 | #endif | ||
1326 | |||
1327 | -void fnord () { int i=42; } | ||
1328 | +int fnord () { return 42; } | ||
1329 | int main () | ||
1330 | { | ||
1331 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); | ||
1332 | @@ -11834,7 +12489,7 @@ else | ||
1333 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 | ||
1334 | lt_status=$lt_dlunknown | ||
1335 | cat > conftest.$ac_ext <<_LT_EOF | ||
1336 | -#line 11837 "configure" | ||
1337 | +#line $LINENO "configure" | ||
1338 | #include "confdefs.h" | ||
1339 | |||
1340 | #if HAVE_DLFCN_H | ||
1341 | @@ -11878,10 +12533,10 @@ else | ||
1342 | /* When -fvisbility=hidden is used, assume the code has been annotated | ||
1343 | correspondingly for the symbols needed. */ | ||
1344 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) | ||
1345 | -void fnord () __attribute__((visibility("default"))); | ||
1346 | +int fnord () __attribute__((visibility("default"))); | ||
1347 | #endif | ||
1348 | |||
1349 | -void fnord () { int i=42; } | ||
1350 | +int fnord () { return 42; } | ||
1351 | int main () | ||
1352 | { | ||
1353 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); | ||
1354 | @@ -14578,7 +15233,7 @@ SHARED_LDFLAGS= | ||
1355 | if test "$enable_shared" = "yes"; then | ||
1356 | x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'` | ||
1357 | if test -n "$x"; then | ||
1358 | - SHARED_LIBADD="-L`pwd`/../libiberty/pic -liberty" | ||
1359 | + SHARED_LIBADD="`pwd`/../libiberty/pic/libiberty.a" | ||
1360 | fi | ||
1361 | |||
1362 | case "${host}" in | ||
1363 | @@ -17197,13 +17852,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' | ||
1364 | lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' | ||
1365 | lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' | ||
1366 | lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' | ||
1367 | +lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`' | ||
1368 | +lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`' | ||
1369 | reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`' | ||
1370 | reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`' | ||
1371 | OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`' | ||
1372 | deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`' | ||
1373 | file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`' | ||
1374 | +file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`' | ||
1375 | +want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`' | ||
1376 | +DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`' | ||
1377 | +sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`' | ||
1378 | AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`' | ||
1379 | AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`' | ||
1380 | +archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`' | ||
1381 | STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' | ||
1382 | RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' | ||
1383 | old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' | ||
1384 | @@ -17218,14 +17880,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"`' | ||
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"`' | ||
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"`' | ||
1388 | +nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`' | ||
1389 | +lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`' | ||
1390 | objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`' | ||
1391 | MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`' | ||
1392 | lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`' | ||
1393 | -lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' | ||
1394 | lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`' | ||
1395 | +lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' | ||
1396 | lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`' | ||
1397 | lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`' | ||
1398 | need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`' | ||
1399 | +MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`' | ||
1400 | DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' | ||
1401 | NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' | ||
1402 | LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' | ||
1403 | @@ -17258,12 +17923,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q | ||
1404 | hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' | ||
1405 | inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' | ||
1406 | link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' | ||
1407 | -fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`' | ||
1408 | always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`' | ||
1409 | export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`' | ||
1410 | exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`' | ||
1411 | include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`' | ||
1412 | prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`' | ||
1413 | +postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`' | ||
1414 | 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"`' | ||
1416 | need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' | ||
1417 | @@ -17318,8 +17983,13 @@ reload_flag \ | ||
1418 | OBJDUMP \ | ||
1419 | deplibs_check_method \ | ||
1420 | file_magic_cmd \ | ||
1421 | +file_magic_glob \ | ||
1422 | +want_nocaseglob \ | ||
1423 | +DLLTOOL \ | ||
1424 | +sharedlib_from_linklib_cmd \ | ||
1425 | AR \ | ||
1426 | AR_FLAGS \ | ||
1427 | +archiver_list_spec \ | ||
1428 | STRIP \ | ||
1429 | RANLIB \ | ||
1430 | CC \ | ||
1431 | @@ -17329,12 +17999,14 @@ lt_cv_sys_global_symbol_pipe \ | ||
1432 | lt_cv_sys_global_symbol_to_cdecl \ | ||
1433 | lt_cv_sys_global_symbol_to_c_name_address \ | ||
1434 | lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ | ||
1435 | +nm_file_list_spec \ | ||
1436 | lt_prog_compiler_no_builtin_flag \ | ||
1437 | -lt_prog_compiler_wl \ | ||
1438 | lt_prog_compiler_pic \ | ||
1439 | +lt_prog_compiler_wl \ | ||
1440 | lt_prog_compiler_static \ | ||
1441 | lt_cv_prog_compiler_c_o \ | ||
1442 | need_locks \ | ||
1443 | +MANIFEST_TOOL \ | ||
1444 | DSYMUTIL \ | ||
1445 | NMEDIT \ | ||
1446 | LIPO \ | ||
1447 | @@ -17350,7 +18022,6 @@ no_undefined_flag \ | ||
1448 | hardcode_libdir_flag_spec \ | ||
1449 | hardcode_libdir_flag_spec_ld \ | ||
1450 | hardcode_libdir_separator \ | ||
1451 | -fix_srcfile_path \ | ||
1452 | exclude_expsyms \ | ||
1453 | include_expsyms \ | ||
1454 | file_list_spec \ | ||
1455 | @@ -17386,6 +18057,7 @@ module_cmds \ | ||
1456 | module_expsym_cmds \ | ||
1457 | export_symbols_cmds \ | ||
1458 | prelink_cmds \ | ||
1459 | +postlink_cmds \ | ||
1460 | postinstall_cmds \ | ||
1461 | postuninstall_cmds \ | ||
1462 | finish_cmds \ | ||
1463 | @@ -18174,7 +18846,8 @@ $as_echo X"$file" | | ||
1464 | # NOTE: Changes made to this file will be lost: look at ltmain.sh. | ||
1465 | # | ||
1466 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, | ||
1467 | -# 2006, 2007, 2008, 2009 Free Software Foundation, Inc. | ||
1468 | +# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, | ||
1469 | +# Inc. | ||
1470 | # Written by Gordon Matzigkeit, 1996 | ||
1471 | # | ||
1472 | # This file is part of GNU Libtool. | ||
1473 | @@ -18277,19 +18950,42 @@ SP2NL=$lt_lt_SP2NL | ||
1474 | # turn newlines into spaces. | ||
1475 | NL2SP=$lt_lt_NL2SP | ||
1476 | |||
1477 | +# convert \$build file names to \$host format. | ||
1478 | +to_host_file_cmd=$lt_cv_to_host_file_cmd | ||
1479 | + | ||
1480 | +# convert \$build files to toolchain format. | ||
1481 | +to_tool_file_cmd=$lt_cv_to_tool_file_cmd | ||
1482 | + | ||
1483 | # An object symbol dumper. | ||
1484 | OBJDUMP=$lt_OBJDUMP | ||
1485 | |||
1486 | # Method to check whether dependent libraries are shared objects. | ||
1487 | deplibs_check_method=$lt_deplibs_check_method | ||
1488 | |||
1489 | -# Command to use when deplibs_check_method == "file_magic". | ||
1490 | +# Command to use when deplibs_check_method = "file_magic". | ||
1491 | file_magic_cmd=$lt_file_magic_cmd | ||
1492 | |||
1493 | +# How to find potential files when deplibs_check_method = "file_magic". | ||
1494 | +file_magic_glob=$lt_file_magic_glob | ||
1495 | + | ||
1496 | +# Find potential files using nocaseglob when deplibs_check_method = "file_magic". | ||
1497 | +want_nocaseglob=$lt_want_nocaseglob | ||
1498 | + | ||
1499 | +# DLL creation program. | ||
1500 | +DLLTOOL=$lt_DLLTOOL | ||
1501 | + | ||
1502 | +# Command to associate shared and link libraries. | ||
1503 | +sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd | ||
1504 | + | ||
1505 | # The archiver. | ||
1506 | AR=$lt_AR | ||
1507 | + | ||
1508 | +# Flags to create an archive. | ||
1509 | AR_FLAGS=$lt_AR_FLAGS | ||
1510 | |||
1511 | +# How to feed a file listing to the archiver. | ||
1512 | +archiver_list_spec=$lt_archiver_list_spec | ||
1513 | + | ||
1514 | # A symbol stripping program. | ||
1515 | STRIP=$lt_STRIP | ||
1516 | |||
1517 | @@ -18319,6 +19015,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. | ||
1519 | global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix | ||
1520 | |||
1521 | +# Specify filename containing input files for \$NM. | ||
1522 | +nm_file_list_spec=$lt_nm_file_list_spec | ||
1523 | + | ||
1524 | +# The root where to search for dependent libraries,and in which our libraries should be installed. | ||
1525 | +lt_sysroot=$lt_sysroot | ||
1526 | + | ||
1527 | # The name of the directory that contains temporary libtool files. | ||
1528 | objdir=$objdir | ||
1529 | |||
1530 | @@ -18328,6 +19030,9 @@ MAGIC_CMD=$MAGIC_CMD | ||
1531 | # Must we lock files when doing compilation? | ||
1532 | need_locks=$lt_need_locks | ||
1533 | |||
1534 | +# Manifest tool. | ||
1535 | +MANIFEST_TOOL=$lt_MANIFEST_TOOL | ||
1536 | + | ||
1537 | # Tool to manipulate archived DWARF debug symbol files on Mac OS X. | ||
1538 | DSYMUTIL=$lt_DSYMUTIL | ||
1539 | |||
1540 | @@ -18442,12 +19147,12 @@ with_gcc=$GCC | ||
1541 | # Compiler flag to turn off builtin functions. | ||
1542 | no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag | ||
1543 | |||
1544 | -# How to pass a linker flag through the compiler. | ||
1545 | -wl=$lt_lt_prog_compiler_wl | ||
1546 | - | ||
1547 | # Additional compiler flags for building library objects. | ||
1548 | pic_flag=$lt_lt_prog_compiler_pic | ||
1549 | |||
1550 | +# How to pass a linker flag through the compiler. | ||
1551 | +wl=$lt_lt_prog_compiler_wl | ||
1552 | + | ||
1553 | # Compiler flag to prevent dynamic linking. | ||
1554 | link_static_flag=$lt_lt_prog_compiler_static | ||
1555 | |||
1556 | @@ -18534,9 +19239,6 @@ inherit_rpath=$inherit_rpath | ||
1557 | # Whether libtool must link a program against all its dependency libraries. | ||
1558 | link_all_deplibs=$link_all_deplibs | ||
1559 | |||
1560 | -# Fix the shell variable \$srcfile for the compiler. | ||
1561 | -fix_srcfile_path=$lt_fix_srcfile_path | ||
1562 | - | ||
1563 | # Set to "yes" if exported symbols are required. | ||
1564 | always_export_symbols=$always_export_symbols | ||
1565 | |||
1566 | @@ -18552,6 +19254,9 @@ include_expsyms=$lt_include_expsyms | ||
1567 | # Commands necessary for linking programs (against libraries) with templates. | ||
1568 | prelink_cmds=$lt_prelink_cmds | ||
1569 | |||
1570 | +# Commands necessary for finishing linking programs. | ||
1571 | +postlink_cmds=$lt_postlink_cmds | ||
1572 | + | ||
1573 | # Specify filename containing input files. | ||
1574 | file_list_spec=$lt_file_list_spec | ||
1575 | |||
1576 | @@ -18584,210 +19289,169 @@ ltmain="$ac_aux_dir/ltmain.sh" | ||
1577 | # 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 | ||
1579 | # is reportedly fixed, but why not run on old versions too? | ||
1580 | - sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ | ||
1581 | - || (rm -f "$cfgfile"; exit 1) | ||
1582 | - | ||
1583 | - case $xsi_shell in | ||
1584 | - yes) | ||
1585 | - cat << \_LT_EOF >> "$cfgfile" | ||
1586 | - | ||
1587 | -# func_dirname file append nondir_replacement | ||
1588 | -# Compute the dirname of FILE. If nonempty, add APPEND to the result, | ||
1589 | -# otherwise set result to NONDIR_REPLACEMENT. | ||
1590 | -func_dirname () | ||
1591 | -{ | ||
1592 | - case ${1} in | ||
1593 | - */*) func_dirname_result="${1%/*}${2}" ;; | ||
1594 | - * ) func_dirname_result="${3}" ;; | ||
1595 | - esac | ||
1596 | -} | ||
1597 | - | ||
1598 | -# func_basename file | ||
1599 | -func_basename () | ||
1600 | -{ | ||
1601 | - func_basename_result="${1##*/}" | ||
1602 | -} | ||
1603 | - | ||
1604 | -# func_dirname_and_basename file append nondir_replacement | ||
1605 | -# perform func_basename and func_dirname in a single function | ||
1606 | -# call: | ||
1607 | -# dirname: Compute the dirname of FILE. If nonempty, | ||
1608 | -# add APPEND to the result, otherwise set result | ||
1609 | -# to NONDIR_REPLACEMENT. | ||
1610 | -# value returned in "$func_dirname_result" | ||
1611 | -# basename: Compute filename of FILE. | ||
1612 | -# value retuned in "$func_basename_result" | ||
1613 | -# Implementation must be kept synchronized with func_dirname | ||
1614 | -# and func_basename. For efficiency, we do not delegate to | ||
1615 | -# those functions but instead duplicate the functionality here. | ||
1616 | -func_dirname_and_basename () | ||
1617 | -{ | ||
1618 | - case ${1} in | ||
1619 | - */*) func_dirname_result="${1%/*}${2}" ;; | ||
1620 | - * ) func_dirname_result="${3}" ;; | ||
1621 | - esac | ||
1622 | - func_basename_result="${1##*/}" | ||
1623 | -} | ||
1624 | - | ||
1625 | -# func_stripname prefix suffix name | ||
1626 | -# strip PREFIX and SUFFIX off of NAME. | ||
1627 | -# PREFIX and SUFFIX must not contain globbing or regex special | ||
1628 | -# characters, hashes, percent signs, but SUFFIX may contain a leading | ||
1629 | -# dot (in which case that matches only a dot). | ||
1630 | -func_stripname () | ||
1631 | -{ | ||
1632 | - # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are | ||
1633 | - # positional parameters, so assign one to ordinary parameter first. | ||
1634 | - func_stripname_result=${3} | ||
1635 | - func_stripname_result=${func_stripname_result#"${1}"} | ||
1636 | - func_stripname_result=${func_stripname_result%"${2}"} | ||
1637 | -} | ||
1638 | - | ||
1639 | -# func_opt_split | ||
1640 | -func_opt_split () | ||
1641 | -{ | ||
1642 | - func_opt_split_opt=${1%%=*} | ||
1643 | - func_opt_split_arg=${1#*=} | ||
1644 | -} | ||
1645 | - | ||
1646 | -# func_lo2o object | ||
1647 | -func_lo2o () | ||
1648 | -{ | ||
1649 | - case ${1} in | ||
1650 | - *.lo) func_lo2o_result=${1%.lo}.${objext} ;; | ||
1651 | - *) func_lo2o_result=${1} ;; | ||
1652 | - esac | ||
1653 | -} | ||
1654 | - | ||
1655 | -# func_xform libobj-or-source | ||
1656 | -func_xform () | ||
1657 | -{ | ||
1658 | - func_xform_result=${1%.*}.lo | ||
1659 | -} | ||
1660 | - | ||
1661 | -# func_arith arithmetic-term... | ||
1662 | -func_arith () | ||
1663 | -{ | ||
1664 | - func_arith_result=$(( $* )) | ||
1665 | -} | ||
1666 | - | ||
1667 | -# func_len string | ||
1668 | -# STRING may not start with a hyphen. | ||
1669 | -func_len () | ||
1670 | -{ | ||
1671 | - func_len_result=${#1} | ||
1672 | -} | ||
1673 | - | ||
1674 | -_LT_EOF | ||
1675 | - ;; | ||
1676 | - *) # Bourne compatible functions. | ||
1677 | - cat << \_LT_EOF >> "$cfgfile" | ||
1678 | - | ||
1679 | -# func_dirname file append nondir_replacement | ||
1680 | -# Compute the dirname of FILE. If nonempty, add APPEND to the result, | ||
1681 | -# otherwise set result to NONDIR_REPLACEMENT. | ||
1682 | -func_dirname () | ||
1683 | -{ | ||
1684 | - # Extract subdirectory from the argument. | ||
1685 | - func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` | ||
1686 | - if test "X$func_dirname_result" = "X${1}"; then | ||
1687 | - func_dirname_result="${3}" | ||
1688 | - else | ||
1689 | - func_dirname_result="$func_dirname_result${2}" | ||
1690 | - fi | ||
1691 | -} | ||
1692 | - | ||
1693 | -# func_basename file | ||
1694 | -func_basename () | ||
1695 | -{ | ||
1696 | - func_basename_result=`$ECHO "${1}" | $SED "$basename"` | ||
1697 | -} | ||
1698 | - | ||
1699 | - | ||
1700 | -# func_stripname prefix suffix name | ||
1701 | -# strip PREFIX and SUFFIX off of NAME. | ||
1702 | -# PREFIX and SUFFIX must not contain globbing or regex special | ||
1703 | -# characters, hashes, percent signs, but SUFFIX may contain a leading | ||
1704 | -# dot (in which case that matches only a dot). | ||
1705 | -# func_strip_suffix prefix name | ||
1706 | -func_stripname () | ||
1707 | -{ | ||
1708 | - case ${2} in | ||
1709 | - .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; | ||
1710 | - *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; | ||
1711 | - esac | ||
1712 | -} | ||
1713 | - | ||
1714 | -# sed scripts: | ||
1715 | -my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q' | ||
1716 | -my_sed_long_arg='1s/^-[^=]*=//' | ||
1717 | - | ||
1718 | -# func_opt_split | ||
1719 | -func_opt_split () | ||
1720 | -{ | ||
1721 | - func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"` | ||
1722 | - func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"` | ||
1723 | -} | ||
1724 | - | ||
1725 | -# func_lo2o object | ||
1726 | -func_lo2o () | ||
1727 | -{ | ||
1728 | - func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` | ||
1729 | -} | ||
1730 | - | ||
1731 | -# func_xform libobj-or-source | ||
1732 | -func_xform () | ||
1733 | -{ | ||
1734 | - func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'` | ||
1735 | -} | ||
1736 | - | ||
1737 | -# func_arith arithmetic-term... | ||
1738 | -func_arith () | ||
1739 | -{ | ||
1740 | - func_arith_result=`expr "$@"` | ||
1741 | -} | ||
1742 | - | ||
1743 | -# func_len string | ||
1744 | -# STRING may not start with a hyphen. | ||
1745 | -func_len () | ||
1746 | -{ | ||
1747 | - func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len` | ||
1748 | -} | ||
1749 | - | ||
1750 | -_LT_EOF | ||
1751 | -esac | ||
1752 | - | ||
1753 | -case $lt_shell_append in | ||
1754 | - yes) | ||
1755 | - cat << \_LT_EOF >> "$cfgfile" | ||
1756 | - | ||
1757 | -# func_append var value | ||
1758 | -# Append VALUE to the end of shell variable VAR. | ||
1759 | -func_append () | ||
1760 | -{ | ||
1761 | - eval "$1+=\$2" | ||
1762 | -} | ||
1763 | -_LT_EOF | ||
1764 | - ;; | ||
1765 | - *) | ||
1766 | - cat << \_LT_EOF >> "$cfgfile" | ||
1767 | - | ||
1768 | -# func_append var value | ||
1769 | -# Append VALUE to the end of shell variable VAR. | ||
1770 | -func_append () | ||
1771 | -{ | ||
1772 | - eval "$1=\$$1\$2" | ||
1773 | -} | ||
1774 | - | ||
1775 | -_LT_EOF | ||
1776 | - ;; | ||
1777 | - esac | ||
1778 | - | ||
1779 | - | ||
1780 | - sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ | ||
1781 | - || (rm -f "$cfgfile"; exit 1) | ||
1782 | - | ||
1783 | - mv -f "$cfgfile" "$ofile" || | ||
1784 | + sed '$q' "$ltmain" >> "$cfgfile" \ | ||
1785 | + || (rm -f "$cfgfile"; exit 1) | ||
1786 | + | ||
1787 | + if test x"$xsi_shell" = xyes; then | ||
1788 | + sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ | ||
1789 | +func_dirname ()\ | ||
1790 | +{\ | ||
1791 | +\ case ${1} in\ | ||
1792 | +\ */*) func_dirname_result="${1%/*}${2}" ;;\ | ||
1793 | +\ * ) func_dirname_result="${3}" ;;\ | ||
1794 | +\ esac\ | ||
1795 | +} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \ | ||
1796 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
1797 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
1798 | +test 0 -eq $? || _lt_function_replace_fail=: | ||
1799 | + | ||
1800 | + | ||
1801 | + sed -e '/^func_basename ()$/,/^} # func_basename /c\ | ||
1802 | +func_basename ()\ | ||
1803 | +{\ | ||
1804 | +\ func_basename_result="${1##*/}"\ | ||
1805 | +} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \ | ||
1806 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
1807 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
1808 | +test 0 -eq $? || _lt_function_replace_fail=: | ||
1809 | + | ||
1810 | + | ||
1811 | + sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\ | ||
1812 | +func_dirname_and_basename ()\ | ||
1813 | +{\ | ||
1814 | +\ case ${1} in\ | ||
1815 | +\ */*) func_dirname_result="${1%/*}${2}" ;;\ | ||
1816 | +\ * ) func_dirname_result="${3}" ;;\ | ||
1817 | +\ esac\ | ||
1818 | +\ func_basename_result="${1##*/}"\ | ||
1819 | +} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \ | ||
1820 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
1821 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
1822 | +test 0 -eq $? || _lt_function_replace_fail=: | ||
1823 | + | ||
1824 | + | ||
1825 | + sed -e '/^func_stripname ()$/,/^} # func_stripname /c\ | ||
1826 | +func_stripname ()\ | ||
1827 | +{\ | ||
1828 | +\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\ | ||
1829 | +\ # positional parameters, so assign one to ordinary parameter first.\ | ||
1830 | +\ func_stripname_result=${3}\ | ||
1831 | +\ func_stripname_result=${func_stripname_result#"${1}"}\ | ||
1832 | +\ func_stripname_result=${func_stripname_result%"${2}"}\ | ||
1833 | +} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \ | ||
1834 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
1835 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
1836 | +test 0 -eq $? || _lt_function_replace_fail=: | ||
1837 | + | ||
1838 | + | ||
1839 | + sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\ | ||
1840 | +func_split_long_opt ()\ | ||
1841 | +{\ | ||
1842 | +\ func_split_long_opt_name=${1%%=*}\ | ||
1843 | +\ func_split_long_opt_arg=${1#*=}\ | ||
1844 | +} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \ | ||
1845 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
1846 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
1847 | +test 0 -eq $? || _lt_function_replace_fail=: | ||
1848 | + | ||
1849 | + | ||
1850 | + sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\ | ||
1851 | +func_split_short_opt ()\ | ||
1852 | +{\ | ||
1853 | +\ func_split_short_opt_arg=${1#??}\ | ||
1854 | +\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\ | ||
1855 | +} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \ | ||
1856 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
1857 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
1858 | +test 0 -eq $? || _lt_function_replace_fail=: | ||
1859 | + | ||
1860 | + | ||
1861 | + sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\ | ||
1862 | +func_lo2o ()\ | ||
1863 | +{\ | ||
1864 | +\ case ${1} in\ | ||
1865 | +\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\ | ||
1866 | +\ *) func_lo2o_result=${1} ;;\ | ||
1867 | +\ esac\ | ||
1868 | +} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \ | ||
1869 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
1870 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
1871 | +test 0 -eq $? || _lt_function_replace_fail=: | ||
1872 | + | ||
1873 | + | ||
1874 | + sed -e '/^func_xform ()$/,/^} # func_xform /c\ | ||
1875 | +func_xform ()\ | ||
1876 | +{\ | ||
1877 | + func_xform_result=${1%.*}.lo\ | ||
1878 | +} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \ | ||
1879 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
1880 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
1881 | +test 0 -eq $? || _lt_function_replace_fail=: | ||
1882 | + | ||
1883 | + | ||
1884 | + sed -e '/^func_arith ()$/,/^} # func_arith /c\ | ||
1885 | +func_arith ()\ | ||
1886 | +{\ | ||
1887 | + func_arith_result=$(( $* ))\ | ||
1888 | +} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \ | ||
1889 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
1890 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
1891 | +test 0 -eq $? || _lt_function_replace_fail=: | ||
1892 | + | ||
1893 | + | ||
1894 | + sed -e '/^func_len ()$/,/^} # func_len /c\ | ||
1895 | +func_len ()\ | ||
1896 | +{\ | ||
1897 | + func_len_result=${#1}\ | ||
1898 | +} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \ | ||
1899 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
1900 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
1901 | +test 0 -eq $? || _lt_function_replace_fail=: | ||
1902 | + | ||
1903 | +fi | ||
1904 | + | ||
1905 | +if test x"$lt_shell_append" = xyes; then | ||
1906 | + sed -e '/^func_append ()$/,/^} # func_append /c\ | ||
1907 | +func_append ()\ | ||
1908 | +{\ | ||
1909 | + eval "${1}+=\\${2}"\ | ||
1910 | +} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \ | ||
1911 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
1912 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
1913 | +test 0 -eq $? || _lt_function_replace_fail=: | ||
1914 | + | ||
1915 | + | ||
1916 | + sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\ | ||
1917 | +func_append_quoted ()\ | ||
1918 | +{\ | ||
1919 | +\ func_quote_for_eval "${2}"\ | ||
1920 | +\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\ | ||
1921 | +} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \ | ||
1922 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
1923 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
1924 | +test 0 -eq $? || _lt_function_replace_fail=: | ||
1925 | + | ||
1926 | + | ||
1927 | + # Save a `func_append' function call where possible by direct use of '+=' | ||
1928 | + sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ | ||
1929 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
1930 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
1931 | + test 0 -eq $? || _lt_function_replace_fail=: | ||
1932 | +else | ||
1933 | + # Save a `func_append' function call even when '+=' is not available | ||
1934 | + sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ | ||
1935 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
1936 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
1937 | + test 0 -eq $? || _lt_function_replace_fail=: | ||
1938 | +fi | ||
1939 | + | ||
1940 | +if test x"$_lt_function_replace_fail" = x":"; then | ||
1941 | + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 | ||
1942 | +$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} | ||
1943 | +fi | ||
1944 | + | ||
1945 | + | ||
1946 | + mv -f "$cfgfile" "$ofile" || | ||
1947 | (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") | ||
1948 | chmod +x "$ofile" | ||
1949 | |||
1950 | diff --git a/bfd/configure.ac b/bfd/configure.ac | ||
1951 | index 8e86f8399ce..e8700c9d4d2 100644 | ||
1952 | --- a/bfd/configure.ac | ||
1953 | +++ b/bfd/configure.ac | ||
1954 | @@ -314,7 +314,7 @@ changequote(,)dnl | ||
1955 | x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'` | ||
1956 | changequote([,])dnl | ||
1957 | if test -n "$x"; then | ||
1958 | - SHARED_LIBADD="-L`pwd`/../libiberty/pic -liberty" | ||
1959 | + SHARED_LIBADD="`pwd`/../libiberty/pic/libiberty.a" | ||
1960 | fi | ||
1961 | |||
1962 | case "${host}" in | ||
1963 | diff --git a/binutils/configure b/binutils/configure | ||
1964 | index 89c99abfeba..d3289a5efcd 100755 | ||
1965 | --- a/binutils/configure | ||
1966 | +++ b/binutils/configure | ||
1967 | @@ -692,8 +692,11 @@ OTOOL | ||
1968 | LIPO | ||
1969 | NMEDIT | ||
1970 | DSYMUTIL | ||
1971 | +MANIFEST_TOOL | ||
1972 | RANLIB | ||
1973 | +ac_ct_AR | ||
1974 | AR | ||
1975 | +DLLTOOL | ||
1976 | OBJDUMP | ||
1977 | LN_S | ||
1978 | NM | ||
1979 | @@ -810,6 +813,7 @@ enable_static | ||
1980 | with_pic | ||
1981 | enable_fast_install | ||
1982 | with_gnu_ld | ||
1983 | +with_libtool_sysroot | ||
1984 | enable_libtool_lock | ||
1985 | enable_plugins | ||
1986 | enable_largefile | ||
1987 | @@ -1490,6 +1494,8 @@ Optional Packages: | ||
1988 | --with-pic try to use only PIC/non-PIC objects [default=use | ||
1989 | both] | ||
1990 | --with-gnu-ld assume the C compiler uses GNU ld [default=no] | ||
1991 | + --with-libtool-sysroot=DIR Search for dependent libraries within DIR | ||
1992 | + (or the compiler's sysroot if not specified). | ||
1993 | --with-debuginfod Enable debuginfo lookups with debuginfod | ||
1994 | (auto/yes/no) | ||
1995 | --with-system-zlib use installed libz | ||
1996 | @@ -5467,8 +5473,8 @@ esac | ||
1997 | |||
1998 | |||
1999 | |||
2000 | -macro_version='2.2.7a' | ||
2001 | -macro_revision='1.3134' | ||
2002 | +macro_version='2.4' | ||
2003 | +macro_revision='1.3293' | ||
2004 | |||
2005 | |||
2006 | |||
2007 | @@ -5508,7 +5514,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO | ||
2008 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 | ||
2009 | $as_echo_n "checking how to print strings... " >&6; } | ||
2010 | # Test print first, because it will be a builtin if present. | ||
2011 | -if test "X`print -r -- -n 2>/dev/null`" = X-n && \ | ||
2012 | +if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ | ||
2013 | test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then | ||
2014 | ECHO='print -r --' | ||
2015 | elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then | ||
2016 | @@ -6194,8 +6200,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; | ||
2017 | # Try some XSI features | ||
2018 | xsi_shell=no | ||
2019 | ( _lt_dummy="a/b/c" | ||
2020 | - test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ | ||
2021 | - = c,a/b,, \ | ||
2022 | + test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ | ||
2023 | + = c,a/b,b/c, \ | ||
2024 | && eval 'test $(( 1 + 1 )) -eq 2 \ | ||
2025 | && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ | ||
2026 | && xsi_shell=yes | ||
2027 | @@ -6244,6 +6250,80 @@ esac | ||
2028 | |||
2029 | |||
2030 | |||
2031 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5 | ||
2032 | +$as_echo_n "checking how to convert $build file names to $host format... " >&6; } | ||
2033 | +if ${lt_cv_to_host_file_cmd+:} false; then : | ||
2034 | + $as_echo_n "(cached) " >&6 | ||
2035 | +else | ||
2036 | + case $host in | ||
2037 | + *-*-mingw* ) | ||
2038 | + case $build in | ||
2039 | + *-*-mingw* ) # actually msys | ||
2040 | + lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 | ||
2041 | + ;; | ||
2042 | + *-*-cygwin* ) | ||
2043 | + lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 | ||
2044 | + ;; | ||
2045 | + * ) # otherwise, assume *nix | ||
2046 | + lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 | ||
2047 | + ;; | ||
2048 | + esac | ||
2049 | + ;; | ||
2050 | + *-*-cygwin* ) | ||
2051 | + case $build in | ||
2052 | + *-*-mingw* ) # actually msys | ||
2053 | + lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin | ||
2054 | + ;; | ||
2055 | + *-*-cygwin* ) | ||
2056 | + lt_cv_to_host_file_cmd=func_convert_file_noop | ||
2057 | + ;; | ||
2058 | + * ) # otherwise, assume *nix | ||
2059 | + lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin | ||
2060 | + ;; | ||
2061 | + esac | ||
2062 | + ;; | ||
2063 | + * ) # unhandled hosts (and "normal" native builds) | ||
2064 | + lt_cv_to_host_file_cmd=func_convert_file_noop | ||
2065 | + ;; | ||
2066 | +esac | ||
2067 | + | ||
2068 | +fi | ||
2069 | + | ||
2070 | +to_host_file_cmd=$lt_cv_to_host_file_cmd | ||
2071 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5 | ||
2072 | +$as_echo "$lt_cv_to_host_file_cmd" >&6; } | ||
2073 | + | ||
2074 | + | ||
2075 | + | ||
2076 | + | ||
2077 | + | ||
2078 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5 | ||
2079 | +$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; } | ||
2080 | +if ${lt_cv_to_tool_file_cmd+:} false; then : | ||
2081 | + $as_echo_n "(cached) " >&6 | ||
2082 | +else | ||
2083 | + #assume ordinary cross tools, or native build. | ||
2084 | +lt_cv_to_tool_file_cmd=func_convert_file_noop | ||
2085 | +case $host in | ||
2086 | + *-*-mingw* ) | ||
2087 | + case $build in | ||
2088 | + *-*-mingw* ) # actually msys | ||
2089 | + lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 | ||
2090 | + ;; | ||
2091 | + esac | ||
2092 | + ;; | ||
2093 | +esac | ||
2094 | + | ||
2095 | +fi | ||
2096 | + | ||
2097 | +to_tool_file_cmd=$lt_cv_to_tool_file_cmd | ||
2098 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5 | ||
2099 | +$as_echo "$lt_cv_to_tool_file_cmd" >&6; } | ||
2100 | + | ||
2101 | + | ||
2102 | + | ||
2103 | + | ||
2104 | + | ||
2105 | { $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; } | ||
2107 | if ${lt_cv_ld_reload_flag+:} false; then : | ||
2108 | @@ -6260,6 +6340,11 @@ case $reload_flag in | ||
2109 | esac | ||
2110 | reload_cmds='$LD$reload_flag -o $output$reload_objs' | ||
2111 | case $host_os in | ||
2112 | + cygwin* | mingw* | pw32* | cegcc*) | ||
2113 | + if test "$GCC" != yes; then | ||
2114 | + reload_cmds=false | ||
2115 | + fi | ||
2116 | + ;; | ||
2117 | darwin*) | ||
2118 | if test "$GCC" = yes; then | ||
2119 | reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' | ||
2120 | @@ -6428,7 +6513,8 @@ mingw* | pw32*) | ||
2121 | lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' | ||
2122 | lt_cv_file_magic_cmd='func_win32_libid' | ||
2123 | else | ||
2124 | - lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' | ||
2125 | + # Keep this pattern in sync with the one in func_win32_libid. | ||
2126 | + lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' | ||
2127 | lt_cv_file_magic_cmd='$OBJDUMP -f' | ||
2128 | fi | ||
2129 | ;; | ||
2130 | @@ -6582,6 +6668,21 @@ esac | ||
2131 | fi | ||
2132 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 | ||
2133 | $as_echo "$lt_cv_deplibs_check_method" >&6; } | ||
2134 | + | ||
2135 | +file_magic_glob= | ||
2136 | +want_nocaseglob=no | ||
2137 | +if test "$build" = "$host"; then | ||
2138 | + case $host_os in | ||
2139 | + mingw* | pw32*) | ||
2140 | + if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then | ||
2141 | + want_nocaseglob=yes | ||
2142 | + else | ||
2143 | + file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"` | ||
2144 | + fi | ||
2145 | + ;; | ||
2146 | + esac | ||
2147 | +fi | ||
2148 | + | ||
2149 | file_magic_cmd=$lt_cv_file_magic_cmd | ||
2150 | deplibs_check_method=$lt_cv_deplibs_check_method | ||
2151 | test -z "$deplibs_check_method" && deplibs_check_method=unknown | ||
2152 | @@ -6597,9 +6698,162 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown | ||
2153 | |||
2154 | |||
2155 | |||
2156 | + | ||
2157 | + | ||
2158 | + | ||
2159 | + | ||
2160 | + | ||
2161 | + | ||
2162 | + | ||
2163 | + | ||
2164 | + | ||
2165 | + | ||
2166 | +if test -n "$ac_tool_prefix"; then | ||
2167 | + # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. | ||
2168 | +set dummy ${ac_tool_prefix}dlltool; ac_word=$2 | ||
2169 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
2170 | +$as_echo_n "checking for $ac_word... " >&6; } | ||
2171 | +if ${ac_cv_prog_DLLTOOL+:} false; then : | ||
2172 | + $as_echo_n "(cached) " >&6 | ||
2173 | +else | ||
2174 | + if test -n "$DLLTOOL"; then | ||
2175 | + ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. | ||
2176 | +else | ||
2177 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | ||
2178 | +for as_dir in $PATH | ||
2179 | +do | ||
2180 | + IFS=$as_save_IFS | ||
2181 | + test -z "$as_dir" && as_dir=. | ||
2182 | + for ac_exec_ext in '' $ac_executable_extensions; do | ||
2183 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | ||
2184 | + ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" | ||
2185 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
2186 | + break 2 | ||
2187 | + fi | ||
2188 | +done | ||
2189 | + done | ||
2190 | +IFS=$as_save_IFS | ||
2191 | + | ||
2192 | +fi | ||
2193 | +fi | ||
2194 | +DLLTOOL=$ac_cv_prog_DLLTOOL | ||
2195 | +if test -n "$DLLTOOL"; then | ||
2196 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 | ||
2197 | +$as_echo "$DLLTOOL" >&6; } | ||
2198 | +else | ||
2199 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
2200 | +$as_echo "no" >&6; } | ||
2201 | +fi | ||
2202 | + | ||
2203 | + | ||
2204 | +fi | ||
2205 | +if test -z "$ac_cv_prog_DLLTOOL"; then | ||
2206 | + ac_ct_DLLTOOL=$DLLTOOL | ||
2207 | + # Extract the first word of "dlltool", so it can be a program name with args. | ||
2208 | +set dummy dlltool; ac_word=$2 | ||
2209 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
2210 | +$as_echo_n "checking for $ac_word... " >&6; } | ||
2211 | +if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then : | ||
2212 | + $as_echo_n "(cached) " >&6 | ||
2213 | +else | ||
2214 | + if test -n "$ac_ct_DLLTOOL"; then | ||
2215 | + ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. | ||
2216 | +else | ||
2217 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | ||
2218 | +for as_dir in $PATH | ||
2219 | +do | ||
2220 | + IFS=$as_save_IFS | ||
2221 | + test -z "$as_dir" && as_dir=. | ||
2222 | + for ac_exec_ext in '' $ac_executable_extensions; do | ||
2223 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | ||
2224 | + ac_cv_prog_ac_ct_DLLTOOL="dlltool" | ||
2225 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
2226 | + break 2 | ||
2227 | + fi | ||
2228 | +done | ||
2229 | + done | ||
2230 | +IFS=$as_save_IFS | ||
2231 | + | ||
2232 | +fi | ||
2233 | +fi | ||
2234 | +ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL | ||
2235 | +if test -n "$ac_ct_DLLTOOL"; then | ||
2236 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 | ||
2237 | +$as_echo "$ac_ct_DLLTOOL" >&6; } | ||
2238 | +else | ||
2239 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
2240 | +$as_echo "no" >&6; } | ||
2241 | +fi | ||
2242 | + | ||
2243 | + if test "x$ac_ct_DLLTOOL" = x; then | ||
2244 | + DLLTOOL="false" | ||
2245 | + else | ||
2246 | + case $cross_compiling:$ac_tool_warned in | ||
2247 | +yes:) | ||
2248 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 | ||
2249 | +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} | ||
2250 | +ac_tool_warned=yes ;; | ||
2251 | +esac | ||
2252 | + DLLTOOL=$ac_ct_DLLTOOL | ||
2253 | + fi | ||
2254 | +else | ||
2255 | + DLLTOOL="$ac_cv_prog_DLLTOOL" | ||
2256 | +fi | ||
2257 | + | ||
2258 | +test -z "$DLLTOOL" && DLLTOOL=dlltool | ||
2259 | + | ||
2260 | + | ||
2261 | + | ||
2262 | + | ||
2263 | + | ||
2264 | + | ||
2265 | + | ||
2266 | + | ||
2267 | + | ||
2268 | + | ||
2269 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5 | ||
2270 | +$as_echo_n "checking how to associate runtime and link libraries... " >&6; } | ||
2271 | +if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then : | ||
2272 | + $as_echo_n "(cached) " >&6 | ||
2273 | +else | ||
2274 | + lt_cv_sharedlib_from_linklib_cmd='unknown' | ||
2275 | + | ||
2276 | +case $host_os in | ||
2277 | +cygwin* | mingw* | pw32* | cegcc*) | ||
2278 | + # two different shell functions defined in ltmain.sh | ||
2279 | + # decide which to use based on capabilities of $DLLTOOL | ||
2280 | + case `$DLLTOOL --help 2>&1` in | ||
2281 | + *--identify-strict*) | ||
2282 | + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib | ||
2283 | + ;; | ||
2284 | + *) | ||
2285 | + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback | ||
2286 | + ;; | ||
2287 | + esac | ||
2288 | + ;; | ||
2289 | +*) | ||
2290 | + # fallback: assume linklib IS sharedlib | ||
2291 | + lt_cv_sharedlib_from_linklib_cmd="$ECHO" | ||
2292 | + ;; | ||
2293 | +esac | ||
2294 | + | ||
2295 | +fi | ||
2296 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5 | ||
2297 | +$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; } | ||
2298 | +sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd | ||
2299 | +test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO | ||
2300 | + | ||
2301 | + | ||
2302 | + | ||
2303 | + | ||
2304 | + | ||
2305 | + | ||
2306 | + | ||
2307 | 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. | ||
2309 | -set dummy ${ac_tool_prefix}ar; ac_word=$2 | ||
2310 | + for ac_prog in ar | ||
2311 | + do | ||
2312 | + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. | ||
2313 | +set dummy $ac_tool_prefix$ac_prog; ac_word=$2 | ||
2314 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
2315 | $as_echo_n "checking for $ac_word... " >&6; } | ||
2316 | if ${ac_cv_prog_AR+:} false; then : | ||
2317 | @@ -6615,7 +6869,7 @@ do | ||
2318 | test -z "$as_dir" && as_dir=. | ||
2319 | for ac_exec_ext in '' $ac_executable_extensions; do | ||
2320 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | ||
2321 | - ac_cv_prog_AR="${ac_tool_prefix}ar" | ||
2322 | + ac_cv_prog_AR="$ac_tool_prefix$ac_prog" | ||
2323 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
2324 | break 2 | ||
2325 | fi | ||
2326 | @@ -6635,11 +6889,15 @@ $as_echo "no" >&6; } | ||
2327 | fi | ||
2328 | |||
2329 | |||
2330 | + test -n "$AR" && break | ||
2331 | + done | ||
2332 | fi | ||
2333 | -if test -z "$ac_cv_prog_AR"; then | ||
2334 | +if test -z "$AR"; then | ||
2335 | ac_ct_AR=$AR | ||
2336 | - # Extract the first word of "ar", so it can be a program name with args. | ||
2337 | -set dummy ar; ac_word=$2 | ||
2338 | + for ac_prog in ar | ||
2339 | +do | ||
2340 | + # Extract the first word of "$ac_prog", so it can be a program name with args. | ||
2341 | +set dummy $ac_prog; ac_word=$2 | ||
2342 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
2343 | $as_echo_n "checking for $ac_word... " >&6; } | ||
2344 | if ${ac_cv_prog_ac_ct_AR+:} false; then : | ||
2345 | @@ -6655,7 +6913,7 @@ do | ||
2346 | test -z "$as_dir" && as_dir=. | ||
2347 | for ac_exec_ext in '' $ac_executable_extensions; do | ||
2348 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | ||
2349 | - ac_cv_prog_ac_ct_AR="ar" | ||
2350 | + ac_cv_prog_ac_ct_AR="$ac_prog" | ||
2351 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
2352 | break 2 | ||
2353 | fi | ||
2354 | @@ -6674,6 +6932,10 @@ else | ||
2355 | $as_echo "no" >&6; } | ||
2356 | fi | ||
2357 | |||
2358 | + | ||
2359 | + test -n "$ac_ct_AR" && break | ||
2360 | +done | ||
2361 | + | ||
2362 | if test "x$ac_ct_AR" = x; then | ||
2363 | AR="false" | ||
2364 | else | ||
2365 | @@ -6685,12 +6947,10 @@ ac_tool_warned=yes ;; | ||
2366 | esac | ||
2367 | AR=$ac_ct_AR | ||
2368 | fi | ||
2369 | -else | ||
2370 | - AR="$ac_cv_prog_AR" | ||
2371 | fi | ||
2372 | |||
2373 | -test -z "$AR" && AR=ar | ||
2374 | -test -z "$AR_FLAGS" && AR_FLAGS=cru | ||
2375 | +: ${AR=ar} | ||
2376 | +: ${AR_FLAGS=cru} | ||
2377 | |||
2378 | |||
2379 | |||
2380 | @@ -6702,6 +6962,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru | ||
2381 | |||
2382 | |||
2383 | |||
2384 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 | ||
2385 | +$as_echo_n "checking for archiver @FILE support... " >&6; } | ||
2386 | +if ${lt_cv_ar_at_file+:} false; then : | ||
2387 | + $as_echo_n "(cached) " >&6 | ||
2388 | +else | ||
2389 | + lt_cv_ar_at_file=no | ||
2390 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
2391 | +/* end confdefs.h. */ | ||
2392 | + | ||
2393 | +int | ||
2394 | +main () | ||
2395 | +{ | ||
2396 | + | ||
2397 | + ; | ||
2398 | + return 0; | ||
2399 | +} | ||
2400 | +_ACEOF | ||
2401 | +if ac_fn_c_try_compile "$LINENO"; then : | ||
2402 | + echo conftest.$ac_objext > conftest.lst | ||
2403 | + lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5' | ||
2404 | + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 | ||
2405 | + (eval $lt_ar_try) 2>&5 | ||
2406 | + ac_status=$? | ||
2407 | + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 | ||
2408 | + test $ac_status = 0; } | ||
2409 | + if test "$ac_status" -eq 0; then | ||
2410 | + # Ensure the archiver fails upon bogus file names. | ||
2411 | + rm -f conftest.$ac_objext libconftest.a | ||
2412 | + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 | ||
2413 | + (eval $lt_ar_try) 2>&5 | ||
2414 | + ac_status=$? | ||
2415 | + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 | ||
2416 | + test $ac_status = 0; } | ||
2417 | + if test "$ac_status" -ne 0; then | ||
2418 | + lt_cv_ar_at_file=@ | ||
2419 | + fi | ||
2420 | + fi | ||
2421 | + rm -f conftest.* libconftest.a | ||
2422 | + | ||
2423 | +fi | ||
2424 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
2425 | + | ||
2426 | +fi | ||
2427 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 | ||
2428 | +$as_echo "$lt_cv_ar_at_file" >&6; } | ||
2429 | + | ||
2430 | +if test "x$lt_cv_ar_at_file" = xno; then | ||
2431 | + archiver_list_spec= | ||
2432 | +else | ||
2433 | + archiver_list_spec=$lt_cv_ar_at_file | ||
2434 | +fi | ||
2435 | + | ||
2436 | + | ||
2437 | + | ||
2438 | + | ||
2439 | + | ||
2440 | + | ||
2441 | + | ||
2442 | 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. | ||
2444 | set dummy ${ac_tool_prefix}strip; ac_word=$2 | ||
2445 | @@ -7036,8 +7354,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'" | ||
2447 | |||
2448 | # Transform an extracted symbol line into symbol name and symbol address | ||
2449 | -lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" | ||
2450 | -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'" | ||
2451 | +lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" | ||
2452 | +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'" | ||
2453 | |||
2454 | # Handle CRLF in mingw tool chain | ||
2455 | opt_cr= | ||
2456 | @@ -7073,6 +7391,7 @@ for ac_symprfx in "" "_"; do | ||
2457 | else | ||
2458 | lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" | ||
2459 | fi | ||
2460 | + lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" | ||
2461 | |||
2462 | # Check to see that the pipe works correctly. | ||
2463 | pipe_works=no | ||
2464 | @@ -7114,6 +7433,18 @@ _LT_EOF | ||
2465 | if $GREP ' nm_test_var$' "$nlist" >/dev/null; then | ||
2466 | if $GREP ' nm_test_func$' "$nlist" >/dev/null; then | ||
2467 | cat <<_LT_EOF > conftest.$ac_ext | ||
2468 | +/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ | ||
2469 | +#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) | ||
2470 | +/* DATA imports from DLLs on WIN32 con't be const, because runtime | ||
2471 | + relocations are performed -- see ld's documentation on pseudo-relocs. */ | ||
2472 | +# define LT_DLSYM_CONST | ||
2473 | +#elif defined(__osf__) | ||
2474 | +/* This system does not cope well with relocations in const data. */ | ||
2475 | +# define LT_DLSYM_CONST | ||
2476 | +#else | ||
2477 | +# define LT_DLSYM_CONST const | ||
2478 | +#endif | ||
2479 | + | ||
2480 | #ifdef __cplusplus | ||
2481 | extern "C" { | ||
2482 | #endif | ||
2483 | @@ -7125,7 +7456,7 @@ _LT_EOF | ||
2484 | cat <<_LT_EOF >> conftest.$ac_ext | ||
2485 | |||
2486 | /* The mapping between symbol names and symbols. */ | ||
2487 | -const struct { | ||
2488 | +LT_DLSYM_CONST struct { | ||
2489 | const char *name; | ||
2490 | void *address; | ||
2491 | } | ||
2492 | @@ -7151,8 +7482,8 @@ static const void *lt_preloaded_setup() { | ||
2493 | _LT_EOF | ||
2494 | # Now try linking the two files. | ||
2495 | mv conftest.$ac_objext conftstm.$ac_objext | ||
2496 | - lt_save_LIBS="$LIBS" | ||
2497 | - lt_save_CFLAGS="$CFLAGS" | ||
2498 | + lt_globsym_save_LIBS=$LIBS | ||
2499 | + lt_globsym_save_CFLAGS=$CFLAGS | ||
2500 | LIBS="conftstm.$ac_objext" | ||
2501 | CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" | ||
2502 | if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 | ||
2503 | @@ -7162,8 +7493,8 @@ _LT_EOF | ||
2504 | test $ac_status = 0; } && test -s conftest${ac_exeext}; then | ||
2505 | pipe_works=yes | ||
2506 | fi | ||
2507 | - LIBS="$lt_save_LIBS" | ||
2508 | - CFLAGS="$lt_save_CFLAGS" | ||
2509 | + LIBS=$lt_globsym_save_LIBS | ||
2510 | + CFLAGS=$lt_globsym_save_CFLAGS | ||
2511 | else | ||
2512 | echo "cannot find nm_test_func in $nlist" >&5 | ||
2513 | fi | ||
2514 | @@ -7200,6 +7531,21 @@ else | ||
2515 | $as_echo "ok" >&6; } | ||
2516 | fi | ||
2517 | |||
2518 | +# Response file support. | ||
2519 | +if test "$lt_cv_nm_interface" = "MS dumpbin"; then | ||
2520 | + nm_file_list_spec='@' | ||
2521 | +elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then | ||
2522 | + nm_file_list_spec='@' | ||
2523 | +fi | ||
2524 | + | ||
2525 | + | ||
2526 | + | ||
2527 | + | ||
2528 | + | ||
2529 | + | ||
2530 | + | ||
2531 | + | ||
2532 | + | ||
2533 | |||
2534 | |||
2535 | |||
2536 | @@ -7216,6 +7562,40 @@ fi | ||
2537 | |||
2538 | |||
2539 | |||
2540 | + | ||
2541 | + | ||
2542 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 | ||
2543 | +$as_echo_n "checking for sysroot... " >&6; } | ||
2544 | + | ||
2545 | +# Check whether --with-libtool-sysroot was given. | ||
2546 | +if test "${with_libtool_sysroot+set}" = set; then : | ||
2547 | + withval=$with_libtool_sysroot; | ||
2548 | +else | ||
2549 | + with_libtool_sysroot=no | ||
2550 | +fi | ||
2551 | + | ||
2552 | + | ||
2553 | +lt_sysroot= | ||
2554 | +case ${with_libtool_sysroot} in #( | ||
2555 | + yes) | ||
2556 | + if test "$GCC" = yes; then | ||
2557 | + lt_sysroot=`$CC --print-sysroot 2>/dev/null` | ||
2558 | + fi | ||
2559 | + ;; #( | ||
2560 | + /*) | ||
2561 | + lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"` | ||
2562 | + ;; #( | ||
2563 | + no|'') | ||
2564 | + ;; #( | ||
2565 | + *) | ||
2566 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5 | ||
2567 | +$as_echo "${with_libtool_sysroot}" >&6; } | ||
2568 | + as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 | ||
2569 | + ;; | ||
2570 | +esac | ||
2571 | + | ||
2572 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 | ||
2573 | +$as_echo "${lt_sysroot:-no}" >&6; } | ||
2574 | |||
2575 | |||
2576 | |||
2577 | @@ -7427,6 +7807,123 @@ esac | ||
2578 | |||
2579 | need_locks="$enable_libtool_lock" | ||
2580 | |||
2581 | +if test -n "$ac_tool_prefix"; then | ||
2582 | + # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args. | ||
2583 | +set dummy ${ac_tool_prefix}mt; ac_word=$2 | ||
2584 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
2585 | +$as_echo_n "checking for $ac_word... " >&6; } | ||
2586 | +if ${ac_cv_prog_MANIFEST_TOOL+:} false; then : | ||
2587 | + $as_echo_n "(cached) " >&6 | ||
2588 | +else | ||
2589 | + if test -n "$MANIFEST_TOOL"; then | ||
2590 | + ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test. | ||
2591 | +else | ||
2592 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | ||
2593 | +for as_dir in $PATH | ||
2594 | +do | ||
2595 | + IFS=$as_save_IFS | ||
2596 | + test -z "$as_dir" && as_dir=. | ||
2597 | + for ac_exec_ext in '' $ac_executable_extensions; do | ||
2598 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | ||
2599 | + ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" | ||
2600 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
2601 | + break 2 | ||
2602 | + fi | ||
2603 | +done | ||
2604 | + done | ||
2605 | +IFS=$as_save_IFS | ||
2606 | + | ||
2607 | +fi | ||
2608 | +fi | ||
2609 | +MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL | ||
2610 | +if test -n "$MANIFEST_TOOL"; then | ||
2611 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5 | ||
2612 | +$as_echo "$MANIFEST_TOOL" >&6; } | ||
2613 | +else | ||
2614 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
2615 | +$as_echo "no" >&6; } | ||
2616 | +fi | ||
2617 | + | ||
2618 | + | ||
2619 | +fi | ||
2620 | +if test -z "$ac_cv_prog_MANIFEST_TOOL"; then | ||
2621 | + ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL | ||
2622 | + # Extract the first word of "mt", so it can be a program name with args. | ||
2623 | +set dummy mt; ac_word=$2 | ||
2624 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
2625 | +$as_echo_n "checking for $ac_word... " >&6; } | ||
2626 | +if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then : | ||
2627 | + $as_echo_n "(cached) " >&6 | ||
2628 | +else | ||
2629 | + if test -n "$ac_ct_MANIFEST_TOOL"; then | ||
2630 | + ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test. | ||
2631 | +else | ||
2632 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | ||
2633 | +for as_dir in $PATH | ||
2634 | +do | ||
2635 | + IFS=$as_save_IFS | ||
2636 | + test -z "$as_dir" && as_dir=. | ||
2637 | + for ac_exec_ext in '' $ac_executable_extensions; do | ||
2638 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | ||
2639 | + ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" | ||
2640 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
2641 | + break 2 | ||
2642 | + fi | ||
2643 | +done | ||
2644 | + done | ||
2645 | +IFS=$as_save_IFS | ||
2646 | + | ||
2647 | +fi | ||
2648 | +fi | ||
2649 | +ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL | ||
2650 | +if test -n "$ac_ct_MANIFEST_TOOL"; then | ||
2651 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5 | ||
2652 | +$as_echo "$ac_ct_MANIFEST_TOOL" >&6; } | ||
2653 | +else | ||
2654 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
2655 | +$as_echo "no" >&6; } | ||
2656 | +fi | ||
2657 | + | ||
2658 | + if test "x$ac_ct_MANIFEST_TOOL" = x; then | ||
2659 | + MANIFEST_TOOL=":" | ||
2660 | + else | ||
2661 | + case $cross_compiling:$ac_tool_warned in | ||
2662 | +yes:) | ||
2663 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 | ||
2664 | +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} | ||
2665 | +ac_tool_warned=yes ;; | ||
2666 | +esac | ||
2667 | + MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL | ||
2668 | + fi | ||
2669 | +else | ||
2670 | + MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL" | ||
2671 | +fi | ||
2672 | + | ||
2673 | +test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt | ||
2674 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5 | ||
2675 | +$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; } | ||
2676 | +if ${lt_cv_path_mainfest_tool+:} false; then : | ||
2677 | + $as_echo_n "(cached) " >&6 | ||
2678 | +else | ||
2679 | + lt_cv_path_mainfest_tool=no | ||
2680 | + echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5 | ||
2681 | + $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out | ||
2682 | + cat conftest.err >&5 | ||
2683 | + if $GREP 'Manifest Tool' conftest.out > /dev/null; then | ||
2684 | + lt_cv_path_mainfest_tool=yes | ||
2685 | + fi | ||
2686 | + rm -f conftest* | ||
2687 | +fi | ||
2688 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5 | ||
2689 | +$as_echo "$lt_cv_path_mainfest_tool" >&6; } | ||
2690 | +if test "x$lt_cv_path_mainfest_tool" != xyes; then | ||
2691 | + MANIFEST_TOOL=: | ||
2692 | +fi | ||
2693 | + | ||
2694 | + | ||
2695 | + | ||
2696 | + | ||
2697 | + | ||
2698 | |||
2699 | case $host_os in | ||
2700 | rhapsody* | darwin*) | ||
2701 | @@ -7990,6 +8487,8 @@ _LT_EOF | ||
2702 | $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 | ||
2703 | echo "$AR cru libconftest.a conftest.o" >&5 | ||
2704 | $AR cru libconftest.a conftest.o 2>&5 | ||
2705 | + echo "$RANLIB libconftest.a" >&5 | ||
2706 | + $RANLIB libconftest.a 2>&5 | ||
2707 | cat > conftest.c << _LT_EOF | ||
2708 | int main() { return 0;} | ||
2709 | _LT_EOF | ||
2710 | @@ -8185,7 +8684,8 @@ 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 | @@ -8274,7 +8774,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 | @@ -8572,8 +9072,6 @@ fi | ||
2730 | lt_prog_compiler_pic= | ||
2731 | lt_prog_compiler_static= | ||
2732 | |||
2733 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 | ||
2734 | -$as_echo_n "checking for $compiler option to produce PIC... " >&6; } | ||
2735 | |||
2736 | if test "$GCC" = yes; then | ||
2737 | lt_prog_compiler_wl='-Wl,' | ||
2738 | @@ -8739,6 +9237,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } | ||
2739 | lt_prog_compiler_pic='--shared' | ||
2740 | lt_prog_compiler_static='--static' | ||
2741 | ;; | ||
2742 | + nagfor*) | ||
2743 | + # NAG Fortran compiler | ||
2744 | + lt_prog_compiler_wl='-Wl,-Wl,,' | ||
2745 | + lt_prog_compiler_pic='-PIC' | ||
2746 | + lt_prog_compiler_static='-Bstatic' | ||
2747 | + ;; | ||
2748 | pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) | ||
2749 | # Portland Group compilers (*not* the Pentium gcc compiler, | ||
2750 | # which looks to be a dead project) | ||
2751 | @@ -8801,7 +9305,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } | ||
2752 | lt_prog_compiler_pic='-KPIC' | ||
2753 | lt_prog_compiler_static='-Bstatic' | ||
2754 | case $cc_basename in | ||
2755 | - f77* | f90* | f95*) | ||
2756 | + f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) | ||
2757 | lt_prog_compiler_wl='-Qoption ld ';; | ||
2758 | *) | ||
2759 | lt_prog_compiler_wl='-Wl,';; | ||
2760 | @@ -8858,13 +9362,17 @@ case $host_os in | ||
2761 | lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" | ||
2762 | ;; | ||
2763 | esac | ||
2764 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5 | ||
2765 | -$as_echo "$lt_prog_compiler_pic" >&6; } | ||
2766 | - | ||
2767 | - | ||
2768 | - | ||
2769 | - | ||
2770 | |||
2771 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 | ||
2772 | +$as_echo_n "checking for $compiler option to produce PIC... " >&6; } | ||
2773 | +if ${lt_cv_prog_compiler_pic+:} false; then : | ||
2774 | + $as_echo_n "(cached) " >&6 | ||
2775 | +else | ||
2776 | + lt_cv_prog_compiler_pic=$lt_prog_compiler_pic | ||
2777 | +fi | ||
2778 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5 | ||
2779 | +$as_echo "$lt_cv_prog_compiler_pic" >&6; } | ||
2780 | +lt_prog_compiler_pic=$lt_cv_prog_compiler_pic | ||
2781 | |||
2782 | # | ||
2783 | # Check to make sure the PIC flag actually works. | ||
2784 | @@ -8925,6 +9433,11 @@ fi | ||
2785 | |||
2786 | |||
2787 | |||
2788 | + | ||
2789 | + | ||
2790 | + | ||
2791 | + | ||
2792 | + | ||
2793 | # | ||
2794 | # Check to make sure the static flag actually works. | ||
2795 | # | ||
2796 | @@ -9275,7 +9788,8 @@ _LT_EOF | ||
2797 | allow_undefined_flag=unsupported | ||
2798 | always_export_symbols=no | ||
2799 | enable_shared_with_static_runtimes=yes | ||
2800 | - export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' | ||
2801 | + 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' | ||
2802 | + exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' | ||
2803 | |||
2804 | 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' | ||
2806 | @@ -9374,12 +9888,12 @@ _LT_EOF | ||
2807 | whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' | ||
2808 | hardcode_libdir_flag_spec= | ||
2809 | hardcode_libdir_flag_spec_ld='-rpath $libdir' | ||
2810 | - archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' | ||
2811 | + archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' | ||
2812 | if test "x$supports_anon_versioning" = xyes; then | ||
2813 | archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ | ||
2814 | cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ | ||
2815 | echo "local: *; };" >> $output_objdir/$libname.ver~ | ||
2816 | - $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' | ||
2817 | + $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' | ||
2818 | fi | ||
2819 | ;; | ||
2820 | esac | ||
2821 | @@ -9393,8 +9907,8 @@ _LT_EOF | ||
2822 | archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' | ||
2823 | wlarc= | ||
2824 | else | ||
2825 | - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' | ||
2826 | - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' | ||
2827 | + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' | ||
2828 | + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' | ||
2829 | fi | ||
2830 | ;; | ||
2831 | |||
2832 | @@ -9412,8 +9926,8 @@ _LT_EOF | ||
2833 | |||
2834 | _LT_EOF | ||
2835 | elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then | ||
2836 | - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' | ||
2837 | - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' | ||
2838 | + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' | ||
2839 | + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' | ||
2840 | else | ||
2841 | ld_shlibs=no | ||
2842 | fi | ||
2843 | @@ -9459,8 +9973,8 @@ _LT_EOF | ||
2844 | |||
2845 | *) | ||
2846 | if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then | ||
2847 | - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' | ||
2848 | - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' | ||
2849 | + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' | ||
2850 | + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' | ||
2851 | else | ||
2852 | ld_shlibs=no | ||
2853 | fi | ||
2854 | @@ -9590,7 +10104,13 @@ _LT_EOF | ||
2855 | allow_undefined_flag='-berok' | ||
2856 | # Determine the default libpath from the value encoded in an | ||
2857 | # empty executable. | ||
2858 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
2859 | + if test "${lt_cv_aix_libpath+set}" = set; then | ||
2860 | + aix_libpath=$lt_cv_aix_libpath | ||
2861 | +else | ||
2862 | + if ${lt_cv_aix_libpath_+:} false; then : | ||
2863 | + $as_echo_n "(cached) " >&6 | ||
2864 | +else | ||
2865 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
2866 | /* end confdefs.h. */ | ||
2867 | |||
2868 | int | ||
2869 | @@ -9603,22 +10123,29 @@ main () | ||
2870 | _ACEOF | ||
2871 | if ac_fn_c_try_link "$LINENO"; then : | ||
2872 | |||
2873 | -lt_aix_libpath_sed=' | ||
2874 | - /Import File Strings/,/^$/ { | ||
2875 | - /^0/ { | ||
2876 | - s/^0 *\(.*\)$/\1/ | ||
2877 | - p | ||
2878 | - } | ||
2879 | - }' | ||
2880 | -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | ||
2881 | -# Check for a 64-bit object if we didn't find anything. | ||
2882 | -if test -z "$aix_libpath"; then | ||
2883 | - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | ||
2884 | -fi | ||
2885 | + lt_aix_libpath_sed=' | ||
2886 | + /Import File Strings/,/^$/ { | ||
2887 | + /^0/ { | ||
2888 | + s/^0 *\([^ ]*\) *$/\1/ | ||
2889 | + p | ||
2890 | + } | ||
2891 | + }' | ||
2892 | + lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | ||
2893 | + # Check for a 64-bit object if we didn't find anything. | ||
2894 | + if test -z "$lt_cv_aix_libpath_"; then | ||
2895 | + lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | ||
2896 | + fi | ||
2897 | fi | ||
2898 | rm -f core conftest.err conftest.$ac_objext \ | ||
2899 | conftest$ac_exeext conftest.$ac_ext | ||
2900 | -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | ||
2901 | + if test -z "$lt_cv_aix_libpath_"; then | ||
2902 | + lt_cv_aix_libpath_="/usr/lib:/lib" | ||
2903 | + fi | ||
2904 | + | ||
2905 | +fi | ||
2906 | + | ||
2907 | + aix_libpath=$lt_cv_aix_libpath_ | ||
2908 | +fi | ||
2909 | |||
2910 | 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" | ||
2912 | @@ -9630,7 +10157,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | ||
2913 | else | ||
2914 | # Determine the default libpath from the value encoded in an | ||
2915 | # empty executable. | ||
2916 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
2917 | + if test "${lt_cv_aix_libpath+set}" = set; then | ||
2918 | + aix_libpath=$lt_cv_aix_libpath | ||
2919 | +else | ||
2920 | + if ${lt_cv_aix_libpath_+:} false; then : | ||
2921 | + $as_echo_n "(cached) " >&6 | ||
2922 | +else | ||
2923 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
2924 | /* end confdefs.h. */ | ||
2925 | |||
2926 | int | ||
2927 | @@ -9643,22 +10176,29 @@ main () | ||
2928 | _ACEOF | ||
2929 | if ac_fn_c_try_link "$LINENO"; then : | ||
2930 | |||
2931 | -lt_aix_libpath_sed=' | ||
2932 | - /Import File Strings/,/^$/ { | ||
2933 | - /^0/ { | ||
2934 | - s/^0 *\(.*\)$/\1/ | ||
2935 | - p | ||
2936 | - } | ||
2937 | - }' | ||
2938 | -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | ||
2939 | -# Check for a 64-bit object if we didn't find anything. | ||
2940 | -if test -z "$aix_libpath"; then | ||
2941 | - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | ||
2942 | -fi | ||
2943 | + lt_aix_libpath_sed=' | ||
2944 | + /Import File Strings/,/^$/ { | ||
2945 | + /^0/ { | ||
2946 | + s/^0 *\([^ ]*\) *$/\1/ | ||
2947 | + p | ||
2948 | + } | ||
2949 | + }' | ||
2950 | + lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | ||
2951 | + # Check for a 64-bit object if we didn't find anything. | ||
2952 | + if test -z "$lt_cv_aix_libpath_"; then | ||
2953 | + lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | ||
2954 | + fi | ||
2955 | fi | ||
2956 | rm -f core conftest.err conftest.$ac_objext \ | ||
2957 | conftest$ac_exeext conftest.$ac_ext | ||
2958 | -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | ||
2959 | + if test -z "$lt_cv_aix_libpath_"; then | ||
2960 | + lt_cv_aix_libpath_="/usr/lib:/lib" | ||
2961 | + fi | ||
2962 | + | ||
2963 | +fi | ||
2964 | + | ||
2965 | + aix_libpath=$lt_cv_aix_libpath_ | ||
2966 | +fi | ||
2967 | |||
2968 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" | ||
2969 | # Warning - without using the other run time loading flags, | ||
2970 | @@ -9703,20 +10243,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | ||
2971 | # Microsoft Visual C++. | ||
2972 | # hardcode_libdir_flag_spec is actually meaningless, as there is | ||
2973 | # no search path for DLLs. | ||
2974 | - hardcode_libdir_flag_spec=' ' | ||
2975 | - allow_undefined_flag=unsupported | ||
2976 | - # Tell ltmain to make .lib files, not .a files. | ||
2977 | - libext=lib | ||
2978 | - # Tell ltmain to make .dll files, not .so files. | ||
2979 | - shrext_cmds=".dll" | ||
2980 | - # FIXME: Setting linknames here is a bad hack. | ||
2981 | - archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' | ||
2982 | - # The linker will automatically build a .lib file if we build a DLL. | ||
2983 | - old_archive_from_new_cmds='true' | ||
2984 | - # FIXME: Should let the user specify the lib program. | ||
2985 | - old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' | ||
2986 | - fix_srcfile_path='`cygpath -w "$srcfile"`' | ||
2987 | - enable_shared_with_static_runtimes=yes | ||
2988 | + case $cc_basename in | ||
2989 | + cl*) | ||
2990 | + # Native MSVC | ||
2991 | + hardcode_libdir_flag_spec=' ' | ||
2992 | + allow_undefined_flag=unsupported | ||
2993 | + always_export_symbols=yes | ||
2994 | + file_list_spec='@' | ||
2995 | + # Tell ltmain to make .lib files, not .a files. | ||
2996 | + libext=lib | ||
2997 | + # Tell ltmain to make .dll files, not .so files. | ||
2998 | + shrext_cmds=".dll" | ||
2999 | + # FIXME: Setting linknames here is a bad hack. | ||
3000 | + archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' | ||
3001 | + archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then | ||
3002 | + sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; | ||
3003 | + else | ||
3004 | + sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; | ||
3005 | + fi~ | ||
3006 | + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ | ||
3007 | + linknames=' | ||
3008 | + # The linker will not automatically build a static lib if we build a DLL. | ||
3009 | + # _LT_TAGVAR(old_archive_from_new_cmds, )='true' | ||
3010 | + enable_shared_with_static_runtimes=yes | ||
3011 | + export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' | ||
3012 | + # Don't use ranlib | ||
3013 | + old_postinstall_cmds='chmod 644 $oldlib' | ||
3014 | + postlink_cmds='lt_outputfile="@OUTPUT@"~ | ||
3015 | + lt_tool_outputfile="@TOOL_OUTPUT@"~ | ||
3016 | + case $lt_outputfile in | ||
3017 | + *.exe|*.EXE) ;; | ||
3018 | + *) | ||
3019 | + lt_outputfile="$lt_outputfile.exe" | ||
3020 | + lt_tool_outputfile="$lt_tool_outputfile.exe" | ||
3021 | + ;; | ||
3022 | + esac~ | ||
3023 | + if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then | ||
3024 | + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; | ||
3025 | + $RM "$lt_outputfile.manifest"; | ||
3026 | + fi' | ||
3027 | + ;; | ||
3028 | + *) | ||
3029 | + # Assume MSVC wrapper | ||
3030 | + hardcode_libdir_flag_spec=' ' | ||
3031 | + allow_undefined_flag=unsupported | ||
3032 | + # Tell ltmain to make .lib files, not .a files. | ||
3033 | + libext=lib | ||
3034 | + # Tell ltmain to make .dll files, not .so files. | ||
3035 | + shrext_cmds=".dll" | ||
3036 | + # FIXME: Setting linknames here is a bad hack. | ||
3037 | + archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' | ||
3038 | + # The linker will automatically build a .lib file if we build a DLL. | ||
3039 | + old_archive_from_new_cmds='true' | ||
3040 | + # FIXME: Should let the user specify the lib program. | ||
3041 | + old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' | ||
3042 | + enable_shared_with_static_runtimes=yes | ||
3043 | + ;; | ||
3044 | + esac | ||
3045 | ;; | ||
3046 | |||
3047 | darwin* | rhapsody*) | ||
3048 | @@ -9777,7 +10360,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | ||
3049 | |||
3050 | # FreeBSD 3 and greater uses gcc -shared to do shared libraries. | ||
3051 | freebsd* | dragonfly*) | ||
3052 | - archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' | ||
3053 | + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' | ||
3054 | hardcode_libdir_flag_spec='-R$libdir' | ||
3055 | hardcode_direct=yes | ||
3056 | hardcode_shlibpath_var=no | ||
3057 | @@ -9785,7 +10368,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | ||
3058 | |||
3059 | hpux9*) | ||
3060 | if test "$GCC" = yes; then | ||
3061 | - 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' | ||
3062 | + 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' | ||
3063 | 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' | ||
3065 | fi | ||
3066 | @@ -9801,7 +10384,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | ||
3067 | |||
3068 | hpux10*) | ||
3069 | if test "$GCC" = yes && test "$with_gnu_ld" = no; then | ||
3070 | - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' | ||
3071 | + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' | ||
3072 | else | ||
3073 | archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' | ||
3074 | fi | ||
3075 | @@ -9825,10 +10408,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' | ||
3077 | ;; | ||
3078 | ia64*) | ||
3079 | - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' | ||
3080 | + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' | ||
3081 | ;; | ||
3082 | *) | ||
3083 | - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' | ||
3084 | + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' | ||
3085 | ;; | ||
3086 | esac | ||
3087 | else | ||
3088 | @@ -9907,23 +10490,36 @@ fi | ||
3089 | |||
3090 | irix5* | irix6* | nonstopux*) | ||
3091 | if test "$GCC" = yes; then | ||
3092 | - 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' | ||
3093 | + 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' | ||
3094 | # Try to use the -exported_symbol ld option, if it does not | ||
3095 | # work, assume that -exports_file does not work either and | ||
3096 | # implicitly export all symbols. | ||
3097 | - save_LDFLAGS="$LDFLAGS" | ||
3098 | - LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" | ||
3099 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
3100 | + # This should be the same for all languages, so no per-tag cache variable. | ||
3101 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5 | ||
3102 | +$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; } | ||
3103 | +if ${lt_cv_irix_exported_symbol+:} false; then : | ||
3104 | + $as_echo_n "(cached) " >&6 | ||
3105 | +else | ||
3106 | + save_LDFLAGS="$LDFLAGS" | ||
3107 | + LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" | ||
3108 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
3109 | /* end confdefs.h. */ | ||
3110 | -int foo(void) {} | ||
3111 | +int foo (void) { return 0; } | ||
3112 | _ACEOF | ||
3113 | if ac_fn_c_try_link "$LINENO"; then : | ||
3114 | - 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' | ||
3115 | - | ||
3116 | + lt_cv_irix_exported_symbol=yes | ||
3117 | +else | ||
3118 | + lt_cv_irix_exported_symbol=no | ||
3119 | fi | ||
3120 | rm -f core conftest.err conftest.$ac_objext \ | ||
3121 | conftest$ac_exeext conftest.$ac_ext | ||
3122 | - LDFLAGS="$save_LDFLAGS" | ||
3123 | + LDFLAGS="$save_LDFLAGS" | ||
3124 | +fi | ||
3125 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5 | ||
3126 | +$as_echo "$lt_cv_irix_exported_symbol" >&6; } | ||
3127 | + if test "$lt_cv_irix_exported_symbol" = yes; then | ||
3128 | + 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' | ||
3129 | + fi | ||
3130 | 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' | ||
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' | ||
3133 | @@ -10008,7 +10604,7 @@ rm -f core conftest.err conftest.$ac_objext \ | ||
3134 | osf4* | osf5*) # as osf3* with the addition of -msym flag | ||
3135 | if test "$GCC" = yes; then | ||
3136 | allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' | ||
3137 | - 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' | ||
3138 | + 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' | ||
3139 | hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' | ||
3140 | else | ||
3141 | allow_undefined_flag=' -expect_unresolved \*' | ||
3142 | @@ -10027,9 +10623,9 @@ rm -f core conftest.err conftest.$ac_objext \ | ||
3143 | no_undefined_flag=' -z defs' | ||
3144 | if test "$GCC" = yes; then | ||
3145 | wlarc='${wl}' | ||
3146 | - archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' | ||
3147 | + archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' | ||
3148 | archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ | ||
3149 | - $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' | ||
3150 | + $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' | ||
3151 | else | ||
3152 | case `$CC -V 2>&1` in | ||
3153 | *"Compilers 5.0"*) | ||
3154 | @@ -10605,8 +11201,9 @@ cygwin* | mingw* | pw32* | cegcc*) | ||
3155 | need_version=no | ||
3156 | need_lib_prefix=no | ||
3157 | |||
3158 | - case $GCC,$host_os in | ||
3159 | - yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) | ||
3160 | + case $GCC,$cc_basename in | ||
3161 | + yes,*) | ||
3162 | + # gcc | ||
3163 | library_names_spec='$libname.dll.a' | ||
3164 | # DLL is installed to $(libdir)/../bin by postinstall_cmds | ||
3165 | postinstall_cmds='base_file=`basename \${file}`~ | ||
3166 | @@ -10639,13 +11236,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}' | ||
3168 | ;; | ||
3169 | esac | ||
3170 | + dynamic_linker='Win32 ld.exe' | ||
3171 | + ;; | ||
3172 | + | ||
3173 | + *,cl*) | ||
3174 | + # Native MSVC | ||
3175 | + libname_spec='$name' | ||
3176 | + soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' | ||
3177 | + library_names_spec='${libname}.dll.lib' | ||
3178 | + | ||
3179 | + case $build_os in | ||
3180 | + mingw*) | ||
3181 | + sys_lib_search_path_spec= | ||
3182 | + lt_save_ifs=$IFS | ||
3183 | + IFS=';' | ||
3184 | + for lt_path in $LIB | ||
3185 | + do | ||
3186 | + IFS=$lt_save_ifs | ||
3187 | + # Let DOS variable expansion print the short 8.3 style file name. | ||
3188 | + lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` | ||
3189 | + sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" | ||
3190 | + done | ||
3191 | + IFS=$lt_save_ifs | ||
3192 | + # Convert to MSYS style. | ||
3193 | + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` | ||
3194 | + ;; | ||
3195 | + cygwin*) | ||
3196 | + # Convert to unix form, then to dos form, then back to unix form | ||
3197 | + # but this time dos style (no spaces!) so that the unix form looks | ||
3198 | + # like /cygdrive/c/PROGRA~1:/cygdr... | ||
3199 | + sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` | ||
3200 | + sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` | ||
3201 | + sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` | ||
3202 | + ;; | ||
3203 | + *) | ||
3204 | + sys_lib_search_path_spec="$LIB" | ||
3205 | + if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then | ||
3206 | + # It is most probably a Windows format PATH. | ||
3207 | + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` | ||
3208 | + else | ||
3209 | + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` | ||
3210 | + fi | ||
3211 | + # FIXME: find the short name or the path components, as spaces are | ||
3212 | + # common. (e.g. "Program Files" -> "PROGRA~1") | ||
3213 | + ;; | ||
3214 | + esac | ||
3215 | + | ||
3216 | + # DLL is installed to $(libdir)/../bin by postinstall_cmds | ||
3217 | + postinstall_cmds='base_file=`basename \${file}`~ | ||
3218 | + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ | ||
3219 | + dldir=$destdir/`dirname \$dlpath`~ | ||
3220 | + test -d \$dldir || mkdir -p \$dldir~ | ||
3221 | + $install_prog $dir/$dlname \$dldir/$dlname' | ||
3222 | + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ | ||
3223 | + dlpath=$dir/\$dldll~ | ||
3224 | + $RM \$dlpath' | ||
3225 | + shlibpath_overrides_runpath=yes | ||
3226 | + dynamic_linker='Win32 link.exe' | ||
3227 | ;; | ||
3228 | |||
3229 | *) | ||
3230 | + # Assume MSVC wrapper | ||
3231 | library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' | ||
3232 | + dynamic_linker='Win32 ld.exe' | ||
3233 | ;; | ||
3234 | esac | ||
3235 | - dynamic_linker='Win32 ld.exe' | ||
3236 | # FIXME: first we should search . and the directory the executable is in | ||
3237 | shlibpath_var=PATH | ||
3238 | ;; | ||
3239 | @@ -10737,7 +11392,7 @@ haiku*) | ||
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 | @@ -11533,7 +12188,7 @@ else | ||
3249 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 | ||
3250 | lt_status=$lt_dlunknown | ||
3251 | cat > conftest.$ac_ext <<_LT_EOF | ||
3252 | -#line 11536 "configure" | ||
3253 | +#line $LINENO "configure" | ||
3254 | #include "confdefs.h" | ||
3255 | |||
3256 | #if HAVE_DLFCN_H | ||
3257 | @@ -11577,10 +12232,10 @@ else | ||
3258 | /* When -fvisbility=hidden is used, assume the code has been annotated | ||
3259 | correspondingly for the symbols needed. */ | ||
3260 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) | ||
3261 | -void fnord () __attribute__((visibility("default"))); | ||
3262 | +int fnord () __attribute__((visibility("default"))); | ||
3263 | #endif | ||
3264 | |||
3265 | -void fnord () { int i=42; } | ||
3266 | +int fnord () { return 42; } | ||
3267 | int main () | ||
3268 | { | ||
3269 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); | ||
3270 | @@ -11639,7 +12294,7 @@ else | ||
3271 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 | ||
3272 | lt_status=$lt_dlunknown | ||
3273 | cat > conftest.$ac_ext <<_LT_EOF | ||
3274 | -#line 11642 "configure" | ||
3275 | +#line $LINENO "configure" | ||
3276 | #include "confdefs.h" | ||
3277 | |||
3278 | #if HAVE_DLFCN_H | ||
3279 | @@ -11683,10 +12338,10 @@ else | ||
3280 | /* When -fvisbility=hidden is used, assume the code has been annotated | ||
3281 | correspondingly for the symbols needed. */ | ||
3282 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) | ||
3283 | -void fnord () __attribute__((visibility("default"))); | ||
3284 | +int fnord () __attribute__((visibility("default"))); | ||
3285 | #endif | ||
3286 | |||
3287 | -void fnord () { int i=42; } | ||
3288 | +int fnord () { return 42; } | ||
3289 | int main () | ||
3290 | { | ||
3291 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); | ||
3292 | @@ -16076,13 +16731,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' | ||
3293 | lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' | ||
3294 | lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' | ||
3295 | lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' | ||
3296 | +lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`' | ||
3297 | +lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`' | ||
3298 | reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`' | ||
3299 | reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`' | ||
3300 | OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`' | ||
3301 | deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`' | ||
3302 | file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`' | ||
3303 | +file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`' | ||
3304 | +want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`' | ||
3305 | +DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`' | ||
3306 | +sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`' | ||
3307 | AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`' | ||
3308 | AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`' | ||
3309 | +archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`' | ||
3310 | STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' | ||
3311 | RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' | ||
3312 | old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' | ||
3313 | @@ -16097,14 +16759,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"`' | ||
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"`' | ||
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"`' | ||
3317 | +nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`' | ||
3318 | +lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`' | ||
3319 | objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`' | ||
3320 | MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`' | ||
3321 | lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`' | ||
3322 | -lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' | ||
3323 | lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`' | ||
3324 | +lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' | ||
3325 | lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`' | ||
3326 | lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`' | ||
3327 | need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`' | ||
3328 | +MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`' | ||
3329 | DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' | ||
3330 | NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' | ||
3331 | LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' | ||
3332 | @@ -16137,12 +16802,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q | ||
3333 | hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' | ||
3334 | inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' | ||
3335 | link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' | ||
3336 | -fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`' | ||
3337 | always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`' | ||
3338 | export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`' | ||
3339 | exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`' | ||
3340 | include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`' | ||
3341 | prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`' | ||
3342 | +postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`' | ||
3343 | 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"`' | ||
3345 | need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' | ||
3346 | @@ -16197,8 +16862,13 @@ reload_flag \ | ||
3347 | OBJDUMP \ | ||
3348 | deplibs_check_method \ | ||
3349 | file_magic_cmd \ | ||
3350 | +file_magic_glob \ | ||
3351 | +want_nocaseglob \ | ||
3352 | +DLLTOOL \ | ||
3353 | +sharedlib_from_linklib_cmd \ | ||
3354 | AR \ | ||
3355 | AR_FLAGS \ | ||
3356 | +archiver_list_spec \ | ||
3357 | STRIP \ | ||
3358 | RANLIB \ | ||
3359 | CC \ | ||
3360 | @@ -16208,12 +16878,14 @@ lt_cv_sys_global_symbol_pipe \ | ||
3361 | lt_cv_sys_global_symbol_to_cdecl \ | ||
3362 | lt_cv_sys_global_symbol_to_c_name_address \ | ||
3363 | lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ | ||
3364 | +nm_file_list_spec \ | ||
3365 | lt_prog_compiler_no_builtin_flag \ | ||
3366 | -lt_prog_compiler_wl \ | ||
3367 | lt_prog_compiler_pic \ | ||
3368 | +lt_prog_compiler_wl \ | ||
3369 | lt_prog_compiler_static \ | ||
3370 | lt_cv_prog_compiler_c_o \ | ||
3371 | need_locks \ | ||
3372 | +MANIFEST_TOOL \ | ||
3373 | DSYMUTIL \ | ||
3374 | NMEDIT \ | ||
3375 | LIPO \ | ||
3376 | @@ -16229,7 +16901,6 @@ no_undefined_flag \ | ||
3377 | hardcode_libdir_flag_spec \ | ||
3378 | hardcode_libdir_flag_spec_ld \ | ||
3379 | hardcode_libdir_separator \ | ||
3380 | -fix_srcfile_path \ | ||
3381 | exclude_expsyms \ | ||
3382 | include_expsyms \ | ||
3383 | file_list_spec \ | ||
3384 | @@ -16265,6 +16936,7 @@ module_cmds \ | ||
3385 | module_expsym_cmds \ | ||
3386 | export_symbols_cmds \ | ||
3387 | prelink_cmds \ | ||
3388 | +postlink_cmds \ | ||
3389 | postinstall_cmds \ | ||
3390 | postuninstall_cmds \ | ||
3391 | finish_cmds \ | ||
3392 | @@ -17031,7 +17703,8 @@ $as_echo X"$file" | | ||
3393 | # NOTE: Changes made to this file will be lost: look at ltmain.sh. | ||
3394 | # | ||
3395 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, | ||
3396 | -# 2006, 2007, 2008, 2009 Free Software Foundation, Inc. | ||
3397 | +# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, | ||
3398 | +# Inc. | ||
3399 | # Written by Gordon Matzigkeit, 1996 | ||
3400 | # | ||
3401 | # This file is part of GNU Libtool. | ||
3402 | @@ -17134,19 +17807,42 @@ SP2NL=$lt_lt_SP2NL | ||
3403 | # turn newlines into spaces. | ||
3404 | NL2SP=$lt_lt_NL2SP | ||
3405 | |||
3406 | +# convert \$build file names to \$host format. | ||
3407 | +to_host_file_cmd=$lt_cv_to_host_file_cmd | ||
3408 | + | ||
3409 | +# convert \$build files to toolchain format. | ||
3410 | +to_tool_file_cmd=$lt_cv_to_tool_file_cmd | ||
3411 | + | ||
3412 | # An object symbol dumper. | ||
3413 | OBJDUMP=$lt_OBJDUMP | ||
3414 | |||
3415 | # Method to check whether dependent libraries are shared objects. | ||
3416 | deplibs_check_method=$lt_deplibs_check_method | ||
3417 | |||
3418 | -# Command to use when deplibs_check_method == "file_magic". | ||
3419 | +# Command to use when deplibs_check_method = "file_magic". | ||
3420 | file_magic_cmd=$lt_file_magic_cmd | ||
3421 | |||
3422 | +# How to find potential files when deplibs_check_method = "file_magic". | ||
3423 | +file_magic_glob=$lt_file_magic_glob | ||
3424 | + | ||
3425 | +# Find potential files using nocaseglob when deplibs_check_method = "file_magic". | ||
3426 | +want_nocaseglob=$lt_want_nocaseglob | ||
3427 | + | ||
3428 | +# DLL creation program. | ||
3429 | +DLLTOOL=$lt_DLLTOOL | ||
3430 | + | ||
3431 | +# Command to associate shared and link libraries. | ||
3432 | +sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd | ||
3433 | + | ||
3434 | # The archiver. | ||
3435 | AR=$lt_AR | ||
3436 | + | ||
3437 | +# Flags to create an archive. | ||
3438 | AR_FLAGS=$lt_AR_FLAGS | ||
3439 | |||
3440 | +# How to feed a file listing to the archiver. | ||
3441 | +archiver_list_spec=$lt_archiver_list_spec | ||
3442 | + | ||
3443 | # A symbol stripping program. | ||
3444 | STRIP=$lt_STRIP | ||
3445 | |||
3446 | @@ -17176,6 +17872,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. | ||
3448 | global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix | ||
3449 | |||
3450 | +# Specify filename containing input files for \$NM. | ||
3451 | +nm_file_list_spec=$lt_nm_file_list_spec | ||
3452 | + | ||
3453 | +# The root where to search for dependent libraries,and in which our libraries should be installed. | ||
3454 | +lt_sysroot=$lt_sysroot | ||
3455 | + | ||
3456 | # The name of the directory that contains temporary libtool files. | ||
3457 | objdir=$objdir | ||
3458 | |||
3459 | @@ -17185,6 +17887,9 @@ MAGIC_CMD=$MAGIC_CMD | ||
3460 | # Must we lock files when doing compilation? | ||
3461 | need_locks=$lt_need_locks | ||
3462 | |||
3463 | +# Manifest tool. | ||
3464 | +MANIFEST_TOOL=$lt_MANIFEST_TOOL | ||
3465 | + | ||
3466 | # Tool to manipulate archived DWARF debug symbol files on Mac OS X. | ||
3467 | DSYMUTIL=$lt_DSYMUTIL | ||
3468 | |||
3469 | @@ -17299,12 +18004,12 @@ with_gcc=$GCC | ||
3470 | # Compiler flag to turn off builtin functions. | ||
3471 | no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag | ||
3472 | |||
3473 | -# How to pass a linker flag through the compiler. | ||
3474 | -wl=$lt_lt_prog_compiler_wl | ||
3475 | - | ||
3476 | # Additional compiler flags for building library objects. | ||
3477 | pic_flag=$lt_lt_prog_compiler_pic | ||
3478 | |||
3479 | +# How to pass a linker flag through the compiler. | ||
3480 | +wl=$lt_lt_prog_compiler_wl | ||
3481 | + | ||
3482 | # Compiler flag to prevent dynamic linking. | ||
3483 | link_static_flag=$lt_lt_prog_compiler_static | ||
3484 | |||
3485 | @@ -17391,9 +18096,6 @@ inherit_rpath=$inherit_rpath | ||
3486 | # Whether libtool must link a program against all its dependency libraries. | ||
3487 | link_all_deplibs=$link_all_deplibs | ||
3488 | |||
3489 | -# Fix the shell variable \$srcfile for the compiler. | ||
3490 | -fix_srcfile_path=$lt_fix_srcfile_path | ||
3491 | - | ||
3492 | # Set to "yes" if exported symbols are required. | ||
3493 | always_export_symbols=$always_export_symbols | ||
3494 | |||
3495 | @@ -17409,6 +18111,9 @@ include_expsyms=$lt_include_expsyms | ||
3496 | # Commands necessary for linking programs (against libraries) with templates. | ||
3497 | prelink_cmds=$lt_prelink_cmds | ||
3498 | |||
3499 | +# Commands necessary for finishing linking programs. | ||
3500 | +postlink_cmds=$lt_postlink_cmds | ||
3501 | + | ||
3502 | # Specify filename containing input files. | ||
3503 | file_list_spec=$lt_file_list_spec | ||
3504 | |||
3505 | @@ -17441,210 +18146,169 @@ ltmain="$ac_aux_dir/ltmain.sh" | ||
3506 | # 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 | ||
3508 | # is reportedly fixed, but why not run on old versions too? | ||
3509 | - sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ | ||
3510 | - || (rm -f "$cfgfile"; exit 1) | ||
3511 | - | ||
3512 | - case $xsi_shell in | ||
3513 | - yes) | ||
3514 | - cat << \_LT_EOF >> "$cfgfile" | ||
3515 | - | ||
3516 | -# func_dirname file append nondir_replacement | ||
3517 | -# Compute the dirname of FILE. If nonempty, add APPEND to the result, | ||
3518 | -# otherwise set result to NONDIR_REPLACEMENT. | ||
3519 | -func_dirname () | ||
3520 | -{ | ||
3521 | - case ${1} in | ||
3522 | - */*) func_dirname_result="${1%/*}${2}" ;; | ||
3523 | - * ) func_dirname_result="${3}" ;; | ||
3524 | - esac | ||
3525 | -} | ||
3526 | - | ||
3527 | -# func_basename file | ||
3528 | -func_basename () | ||
3529 | -{ | ||
3530 | - func_basename_result="${1##*/}" | ||
3531 | -} | ||
3532 | - | ||
3533 | -# func_dirname_and_basename file append nondir_replacement | ||
3534 | -# perform func_basename and func_dirname in a single function | ||
3535 | -# call: | ||
3536 | -# dirname: Compute the dirname of FILE. If nonempty, | ||
3537 | -# add APPEND to the result, otherwise set result | ||
3538 | -# to NONDIR_REPLACEMENT. | ||
3539 | -# value returned in "$func_dirname_result" | ||
3540 | -# basename: Compute filename of FILE. | ||
3541 | -# value retuned in "$func_basename_result" | ||
3542 | -# Implementation must be kept synchronized with func_dirname | ||
3543 | -# and func_basename. For efficiency, we do not delegate to | ||
3544 | -# those functions but instead duplicate the functionality here. | ||
3545 | -func_dirname_and_basename () | ||
3546 | -{ | ||
3547 | - case ${1} in | ||
3548 | - */*) func_dirname_result="${1%/*}${2}" ;; | ||
3549 | - * ) func_dirname_result="${3}" ;; | ||
3550 | - esac | ||
3551 | - func_basename_result="${1##*/}" | ||
3552 | -} | ||
3553 | - | ||
3554 | -# func_stripname prefix suffix name | ||
3555 | -# strip PREFIX and SUFFIX off of NAME. | ||
3556 | -# PREFIX and SUFFIX must not contain globbing or regex special | ||
3557 | -# characters, hashes, percent signs, but SUFFIX may contain a leading | ||
3558 | -# dot (in which case that matches only a dot). | ||
3559 | -func_stripname () | ||
3560 | -{ | ||
3561 | - # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are | ||
3562 | - # positional parameters, so assign one to ordinary parameter first. | ||
3563 | - func_stripname_result=${3} | ||
3564 | - func_stripname_result=${func_stripname_result#"${1}"} | ||
3565 | - func_stripname_result=${func_stripname_result%"${2}"} | ||
3566 | -} | ||
3567 | - | ||
3568 | -# func_opt_split | ||
3569 | -func_opt_split () | ||
3570 | -{ | ||
3571 | - func_opt_split_opt=${1%%=*} | ||
3572 | - func_opt_split_arg=${1#*=} | ||
3573 | -} | ||
3574 | - | ||
3575 | -# func_lo2o object | ||
3576 | -func_lo2o () | ||
3577 | -{ | ||
3578 | - case ${1} in | ||
3579 | - *.lo) func_lo2o_result=${1%.lo}.${objext} ;; | ||
3580 | - *) func_lo2o_result=${1} ;; | ||
3581 | - esac | ||
3582 | -} | ||
3583 | - | ||
3584 | -# func_xform libobj-or-source | ||
3585 | -func_xform () | ||
3586 | -{ | ||
3587 | - func_xform_result=${1%.*}.lo | ||
3588 | -} | ||
3589 | - | ||
3590 | -# func_arith arithmetic-term... | ||
3591 | -func_arith () | ||
3592 | -{ | ||
3593 | - func_arith_result=$(( $* )) | ||
3594 | -} | ||
3595 | - | ||
3596 | -# func_len string | ||
3597 | -# STRING may not start with a hyphen. | ||
3598 | -func_len () | ||
3599 | -{ | ||
3600 | - func_len_result=${#1} | ||
3601 | -} | ||
3602 | - | ||
3603 | -_LT_EOF | ||
3604 | - ;; | ||
3605 | - *) # Bourne compatible functions. | ||
3606 | - cat << \_LT_EOF >> "$cfgfile" | ||
3607 | - | ||
3608 | -# func_dirname file append nondir_replacement | ||
3609 | -# Compute the dirname of FILE. If nonempty, add APPEND to the result, | ||
3610 | -# otherwise set result to NONDIR_REPLACEMENT. | ||
3611 | -func_dirname () | ||
3612 | -{ | ||
3613 | - # Extract subdirectory from the argument. | ||
3614 | - func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` | ||
3615 | - if test "X$func_dirname_result" = "X${1}"; then | ||
3616 | - func_dirname_result="${3}" | ||
3617 | - else | ||
3618 | - func_dirname_result="$func_dirname_result${2}" | ||
3619 | - fi | ||
3620 | -} | ||
3621 | - | ||
3622 | -# func_basename file | ||
3623 | -func_basename () | ||
3624 | -{ | ||
3625 | - func_basename_result=`$ECHO "${1}" | $SED "$basename"` | ||
3626 | -} | ||
3627 | - | ||
3628 | - | ||
3629 | -# func_stripname prefix suffix name | ||
3630 | -# strip PREFIX and SUFFIX off of NAME. | ||
3631 | -# PREFIX and SUFFIX must not contain globbing or regex special | ||
3632 | -# characters, hashes, percent signs, but SUFFIX may contain a leading | ||
3633 | -# dot (in which case that matches only a dot). | ||
3634 | -# func_strip_suffix prefix name | ||
3635 | -func_stripname () | ||
3636 | -{ | ||
3637 | - case ${2} in | ||
3638 | - .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; | ||
3639 | - *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; | ||
3640 | - esac | ||
3641 | -} | ||
3642 | - | ||
3643 | -# sed scripts: | ||
3644 | -my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q' | ||
3645 | -my_sed_long_arg='1s/^-[^=]*=//' | ||
3646 | - | ||
3647 | -# func_opt_split | ||
3648 | -func_opt_split () | ||
3649 | -{ | ||
3650 | - func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"` | ||
3651 | - func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"` | ||
3652 | -} | ||
3653 | - | ||
3654 | -# func_lo2o object | ||
3655 | -func_lo2o () | ||
3656 | -{ | ||
3657 | - func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` | ||
3658 | -} | ||
3659 | - | ||
3660 | -# func_xform libobj-or-source | ||
3661 | -func_xform () | ||
3662 | -{ | ||
3663 | - func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'` | ||
3664 | -} | ||
3665 | - | ||
3666 | -# func_arith arithmetic-term... | ||
3667 | -func_arith () | ||
3668 | -{ | ||
3669 | - func_arith_result=`expr "$@"` | ||
3670 | -} | ||
3671 | - | ||
3672 | -# func_len string | ||
3673 | -# STRING may not start with a hyphen. | ||
3674 | -func_len () | ||
3675 | -{ | ||
3676 | - func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len` | ||
3677 | -} | ||
3678 | - | ||
3679 | -_LT_EOF | ||
3680 | -esac | ||
3681 | - | ||
3682 | -case $lt_shell_append in | ||
3683 | - yes) | ||
3684 | - cat << \_LT_EOF >> "$cfgfile" | ||
3685 | - | ||
3686 | -# func_append var value | ||
3687 | -# Append VALUE to the end of shell variable VAR. | ||
3688 | -func_append () | ||
3689 | -{ | ||
3690 | - eval "$1+=\$2" | ||
3691 | -} | ||
3692 | -_LT_EOF | ||
3693 | - ;; | ||
3694 | - *) | ||
3695 | - cat << \_LT_EOF >> "$cfgfile" | ||
3696 | - | ||
3697 | -# func_append var value | ||
3698 | -# Append VALUE to the end of shell variable VAR. | ||
3699 | -func_append () | ||
3700 | -{ | ||
3701 | - eval "$1=\$$1\$2" | ||
3702 | -} | ||
3703 | - | ||
3704 | -_LT_EOF | ||
3705 | - ;; | ||
3706 | - esac | ||
3707 | - | ||
3708 | - | ||
3709 | - sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ | ||
3710 | - || (rm -f "$cfgfile"; exit 1) | ||
3711 | - | ||
3712 | - mv -f "$cfgfile" "$ofile" || | ||
3713 | + sed '$q' "$ltmain" >> "$cfgfile" \ | ||
3714 | + || (rm -f "$cfgfile"; exit 1) | ||
3715 | + | ||
3716 | + if test x"$xsi_shell" = xyes; then | ||
3717 | + sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ | ||
3718 | +func_dirname ()\ | ||
3719 | +{\ | ||
3720 | +\ case ${1} in\ | ||
3721 | +\ */*) func_dirname_result="${1%/*}${2}" ;;\ | ||
3722 | +\ * ) func_dirname_result="${3}" ;;\ | ||
3723 | +\ esac\ | ||
3724 | +} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \ | ||
3725 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
3726 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
3727 | +test 0 -eq $? || _lt_function_replace_fail=: | ||
3728 | + | ||
3729 | + | ||
3730 | + sed -e '/^func_basename ()$/,/^} # func_basename /c\ | ||
3731 | +func_basename ()\ | ||
3732 | +{\ | ||
3733 | +\ func_basename_result="${1##*/}"\ | ||
3734 | +} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \ | ||
3735 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
3736 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
3737 | +test 0 -eq $? || _lt_function_replace_fail=: | ||
3738 | + | ||
3739 | + | ||
3740 | + sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\ | ||
3741 | +func_dirname_and_basename ()\ | ||
3742 | +{\ | ||
3743 | +\ case ${1} in\ | ||
3744 | +\ */*) func_dirname_result="${1%/*}${2}" ;;\ | ||
3745 | +\ * ) func_dirname_result="${3}" ;;\ | ||
3746 | +\ esac\ | ||
3747 | +\ func_basename_result="${1##*/}"\ | ||
3748 | +} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \ | ||
3749 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
3750 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
3751 | +test 0 -eq $? || _lt_function_replace_fail=: | ||
3752 | + | ||
3753 | + | ||
3754 | + sed -e '/^func_stripname ()$/,/^} # func_stripname /c\ | ||
3755 | +func_stripname ()\ | ||
3756 | +{\ | ||
3757 | +\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\ | ||
3758 | +\ # positional parameters, so assign one to ordinary parameter first.\ | ||
3759 | +\ func_stripname_result=${3}\ | ||
3760 | +\ func_stripname_result=${func_stripname_result#"${1}"}\ | ||
3761 | +\ func_stripname_result=${func_stripname_result%"${2}"}\ | ||
3762 | +} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \ | ||
3763 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
3764 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
3765 | +test 0 -eq $? || _lt_function_replace_fail=: | ||
3766 | + | ||
3767 | + | ||
3768 | + sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\ | ||
3769 | +func_split_long_opt ()\ | ||
3770 | +{\ | ||
3771 | +\ func_split_long_opt_name=${1%%=*}\ | ||
3772 | +\ func_split_long_opt_arg=${1#*=}\ | ||
3773 | +} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \ | ||
3774 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
3775 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
3776 | +test 0 -eq $? || _lt_function_replace_fail=: | ||
3777 | + | ||
3778 | + | ||
3779 | + sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\ | ||
3780 | +func_split_short_opt ()\ | ||
3781 | +{\ | ||
3782 | +\ func_split_short_opt_arg=${1#??}\ | ||
3783 | +\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\ | ||
3784 | +} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \ | ||
3785 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
3786 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
3787 | +test 0 -eq $? || _lt_function_replace_fail=: | ||
3788 | + | ||
3789 | + | ||
3790 | + sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\ | ||
3791 | +func_lo2o ()\ | ||
3792 | +{\ | ||
3793 | +\ case ${1} in\ | ||
3794 | +\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\ | ||
3795 | +\ *) func_lo2o_result=${1} ;;\ | ||
3796 | +\ esac\ | ||
3797 | +} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \ | ||
3798 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
3799 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
3800 | +test 0 -eq $? || _lt_function_replace_fail=: | ||
3801 | + | ||
3802 | + | ||
3803 | + sed -e '/^func_xform ()$/,/^} # func_xform /c\ | ||
3804 | +func_xform ()\ | ||
3805 | +{\ | ||
3806 | + func_xform_result=${1%.*}.lo\ | ||
3807 | +} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \ | ||
3808 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
3809 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
3810 | +test 0 -eq $? || _lt_function_replace_fail=: | ||
3811 | + | ||
3812 | + | ||
3813 | + sed -e '/^func_arith ()$/,/^} # func_arith /c\ | ||
3814 | +func_arith ()\ | ||
3815 | +{\ | ||
3816 | + func_arith_result=$(( $* ))\ | ||
3817 | +} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \ | ||
3818 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
3819 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
3820 | +test 0 -eq $? || _lt_function_replace_fail=: | ||
3821 | + | ||
3822 | + | ||
3823 | + sed -e '/^func_len ()$/,/^} # func_len /c\ | ||
3824 | +func_len ()\ | ||
3825 | +{\ | ||
3826 | + func_len_result=${#1}\ | ||
3827 | +} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \ | ||
3828 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
3829 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
3830 | +test 0 -eq $? || _lt_function_replace_fail=: | ||
3831 | + | ||
3832 | +fi | ||
3833 | + | ||
3834 | +if test x"$lt_shell_append" = xyes; then | ||
3835 | + sed -e '/^func_append ()$/,/^} # func_append /c\ | ||
3836 | +func_append ()\ | ||
3837 | +{\ | ||
3838 | + eval "${1}+=\\${2}"\ | ||
3839 | +} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \ | ||
3840 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
3841 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
3842 | +test 0 -eq $? || _lt_function_replace_fail=: | ||
3843 | + | ||
3844 | + | ||
3845 | + sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\ | ||
3846 | +func_append_quoted ()\ | ||
3847 | +{\ | ||
3848 | +\ func_quote_for_eval "${2}"\ | ||
3849 | +\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\ | ||
3850 | +} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \ | ||
3851 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
3852 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
3853 | +test 0 -eq $? || _lt_function_replace_fail=: | ||
3854 | + | ||
3855 | + | ||
3856 | + # Save a `func_append' function call where possible by direct use of '+=' | ||
3857 | + sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ | ||
3858 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
3859 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
3860 | + test 0 -eq $? || _lt_function_replace_fail=: | ||
3861 | +else | ||
3862 | + # Save a `func_append' function call even when '+=' is not available | ||
3863 | + sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ | ||
3864 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
3865 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
3866 | + test 0 -eq $? || _lt_function_replace_fail=: | ||
3867 | +fi | ||
3868 | + | ||
3869 | +if test x"$_lt_function_replace_fail" = x":"; then | ||
3870 | + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 | ||
3871 | +$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} | ||
3872 | +fi | ||
3873 | + | ||
3874 | + | ||
3875 | + mv -f "$cfgfile" "$ofile" || | ||
3876 | (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") | ||
3877 | chmod +x "$ofile" | ||
3878 | |||
3879 | diff --git a/gas/configure b/gas/configure | ||
3880 | index d4b13e6fc8b..dd5224c5c81 100755 | ||
3881 | --- a/gas/configure | ||
3882 | +++ b/gas/configure | ||
3883 | @@ -681,8 +681,11 @@ OTOOL | ||
3884 | LIPO | ||
3885 | NMEDIT | ||
3886 | DSYMUTIL | ||
3887 | +MANIFEST_TOOL | ||
3888 | RANLIB | ||
3889 | +ac_ct_AR | ||
3890 | AR | ||
3891 | +DLLTOOL | ||
3892 | OBJDUMP | ||
3893 | LN_S | ||
3894 | NM | ||
3895 | @@ -799,6 +802,7 @@ enable_static | ||
3896 | with_pic | ||
3897 | enable_fast_install | ||
3898 | with_gnu_ld | ||
3899 | +with_libtool_sysroot | ||
3900 | enable_libtool_lock | ||
3901 | enable_plugins | ||
3902 | enable_largefile | ||
3903 | @@ -1490,6 +1494,8 @@ Optional Packages: | ||
3904 | --with-pic try to use only PIC/non-PIC objects [default=use | ||
3905 | both] | ||
3906 | --with-gnu-ld assume the C compiler uses GNU ld [default=no] | ||
3907 | + --with-libtool-sysroot=DIR Search for dependent libraries within DIR | ||
3908 | + (or the compiler's sysroot if not specified). | ||
3909 | --with-cpu=CPU default cpu variant is CPU (currently only supported | ||
3910 | on ARC) | ||
3911 | --with-system-zlib use installed libz | ||
3912 | @@ -5277,8 +5283,8 @@ esac | ||
3913 | |||
3914 | |||
3915 | |||
3916 | -macro_version='2.2.7a' | ||
3917 | -macro_revision='1.3134' | ||
3918 | +macro_version='2.4' | ||
3919 | +macro_revision='1.3293' | ||
3920 | |||
3921 | |||
3922 | |||
3923 | @@ -5318,7 +5324,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO | ||
3924 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 | ||
3925 | $as_echo_n "checking how to print strings... " >&6; } | ||
3926 | # Test print first, because it will be a builtin if present. | ||
3927 | -if test "X`print -r -- -n 2>/dev/null`" = X-n && \ | ||
3928 | +if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ | ||
3929 | test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then | ||
3930 | ECHO='print -r --' | ||
3931 | elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then | ||
3932 | @@ -6004,8 +6010,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; | ||
3933 | # Try some XSI features | ||
3934 | xsi_shell=no | ||
3935 | ( _lt_dummy="a/b/c" | ||
3936 | - test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ | ||
3937 | - = c,a/b,, \ | ||
3938 | + test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ | ||
3939 | + = c,a/b,b/c, \ | ||
3940 | && eval 'test $(( 1 + 1 )) -eq 2 \ | ||
3941 | && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ | ||
3942 | && xsi_shell=yes | ||
3943 | @@ -6054,6 +6060,80 @@ esac | ||
3944 | |||
3945 | |||
3946 | |||
3947 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5 | ||
3948 | +$as_echo_n "checking how to convert $build file names to $host format... " >&6; } | ||
3949 | +if ${lt_cv_to_host_file_cmd+:} false; then : | ||
3950 | + $as_echo_n "(cached) " >&6 | ||
3951 | +else | ||
3952 | + case $host in | ||
3953 | + *-*-mingw* ) | ||
3954 | + case $build in | ||
3955 | + *-*-mingw* ) # actually msys | ||
3956 | + lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 | ||
3957 | + ;; | ||
3958 | + *-*-cygwin* ) | ||
3959 | + lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 | ||
3960 | + ;; | ||
3961 | + * ) # otherwise, assume *nix | ||
3962 | + lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 | ||
3963 | + ;; | ||
3964 | + esac | ||
3965 | + ;; | ||
3966 | + *-*-cygwin* ) | ||
3967 | + case $build in | ||
3968 | + *-*-mingw* ) # actually msys | ||
3969 | + lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin | ||
3970 | + ;; | ||
3971 | + *-*-cygwin* ) | ||
3972 | + lt_cv_to_host_file_cmd=func_convert_file_noop | ||
3973 | + ;; | ||
3974 | + * ) # otherwise, assume *nix | ||
3975 | + lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin | ||
3976 | + ;; | ||
3977 | + esac | ||
3978 | + ;; | ||
3979 | + * ) # unhandled hosts (and "normal" native builds) | ||
3980 | + lt_cv_to_host_file_cmd=func_convert_file_noop | ||
3981 | + ;; | ||
3982 | +esac | ||
3983 | + | ||
3984 | +fi | ||
3985 | + | ||
3986 | +to_host_file_cmd=$lt_cv_to_host_file_cmd | ||
3987 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5 | ||
3988 | +$as_echo "$lt_cv_to_host_file_cmd" >&6; } | ||
3989 | + | ||
3990 | + | ||
3991 | + | ||
3992 | + | ||
3993 | + | ||
3994 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5 | ||
3995 | +$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; } | ||
3996 | +if ${lt_cv_to_tool_file_cmd+:} false; then : | ||
3997 | + $as_echo_n "(cached) " >&6 | ||
3998 | +else | ||
3999 | + #assume ordinary cross tools, or native build. | ||
4000 | +lt_cv_to_tool_file_cmd=func_convert_file_noop | ||
4001 | +case $host in | ||
4002 | + *-*-mingw* ) | ||
4003 | + case $build in | ||
4004 | + *-*-mingw* ) # actually msys | ||
4005 | + lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 | ||
4006 | + ;; | ||
4007 | + esac | ||
4008 | + ;; | ||
4009 | +esac | ||
4010 | + | ||
4011 | +fi | ||
4012 | + | ||
4013 | +to_tool_file_cmd=$lt_cv_to_tool_file_cmd | ||
4014 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5 | ||
4015 | +$as_echo "$lt_cv_to_tool_file_cmd" >&6; } | ||
4016 | + | ||
4017 | + | ||
4018 | + | ||
4019 | + | ||
4020 | + | ||
4021 | { $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; } | ||
4023 | if ${lt_cv_ld_reload_flag+:} false; then : | ||
4024 | @@ -6070,6 +6150,11 @@ case $reload_flag in | ||
4025 | esac | ||
4026 | reload_cmds='$LD$reload_flag -o $output$reload_objs' | ||
4027 | case $host_os in | ||
4028 | + cygwin* | mingw* | pw32* | cegcc*) | ||
4029 | + if test "$GCC" != yes; then | ||
4030 | + reload_cmds=false | ||
4031 | + fi | ||
4032 | + ;; | ||
4033 | darwin*) | ||
4034 | if test "$GCC" = yes; then | ||
4035 | reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' | ||
4036 | @@ -6238,7 +6323,8 @@ mingw* | pw32*) | ||
4037 | lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' | ||
4038 | lt_cv_file_magic_cmd='func_win32_libid' | ||
4039 | else | ||
4040 | - lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' | ||
4041 | + # Keep this pattern in sync with the one in func_win32_libid. | ||
4042 | + lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' | ||
4043 | lt_cv_file_magic_cmd='$OBJDUMP -f' | ||
4044 | fi | ||
4045 | ;; | ||
4046 | @@ -6392,6 +6478,21 @@ esac | ||
4047 | fi | ||
4048 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 | ||
4049 | $as_echo "$lt_cv_deplibs_check_method" >&6; } | ||
4050 | + | ||
4051 | +file_magic_glob= | ||
4052 | +want_nocaseglob=no | ||
4053 | +if test "$build" = "$host"; then | ||
4054 | + case $host_os in | ||
4055 | + mingw* | pw32*) | ||
4056 | + if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then | ||
4057 | + want_nocaseglob=yes | ||
4058 | + else | ||
4059 | + file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"` | ||
4060 | + fi | ||
4061 | + ;; | ||
4062 | + esac | ||
4063 | +fi | ||
4064 | + | ||
4065 | file_magic_cmd=$lt_cv_file_magic_cmd | ||
4066 | deplibs_check_method=$lt_cv_deplibs_check_method | ||
4067 | test -z "$deplibs_check_method" && deplibs_check_method=unknown | ||
4068 | @@ -6407,9 +6508,162 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown | ||
4069 | |||
4070 | |||
4071 | |||
4072 | + | ||
4073 | + | ||
4074 | + | ||
4075 | + | ||
4076 | + | ||
4077 | + | ||
4078 | + | ||
4079 | + | ||
4080 | + | ||
4081 | + | ||
4082 | +if test -n "$ac_tool_prefix"; then | ||
4083 | + # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. | ||
4084 | +set dummy ${ac_tool_prefix}dlltool; ac_word=$2 | ||
4085 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
4086 | +$as_echo_n "checking for $ac_word... " >&6; } | ||
4087 | +if ${ac_cv_prog_DLLTOOL+:} false; then : | ||
4088 | + $as_echo_n "(cached) " >&6 | ||
4089 | +else | ||
4090 | + if test -n "$DLLTOOL"; then | ||
4091 | + ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. | ||
4092 | +else | ||
4093 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | ||
4094 | +for as_dir in $PATH | ||
4095 | +do | ||
4096 | + IFS=$as_save_IFS | ||
4097 | + test -z "$as_dir" && as_dir=. | ||
4098 | + for ac_exec_ext in '' $ac_executable_extensions; do | ||
4099 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | ||
4100 | + ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" | ||
4101 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
4102 | + break 2 | ||
4103 | + fi | ||
4104 | +done | ||
4105 | + done | ||
4106 | +IFS=$as_save_IFS | ||
4107 | + | ||
4108 | +fi | ||
4109 | +fi | ||
4110 | +DLLTOOL=$ac_cv_prog_DLLTOOL | ||
4111 | +if test -n "$DLLTOOL"; then | ||
4112 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 | ||
4113 | +$as_echo "$DLLTOOL" >&6; } | ||
4114 | +else | ||
4115 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
4116 | +$as_echo "no" >&6; } | ||
4117 | +fi | ||
4118 | + | ||
4119 | + | ||
4120 | +fi | ||
4121 | +if test -z "$ac_cv_prog_DLLTOOL"; then | ||
4122 | + ac_ct_DLLTOOL=$DLLTOOL | ||
4123 | + # Extract the first word of "dlltool", so it can be a program name with args. | ||
4124 | +set dummy dlltool; ac_word=$2 | ||
4125 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
4126 | +$as_echo_n "checking for $ac_word... " >&6; } | ||
4127 | +if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then : | ||
4128 | + $as_echo_n "(cached) " >&6 | ||
4129 | +else | ||
4130 | + if test -n "$ac_ct_DLLTOOL"; then | ||
4131 | + ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. | ||
4132 | +else | ||
4133 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | ||
4134 | +for as_dir in $PATH | ||
4135 | +do | ||
4136 | + IFS=$as_save_IFS | ||
4137 | + test -z "$as_dir" && as_dir=. | ||
4138 | + for ac_exec_ext in '' $ac_executable_extensions; do | ||
4139 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | ||
4140 | + ac_cv_prog_ac_ct_DLLTOOL="dlltool" | ||
4141 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
4142 | + break 2 | ||
4143 | + fi | ||
4144 | +done | ||
4145 | + done | ||
4146 | +IFS=$as_save_IFS | ||
4147 | + | ||
4148 | +fi | ||
4149 | +fi | ||
4150 | +ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL | ||
4151 | +if test -n "$ac_ct_DLLTOOL"; then | ||
4152 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 | ||
4153 | +$as_echo "$ac_ct_DLLTOOL" >&6; } | ||
4154 | +else | ||
4155 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
4156 | +$as_echo "no" >&6; } | ||
4157 | +fi | ||
4158 | + | ||
4159 | + if test "x$ac_ct_DLLTOOL" = x; then | ||
4160 | + DLLTOOL="false" | ||
4161 | + else | ||
4162 | + case $cross_compiling:$ac_tool_warned in | ||
4163 | +yes:) | ||
4164 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 | ||
4165 | +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} | ||
4166 | +ac_tool_warned=yes ;; | ||
4167 | +esac | ||
4168 | + DLLTOOL=$ac_ct_DLLTOOL | ||
4169 | + fi | ||
4170 | +else | ||
4171 | + DLLTOOL="$ac_cv_prog_DLLTOOL" | ||
4172 | +fi | ||
4173 | + | ||
4174 | +test -z "$DLLTOOL" && DLLTOOL=dlltool | ||
4175 | + | ||
4176 | + | ||
4177 | + | ||
4178 | + | ||
4179 | + | ||
4180 | + | ||
4181 | + | ||
4182 | + | ||
4183 | + | ||
4184 | + | ||
4185 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5 | ||
4186 | +$as_echo_n "checking how to associate runtime and link libraries... " >&6; } | ||
4187 | +if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then : | ||
4188 | + $as_echo_n "(cached) " >&6 | ||
4189 | +else | ||
4190 | + lt_cv_sharedlib_from_linklib_cmd='unknown' | ||
4191 | + | ||
4192 | +case $host_os in | ||
4193 | +cygwin* | mingw* | pw32* | cegcc*) | ||
4194 | + # two different shell functions defined in ltmain.sh | ||
4195 | + # decide which to use based on capabilities of $DLLTOOL | ||
4196 | + case `$DLLTOOL --help 2>&1` in | ||
4197 | + *--identify-strict*) | ||
4198 | + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib | ||
4199 | + ;; | ||
4200 | + *) | ||
4201 | + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback | ||
4202 | + ;; | ||
4203 | + esac | ||
4204 | + ;; | ||
4205 | +*) | ||
4206 | + # fallback: assume linklib IS sharedlib | ||
4207 | + lt_cv_sharedlib_from_linklib_cmd="$ECHO" | ||
4208 | + ;; | ||
4209 | +esac | ||
4210 | + | ||
4211 | +fi | ||
4212 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5 | ||
4213 | +$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; } | ||
4214 | +sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd | ||
4215 | +test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO | ||
4216 | + | ||
4217 | + | ||
4218 | + | ||
4219 | + | ||
4220 | + | ||
4221 | + | ||
4222 | + | ||
4223 | 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. | ||
4225 | -set dummy ${ac_tool_prefix}ar; ac_word=$2 | ||
4226 | + for ac_prog in ar | ||
4227 | + do | ||
4228 | + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. | ||
4229 | +set dummy $ac_tool_prefix$ac_prog; ac_word=$2 | ||
4230 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
4231 | $as_echo_n "checking for $ac_word... " >&6; } | ||
4232 | if ${ac_cv_prog_AR+:} false; then : | ||
4233 | @@ -6425,7 +6679,7 @@ do | ||
4234 | test -z "$as_dir" && as_dir=. | ||
4235 | for ac_exec_ext in '' $ac_executable_extensions; do | ||
4236 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | ||
4237 | - ac_cv_prog_AR="${ac_tool_prefix}ar" | ||
4238 | + ac_cv_prog_AR="$ac_tool_prefix$ac_prog" | ||
4239 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
4240 | break 2 | ||
4241 | fi | ||
4242 | @@ -6445,11 +6699,15 @@ $as_echo "no" >&6; } | ||
4243 | fi | ||
4244 | |||
4245 | |||
4246 | + test -n "$AR" && break | ||
4247 | + done | ||
4248 | fi | ||
4249 | -if test -z "$ac_cv_prog_AR"; then | ||
4250 | +if test -z "$AR"; then | ||
4251 | ac_ct_AR=$AR | ||
4252 | - # Extract the first word of "ar", so it can be a program name with args. | ||
4253 | -set dummy ar; ac_word=$2 | ||
4254 | + for ac_prog in ar | ||
4255 | +do | ||
4256 | + # Extract the first word of "$ac_prog", so it can be a program name with args. | ||
4257 | +set dummy $ac_prog; ac_word=$2 | ||
4258 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
4259 | $as_echo_n "checking for $ac_word... " >&6; } | ||
4260 | if ${ac_cv_prog_ac_ct_AR+:} false; then : | ||
4261 | @@ -6465,7 +6723,7 @@ do | ||
4262 | test -z "$as_dir" && as_dir=. | ||
4263 | for ac_exec_ext in '' $ac_executable_extensions; do | ||
4264 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | ||
4265 | - ac_cv_prog_ac_ct_AR="ar" | ||
4266 | + ac_cv_prog_ac_ct_AR="$ac_prog" | ||
4267 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
4268 | break 2 | ||
4269 | fi | ||
4270 | @@ -6484,6 +6742,10 @@ else | ||
4271 | $as_echo "no" >&6; } | ||
4272 | fi | ||
4273 | |||
4274 | + | ||
4275 | + test -n "$ac_ct_AR" && break | ||
4276 | +done | ||
4277 | + | ||
4278 | if test "x$ac_ct_AR" = x; then | ||
4279 | AR="false" | ||
4280 | else | ||
4281 | @@ -6495,12 +6757,10 @@ ac_tool_warned=yes ;; | ||
4282 | esac | ||
4283 | AR=$ac_ct_AR | ||
4284 | fi | ||
4285 | -else | ||
4286 | - AR="$ac_cv_prog_AR" | ||
4287 | fi | ||
4288 | |||
4289 | -test -z "$AR" && AR=ar | ||
4290 | -test -z "$AR_FLAGS" && AR_FLAGS=cru | ||
4291 | +: ${AR=ar} | ||
4292 | +: ${AR_FLAGS=cru} | ||
4293 | |||
4294 | |||
4295 | |||
4296 | @@ -6512,6 +6772,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru | ||
4297 | |||
4298 | |||
4299 | |||
4300 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 | ||
4301 | +$as_echo_n "checking for archiver @FILE support... " >&6; } | ||
4302 | +if ${lt_cv_ar_at_file+:} false; then : | ||
4303 | + $as_echo_n "(cached) " >&6 | ||
4304 | +else | ||
4305 | + lt_cv_ar_at_file=no | ||
4306 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
4307 | +/* end confdefs.h. */ | ||
4308 | + | ||
4309 | +int | ||
4310 | +main () | ||
4311 | +{ | ||
4312 | + | ||
4313 | + ; | ||
4314 | + return 0; | ||
4315 | +} | ||
4316 | +_ACEOF | ||
4317 | +if ac_fn_c_try_compile "$LINENO"; then : | ||
4318 | + echo conftest.$ac_objext > conftest.lst | ||
4319 | + lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5' | ||
4320 | + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 | ||
4321 | + (eval $lt_ar_try) 2>&5 | ||
4322 | + ac_status=$? | ||
4323 | + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 | ||
4324 | + test $ac_status = 0; } | ||
4325 | + if test "$ac_status" -eq 0; then | ||
4326 | + # Ensure the archiver fails upon bogus file names. | ||
4327 | + rm -f conftest.$ac_objext libconftest.a | ||
4328 | + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 | ||
4329 | + (eval $lt_ar_try) 2>&5 | ||
4330 | + ac_status=$? | ||
4331 | + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 | ||
4332 | + test $ac_status = 0; } | ||
4333 | + if test "$ac_status" -ne 0; then | ||
4334 | + lt_cv_ar_at_file=@ | ||
4335 | + fi | ||
4336 | + fi | ||
4337 | + rm -f conftest.* libconftest.a | ||
4338 | + | ||
4339 | +fi | ||
4340 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
4341 | + | ||
4342 | +fi | ||
4343 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 | ||
4344 | +$as_echo "$lt_cv_ar_at_file" >&6; } | ||
4345 | + | ||
4346 | +if test "x$lt_cv_ar_at_file" = xno; then | ||
4347 | + archiver_list_spec= | ||
4348 | +else | ||
4349 | + archiver_list_spec=$lt_cv_ar_at_file | ||
4350 | +fi | ||
4351 | + | ||
4352 | + | ||
4353 | + | ||
4354 | + | ||
4355 | + | ||
4356 | + | ||
4357 | + | ||
4358 | 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. | ||
4360 | set dummy ${ac_tool_prefix}strip; ac_word=$2 | ||
4361 | @@ -6846,8 +7164,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'" | ||
4363 | |||
4364 | # Transform an extracted symbol line into symbol name and symbol address | ||
4365 | -lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" | ||
4366 | -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'" | ||
4367 | +lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" | ||
4368 | +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'" | ||
4369 | |||
4370 | # Handle CRLF in mingw tool chain | ||
4371 | opt_cr= | ||
4372 | @@ -6883,6 +7201,7 @@ for ac_symprfx in "" "_"; do | ||
4373 | else | ||
4374 | lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" | ||
4375 | fi | ||
4376 | + lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" | ||
4377 | |||
4378 | # Check to see that the pipe works correctly. | ||
4379 | pipe_works=no | ||
4380 | @@ -6924,6 +7243,18 @@ _LT_EOF | ||
4381 | if $GREP ' nm_test_var$' "$nlist" >/dev/null; then | ||
4382 | if $GREP ' nm_test_func$' "$nlist" >/dev/null; then | ||
4383 | cat <<_LT_EOF > conftest.$ac_ext | ||
4384 | +/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ | ||
4385 | +#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) | ||
4386 | +/* DATA imports from DLLs on WIN32 con't be const, because runtime | ||
4387 | + relocations are performed -- see ld's documentation on pseudo-relocs. */ | ||
4388 | +# define LT_DLSYM_CONST | ||
4389 | +#elif defined(__osf__) | ||
4390 | +/* This system does not cope well with relocations in const data. */ | ||
4391 | +# define LT_DLSYM_CONST | ||
4392 | +#else | ||
4393 | +# define LT_DLSYM_CONST const | ||
4394 | +#endif | ||
4395 | + | ||
4396 | #ifdef __cplusplus | ||
4397 | extern "C" { | ||
4398 | #endif | ||
4399 | @@ -6935,7 +7266,7 @@ _LT_EOF | ||
4400 | cat <<_LT_EOF >> conftest.$ac_ext | ||
4401 | |||
4402 | /* The mapping between symbol names and symbols. */ | ||
4403 | -const struct { | ||
4404 | +LT_DLSYM_CONST struct { | ||
4405 | const char *name; | ||
4406 | void *address; | ||
4407 | } | ||
4408 | @@ -6961,8 +7292,8 @@ static const void *lt_preloaded_setup() { | ||
4409 | _LT_EOF | ||
4410 | # Now try linking the two files. | ||
4411 | mv conftest.$ac_objext conftstm.$ac_objext | ||
4412 | - lt_save_LIBS="$LIBS" | ||
4413 | - lt_save_CFLAGS="$CFLAGS" | ||
4414 | + lt_globsym_save_LIBS=$LIBS | ||
4415 | + lt_globsym_save_CFLAGS=$CFLAGS | ||
4416 | LIBS="conftstm.$ac_objext" | ||
4417 | CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" | ||
4418 | if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 | ||
4419 | @@ -6972,8 +7303,8 @@ _LT_EOF | ||
4420 | test $ac_status = 0; } && test -s conftest${ac_exeext}; then | ||
4421 | pipe_works=yes | ||
4422 | fi | ||
4423 | - LIBS="$lt_save_LIBS" | ||
4424 | - CFLAGS="$lt_save_CFLAGS" | ||
4425 | + LIBS=$lt_globsym_save_LIBS | ||
4426 | + CFLAGS=$lt_globsym_save_CFLAGS | ||
4427 | else | ||
4428 | echo "cannot find nm_test_func in $nlist" >&5 | ||
4429 | fi | ||
4430 | @@ -7010,6 +7341,21 @@ else | ||
4431 | $as_echo "ok" >&6; } | ||
4432 | fi | ||
4433 | |||
4434 | +# Response file support. | ||
4435 | +if test "$lt_cv_nm_interface" = "MS dumpbin"; then | ||
4436 | + nm_file_list_spec='@' | ||
4437 | +elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then | ||
4438 | + nm_file_list_spec='@' | ||
4439 | +fi | ||
4440 | + | ||
4441 | + | ||
4442 | + | ||
4443 | + | ||
4444 | + | ||
4445 | + | ||
4446 | + | ||
4447 | + | ||
4448 | + | ||
4449 | |||
4450 | |||
4451 | |||
4452 | @@ -7026,6 +7372,40 @@ fi | ||
4453 | |||
4454 | |||
4455 | |||
4456 | + | ||
4457 | + | ||
4458 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 | ||
4459 | +$as_echo_n "checking for sysroot... " >&6; } | ||
4460 | + | ||
4461 | +# Check whether --with-libtool-sysroot was given. | ||
4462 | +if test "${with_libtool_sysroot+set}" = set; then : | ||
4463 | + withval=$with_libtool_sysroot; | ||
4464 | +else | ||
4465 | + with_libtool_sysroot=no | ||
4466 | +fi | ||
4467 | + | ||
4468 | + | ||
4469 | +lt_sysroot= | ||
4470 | +case ${with_libtool_sysroot} in #( | ||
4471 | + yes) | ||
4472 | + if test "$GCC" = yes; then | ||
4473 | + lt_sysroot=`$CC --print-sysroot 2>/dev/null` | ||
4474 | + fi | ||
4475 | + ;; #( | ||
4476 | + /*) | ||
4477 | + lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"` | ||
4478 | + ;; #( | ||
4479 | + no|'') | ||
4480 | + ;; #( | ||
4481 | + *) | ||
4482 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5 | ||
4483 | +$as_echo "${with_libtool_sysroot}" >&6; } | ||
4484 | + as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 | ||
4485 | + ;; | ||
4486 | +esac | ||
4487 | + | ||
4488 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 | ||
4489 | +$as_echo "${lt_sysroot:-no}" >&6; } | ||
4490 | |||
4491 | |||
4492 | |||
4493 | @@ -7237,6 +7617,123 @@ esac | ||
4494 | |||
4495 | need_locks="$enable_libtool_lock" | ||
4496 | |||
4497 | +if test -n "$ac_tool_prefix"; then | ||
4498 | + # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args. | ||
4499 | +set dummy ${ac_tool_prefix}mt; ac_word=$2 | ||
4500 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
4501 | +$as_echo_n "checking for $ac_word... " >&6; } | ||
4502 | +if ${ac_cv_prog_MANIFEST_TOOL+:} false; then : | ||
4503 | + $as_echo_n "(cached) " >&6 | ||
4504 | +else | ||
4505 | + if test -n "$MANIFEST_TOOL"; then | ||
4506 | + ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test. | ||
4507 | +else | ||
4508 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | ||
4509 | +for as_dir in $PATH | ||
4510 | +do | ||
4511 | + IFS=$as_save_IFS | ||
4512 | + test -z "$as_dir" && as_dir=. | ||
4513 | + for ac_exec_ext in '' $ac_executable_extensions; do | ||
4514 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | ||
4515 | + ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" | ||
4516 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
4517 | + break 2 | ||
4518 | + fi | ||
4519 | +done | ||
4520 | + done | ||
4521 | +IFS=$as_save_IFS | ||
4522 | + | ||
4523 | +fi | ||
4524 | +fi | ||
4525 | +MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL | ||
4526 | +if test -n "$MANIFEST_TOOL"; then | ||
4527 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5 | ||
4528 | +$as_echo "$MANIFEST_TOOL" >&6; } | ||
4529 | +else | ||
4530 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
4531 | +$as_echo "no" >&6; } | ||
4532 | +fi | ||
4533 | + | ||
4534 | + | ||
4535 | +fi | ||
4536 | +if test -z "$ac_cv_prog_MANIFEST_TOOL"; then | ||
4537 | + ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL | ||
4538 | + # Extract the first word of "mt", so it can be a program name with args. | ||
4539 | +set dummy mt; ac_word=$2 | ||
4540 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
4541 | +$as_echo_n "checking for $ac_word... " >&6; } | ||
4542 | +if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then : | ||
4543 | + $as_echo_n "(cached) " >&6 | ||
4544 | +else | ||
4545 | + if test -n "$ac_ct_MANIFEST_TOOL"; then | ||
4546 | + ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test. | ||
4547 | +else | ||
4548 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | ||
4549 | +for as_dir in $PATH | ||
4550 | +do | ||
4551 | + IFS=$as_save_IFS | ||
4552 | + test -z "$as_dir" && as_dir=. | ||
4553 | + for ac_exec_ext in '' $ac_executable_extensions; do | ||
4554 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | ||
4555 | + ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" | ||
4556 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
4557 | + break 2 | ||
4558 | + fi | ||
4559 | +done | ||
4560 | + done | ||
4561 | +IFS=$as_save_IFS | ||
4562 | + | ||
4563 | +fi | ||
4564 | +fi | ||
4565 | +ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL | ||
4566 | +if test -n "$ac_ct_MANIFEST_TOOL"; then | ||
4567 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5 | ||
4568 | +$as_echo "$ac_ct_MANIFEST_TOOL" >&6; } | ||
4569 | +else | ||
4570 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
4571 | +$as_echo "no" >&6; } | ||
4572 | +fi | ||
4573 | + | ||
4574 | + if test "x$ac_ct_MANIFEST_TOOL" = x; then | ||
4575 | + MANIFEST_TOOL=":" | ||
4576 | + else | ||
4577 | + case $cross_compiling:$ac_tool_warned in | ||
4578 | +yes:) | ||
4579 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 | ||
4580 | +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} | ||
4581 | +ac_tool_warned=yes ;; | ||
4582 | +esac | ||
4583 | + MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL | ||
4584 | + fi | ||
4585 | +else | ||
4586 | + MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL" | ||
4587 | +fi | ||
4588 | + | ||
4589 | +test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt | ||
4590 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5 | ||
4591 | +$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; } | ||
4592 | +if ${lt_cv_path_mainfest_tool+:} false; then : | ||
4593 | + $as_echo_n "(cached) " >&6 | ||
4594 | +else | ||
4595 | + lt_cv_path_mainfest_tool=no | ||
4596 | + echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5 | ||
4597 | + $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out | ||
4598 | + cat conftest.err >&5 | ||
4599 | + if $GREP 'Manifest Tool' conftest.out > /dev/null; then | ||
4600 | + lt_cv_path_mainfest_tool=yes | ||
4601 | + fi | ||
4602 | + rm -f conftest* | ||
4603 | +fi | ||
4604 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5 | ||
4605 | +$as_echo "$lt_cv_path_mainfest_tool" >&6; } | ||
4606 | +if test "x$lt_cv_path_mainfest_tool" != xyes; then | ||
4607 | + MANIFEST_TOOL=: | ||
4608 | +fi | ||
4609 | + | ||
4610 | + | ||
4611 | + | ||
4612 | + | ||
4613 | + | ||
4614 | |||
4615 | case $host_os in | ||
4616 | rhapsody* | darwin*) | ||
4617 | @@ -7800,6 +8297,8 @@ _LT_EOF | ||
4618 | $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 | ||
4619 | echo "$AR cru libconftest.a conftest.o" >&5 | ||
4620 | $AR cru libconftest.a conftest.o 2>&5 | ||
4621 | + echo "$RANLIB libconftest.a" >&5 | ||
4622 | + $RANLIB libconftest.a 2>&5 | ||
4623 | cat > conftest.c << _LT_EOF | ||
4624 | int main() { return 0;} | ||
4625 | _LT_EOF | ||
4626 | @@ -7995,7 +8494,8 @@ 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 | @@ -8084,7 +8584,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 | @@ -8382,8 +8882,6 @@ fi | ||
4646 | lt_prog_compiler_pic= | ||
4647 | lt_prog_compiler_static= | ||
4648 | |||
4649 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 | ||
4650 | -$as_echo_n "checking for $compiler option to produce PIC... " >&6; } | ||
4651 | |||
4652 | if test "$GCC" = yes; then | ||
4653 | lt_prog_compiler_wl='-Wl,' | ||
4654 | @@ -8549,6 +9047,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } | ||
4655 | lt_prog_compiler_pic='--shared' | ||
4656 | lt_prog_compiler_static='--static' | ||
4657 | ;; | ||
4658 | + nagfor*) | ||
4659 | + # NAG Fortran compiler | ||
4660 | + lt_prog_compiler_wl='-Wl,-Wl,,' | ||
4661 | + lt_prog_compiler_pic='-PIC' | ||
4662 | + lt_prog_compiler_static='-Bstatic' | ||
4663 | + ;; | ||
4664 | pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) | ||
4665 | # Portland Group compilers (*not* the Pentium gcc compiler, | ||
4666 | # which looks to be a dead project) | ||
4667 | @@ -8611,7 +9115,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } | ||
4668 | lt_prog_compiler_pic='-KPIC' | ||
4669 | lt_prog_compiler_static='-Bstatic' | ||
4670 | case $cc_basename in | ||
4671 | - f77* | f90* | f95*) | ||
4672 | + f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) | ||
4673 | lt_prog_compiler_wl='-Qoption ld ';; | ||
4674 | *) | ||
4675 | lt_prog_compiler_wl='-Wl,';; | ||
4676 | @@ -8668,13 +9172,17 @@ case $host_os in | ||
4677 | lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" | ||
4678 | ;; | ||
4679 | esac | ||
4680 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5 | ||
4681 | -$as_echo "$lt_prog_compiler_pic" >&6; } | ||
4682 | - | ||
4683 | - | ||
4684 | - | ||
4685 | - | ||
4686 | |||
4687 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 | ||
4688 | +$as_echo_n "checking for $compiler option to produce PIC... " >&6; } | ||
4689 | +if ${lt_cv_prog_compiler_pic+:} false; then : | ||
4690 | + $as_echo_n "(cached) " >&6 | ||
4691 | +else | ||
4692 | + lt_cv_prog_compiler_pic=$lt_prog_compiler_pic | ||
4693 | +fi | ||
4694 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5 | ||
4695 | +$as_echo "$lt_cv_prog_compiler_pic" >&6; } | ||
4696 | +lt_prog_compiler_pic=$lt_cv_prog_compiler_pic | ||
4697 | |||
4698 | # | ||
4699 | # Check to make sure the PIC flag actually works. | ||
4700 | @@ -8735,6 +9243,11 @@ fi | ||
4701 | |||
4702 | |||
4703 | |||
4704 | + | ||
4705 | + | ||
4706 | + | ||
4707 | + | ||
4708 | + | ||
4709 | # | ||
4710 | # Check to make sure the static flag actually works. | ||
4711 | # | ||
4712 | @@ -9085,7 +9598,8 @@ _LT_EOF | ||
4713 | allow_undefined_flag=unsupported | ||
4714 | always_export_symbols=no | ||
4715 | enable_shared_with_static_runtimes=yes | ||
4716 | - export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' | ||
4717 | + 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' | ||
4718 | + exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' | ||
4719 | |||
4720 | 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' | ||
4722 | @@ -9184,12 +9698,12 @@ _LT_EOF | ||
4723 | whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' | ||
4724 | hardcode_libdir_flag_spec= | ||
4725 | hardcode_libdir_flag_spec_ld='-rpath $libdir' | ||
4726 | - archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' | ||
4727 | + archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' | ||
4728 | if test "x$supports_anon_versioning" = xyes; then | ||
4729 | archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ | ||
4730 | cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ | ||
4731 | echo "local: *; };" >> $output_objdir/$libname.ver~ | ||
4732 | - $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' | ||
4733 | + $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' | ||
4734 | fi | ||
4735 | ;; | ||
4736 | esac | ||
4737 | @@ -9203,8 +9717,8 @@ _LT_EOF | ||
4738 | archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' | ||
4739 | wlarc= | ||
4740 | else | ||
4741 | - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' | ||
4742 | - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' | ||
4743 | + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' | ||
4744 | + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' | ||
4745 | fi | ||
4746 | ;; | ||
4747 | |||
4748 | @@ -9222,8 +9736,8 @@ _LT_EOF | ||
4749 | |||
4750 | _LT_EOF | ||
4751 | elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then | ||
4752 | - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' | ||
4753 | - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' | ||
4754 | + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' | ||
4755 | + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' | ||
4756 | else | ||
4757 | ld_shlibs=no | ||
4758 | fi | ||
4759 | @@ -9269,8 +9783,8 @@ _LT_EOF | ||
4760 | |||
4761 | *) | ||
4762 | if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then | ||
4763 | - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' | ||
4764 | - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' | ||
4765 | + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' | ||
4766 | + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' | ||
4767 | else | ||
4768 | ld_shlibs=no | ||
4769 | fi | ||
4770 | @@ -9400,7 +9914,13 @@ _LT_EOF | ||
4771 | allow_undefined_flag='-berok' | ||
4772 | # Determine the default libpath from the value encoded in an | ||
4773 | # empty executable. | ||
4774 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
4775 | + if test "${lt_cv_aix_libpath+set}" = set; then | ||
4776 | + aix_libpath=$lt_cv_aix_libpath | ||
4777 | +else | ||
4778 | + if ${lt_cv_aix_libpath_+:} false; then : | ||
4779 | + $as_echo_n "(cached) " >&6 | ||
4780 | +else | ||
4781 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
4782 | /* end confdefs.h. */ | ||
4783 | |||
4784 | int | ||
4785 | @@ -9413,22 +9933,29 @@ main () | ||
4786 | _ACEOF | ||
4787 | if ac_fn_c_try_link "$LINENO"; then : | ||
4788 | |||
4789 | -lt_aix_libpath_sed=' | ||
4790 | - /Import File Strings/,/^$/ { | ||
4791 | - /^0/ { | ||
4792 | - s/^0 *\(.*\)$/\1/ | ||
4793 | - p | ||
4794 | - } | ||
4795 | - }' | ||
4796 | -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | ||
4797 | -# Check for a 64-bit object if we didn't find anything. | ||
4798 | -if test -z "$aix_libpath"; then | ||
4799 | - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | ||
4800 | -fi | ||
4801 | + lt_aix_libpath_sed=' | ||
4802 | + /Import File Strings/,/^$/ { | ||
4803 | + /^0/ { | ||
4804 | + s/^0 *\([^ ]*\) *$/\1/ | ||
4805 | + p | ||
4806 | + } | ||
4807 | + }' | ||
4808 | + lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | ||
4809 | + # Check for a 64-bit object if we didn't find anything. | ||
4810 | + if test -z "$lt_cv_aix_libpath_"; then | ||
4811 | + lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | ||
4812 | + fi | ||
4813 | fi | ||
4814 | rm -f core conftest.err conftest.$ac_objext \ | ||
4815 | conftest$ac_exeext conftest.$ac_ext | ||
4816 | -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | ||
4817 | + if test -z "$lt_cv_aix_libpath_"; then | ||
4818 | + lt_cv_aix_libpath_="/usr/lib:/lib" | ||
4819 | + fi | ||
4820 | + | ||
4821 | +fi | ||
4822 | + | ||
4823 | + aix_libpath=$lt_cv_aix_libpath_ | ||
4824 | +fi | ||
4825 | |||
4826 | 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" | ||
4828 | @@ -9440,7 +9967,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | ||
4829 | else | ||
4830 | # Determine the default libpath from the value encoded in an | ||
4831 | # empty executable. | ||
4832 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
4833 | + if test "${lt_cv_aix_libpath+set}" = set; then | ||
4834 | + aix_libpath=$lt_cv_aix_libpath | ||
4835 | +else | ||
4836 | + if ${lt_cv_aix_libpath_+:} false; then : | ||
4837 | + $as_echo_n "(cached) " >&6 | ||
4838 | +else | ||
4839 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
4840 | /* end confdefs.h. */ | ||
4841 | |||
4842 | int | ||
4843 | @@ -9453,22 +9986,29 @@ main () | ||
4844 | _ACEOF | ||
4845 | if ac_fn_c_try_link "$LINENO"; then : | ||
4846 | |||
4847 | -lt_aix_libpath_sed=' | ||
4848 | - /Import File Strings/,/^$/ { | ||
4849 | - /^0/ { | ||
4850 | - s/^0 *\(.*\)$/\1/ | ||
4851 | - p | ||
4852 | - } | ||
4853 | - }' | ||
4854 | -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | ||
4855 | -# Check for a 64-bit object if we didn't find anything. | ||
4856 | -if test -z "$aix_libpath"; then | ||
4857 | - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | ||
4858 | -fi | ||
4859 | + lt_aix_libpath_sed=' | ||
4860 | + /Import File Strings/,/^$/ { | ||
4861 | + /^0/ { | ||
4862 | + s/^0 *\([^ ]*\) *$/\1/ | ||
4863 | + p | ||
4864 | + } | ||
4865 | + }' | ||
4866 | + lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | ||
4867 | + # Check for a 64-bit object if we didn't find anything. | ||
4868 | + if test -z "$lt_cv_aix_libpath_"; then | ||
4869 | + lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | ||
4870 | + fi | ||
4871 | fi | ||
4872 | rm -f core conftest.err conftest.$ac_objext \ | ||
4873 | conftest$ac_exeext conftest.$ac_ext | ||
4874 | -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | ||
4875 | + if test -z "$lt_cv_aix_libpath_"; then | ||
4876 | + lt_cv_aix_libpath_="/usr/lib:/lib" | ||
4877 | + fi | ||
4878 | + | ||
4879 | +fi | ||
4880 | + | ||
4881 | + aix_libpath=$lt_cv_aix_libpath_ | ||
4882 | +fi | ||
4883 | |||
4884 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" | ||
4885 | # Warning - without using the other run time loading flags, | ||
4886 | @@ -9513,20 +10053,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | ||
4887 | # Microsoft Visual C++. | ||
4888 | # hardcode_libdir_flag_spec is actually meaningless, as there is | ||
4889 | # no search path for DLLs. | ||
4890 | - hardcode_libdir_flag_spec=' ' | ||
4891 | - allow_undefined_flag=unsupported | ||
4892 | - # Tell ltmain to make .lib files, not .a files. | ||
4893 | - libext=lib | ||
4894 | - # Tell ltmain to make .dll files, not .so files. | ||
4895 | - shrext_cmds=".dll" | ||
4896 | - # FIXME: Setting linknames here is a bad hack. | ||
4897 | - archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' | ||
4898 | - # The linker will automatically build a .lib file if we build a DLL. | ||
4899 | - old_archive_from_new_cmds='true' | ||
4900 | - # FIXME: Should let the user specify the lib program. | ||
4901 | - old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' | ||
4902 | - fix_srcfile_path='`cygpath -w "$srcfile"`' | ||
4903 | - enable_shared_with_static_runtimes=yes | ||
4904 | + case $cc_basename in | ||
4905 | + cl*) | ||
4906 | + # Native MSVC | ||
4907 | + hardcode_libdir_flag_spec=' ' | ||
4908 | + allow_undefined_flag=unsupported | ||
4909 | + always_export_symbols=yes | ||
4910 | + file_list_spec='@' | ||
4911 | + # Tell ltmain to make .lib files, not .a files. | ||
4912 | + libext=lib | ||
4913 | + # Tell ltmain to make .dll files, not .so files. | ||
4914 | + shrext_cmds=".dll" | ||
4915 | + # FIXME: Setting linknames here is a bad hack. | ||
4916 | + archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' | ||
4917 | + archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then | ||
4918 | + sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; | ||
4919 | + else | ||
4920 | + sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; | ||
4921 | + fi~ | ||
4922 | + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ | ||
4923 | + linknames=' | ||
4924 | + # The linker will not automatically build a static lib if we build a DLL. | ||
4925 | + # _LT_TAGVAR(old_archive_from_new_cmds, )='true' | ||
4926 | + enable_shared_with_static_runtimes=yes | ||
4927 | + export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' | ||
4928 | + # Don't use ranlib | ||
4929 | + old_postinstall_cmds='chmod 644 $oldlib' | ||
4930 | + postlink_cmds='lt_outputfile="@OUTPUT@"~ | ||
4931 | + lt_tool_outputfile="@TOOL_OUTPUT@"~ | ||
4932 | + case $lt_outputfile in | ||
4933 | + *.exe|*.EXE) ;; | ||
4934 | + *) | ||
4935 | + lt_outputfile="$lt_outputfile.exe" | ||
4936 | + lt_tool_outputfile="$lt_tool_outputfile.exe" | ||
4937 | + ;; | ||
4938 | + esac~ | ||
4939 | + if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then | ||
4940 | + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; | ||
4941 | + $RM "$lt_outputfile.manifest"; | ||
4942 | + fi' | ||
4943 | + ;; | ||
4944 | + *) | ||
4945 | + # Assume MSVC wrapper | ||
4946 | + hardcode_libdir_flag_spec=' ' | ||
4947 | + allow_undefined_flag=unsupported | ||
4948 | + # Tell ltmain to make .lib files, not .a files. | ||
4949 | + libext=lib | ||
4950 | + # Tell ltmain to make .dll files, not .so files. | ||
4951 | + shrext_cmds=".dll" | ||
4952 | + # FIXME: Setting linknames here is a bad hack. | ||
4953 | + archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' | ||
4954 | + # The linker will automatically build a .lib file if we build a DLL. | ||
4955 | + old_archive_from_new_cmds='true' | ||
4956 | + # FIXME: Should let the user specify the lib program. | ||
4957 | + old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' | ||
4958 | + enable_shared_with_static_runtimes=yes | ||
4959 | + ;; | ||
4960 | + esac | ||
4961 | ;; | ||
4962 | |||
4963 | darwin* | rhapsody*) | ||
4964 | @@ -9587,7 +10170,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | ||
4965 | |||
4966 | # FreeBSD 3 and greater uses gcc -shared to do shared libraries. | ||
4967 | freebsd* | dragonfly*) | ||
4968 | - archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' | ||
4969 | + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' | ||
4970 | hardcode_libdir_flag_spec='-R$libdir' | ||
4971 | hardcode_direct=yes | ||
4972 | hardcode_shlibpath_var=no | ||
4973 | @@ -9595,7 +10178,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | ||
4974 | |||
4975 | hpux9*) | ||
4976 | if test "$GCC" = yes; then | ||
4977 | - 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' | ||
4978 | + 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' | ||
4979 | 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' | ||
4981 | fi | ||
4982 | @@ -9611,7 +10194,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | ||
4983 | |||
4984 | hpux10*) | ||
4985 | if test "$GCC" = yes && test "$with_gnu_ld" = no; then | ||
4986 | - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' | ||
4987 | + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' | ||
4988 | else | ||
4989 | archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' | ||
4990 | fi | ||
4991 | @@ -9635,10 +10218,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' | ||
4993 | ;; | ||
4994 | ia64*) | ||
4995 | - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' | ||
4996 | + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' | ||
4997 | ;; | ||
4998 | *) | ||
4999 | - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' | ||
5000 | + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' | ||
5001 | ;; | ||
5002 | esac | ||
5003 | else | ||
5004 | @@ -9717,23 +10300,36 @@ fi | ||
5005 | |||
5006 | irix5* | irix6* | nonstopux*) | ||
5007 | if test "$GCC" = yes; then | ||
5008 | - 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' | ||
5009 | + 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' | ||
5010 | # Try to use the -exported_symbol ld option, if it does not | ||
5011 | # work, assume that -exports_file does not work either and | ||
5012 | # implicitly export all symbols. | ||
5013 | - save_LDFLAGS="$LDFLAGS" | ||
5014 | - LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" | ||
5015 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
5016 | + # This should be the same for all languages, so no per-tag cache variable. | ||
5017 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5 | ||
5018 | +$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; } | ||
5019 | +if ${lt_cv_irix_exported_symbol+:} false; then : | ||
5020 | + $as_echo_n "(cached) " >&6 | ||
5021 | +else | ||
5022 | + save_LDFLAGS="$LDFLAGS" | ||
5023 | + LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" | ||
5024 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
5025 | /* end confdefs.h. */ | ||
5026 | -int foo(void) {} | ||
5027 | +int foo (void) { return 0; } | ||
5028 | _ACEOF | ||
5029 | if ac_fn_c_try_link "$LINENO"; then : | ||
5030 | - 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' | ||
5031 | - | ||
5032 | + lt_cv_irix_exported_symbol=yes | ||
5033 | +else | ||
5034 | + lt_cv_irix_exported_symbol=no | ||
5035 | fi | ||
5036 | rm -f core conftest.err conftest.$ac_objext \ | ||
5037 | conftest$ac_exeext conftest.$ac_ext | ||
5038 | - LDFLAGS="$save_LDFLAGS" | ||
5039 | + LDFLAGS="$save_LDFLAGS" | ||
5040 | +fi | ||
5041 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5 | ||
5042 | +$as_echo "$lt_cv_irix_exported_symbol" >&6; } | ||
5043 | + if test "$lt_cv_irix_exported_symbol" = yes; then | ||
5044 | + 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' | ||
5045 | + fi | ||
5046 | 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' | ||
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' | ||
5049 | @@ -9818,7 +10414,7 @@ rm -f core conftest.err conftest.$ac_objext \ | ||
5050 | osf4* | osf5*) # as osf3* with the addition of -msym flag | ||
5051 | if test "$GCC" = yes; then | ||
5052 | allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' | ||
5053 | - 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' | ||
5054 | + 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' | ||
5055 | hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' | ||
5056 | else | ||
5057 | allow_undefined_flag=' -expect_unresolved \*' | ||
5058 | @@ -9837,9 +10433,9 @@ rm -f core conftest.err conftest.$ac_objext \ | ||
5059 | no_undefined_flag=' -z defs' | ||
5060 | if test "$GCC" = yes; then | ||
5061 | wlarc='${wl}' | ||
5062 | - archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' | ||
5063 | + archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' | ||
5064 | archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ | ||
5065 | - $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' | ||
5066 | + $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' | ||
5067 | else | ||
5068 | case `$CC -V 2>&1` in | ||
5069 | *"Compilers 5.0"*) | ||
5070 | @@ -10415,8 +11011,9 @@ cygwin* | mingw* | pw32* | cegcc*) | ||
5071 | need_version=no | ||
5072 | need_lib_prefix=no | ||
5073 | |||
5074 | - case $GCC,$host_os in | ||
5075 | - yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) | ||
5076 | + case $GCC,$cc_basename in | ||
5077 | + yes,*) | ||
5078 | + # gcc | ||
5079 | library_names_spec='$libname.dll.a' | ||
5080 | # DLL is installed to $(libdir)/../bin by postinstall_cmds | ||
5081 | postinstall_cmds='base_file=`basename \${file}`~ | ||
5082 | @@ -10449,13 +11046,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}' | ||
5084 | ;; | ||
5085 | esac | ||
5086 | + dynamic_linker='Win32 ld.exe' | ||
5087 | + ;; | ||
5088 | + | ||
5089 | + *,cl*) | ||
5090 | + # Native MSVC | ||
5091 | + libname_spec='$name' | ||
5092 | + soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' | ||
5093 | + library_names_spec='${libname}.dll.lib' | ||
5094 | + | ||
5095 | + case $build_os in | ||
5096 | + mingw*) | ||
5097 | + sys_lib_search_path_spec= | ||
5098 | + lt_save_ifs=$IFS | ||
5099 | + IFS=';' | ||
5100 | + for lt_path in $LIB | ||
5101 | + do | ||
5102 | + IFS=$lt_save_ifs | ||
5103 | + # Let DOS variable expansion print the short 8.3 style file name. | ||
5104 | + lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` | ||
5105 | + sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" | ||
5106 | + done | ||
5107 | + IFS=$lt_save_ifs | ||
5108 | + # Convert to MSYS style. | ||
5109 | + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` | ||
5110 | + ;; | ||
5111 | + cygwin*) | ||
5112 | + # Convert to unix form, then to dos form, then back to unix form | ||
5113 | + # but this time dos style (no spaces!) so that the unix form looks | ||
5114 | + # like /cygdrive/c/PROGRA~1:/cygdr... | ||
5115 | + sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` | ||
5116 | + sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` | ||
5117 | + sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` | ||
5118 | + ;; | ||
5119 | + *) | ||
5120 | + sys_lib_search_path_spec="$LIB" | ||
5121 | + if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then | ||
5122 | + # It is most probably a Windows format PATH. | ||
5123 | + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` | ||
5124 | + else | ||
5125 | + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` | ||
5126 | + fi | ||
5127 | + # FIXME: find the short name or the path components, as spaces are | ||
5128 | + # common. (e.g. "Program Files" -> "PROGRA~1") | ||
5129 | + ;; | ||
5130 | + esac | ||
5131 | + | ||
5132 | + # DLL is installed to $(libdir)/../bin by postinstall_cmds | ||
5133 | + postinstall_cmds='base_file=`basename \${file}`~ | ||
5134 | + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ | ||
5135 | + dldir=$destdir/`dirname \$dlpath`~ | ||
5136 | + test -d \$dldir || mkdir -p \$dldir~ | ||
5137 | + $install_prog $dir/$dlname \$dldir/$dlname' | ||
5138 | + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ | ||
5139 | + dlpath=$dir/\$dldll~ | ||
5140 | + $RM \$dlpath' | ||
5141 | + shlibpath_overrides_runpath=yes | ||
5142 | + dynamic_linker='Win32 link.exe' | ||
5143 | ;; | ||
5144 | |||
5145 | *) | ||
5146 | + # Assume MSVC wrapper | ||
5147 | library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' | ||
5148 | + dynamic_linker='Win32 ld.exe' | ||
5149 | ;; | ||
5150 | esac | ||
5151 | - dynamic_linker='Win32 ld.exe' | ||
5152 | # FIXME: first we should search . and the directory the executable is in | ||
5153 | shlibpath_var=PATH | ||
5154 | ;; | ||
5155 | @@ -10547,7 +11202,7 @@ haiku*) | ||
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 | @@ -11343,7 +11998,7 @@ else | ||
5165 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 | ||
5166 | lt_status=$lt_dlunknown | ||
5167 | cat > conftest.$ac_ext <<_LT_EOF | ||
5168 | -#line 11346 "configure" | ||
5169 | +#line $LINENO "configure" | ||
5170 | #include "confdefs.h" | ||
5171 | |||
5172 | #if HAVE_DLFCN_H | ||
5173 | @@ -11387,10 +12042,10 @@ else | ||
5174 | /* When -fvisbility=hidden is used, assume the code has been annotated | ||
5175 | correspondingly for the symbols needed. */ | ||
5176 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) | ||
5177 | -void fnord () __attribute__((visibility("default"))); | ||
5178 | +int fnord () __attribute__((visibility("default"))); | ||
5179 | #endif | ||
5180 | |||
5181 | -void fnord () { int i=42; } | ||
5182 | +int fnord () { return 42; } | ||
5183 | int main () | ||
5184 | { | ||
5185 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); | ||
5186 | @@ -11449,7 +12104,7 @@ else | ||
5187 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 | ||
5188 | lt_status=$lt_dlunknown | ||
5189 | cat > conftest.$ac_ext <<_LT_EOF | ||
5190 | -#line 11452 "configure" | ||
5191 | +#line $LINENO "configure" | ||
5192 | #include "confdefs.h" | ||
5193 | |||
5194 | #if HAVE_DLFCN_H | ||
5195 | @@ -11493,10 +12148,10 @@ else | ||
5196 | /* When -fvisbility=hidden is used, assume the code has been annotated | ||
5197 | correspondingly for the symbols needed. */ | ||
5198 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) | ||
5199 | -void fnord () __attribute__((visibility("default"))); | ||
5200 | +int fnord () __attribute__((visibility("default"))); | ||
5201 | #endif | ||
5202 | |||
5203 | -void fnord () { int i=42; } | ||
5204 | +int fnord () { return 42; } | ||
5205 | int main () | ||
5206 | { | ||
5207 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); | ||
5208 | @@ -15981,13 +16636,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' | ||
5209 | lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' | ||
5210 | lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' | ||
5211 | lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' | ||
5212 | +lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`' | ||
5213 | +lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`' | ||
5214 | reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`' | ||
5215 | reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`' | ||
5216 | OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`' | ||
5217 | deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`' | ||
5218 | file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`' | ||
5219 | +file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`' | ||
5220 | +want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`' | ||
5221 | +DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`' | ||
5222 | +sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`' | ||
5223 | AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`' | ||
5224 | AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`' | ||
5225 | +archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`' | ||
5226 | STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' | ||
5227 | RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' | ||
5228 | old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' | ||
5229 | @@ -16002,14 +16664,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"`' | ||
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"`' | ||
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"`' | ||
5233 | +nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`' | ||
5234 | +lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`' | ||
5235 | objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`' | ||
5236 | MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`' | ||
5237 | lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`' | ||
5238 | -lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' | ||
5239 | lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`' | ||
5240 | +lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' | ||
5241 | lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`' | ||
5242 | lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`' | ||
5243 | need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`' | ||
5244 | +MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`' | ||
5245 | DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' | ||
5246 | NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' | ||
5247 | LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' | ||
5248 | @@ -16042,12 +16707,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q | ||
5249 | hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' | ||
5250 | inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' | ||
5251 | link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' | ||
5252 | -fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`' | ||
5253 | always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`' | ||
5254 | export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`' | ||
5255 | exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`' | ||
5256 | include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`' | ||
5257 | prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`' | ||
5258 | +postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`' | ||
5259 | 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"`' | ||
5261 | need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' | ||
5262 | @@ -16102,8 +16767,13 @@ reload_flag \ | ||
5263 | OBJDUMP \ | ||
5264 | deplibs_check_method \ | ||
5265 | file_magic_cmd \ | ||
5266 | +file_magic_glob \ | ||
5267 | +want_nocaseglob \ | ||
5268 | +DLLTOOL \ | ||
5269 | +sharedlib_from_linklib_cmd \ | ||
5270 | AR \ | ||
5271 | AR_FLAGS \ | ||
5272 | +archiver_list_spec \ | ||
5273 | STRIP \ | ||
5274 | RANLIB \ | ||
5275 | CC \ | ||
5276 | @@ -16113,12 +16783,14 @@ lt_cv_sys_global_symbol_pipe \ | ||
5277 | lt_cv_sys_global_symbol_to_cdecl \ | ||
5278 | lt_cv_sys_global_symbol_to_c_name_address \ | ||
5279 | lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ | ||
5280 | +nm_file_list_spec \ | ||
5281 | lt_prog_compiler_no_builtin_flag \ | ||
5282 | -lt_prog_compiler_wl \ | ||
5283 | lt_prog_compiler_pic \ | ||
5284 | +lt_prog_compiler_wl \ | ||
5285 | lt_prog_compiler_static \ | ||
5286 | lt_cv_prog_compiler_c_o \ | ||
5287 | need_locks \ | ||
5288 | +MANIFEST_TOOL \ | ||
5289 | DSYMUTIL \ | ||
5290 | NMEDIT \ | ||
5291 | LIPO \ | ||
5292 | @@ -16134,7 +16806,6 @@ no_undefined_flag \ | ||
5293 | hardcode_libdir_flag_spec \ | ||
5294 | hardcode_libdir_flag_spec_ld \ | ||
5295 | hardcode_libdir_separator \ | ||
5296 | -fix_srcfile_path \ | ||
5297 | exclude_expsyms \ | ||
5298 | include_expsyms \ | ||
5299 | file_list_spec \ | ||
5300 | @@ -16170,6 +16841,7 @@ module_cmds \ | ||
5301 | module_expsym_cmds \ | ||
5302 | export_symbols_cmds \ | ||
5303 | prelink_cmds \ | ||
5304 | +postlink_cmds \ | ||
5305 | postinstall_cmds \ | ||
5306 | postuninstall_cmds \ | ||
5307 | finish_cmds \ | ||
5308 | @@ -16943,7 +17615,8 @@ $as_echo X"$file" | | ||
5309 | # NOTE: Changes made to this file will be lost: look at ltmain.sh. | ||
5310 | # | ||
5311 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, | ||
5312 | -# 2006, 2007, 2008, 2009 Free Software Foundation, Inc. | ||
5313 | +# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, | ||
5314 | +# Inc. | ||
5315 | # Written by Gordon Matzigkeit, 1996 | ||
5316 | # | ||
5317 | # This file is part of GNU Libtool. | ||
5318 | @@ -17046,19 +17719,42 @@ SP2NL=$lt_lt_SP2NL | ||
5319 | # turn newlines into spaces. | ||
5320 | NL2SP=$lt_lt_NL2SP | ||
5321 | |||
5322 | +# convert \$build file names to \$host format. | ||
5323 | +to_host_file_cmd=$lt_cv_to_host_file_cmd | ||
5324 | + | ||
5325 | +# convert \$build files to toolchain format. | ||
5326 | +to_tool_file_cmd=$lt_cv_to_tool_file_cmd | ||
5327 | + | ||
5328 | # An object symbol dumper. | ||
5329 | OBJDUMP=$lt_OBJDUMP | ||
5330 | |||
5331 | # Method to check whether dependent libraries are shared objects. | ||
5332 | deplibs_check_method=$lt_deplibs_check_method | ||
5333 | |||
5334 | -# Command to use when deplibs_check_method == "file_magic". | ||
5335 | +# Command to use when deplibs_check_method = "file_magic". | ||
5336 | file_magic_cmd=$lt_file_magic_cmd | ||
5337 | |||
5338 | +# How to find potential files when deplibs_check_method = "file_magic". | ||
5339 | +file_magic_glob=$lt_file_magic_glob | ||
5340 | + | ||
5341 | +# Find potential files using nocaseglob when deplibs_check_method = "file_magic". | ||
5342 | +want_nocaseglob=$lt_want_nocaseglob | ||
5343 | + | ||
5344 | +# DLL creation program. | ||
5345 | +DLLTOOL=$lt_DLLTOOL | ||
5346 | + | ||
5347 | +# Command to associate shared and link libraries. | ||
5348 | +sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd | ||
5349 | + | ||
5350 | # The archiver. | ||
5351 | AR=$lt_AR | ||
5352 | + | ||
5353 | +# Flags to create an archive. | ||
5354 | AR_FLAGS=$lt_AR_FLAGS | ||
5355 | |||
5356 | +# How to feed a file listing to the archiver. | ||
5357 | +archiver_list_spec=$lt_archiver_list_spec | ||
5358 | + | ||
5359 | # A symbol stripping program. | ||
5360 | STRIP=$lt_STRIP | ||
5361 | |||
5362 | @@ -17088,6 +17784,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. | ||
5364 | global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix | ||
5365 | |||
5366 | +# Specify filename containing input files for \$NM. | ||
5367 | +nm_file_list_spec=$lt_nm_file_list_spec | ||
5368 | + | ||
5369 | +# The root where to search for dependent libraries,and in which our libraries should be installed. | ||
5370 | +lt_sysroot=$lt_sysroot | ||
5371 | + | ||
5372 | # The name of the directory that contains temporary libtool files. | ||
5373 | objdir=$objdir | ||
5374 | |||
5375 | @@ -17097,6 +17799,9 @@ MAGIC_CMD=$MAGIC_CMD | ||
5376 | # Must we lock files when doing compilation? | ||
5377 | need_locks=$lt_need_locks | ||
5378 | |||
5379 | +# Manifest tool. | ||
5380 | +MANIFEST_TOOL=$lt_MANIFEST_TOOL | ||
5381 | + | ||
5382 | # Tool to manipulate archived DWARF debug symbol files on Mac OS X. | ||
5383 | DSYMUTIL=$lt_DSYMUTIL | ||
5384 | |||
5385 | @@ -17211,12 +17916,12 @@ with_gcc=$GCC | ||
5386 | # Compiler flag to turn off builtin functions. | ||
5387 | no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag | ||
5388 | |||
5389 | -# How to pass a linker flag through the compiler. | ||
5390 | -wl=$lt_lt_prog_compiler_wl | ||
5391 | - | ||
5392 | # Additional compiler flags for building library objects. | ||
5393 | pic_flag=$lt_lt_prog_compiler_pic | ||
5394 | |||
5395 | +# How to pass a linker flag through the compiler. | ||
5396 | +wl=$lt_lt_prog_compiler_wl | ||
5397 | + | ||
5398 | # Compiler flag to prevent dynamic linking. | ||
5399 | link_static_flag=$lt_lt_prog_compiler_static | ||
5400 | |||
5401 | @@ -17303,9 +18008,6 @@ inherit_rpath=$inherit_rpath | ||
5402 | # Whether libtool must link a program against all its dependency libraries. | ||
5403 | link_all_deplibs=$link_all_deplibs | ||
5404 | |||
5405 | -# Fix the shell variable \$srcfile for the compiler. | ||
5406 | -fix_srcfile_path=$lt_fix_srcfile_path | ||
5407 | - | ||
5408 | # Set to "yes" if exported symbols are required. | ||
5409 | always_export_symbols=$always_export_symbols | ||
5410 | |||
5411 | @@ -17321,6 +18023,9 @@ include_expsyms=$lt_include_expsyms | ||
5412 | # Commands necessary for linking programs (against libraries) with templates. | ||
5413 | prelink_cmds=$lt_prelink_cmds | ||
5414 | |||
5415 | +# Commands necessary for finishing linking programs. | ||
5416 | +postlink_cmds=$lt_postlink_cmds | ||
5417 | + | ||
5418 | # Specify filename containing input files. | ||
5419 | file_list_spec=$lt_file_list_spec | ||
5420 | |||
5421 | @@ -17353,210 +18058,169 @@ ltmain="$ac_aux_dir/ltmain.sh" | ||
5422 | # 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 | ||
5424 | # is reportedly fixed, but why not run on old versions too? | ||
5425 | - sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ | ||
5426 | - || (rm -f "$cfgfile"; exit 1) | ||
5427 | - | ||
5428 | - case $xsi_shell in | ||
5429 | - yes) | ||
5430 | - cat << \_LT_EOF >> "$cfgfile" | ||
5431 | - | ||
5432 | -# func_dirname file append nondir_replacement | ||
5433 | -# Compute the dirname of FILE. If nonempty, add APPEND to the result, | ||
5434 | -# otherwise set result to NONDIR_REPLACEMENT. | ||
5435 | -func_dirname () | ||
5436 | -{ | ||
5437 | - case ${1} in | ||
5438 | - */*) func_dirname_result="${1%/*}${2}" ;; | ||
5439 | - * ) func_dirname_result="${3}" ;; | ||
5440 | - esac | ||
5441 | -} | ||
5442 | - | ||
5443 | -# func_basename file | ||
5444 | -func_basename () | ||
5445 | -{ | ||
5446 | - func_basename_result="${1##*/}" | ||
5447 | -} | ||
5448 | - | ||
5449 | -# func_dirname_and_basename file append nondir_replacement | ||
5450 | -# perform func_basename and func_dirname in a single function | ||
5451 | -# call: | ||
5452 | -# dirname: Compute the dirname of FILE. If nonempty, | ||
5453 | -# add APPEND to the result, otherwise set result | ||
5454 | -# to NONDIR_REPLACEMENT. | ||
5455 | -# value returned in "$func_dirname_result" | ||
5456 | -# basename: Compute filename of FILE. | ||
5457 | -# value retuned in "$func_basename_result" | ||
5458 | -# Implementation must be kept synchronized with func_dirname | ||
5459 | -# and func_basename. For efficiency, we do not delegate to | ||
5460 | -# those functions but instead duplicate the functionality here. | ||
5461 | -func_dirname_and_basename () | ||
5462 | -{ | ||
5463 | - case ${1} in | ||
5464 | - */*) func_dirname_result="${1%/*}${2}" ;; | ||
5465 | - * ) func_dirname_result="${3}" ;; | ||
5466 | - esac | ||
5467 | - func_basename_result="${1##*/}" | ||
5468 | -} | ||
5469 | - | ||
5470 | -# func_stripname prefix suffix name | ||
5471 | -# strip PREFIX and SUFFIX off of NAME. | ||
5472 | -# PREFIX and SUFFIX must not contain globbing or regex special | ||
5473 | -# characters, hashes, percent signs, but SUFFIX may contain a leading | ||
5474 | -# dot (in which case that matches only a dot). | ||
5475 | -func_stripname () | ||
5476 | -{ | ||
5477 | - # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are | ||
5478 | - # positional parameters, so assign one to ordinary parameter first. | ||
5479 | - func_stripname_result=${3} | ||
5480 | - func_stripname_result=${func_stripname_result#"${1}"} | ||
5481 | - func_stripname_result=${func_stripname_result%"${2}"} | ||
5482 | -} | ||
5483 | - | ||
5484 | -# func_opt_split | ||
5485 | -func_opt_split () | ||
5486 | -{ | ||
5487 | - func_opt_split_opt=${1%%=*} | ||
5488 | - func_opt_split_arg=${1#*=} | ||
5489 | -} | ||
5490 | - | ||
5491 | -# func_lo2o object | ||
5492 | -func_lo2o () | ||
5493 | -{ | ||
5494 | - case ${1} in | ||
5495 | - *.lo) func_lo2o_result=${1%.lo}.${objext} ;; | ||
5496 | - *) func_lo2o_result=${1} ;; | ||
5497 | - esac | ||
5498 | -} | ||
5499 | - | ||
5500 | -# func_xform libobj-or-source | ||
5501 | -func_xform () | ||
5502 | -{ | ||
5503 | - func_xform_result=${1%.*}.lo | ||
5504 | -} | ||
5505 | - | ||
5506 | -# func_arith arithmetic-term... | ||
5507 | -func_arith () | ||
5508 | -{ | ||
5509 | - func_arith_result=$(( $* )) | ||
5510 | -} | ||
5511 | - | ||
5512 | -# func_len string | ||
5513 | -# STRING may not start with a hyphen. | ||
5514 | -func_len () | ||
5515 | -{ | ||
5516 | - func_len_result=${#1} | ||
5517 | -} | ||
5518 | - | ||
5519 | -_LT_EOF | ||
5520 | - ;; | ||
5521 | - *) # Bourne compatible functions. | ||
5522 | - cat << \_LT_EOF >> "$cfgfile" | ||
5523 | - | ||
5524 | -# func_dirname file append nondir_replacement | ||
5525 | -# Compute the dirname of FILE. If nonempty, add APPEND to the result, | ||
5526 | -# otherwise set result to NONDIR_REPLACEMENT. | ||
5527 | -func_dirname () | ||
5528 | -{ | ||
5529 | - # Extract subdirectory from the argument. | ||
5530 | - func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` | ||
5531 | - if test "X$func_dirname_result" = "X${1}"; then | ||
5532 | - func_dirname_result="${3}" | ||
5533 | - else | ||
5534 | - func_dirname_result="$func_dirname_result${2}" | ||
5535 | - fi | ||
5536 | -} | ||
5537 | - | ||
5538 | -# func_basename file | ||
5539 | -func_basename () | ||
5540 | -{ | ||
5541 | - func_basename_result=`$ECHO "${1}" | $SED "$basename"` | ||
5542 | -} | ||
5543 | - | ||
5544 | - | ||
5545 | -# func_stripname prefix suffix name | ||
5546 | -# strip PREFIX and SUFFIX off of NAME. | ||
5547 | -# PREFIX and SUFFIX must not contain globbing or regex special | ||
5548 | -# characters, hashes, percent signs, but SUFFIX may contain a leading | ||
5549 | -# dot (in which case that matches only a dot). | ||
5550 | -# func_strip_suffix prefix name | ||
5551 | -func_stripname () | ||
5552 | -{ | ||
5553 | - case ${2} in | ||
5554 | - .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; | ||
5555 | - *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; | ||
5556 | - esac | ||
5557 | -} | ||
5558 | - | ||
5559 | -# sed scripts: | ||
5560 | -my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q' | ||
5561 | -my_sed_long_arg='1s/^-[^=]*=//' | ||
5562 | - | ||
5563 | -# func_opt_split | ||
5564 | -func_opt_split () | ||
5565 | -{ | ||
5566 | - func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"` | ||
5567 | - func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"` | ||
5568 | -} | ||
5569 | - | ||
5570 | -# func_lo2o object | ||
5571 | -func_lo2o () | ||
5572 | -{ | ||
5573 | - func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` | ||
5574 | -} | ||
5575 | - | ||
5576 | -# func_xform libobj-or-source | ||
5577 | -func_xform () | ||
5578 | -{ | ||
5579 | - func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'` | ||
5580 | -} | ||
5581 | - | ||
5582 | -# func_arith arithmetic-term... | ||
5583 | -func_arith () | ||
5584 | -{ | ||
5585 | - func_arith_result=`expr "$@"` | ||
5586 | -} | ||
5587 | - | ||
5588 | -# func_len string | ||
5589 | -# STRING may not start with a hyphen. | ||
5590 | -func_len () | ||
5591 | -{ | ||
5592 | - func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len` | ||
5593 | -} | ||
5594 | - | ||
5595 | -_LT_EOF | ||
5596 | -esac | ||
5597 | - | ||
5598 | -case $lt_shell_append in | ||
5599 | - yes) | ||
5600 | - cat << \_LT_EOF >> "$cfgfile" | ||
5601 | - | ||
5602 | -# func_append var value | ||
5603 | -# Append VALUE to the end of shell variable VAR. | ||
5604 | -func_append () | ||
5605 | -{ | ||
5606 | - eval "$1+=\$2" | ||
5607 | -} | ||
5608 | -_LT_EOF | ||
5609 | - ;; | ||
5610 | - *) | ||
5611 | - cat << \_LT_EOF >> "$cfgfile" | ||
5612 | - | ||
5613 | -# func_append var value | ||
5614 | -# Append VALUE to the end of shell variable VAR. | ||
5615 | -func_append () | ||
5616 | -{ | ||
5617 | - eval "$1=\$$1\$2" | ||
5618 | -} | ||
5619 | - | ||
5620 | -_LT_EOF | ||
5621 | - ;; | ||
5622 | - esac | ||
5623 | - | ||
5624 | - | ||
5625 | - sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ | ||
5626 | - || (rm -f "$cfgfile"; exit 1) | ||
5627 | - | ||
5628 | - mv -f "$cfgfile" "$ofile" || | ||
5629 | + sed '$q' "$ltmain" >> "$cfgfile" \ | ||
5630 | + || (rm -f "$cfgfile"; exit 1) | ||
5631 | + | ||
5632 | + if test x"$xsi_shell" = xyes; then | ||
5633 | + sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ | ||
5634 | +func_dirname ()\ | ||
5635 | +{\ | ||
5636 | +\ case ${1} in\ | ||
5637 | +\ */*) func_dirname_result="${1%/*}${2}" ;;\ | ||
5638 | +\ * ) func_dirname_result="${3}" ;;\ | ||
5639 | +\ esac\ | ||
5640 | +} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \ | ||
5641 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
5642 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
5643 | +test 0 -eq $? || _lt_function_replace_fail=: | ||
5644 | + | ||
5645 | + | ||
5646 | + sed -e '/^func_basename ()$/,/^} # func_basename /c\ | ||
5647 | +func_basename ()\ | ||
5648 | +{\ | ||
5649 | +\ func_basename_result="${1##*/}"\ | ||
5650 | +} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \ | ||
5651 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
5652 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
5653 | +test 0 -eq $? || _lt_function_replace_fail=: | ||
5654 | + | ||
5655 | + | ||
5656 | + sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\ | ||
5657 | +func_dirname_and_basename ()\ | ||
5658 | +{\ | ||
5659 | +\ case ${1} in\ | ||
5660 | +\ */*) func_dirname_result="${1%/*}${2}" ;;\ | ||
5661 | +\ * ) func_dirname_result="${3}" ;;\ | ||
5662 | +\ esac\ | ||
5663 | +\ func_basename_result="${1##*/}"\ | ||
5664 | +} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \ | ||
5665 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
5666 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
5667 | +test 0 -eq $? || _lt_function_replace_fail=: | ||
5668 | + | ||
5669 | + | ||
5670 | + sed -e '/^func_stripname ()$/,/^} # func_stripname /c\ | ||
5671 | +func_stripname ()\ | ||
5672 | +{\ | ||
5673 | +\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\ | ||
5674 | +\ # positional parameters, so assign one to ordinary parameter first.\ | ||
5675 | +\ func_stripname_result=${3}\ | ||
5676 | +\ func_stripname_result=${func_stripname_result#"${1}"}\ | ||
5677 | +\ func_stripname_result=${func_stripname_result%"${2}"}\ | ||
5678 | +} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \ | ||
5679 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
5680 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
5681 | +test 0 -eq $? || _lt_function_replace_fail=: | ||
5682 | + | ||
5683 | + | ||
5684 | + sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\ | ||
5685 | +func_split_long_opt ()\ | ||
5686 | +{\ | ||
5687 | +\ func_split_long_opt_name=${1%%=*}\ | ||
5688 | +\ func_split_long_opt_arg=${1#*=}\ | ||
5689 | +} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \ | ||
5690 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
5691 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
5692 | +test 0 -eq $? || _lt_function_replace_fail=: | ||
5693 | + | ||
5694 | + | ||
5695 | + sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\ | ||
5696 | +func_split_short_opt ()\ | ||
5697 | +{\ | ||
5698 | +\ func_split_short_opt_arg=${1#??}\ | ||
5699 | +\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\ | ||
5700 | +} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \ | ||
5701 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
5702 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
5703 | +test 0 -eq $? || _lt_function_replace_fail=: | ||
5704 | + | ||
5705 | + | ||
5706 | + sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\ | ||
5707 | +func_lo2o ()\ | ||
5708 | +{\ | ||
5709 | +\ case ${1} in\ | ||
5710 | +\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\ | ||
5711 | +\ *) func_lo2o_result=${1} ;;\ | ||
5712 | +\ esac\ | ||
5713 | +} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \ | ||
5714 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
5715 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
5716 | +test 0 -eq $? || _lt_function_replace_fail=: | ||
5717 | + | ||
5718 | + | ||
5719 | + sed -e '/^func_xform ()$/,/^} # func_xform /c\ | ||
5720 | +func_xform ()\ | ||
5721 | +{\ | ||
5722 | + func_xform_result=${1%.*}.lo\ | ||
5723 | +} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \ | ||
5724 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
5725 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
5726 | +test 0 -eq $? || _lt_function_replace_fail=: | ||
5727 | + | ||
5728 | + | ||
5729 | + sed -e '/^func_arith ()$/,/^} # func_arith /c\ | ||
5730 | +func_arith ()\ | ||
5731 | +{\ | ||
5732 | + func_arith_result=$(( $* ))\ | ||
5733 | +} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \ | ||
5734 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
5735 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
5736 | +test 0 -eq $? || _lt_function_replace_fail=: | ||
5737 | + | ||
5738 | + | ||
5739 | + sed -e '/^func_len ()$/,/^} # func_len /c\ | ||
5740 | +func_len ()\ | ||
5741 | +{\ | ||
5742 | + func_len_result=${#1}\ | ||
5743 | +} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \ | ||
5744 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
5745 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
5746 | +test 0 -eq $? || _lt_function_replace_fail=: | ||
5747 | + | ||
5748 | +fi | ||
5749 | + | ||
5750 | +if test x"$lt_shell_append" = xyes; then | ||
5751 | + sed -e '/^func_append ()$/,/^} # func_append /c\ | ||
5752 | +func_append ()\ | ||
5753 | +{\ | ||
5754 | + eval "${1}+=\\${2}"\ | ||
5755 | +} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \ | ||
5756 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
5757 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
5758 | +test 0 -eq $? || _lt_function_replace_fail=: | ||
5759 | + | ||
5760 | + | ||
5761 | + sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\ | ||
5762 | +func_append_quoted ()\ | ||
5763 | +{\ | ||
5764 | +\ func_quote_for_eval "${2}"\ | ||
5765 | +\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\ | ||
5766 | +} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \ | ||
5767 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
5768 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
5769 | +test 0 -eq $? || _lt_function_replace_fail=: | ||
5770 | + | ||
5771 | + | ||
5772 | + # Save a `func_append' function call where possible by direct use of '+=' | ||
5773 | + sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ | ||
5774 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
5775 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
5776 | + test 0 -eq $? || _lt_function_replace_fail=: | ||
5777 | +else | ||
5778 | + # Save a `func_append' function call even when '+=' is not available | ||
5779 | + sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ | ||
5780 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
5781 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
5782 | + test 0 -eq $? || _lt_function_replace_fail=: | ||
5783 | +fi | ||
5784 | + | ||
5785 | +if test x"$_lt_function_replace_fail" = x":"; then | ||
5786 | + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 | ||
5787 | +$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} | ||
5788 | +fi | ||
5789 | + | ||
5790 | + | ||
5791 | + mv -f "$cfgfile" "$ofile" || | ||
5792 | (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") | ||
5793 | chmod +x "$ofile" | ||
5794 | |||
5795 | diff --git a/gprof/configure b/gprof/configure | ||
5796 | index 3cf41b79116..e5d57f52912 100755 | ||
5797 | --- a/gprof/configure | ||
5798 | +++ b/gprof/configure | ||
5799 | @@ -662,8 +662,11 @@ OTOOL | ||
5800 | LIPO | ||
5801 | NMEDIT | ||
5802 | DSYMUTIL | ||
5803 | +MANIFEST_TOOL | ||
5804 | RANLIB | ||
5805 | +ac_ct_AR | ||
5806 | AR | ||
5807 | +DLLTOOL | ||
5808 | OBJDUMP | ||
5809 | LN_S | ||
5810 | NM | ||
5811 | @@ -780,6 +783,7 @@ enable_static | ||
5812 | with_pic | ||
5813 | enable_fast_install | ||
5814 | with_gnu_ld | ||
5815 | +with_libtool_sysroot | ||
5816 | enable_libtool_lock | ||
5817 | enable_plugins | ||
5818 | enable_largefile | ||
5819 | @@ -1442,6 +1446,8 @@ Optional Packages: | ||
5820 | --with-pic try to use only PIC/non-PIC objects [default=use | ||
5821 | both] | ||
5822 | --with-gnu-ld assume the C compiler uses GNU ld [default=no] | ||
5823 | + --with-libtool-sysroot=DIR Search for dependent libraries within DIR | ||
5824 | + (or the compiler's sysroot if not specified). | ||
5825 | |||
5826 | Some influential environment variables: | ||
5827 | CC C compiler command | ||
5828 | @@ -5124,8 +5130,8 @@ esac | ||
5829 | |||
5830 | |||
5831 | |||
5832 | -macro_version='2.2.7a' | ||
5833 | -macro_revision='1.3134' | ||
5834 | +macro_version='2.4' | ||
5835 | +macro_revision='1.3293' | ||
5836 | |||
5837 | |||
5838 | |||
5839 | @@ -5165,7 +5171,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO | ||
5840 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 | ||
5841 | $as_echo_n "checking how to print strings... " >&6; } | ||
5842 | # Test print first, because it will be a builtin if present. | ||
5843 | -if test "X`print -r -- -n 2>/dev/null`" = X-n && \ | ||
5844 | +if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ | ||
5845 | test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then | ||
5846 | ECHO='print -r --' | ||
5847 | elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then | ||
5848 | @@ -5851,8 +5857,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; | ||
5849 | # Try some XSI features | ||
5850 | xsi_shell=no | ||
5851 | ( _lt_dummy="a/b/c" | ||
5852 | - test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ | ||
5853 | - = c,a/b,, \ | ||
5854 | + test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ | ||
5855 | + = c,a/b,b/c, \ | ||
5856 | && eval 'test $(( 1 + 1 )) -eq 2 \ | ||
5857 | && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ | ||
5858 | && xsi_shell=yes | ||
5859 | @@ -5901,6 +5907,80 @@ esac | ||
5860 | |||
5861 | |||
5862 | |||
5863 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5 | ||
5864 | +$as_echo_n "checking how to convert $build file names to $host format... " >&6; } | ||
5865 | +if ${lt_cv_to_host_file_cmd+:} false; then : | ||
5866 | + $as_echo_n "(cached) " >&6 | ||
5867 | +else | ||
5868 | + case $host in | ||
5869 | + *-*-mingw* ) | ||
5870 | + case $build in | ||
5871 | + *-*-mingw* ) # actually msys | ||
5872 | + lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 | ||
5873 | + ;; | ||
5874 | + *-*-cygwin* ) | ||
5875 | + lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 | ||
5876 | + ;; | ||
5877 | + * ) # otherwise, assume *nix | ||
5878 | + lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 | ||
5879 | + ;; | ||
5880 | + esac | ||
5881 | + ;; | ||
5882 | + *-*-cygwin* ) | ||
5883 | + case $build in | ||
5884 | + *-*-mingw* ) # actually msys | ||
5885 | + lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin | ||
5886 | + ;; | ||
5887 | + *-*-cygwin* ) | ||
5888 | + lt_cv_to_host_file_cmd=func_convert_file_noop | ||
5889 | + ;; | ||
5890 | + * ) # otherwise, assume *nix | ||
5891 | + lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin | ||
5892 | + ;; | ||
5893 | + esac | ||
5894 | + ;; | ||
5895 | + * ) # unhandled hosts (and "normal" native builds) | ||
5896 | + lt_cv_to_host_file_cmd=func_convert_file_noop | ||
5897 | + ;; | ||
5898 | +esac | ||
5899 | + | ||
5900 | +fi | ||
5901 | + | ||
5902 | +to_host_file_cmd=$lt_cv_to_host_file_cmd | ||
5903 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5 | ||
5904 | +$as_echo "$lt_cv_to_host_file_cmd" >&6; } | ||
5905 | + | ||
5906 | + | ||
5907 | + | ||
5908 | + | ||
5909 | + | ||
5910 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5 | ||
5911 | +$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; } | ||
5912 | +if ${lt_cv_to_tool_file_cmd+:} false; then : | ||
5913 | + $as_echo_n "(cached) " >&6 | ||
5914 | +else | ||
5915 | + #assume ordinary cross tools, or native build. | ||
5916 | +lt_cv_to_tool_file_cmd=func_convert_file_noop | ||
5917 | +case $host in | ||
5918 | + *-*-mingw* ) | ||
5919 | + case $build in | ||
5920 | + *-*-mingw* ) # actually msys | ||
5921 | + lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 | ||
5922 | + ;; | ||
5923 | + esac | ||
5924 | + ;; | ||
5925 | +esac | ||
5926 | + | ||
5927 | +fi | ||
5928 | + | ||
5929 | +to_tool_file_cmd=$lt_cv_to_tool_file_cmd | ||
5930 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5 | ||
5931 | +$as_echo "$lt_cv_to_tool_file_cmd" >&6; } | ||
5932 | + | ||
5933 | + | ||
5934 | + | ||
5935 | + | ||
5936 | + | ||
5937 | { $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; } | ||
5939 | if ${lt_cv_ld_reload_flag+:} false; then : | ||
5940 | @@ -5917,6 +5997,11 @@ case $reload_flag in | ||
5941 | esac | ||
5942 | reload_cmds='$LD$reload_flag -o $output$reload_objs' | ||
5943 | case $host_os in | ||
5944 | + cygwin* | mingw* | pw32* | cegcc*) | ||
5945 | + if test "$GCC" != yes; then | ||
5946 | + reload_cmds=false | ||
5947 | + fi | ||
5948 | + ;; | ||
5949 | darwin*) | ||
5950 | if test "$GCC" = yes; then | ||
5951 | reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' | ||
5952 | @@ -6085,7 +6170,8 @@ mingw* | pw32*) | ||
5953 | lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' | ||
5954 | lt_cv_file_magic_cmd='func_win32_libid' | ||
5955 | else | ||
5956 | - lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' | ||
5957 | + # Keep this pattern in sync with the one in func_win32_libid. | ||
5958 | + lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' | ||
5959 | lt_cv_file_magic_cmd='$OBJDUMP -f' | ||
5960 | fi | ||
5961 | ;; | ||
5962 | @@ -6239,6 +6325,21 @@ esac | ||
5963 | fi | ||
5964 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 | ||
5965 | $as_echo "$lt_cv_deplibs_check_method" >&6; } | ||
5966 | + | ||
5967 | +file_magic_glob= | ||
5968 | +want_nocaseglob=no | ||
5969 | +if test "$build" = "$host"; then | ||
5970 | + case $host_os in | ||
5971 | + mingw* | pw32*) | ||
5972 | + if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then | ||
5973 | + want_nocaseglob=yes | ||
5974 | + else | ||
5975 | + file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"` | ||
5976 | + fi | ||
5977 | + ;; | ||
5978 | + esac | ||
5979 | +fi | ||
5980 | + | ||
5981 | file_magic_cmd=$lt_cv_file_magic_cmd | ||
5982 | deplibs_check_method=$lt_cv_deplibs_check_method | ||
5983 | test -z "$deplibs_check_method" && deplibs_check_method=unknown | ||
5984 | @@ -6252,11 +6353,164 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown | ||
5985 | |||
5986 | |||
5987 | |||
5988 | + | ||
5989 | + | ||
5990 | + | ||
5991 | + | ||
5992 | + | ||
5993 | + | ||
5994 | + | ||
5995 | + | ||
5996 | + | ||
5997 | + | ||
5998 | |||
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. | ||
6004 | +set dummy ${ac_tool_prefix}dlltool; ac_word=$2 | ||
6005 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
6006 | +$as_echo_n "checking for $ac_word... " >&6; } | ||
6007 | +if ${ac_cv_prog_DLLTOOL+:} false; then : | ||
6008 | + $as_echo_n "(cached) " >&6 | ||
6009 | +else | ||
6010 | + if test -n "$DLLTOOL"; then | ||
6011 | + ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. | ||
6012 | +else | ||
6013 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | ||
6014 | +for as_dir in $PATH | ||
6015 | +do | ||
6016 | + IFS=$as_save_IFS | ||
6017 | + test -z "$as_dir" && as_dir=. | ||
6018 | + for ac_exec_ext in '' $ac_executable_extensions; do | ||
6019 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | ||
6020 | + ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" | ||
6021 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
6022 | + break 2 | ||
6023 | + fi | ||
6024 | +done | ||
6025 | + done | ||
6026 | +IFS=$as_save_IFS | ||
6027 | + | ||
6028 | +fi | ||
6029 | +fi | ||
6030 | +DLLTOOL=$ac_cv_prog_DLLTOOL | ||
6031 | +if test -n "$DLLTOOL"; then | ||
6032 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 | ||
6033 | +$as_echo "$DLLTOOL" >&6; } | ||
6034 | +else | ||
6035 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
6036 | +$as_echo "no" >&6; } | ||
6037 | +fi | ||
6038 | + | ||
6039 | + | ||
6040 | +fi | ||
6041 | +if test -z "$ac_cv_prog_DLLTOOL"; then | ||
6042 | + ac_ct_DLLTOOL=$DLLTOOL | ||
6043 | + # Extract the first word of "dlltool", so it can be a program name with args. | ||
6044 | +set dummy dlltool; ac_word=$2 | ||
6045 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
6046 | +$as_echo_n "checking for $ac_word... " >&6; } | ||
6047 | +if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then : | ||
6048 | + $as_echo_n "(cached) " >&6 | ||
6049 | +else | ||
6050 | + if test -n "$ac_ct_DLLTOOL"; then | ||
6051 | + ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. | ||
6052 | +else | ||
6053 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | ||
6054 | +for as_dir in $PATH | ||
6055 | +do | ||
6056 | + IFS=$as_save_IFS | ||
6057 | + test -z "$as_dir" && as_dir=. | ||
6058 | + for ac_exec_ext in '' $ac_executable_extensions; do | ||
6059 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | ||
6060 | + ac_cv_prog_ac_ct_DLLTOOL="dlltool" | ||
6061 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
6062 | + break 2 | ||
6063 | + fi | ||
6064 | +done | ||
6065 | + done | ||
6066 | +IFS=$as_save_IFS | ||
6067 | + | ||
6068 | +fi | ||
6069 | +fi | ||
6070 | +ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL | ||
6071 | +if test -n "$ac_ct_DLLTOOL"; then | ||
6072 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 | ||
6073 | +$as_echo "$ac_ct_DLLTOOL" >&6; } | ||
6074 | +else | ||
6075 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
6076 | +$as_echo "no" >&6; } | ||
6077 | +fi | ||
6078 | + | ||
6079 | + if test "x$ac_ct_DLLTOOL" = x; then | ||
6080 | + DLLTOOL="false" | ||
6081 | + else | ||
6082 | + case $cross_compiling:$ac_tool_warned in | ||
6083 | +yes:) | ||
6084 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 | ||
6085 | +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} | ||
6086 | +ac_tool_warned=yes ;; | ||
6087 | +esac | ||
6088 | + DLLTOOL=$ac_ct_DLLTOOL | ||
6089 | + fi | ||
6090 | +else | ||
6091 | + DLLTOOL="$ac_cv_prog_DLLTOOL" | ||
6092 | +fi | ||
6093 | + | ||
6094 | +test -z "$DLLTOOL" && DLLTOOL=dlltool | ||
6095 | + | ||
6096 | + | ||
6097 | + | ||
6098 | + | ||
6099 | + | ||
6100 | + | ||
6101 | + | ||
6102 | + | ||
6103 | + | ||
6104 | + | ||
6105 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5 | ||
6106 | +$as_echo_n "checking how to associate runtime and link libraries... " >&6; } | ||
6107 | +if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then : | ||
6108 | + $as_echo_n "(cached) " >&6 | ||
6109 | +else | ||
6110 | + lt_cv_sharedlib_from_linklib_cmd='unknown' | ||
6111 | + | ||
6112 | +case $host_os in | ||
6113 | +cygwin* | mingw* | pw32* | cegcc*) | ||
6114 | + # two different shell functions defined in ltmain.sh | ||
6115 | + # decide which to use based on capabilities of $DLLTOOL | ||
6116 | + case `$DLLTOOL --help 2>&1` in | ||
6117 | + *--identify-strict*) | ||
6118 | + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib | ||
6119 | + ;; | ||
6120 | + *) | ||
6121 | + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback | ||
6122 | + ;; | ||
6123 | + esac | ||
6124 | + ;; | ||
6125 | +*) | ||
6126 | + # fallback: assume linklib IS sharedlib | ||
6127 | + lt_cv_sharedlib_from_linklib_cmd="$ECHO" | ||
6128 | + ;; | ||
6129 | +esac | ||
6130 | + | ||
6131 | +fi | ||
6132 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5 | ||
6133 | +$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; } | ||
6134 | +sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd | ||
6135 | +test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO | ||
6136 | + | ||
6137 | + | ||
6138 | + | ||
6139 | + | ||
6140 | + | ||
6141 | + | ||
6142 | + | ||
6143 | +if test -n "$ac_tool_prefix"; then | ||
6144 | + for ac_prog in ar | ||
6145 | + do | ||
6146 | + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. | ||
6147 | +set dummy $ac_tool_prefix$ac_prog; ac_word=$2 | ||
6148 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
6149 | $as_echo_n "checking for $ac_word... " >&6; } | ||
6150 | if ${ac_cv_prog_AR+:} false; then : | ||
6151 | @@ -6272,7 +6526,7 @@ do | ||
6152 | test -z "$as_dir" && as_dir=. | ||
6153 | for ac_exec_ext in '' $ac_executable_extensions; do | ||
6154 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | ||
6155 | - ac_cv_prog_AR="${ac_tool_prefix}ar" | ||
6156 | + ac_cv_prog_AR="$ac_tool_prefix$ac_prog" | ||
6157 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
6158 | break 2 | ||
6159 | fi | ||
6160 | @@ -6292,11 +6546,15 @@ $as_echo "no" >&6; } | ||
6161 | fi | ||
6162 | |||
6163 | |||
6164 | + test -n "$AR" && break | ||
6165 | + done | ||
6166 | fi | ||
6167 | -if test -z "$ac_cv_prog_AR"; then | ||
6168 | +if test -z "$AR"; then | ||
6169 | ac_ct_AR=$AR | ||
6170 | - # Extract the first word of "ar", so it can be a program name with args. | ||
6171 | -set dummy ar; ac_word=$2 | ||
6172 | + for ac_prog in ar | ||
6173 | +do | ||
6174 | + # Extract the first word of "$ac_prog", so it can be a program name with args. | ||
6175 | +set dummy $ac_prog; ac_word=$2 | ||
6176 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
6177 | $as_echo_n "checking for $ac_word... " >&6; } | ||
6178 | if ${ac_cv_prog_ac_ct_AR+:} false; then : | ||
6179 | @@ -6312,7 +6570,7 @@ do | ||
6180 | test -z "$as_dir" && as_dir=. | ||
6181 | for ac_exec_ext in '' $ac_executable_extensions; do | ||
6182 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | ||
6183 | - ac_cv_prog_ac_ct_AR="ar" | ||
6184 | + ac_cv_prog_ac_ct_AR="$ac_prog" | ||
6185 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
6186 | break 2 | ||
6187 | fi | ||
6188 | @@ -6331,6 +6589,10 @@ else | ||
6189 | $as_echo "no" >&6; } | ||
6190 | fi | ||
6191 | |||
6192 | + | ||
6193 | + test -n "$ac_ct_AR" && break | ||
6194 | +done | ||
6195 | + | ||
6196 | if test "x$ac_ct_AR" = x; then | ||
6197 | AR="false" | ||
6198 | else | ||
6199 | @@ -6342,16 +6604,72 @@ ac_tool_warned=yes ;; | ||
6200 | esac | ||
6201 | AR=$ac_ct_AR | ||
6202 | fi | ||
6203 | -else | ||
6204 | - AR="$ac_cv_prog_AR" | ||
6205 | fi | ||
6206 | |||
6207 | -test -z "$AR" && AR=ar | ||
6208 | -test -z "$AR_FLAGS" && AR_FLAGS=cru | ||
6209 | +: ${AR=ar} | ||
6210 | +: ${AR_FLAGS=cru} | ||
6211 | + | ||
6212 | + | ||
6213 | + | ||
6214 | + | ||
6215 | + | ||
6216 | + | ||
6217 | + | ||
6218 | + | ||
6219 | + | ||
6220 | + | ||
6221 | + | ||
6222 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 | ||
6223 | +$as_echo_n "checking for archiver @FILE support... " >&6; } | ||
6224 | +if ${lt_cv_ar_at_file+:} false; then : | ||
6225 | + $as_echo_n "(cached) " >&6 | ||
6226 | +else | ||
6227 | + lt_cv_ar_at_file=no | ||
6228 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
6229 | +/* end confdefs.h. */ | ||
6230 | + | ||
6231 | +int | ||
6232 | +main () | ||
6233 | +{ | ||
6234 | |||
6235 | + ; | ||
6236 | + return 0; | ||
6237 | +} | ||
6238 | +_ACEOF | ||
6239 | +if ac_fn_c_try_compile "$LINENO"; then : | ||
6240 | + echo conftest.$ac_objext > conftest.lst | ||
6241 | + lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5' | ||
6242 | + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 | ||
6243 | + (eval $lt_ar_try) 2>&5 | ||
6244 | + ac_status=$? | ||
6245 | + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 | ||
6246 | + test $ac_status = 0; } | ||
6247 | + if test "$ac_status" -eq 0; then | ||
6248 | + # Ensure the archiver fails upon bogus file names. | ||
6249 | + rm -f conftest.$ac_objext libconftest.a | ||
6250 | + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 | ||
6251 | + (eval $lt_ar_try) 2>&5 | ||
6252 | + ac_status=$? | ||
6253 | + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 | ||
6254 | + test $ac_status = 0; } | ||
6255 | + if test "$ac_status" -ne 0; then | ||
6256 | + lt_cv_ar_at_file=@ | ||
6257 | + fi | ||
6258 | + fi | ||
6259 | + rm -f conftest.* libconftest.a | ||
6260 | |||
6261 | +fi | ||
6262 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
6263 | |||
6264 | +fi | ||
6265 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 | ||
6266 | +$as_echo "$lt_cv_ar_at_file" >&6; } | ||
6267 | |||
6268 | +if test "x$lt_cv_ar_at_file" = xno; then | ||
6269 | + archiver_list_spec= | ||
6270 | +else | ||
6271 | + archiver_list_spec=$lt_cv_ar_at_file | ||
6272 | +fi | ||
6273 | |||
6274 | |||
6275 | |||
6276 | @@ -6693,8 +7011,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'" | ||
6278 | |||
6279 | # Transform an extracted symbol line into symbol name and symbol address | ||
6280 | -lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" | ||
6281 | -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'" | ||
6282 | +lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" | ||
6283 | +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'" | ||
6284 | |||
6285 | # Handle CRLF in mingw tool chain | ||
6286 | opt_cr= | ||
6287 | @@ -6730,6 +7048,7 @@ for ac_symprfx in "" "_"; do | ||
6288 | else | ||
6289 | lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" | ||
6290 | fi | ||
6291 | + lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" | ||
6292 | |||
6293 | # Check to see that the pipe works correctly. | ||
6294 | pipe_works=no | ||
6295 | @@ -6771,6 +7090,18 @@ _LT_EOF | ||
6296 | if $GREP ' nm_test_var$' "$nlist" >/dev/null; then | ||
6297 | if $GREP ' nm_test_func$' "$nlist" >/dev/null; then | ||
6298 | cat <<_LT_EOF > conftest.$ac_ext | ||
6299 | +/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ | ||
6300 | +#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) | ||
6301 | +/* DATA imports from DLLs on WIN32 con't be const, because runtime | ||
6302 | + relocations are performed -- see ld's documentation on pseudo-relocs. */ | ||
6303 | +# define LT_DLSYM_CONST | ||
6304 | +#elif defined(__osf__) | ||
6305 | +/* This system does not cope well with relocations in const data. */ | ||
6306 | +# define LT_DLSYM_CONST | ||
6307 | +#else | ||
6308 | +# define LT_DLSYM_CONST const | ||
6309 | +#endif | ||
6310 | + | ||
6311 | #ifdef __cplusplus | ||
6312 | extern "C" { | ||
6313 | #endif | ||
6314 | @@ -6782,7 +7113,7 @@ _LT_EOF | ||
6315 | cat <<_LT_EOF >> conftest.$ac_ext | ||
6316 | |||
6317 | /* The mapping between symbol names and symbols. */ | ||
6318 | -const struct { | ||
6319 | +LT_DLSYM_CONST struct { | ||
6320 | const char *name; | ||
6321 | void *address; | ||
6322 | } | ||
6323 | @@ -6808,8 +7139,8 @@ static const void *lt_preloaded_setup() { | ||
6324 | _LT_EOF | ||
6325 | # Now try linking the two files. | ||
6326 | mv conftest.$ac_objext conftstm.$ac_objext | ||
6327 | - lt_save_LIBS="$LIBS" | ||
6328 | - lt_save_CFLAGS="$CFLAGS" | ||
6329 | + lt_globsym_save_LIBS=$LIBS | ||
6330 | + lt_globsym_save_CFLAGS=$CFLAGS | ||
6331 | LIBS="conftstm.$ac_objext" | ||
6332 | CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" | ||
6333 | if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 | ||
6334 | @@ -6819,8 +7150,8 @@ _LT_EOF | ||
6335 | test $ac_status = 0; } && test -s conftest${ac_exeext}; then | ||
6336 | pipe_works=yes | ||
6337 | fi | ||
6338 | - LIBS="$lt_save_LIBS" | ||
6339 | - CFLAGS="$lt_save_CFLAGS" | ||
6340 | + LIBS=$lt_globsym_save_LIBS | ||
6341 | + CFLAGS=$lt_globsym_save_CFLAGS | ||
6342 | else | ||
6343 | echo "cannot find nm_test_func in $nlist" >&5 | ||
6344 | fi | ||
6345 | @@ -6857,6 +7188,20 @@ else | ||
6346 | $as_echo "ok" >&6; } | ||
6347 | fi | ||
6348 | |||
6349 | +# Response file support. | ||
6350 | +if test "$lt_cv_nm_interface" = "MS dumpbin"; then | ||
6351 | + nm_file_list_spec='@' | ||
6352 | +elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then | ||
6353 | + nm_file_list_spec='@' | ||
6354 | +fi | ||
6355 | + | ||
6356 | + | ||
6357 | + | ||
6358 | + | ||
6359 | + | ||
6360 | + | ||
6361 | + | ||
6362 | + | ||
6363 | |||
6364 | |||
6365 | |||
6366 | @@ -6873,6 +7218,41 @@ fi | ||
6367 | |||
6368 | |||
6369 | |||
6370 | + | ||
6371 | + | ||
6372 | + | ||
6373 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 | ||
6374 | +$as_echo_n "checking for sysroot... " >&6; } | ||
6375 | + | ||
6376 | +# Check whether --with-libtool-sysroot was given. | ||
6377 | +if test "${with_libtool_sysroot+set}" = set; then : | ||
6378 | + withval=$with_libtool_sysroot; | ||
6379 | +else | ||
6380 | + with_libtool_sysroot=no | ||
6381 | +fi | ||
6382 | + | ||
6383 | + | ||
6384 | +lt_sysroot= | ||
6385 | +case ${with_libtool_sysroot} in #( | ||
6386 | + yes) | ||
6387 | + if test "$GCC" = yes; then | ||
6388 | + lt_sysroot=`$CC --print-sysroot 2>/dev/null` | ||
6389 | + fi | ||
6390 | + ;; #( | ||
6391 | + /*) | ||
6392 | + lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"` | ||
6393 | + ;; #( | ||
6394 | + no|'') | ||
6395 | + ;; #( | ||
6396 | + *) | ||
6397 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5 | ||
6398 | +$as_echo "${with_libtool_sysroot}" >&6; } | ||
6399 | + as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 | ||
6400 | + ;; | ||
6401 | +esac | ||
6402 | + | ||
6403 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 | ||
6404 | +$as_echo "${lt_sysroot:-no}" >&6; } | ||
6405 | |||
6406 | |||
6407 | |||
6408 | @@ -7084,6 +7464,123 @@ esac | ||
6409 | |||
6410 | need_locks="$enable_libtool_lock" | ||
6411 | |||
6412 | +if test -n "$ac_tool_prefix"; then | ||
6413 | + # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args. | ||
6414 | +set dummy ${ac_tool_prefix}mt; ac_word=$2 | ||
6415 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
6416 | +$as_echo_n "checking for $ac_word... " >&6; } | ||
6417 | +if ${ac_cv_prog_MANIFEST_TOOL+:} false; then : | ||
6418 | + $as_echo_n "(cached) " >&6 | ||
6419 | +else | ||
6420 | + if test -n "$MANIFEST_TOOL"; then | ||
6421 | + ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test. | ||
6422 | +else | ||
6423 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | ||
6424 | +for as_dir in $PATH | ||
6425 | +do | ||
6426 | + IFS=$as_save_IFS | ||
6427 | + test -z "$as_dir" && as_dir=. | ||
6428 | + for ac_exec_ext in '' $ac_executable_extensions; do | ||
6429 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | ||
6430 | + ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" | ||
6431 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
6432 | + break 2 | ||
6433 | + fi | ||
6434 | +done | ||
6435 | + done | ||
6436 | +IFS=$as_save_IFS | ||
6437 | + | ||
6438 | +fi | ||
6439 | +fi | ||
6440 | +MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL | ||
6441 | +if test -n "$MANIFEST_TOOL"; then | ||
6442 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5 | ||
6443 | +$as_echo "$MANIFEST_TOOL" >&6; } | ||
6444 | +else | ||
6445 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
6446 | +$as_echo "no" >&6; } | ||
6447 | +fi | ||
6448 | + | ||
6449 | + | ||
6450 | +fi | ||
6451 | +if test -z "$ac_cv_prog_MANIFEST_TOOL"; then | ||
6452 | + ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL | ||
6453 | + # Extract the first word of "mt", so it can be a program name with args. | ||
6454 | +set dummy mt; ac_word=$2 | ||
6455 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
6456 | +$as_echo_n "checking for $ac_word... " >&6; } | ||
6457 | +if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then : | ||
6458 | + $as_echo_n "(cached) " >&6 | ||
6459 | +else | ||
6460 | + if test -n "$ac_ct_MANIFEST_TOOL"; then | ||
6461 | + ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test. | ||
6462 | +else | ||
6463 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | ||
6464 | +for as_dir in $PATH | ||
6465 | +do | ||
6466 | + IFS=$as_save_IFS | ||
6467 | + test -z "$as_dir" && as_dir=. | ||
6468 | + for ac_exec_ext in '' $ac_executable_extensions; do | ||
6469 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | ||
6470 | + ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" | ||
6471 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
6472 | + break 2 | ||
6473 | + fi | ||
6474 | +done | ||
6475 | + done | ||
6476 | +IFS=$as_save_IFS | ||
6477 | + | ||
6478 | +fi | ||
6479 | +fi | ||
6480 | +ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL | ||
6481 | +if test -n "$ac_ct_MANIFEST_TOOL"; then | ||
6482 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5 | ||
6483 | +$as_echo "$ac_ct_MANIFEST_TOOL" >&6; } | ||
6484 | +else | ||
6485 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
6486 | +$as_echo "no" >&6; } | ||
6487 | +fi | ||
6488 | + | ||
6489 | + if test "x$ac_ct_MANIFEST_TOOL" = x; then | ||
6490 | + MANIFEST_TOOL=":" | ||
6491 | + else | ||
6492 | + case $cross_compiling:$ac_tool_warned in | ||
6493 | +yes:) | ||
6494 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 | ||
6495 | +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} | ||
6496 | +ac_tool_warned=yes ;; | ||
6497 | +esac | ||
6498 | + MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL | ||
6499 | + fi | ||
6500 | +else | ||
6501 | + MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL" | ||
6502 | +fi | ||
6503 | + | ||
6504 | +test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt | ||
6505 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5 | ||
6506 | +$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; } | ||
6507 | +if ${lt_cv_path_mainfest_tool+:} false; then : | ||
6508 | + $as_echo_n "(cached) " >&6 | ||
6509 | +else | ||
6510 | + lt_cv_path_mainfest_tool=no | ||
6511 | + echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5 | ||
6512 | + $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out | ||
6513 | + cat conftest.err >&5 | ||
6514 | + if $GREP 'Manifest Tool' conftest.out > /dev/null; then | ||
6515 | + lt_cv_path_mainfest_tool=yes | ||
6516 | + fi | ||
6517 | + rm -f conftest* | ||
6518 | +fi | ||
6519 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5 | ||
6520 | +$as_echo "$lt_cv_path_mainfest_tool" >&6; } | ||
6521 | +if test "x$lt_cv_path_mainfest_tool" != xyes; then | ||
6522 | + MANIFEST_TOOL=: | ||
6523 | +fi | ||
6524 | + | ||
6525 | + | ||
6526 | + | ||
6527 | + | ||
6528 | + | ||
6529 | |||
6530 | case $host_os in | ||
6531 | rhapsody* | darwin*) | ||
6532 | @@ -7647,6 +8144,8 @@ _LT_EOF | ||
6533 | $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 | ||
6534 | echo "$AR cru libconftest.a conftest.o" >&5 | ||
6535 | $AR cru libconftest.a conftest.o 2>&5 | ||
6536 | + echo "$RANLIB libconftest.a" >&5 | ||
6537 | + $RANLIB libconftest.a 2>&5 | ||
6538 | cat > conftest.c << _LT_EOF | ||
6539 | int main() { return 0;} | ||
6540 | _LT_EOF | ||
6541 | @@ -7842,7 +8341,8 @@ fi | ||
6542 | LIBTOOL_DEPS="$ltmain" | ||
6543 | |||
6544 | # Always use our own libtool. | ||
6545 | -LIBTOOL='$(SHELL) $(top_builddir)/libtool' | ||
6546 | +LIBTOOL='$(SHELL) $(top_builddir)' | ||
6547 | +LIBTOOL="$LIBTOOL/${host_alias}-libtool" | ||
6548 | |||
6549 | |||
6550 | |||
6551 | @@ -7931,7 +8431,7 @@ aix3*) | ||
6552 | esac | ||
6553 | |||
6554 | # Global variables: | ||
6555 | -ofile=libtool | ||
6556 | +ofile=${host_alias}-libtool | ||
6557 | can_build_shared=yes | ||
6558 | |||
6559 | # All known linkers require a `.a' archive for static linking (except MSVC, | ||
6560 | @@ -8229,8 +8729,6 @@ fi | ||
6561 | lt_prog_compiler_pic= | ||
6562 | lt_prog_compiler_static= | ||
6563 | |||
6564 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 | ||
6565 | -$as_echo_n "checking for $compiler option to produce PIC... " >&6; } | ||
6566 | |||
6567 | if test "$GCC" = yes; then | ||
6568 | lt_prog_compiler_wl='-Wl,' | ||
6569 | @@ -8396,6 +8894,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } | ||
6570 | lt_prog_compiler_pic='--shared' | ||
6571 | lt_prog_compiler_static='--static' | ||
6572 | ;; | ||
6573 | + nagfor*) | ||
6574 | + # NAG Fortran compiler | ||
6575 | + lt_prog_compiler_wl='-Wl,-Wl,,' | ||
6576 | + lt_prog_compiler_pic='-PIC' | ||
6577 | + lt_prog_compiler_static='-Bstatic' | ||
6578 | + ;; | ||
6579 | pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) | ||
6580 | # Portland Group compilers (*not* the Pentium gcc compiler, | ||
6581 | # which looks to be a dead project) | ||
6582 | @@ -8458,7 +8962,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } | ||
6583 | lt_prog_compiler_pic='-KPIC' | ||
6584 | lt_prog_compiler_static='-Bstatic' | ||
6585 | case $cc_basename in | ||
6586 | - f77* | f90* | f95*) | ||
6587 | + f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) | ||
6588 | lt_prog_compiler_wl='-Qoption ld ';; | ||
6589 | *) | ||
6590 | lt_prog_compiler_wl='-Wl,';; | ||
6591 | @@ -8515,13 +9019,17 @@ case $host_os in | ||
6592 | lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" | ||
6593 | ;; | ||
6594 | esac | ||
6595 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5 | ||
6596 | -$as_echo "$lt_prog_compiler_pic" >&6; } | ||
6597 | - | ||
6598 | - | ||
6599 | - | ||
6600 | - | ||
6601 | |||
6602 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 | ||
6603 | +$as_echo_n "checking for $compiler option to produce PIC... " >&6; } | ||
6604 | +if ${lt_cv_prog_compiler_pic+:} false; then : | ||
6605 | + $as_echo_n "(cached) " >&6 | ||
6606 | +else | ||
6607 | + lt_cv_prog_compiler_pic=$lt_prog_compiler_pic | ||
6608 | +fi | ||
6609 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5 | ||
6610 | +$as_echo "$lt_cv_prog_compiler_pic" >&6; } | ||
6611 | +lt_prog_compiler_pic=$lt_cv_prog_compiler_pic | ||
6612 | |||
6613 | # | ||
6614 | # Check to make sure the PIC flag actually works. | ||
6615 | @@ -8582,6 +9090,11 @@ fi | ||
6616 | |||
6617 | |||
6618 | |||
6619 | + | ||
6620 | + | ||
6621 | + | ||
6622 | + | ||
6623 | + | ||
6624 | # | ||
6625 | # Check to make sure the static flag actually works. | ||
6626 | # | ||
6627 | @@ -8932,7 +9445,8 @@ _LT_EOF | ||
6628 | allow_undefined_flag=unsupported | ||
6629 | always_export_symbols=no | ||
6630 | enable_shared_with_static_runtimes=yes | ||
6631 | - export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' | ||
6632 | + 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' | ||
6633 | + exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' | ||
6634 | |||
6635 | 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' | ||
6637 | @@ -9031,12 +9545,12 @@ _LT_EOF | ||
6638 | whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' | ||
6639 | hardcode_libdir_flag_spec= | ||
6640 | hardcode_libdir_flag_spec_ld='-rpath $libdir' | ||
6641 | - archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' | ||
6642 | + archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' | ||
6643 | if test "x$supports_anon_versioning" = xyes; then | ||
6644 | archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ | ||
6645 | cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ | ||
6646 | echo "local: *; };" >> $output_objdir/$libname.ver~ | ||
6647 | - $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' | ||
6648 | + $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' | ||
6649 | fi | ||
6650 | ;; | ||
6651 | esac | ||
6652 | @@ -9050,8 +9564,8 @@ _LT_EOF | ||
6653 | archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' | ||
6654 | wlarc= | ||
6655 | else | ||
6656 | - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' | ||
6657 | - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' | ||
6658 | + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' | ||
6659 | + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' | ||
6660 | fi | ||
6661 | ;; | ||
6662 | |||
6663 | @@ -9069,8 +9583,8 @@ _LT_EOF | ||
6664 | |||
6665 | _LT_EOF | ||
6666 | elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then | ||
6667 | - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' | ||
6668 | - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' | ||
6669 | + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' | ||
6670 | + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' | ||
6671 | else | ||
6672 | ld_shlibs=no | ||
6673 | fi | ||
6674 | @@ -9116,8 +9630,8 @@ _LT_EOF | ||
6675 | |||
6676 | *) | ||
6677 | if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then | ||
6678 | - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' | ||
6679 | - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' | ||
6680 | + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' | ||
6681 | + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' | ||
6682 | else | ||
6683 | ld_shlibs=no | ||
6684 | fi | ||
6685 | @@ -9247,7 +9761,13 @@ _LT_EOF | ||
6686 | allow_undefined_flag='-berok' | ||
6687 | # Determine the default libpath from the value encoded in an | ||
6688 | # empty executable. | ||
6689 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
6690 | + if test "${lt_cv_aix_libpath+set}" = set; then | ||
6691 | + aix_libpath=$lt_cv_aix_libpath | ||
6692 | +else | ||
6693 | + if ${lt_cv_aix_libpath_+:} false; then : | ||
6694 | + $as_echo_n "(cached) " >&6 | ||
6695 | +else | ||
6696 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
6697 | /* end confdefs.h. */ | ||
6698 | |||
6699 | int | ||
6700 | @@ -9260,22 +9780,29 @@ main () | ||
6701 | _ACEOF | ||
6702 | if ac_fn_c_try_link "$LINENO"; then : | ||
6703 | |||
6704 | -lt_aix_libpath_sed=' | ||
6705 | - /Import File Strings/,/^$/ { | ||
6706 | - /^0/ { | ||
6707 | - s/^0 *\(.*\)$/\1/ | ||
6708 | - p | ||
6709 | - } | ||
6710 | - }' | ||
6711 | -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | ||
6712 | -# Check for a 64-bit object if we didn't find anything. | ||
6713 | -if test -z "$aix_libpath"; then | ||
6714 | - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | ||
6715 | -fi | ||
6716 | + lt_aix_libpath_sed=' | ||
6717 | + /Import File Strings/,/^$/ { | ||
6718 | + /^0/ { | ||
6719 | + s/^0 *\([^ ]*\) *$/\1/ | ||
6720 | + p | ||
6721 | + } | ||
6722 | + }' | ||
6723 | + lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | ||
6724 | + # Check for a 64-bit object if we didn't find anything. | ||
6725 | + if test -z "$lt_cv_aix_libpath_"; then | ||
6726 | + lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | ||
6727 | + fi | ||
6728 | fi | ||
6729 | rm -f core conftest.err conftest.$ac_objext \ | ||
6730 | conftest$ac_exeext conftest.$ac_ext | ||
6731 | -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | ||
6732 | + if test -z "$lt_cv_aix_libpath_"; then | ||
6733 | + lt_cv_aix_libpath_="/usr/lib:/lib" | ||
6734 | + fi | ||
6735 | + | ||
6736 | +fi | ||
6737 | + | ||
6738 | + aix_libpath=$lt_cv_aix_libpath_ | ||
6739 | +fi | ||
6740 | |||
6741 | 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" | ||
6743 | @@ -9287,7 +9814,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | ||
6744 | else | ||
6745 | # Determine the default libpath from the value encoded in an | ||
6746 | # empty executable. | ||
6747 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
6748 | + if test "${lt_cv_aix_libpath+set}" = set; then | ||
6749 | + aix_libpath=$lt_cv_aix_libpath | ||
6750 | +else | ||
6751 | + if ${lt_cv_aix_libpath_+:} false; then : | ||
6752 | + $as_echo_n "(cached) " >&6 | ||
6753 | +else | ||
6754 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
6755 | /* end confdefs.h. */ | ||
6756 | |||
6757 | int | ||
6758 | @@ -9300,22 +9833,29 @@ main () | ||
6759 | _ACEOF | ||
6760 | if ac_fn_c_try_link "$LINENO"; then : | ||
6761 | |||
6762 | -lt_aix_libpath_sed=' | ||
6763 | - /Import File Strings/,/^$/ { | ||
6764 | - /^0/ { | ||
6765 | - s/^0 *\(.*\)$/\1/ | ||
6766 | - p | ||
6767 | - } | ||
6768 | - }' | ||
6769 | -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | ||
6770 | -# Check for a 64-bit object if we didn't find anything. | ||
6771 | -if test -z "$aix_libpath"; then | ||
6772 | - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | ||
6773 | -fi | ||
6774 | + lt_aix_libpath_sed=' | ||
6775 | + /Import File Strings/,/^$/ { | ||
6776 | + /^0/ { | ||
6777 | + s/^0 *\([^ ]*\) *$/\1/ | ||
6778 | + p | ||
6779 | + } | ||
6780 | + }' | ||
6781 | + lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | ||
6782 | + # Check for a 64-bit object if we didn't find anything. | ||
6783 | + if test -z "$lt_cv_aix_libpath_"; then | ||
6784 | + lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | ||
6785 | + fi | ||
6786 | fi | ||
6787 | rm -f core conftest.err conftest.$ac_objext \ | ||
6788 | conftest$ac_exeext conftest.$ac_ext | ||
6789 | -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | ||
6790 | + if test -z "$lt_cv_aix_libpath_"; then | ||
6791 | + lt_cv_aix_libpath_="/usr/lib:/lib" | ||
6792 | + fi | ||
6793 | + | ||
6794 | +fi | ||
6795 | + | ||
6796 | + aix_libpath=$lt_cv_aix_libpath_ | ||
6797 | +fi | ||
6798 | |||
6799 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" | ||
6800 | # Warning - without using the other run time loading flags, | ||
6801 | @@ -9360,20 +9900,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | ||
6802 | # Microsoft Visual C++. | ||
6803 | # hardcode_libdir_flag_spec is actually meaningless, as there is | ||
6804 | # no search path for DLLs. | ||
6805 | - hardcode_libdir_flag_spec=' ' | ||
6806 | - allow_undefined_flag=unsupported | ||
6807 | - # Tell ltmain to make .lib files, not .a files. | ||
6808 | - libext=lib | ||
6809 | - # Tell ltmain to make .dll files, not .so files. | ||
6810 | - shrext_cmds=".dll" | ||
6811 | - # FIXME: Setting linknames here is a bad hack. | ||
6812 | - archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' | ||
6813 | - # The linker will automatically build a .lib file if we build a DLL. | ||
6814 | - old_archive_from_new_cmds='true' | ||
6815 | - # FIXME: Should let the user specify the lib program. | ||
6816 | - old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' | ||
6817 | - fix_srcfile_path='`cygpath -w "$srcfile"`' | ||
6818 | - enable_shared_with_static_runtimes=yes | ||
6819 | + case $cc_basename in | ||
6820 | + cl*) | ||
6821 | + # Native MSVC | ||
6822 | + hardcode_libdir_flag_spec=' ' | ||
6823 | + allow_undefined_flag=unsupported | ||
6824 | + always_export_symbols=yes | ||
6825 | + file_list_spec='@' | ||
6826 | + # Tell ltmain to make .lib files, not .a files. | ||
6827 | + libext=lib | ||
6828 | + # Tell ltmain to make .dll files, not .so files. | ||
6829 | + shrext_cmds=".dll" | ||
6830 | + # FIXME: Setting linknames here is a bad hack. | ||
6831 | + archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' | ||
6832 | + archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then | ||
6833 | + sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; | ||
6834 | + else | ||
6835 | + sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; | ||
6836 | + fi~ | ||
6837 | + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ | ||
6838 | + linknames=' | ||
6839 | + # The linker will not automatically build a static lib if we build a DLL. | ||
6840 | + # _LT_TAGVAR(old_archive_from_new_cmds, )='true' | ||
6841 | + enable_shared_with_static_runtimes=yes | ||
6842 | + export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' | ||
6843 | + # Don't use ranlib | ||
6844 | + old_postinstall_cmds='chmod 644 $oldlib' | ||
6845 | + postlink_cmds='lt_outputfile="@OUTPUT@"~ | ||
6846 | + lt_tool_outputfile="@TOOL_OUTPUT@"~ | ||
6847 | + case $lt_outputfile in | ||
6848 | + *.exe|*.EXE) ;; | ||
6849 | + *) | ||
6850 | + lt_outputfile="$lt_outputfile.exe" | ||
6851 | + lt_tool_outputfile="$lt_tool_outputfile.exe" | ||
6852 | + ;; | ||
6853 | + esac~ | ||
6854 | + if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then | ||
6855 | + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; | ||
6856 | + $RM "$lt_outputfile.manifest"; | ||
6857 | + fi' | ||
6858 | + ;; | ||
6859 | + *) | ||
6860 | + # Assume MSVC wrapper | ||
6861 | + hardcode_libdir_flag_spec=' ' | ||
6862 | + allow_undefined_flag=unsupported | ||
6863 | + # Tell ltmain to make .lib files, not .a files. | ||
6864 | + libext=lib | ||
6865 | + # Tell ltmain to make .dll files, not .so files. | ||
6866 | + shrext_cmds=".dll" | ||
6867 | + # FIXME: Setting linknames here is a bad hack. | ||
6868 | + archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' | ||
6869 | + # The linker will automatically build a .lib file if we build a DLL. | ||
6870 | + old_archive_from_new_cmds='true' | ||
6871 | + # FIXME: Should let the user specify the lib program. | ||
6872 | + old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' | ||
6873 | + enable_shared_with_static_runtimes=yes | ||
6874 | + ;; | ||
6875 | + esac | ||
6876 | ;; | ||
6877 | |||
6878 | darwin* | rhapsody*) | ||
6879 | @@ -9434,7 +10017,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | ||
6880 | |||
6881 | # FreeBSD 3 and greater uses gcc -shared to do shared libraries. | ||
6882 | freebsd* | dragonfly*) | ||
6883 | - archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' | ||
6884 | + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' | ||
6885 | hardcode_libdir_flag_spec='-R$libdir' | ||
6886 | hardcode_direct=yes | ||
6887 | hardcode_shlibpath_var=no | ||
6888 | @@ -9442,7 +10025,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | ||
6889 | |||
6890 | hpux9*) | ||
6891 | if test "$GCC" = yes; then | ||
6892 | - 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' | ||
6893 | + 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' | ||
6894 | 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' | ||
6896 | fi | ||
6897 | @@ -9458,7 +10041,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | ||
6898 | |||
6899 | hpux10*) | ||
6900 | if test "$GCC" = yes && test "$with_gnu_ld" = no; then | ||
6901 | - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' | ||
6902 | + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' | ||
6903 | else | ||
6904 | archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' | ||
6905 | fi | ||
6906 | @@ -9482,10 +10065,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' | ||
6908 | ;; | ||
6909 | ia64*) | ||
6910 | - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' | ||
6911 | + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' | ||
6912 | ;; | ||
6913 | *) | ||
6914 | - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' | ||
6915 | + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' | ||
6916 | ;; | ||
6917 | esac | ||
6918 | else | ||
6919 | @@ -9564,23 +10147,36 @@ fi | ||
6920 | |||
6921 | irix5* | irix6* | nonstopux*) | ||
6922 | if test "$GCC" = yes; then | ||
6923 | - 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' | ||
6924 | + 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' | ||
6925 | # Try to use the -exported_symbol ld option, if it does not | ||
6926 | # work, assume that -exports_file does not work either and | ||
6927 | # implicitly export all symbols. | ||
6928 | - save_LDFLAGS="$LDFLAGS" | ||
6929 | - LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" | ||
6930 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
6931 | + # This should be the same for all languages, so no per-tag cache variable. | ||
6932 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5 | ||
6933 | +$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; } | ||
6934 | +if ${lt_cv_irix_exported_symbol+:} false; then : | ||
6935 | + $as_echo_n "(cached) " >&6 | ||
6936 | +else | ||
6937 | + save_LDFLAGS="$LDFLAGS" | ||
6938 | + LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" | ||
6939 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
6940 | /* end confdefs.h. */ | ||
6941 | -int foo(void) {} | ||
6942 | +int foo (void) { return 0; } | ||
6943 | _ACEOF | ||
6944 | if ac_fn_c_try_link "$LINENO"; then : | ||
6945 | - 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' | ||
6946 | - | ||
6947 | + lt_cv_irix_exported_symbol=yes | ||
6948 | +else | ||
6949 | + lt_cv_irix_exported_symbol=no | ||
6950 | fi | ||
6951 | rm -f core conftest.err conftest.$ac_objext \ | ||
6952 | conftest$ac_exeext conftest.$ac_ext | ||
6953 | - LDFLAGS="$save_LDFLAGS" | ||
6954 | + LDFLAGS="$save_LDFLAGS" | ||
6955 | +fi | ||
6956 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5 | ||
6957 | +$as_echo "$lt_cv_irix_exported_symbol" >&6; } | ||
6958 | + if test "$lt_cv_irix_exported_symbol" = yes; then | ||
6959 | + 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' | ||
6960 | + fi | ||
6961 | 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' | ||
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' | ||
6964 | @@ -9665,7 +10261,7 @@ rm -f core conftest.err conftest.$ac_objext \ | ||
6965 | osf4* | osf5*) # as osf3* with the addition of -msym flag | ||
6966 | if test "$GCC" = yes; then | ||
6967 | allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' | ||
6968 | - 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' | ||
6969 | + 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' | ||
6970 | hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' | ||
6971 | else | ||
6972 | allow_undefined_flag=' -expect_unresolved \*' | ||
6973 | @@ -9684,9 +10280,9 @@ rm -f core conftest.err conftest.$ac_objext \ | ||
6974 | no_undefined_flag=' -z defs' | ||
6975 | if test "$GCC" = yes; then | ||
6976 | wlarc='${wl}' | ||
6977 | - archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' | ||
6978 | + archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' | ||
6979 | archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ | ||
6980 | - $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' | ||
6981 | + $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' | ||
6982 | else | ||
6983 | case `$CC -V 2>&1` in | ||
6984 | *"Compilers 5.0"*) | ||
6985 | @@ -10262,8 +10858,9 @@ cygwin* | mingw* | pw32* | cegcc*) | ||
6986 | need_version=no | ||
6987 | need_lib_prefix=no | ||
6988 | |||
6989 | - case $GCC,$host_os in | ||
6990 | - yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) | ||
6991 | + case $GCC,$cc_basename in | ||
6992 | + yes,*) | ||
6993 | + # gcc | ||
6994 | library_names_spec='$libname.dll.a' | ||
6995 | # DLL is installed to $(libdir)/../bin by postinstall_cmds | ||
6996 | postinstall_cmds='base_file=`basename \${file}`~ | ||
6997 | @@ -10296,13 +10893,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}' | ||
6999 | ;; | ||
7000 | esac | ||
7001 | + dynamic_linker='Win32 ld.exe' | ||
7002 | + ;; | ||
7003 | + | ||
7004 | + *,cl*) | ||
7005 | + # Native MSVC | ||
7006 | + libname_spec='$name' | ||
7007 | + soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' | ||
7008 | + library_names_spec='${libname}.dll.lib' | ||
7009 | + | ||
7010 | + case $build_os in | ||
7011 | + mingw*) | ||
7012 | + sys_lib_search_path_spec= | ||
7013 | + lt_save_ifs=$IFS | ||
7014 | + IFS=';' | ||
7015 | + for lt_path in $LIB | ||
7016 | + do | ||
7017 | + IFS=$lt_save_ifs | ||
7018 | + # Let DOS variable expansion print the short 8.3 style file name. | ||
7019 | + lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` | ||
7020 | + sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" | ||
7021 | + done | ||
7022 | + IFS=$lt_save_ifs | ||
7023 | + # Convert to MSYS style. | ||
7024 | + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` | ||
7025 | + ;; | ||
7026 | + cygwin*) | ||
7027 | + # Convert to unix form, then to dos form, then back to unix form | ||
7028 | + # but this time dos style (no spaces!) so that the unix form looks | ||
7029 | + # like /cygdrive/c/PROGRA~1:/cygdr... | ||
7030 | + sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` | ||
7031 | + sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` | ||
7032 | + sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` | ||
7033 | + ;; | ||
7034 | + *) | ||
7035 | + sys_lib_search_path_spec="$LIB" | ||
7036 | + if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then | ||
7037 | + # It is most probably a Windows format PATH. | ||
7038 | + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` | ||
7039 | + else | ||
7040 | + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` | ||
7041 | + fi | ||
7042 | + # FIXME: find the short name or the path components, as spaces are | ||
7043 | + # common. (e.g. "Program Files" -> "PROGRA~1") | ||
7044 | + ;; | ||
7045 | + esac | ||
7046 | + | ||
7047 | + # DLL is installed to $(libdir)/../bin by postinstall_cmds | ||
7048 | + postinstall_cmds='base_file=`basename \${file}`~ | ||
7049 | + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ | ||
7050 | + dldir=$destdir/`dirname \$dlpath`~ | ||
7051 | + test -d \$dldir || mkdir -p \$dldir~ | ||
7052 | + $install_prog $dir/$dlname \$dldir/$dlname' | ||
7053 | + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ | ||
7054 | + dlpath=$dir/\$dldll~ | ||
7055 | + $RM \$dlpath' | ||
7056 | + shlibpath_overrides_runpath=yes | ||
7057 | + dynamic_linker='Win32 link.exe' | ||
7058 | ;; | ||
7059 | |||
7060 | *) | ||
7061 | + # Assume MSVC wrapper | ||
7062 | library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' | ||
7063 | + dynamic_linker='Win32 ld.exe' | ||
7064 | ;; | ||
7065 | esac | ||
7066 | - dynamic_linker='Win32 ld.exe' | ||
7067 | # FIXME: first we should search . and the directory the executable is in | ||
7068 | shlibpath_var=PATH | ||
7069 | ;; | ||
7070 | @@ -10394,7 +11049,7 @@ haiku*) | ||
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 | @@ -11190,7 +11845,7 @@ else | ||
7080 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 | ||
7081 | lt_status=$lt_dlunknown | ||
7082 | cat > conftest.$ac_ext <<_LT_EOF | ||
7083 | -#line 11193 "configure" | ||
7084 | +#line $LINENO "configure" | ||
7085 | #include "confdefs.h" | ||
7086 | |||
7087 | #if HAVE_DLFCN_H | ||
7088 | @@ -11234,10 +11889,10 @@ else | ||
7089 | /* When -fvisbility=hidden is used, assume the code has been annotated | ||
7090 | correspondingly for the symbols needed. */ | ||
7091 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) | ||
7092 | -void fnord () __attribute__((visibility("default"))); | ||
7093 | +int fnord () __attribute__((visibility("default"))); | ||
7094 | #endif | ||
7095 | |||
7096 | -void fnord () { int i=42; } | ||
7097 | +int fnord () { return 42; } | ||
7098 | int main () | ||
7099 | { | ||
7100 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); | ||
7101 | @@ -11296,7 +11951,7 @@ else | ||
7102 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 | ||
7103 | lt_status=$lt_dlunknown | ||
7104 | cat > conftest.$ac_ext <<_LT_EOF | ||
7105 | -#line 11299 "configure" | ||
7106 | +#line $LINENO "configure" | ||
7107 | #include "confdefs.h" | ||
7108 | |||
7109 | #if HAVE_DLFCN_H | ||
7110 | @@ -11340,10 +11995,10 @@ else | ||
7111 | /* When -fvisbility=hidden is used, assume the code has been annotated | ||
7112 | correspondingly for the symbols needed. */ | ||
7113 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) | ||
7114 | -void fnord () __attribute__((visibility("default"))); | ||
7115 | +int fnord () __attribute__((visibility("default"))); | ||
7116 | #endif | ||
7117 | |||
7118 | -void fnord () { int i=42; } | ||
7119 | +int fnord () { return 42; } | ||
7120 | int main () | ||
7121 | { | ||
7122 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); | ||
7123 | @@ -13309,13 +13964,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' | ||
7124 | lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' | ||
7125 | lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' | ||
7126 | lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' | ||
7127 | +lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`' | ||
7128 | +lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`' | ||
7129 | reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`' | ||
7130 | reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`' | ||
7131 | OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`' | ||
7132 | deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`' | ||
7133 | file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`' | ||
7134 | +file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`' | ||
7135 | +want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`' | ||
7136 | +DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`' | ||
7137 | +sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`' | ||
7138 | AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`' | ||
7139 | AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`' | ||
7140 | +archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`' | ||
7141 | STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' | ||
7142 | RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' | ||
7143 | old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' | ||
7144 | @@ -13330,14 +13992,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"`' | ||
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"`' | ||
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"`' | ||
7148 | +nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`' | ||
7149 | +lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`' | ||
7150 | objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`' | ||
7151 | MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`' | ||
7152 | lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`' | ||
7153 | -lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' | ||
7154 | lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`' | ||
7155 | +lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' | ||
7156 | lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`' | ||
7157 | lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`' | ||
7158 | need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`' | ||
7159 | +MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`' | ||
7160 | DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' | ||
7161 | NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' | ||
7162 | LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' | ||
7163 | @@ -13370,12 +14035,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q | ||
7164 | hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' | ||
7165 | inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' | ||
7166 | link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' | ||
7167 | -fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`' | ||
7168 | always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`' | ||
7169 | export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`' | ||
7170 | exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`' | ||
7171 | include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`' | ||
7172 | prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`' | ||
7173 | +postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`' | ||
7174 | 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"`' | ||
7176 | need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' | ||
7177 | @@ -13430,8 +14095,13 @@ reload_flag \ | ||
7178 | OBJDUMP \ | ||
7179 | deplibs_check_method \ | ||
7180 | file_magic_cmd \ | ||
7181 | +file_magic_glob \ | ||
7182 | +want_nocaseglob \ | ||
7183 | +DLLTOOL \ | ||
7184 | +sharedlib_from_linklib_cmd \ | ||
7185 | AR \ | ||
7186 | AR_FLAGS \ | ||
7187 | +archiver_list_spec \ | ||
7188 | STRIP \ | ||
7189 | RANLIB \ | ||
7190 | CC \ | ||
7191 | @@ -13441,12 +14111,14 @@ lt_cv_sys_global_symbol_pipe \ | ||
7192 | lt_cv_sys_global_symbol_to_cdecl \ | ||
7193 | lt_cv_sys_global_symbol_to_c_name_address \ | ||
7194 | lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ | ||
7195 | +nm_file_list_spec \ | ||
7196 | lt_prog_compiler_no_builtin_flag \ | ||
7197 | -lt_prog_compiler_wl \ | ||
7198 | lt_prog_compiler_pic \ | ||
7199 | +lt_prog_compiler_wl \ | ||
7200 | lt_prog_compiler_static \ | ||
7201 | lt_cv_prog_compiler_c_o \ | ||
7202 | need_locks \ | ||
7203 | +MANIFEST_TOOL \ | ||
7204 | DSYMUTIL \ | ||
7205 | NMEDIT \ | ||
7206 | LIPO \ | ||
7207 | @@ -13462,7 +14134,6 @@ no_undefined_flag \ | ||
7208 | hardcode_libdir_flag_spec \ | ||
7209 | hardcode_libdir_flag_spec_ld \ | ||
7210 | hardcode_libdir_separator \ | ||
7211 | -fix_srcfile_path \ | ||
7212 | exclude_expsyms \ | ||
7213 | include_expsyms \ | ||
7214 | file_list_spec \ | ||
7215 | @@ -13498,6 +14169,7 @@ module_cmds \ | ||
7216 | module_expsym_cmds \ | ||
7217 | export_symbols_cmds \ | ||
7218 | prelink_cmds \ | ||
7219 | +postlink_cmds \ | ||
7220 | postinstall_cmds \ | ||
7221 | postuninstall_cmds \ | ||
7222 | finish_cmds \ | ||
7223 | @@ -14263,7 +14935,8 @@ $as_echo X"$file" | | ||
7224 | # NOTE: Changes made to this file will be lost: look at ltmain.sh. | ||
7225 | # | ||
7226 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, | ||
7227 | -# 2006, 2007, 2008, 2009 Free Software Foundation, Inc. | ||
7228 | +# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, | ||
7229 | +# Inc. | ||
7230 | # Written by Gordon Matzigkeit, 1996 | ||
7231 | # | ||
7232 | # This file is part of GNU Libtool. | ||
7233 | @@ -14366,19 +15039,42 @@ SP2NL=$lt_lt_SP2NL | ||
7234 | # turn newlines into spaces. | ||
7235 | NL2SP=$lt_lt_NL2SP | ||
7236 | |||
7237 | +# convert \$build file names to \$host format. | ||
7238 | +to_host_file_cmd=$lt_cv_to_host_file_cmd | ||
7239 | + | ||
7240 | +# convert \$build files to toolchain format. | ||
7241 | +to_tool_file_cmd=$lt_cv_to_tool_file_cmd | ||
7242 | + | ||
7243 | # An object symbol dumper. | ||
7244 | OBJDUMP=$lt_OBJDUMP | ||
7245 | |||
7246 | # Method to check whether dependent libraries are shared objects. | ||
7247 | deplibs_check_method=$lt_deplibs_check_method | ||
7248 | |||
7249 | -# Command to use when deplibs_check_method == "file_magic". | ||
7250 | +# Command to use when deplibs_check_method = "file_magic". | ||
7251 | file_magic_cmd=$lt_file_magic_cmd | ||
7252 | |||
7253 | +# How to find potential files when deplibs_check_method = "file_magic". | ||
7254 | +file_magic_glob=$lt_file_magic_glob | ||
7255 | + | ||
7256 | +# Find potential files using nocaseglob when deplibs_check_method = "file_magic". | ||
7257 | +want_nocaseglob=$lt_want_nocaseglob | ||
7258 | + | ||
7259 | +# DLL creation program. | ||
7260 | +DLLTOOL=$lt_DLLTOOL | ||
7261 | + | ||
7262 | +# Command to associate shared and link libraries. | ||
7263 | +sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd | ||
7264 | + | ||
7265 | # The archiver. | ||
7266 | AR=$lt_AR | ||
7267 | + | ||
7268 | +# Flags to create an archive. | ||
7269 | AR_FLAGS=$lt_AR_FLAGS | ||
7270 | |||
7271 | +# How to feed a file listing to the archiver. | ||
7272 | +archiver_list_spec=$lt_archiver_list_spec | ||
7273 | + | ||
7274 | # A symbol stripping program. | ||
7275 | STRIP=$lt_STRIP | ||
7276 | |||
7277 | @@ -14408,6 +15104,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. | ||
7279 | global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix | ||
7280 | |||
7281 | +# Specify filename containing input files for \$NM. | ||
7282 | +nm_file_list_spec=$lt_nm_file_list_spec | ||
7283 | + | ||
7284 | +# The root where to search for dependent libraries,and in which our libraries should be installed. | ||
7285 | +lt_sysroot=$lt_sysroot | ||
7286 | + | ||
7287 | # The name of the directory that contains temporary libtool files. | ||
7288 | objdir=$objdir | ||
7289 | |||
7290 | @@ -14417,6 +15119,9 @@ MAGIC_CMD=$MAGIC_CMD | ||
7291 | # Must we lock files when doing compilation? | ||
7292 | need_locks=$lt_need_locks | ||
7293 | |||
7294 | +# Manifest tool. | ||
7295 | +MANIFEST_TOOL=$lt_MANIFEST_TOOL | ||
7296 | + | ||
7297 | # Tool to manipulate archived DWARF debug symbol files on Mac OS X. | ||
7298 | DSYMUTIL=$lt_DSYMUTIL | ||
7299 | |||
7300 | @@ -14531,12 +15236,12 @@ with_gcc=$GCC | ||
7301 | # Compiler flag to turn off builtin functions. | ||
7302 | no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag | ||
7303 | |||
7304 | -# How to pass a linker flag through the compiler. | ||
7305 | -wl=$lt_lt_prog_compiler_wl | ||
7306 | - | ||
7307 | # Additional compiler flags for building library objects. | ||
7308 | pic_flag=$lt_lt_prog_compiler_pic | ||
7309 | |||
7310 | +# How to pass a linker flag through the compiler. | ||
7311 | +wl=$lt_lt_prog_compiler_wl | ||
7312 | + | ||
7313 | # Compiler flag to prevent dynamic linking. | ||
7314 | link_static_flag=$lt_lt_prog_compiler_static | ||
7315 | |||
7316 | @@ -14623,9 +15328,6 @@ inherit_rpath=$inherit_rpath | ||
7317 | # Whether libtool must link a program against all its dependency libraries. | ||
7318 | link_all_deplibs=$link_all_deplibs | ||
7319 | |||
7320 | -# Fix the shell variable \$srcfile for the compiler. | ||
7321 | -fix_srcfile_path=$lt_fix_srcfile_path | ||
7322 | - | ||
7323 | # Set to "yes" if exported symbols are required. | ||
7324 | always_export_symbols=$always_export_symbols | ||
7325 | |||
7326 | @@ -14641,6 +15343,9 @@ include_expsyms=$lt_include_expsyms | ||
7327 | # Commands necessary for linking programs (against libraries) with templates. | ||
7328 | prelink_cmds=$lt_prelink_cmds | ||
7329 | |||
7330 | +# Commands necessary for finishing linking programs. | ||
7331 | +postlink_cmds=$lt_postlink_cmds | ||
7332 | + | ||
7333 | # Specify filename containing input files. | ||
7334 | file_list_spec=$lt_file_list_spec | ||
7335 | |||
7336 | @@ -14673,210 +15378,169 @@ ltmain="$ac_aux_dir/ltmain.sh" | ||
7337 | # 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 | ||
7339 | # is reportedly fixed, but why not run on old versions too? | ||
7340 | - sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ | ||
7341 | - || (rm -f "$cfgfile"; exit 1) | ||
7342 | - | ||
7343 | - case $xsi_shell in | ||
7344 | - yes) | ||
7345 | - cat << \_LT_EOF >> "$cfgfile" | ||
7346 | - | ||
7347 | -# func_dirname file append nondir_replacement | ||
7348 | -# Compute the dirname of FILE. If nonempty, add APPEND to the result, | ||
7349 | -# otherwise set result to NONDIR_REPLACEMENT. | ||
7350 | -func_dirname () | ||
7351 | -{ | ||
7352 | - case ${1} in | ||
7353 | - */*) func_dirname_result="${1%/*}${2}" ;; | ||
7354 | - * ) func_dirname_result="${3}" ;; | ||
7355 | - esac | ||
7356 | -} | ||
7357 | - | ||
7358 | -# func_basename file | ||
7359 | -func_basename () | ||
7360 | -{ | ||
7361 | - func_basename_result="${1##*/}" | ||
7362 | -} | ||
7363 | - | ||
7364 | -# func_dirname_and_basename file append nondir_replacement | ||
7365 | -# perform func_basename and func_dirname in a single function | ||
7366 | -# call: | ||
7367 | -# dirname: Compute the dirname of FILE. If nonempty, | ||
7368 | -# add APPEND to the result, otherwise set result | ||
7369 | -# to NONDIR_REPLACEMENT. | ||
7370 | -# value returned in "$func_dirname_result" | ||
7371 | -# basename: Compute filename of FILE. | ||
7372 | -# value retuned in "$func_basename_result" | ||
7373 | -# Implementation must be kept synchronized with func_dirname | ||
7374 | -# and func_basename. For efficiency, we do not delegate to | ||
7375 | -# those functions but instead duplicate the functionality here. | ||
7376 | -func_dirname_and_basename () | ||
7377 | -{ | ||
7378 | - case ${1} in | ||
7379 | - */*) func_dirname_result="${1%/*}${2}" ;; | ||
7380 | - * ) func_dirname_result="${3}" ;; | ||
7381 | - esac | ||
7382 | - func_basename_result="${1##*/}" | ||
7383 | -} | ||
7384 | - | ||
7385 | -# func_stripname prefix suffix name | ||
7386 | -# strip PREFIX and SUFFIX off of NAME. | ||
7387 | -# PREFIX and SUFFIX must not contain globbing or regex special | ||
7388 | -# characters, hashes, percent signs, but SUFFIX may contain a leading | ||
7389 | -# dot (in which case that matches only a dot). | ||
7390 | -func_stripname () | ||
7391 | -{ | ||
7392 | - # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are | ||
7393 | - # positional parameters, so assign one to ordinary parameter first. | ||
7394 | - func_stripname_result=${3} | ||
7395 | - func_stripname_result=${func_stripname_result#"${1}"} | ||
7396 | - func_stripname_result=${func_stripname_result%"${2}"} | ||
7397 | -} | ||
7398 | - | ||
7399 | -# func_opt_split | ||
7400 | -func_opt_split () | ||
7401 | -{ | ||
7402 | - func_opt_split_opt=${1%%=*} | ||
7403 | - func_opt_split_arg=${1#*=} | ||
7404 | -} | ||
7405 | - | ||
7406 | -# func_lo2o object | ||
7407 | -func_lo2o () | ||
7408 | -{ | ||
7409 | - case ${1} in | ||
7410 | - *.lo) func_lo2o_result=${1%.lo}.${objext} ;; | ||
7411 | - *) func_lo2o_result=${1} ;; | ||
7412 | - esac | ||
7413 | -} | ||
7414 | - | ||
7415 | -# func_xform libobj-or-source | ||
7416 | -func_xform () | ||
7417 | -{ | ||
7418 | - func_xform_result=${1%.*}.lo | ||
7419 | -} | ||
7420 | - | ||
7421 | -# func_arith arithmetic-term... | ||
7422 | -func_arith () | ||
7423 | -{ | ||
7424 | - func_arith_result=$(( $* )) | ||
7425 | -} | ||
7426 | - | ||
7427 | -# func_len string | ||
7428 | -# STRING may not start with a hyphen. | ||
7429 | -func_len () | ||
7430 | -{ | ||
7431 | - func_len_result=${#1} | ||
7432 | -} | ||
7433 | - | ||
7434 | -_LT_EOF | ||
7435 | - ;; | ||
7436 | - *) # Bourne compatible functions. | ||
7437 | - cat << \_LT_EOF >> "$cfgfile" | ||
7438 | - | ||
7439 | -# func_dirname file append nondir_replacement | ||
7440 | -# Compute the dirname of FILE. If nonempty, add APPEND to the result, | ||
7441 | -# otherwise set result to NONDIR_REPLACEMENT. | ||
7442 | -func_dirname () | ||
7443 | -{ | ||
7444 | - # Extract subdirectory from the argument. | ||
7445 | - func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` | ||
7446 | - if test "X$func_dirname_result" = "X${1}"; then | ||
7447 | - func_dirname_result="${3}" | ||
7448 | - else | ||
7449 | - func_dirname_result="$func_dirname_result${2}" | ||
7450 | - fi | ||
7451 | -} | ||
7452 | - | ||
7453 | -# func_basename file | ||
7454 | -func_basename () | ||
7455 | -{ | ||
7456 | - func_basename_result=`$ECHO "${1}" | $SED "$basename"` | ||
7457 | -} | ||
7458 | - | ||
7459 | - | ||
7460 | -# func_stripname prefix suffix name | ||
7461 | -# strip PREFIX and SUFFIX off of NAME. | ||
7462 | -# PREFIX and SUFFIX must not contain globbing or regex special | ||
7463 | -# characters, hashes, percent signs, but SUFFIX may contain a leading | ||
7464 | -# dot (in which case that matches only a dot). | ||
7465 | -# func_strip_suffix prefix name | ||
7466 | -func_stripname () | ||
7467 | -{ | ||
7468 | - case ${2} in | ||
7469 | - .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; | ||
7470 | - *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; | ||
7471 | - esac | ||
7472 | -} | ||
7473 | - | ||
7474 | -# sed scripts: | ||
7475 | -my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q' | ||
7476 | -my_sed_long_arg='1s/^-[^=]*=//' | ||
7477 | - | ||
7478 | -# func_opt_split | ||
7479 | -func_opt_split () | ||
7480 | -{ | ||
7481 | - func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"` | ||
7482 | - func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"` | ||
7483 | -} | ||
7484 | - | ||
7485 | -# func_lo2o object | ||
7486 | -func_lo2o () | ||
7487 | -{ | ||
7488 | - func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` | ||
7489 | -} | ||
7490 | - | ||
7491 | -# func_xform libobj-or-source | ||
7492 | -func_xform () | ||
7493 | -{ | ||
7494 | - func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'` | ||
7495 | -} | ||
7496 | - | ||
7497 | -# func_arith arithmetic-term... | ||
7498 | -func_arith () | ||
7499 | -{ | ||
7500 | - func_arith_result=`expr "$@"` | ||
7501 | -} | ||
7502 | - | ||
7503 | -# func_len string | ||
7504 | -# STRING may not start with a hyphen. | ||
7505 | -func_len () | ||
7506 | -{ | ||
7507 | - func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len` | ||
7508 | -} | ||
7509 | - | ||
7510 | -_LT_EOF | ||
7511 | -esac | ||
7512 | - | ||
7513 | -case $lt_shell_append in | ||
7514 | - yes) | ||
7515 | - cat << \_LT_EOF >> "$cfgfile" | ||
7516 | - | ||
7517 | -# func_append var value | ||
7518 | -# Append VALUE to the end of shell variable VAR. | ||
7519 | -func_append () | ||
7520 | -{ | ||
7521 | - eval "$1+=\$2" | ||
7522 | -} | ||
7523 | -_LT_EOF | ||
7524 | - ;; | ||
7525 | - *) | ||
7526 | - cat << \_LT_EOF >> "$cfgfile" | ||
7527 | - | ||
7528 | -# func_append var value | ||
7529 | -# Append VALUE to the end of shell variable VAR. | ||
7530 | -func_append () | ||
7531 | -{ | ||
7532 | - eval "$1=\$$1\$2" | ||
7533 | -} | ||
7534 | - | ||
7535 | -_LT_EOF | ||
7536 | - ;; | ||
7537 | - esac | ||
7538 | - | ||
7539 | - | ||
7540 | - sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ | ||
7541 | - || (rm -f "$cfgfile"; exit 1) | ||
7542 | - | ||
7543 | - mv -f "$cfgfile" "$ofile" || | ||
7544 | + sed '$q' "$ltmain" >> "$cfgfile" \ | ||
7545 | + || (rm -f "$cfgfile"; exit 1) | ||
7546 | + | ||
7547 | + if test x"$xsi_shell" = xyes; then | ||
7548 | + sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ | ||
7549 | +func_dirname ()\ | ||
7550 | +{\ | ||
7551 | +\ case ${1} in\ | ||
7552 | +\ */*) func_dirname_result="${1%/*}${2}" ;;\ | ||
7553 | +\ * ) func_dirname_result="${3}" ;;\ | ||
7554 | +\ esac\ | ||
7555 | +} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \ | ||
7556 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
7557 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
7558 | +test 0 -eq $? || _lt_function_replace_fail=: | ||
7559 | + | ||
7560 | + | ||
7561 | + sed -e '/^func_basename ()$/,/^} # func_basename /c\ | ||
7562 | +func_basename ()\ | ||
7563 | +{\ | ||
7564 | +\ func_basename_result="${1##*/}"\ | ||
7565 | +} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \ | ||
7566 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
7567 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
7568 | +test 0 -eq $? || _lt_function_replace_fail=: | ||
7569 | + | ||
7570 | + | ||
7571 | + sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\ | ||
7572 | +func_dirname_and_basename ()\ | ||
7573 | +{\ | ||
7574 | +\ case ${1} in\ | ||
7575 | +\ */*) func_dirname_result="${1%/*}${2}" ;;\ | ||
7576 | +\ * ) func_dirname_result="${3}" ;;\ | ||
7577 | +\ esac\ | ||
7578 | +\ func_basename_result="${1##*/}"\ | ||
7579 | +} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \ | ||
7580 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
7581 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
7582 | +test 0 -eq $? || _lt_function_replace_fail=: | ||
7583 | + | ||
7584 | + | ||
7585 | + sed -e '/^func_stripname ()$/,/^} # func_stripname /c\ | ||
7586 | +func_stripname ()\ | ||
7587 | +{\ | ||
7588 | +\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\ | ||
7589 | +\ # positional parameters, so assign one to ordinary parameter first.\ | ||
7590 | +\ func_stripname_result=${3}\ | ||
7591 | +\ func_stripname_result=${func_stripname_result#"${1}"}\ | ||
7592 | +\ func_stripname_result=${func_stripname_result%"${2}"}\ | ||
7593 | +} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \ | ||
7594 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
7595 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
7596 | +test 0 -eq $? || _lt_function_replace_fail=: | ||
7597 | + | ||
7598 | + | ||
7599 | + sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\ | ||
7600 | +func_split_long_opt ()\ | ||
7601 | +{\ | ||
7602 | +\ func_split_long_opt_name=${1%%=*}\ | ||
7603 | +\ func_split_long_opt_arg=${1#*=}\ | ||
7604 | +} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \ | ||
7605 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
7606 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
7607 | +test 0 -eq $? || _lt_function_replace_fail=: | ||
7608 | + | ||
7609 | + | ||
7610 | + sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\ | ||
7611 | +func_split_short_opt ()\ | ||
7612 | +{\ | ||
7613 | +\ func_split_short_opt_arg=${1#??}\ | ||
7614 | +\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\ | ||
7615 | +} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \ | ||
7616 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
7617 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
7618 | +test 0 -eq $? || _lt_function_replace_fail=: | ||
7619 | + | ||
7620 | + | ||
7621 | + sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\ | ||
7622 | +func_lo2o ()\ | ||
7623 | +{\ | ||
7624 | +\ case ${1} in\ | ||
7625 | +\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\ | ||
7626 | +\ *) func_lo2o_result=${1} ;;\ | ||
7627 | +\ esac\ | ||
7628 | +} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \ | ||
7629 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
7630 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
7631 | +test 0 -eq $? || _lt_function_replace_fail=: | ||
7632 | + | ||
7633 | + | ||
7634 | + sed -e '/^func_xform ()$/,/^} # func_xform /c\ | ||
7635 | +func_xform ()\ | ||
7636 | +{\ | ||
7637 | + func_xform_result=${1%.*}.lo\ | ||
7638 | +} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \ | ||
7639 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
7640 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
7641 | +test 0 -eq $? || _lt_function_replace_fail=: | ||
7642 | + | ||
7643 | + | ||
7644 | + sed -e '/^func_arith ()$/,/^} # func_arith /c\ | ||
7645 | +func_arith ()\ | ||
7646 | +{\ | ||
7647 | + func_arith_result=$(( $* ))\ | ||
7648 | +} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \ | ||
7649 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
7650 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
7651 | +test 0 -eq $? || _lt_function_replace_fail=: | ||
7652 | + | ||
7653 | + | ||
7654 | + sed -e '/^func_len ()$/,/^} # func_len /c\ | ||
7655 | +func_len ()\ | ||
7656 | +{\ | ||
7657 | + func_len_result=${#1}\ | ||
7658 | +} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \ | ||
7659 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
7660 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
7661 | +test 0 -eq $? || _lt_function_replace_fail=: | ||
7662 | + | ||
7663 | +fi | ||
7664 | + | ||
7665 | +if test x"$lt_shell_append" = xyes; then | ||
7666 | + sed -e '/^func_append ()$/,/^} # func_append /c\ | ||
7667 | +func_append ()\ | ||
7668 | +{\ | ||
7669 | + eval "${1}+=\\${2}"\ | ||
7670 | +} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \ | ||
7671 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
7672 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
7673 | +test 0 -eq $? || _lt_function_replace_fail=: | ||
7674 | + | ||
7675 | + | ||
7676 | + sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\ | ||
7677 | +func_append_quoted ()\ | ||
7678 | +{\ | ||
7679 | +\ func_quote_for_eval "${2}"\ | ||
7680 | +\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\ | ||
7681 | +} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \ | ||
7682 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
7683 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
7684 | +test 0 -eq $? || _lt_function_replace_fail=: | ||
7685 | + | ||
7686 | + | ||
7687 | + # Save a `func_append' function call where possible by direct use of '+=' | ||
7688 | + sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ | ||
7689 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
7690 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
7691 | + test 0 -eq $? || _lt_function_replace_fail=: | ||
7692 | +else | ||
7693 | + # Save a `func_append' function call even when '+=' is not available | ||
7694 | + sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ | ||
7695 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
7696 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
7697 | + test 0 -eq $? || _lt_function_replace_fail=: | ||
7698 | +fi | ||
7699 | + | ||
7700 | +if test x"$_lt_function_replace_fail" = x":"; then | ||
7701 | + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 | ||
7702 | +$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} | ||
7703 | +fi | ||
7704 | + | ||
7705 | + | ||
7706 | + mv -f "$cfgfile" "$ofile" || | ||
7707 | (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") | ||
7708 | chmod +x "$ofile" | ||
7709 | |||
7710 | diff --git a/ld/configure b/ld/configure | ||
7711 | index 1c872c0db5f..fe938e6c99f 100755 | ||
7712 | --- a/ld/configure | ||
7713 | +++ b/ld/configure | ||
7714 | @@ -691,8 +691,11 @@ OTOOL | ||
7715 | LIPO | ||
7716 | NMEDIT | ||
7717 | DSYMUTIL | ||
7718 | +MANIFEST_TOOL | ||
7719 | RANLIB | ||
7720 | +ac_ct_AR | ||
7721 | AR | ||
7722 | +DLLTOOL | ||
7723 | OBJDUMP | ||
7724 | LN_S | ||
7725 | NM | ||
7726 | @@ -819,6 +822,7 @@ enable_static | ||
7727 | with_pic | ||
7728 | enable_fast_install | ||
7729 | with_gnu_ld | ||
7730 | +with_libtool_sysroot | ||
7731 | enable_libtool_lock | ||
7732 | enable_plugins | ||
7733 | enable_largefile | ||
7734 | @@ -1520,6 +1524,8 @@ Optional Packages: | ||
7735 | --with-pic try to use only PIC/non-PIC objects [default=use | ||
7736 | both] | ||
7737 | --with-gnu-ld assume the C compiler uses GNU ld [default=no] | ||
7738 | + --with-libtool-sysroot=DIR Search for dependent libraries within DIR | ||
7739 | + (or the compiler's sysroot if not specified). | ||
7740 | --with-lib-path=dir1:dir2... set default LIB_PATH | ||
7741 | --with-sysroot=DIR Search for usr/lib et al within DIR. | ||
7742 | --with-system-zlib use installed libz | ||
7743 | @@ -5973,8 +5979,8 @@ esac | ||
7744 | |||
7745 | |||
7746 | |||
7747 | -macro_version='2.2.7a' | ||
7748 | -macro_revision='1.3134' | ||
7749 | +macro_version='2.4' | ||
7750 | +macro_revision='1.3293' | ||
7751 | |||
7752 | |||
7753 | |||
7754 | @@ -6014,7 +6020,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO | ||
7755 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 | ||
7756 | $as_echo_n "checking how to print strings... " >&6; } | ||
7757 | # Test print first, because it will be a builtin if present. | ||
7758 | -if test "X`print -r -- -n 2>/dev/null`" = X-n && \ | ||
7759 | +if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ | ||
7760 | test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then | ||
7761 | ECHO='print -r --' | ||
7762 | elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then | ||
7763 | @@ -6700,8 +6706,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; | ||
7764 | # Try some XSI features | ||
7765 | xsi_shell=no | ||
7766 | ( _lt_dummy="a/b/c" | ||
7767 | - test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ | ||
7768 | - = c,a/b,, \ | ||
7769 | + test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ | ||
7770 | + = c,a/b,b/c, \ | ||
7771 | && eval 'test $(( 1 + 1 )) -eq 2 \ | ||
7772 | && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ | ||
7773 | && xsi_shell=yes | ||
7774 | @@ -6750,6 +6756,80 @@ esac | ||
7775 | |||
7776 | |||
7777 | |||
7778 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5 | ||
7779 | +$as_echo_n "checking how to convert $build file names to $host format... " >&6; } | ||
7780 | +if ${lt_cv_to_host_file_cmd+:} false; then : | ||
7781 | + $as_echo_n "(cached) " >&6 | ||
7782 | +else | ||
7783 | + case $host in | ||
7784 | + *-*-mingw* ) | ||
7785 | + case $build in | ||
7786 | + *-*-mingw* ) # actually msys | ||
7787 | + lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 | ||
7788 | + ;; | ||
7789 | + *-*-cygwin* ) | ||
7790 | + lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 | ||
7791 | + ;; | ||
7792 | + * ) # otherwise, assume *nix | ||
7793 | + lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 | ||
7794 | + ;; | ||
7795 | + esac | ||
7796 | + ;; | ||
7797 | + *-*-cygwin* ) | ||
7798 | + case $build in | ||
7799 | + *-*-mingw* ) # actually msys | ||
7800 | + lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin | ||
7801 | + ;; | ||
7802 | + *-*-cygwin* ) | ||
7803 | + lt_cv_to_host_file_cmd=func_convert_file_noop | ||
7804 | + ;; | ||
7805 | + * ) # otherwise, assume *nix | ||
7806 | + lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin | ||
7807 | + ;; | ||
7808 | + esac | ||
7809 | + ;; | ||
7810 | + * ) # unhandled hosts (and "normal" native builds) | ||
7811 | + lt_cv_to_host_file_cmd=func_convert_file_noop | ||
7812 | + ;; | ||
7813 | +esac | ||
7814 | + | ||
7815 | +fi | ||
7816 | + | ||
7817 | +to_host_file_cmd=$lt_cv_to_host_file_cmd | ||
7818 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5 | ||
7819 | +$as_echo "$lt_cv_to_host_file_cmd" >&6; } | ||
7820 | + | ||
7821 | + | ||
7822 | + | ||
7823 | + | ||
7824 | + | ||
7825 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5 | ||
7826 | +$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; } | ||
7827 | +if ${lt_cv_to_tool_file_cmd+:} false; then : | ||
7828 | + $as_echo_n "(cached) " >&6 | ||
7829 | +else | ||
7830 | + #assume ordinary cross tools, or native build. | ||
7831 | +lt_cv_to_tool_file_cmd=func_convert_file_noop | ||
7832 | +case $host in | ||
7833 | + *-*-mingw* ) | ||
7834 | + case $build in | ||
7835 | + *-*-mingw* ) # actually msys | ||
7836 | + lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 | ||
7837 | + ;; | ||
7838 | + esac | ||
7839 | + ;; | ||
7840 | +esac | ||
7841 | + | ||
7842 | +fi | ||
7843 | + | ||
7844 | +to_tool_file_cmd=$lt_cv_to_tool_file_cmd | ||
7845 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5 | ||
7846 | +$as_echo "$lt_cv_to_tool_file_cmd" >&6; } | ||
7847 | + | ||
7848 | + | ||
7849 | + | ||
7850 | + | ||
7851 | + | ||
7852 | { $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; } | ||
7854 | if ${lt_cv_ld_reload_flag+:} false; then : | ||
7855 | @@ -6766,6 +6846,11 @@ case $reload_flag in | ||
7856 | esac | ||
7857 | reload_cmds='$LD$reload_flag -o $output$reload_objs' | ||
7858 | case $host_os in | ||
7859 | + cygwin* | mingw* | pw32* | cegcc*) | ||
7860 | + if test "$GCC" != yes; then | ||
7861 | + reload_cmds=false | ||
7862 | + fi | ||
7863 | + ;; | ||
7864 | darwin*) | ||
7865 | if test "$GCC" = yes; then | ||
7866 | reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' | ||
7867 | @@ -6934,7 +7019,8 @@ mingw* | pw32*) | ||
7868 | lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' | ||
7869 | lt_cv_file_magic_cmd='func_win32_libid' | ||
7870 | else | ||
7871 | - lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' | ||
7872 | + # Keep this pattern in sync with the one in func_win32_libid. | ||
7873 | + lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' | ||
7874 | lt_cv_file_magic_cmd='$OBJDUMP -f' | ||
7875 | fi | ||
7876 | ;; | ||
7877 | @@ -7088,6 +7174,21 @@ esac | ||
7878 | fi | ||
7879 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 | ||
7880 | $as_echo "$lt_cv_deplibs_check_method" >&6; } | ||
7881 | + | ||
7882 | +file_magic_glob= | ||
7883 | +want_nocaseglob=no | ||
7884 | +if test "$build" = "$host"; then | ||
7885 | + case $host_os in | ||
7886 | + mingw* | pw32*) | ||
7887 | + if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then | ||
7888 | + want_nocaseglob=yes | ||
7889 | + else | ||
7890 | + file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"` | ||
7891 | + fi | ||
7892 | + ;; | ||
7893 | + esac | ||
7894 | +fi | ||
7895 | + | ||
7896 | file_magic_cmd=$lt_cv_file_magic_cmd | ||
7897 | deplibs_check_method=$lt_cv_deplibs_check_method | ||
7898 | test -z "$deplibs_check_method" && deplibs_check_method=unknown | ||
7899 | @@ -7103,9 +7204,162 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown | ||
7900 | |||
7901 | |||
7902 | |||
7903 | + | ||
7904 | + | ||
7905 | + | ||
7906 | + | ||
7907 | + | ||
7908 | + | ||
7909 | + | ||
7910 | + | ||
7911 | + | ||
7912 | + | ||
7913 | +if test -n "$ac_tool_prefix"; then | ||
7914 | + # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. | ||
7915 | +set dummy ${ac_tool_prefix}dlltool; ac_word=$2 | ||
7916 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
7917 | +$as_echo_n "checking for $ac_word... " >&6; } | ||
7918 | +if ${ac_cv_prog_DLLTOOL+:} false; then : | ||
7919 | + $as_echo_n "(cached) " >&6 | ||
7920 | +else | ||
7921 | + if test -n "$DLLTOOL"; then | ||
7922 | + ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. | ||
7923 | +else | ||
7924 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | ||
7925 | +for as_dir in $PATH | ||
7926 | +do | ||
7927 | + IFS=$as_save_IFS | ||
7928 | + test -z "$as_dir" && as_dir=. | ||
7929 | + for ac_exec_ext in '' $ac_executable_extensions; do | ||
7930 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | ||
7931 | + ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" | ||
7932 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
7933 | + break 2 | ||
7934 | + fi | ||
7935 | +done | ||
7936 | + done | ||
7937 | +IFS=$as_save_IFS | ||
7938 | + | ||
7939 | +fi | ||
7940 | +fi | ||
7941 | +DLLTOOL=$ac_cv_prog_DLLTOOL | ||
7942 | +if test -n "$DLLTOOL"; then | ||
7943 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 | ||
7944 | +$as_echo "$DLLTOOL" >&6; } | ||
7945 | +else | ||
7946 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
7947 | +$as_echo "no" >&6; } | ||
7948 | +fi | ||
7949 | + | ||
7950 | + | ||
7951 | +fi | ||
7952 | +if test -z "$ac_cv_prog_DLLTOOL"; then | ||
7953 | + ac_ct_DLLTOOL=$DLLTOOL | ||
7954 | + # Extract the first word of "dlltool", so it can be a program name with args. | ||
7955 | +set dummy dlltool; ac_word=$2 | ||
7956 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
7957 | +$as_echo_n "checking for $ac_word... " >&6; } | ||
7958 | +if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then : | ||
7959 | + $as_echo_n "(cached) " >&6 | ||
7960 | +else | ||
7961 | + if test -n "$ac_ct_DLLTOOL"; then | ||
7962 | + ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. | ||
7963 | +else | ||
7964 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | ||
7965 | +for as_dir in $PATH | ||
7966 | +do | ||
7967 | + IFS=$as_save_IFS | ||
7968 | + test -z "$as_dir" && as_dir=. | ||
7969 | + for ac_exec_ext in '' $ac_executable_extensions; do | ||
7970 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | ||
7971 | + ac_cv_prog_ac_ct_DLLTOOL="dlltool" | ||
7972 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
7973 | + break 2 | ||
7974 | + fi | ||
7975 | +done | ||
7976 | + done | ||
7977 | +IFS=$as_save_IFS | ||
7978 | + | ||
7979 | +fi | ||
7980 | +fi | ||
7981 | +ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL | ||
7982 | +if test -n "$ac_ct_DLLTOOL"; then | ||
7983 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 | ||
7984 | +$as_echo "$ac_ct_DLLTOOL" >&6; } | ||
7985 | +else | ||
7986 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
7987 | +$as_echo "no" >&6; } | ||
7988 | +fi | ||
7989 | + | ||
7990 | + if test "x$ac_ct_DLLTOOL" = x; then | ||
7991 | + DLLTOOL="false" | ||
7992 | + else | ||
7993 | + case $cross_compiling:$ac_tool_warned in | ||
7994 | +yes:) | ||
7995 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 | ||
7996 | +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} | ||
7997 | +ac_tool_warned=yes ;; | ||
7998 | +esac | ||
7999 | + DLLTOOL=$ac_ct_DLLTOOL | ||
8000 | + fi | ||
8001 | +else | ||
8002 | + DLLTOOL="$ac_cv_prog_DLLTOOL" | ||
8003 | +fi | ||
8004 | + | ||
8005 | +test -z "$DLLTOOL" && DLLTOOL=dlltool | ||
8006 | + | ||
8007 | + | ||
8008 | + | ||
8009 | + | ||
8010 | + | ||
8011 | + | ||
8012 | + | ||
8013 | + | ||
8014 | + | ||
8015 | + | ||
8016 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5 | ||
8017 | +$as_echo_n "checking how to associate runtime and link libraries... " >&6; } | ||
8018 | +if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then : | ||
8019 | + $as_echo_n "(cached) " >&6 | ||
8020 | +else | ||
8021 | + lt_cv_sharedlib_from_linklib_cmd='unknown' | ||
8022 | + | ||
8023 | +case $host_os in | ||
8024 | +cygwin* | mingw* | pw32* | cegcc*) | ||
8025 | + # two different shell functions defined in ltmain.sh | ||
8026 | + # decide which to use based on capabilities of $DLLTOOL | ||
8027 | + case `$DLLTOOL --help 2>&1` in | ||
8028 | + *--identify-strict*) | ||
8029 | + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib | ||
8030 | + ;; | ||
8031 | + *) | ||
8032 | + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback | ||
8033 | + ;; | ||
8034 | + esac | ||
8035 | + ;; | ||
8036 | +*) | ||
8037 | + # fallback: assume linklib IS sharedlib | ||
8038 | + lt_cv_sharedlib_from_linklib_cmd="$ECHO" | ||
8039 | + ;; | ||
8040 | +esac | ||
8041 | + | ||
8042 | +fi | ||
8043 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5 | ||
8044 | +$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; } | ||
8045 | +sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd | ||
8046 | +test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO | ||
8047 | + | ||
8048 | + | ||
8049 | + | ||
8050 | + | ||
8051 | + | ||
8052 | + | ||
8053 | + | ||
8054 | 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. | ||
8056 | -set dummy ${ac_tool_prefix}ar; ac_word=$2 | ||
8057 | + for ac_prog in ar | ||
8058 | + do | ||
8059 | + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. | ||
8060 | +set dummy $ac_tool_prefix$ac_prog; ac_word=$2 | ||
8061 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
8062 | $as_echo_n "checking for $ac_word... " >&6; } | ||
8063 | if ${ac_cv_prog_AR+:} false; then : | ||
8064 | @@ -7121,7 +7375,7 @@ do | ||
8065 | test -z "$as_dir" && as_dir=. | ||
8066 | for ac_exec_ext in '' $ac_executable_extensions; do | ||
8067 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | ||
8068 | - ac_cv_prog_AR="${ac_tool_prefix}ar" | ||
8069 | + ac_cv_prog_AR="$ac_tool_prefix$ac_prog" | ||
8070 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
8071 | break 2 | ||
8072 | fi | ||
8073 | @@ -7141,11 +7395,15 @@ $as_echo "no" >&6; } | ||
8074 | fi | ||
8075 | |||
8076 | |||
8077 | + test -n "$AR" && break | ||
8078 | + done | ||
8079 | fi | ||
8080 | -if test -z "$ac_cv_prog_AR"; then | ||
8081 | +if test -z "$AR"; then | ||
8082 | ac_ct_AR=$AR | ||
8083 | - # Extract the first word of "ar", so it can be a program name with args. | ||
8084 | -set dummy ar; ac_word=$2 | ||
8085 | + for ac_prog in ar | ||
8086 | +do | ||
8087 | + # Extract the first word of "$ac_prog", so it can be a program name with args. | ||
8088 | +set dummy $ac_prog; ac_word=$2 | ||
8089 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
8090 | $as_echo_n "checking for $ac_word... " >&6; } | ||
8091 | if ${ac_cv_prog_ac_ct_AR+:} false; then : | ||
8092 | @@ -7161,7 +7419,7 @@ do | ||
8093 | test -z "$as_dir" && as_dir=. | ||
8094 | for ac_exec_ext in '' $ac_executable_extensions; do | ||
8095 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | ||
8096 | - ac_cv_prog_ac_ct_AR="ar" | ||
8097 | + ac_cv_prog_ac_ct_AR="$ac_prog" | ||
8098 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
8099 | break 2 | ||
8100 | fi | ||
8101 | @@ -7180,6 +7438,10 @@ else | ||
8102 | $as_echo "no" >&6; } | ||
8103 | fi | ||
8104 | |||
8105 | + | ||
8106 | + test -n "$ac_ct_AR" && break | ||
8107 | +done | ||
8108 | + | ||
8109 | if test "x$ac_ct_AR" = x; then | ||
8110 | AR="false" | ||
8111 | else | ||
8112 | @@ -7191,12 +7453,12 @@ ac_tool_warned=yes ;; | ||
8113 | esac | ||
8114 | AR=$ac_ct_AR | ||
8115 | fi | ||
8116 | -else | ||
8117 | - AR="$ac_cv_prog_AR" | ||
8118 | fi | ||
8119 | |||
8120 | -test -z "$AR" && AR=ar | ||
8121 | -test -z "$AR_FLAGS" && AR_FLAGS=cru | ||
8122 | +: ${AR=ar} | ||
8123 | +: ${AR_FLAGS=cru} | ||
8124 | + | ||
8125 | + | ||
8126 | |||
8127 | |||
8128 | |||
8129 | @@ -7206,6 +7468,62 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru | ||
8130 | |||
8131 | |||
8132 | |||
8133 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 | ||
8134 | +$as_echo_n "checking for archiver @FILE support... " >&6; } | ||
8135 | +if ${lt_cv_ar_at_file+:} false; then : | ||
8136 | + $as_echo_n "(cached) " >&6 | ||
8137 | +else | ||
8138 | + lt_cv_ar_at_file=no | ||
8139 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
8140 | +/* end confdefs.h. */ | ||
8141 | + | ||
8142 | +int | ||
8143 | +main () | ||
8144 | +{ | ||
8145 | + | ||
8146 | + ; | ||
8147 | + return 0; | ||
8148 | +} | ||
8149 | +_ACEOF | ||
8150 | +if ac_fn_c_try_compile "$LINENO"; then : | ||
8151 | + echo conftest.$ac_objext > conftest.lst | ||
8152 | + lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5' | ||
8153 | + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 | ||
8154 | + (eval $lt_ar_try) 2>&5 | ||
8155 | + ac_status=$? | ||
8156 | + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 | ||
8157 | + test $ac_status = 0; } | ||
8158 | + if test "$ac_status" -eq 0; then | ||
8159 | + # Ensure the archiver fails upon bogus file names. | ||
8160 | + rm -f conftest.$ac_objext libconftest.a | ||
8161 | + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 | ||
8162 | + (eval $lt_ar_try) 2>&5 | ||
8163 | + ac_status=$? | ||
8164 | + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 | ||
8165 | + test $ac_status = 0; } | ||
8166 | + if test "$ac_status" -ne 0; then | ||
8167 | + lt_cv_ar_at_file=@ | ||
8168 | + fi | ||
8169 | + fi | ||
8170 | + rm -f conftest.* libconftest.a | ||
8171 | + | ||
8172 | +fi | ||
8173 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
8174 | + | ||
8175 | +fi | ||
8176 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 | ||
8177 | +$as_echo "$lt_cv_ar_at_file" >&6; } | ||
8178 | + | ||
8179 | +if test "x$lt_cv_ar_at_file" = xno; then | ||
8180 | + archiver_list_spec= | ||
8181 | +else | ||
8182 | + archiver_list_spec=$lt_cv_ar_at_file | ||
8183 | +fi | ||
8184 | + | ||
8185 | + | ||
8186 | + | ||
8187 | + | ||
8188 | + | ||
8189 | |||
8190 | |||
8191 | if test -n "$ac_tool_prefix"; then | ||
8192 | @@ -7542,8 +7860,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'" | ||
8194 | |||
8195 | # Transform an extracted symbol line into symbol name and symbol address | ||
8196 | -lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" | ||
8197 | -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'" | ||
8198 | +lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" | ||
8199 | +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'" | ||
8200 | |||
8201 | # Handle CRLF in mingw tool chain | ||
8202 | opt_cr= | ||
8203 | @@ -7579,6 +7897,7 @@ for ac_symprfx in "" "_"; do | ||
8204 | else | ||
8205 | lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" | ||
8206 | fi | ||
8207 | + lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" | ||
8208 | |||
8209 | # Check to see that the pipe works correctly. | ||
8210 | pipe_works=no | ||
8211 | @@ -7620,6 +7939,18 @@ _LT_EOF | ||
8212 | if $GREP ' nm_test_var$' "$nlist" >/dev/null; then | ||
8213 | if $GREP ' nm_test_func$' "$nlist" >/dev/null; then | ||
8214 | cat <<_LT_EOF > conftest.$ac_ext | ||
8215 | +/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ | ||
8216 | +#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) | ||
8217 | +/* DATA imports from DLLs on WIN32 con't be const, because runtime | ||
8218 | + relocations are performed -- see ld's documentation on pseudo-relocs. */ | ||
8219 | +# define LT_DLSYM_CONST | ||
8220 | +#elif defined(__osf__) | ||
8221 | +/* This system does not cope well with relocations in const data. */ | ||
8222 | +# define LT_DLSYM_CONST | ||
8223 | +#else | ||
8224 | +# define LT_DLSYM_CONST const | ||
8225 | +#endif | ||
8226 | + | ||
8227 | #ifdef __cplusplus | ||
8228 | extern "C" { | ||
8229 | #endif | ||
8230 | @@ -7631,7 +7962,7 @@ _LT_EOF | ||
8231 | cat <<_LT_EOF >> conftest.$ac_ext | ||
8232 | |||
8233 | /* The mapping between symbol names and symbols. */ | ||
8234 | -const struct { | ||
8235 | +LT_DLSYM_CONST struct { | ||
8236 | const char *name; | ||
8237 | void *address; | ||
8238 | } | ||
8239 | @@ -7657,8 +7988,8 @@ static const void *lt_preloaded_setup() { | ||
8240 | _LT_EOF | ||
8241 | # Now try linking the two files. | ||
8242 | mv conftest.$ac_objext conftstm.$ac_objext | ||
8243 | - lt_save_LIBS="$LIBS" | ||
8244 | - lt_save_CFLAGS="$CFLAGS" | ||
8245 | + lt_globsym_save_LIBS=$LIBS | ||
8246 | + lt_globsym_save_CFLAGS=$CFLAGS | ||
8247 | LIBS="conftstm.$ac_objext" | ||
8248 | CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" | ||
8249 | if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 | ||
8250 | @@ -7668,8 +7999,8 @@ _LT_EOF | ||
8251 | test $ac_status = 0; } && test -s conftest${ac_exeext}; then | ||
8252 | pipe_works=yes | ||
8253 | fi | ||
8254 | - LIBS="$lt_save_LIBS" | ||
8255 | - CFLAGS="$lt_save_CFLAGS" | ||
8256 | + LIBS=$lt_globsym_save_LIBS | ||
8257 | + CFLAGS=$lt_globsym_save_CFLAGS | ||
8258 | else | ||
8259 | echo "cannot find nm_test_func in $nlist" >&5 | ||
8260 | fi | ||
8261 | @@ -7706,6 +8037,19 @@ else | ||
8262 | $as_echo "ok" >&6; } | ||
8263 | fi | ||
8264 | |||
8265 | +# Response file support. | ||
8266 | +if test "$lt_cv_nm_interface" = "MS dumpbin"; then | ||
8267 | + nm_file_list_spec='@' | ||
8268 | +elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then | ||
8269 | + nm_file_list_spec='@' | ||
8270 | +fi | ||
8271 | + | ||
8272 | + | ||
8273 | + | ||
8274 | + | ||
8275 | + | ||
8276 | + | ||
8277 | + | ||
8278 | |||
8279 | |||
8280 | |||
8281 | @@ -7722,6 +8066,42 @@ fi | ||
8282 | |||
8283 | |||
8284 | |||
8285 | + | ||
8286 | + | ||
8287 | + | ||
8288 | + | ||
8289 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 | ||
8290 | +$as_echo_n "checking for sysroot... " >&6; } | ||
8291 | + | ||
8292 | +# Check whether --with-libtool-sysroot was given. | ||
8293 | +if test "${with_libtool_sysroot+set}" = set; then : | ||
8294 | + withval=$with_libtool_sysroot; | ||
8295 | +else | ||
8296 | + with_libtool_sysroot=no | ||
8297 | +fi | ||
8298 | + | ||
8299 | + | ||
8300 | +lt_sysroot= | ||
8301 | +case ${with_libtool_sysroot} in #( | ||
8302 | + yes) | ||
8303 | + if test "$GCC" = yes; then | ||
8304 | + lt_sysroot=`$CC --print-sysroot 2>/dev/null` | ||
8305 | + fi | ||
8306 | + ;; #( | ||
8307 | + /*) | ||
8308 | + lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"` | ||
8309 | + ;; #( | ||
8310 | + no|'') | ||
8311 | + ;; #( | ||
8312 | + *) | ||
8313 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5 | ||
8314 | +$as_echo "${with_libtool_sysroot}" >&6; } | ||
8315 | + as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 | ||
8316 | + ;; | ||
8317 | +esac | ||
8318 | + | ||
8319 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 | ||
8320 | +$as_echo "${lt_sysroot:-no}" >&6; } | ||
8321 | |||
8322 | |||
8323 | |||
8324 | @@ -7933,6 +8313,123 @@ esac | ||
8325 | |||
8326 | need_locks="$enable_libtool_lock" | ||
8327 | |||
8328 | +if test -n "$ac_tool_prefix"; then | ||
8329 | + # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args. | ||
8330 | +set dummy ${ac_tool_prefix}mt; ac_word=$2 | ||
8331 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
8332 | +$as_echo_n "checking for $ac_word... " >&6; } | ||
8333 | +if ${ac_cv_prog_MANIFEST_TOOL+:} false; then : | ||
8334 | + $as_echo_n "(cached) " >&6 | ||
8335 | +else | ||
8336 | + if test -n "$MANIFEST_TOOL"; then | ||
8337 | + ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test. | ||
8338 | +else | ||
8339 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | ||
8340 | +for as_dir in $PATH | ||
8341 | +do | ||
8342 | + IFS=$as_save_IFS | ||
8343 | + test -z "$as_dir" && as_dir=. | ||
8344 | + for ac_exec_ext in '' $ac_executable_extensions; do | ||
8345 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | ||
8346 | + ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" | ||
8347 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
8348 | + break 2 | ||
8349 | + fi | ||
8350 | +done | ||
8351 | + done | ||
8352 | +IFS=$as_save_IFS | ||
8353 | + | ||
8354 | +fi | ||
8355 | +fi | ||
8356 | +MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL | ||
8357 | +if test -n "$MANIFEST_TOOL"; then | ||
8358 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5 | ||
8359 | +$as_echo "$MANIFEST_TOOL" >&6; } | ||
8360 | +else | ||
8361 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
8362 | +$as_echo "no" >&6; } | ||
8363 | +fi | ||
8364 | + | ||
8365 | + | ||
8366 | +fi | ||
8367 | +if test -z "$ac_cv_prog_MANIFEST_TOOL"; then | ||
8368 | + ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL | ||
8369 | + # Extract the first word of "mt", so it can be a program name with args. | ||
8370 | +set dummy mt; ac_word=$2 | ||
8371 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
8372 | +$as_echo_n "checking for $ac_word... " >&6; } | ||
8373 | +if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then : | ||
8374 | + $as_echo_n "(cached) " >&6 | ||
8375 | +else | ||
8376 | + if test -n "$ac_ct_MANIFEST_TOOL"; then | ||
8377 | + ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test. | ||
8378 | +else | ||
8379 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | ||
8380 | +for as_dir in $PATH | ||
8381 | +do | ||
8382 | + IFS=$as_save_IFS | ||
8383 | + test -z "$as_dir" && as_dir=. | ||
8384 | + for ac_exec_ext in '' $ac_executable_extensions; do | ||
8385 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | ||
8386 | + ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" | ||
8387 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
8388 | + break 2 | ||
8389 | + fi | ||
8390 | +done | ||
8391 | + done | ||
8392 | +IFS=$as_save_IFS | ||
8393 | + | ||
8394 | +fi | ||
8395 | +fi | ||
8396 | +ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL | ||
8397 | +if test -n "$ac_ct_MANIFEST_TOOL"; then | ||
8398 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5 | ||
8399 | +$as_echo "$ac_ct_MANIFEST_TOOL" >&6; } | ||
8400 | +else | ||
8401 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
8402 | +$as_echo "no" >&6; } | ||
8403 | +fi | ||
8404 | + | ||
8405 | + if test "x$ac_ct_MANIFEST_TOOL" = x; then | ||
8406 | + MANIFEST_TOOL=":" | ||
8407 | + else | ||
8408 | + case $cross_compiling:$ac_tool_warned in | ||
8409 | +yes:) | ||
8410 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 | ||
8411 | +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} | ||
8412 | +ac_tool_warned=yes ;; | ||
8413 | +esac | ||
8414 | + MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL | ||
8415 | + fi | ||
8416 | +else | ||
8417 | + MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL" | ||
8418 | +fi | ||
8419 | + | ||
8420 | +test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt | ||
8421 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5 | ||
8422 | +$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; } | ||
8423 | +if ${lt_cv_path_mainfest_tool+:} false; then : | ||
8424 | + $as_echo_n "(cached) " >&6 | ||
8425 | +else | ||
8426 | + lt_cv_path_mainfest_tool=no | ||
8427 | + echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5 | ||
8428 | + $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out | ||
8429 | + cat conftest.err >&5 | ||
8430 | + if $GREP 'Manifest Tool' conftest.out > /dev/null; then | ||
8431 | + lt_cv_path_mainfest_tool=yes | ||
8432 | + fi | ||
8433 | + rm -f conftest* | ||
8434 | +fi | ||
8435 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5 | ||
8436 | +$as_echo "$lt_cv_path_mainfest_tool" >&6; } | ||
8437 | +if test "x$lt_cv_path_mainfest_tool" != xyes; then | ||
8438 | + MANIFEST_TOOL=: | ||
8439 | +fi | ||
8440 | + | ||
8441 | + | ||
8442 | + | ||
8443 | + | ||
8444 | + | ||
8445 | |||
8446 | case $host_os in | ||
8447 | rhapsody* | darwin*) | ||
8448 | @@ -8496,6 +8993,8 @@ _LT_EOF | ||
8449 | $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 | ||
8450 | echo "$AR cru libconftest.a conftest.o" >&5 | ||
8451 | $AR cru libconftest.a conftest.o 2>&5 | ||
8452 | + echo "$RANLIB libconftest.a" >&5 | ||
8453 | + $RANLIB libconftest.a 2>&5 | ||
8454 | cat > conftest.c << _LT_EOF | ||
8455 | int main() { return 0;} | ||
8456 | _LT_EOF | ||
8457 | @@ -8564,6 +9063,16 @@ done | ||
8458 | |||
8459 | |||
8460 | |||
8461 | +func_stripname_cnf () | ||
8462 | +{ | ||
8463 | + case ${2} in | ||
8464 | + .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; | ||
8465 | + *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; | ||
8466 | + esac | ||
8467 | +} # func_stripname_cnf | ||
8468 | + | ||
8469 | + | ||
8470 | + | ||
8471 | |||
8472 | |||
8473 | # Set options | ||
8474 | @@ -8692,7 +9201,8 @@ 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 | @@ -8781,7 +9291,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 | @@ -9079,8 +9589,6 @@ fi | ||
8494 | lt_prog_compiler_pic= | ||
8495 | lt_prog_compiler_static= | ||
8496 | |||
8497 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 | ||
8498 | -$as_echo_n "checking for $compiler option to produce PIC... " >&6; } | ||
8499 | |||
8500 | if test "$GCC" = yes; then | ||
8501 | lt_prog_compiler_wl='-Wl,' | ||
8502 | @@ -9246,6 +9754,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } | ||
8503 | lt_prog_compiler_pic='--shared' | ||
8504 | lt_prog_compiler_static='--static' | ||
8505 | ;; | ||
8506 | + nagfor*) | ||
8507 | + # NAG Fortran compiler | ||
8508 | + lt_prog_compiler_wl='-Wl,-Wl,,' | ||
8509 | + lt_prog_compiler_pic='-PIC' | ||
8510 | + lt_prog_compiler_static='-Bstatic' | ||
8511 | + ;; | ||
8512 | pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) | ||
8513 | # Portland Group compilers (*not* the Pentium gcc compiler, | ||
8514 | # which looks to be a dead project) | ||
8515 | @@ -9308,7 +9822,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } | ||
8516 | lt_prog_compiler_pic='-KPIC' | ||
8517 | lt_prog_compiler_static='-Bstatic' | ||
8518 | case $cc_basename in | ||
8519 | - f77* | f90* | f95*) | ||
8520 | + f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) | ||
8521 | lt_prog_compiler_wl='-Qoption ld ';; | ||
8522 | *) | ||
8523 | lt_prog_compiler_wl='-Wl,';; | ||
8524 | @@ -9365,13 +9879,17 @@ case $host_os in | ||
8525 | lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" | ||
8526 | ;; | ||
8527 | esac | ||
8528 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5 | ||
8529 | -$as_echo "$lt_prog_compiler_pic" >&6; } | ||
8530 | - | ||
8531 | - | ||
8532 | - | ||
8533 | - | ||
8534 | |||
8535 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 | ||
8536 | +$as_echo_n "checking for $compiler option to produce PIC... " >&6; } | ||
8537 | +if ${lt_cv_prog_compiler_pic+:} false; then : | ||
8538 | + $as_echo_n "(cached) " >&6 | ||
8539 | +else | ||
8540 | + lt_cv_prog_compiler_pic=$lt_prog_compiler_pic | ||
8541 | +fi | ||
8542 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5 | ||
8543 | +$as_echo "$lt_cv_prog_compiler_pic" >&6; } | ||
8544 | +lt_prog_compiler_pic=$lt_cv_prog_compiler_pic | ||
8545 | |||
8546 | # | ||
8547 | # Check to make sure the PIC flag actually works. | ||
8548 | @@ -9432,6 +9950,11 @@ fi | ||
8549 | |||
8550 | |||
8551 | |||
8552 | + | ||
8553 | + | ||
8554 | + | ||
8555 | + | ||
8556 | + | ||
8557 | # | ||
8558 | # Check to make sure the static flag actually works. | ||
8559 | # | ||
8560 | @@ -9782,7 +10305,8 @@ _LT_EOF | ||
8561 | allow_undefined_flag=unsupported | ||
8562 | always_export_symbols=no | ||
8563 | enable_shared_with_static_runtimes=yes | ||
8564 | - export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' | ||
8565 | + 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' | ||
8566 | + exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' | ||
8567 | |||
8568 | 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' | ||
8570 | @@ -9881,12 +10405,12 @@ _LT_EOF | ||
8571 | whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' | ||
8572 | hardcode_libdir_flag_spec= | ||
8573 | hardcode_libdir_flag_spec_ld='-rpath $libdir' | ||
8574 | - archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' | ||
8575 | + archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' | ||
8576 | if test "x$supports_anon_versioning" = xyes; then | ||
8577 | archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ | ||
8578 | cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ | ||
8579 | echo "local: *; };" >> $output_objdir/$libname.ver~ | ||
8580 | - $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' | ||
8581 | + $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' | ||
8582 | fi | ||
8583 | ;; | ||
8584 | esac | ||
8585 | @@ -9900,8 +10424,8 @@ _LT_EOF | ||
8586 | archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' | ||
8587 | wlarc= | ||
8588 | else | ||
8589 | - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' | ||
8590 | - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' | ||
8591 | + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' | ||
8592 | + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' | ||
8593 | fi | ||
8594 | ;; | ||
8595 | |||
8596 | @@ -9919,8 +10443,8 @@ _LT_EOF | ||
8597 | |||
8598 | _LT_EOF | ||
8599 | elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then | ||
8600 | - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' | ||
8601 | - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' | ||
8602 | + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' | ||
8603 | + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' | ||
8604 | else | ||
8605 | ld_shlibs=no | ||
8606 | fi | ||
8607 | @@ -9966,8 +10490,8 @@ _LT_EOF | ||
8608 | |||
8609 | *) | ||
8610 | if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then | ||
8611 | - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' | ||
8612 | - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' | ||
8613 | + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' | ||
8614 | + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' | ||
8615 | else | ||
8616 | ld_shlibs=no | ||
8617 | fi | ||
8618 | @@ -10097,7 +10621,13 @@ _LT_EOF | ||
8619 | allow_undefined_flag='-berok' | ||
8620 | # Determine the default libpath from the value encoded in an | ||
8621 | # empty executable. | ||
8622 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
8623 | + if test "${lt_cv_aix_libpath+set}" = set; then | ||
8624 | + aix_libpath=$lt_cv_aix_libpath | ||
8625 | +else | ||
8626 | + if ${lt_cv_aix_libpath_+:} false; then : | ||
8627 | + $as_echo_n "(cached) " >&6 | ||
8628 | +else | ||
8629 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
8630 | /* end confdefs.h. */ | ||
8631 | |||
8632 | int | ||
8633 | @@ -10110,22 +10640,29 @@ main () | ||
8634 | _ACEOF | ||
8635 | if ac_fn_c_try_link "$LINENO"; then : | ||
8636 | |||
8637 | -lt_aix_libpath_sed=' | ||
8638 | - /Import File Strings/,/^$/ { | ||
8639 | - /^0/ { | ||
8640 | - s/^0 *\(.*\)$/\1/ | ||
8641 | - p | ||
8642 | - } | ||
8643 | - }' | ||
8644 | -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | ||
8645 | -# Check for a 64-bit object if we didn't find anything. | ||
8646 | -if test -z "$aix_libpath"; then | ||
8647 | - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | ||
8648 | -fi | ||
8649 | + lt_aix_libpath_sed=' | ||
8650 | + /Import File Strings/,/^$/ { | ||
8651 | + /^0/ { | ||
8652 | + s/^0 *\([^ ]*\) *$/\1/ | ||
8653 | + p | ||
8654 | + } | ||
8655 | + }' | ||
8656 | + lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | ||
8657 | + # Check for a 64-bit object if we didn't find anything. | ||
8658 | + if test -z "$lt_cv_aix_libpath_"; then | ||
8659 | + lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | ||
8660 | + fi | ||
8661 | fi | ||
8662 | rm -f core conftest.err conftest.$ac_objext \ | ||
8663 | conftest$ac_exeext conftest.$ac_ext | ||
8664 | -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | ||
8665 | + if test -z "$lt_cv_aix_libpath_"; then | ||
8666 | + lt_cv_aix_libpath_="/usr/lib:/lib" | ||
8667 | + fi | ||
8668 | + | ||
8669 | +fi | ||
8670 | + | ||
8671 | + aix_libpath=$lt_cv_aix_libpath_ | ||
8672 | +fi | ||
8673 | |||
8674 | 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" | ||
8676 | @@ -10137,7 +10674,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | ||
8677 | else | ||
8678 | # Determine the default libpath from the value encoded in an | ||
8679 | # empty executable. | ||
8680 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
8681 | + if test "${lt_cv_aix_libpath+set}" = set; then | ||
8682 | + aix_libpath=$lt_cv_aix_libpath | ||
8683 | +else | ||
8684 | + if ${lt_cv_aix_libpath_+:} false; then : | ||
8685 | + $as_echo_n "(cached) " >&6 | ||
8686 | +else | ||
8687 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
8688 | /* end confdefs.h. */ | ||
8689 | |||
8690 | int | ||
8691 | @@ -10150,22 +10693,29 @@ main () | ||
8692 | _ACEOF | ||
8693 | if ac_fn_c_try_link "$LINENO"; then : | ||
8694 | |||
8695 | -lt_aix_libpath_sed=' | ||
8696 | - /Import File Strings/,/^$/ { | ||
8697 | - /^0/ { | ||
8698 | - s/^0 *\(.*\)$/\1/ | ||
8699 | - p | ||
8700 | - } | ||
8701 | - }' | ||
8702 | -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | ||
8703 | -# Check for a 64-bit object if we didn't find anything. | ||
8704 | -if test -z "$aix_libpath"; then | ||
8705 | - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | ||
8706 | -fi | ||
8707 | + lt_aix_libpath_sed=' | ||
8708 | + /Import File Strings/,/^$/ { | ||
8709 | + /^0/ { | ||
8710 | + s/^0 *\([^ ]*\) *$/\1/ | ||
8711 | + p | ||
8712 | + } | ||
8713 | + }' | ||
8714 | + lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | ||
8715 | + # Check for a 64-bit object if we didn't find anything. | ||
8716 | + if test -z "$lt_cv_aix_libpath_"; then | ||
8717 | + lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | ||
8718 | + fi | ||
8719 | fi | ||
8720 | rm -f core conftest.err conftest.$ac_objext \ | ||
8721 | conftest$ac_exeext conftest.$ac_ext | ||
8722 | -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | ||
8723 | + if test -z "$lt_cv_aix_libpath_"; then | ||
8724 | + lt_cv_aix_libpath_="/usr/lib:/lib" | ||
8725 | + fi | ||
8726 | + | ||
8727 | +fi | ||
8728 | + | ||
8729 | + aix_libpath=$lt_cv_aix_libpath_ | ||
8730 | +fi | ||
8731 | |||
8732 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" | ||
8733 | # Warning - without using the other run time loading flags, | ||
8734 | @@ -10209,21 +10759,64 @@ 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++. | ||
8737 | # hardcode_libdir_flag_spec is actually meaningless, as there is | ||
8738 | - # no search path for DLLs. | ||
8739 | - hardcode_libdir_flag_spec=' ' | ||
8740 | - allow_undefined_flag=unsupported | ||
8741 | - # Tell ltmain to make .lib files, not .a files. | ||
8742 | - libext=lib | ||
8743 | - # Tell ltmain to make .dll files, not .so files. | ||
8744 | - shrext_cmds=".dll" | ||
8745 | - # FIXME: Setting linknames here is a bad hack. | ||
8746 | - archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' | ||
8747 | - # The linker will automatically build a .lib file if we build a DLL. | ||
8748 | - old_archive_from_new_cmds='true' | ||
8749 | - # FIXME: Should let the user specify the lib program. | ||
8750 | - old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' | ||
8751 | - fix_srcfile_path='`cygpath -w "$srcfile"`' | ||
8752 | - enable_shared_with_static_runtimes=yes | ||
8753 | + # no search path for DLLs. | ||
8754 | + case $cc_basename in | ||
8755 | + cl*) | ||
8756 | + # Native MSVC | ||
8757 | + hardcode_libdir_flag_spec=' ' | ||
8758 | + allow_undefined_flag=unsupported | ||
8759 | + always_export_symbols=yes | ||
8760 | + file_list_spec='@' | ||
8761 | + # Tell ltmain to make .lib files, not .a files. | ||
8762 | + libext=lib | ||
8763 | + # Tell ltmain to make .dll files, not .so files. | ||
8764 | + shrext_cmds=".dll" | ||
8765 | + # FIXME: Setting linknames here is a bad hack. | ||
8766 | + archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' | ||
8767 | + archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then | ||
8768 | + sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; | ||
8769 | + else | ||
8770 | + sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; | ||
8771 | + fi~ | ||
8772 | + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ | ||
8773 | + linknames=' | ||
8774 | + # The linker will not automatically build a static lib if we build a DLL. | ||
8775 | + # _LT_TAGVAR(old_archive_from_new_cmds, )='true' | ||
8776 | + enable_shared_with_static_runtimes=yes | ||
8777 | + export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' | ||
8778 | + # Don't use ranlib | ||
8779 | + old_postinstall_cmds='chmod 644 $oldlib' | ||
8780 | + postlink_cmds='lt_outputfile="@OUTPUT@"~ | ||
8781 | + lt_tool_outputfile="@TOOL_OUTPUT@"~ | ||
8782 | + case $lt_outputfile in | ||
8783 | + *.exe|*.EXE) ;; | ||
8784 | + *) | ||
8785 | + lt_outputfile="$lt_outputfile.exe" | ||
8786 | + lt_tool_outputfile="$lt_tool_outputfile.exe" | ||
8787 | + ;; | ||
8788 | + esac~ | ||
8789 | + if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then | ||
8790 | + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; | ||
8791 | + $RM "$lt_outputfile.manifest"; | ||
8792 | + fi' | ||
8793 | + ;; | ||
8794 | + *) | ||
8795 | + # Assume MSVC wrapper | ||
8796 | + hardcode_libdir_flag_spec=' ' | ||
8797 | + allow_undefined_flag=unsupported | ||
8798 | + # Tell ltmain to make .lib files, not .a files. | ||
8799 | + libext=lib | ||
8800 | + # Tell ltmain to make .dll files, not .so files. | ||
8801 | + shrext_cmds=".dll" | ||
8802 | + # FIXME: Setting linknames here is a bad hack. | ||
8803 | + archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' | ||
8804 | + # The linker will automatically build a .lib file if we build a DLL. | ||
8805 | + old_archive_from_new_cmds='true' | ||
8806 | + # FIXME: Should let the user specify the lib program. | ||
8807 | + old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' | ||
8808 | + enable_shared_with_static_runtimes=yes | ||
8809 | + ;; | ||
8810 | + esac | ||
8811 | ;; | ||
8812 | |||
8813 | darwin* | rhapsody*) | ||
8814 | @@ -10284,7 +10877,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | ||
8815 | |||
8816 | # FreeBSD 3 and greater uses gcc -shared to do shared libraries. | ||
8817 | freebsd* | dragonfly*) | ||
8818 | - archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' | ||
8819 | + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' | ||
8820 | hardcode_libdir_flag_spec='-R$libdir' | ||
8821 | hardcode_direct=yes | ||
8822 | hardcode_shlibpath_var=no | ||
8823 | @@ -10292,7 +10885,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | ||
8824 | |||
8825 | hpux9*) | ||
8826 | if test "$GCC" = yes; then | ||
8827 | - 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' | ||
8828 | + 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' | ||
8829 | 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' | ||
8831 | fi | ||
8832 | @@ -10308,7 +10901,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | ||
8833 | |||
8834 | hpux10*) | ||
8835 | if test "$GCC" = yes && test "$with_gnu_ld" = no; then | ||
8836 | - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' | ||
8837 | + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' | ||
8838 | else | ||
8839 | archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' | ||
8840 | fi | ||
8841 | @@ -10332,10 +10925,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' | ||
8843 | ;; | ||
8844 | ia64*) | ||
8845 | - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' | ||
8846 | + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' | ||
8847 | ;; | ||
8848 | *) | ||
8849 | - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' | ||
8850 | + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' | ||
8851 | ;; | ||
8852 | esac | ||
8853 | else | ||
8854 | @@ -10414,23 +11007,36 @@ fi | ||
8855 | |||
8856 | irix5* | irix6* | nonstopux*) | ||
8857 | if test "$GCC" = yes; then | ||
8858 | - 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' | ||
8859 | + 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' | ||
8860 | # Try to use the -exported_symbol ld option, if it does not | ||
8861 | # work, assume that -exports_file does not work either and | ||
8862 | # implicitly export all symbols. | ||
8863 | - save_LDFLAGS="$LDFLAGS" | ||
8864 | - LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" | ||
8865 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
8866 | + # This should be the same for all languages, so no per-tag cache variable. | ||
8867 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5 | ||
8868 | +$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; } | ||
8869 | +if ${lt_cv_irix_exported_symbol+:} false; then : | ||
8870 | + $as_echo_n "(cached) " >&6 | ||
8871 | +else | ||
8872 | + save_LDFLAGS="$LDFLAGS" | ||
8873 | + LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" | ||
8874 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
8875 | /* end confdefs.h. */ | ||
8876 | -int foo(void) {} | ||
8877 | +int foo (void) { return 0; } | ||
8878 | _ACEOF | ||
8879 | if ac_fn_c_try_link "$LINENO"; then : | ||
8880 | - 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' | ||
8881 | - | ||
8882 | + lt_cv_irix_exported_symbol=yes | ||
8883 | +else | ||
8884 | + lt_cv_irix_exported_symbol=no | ||
8885 | fi | ||
8886 | rm -f core conftest.err conftest.$ac_objext \ | ||
8887 | conftest$ac_exeext conftest.$ac_ext | ||
8888 | - LDFLAGS="$save_LDFLAGS" | ||
8889 | + LDFLAGS="$save_LDFLAGS" | ||
8890 | +fi | ||
8891 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5 | ||
8892 | +$as_echo "$lt_cv_irix_exported_symbol" >&6; } | ||
8893 | + if test "$lt_cv_irix_exported_symbol" = yes; then | ||
8894 | + 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' | ||
8895 | + fi | ||
8896 | 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' | ||
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' | ||
8899 | @@ -10515,7 +11121,7 @@ rm -f core conftest.err conftest.$ac_objext \ | ||
8900 | osf4* | osf5*) # as osf3* with the addition of -msym flag | ||
8901 | if test "$GCC" = yes; then | ||
8902 | allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' | ||
8903 | - 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' | ||
8904 | + 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' | ||
8905 | hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' | ||
8906 | else | ||
8907 | allow_undefined_flag=' -expect_unresolved \*' | ||
8908 | @@ -10534,9 +11140,9 @@ rm -f core conftest.err conftest.$ac_objext \ | ||
8909 | no_undefined_flag=' -z defs' | ||
8910 | if test "$GCC" = yes; then | ||
8911 | wlarc='${wl}' | ||
8912 | - archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' | ||
8913 | + archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' | ||
8914 | archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ | ||
8915 | - $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' | ||
8916 | + $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' | ||
8917 | else | ||
8918 | case `$CC -V 2>&1` in | ||
8919 | *"Compilers 5.0"*) | ||
8920 | @@ -11112,8 +11718,9 @@ cygwin* | mingw* | pw32* | cegcc*) | ||
8921 | need_version=no | ||
8922 | need_lib_prefix=no | ||
8923 | |||
8924 | - case $GCC,$host_os in | ||
8925 | - yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) | ||
8926 | + case $GCC,$cc_basename in | ||
8927 | + yes,*) | ||
8928 | + # gcc | ||
8929 | library_names_spec='$libname.dll.a' | ||
8930 | # DLL is installed to $(libdir)/../bin by postinstall_cmds | ||
8931 | postinstall_cmds='base_file=`basename \${file}`~ | ||
8932 | @@ -11146,13 +11753,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}' | ||
8934 | ;; | ||
8935 | esac | ||
8936 | + dynamic_linker='Win32 ld.exe' | ||
8937 | + ;; | ||
8938 | + | ||
8939 | + *,cl*) | ||
8940 | + # Native MSVC | ||
8941 | + libname_spec='$name' | ||
8942 | + soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' | ||
8943 | + library_names_spec='${libname}.dll.lib' | ||
8944 | + | ||
8945 | + case $build_os in | ||
8946 | + mingw*) | ||
8947 | + sys_lib_search_path_spec= | ||
8948 | + lt_save_ifs=$IFS | ||
8949 | + IFS=';' | ||
8950 | + for lt_path in $LIB | ||
8951 | + do | ||
8952 | + IFS=$lt_save_ifs | ||
8953 | + # Let DOS variable expansion print the short 8.3 style file name. | ||
8954 | + lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` | ||
8955 | + sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" | ||
8956 | + done | ||
8957 | + IFS=$lt_save_ifs | ||
8958 | + # Convert to MSYS style. | ||
8959 | + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` | ||
8960 | + ;; | ||
8961 | + cygwin*) | ||
8962 | + # Convert to unix form, then to dos form, then back to unix form | ||
8963 | + # but this time dos style (no spaces!) so that the unix form looks | ||
8964 | + # like /cygdrive/c/PROGRA~1:/cygdr... | ||
8965 | + sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` | ||
8966 | + sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` | ||
8967 | + sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` | ||
8968 | + ;; | ||
8969 | + *) | ||
8970 | + sys_lib_search_path_spec="$LIB" | ||
8971 | + if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then | ||
8972 | + # It is most probably a Windows format PATH. | ||
8973 | + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` | ||
8974 | + else | ||
8975 | + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` | ||
8976 | + fi | ||
8977 | + # FIXME: find the short name or the path components, as spaces are | ||
8978 | + # common. (e.g. "Program Files" -> "PROGRA~1") | ||
8979 | + ;; | ||
8980 | + esac | ||
8981 | + | ||
8982 | + # DLL is installed to $(libdir)/../bin by postinstall_cmds | ||
8983 | + postinstall_cmds='base_file=`basename \${file}`~ | ||
8984 | + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ | ||
8985 | + dldir=$destdir/`dirname \$dlpath`~ | ||
8986 | + test -d \$dldir || mkdir -p \$dldir~ | ||
8987 | + $install_prog $dir/$dlname \$dldir/$dlname' | ||
8988 | + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ | ||
8989 | + dlpath=$dir/\$dldll~ | ||
8990 | + $RM \$dlpath' | ||
8991 | + shlibpath_overrides_runpath=yes | ||
8992 | + dynamic_linker='Win32 link.exe' | ||
8993 | ;; | ||
8994 | |||
8995 | *) | ||
8996 | + # Assume MSVC wrapper | ||
8997 | library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' | ||
8998 | + dynamic_linker='Win32 ld.exe' | ||
8999 | ;; | ||
9000 | esac | ||
9001 | - dynamic_linker='Win32 ld.exe' | ||
9002 | # FIXME: first we should search . and the directory the executable is in | ||
9003 | shlibpath_var=PATH | ||
9004 | ;; | ||
9005 | @@ -11244,7 +11909,7 @@ haiku*) | ||
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 | @@ -12040,7 +12705,7 @@ else | ||
9015 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 | ||
9016 | lt_status=$lt_dlunknown | ||
9017 | cat > conftest.$ac_ext <<_LT_EOF | ||
9018 | -#line 12040 "configure" | ||
9019 | +#line $LINENO "configure" | ||
9020 | #include "confdefs.h" | ||
9021 | |||
9022 | #if HAVE_DLFCN_H | ||
9023 | @@ -12084,10 +12749,10 @@ else | ||
9024 | /* When -fvisbility=hidden is used, assume the code has been annotated | ||
9025 | correspondingly for the symbols needed. */ | ||
9026 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) | ||
9027 | -void fnord () __attribute__((visibility("default"))); | ||
9028 | +int fnord () __attribute__((visibility("default"))); | ||
9029 | #endif | ||
9030 | |||
9031 | -void fnord () { int i=42; } | ||
9032 | +int fnord () { return 42; } | ||
9033 | int main () | ||
9034 | { | ||
9035 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); | ||
9036 | @@ -12146,7 +12811,7 @@ else | ||
9037 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 | ||
9038 | lt_status=$lt_dlunknown | ||
9039 | cat > conftest.$ac_ext <<_LT_EOF | ||
9040 | -#line 12146 "configure" | ||
9041 | +#line $LINENO "configure" | ||
9042 | #include "confdefs.h" | ||
9043 | |||
9044 | #if HAVE_DLFCN_H | ||
9045 | @@ -12190,10 +12855,10 @@ else | ||
9046 | /* When -fvisbility=hidden is used, assume the code has been annotated | ||
9047 | correspondingly for the symbols needed. */ | ||
9048 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) | ||
9049 | -void fnord () __attribute__((visibility("default"))); | ||
9050 | +int fnord () __attribute__((visibility("default"))); | ||
9051 | #endif | ||
9052 | |||
9053 | -void fnord () { int i=42; } | ||
9054 | +int fnord () { return 42; } | ||
9055 | int main () | ||
9056 | { | ||
9057 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); | ||
9058 | @@ -12585,6 +13250,7 @@ $RM -r conftest* | ||
9059 | |||
9060 | # Allow CC to be a program name with arguments. | ||
9061 | lt_save_CC=$CC | ||
9062 | + lt_save_CFLAGS=$CFLAGS | ||
9063 | lt_save_LD=$LD | ||
9064 | lt_save_GCC=$GCC | ||
9065 | GCC=$GXX | ||
9066 | @@ -12602,6 +13268,7 @@ $RM -r conftest* | ||
9067 | fi | ||
9068 | test -z "${LDCXX+set}" || LD=$LDCXX | ||
9069 | CC=${CXX-"c++"} | ||
9070 | + CFLAGS=$CXXFLAGS | ||
9071 | compiler=$CC | ||
9072 | compiler_CXX=$CC | ||
9073 | for cc_temp in $compiler""; do | ||
9074 | @@ -12884,7 +13551,13 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie | ||
9075 | allow_undefined_flag_CXX='-berok' | ||
9076 | # Determine the default libpath from the value encoded in an empty | ||
9077 | # executable. | ||
9078 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
9079 | + if test "${lt_cv_aix_libpath+set}" = set; then | ||
9080 | + aix_libpath=$lt_cv_aix_libpath | ||
9081 | +else | ||
9082 | + if ${lt_cv_aix_libpath__CXX+:} false; then : | ||
9083 | + $as_echo_n "(cached) " >&6 | ||
9084 | +else | ||
9085 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
9086 | /* end confdefs.h. */ | ||
9087 | |||
9088 | int | ||
9089 | @@ -12897,22 +13570,29 @@ main () | ||
9090 | _ACEOF | ||
9091 | if ac_fn_cxx_try_link "$LINENO"; then : | ||
9092 | |||
9093 | -lt_aix_libpath_sed=' | ||
9094 | - /Import File Strings/,/^$/ { | ||
9095 | - /^0/ { | ||
9096 | - s/^0 *\(.*\)$/\1/ | ||
9097 | - p | ||
9098 | - } | ||
9099 | - }' | ||
9100 | -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | ||
9101 | -# Check for a 64-bit object if we didn't find anything. | ||
9102 | -if test -z "$aix_libpath"; then | ||
9103 | - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | ||
9104 | -fi | ||
9105 | + lt_aix_libpath_sed=' | ||
9106 | + /Import File Strings/,/^$/ { | ||
9107 | + /^0/ { | ||
9108 | + s/^0 *\([^ ]*\) *$/\1/ | ||
9109 | + p | ||
9110 | + } | ||
9111 | + }' | ||
9112 | + lt_cv_aix_libpath__CXX=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | ||
9113 | + # Check for a 64-bit object if we didn't find anything. | ||
9114 | + if test -z "$lt_cv_aix_libpath__CXX"; then | ||
9115 | + lt_cv_aix_libpath__CXX=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | ||
9116 | + fi | ||
9117 | fi | ||
9118 | rm -f core conftest.err conftest.$ac_objext \ | ||
9119 | conftest$ac_exeext conftest.$ac_ext | ||
9120 | -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | ||
9121 | + if test -z "$lt_cv_aix_libpath__CXX"; then | ||
9122 | + lt_cv_aix_libpath__CXX="/usr/lib:/lib" | ||
9123 | + fi | ||
9124 | + | ||
9125 | +fi | ||
9126 | + | ||
9127 | + aix_libpath=$lt_cv_aix_libpath__CXX | ||
9128 | +fi | ||
9129 | |||
9130 | hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" | ||
9131 | |||
9132 | @@ -12925,7 +13605,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | ||
9133 | else | ||
9134 | # Determine the default libpath from the value encoded in an | ||
9135 | # empty executable. | ||
9136 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
9137 | + if test "${lt_cv_aix_libpath+set}" = set; then | ||
9138 | + aix_libpath=$lt_cv_aix_libpath | ||
9139 | +else | ||
9140 | + if ${lt_cv_aix_libpath__CXX+:} false; then : | ||
9141 | + $as_echo_n "(cached) " >&6 | ||
9142 | +else | ||
9143 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
9144 | /* end confdefs.h. */ | ||
9145 | |||
9146 | int | ||
9147 | @@ -12938,22 +13624,29 @@ main () | ||
9148 | _ACEOF | ||
9149 | if ac_fn_cxx_try_link "$LINENO"; then : | ||
9150 | |||
9151 | -lt_aix_libpath_sed=' | ||
9152 | - /Import File Strings/,/^$/ { | ||
9153 | - /^0/ { | ||
9154 | - s/^0 *\(.*\)$/\1/ | ||
9155 | - p | ||
9156 | - } | ||
9157 | - }' | ||
9158 | -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | ||
9159 | -# Check for a 64-bit object if we didn't find anything. | ||
9160 | -if test -z "$aix_libpath"; then | ||
9161 | - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | ||
9162 | -fi | ||
9163 | + lt_aix_libpath_sed=' | ||
9164 | + /Import File Strings/,/^$/ { | ||
9165 | + /^0/ { | ||
9166 | + s/^0 *\([^ ]*\) *$/\1/ | ||
9167 | + p | ||
9168 | + } | ||
9169 | + }' | ||
9170 | + lt_cv_aix_libpath__CXX=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | ||
9171 | + # Check for a 64-bit object if we didn't find anything. | ||
9172 | + if test -z "$lt_cv_aix_libpath__CXX"; then | ||
9173 | + lt_cv_aix_libpath__CXX=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | ||
9174 | + fi | ||
9175 | fi | ||
9176 | rm -f core conftest.err conftest.$ac_objext \ | ||
9177 | conftest$ac_exeext conftest.$ac_ext | ||
9178 | -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | ||
9179 | + if test -z "$lt_cv_aix_libpath__CXX"; then | ||
9180 | + lt_cv_aix_libpath__CXX="/usr/lib:/lib" | ||
9181 | + fi | ||
9182 | + | ||
9183 | +fi | ||
9184 | + | ||
9185 | + aix_libpath=$lt_cv_aix_libpath__CXX | ||
9186 | +fi | ||
9187 | |||
9188 | hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" | ||
9189 | # Warning - without using the other run time loading flags, | ||
9190 | @@ -12996,29 +13689,75 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | ||
9191 | ;; | ||
9192 | |||
9193 | cygwin* | mingw* | pw32* | cegcc*) | ||
9194 | - # _LT_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless, | ||
9195 | - # as there is no search path for DLLs. | ||
9196 | - hardcode_libdir_flag_spec_CXX='-L$libdir' | ||
9197 | - export_dynamic_flag_spec_CXX='${wl}--export-all-symbols' | ||
9198 | - allow_undefined_flag_CXX=unsupported | ||
9199 | - always_export_symbols_CXX=no | ||
9200 | - enable_shared_with_static_runtimes_CXX=yes | ||
9201 | - | ||
9202 | - if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then | ||
9203 | - 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' | ||
9204 | - # If the export-symbols file already is a .def file (1st line | ||
9205 | - # is EXPORTS), use it as is; otherwise, prepend... | ||
9206 | - archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then | ||
9207 | - cp $export_symbols $output_objdir/$soname.def; | ||
9208 | - else | ||
9209 | - echo EXPORTS > $output_objdir/$soname.def; | ||
9210 | - cat $export_symbols >> $output_objdir/$soname.def; | ||
9211 | - fi~ | ||
9212 | - $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' | ||
9213 | - else | ||
9214 | - ld_shlibs_CXX=no | ||
9215 | - fi | ||
9216 | - ;; | ||
9217 | + case $GXX,$cc_basename in | ||
9218 | + ,cl* | no,cl*) | ||
9219 | + # Native MSVC | ||
9220 | + # hardcode_libdir_flag_spec is actually meaningless, as there is | ||
9221 | + # no search path for DLLs. | ||
9222 | + hardcode_libdir_flag_spec_CXX=' ' | ||
9223 | + allow_undefined_flag_CXX=unsupported | ||
9224 | + always_export_symbols_CXX=yes | ||
9225 | + file_list_spec_CXX='@' | ||
9226 | + # Tell ltmain to make .lib files, not .a files. | ||
9227 | + libext=lib | ||
9228 | + # Tell ltmain to make .dll files, not .so files. | ||
9229 | + shrext_cmds=".dll" | ||
9230 | + # FIXME: Setting linknames here is a bad hack. | ||
9231 | + archive_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' | ||
9232 | + archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then | ||
9233 | + $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; | ||
9234 | + else | ||
9235 | + $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; | ||
9236 | + fi~ | ||
9237 | + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ | ||
9238 | + linknames=' | ||
9239 | + # The linker will not automatically build a static lib if we build a DLL. | ||
9240 | + # _LT_TAGVAR(old_archive_from_new_cmds, CXX)='true' | ||
9241 | + enable_shared_with_static_runtimes_CXX=yes | ||
9242 | + # Don't use ranlib | ||
9243 | + old_postinstall_cmds_CXX='chmod 644 $oldlib' | ||
9244 | + postlink_cmds_CXX='lt_outputfile="@OUTPUT@"~ | ||
9245 | + lt_tool_outputfile="@TOOL_OUTPUT@"~ | ||
9246 | + case $lt_outputfile in | ||
9247 | + *.exe|*.EXE) ;; | ||
9248 | + *) | ||
9249 | + lt_outputfile="$lt_outputfile.exe" | ||
9250 | + lt_tool_outputfile="$lt_tool_outputfile.exe" | ||
9251 | + ;; | ||
9252 | + esac~ | ||
9253 | + func_to_tool_file "$lt_outputfile"~ | ||
9254 | + if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then | ||
9255 | + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; | ||
9256 | + $RM "$lt_outputfile.manifest"; | ||
9257 | + fi' | ||
9258 | + ;; | ||
9259 | + *) | ||
9260 | + # g++ | ||
9261 | + # _LT_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless, | ||
9262 | + # as there is no search path for DLLs. | ||
9263 | + hardcode_libdir_flag_spec_CXX='-L$libdir' | ||
9264 | + export_dynamic_flag_spec_CXX='${wl}--export-all-symbols' | ||
9265 | + allow_undefined_flag_CXX=unsupported | ||
9266 | + always_export_symbols_CXX=no | ||
9267 | + enable_shared_with_static_runtimes_CXX=yes | ||
9268 | + | ||
9269 | + if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then | ||
9270 | + 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' | ||
9271 | + # If the export-symbols file already is a .def file (1st line | ||
9272 | + # is EXPORTS), use it as is; otherwise, prepend... | ||
9273 | + archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then | ||
9274 | + cp $export_symbols $output_objdir/$soname.def; | ||
9275 | + else | ||
9276 | + echo EXPORTS > $output_objdir/$soname.def; | ||
9277 | + cat $export_symbols >> $output_objdir/$soname.def; | ||
9278 | + fi~ | ||
9279 | + $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' | ||
9280 | + else | ||
9281 | + ld_shlibs_CXX=no | ||
9282 | + fi | ||
9283 | + ;; | ||
9284 | + esac | ||
9285 | + ;; | ||
9286 | darwin* | rhapsody*) | ||
9287 | |||
9288 | |||
9289 | @@ -13124,7 +13863,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | ||
9290 | ;; | ||
9291 | *) | ||
9292 | if test "$GXX" = yes; then | ||
9293 | - 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' | ||
9294 | + 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' | ||
9295 | else | ||
9296 | # FIXME: insert proper C++ library support | ||
9297 | ld_shlibs_CXX=no | ||
9298 | @@ -13195,10 +13934,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' | ||
9300 | ;; | ||
9301 | 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' | ||
9303 | + archive_cmds_CXX='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' | ||
9304 | ;; | ||
9305 | *) | ||
9306 | - 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' | ||
9307 | + 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' | ||
9308 | ;; | ||
9309 | esac | ||
9310 | fi | ||
9311 | @@ -13239,9 +13978,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | ||
9312 | *) | ||
9313 | if test "$GXX" = yes; then | ||
9314 | if test "$with_gnu_ld" = no; then | ||
9315 | - 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' | ||
9316 | + 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' | ||
9317 | else | ||
9318 | - 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' | ||
9319 | + 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' | ||
9320 | fi | ||
9321 | fi | ||
9322 | link_all_deplibs_CXX=yes | ||
9323 | @@ -13311,20 +14050,20 @@ 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 | @@ -13519,7 +14258,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' | ||
9350 | ;; | ||
9351 | *) | ||
9352 | - 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' | ||
9353 | + 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' | ||
9354 | ;; | ||
9355 | esac | ||
9356 | |||
9357 | @@ -13565,7 +14304,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | ||
9358 | |||
9359 | solaris*) | ||
9360 | case $cc_basename in | ||
9361 | - CC*) | ||
9362 | + CC* | sunCC*) | ||
9363 | # Sun C++ 4.2, 5.x and Centerline C++ | ||
9364 | archive_cmds_need_lc_CXX=yes | ||
9365 | no_undefined_flag_CXX=' -zdefs' | ||
9366 | @@ -13606,9 +14345,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | ||
9367 | if test "$GXX" = yes && test "$with_gnu_ld" = no; then | ||
9368 | no_undefined_flag_CXX=' ${wl}-z ${wl}defs' | ||
9369 | if $CC --version | $GREP -v '^2\.7' > /dev/null; then | ||
9370 | - archive_cmds_CXX='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' | ||
9371 | + archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' | ||
9372 | archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ | ||
9373 | - $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' | ||
9374 | + $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' | ||
9375 | |||
9376 | # Commands to make compiler produce verbose output that lists | ||
9377 | # what "hidden" libraries, object files and flags are used when | ||
9378 | @@ -13743,6 +14482,13 @@ private: | ||
9379 | }; | ||
9380 | _LT_EOF | ||
9381 | |||
9382 | + | ||
9383 | +_lt_libdeps_save_CFLAGS=$CFLAGS | ||
9384 | +case "$CC $CFLAGS " in #( | ||
9385 | +*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;; | ||
9386 | +*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;; | ||
9387 | +esac | ||
9388 | + | ||
9389 | if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 | ||
9390 | (eval $ac_compile) 2>&5 | ||
9391 | ac_status=$? | ||
9392 | @@ -13756,7 +14502,7 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 | ||
9393 | pre_test_object_deps_done=no | ||
9394 | |||
9395 | for p in `eval "$output_verbose_link_cmd"`; do | ||
9396 | - case $p in | ||
9397 | + case ${prev}${p} in | ||
9398 | |||
9399 | -L* | -R* | -l*) | ||
9400 | # Some compilers place space between "-{L,R}" and the path. | ||
9401 | @@ -13765,13 +14511,22 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 | ||
9402 | test $p = "-R"; then | ||
9403 | prev=$p | ||
9404 | continue | ||
9405 | - else | ||
9406 | - prev= | ||
9407 | fi | ||
9408 | |||
9409 | + # Expand the sysroot to ease extracting the directories later. | ||
9410 | + if test -z "$prev"; then | ||
9411 | + case $p in | ||
9412 | + -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;; | ||
9413 | + -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;; | ||
9414 | + -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;; | ||
9415 | + esac | ||
9416 | + fi | ||
9417 | + case $p in | ||
9418 | + =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;; | ||
9419 | + esac | ||
9420 | if test "$pre_test_object_deps_done" = no; then | ||
9421 | - case $p in | ||
9422 | - -L* | -R*) | ||
9423 | + case ${prev} in | ||
9424 | + -L | -R) | ||
9425 | # Internal compiler library paths should come after those | ||
9426 | # provided the user. The postdeps already come after the | ||
9427 | # user supplied libs so there is no need to process them. | ||
9428 | @@ -13791,8 +14546,10 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 | ||
9429 | postdeps_CXX="${postdeps_CXX} ${prev}${p}" | ||
9430 | fi | ||
9431 | fi | ||
9432 | + prev= | ||
9433 | ;; | ||
9434 | |||
9435 | + *.lto.$objext) ;; # Ignore GCC LTO objects | ||
9436 | *.$objext) | ||
9437 | # This assumes that the test object file only shows up | ||
9438 | # once in the compiler output. | ||
9439 | @@ -13828,6 +14585,7 @@ else | ||
9440 | fi | ||
9441 | |||
9442 | $RM -f confest.$objext | ||
9443 | +CFLAGS=$_lt_libdeps_save_CFLAGS | ||
9444 | |||
9445 | # PORTME: override above test on systems where it is broken | ||
9446 | case $host_os in | ||
9447 | @@ -13863,7 +14621,7 @@ linux*) | ||
9448 | |||
9449 | solaris*) | ||
9450 | case $cc_basename in | ||
9451 | - CC*) | ||
9452 | + CC* | sunCC*) | ||
9453 | # The more standards-conforming stlport4 library is | ||
9454 | # incompatible with the Cstd library. Avoid specifying | ||
9455 | # it if it's in CXXFLAGS. Ignore libCrun as | ||
9456 | @@ -13928,8 +14686,6 @@ fi | ||
9457 | lt_prog_compiler_pic_CXX= | ||
9458 | lt_prog_compiler_static_CXX= | ||
9459 | |||
9460 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 | ||
9461 | -$as_echo_n "checking for $compiler option to produce PIC... " >&6; } | ||
9462 | |||
9463 | # C++ specific cases for pic, static, wl, etc. | ||
9464 | if test "$GXX" = yes; then | ||
9465 | @@ -14034,6 +14790,11 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } | ||
9466 | ;; | ||
9467 | esac | ||
9468 | ;; | ||
9469 | + mingw* | cygwin* | os2* | pw32* | cegcc*) | ||
9470 | + # This hack is so that the source file can tell whether it is being | ||
9471 | + # built for inclusion in a dll (and should export symbols for example). | ||
9472 | + lt_prog_compiler_pic_CXX='-DDLL_EXPORT' | ||
9473 | + ;; | ||
9474 | dgux*) | ||
9475 | case $cc_basename in | ||
9476 | ec++*) | ||
9477 | @@ -14186,7 +14947,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } | ||
9478 | ;; | ||
9479 | solaris*) | ||
9480 | case $cc_basename in | ||
9481 | - CC*) | ||
9482 | + CC* | sunCC*) | ||
9483 | # Sun C++ 4.2, 5.x and Centerline C++ | ||
9484 | lt_prog_compiler_pic_CXX='-KPIC' | ||
9485 | lt_prog_compiler_static_CXX='-Bstatic' | ||
9486 | @@ -14251,10 +15012,17 @@ case $host_os in | ||
9487 | lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC" | ||
9488 | ;; | ||
9489 | esac | ||
9490 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic_CXX" >&5 | ||
9491 | -$as_echo "$lt_prog_compiler_pic_CXX" >&6; } | ||
9492 | - | ||
9493 | |||
9494 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 | ||
9495 | +$as_echo_n "checking for $compiler option to produce PIC... " >&6; } | ||
9496 | +if ${lt_cv_prog_compiler_pic_CXX+:} false; then : | ||
9497 | + $as_echo_n "(cached) " >&6 | ||
9498 | +else | ||
9499 | + lt_cv_prog_compiler_pic_CXX=$lt_prog_compiler_pic_CXX | ||
9500 | +fi | ||
9501 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_CXX" >&5 | ||
9502 | +$as_echo "$lt_cv_prog_compiler_pic_CXX" >&6; } | ||
9503 | +lt_prog_compiler_pic_CXX=$lt_cv_prog_compiler_pic_CXX | ||
9504 | |||
9505 | # | ||
9506 | # Check to make sure the PIC flag actually works. | ||
9507 | @@ -14312,6 +15080,8 @@ fi | ||
9508 | |||
9509 | |||
9510 | |||
9511 | + | ||
9512 | + | ||
9513 | # | ||
9514 | # Check to make sure the static flag actually works. | ||
9515 | # | ||
9516 | @@ -14489,6 +15259,7 @@ fi | ||
9517 | $as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } | ||
9518 | |||
9519 | export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' | ||
9520 | + exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' | ||
9521 | case $host_os in | ||
9522 | aix[4-9]*) | ||
9523 | # If we're using GNU nm, then we don't want the "-C" option. | ||
9524 | @@ -14503,15 +15274,20 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie | ||
9525 | ;; | ||
9526 | pw32*) | ||
9527 | export_symbols_cmds_CXX="$ltdll_cmds" | ||
9528 | - ;; | ||
9529 | + ;; | ||
9530 | cygwin* | mingw* | cegcc*) | ||
9531 | - 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' | ||
9532 | - ;; | ||
9533 | + case $cc_basename in | ||
9534 | + cl*) ;; | ||
9535 | + *) | ||
9536 | + 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' | ||
9537 | + exclude_expsyms_CXX='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' | ||
9538 | + ;; | ||
9539 | + esac | ||
9540 | + ;; | ||
9541 | *) | ||
9542 | export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' | ||
9543 | - ;; | ||
9544 | + ;; | ||
9545 | esac | ||
9546 | - exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' | ||
9547 | |||
9548 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5 | ||
9549 | $as_echo "$ld_shlibs_CXX" >&6; } | ||
9550 | @@ -14774,8 +15550,9 @@ cygwin* | mingw* | pw32* | cegcc*) | ||
9551 | need_version=no | ||
9552 | need_lib_prefix=no | ||
9553 | |||
9554 | - case $GCC,$host_os in | ||
9555 | - yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) | ||
9556 | + case $GCC,$cc_basename in | ||
9557 | + yes,*) | ||
9558 | + # gcc | ||
9559 | library_names_spec='$libname.dll.a' | ||
9560 | # DLL is installed to $(libdir)/../bin by postinstall_cmds | ||
9561 | postinstall_cmds='base_file=`basename \${file}`~ | ||
9562 | @@ -14807,13 +15584,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}' | ||
9564 | ;; | ||
9565 | esac | ||
9566 | + dynamic_linker='Win32 ld.exe' | ||
9567 | + ;; | ||
9568 | + | ||
9569 | + *,cl*) | ||
9570 | + # Native MSVC | ||
9571 | + libname_spec='$name' | ||
9572 | + soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' | ||
9573 | + library_names_spec='${libname}.dll.lib' | ||
9574 | + | ||
9575 | + case $build_os in | ||
9576 | + mingw*) | ||
9577 | + sys_lib_search_path_spec= | ||
9578 | + lt_save_ifs=$IFS | ||
9579 | + IFS=';' | ||
9580 | + for lt_path in $LIB | ||
9581 | + do | ||
9582 | + IFS=$lt_save_ifs | ||
9583 | + # Let DOS variable expansion print the short 8.3 style file name. | ||
9584 | + lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` | ||
9585 | + sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" | ||
9586 | + done | ||
9587 | + IFS=$lt_save_ifs | ||
9588 | + # Convert to MSYS style. | ||
9589 | + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` | ||
9590 | + ;; | ||
9591 | + cygwin*) | ||
9592 | + # Convert to unix form, then to dos form, then back to unix form | ||
9593 | + # but this time dos style (no spaces!) so that the unix form looks | ||
9594 | + # like /cygdrive/c/PROGRA~1:/cygdr... | ||
9595 | + sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` | ||
9596 | + sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` | ||
9597 | + sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` | ||
9598 | + ;; | ||
9599 | + *) | ||
9600 | + sys_lib_search_path_spec="$LIB" | ||
9601 | + if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then | ||
9602 | + # It is most probably a Windows format PATH. | ||
9603 | + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` | ||
9604 | + else | ||
9605 | + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` | ||
9606 | + fi | ||
9607 | + # FIXME: find the short name or the path components, as spaces are | ||
9608 | + # common. (e.g. "Program Files" -> "PROGRA~1") | ||
9609 | + ;; | ||
9610 | + esac | ||
9611 | + | ||
9612 | + # DLL is installed to $(libdir)/../bin by postinstall_cmds | ||
9613 | + postinstall_cmds='base_file=`basename \${file}`~ | ||
9614 | + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ | ||
9615 | + dldir=$destdir/`dirname \$dlpath`~ | ||
9616 | + test -d \$dldir || mkdir -p \$dldir~ | ||
9617 | + $install_prog $dir/$dlname \$dldir/$dlname' | ||
9618 | + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ | ||
9619 | + dlpath=$dir/\$dldll~ | ||
9620 | + $RM \$dlpath' | ||
9621 | + shlibpath_overrides_runpath=yes | ||
9622 | + dynamic_linker='Win32 link.exe' | ||
9623 | ;; | ||
9624 | |||
9625 | *) | ||
9626 | + # Assume MSVC wrapper | ||
9627 | library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' | ||
9628 | + dynamic_linker='Win32 ld.exe' | ||
9629 | ;; | ||
9630 | esac | ||
9631 | - dynamic_linker='Win32 ld.exe' | ||
9632 | # FIXME: first we should search . and the directory the executable is in | ||
9633 | shlibpath_var=PATH | ||
9634 | ;; | ||
9635 | @@ -14904,7 +15739,7 @@ haiku*) | ||
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 | @@ -15363,6 +16198,7 @@ fi | ||
9645 | fi # test -n "$compiler" | ||
9646 | |||
9647 | CC=$lt_save_CC | ||
9648 | + CFLAGS=$lt_save_CFLAGS | ||
9649 | LDCXX=$LD | ||
9650 | LD=$lt_save_LD | ||
9651 | GCC=$lt_save_GCC | ||
9652 | @@ -18554,13 +19390,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' | ||
9653 | lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' | ||
9654 | lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' | ||
9655 | lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' | ||
9656 | +lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`' | ||
9657 | +lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`' | ||
9658 | reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`' | ||
9659 | reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`' | ||
9660 | OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`' | ||
9661 | deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`' | ||
9662 | file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`' | ||
9663 | +file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`' | ||
9664 | +want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`' | ||
9665 | +DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`' | ||
9666 | +sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`' | ||
9667 | AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`' | ||
9668 | AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`' | ||
9669 | +archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`' | ||
9670 | STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' | ||
9671 | RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' | ||
9672 | old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' | ||
9673 | @@ -18575,14 +19418,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"`' | ||
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"`' | ||
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"`' | ||
9677 | +nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`' | ||
9678 | +lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`' | ||
9679 | objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`' | ||
9680 | MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`' | ||
9681 | lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`' | ||
9682 | -lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' | ||
9683 | lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`' | ||
9684 | +lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' | ||
9685 | lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`' | ||
9686 | lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`' | ||
9687 | need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`' | ||
9688 | +MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`' | ||
9689 | DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' | ||
9690 | NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' | ||
9691 | LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' | ||
9692 | @@ -18615,12 +19461,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q | ||
9693 | hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' | ||
9694 | inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' | ||
9695 | link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' | ||
9696 | -fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`' | ||
9697 | always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`' | ||
9698 | export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`' | ||
9699 | exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`' | ||
9700 | include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`' | ||
9701 | prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`' | ||
9702 | +postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`' | ||
9703 | 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"`' | ||
9705 | need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' | ||
9706 | @@ -18659,8 +19505,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"`' | ||
9708 | 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"`' | ||
9710 | -lt_prog_compiler_wl_CXX='`$ECHO "$lt_prog_compiler_wl_CXX" | $SED "$delay_single_quote_subst"`' | ||
9711 | lt_prog_compiler_pic_CXX='`$ECHO "$lt_prog_compiler_pic_CXX" | $SED "$delay_single_quote_subst"`' | ||
9712 | +lt_prog_compiler_wl_CXX='`$ECHO "$lt_prog_compiler_wl_CXX" | $SED "$delay_single_quote_subst"`' | ||
9713 | 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"`' | ||
9715 | archive_cmds_need_lc_CXX='`$ECHO "$archive_cmds_need_lc_CXX" | $SED "$delay_single_quote_subst"`' | ||
9716 | @@ -18687,12 +19533,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"`' | ||
9718 | 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"`' | ||
9720 | -fix_srcfile_path_CXX='`$ECHO "$fix_srcfile_path_CXX" | $SED "$delay_single_quote_subst"`' | ||
9721 | always_export_symbols_CXX='`$ECHO "$always_export_symbols_CXX" | $SED "$delay_single_quote_subst"`' | ||
9722 | export_symbols_cmds_CXX='`$ECHO "$export_symbols_cmds_CXX" | $SED "$delay_single_quote_subst"`' | ||
9723 | exclude_expsyms_CXX='`$ECHO "$exclude_expsyms_CXX" | $SED "$delay_single_quote_subst"`' | ||
9724 | include_expsyms_CXX='`$ECHO "$include_expsyms_CXX" | $SED "$delay_single_quote_subst"`' | ||
9725 | prelink_cmds_CXX='`$ECHO "$prelink_cmds_CXX" | $SED "$delay_single_quote_subst"`' | ||
9726 | +postlink_cmds_CXX='`$ECHO "$postlink_cmds_CXX" | $SED "$delay_single_quote_subst"`' | ||
9727 | 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"`' | ||
9729 | compiler_lib_search_dirs_CXX='`$ECHO "$compiler_lib_search_dirs_CXX" | $SED "$delay_single_quote_subst"`' | ||
9730 | @@ -18730,8 +19576,13 @@ reload_flag \ | ||
9731 | OBJDUMP \ | ||
9732 | deplibs_check_method \ | ||
9733 | file_magic_cmd \ | ||
9734 | +file_magic_glob \ | ||
9735 | +want_nocaseglob \ | ||
9736 | +DLLTOOL \ | ||
9737 | +sharedlib_from_linklib_cmd \ | ||
9738 | AR \ | ||
9739 | AR_FLAGS \ | ||
9740 | +archiver_list_spec \ | ||
9741 | STRIP \ | ||
9742 | RANLIB \ | ||
9743 | CC \ | ||
9744 | @@ -18741,12 +19592,14 @@ lt_cv_sys_global_symbol_pipe \ | ||
9745 | lt_cv_sys_global_symbol_to_cdecl \ | ||
9746 | lt_cv_sys_global_symbol_to_c_name_address \ | ||
9747 | lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ | ||
9748 | +nm_file_list_spec \ | ||
9749 | lt_prog_compiler_no_builtin_flag \ | ||
9750 | -lt_prog_compiler_wl \ | ||
9751 | lt_prog_compiler_pic \ | ||
9752 | +lt_prog_compiler_wl \ | ||
9753 | lt_prog_compiler_static \ | ||
9754 | lt_cv_prog_compiler_c_o \ | ||
9755 | need_locks \ | ||
9756 | +MANIFEST_TOOL \ | ||
9757 | DSYMUTIL \ | ||
9758 | NMEDIT \ | ||
9759 | LIPO \ | ||
9760 | @@ -18762,7 +19615,6 @@ no_undefined_flag \ | ||
9761 | hardcode_libdir_flag_spec \ | ||
9762 | hardcode_libdir_flag_spec_ld \ | ||
9763 | hardcode_libdir_separator \ | ||
9764 | -fix_srcfile_path \ | ||
9765 | exclude_expsyms \ | ||
9766 | include_expsyms \ | ||
9767 | file_list_spec \ | ||
9768 | @@ -18784,8 +19636,8 @@ LD_CXX \ | ||
9769 | reload_flag_CXX \ | ||
9770 | compiler_CXX \ | ||
9771 | lt_prog_compiler_no_builtin_flag_CXX \ | ||
9772 | -lt_prog_compiler_wl_CXX \ | ||
9773 | lt_prog_compiler_pic_CXX \ | ||
9774 | +lt_prog_compiler_wl_CXX \ | ||
9775 | lt_prog_compiler_static_CXX \ | ||
9776 | lt_cv_prog_compiler_c_o_CXX \ | ||
9777 | export_dynamic_flag_spec_CXX \ | ||
9778 | @@ -18797,7 +19649,6 @@ no_undefined_flag_CXX \ | ||
9779 | hardcode_libdir_flag_spec_CXX \ | ||
9780 | hardcode_libdir_flag_spec_ld_CXX \ | ||
9781 | hardcode_libdir_separator_CXX \ | ||
9782 | -fix_srcfile_path_CXX \ | ||
9783 | exclude_expsyms_CXX \ | ||
9784 | include_expsyms_CXX \ | ||
9785 | file_list_spec_CXX \ | ||
9786 | @@ -18831,6 +19682,7 @@ module_cmds \ | ||
9787 | module_expsym_cmds \ | ||
9788 | export_symbols_cmds \ | ||
9789 | prelink_cmds \ | ||
9790 | +postlink_cmds \ | ||
9791 | postinstall_cmds \ | ||
9792 | postuninstall_cmds \ | ||
9793 | finish_cmds \ | ||
9794 | @@ -18845,7 +19697,8 @@ archive_expsym_cmds_CXX \ | ||
9795 | module_cmds_CXX \ | ||
9796 | module_expsym_cmds_CXX \ | ||
9797 | export_symbols_cmds_CXX \ | ||
9798 | -prelink_cmds_CXX; do | ||
9799 | +prelink_cmds_CXX \ | ||
9800 | +postlink_cmds_CXX; do | ||
9801 | case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in | ||
9802 | *[\\\\\\\`\\"\\\$]*) | ||
9803 | eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" | ||
9804 | @@ -19610,7 +20463,8 @@ $as_echo X"$file" | | ||
9805 | # NOTE: Changes made to this file will be lost: look at ltmain.sh. | ||
9806 | # | ||
9807 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, | ||
9808 | -# 2006, 2007, 2008, 2009 Free Software Foundation, Inc. | ||
9809 | +# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, | ||
9810 | +# Inc. | ||
9811 | # Written by Gordon Matzigkeit, 1996 | ||
9812 | # | ||
9813 | # This file is part of GNU Libtool. | ||
9814 | @@ -19713,19 +20567,42 @@ SP2NL=$lt_lt_SP2NL | ||
9815 | # turn newlines into spaces. | ||
9816 | NL2SP=$lt_lt_NL2SP | ||
9817 | |||
9818 | +# convert \$build file names to \$host format. | ||
9819 | +to_host_file_cmd=$lt_cv_to_host_file_cmd | ||
9820 | + | ||
9821 | +# convert \$build files to toolchain format. | ||
9822 | +to_tool_file_cmd=$lt_cv_to_tool_file_cmd | ||
9823 | + | ||
9824 | # An object symbol dumper. | ||
9825 | OBJDUMP=$lt_OBJDUMP | ||
9826 | |||
9827 | # Method to check whether dependent libraries are shared objects. | ||
9828 | deplibs_check_method=$lt_deplibs_check_method | ||
9829 | |||
9830 | -# Command to use when deplibs_check_method == "file_magic". | ||
9831 | +# Command to use when deplibs_check_method = "file_magic". | ||
9832 | file_magic_cmd=$lt_file_magic_cmd | ||
9833 | |||
9834 | +# How to find potential files when deplibs_check_method = "file_magic". | ||
9835 | +file_magic_glob=$lt_file_magic_glob | ||
9836 | + | ||
9837 | +# Find potential files using nocaseglob when deplibs_check_method = "file_magic". | ||
9838 | +want_nocaseglob=$lt_want_nocaseglob | ||
9839 | + | ||
9840 | +# DLL creation program. | ||
9841 | +DLLTOOL=$lt_DLLTOOL | ||
9842 | + | ||
9843 | +# Command to associate shared and link libraries. | ||
9844 | +sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd | ||
9845 | + | ||
9846 | # The archiver. | ||
9847 | AR=$lt_AR | ||
9848 | + | ||
9849 | +# Flags to create an archive. | ||
9850 | AR_FLAGS=$lt_AR_FLAGS | ||
9851 | |||
9852 | +# How to feed a file listing to the archiver. | ||
9853 | +archiver_list_spec=$lt_archiver_list_spec | ||
9854 | + | ||
9855 | # A symbol stripping program. | ||
9856 | STRIP=$lt_STRIP | ||
9857 | |||
9858 | @@ -19755,6 +20632,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. | ||
9860 | global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix | ||
9861 | |||
9862 | +# Specify filename containing input files for \$NM. | ||
9863 | +nm_file_list_spec=$lt_nm_file_list_spec | ||
9864 | + | ||
9865 | +# The root where to search for dependent libraries,and in which our libraries should be installed. | ||
9866 | +lt_sysroot=$lt_sysroot | ||
9867 | + | ||
9868 | # The name of the directory that contains temporary libtool files. | ||
9869 | objdir=$objdir | ||
9870 | |||
9871 | @@ -19764,6 +20647,9 @@ MAGIC_CMD=$MAGIC_CMD | ||
9872 | # Must we lock files when doing compilation? | ||
9873 | need_locks=$lt_need_locks | ||
9874 | |||
9875 | +# Manifest tool. | ||
9876 | +MANIFEST_TOOL=$lt_MANIFEST_TOOL | ||
9877 | + | ||
9878 | # Tool to manipulate archived DWARF debug symbol files on Mac OS X. | ||
9879 | DSYMUTIL=$lt_DSYMUTIL | ||
9880 | |||
9881 | @@ -19878,12 +20764,12 @@ with_gcc=$GCC | ||
9882 | # Compiler flag to turn off builtin functions. | ||
9883 | no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag | ||
9884 | |||
9885 | -# How to pass a linker flag through the compiler. | ||
9886 | -wl=$lt_lt_prog_compiler_wl | ||
9887 | - | ||
9888 | # Additional compiler flags for building library objects. | ||
9889 | pic_flag=$lt_lt_prog_compiler_pic | ||
9890 | |||
9891 | +# How to pass a linker flag through the compiler. | ||
9892 | +wl=$lt_lt_prog_compiler_wl | ||
9893 | + | ||
9894 | # Compiler flag to prevent dynamic linking. | ||
9895 | link_static_flag=$lt_lt_prog_compiler_static | ||
9896 | |||
9897 | @@ -19970,9 +20856,6 @@ inherit_rpath=$inherit_rpath | ||
9898 | # Whether libtool must link a program against all its dependency libraries. | ||
9899 | link_all_deplibs=$link_all_deplibs | ||
9900 | |||
9901 | -# Fix the shell variable \$srcfile for the compiler. | ||
9902 | -fix_srcfile_path=$lt_fix_srcfile_path | ||
9903 | - | ||
9904 | # Set to "yes" if exported symbols are required. | ||
9905 | always_export_symbols=$always_export_symbols | ||
9906 | |||
9907 | @@ -19988,6 +20871,9 @@ include_expsyms=$lt_include_expsyms | ||
9908 | # Commands necessary for linking programs (against libraries) with templates. | ||
9909 | prelink_cmds=$lt_prelink_cmds | ||
9910 | |||
9911 | +# Commands necessary for finishing linking programs. | ||
9912 | +postlink_cmds=$lt_postlink_cmds | ||
9913 | + | ||
9914 | # Specify filename containing input files. | ||
9915 | file_list_spec=$lt_file_list_spec | ||
9916 | |||
9917 | @@ -20034,210 +20920,169 @@ ltmain="$ac_aux_dir/ltmain.sh" | ||
9918 | # 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 | ||
9920 | # is reportedly fixed, but why not run on old versions too? | ||
9921 | - sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ | ||
9922 | - || (rm -f "$cfgfile"; exit 1) | ||
9923 | - | ||
9924 | - case $xsi_shell in | ||
9925 | - yes) | ||
9926 | - cat << \_LT_EOF >> "$cfgfile" | ||
9927 | - | ||
9928 | -# func_dirname file append nondir_replacement | ||
9929 | -# Compute the dirname of FILE. If nonempty, add APPEND to the result, | ||
9930 | -# otherwise set result to NONDIR_REPLACEMENT. | ||
9931 | -func_dirname () | ||
9932 | -{ | ||
9933 | - case ${1} in | ||
9934 | - */*) func_dirname_result="${1%/*}${2}" ;; | ||
9935 | - * ) func_dirname_result="${3}" ;; | ||
9936 | - esac | ||
9937 | -} | ||
9938 | - | ||
9939 | -# func_basename file | ||
9940 | -func_basename () | ||
9941 | -{ | ||
9942 | - func_basename_result="${1##*/}" | ||
9943 | -} | ||
9944 | - | ||
9945 | -# func_dirname_and_basename file append nondir_replacement | ||
9946 | -# perform func_basename and func_dirname in a single function | ||
9947 | -# call: | ||
9948 | -# dirname: Compute the dirname of FILE. If nonempty, | ||
9949 | -# add APPEND to the result, otherwise set result | ||
9950 | -# to NONDIR_REPLACEMENT. | ||
9951 | -# value returned in "$func_dirname_result" | ||
9952 | -# basename: Compute filename of FILE. | ||
9953 | -# value retuned in "$func_basename_result" | ||
9954 | -# Implementation must be kept synchronized with func_dirname | ||
9955 | -# and func_basename. For efficiency, we do not delegate to | ||
9956 | -# those functions but instead duplicate the functionality here. | ||
9957 | -func_dirname_and_basename () | ||
9958 | -{ | ||
9959 | - case ${1} in | ||
9960 | - */*) func_dirname_result="${1%/*}${2}" ;; | ||
9961 | - * ) func_dirname_result="${3}" ;; | ||
9962 | - esac | ||
9963 | - func_basename_result="${1##*/}" | ||
9964 | -} | ||
9965 | - | ||
9966 | -# func_stripname prefix suffix name | ||
9967 | -# strip PREFIX and SUFFIX off of NAME. | ||
9968 | -# PREFIX and SUFFIX must not contain globbing or regex special | ||
9969 | -# characters, hashes, percent signs, but SUFFIX may contain a leading | ||
9970 | -# dot (in which case that matches only a dot). | ||
9971 | -func_stripname () | ||
9972 | -{ | ||
9973 | - # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are | ||
9974 | - # positional parameters, so assign one to ordinary parameter first. | ||
9975 | - func_stripname_result=${3} | ||
9976 | - func_stripname_result=${func_stripname_result#"${1}"} | ||
9977 | - func_stripname_result=${func_stripname_result%"${2}"} | ||
9978 | -} | ||
9979 | - | ||
9980 | -# func_opt_split | ||
9981 | -func_opt_split () | ||
9982 | -{ | ||
9983 | - func_opt_split_opt=${1%%=*} | ||
9984 | - func_opt_split_arg=${1#*=} | ||
9985 | -} | ||
9986 | - | ||
9987 | -# func_lo2o object | ||
9988 | -func_lo2o () | ||
9989 | -{ | ||
9990 | - case ${1} in | ||
9991 | - *.lo) func_lo2o_result=${1%.lo}.${objext} ;; | ||
9992 | - *) func_lo2o_result=${1} ;; | ||
9993 | - esac | ||
9994 | -} | ||
9995 | - | ||
9996 | -# func_xform libobj-or-source | ||
9997 | -func_xform () | ||
9998 | -{ | ||
9999 | - func_xform_result=${1%.*}.lo | ||
10000 | -} | ||
10001 | - | ||
10002 | -# func_arith arithmetic-term... | ||
10003 | -func_arith () | ||
10004 | -{ | ||
10005 | - func_arith_result=$(( $* )) | ||
10006 | -} | ||
10007 | - | ||
10008 | -# func_len string | ||
10009 | -# STRING may not start with a hyphen. | ||
10010 | -func_len () | ||
10011 | -{ | ||
10012 | - func_len_result=${#1} | ||
10013 | -} | ||
10014 | - | ||
10015 | -_LT_EOF | ||
10016 | - ;; | ||
10017 | - *) # Bourne compatible functions. | ||
10018 | - cat << \_LT_EOF >> "$cfgfile" | ||
10019 | - | ||
10020 | -# func_dirname file append nondir_replacement | ||
10021 | -# Compute the dirname of FILE. If nonempty, add APPEND to the result, | ||
10022 | -# otherwise set result to NONDIR_REPLACEMENT. | ||
10023 | -func_dirname () | ||
10024 | -{ | ||
10025 | - # Extract subdirectory from the argument. | ||
10026 | - func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` | ||
10027 | - if test "X$func_dirname_result" = "X${1}"; then | ||
10028 | - func_dirname_result="${3}" | ||
10029 | - else | ||
10030 | - func_dirname_result="$func_dirname_result${2}" | ||
10031 | - fi | ||
10032 | -} | ||
10033 | - | ||
10034 | -# func_basename file | ||
10035 | -func_basename () | ||
10036 | -{ | ||
10037 | - func_basename_result=`$ECHO "${1}" | $SED "$basename"` | ||
10038 | -} | ||
10039 | - | ||
10040 | - | ||
10041 | -# func_stripname prefix suffix name | ||
10042 | -# strip PREFIX and SUFFIX off of NAME. | ||
10043 | -# PREFIX and SUFFIX must not contain globbing or regex special | ||
10044 | -# characters, hashes, percent signs, but SUFFIX may contain a leading | ||
10045 | -# dot (in which case that matches only a dot). | ||
10046 | -# func_strip_suffix prefix name | ||
10047 | -func_stripname () | ||
10048 | -{ | ||
10049 | - case ${2} in | ||
10050 | - .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; | ||
10051 | - *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; | ||
10052 | - esac | ||
10053 | -} | ||
10054 | - | ||
10055 | -# sed scripts: | ||
10056 | -my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q' | ||
10057 | -my_sed_long_arg='1s/^-[^=]*=//' | ||
10058 | - | ||
10059 | -# func_opt_split | ||
10060 | -func_opt_split () | ||
10061 | -{ | ||
10062 | - func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"` | ||
10063 | - func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"` | ||
10064 | -} | ||
10065 | - | ||
10066 | -# func_lo2o object | ||
10067 | -func_lo2o () | ||
10068 | -{ | ||
10069 | - func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` | ||
10070 | -} | ||
10071 | - | ||
10072 | -# func_xform libobj-or-source | ||
10073 | -func_xform () | ||
10074 | -{ | ||
10075 | - func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'` | ||
10076 | -} | ||
10077 | - | ||
10078 | -# func_arith arithmetic-term... | ||
10079 | -func_arith () | ||
10080 | -{ | ||
10081 | - func_arith_result=`expr "$@"` | ||
10082 | -} | ||
10083 | - | ||
10084 | -# func_len string | ||
10085 | -# STRING may not start with a hyphen. | ||
10086 | -func_len () | ||
10087 | -{ | ||
10088 | - func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len` | ||
10089 | -} | ||
10090 | - | ||
10091 | -_LT_EOF | ||
10092 | -esac | ||
10093 | - | ||
10094 | -case $lt_shell_append in | ||
10095 | - yes) | ||
10096 | - cat << \_LT_EOF >> "$cfgfile" | ||
10097 | - | ||
10098 | -# func_append var value | ||
10099 | -# Append VALUE to the end of shell variable VAR. | ||
10100 | -func_append () | ||
10101 | -{ | ||
10102 | - eval "$1+=\$2" | ||
10103 | -} | ||
10104 | -_LT_EOF | ||
10105 | - ;; | ||
10106 | - *) | ||
10107 | - cat << \_LT_EOF >> "$cfgfile" | ||
10108 | - | ||
10109 | -# func_append var value | ||
10110 | -# Append VALUE to the end of shell variable VAR. | ||
10111 | -func_append () | ||
10112 | -{ | ||
10113 | - eval "$1=\$$1\$2" | ||
10114 | -} | ||
10115 | - | ||
10116 | -_LT_EOF | ||
10117 | - ;; | ||
10118 | - esac | ||
10119 | - | ||
10120 | - | ||
10121 | - sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ | ||
10122 | - || (rm -f "$cfgfile"; exit 1) | ||
10123 | - | ||
10124 | - mv -f "$cfgfile" "$ofile" || | ||
10125 | + sed '$q' "$ltmain" >> "$cfgfile" \ | ||
10126 | + || (rm -f "$cfgfile"; exit 1) | ||
10127 | + | ||
10128 | + if test x"$xsi_shell" = xyes; then | ||
10129 | + sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ | ||
10130 | +func_dirname ()\ | ||
10131 | +{\ | ||
10132 | +\ case ${1} in\ | ||
10133 | +\ */*) func_dirname_result="${1%/*}${2}" ;;\ | ||
10134 | +\ * ) func_dirname_result="${3}" ;;\ | ||
10135 | +\ esac\ | ||
10136 | +} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \ | ||
10137 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
10138 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
10139 | +test 0 -eq $? || _lt_function_replace_fail=: | ||
10140 | + | ||
10141 | + | ||
10142 | + sed -e '/^func_basename ()$/,/^} # func_basename /c\ | ||
10143 | +func_basename ()\ | ||
10144 | +{\ | ||
10145 | +\ func_basename_result="${1##*/}"\ | ||
10146 | +} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \ | ||
10147 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
10148 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
10149 | +test 0 -eq $? || _lt_function_replace_fail=: | ||
10150 | + | ||
10151 | + | ||
10152 | + sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\ | ||
10153 | +func_dirname_and_basename ()\ | ||
10154 | +{\ | ||
10155 | +\ case ${1} in\ | ||
10156 | +\ */*) func_dirname_result="${1%/*}${2}" ;;\ | ||
10157 | +\ * ) func_dirname_result="${3}" ;;\ | ||
10158 | +\ esac\ | ||
10159 | +\ func_basename_result="${1##*/}"\ | ||
10160 | +} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \ | ||
10161 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
10162 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
10163 | +test 0 -eq $? || _lt_function_replace_fail=: | ||
10164 | + | ||
10165 | + | ||
10166 | + sed -e '/^func_stripname ()$/,/^} # func_stripname /c\ | ||
10167 | +func_stripname ()\ | ||
10168 | +{\ | ||
10169 | +\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\ | ||
10170 | +\ # positional parameters, so assign one to ordinary parameter first.\ | ||
10171 | +\ func_stripname_result=${3}\ | ||
10172 | +\ func_stripname_result=${func_stripname_result#"${1}"}\ | ||
10173 | +\ func_stripname_result=${func_stripname_result%"${2}"}\ | ||
10174 | +} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \ | ||
10175 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
10176 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
10177 | +test 0 -eq $? || _lt_function_replace_fail=: | ||
10178 | + | ||
10179 | + | ||
10180 | + sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\ | ||
10181 | +func_split_long_opt ()\ | ||
10182 | +{\ | ||
10183 | +\ func_split_long_opt_name=${1%%=*}\ | ||
10184 | +\ func_split_long_opt_arg=${1#*=}\ | ||
10185 | +} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \ | ||
10186 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
10187 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
10188 | +test 0 -eq $? || _lt_function_replace_fail=: | ||
10189 | + | ||
10190 | + | ||
10191 | + sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\ | ||
10192 | +func_split_short_opt ()\ | ||
10193 | +{\ | ||
10194 | +\ func_split_short_opt_arg=${1#??}\ | ||
10195 | +\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\ | ||
10196 | +} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \ | ||
10197 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
10198 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
10199 | +test 0 -eq $? || _lt_function_replace_fail=: | ||
10200 | + | ||
10201 | + | ||
10202 | + sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\ | ||
10203 | +func_lo2o ()\ | ||
10204 | +{\ | ||
10205 | +\ case ${1} in\ | ||
10206 | +\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\ | ||
10207 | +\ *) func_lo2o_result=${1} ;;\ | ||
10208 | +\ esac\ | ||
10209 | +} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \ | ||
10210 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
10211 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
10212 | +test 0 -eq $? || _lt_function_replace_fail=: | ||
10213 | + | ||
10214 | + | ||
10215 | + sed -e '/^func_xform ()$/,/^} # func_xform /c\ | ||
10216 | +func_xform ()\ | ||
10217 | +{\ | ||
10218 | + func_xform_result=${1%.*}.lo\ | ||
10219 | +} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \ | ||
10220 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
10221 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
10222 | +test 0 -eq $? || _lt_function_replace_fail=: | ||
10223 | + | ||
10224 | + | ||
10225 | + sed -e '/^func_arith ()$/,/^} # func_arith /c\ | ||
10226 | +func_arith ()\ | ||
10227 | +{\ | ||
10228 | + func_arith_result=$(( $* ))\ | ||
10229 | +} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \ | ||
10230 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
10231 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
10232 | +test 0 -eq $? || _lt_function_replace_fail=: | ||
10233 | + | ||
10234 | + | ||
10235 | + sed -e '/^func_len ()$/,/^} # func_len /c\ | ||
10236 | +func_len ()\ | ||
10237 | +{\ | ||
10238 | + func_len_result=${#1}\ | ||
10239 | +} # Extended-shell func_len 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 | +fi | ||
10245 | + | ||
10246 | +if test x"$lt_shell_append" = xyes; then | ||
10247 | + sed -e '/^func_append ()$/,/^} # func_append /c\ | ||
10248 | +func_append ()\ | ||
10249 | +{\ | ||
10250 | + eval "${1}+=\\${2}"\ | ||
10251 | +} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \ | ||
10252 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
10253 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
10254 | +test 0 -eq $? || _lt_function_replace_fail=: | ||
10255 | + | ||
10256 | + | ||
10257 | + sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\ | ||
10258 | +func_append_quoted ()\ | ||
10259 | +{\ | ||
10260 | +\ func_quote_for_eval "${2}"\ | ||
10261 | +\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\ | ||
10262 | +} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \ | ||
10263 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
10264 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
10265 | +test 0 -eq $? || _lt_function_replace_fail=: | ||
10266 | + | ||
10267 | + | ||
10268 | + # Save a `func_append' function call where possible by direct use of '+=' | ||
10269 | + sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ | ||
10270 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
10271 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
10272 | + test 0 -eq $? || _lt_function_replace_fail=: | ||
10273 | +else | ||
10274 | + # Save a `func_append' function call even when '+=' is not available | ||
10275 | + sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ | ||
10276 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
10277 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
10278 | + test 0 -eq $? || _lt_function_replace_fail=: | ||
10279 | +fi | ||
10280 | + | ||
10281 | +if test x"$_lt_function_replace_fail" = x":"; then | ||
10282 | + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 | ||
10283 | +$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} | ||
10284 | +fi | ||
10285 | + | ||
10286 | + | ||
10287 | + mv -f "$cfgfile" "$ofile" || | ||
10288 | (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") | ||
10289 | chmod +x "$ofile" | ||
10290 | |||
10291 | @@ -20265,12 +21110,12 @@ with_gcc=$GCC_CXX | ||
10292 | # Compiler flag to turn off builtin functions. | ||
10293 | no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX | ||
10294 | |||
10295 | -# How to pass a linker flag through the compiler. | ||
10296 | -wl=$lt_lt_prog_compiler_wl_CXX | ||
10297 | - | ||
10298 | # Additional compiler flags for building library objects. | ||
10299 | pic_flag=$lt_lt_prog_compiler_pic_CXX | ||
10300 | |||
10301 | +# How to pass a linker flag through the compiler. | ||
10302 | +wl=$lt_lt_prog_compiler_wl_CXX | ||
10303 | + | ||
10304 | # Compiler flag to prevent dynamic linking. | ||
10305 | link_static_flag=$lt_lt_prog_compiler_static_CXX | ||
10306 | |||
10307 | @@ -20357,9 +21202,6 @@ inherit_rpath=$inherit_rpath_CXX | ||
10308 | # Whether libtool must link a program against all its dependency libraries. | ||
10309 | link_all_deplibs=$link_all_deplibs_CXX | ||
10310 | |||
10311 | -# Fix the shell variable \$srcfile for the compiler. | ||
10312 | -fix_srcfile_path=$lt_fix_srcfile_path_CXX | ||
10313 | - | ||
10314 | # Set to "yes" if exported symbols are required. | ||
10315 | always_export_symbols=$always_export_symbols_CXX | ||
10316 | |||
10317 | @@ -20375,6 +21217,9 @@ include_expsyms=$lt_include_expsyms_CXX | ||
10318 | # Commands necessary for linking programs (against libraries) with templates. | ||
10319 | prelink_cmds=$lt_prelink_cmds_CXX | ||
10320 | |||
10321 | +# Commands necessary for finishing linking programs. | ||
10322 | +postlink_cmds=$lt_postlink_cmds_CXX | ||
10323 | + | ||
10324 | # Specify filename containing input files. | ||
10325 | file_list_spec=$lt_file_list_spec_CXX | ||
10326 | |||
10327 | diff --git a/libctf/configure b/libctf/configure | ||
10328 | index 1dc1b65fac3..c5c2f36bbc0 100755 | ||
10329 | --- a/libctf/configure | ||
10330 | +++ b/libctf/configure | ||
10331 | @@ -663,6 +663,8 @@ OTOOL | ||
10332 | LIPO | ||
10333 | NMEDIT | ||
10334 | DSYMUTIL | ||
10335 | +MANIFEST_TOOL | ||
10336 | +DLLTOOL | ||
10337 | OBJDUMP | ||
10338 | LN_S | ||
10339 | NM | ||
10340 | @@ -790,6 +792,7 @@ enable_static | ||
10341 | with_pic | ||
10342 | enable_fast_install | ||
10343 | with_gnu_ld | ||
10344 | +with_libtool_sysroot | ||
10345 | enable_libtool_lock | ||
10346 | enable_largefile | ||
10347 | enable_werror_always | ||
10348 | @@ -1448,6 +1451,8 @@ Optional Packages: | ||
10349 | --with-pic try to use only PIC/non-PIC objects [default=use | ||
10350 | both] | ||
10351 | --with-gnu-ld assume the C compiler uses GNU ld [default=no] | ||
10352 | + --with-libtool-sysroot=DIR Search for dependent libraries within DIR | ||
10353 | + (or the compiler's sysroot if not specified). | ||
10354 | --with-system-zlib use installed libz | ||
10355 | |||
10356 | Some influential environment variables: | ||
10357 | @@ -5406,8 +5411,8 @@ esac | ||
10358 | |||
10359 | |||
10360 | |||
10361 | -macro_version='2.2.7a' | ||
10362 | -macro_revision='1.3134' | ||
10363 | +macro_version='2.4' | ||
10364 | +macro_revision='1.3293' | ||
10365 | |||
10366 | |||
10367 | |||
10368 | @@ -5518,7 +5523,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO | ||
10369 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 | ||
10370 | $as_echo_n "checking how to print strings... " >&6; } | ||
10371 | # Test print first, because it will be a builtin if present. | ||
10372 | -if test "X`print -r -- -n 2>/dev/null`" = X-n && \ | ||
10373 | +if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ | ||
10374 | test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then | ||
10375 | ECHO='print -r --' | ||
10376 | elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then | ||
10377 | @@ -6204,8 +6209,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; | ||
10378 | # Try some XSI features | ||
10379 | xsi_shell=no | ||
10380 | ( _lt_dummy="a/b/c" | ||
10381 | - test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ | ||
10382 | - = c,a/b,, \ | ||
10383 | + test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ | ||
10384 | + = c,a/b,b/c, \ | ||
10385 | && eval 'test $(( 1 + 1 )) -eq 2 \ | ||
10386 | && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ | ||
10387 | && xsi_shell=yes | ||
10388 | @@ -6254,6 +6259,80 @@ esac | ||
10389 | |||
10390 | |||
10391 | |||
10392 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5 | ||
10393 | +$as_echo_n "checking how to convert $build file names to $host format... " >&6; } | ||
10394 | +if ${lt_cv_to_host_file_cmd+:} false; then : | ||
10395 | + $as_echo_n "(cached) " >&6 | ||
10396 | +else | ||
10397 | + case $host in | ||
10398 | + *-*-mingw* ) | ||
10399 | + case $build in | ||
10400 | + *-*-mingw* ) # actually msys | ||
10401 | + lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 | ||
10402 | + ;; | ||
10403 | + *-*-cygwin* ) | ||
10404 | + lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 | ||
10405 | + ;; | ||
10406 | + * ) # otherwise, assume *nix | ||
10407 | + lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 | ||
10408 | + ;; | ||
10409 | + esac | ||
10410 | + ;; | ||
10411 | + *-*-cygwin* ) | ||
10412 | + case $build in | ||
10413 | + *-*-mingw* ) # actually msys | ||
10414 | + lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin | ||
10415 | + ;; | ||
10416 | + *-*-cygwin* ) | ||
10417 | + lt_cv_to_host_file_cmd=func_convert_file_noop | ||
10418 | + ;; | ||
10419 | + * ) # otherwise, assume *nix | ||
10420 | + lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin | ||
10421 | + ;; | ||
10422 | + esac | ||
10423 | + ;; | ||
10424 | + * ) # unhandled hosts (and "normal" native builds) | ||
10425 | + lt_cv_to_host_file_cmd=func_convert_file_noop | ||
10426 | + ;; | ||
10427 | +esac | ||
10428 | + | ||
10429 | +fi | ||
10430 | + | ||
10431 | +to_host_file_cmd=$lt_cv_to_host_file_cmd | ||
10432 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5 | ||
10433 | +$as_echo "$lt_cv_to_host_file_cmd" >&6; } | ||
10434 | + | ||
10435 | + | ||
10436 | + | ||
10437 | + | ||
10438 | + | ||
10439 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5 | ||
10440 | +$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; } | ||
10441 | +if ${lt_cv_to_tool_file_cmd+:} false; then : | ||
10442 | + $as_echo_n "(cached) " >&6 | ||
10443 | +else | ||
10444 | + #assume ordinary cross tools, or native build. | ||
10445 | +lt_cv_to_tool_file_cmd=func_convert_file_noop | ||
10446 | +case $host in | ||
10447 | + *-*-mingw* ) | ||
10448 | + case $build in | ||
10449 | + *-*-mingw* ) # actually msys | ||
10450 | + lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 | ||
10451 | + ;; | ||
10452 | + esac | ||
10453 | + ;; | ||
10454 | +esac | ||
10455 | + | ||
10456 | +fi | ||
10457 | + | ||
10458 | +to_tool_file_cmd=$lt_cv_to_tool_file_cmd | ||
10459 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5 | ||
10460 | +$as_echo "$lt_cv_to_tool_file_cmd" >&6; } | ||
10461 | + | ||
10462 | + | ||
10463 | + | ||
10464 | + | ||
10465 | + | ||
10466 | { $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; } | ||
10468 | if ${lt_cv_ld_reload_flag+:} false; then : | ||
10469 | @@ -6270,6 +6349,11 @@ case $reload_flag in | ||
10470 | esac | ||
10471 | reload_cmds='$LD$reload_flag -o $output$reload_objs' | ||
10472 | case $host_os in | ||
10473 | + cygwin* | mingw* | pw32* | cegcc*) | ||
10474 | + if test "$GCC" != yes; then | ||
10475 | + reload_cmds=false | ||
10476 | + fi | ||
10477 | + ;; | ||
10478 | darwin*) | ||
10479 | if test "$GCC" = yes; then | ||
10480 | reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' | ||
10481 | @@ -6438,7 +6522,8 @@ mingw* | pw32*) | ||
10482 | lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' | ||
10483 | lt_cv_file_magic_cmd='func_win32_libid' | ||
10484 | else | ||
10485 | - lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' | ||
10486 | + # Keep this pattern in sync with the one in func_win32_libid. | ||
10487 | + lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' | ||
10488 | lt_cv_file_magic_cmd='$OBJDUMP -f' | ||
10489 | fi | ||
10490 | ;; | ||
10491 | @@ -6592,6 +6677,21 @@ esac | ||
10492 | fi | ||
10493 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 | ||
10494 | $as_echo "$lt_cv_deplibs_check_method" >&6; } | ||
10495 | + | ||
10496 | +file_magic_glob= | ||
10497 | +want_nocaseglob=no | ||
10498 | +if test "$build" = "$host"; then | ||
10499 | + case $host_os in | ||
10500 | + mingw* | pw32*) | ||
10501 | + if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then | ||
10502 | + want_nocaseglob=yes | ||
10503 | + else | ||
10504 | + file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"` | ||
10505 | + fi | ||
10506 | + ;; | ||
10507 | + esac | ||
10508 | +fi | ||
10509 | + | ||
10510 | file_magic_cmd=$lt_cv_file_magic_cmd | ||
10511 | deplibs_check_method=$lt_cv_deplibs_check_method | ||
10512 | test -z "$deplibs_check_method" && deplibs_check_method=unknown | ||
10513 | @@ -6607,9 +6707,162 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown | ||
10514 | |||
10515 | |||
10516 | |||
10517 | + | ||
10518 | + | ||
10519 | + | ||
10520 | + | ||
10521 | + | ||
10522 | + | ||
10523 | + | ||
10524 | + | ||
10525 | + | ||
10526 | + | ||
10527 | +if test -n "$ac_tool_prefix"; then | ||
10528 | + # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. | ||
10529 | +set dummy ${ac_tool_prefix}dlltool; ac_word=$2 | ||
10530 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
10531 | +$as_echo_n "checking for $ac_word... " >&6; } | ||
10532 | +if ${ac_cv_prog_DLLTOOL+:} false; then : | ||
10533 | + $as_echo_n "(cached) " >&6 | ||
10534 | +else | ||
10535 | + if test -n "$DLLTOOL"; then | ||
10536 | + ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. | ||
10537 | +else | ||
10538 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | ||
10539 | +for as_dir in $PATH | ||
10540 | +do | ||
10541 | + IFS=$as_save_IFS | ||
10542 | + test -z "$as_dir" && as_dir=. | ||
10543 | + for ac_exec_ext in '' $ac_executable_extensions; do | ||
10544 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | ||
10545 | + ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" | ||
10546 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
10547 | + break 2 | ||
10548 | + fi | ||
10549 | +done | ||
10550 | + done | ||
10551 | +IFS=$as_save_IFS | ||
10552 | + | ||
10553 | +fi | ||
10554 | +fi | ||
10555 | +DLLTOOL=$ac_cv_prog_DLLTOOL | ||
10556 | +if test -n "$DLLTOOL"; then | ||
10557 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 | ||
10558 | +$as_echo "$DLLTOOL" >&6; } | ||
10559 | +else | ||
10560 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
10561 | +$as_echo "no" >&6; } | ||
10562 | +fi | ||
10563 | + | ||
10564 | + | ||
10565 | +fi | ||
10566 | +if test -z "$ac_cv_prog_DLLTOOL"; then | ||
10567 | + ac_ct_DLLTOOL=$DLLTOOL | ||
10568 | + # Extract the first word of "dlltool", so it can be a program name with args. | ||
10569 | +set dummy dlltool; ac_word=$2 | ||
10570 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
10571 | +$as_echo_n "checking for $ac_word... " >&6; } | ||
10572 | +if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then : | ||
10573 | + $as_echo_n "(cached) " >&6 | ||
10574 | +else | ||
10575 | + if test -n "$ac_ct_DLLTOOL"; then | ||
10576 | + ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. | ||
10577 | +else | ||
10578 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | ||
10579 | +for as_dir in $PATH | ||
10580 | +do | ||
10581 | + IFS=$as_save_IFS | ||
10582 | + test -z "$as_dir" && as_dir=. | ||
10583 | + for ac_exec_ext in '' $ac_executable_extensions; do | ||
10584 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | ||
10585 | + ac_cv_prog_ac_ct_DLLTOOL="dlltool" | ||
10586 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
10587 | + break 2 | ||
10588 | + fi | ||
10589 | +done | ||
10590 | + done | ||
10591 | +IFS=$as_save_IFS | ||
10592 | + | ||
10593 | +fi | ||
10594 | +fi | ||
10595 | +ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL | ||
10596 | +if test -n "$ac_ct_DLLTOOL"; then | ||
10597 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 | ||
10598 | +$as_echo "$ac_ct_DLLTOOL" >&6; } | ||
10599 | +else | ||
10600 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
10601 | +$as_echo "no" >&6; } | ||
10602 | +fi | ||
10603 | + | ||
10604 | + if test "x$ac_ct_DLLTOOL" = x; then | ||
10605 | + DLLTOOL="false" | ||
10606 | + else | ||
10607 | + case $cross_compiling:$ac_tool_warned in | ||
10608 | +yes:) | ||
10609 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 | ||
10610 | +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} | ||
10611 | +ac_tool_warned=yes ;; | ||
10612 | +esac | ||
10613 | + DLLTOOL=$ac_ct_DLLTOOL | ||
10614 | + fi | ||
10615 | +else | ||
10616 | + DLLTOOL="$ac_cv_prog_DLLTOOL" | ||
10617 | +fi | ||
10618 | + | ||
10619 | +test -z "$DLLTOOL" && DLLTOOL=dlltool | ||
10620 | + | ||
10621 | + | ||
10622 | + | ||
10623 | + | ||
10624 | + | ||
10625 | + | ||
10626 | + | ||
10627 | + | ||
10628 | + | ||
10629 | + | ||
10630 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5 | ||
10631 | +$as_echo_n "checking how to associate runtime and link libraries... " >&6; } | ||
10632 | +if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then : | ||
10633 | + $as_echo_n "(cached) " >&6 | ||
10634 | +else | ||
10635 | + lt_cv_sharedlib_from_linklib_cmd='unknown' | ||
10636 | + | ||
10637 | +case $host_os in | ||
10638 | +cygwin* | mingw* | pw32* | cegcc*) | ||
10639 | + # two different shell functions defined in ltmain.sh | ||
10640 | + # decide which to use based on capabilities of $DLLTOOL | ||
10641 | + case `$DLLTOOL --help 2>&1` in | ||
10642 | + *--identify-strict*) | ||
10643 | + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib | ||
10644 | + ;; | ||
10645 | + *) | ||
10646 | + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback | ||
10647 | + ;; | ||
10648 | + esac | ||
10649 | + ;; | ||
10650 | +*) | ||
10651 | + # fallback: assume linklib IS sharedlib | ||
10652 | + lt_cv_sharedlib_from_linklib_cmd="$ECHO" | ||
10653 | + ;; | ||
10654 | +esac | ||
10655 | + | ||
10656 | +fi | ||
10657 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5 | ||
10658 | +$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; } | ||
10659 | +sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd | ||
10660 | +test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO | ||
10661 | + | ||
10662 | + | ||
10663 | + | ||
10664 | + | ||
10665 | + | ||
10666 | + | ||
10667 | + | ||
10668 | 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. | ||
10670 | -set dummy ${ac_tool_prefix}ar; ac_word=$2 | ||
10671 | + for ac_prog in ar | ||
10672 | + do | ||
10673 | + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. | ||
10674 | +set dummy $ac_tool_prefix$ac_prog; ac_word=$2 | ||
10675 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
10676 | $as_echo_n "checking for $ac_word... " >&6; } | ||
10677 | if ${ac_cv_prog_AR+:} false; then : | ||
10678 | @@ -6625,7 +6878,7 @@ do | ||
10679 | test -z "$as_dir" && as_dir=. | ||
10680 | for ac_exec_ext in '' $ac_executable_extensions; do | ||
10681 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | ||
10682 | - ac_cv_prog_AR="${ac_tool_prefix}ar" | ||
10683 | + ac_cv_prog_AR="$ac_tool_prefix$ac_prog" | ||
10684 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
10685 | break 2 | ||
10686 | fi | ||
10687 | @@ -6645,11 +6898,15 @@ $as_echo "no" >&6; } | ||
10688 | fi | ||
10689 | |||
10690 | |||
10691 | + test -n "$AR" && break | ||
10692 | + done | ||
10693 | fi | ||
10694 | -if test -z "$ac_cv_prog_AR"; then | ||
10695 | +if test -z "$AR"; then | ||
10696 | ac_ct_AR=$AR | ||
10697 | - # Extract the first word of "ar", so it can be a program name with args. | ||
10698 | -set dummy ar; ac_word=$2 | ||
10699 | + for ac_prog in ar | ||
10700 | +do | ||
10701 | + # Extract the first word of "$ac_prog", so it can be a program name with args. | ||
10702 | +set dummy $ac_prog; ac_word=$2 | ||
10703 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
10704 | $as_echo_n "checking for $ac_word... " >&6; } | ||
10705 | if ${ac_cv_prog_ac_ct_AR+:} false; then : | ||
10706 | @@ -6665,7 +6922,7 @@ do | ||
10707 | test -z "$as_dir" && as_dir=. | ||
10708 | for ac_exec_ext in '' $ac_executable_extensions; do | ||
10709 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | ||
10710 | - ac_cv_prog_ac_ct_AR="ar" | ||
10711 | + ac_cv_prog_ac_ct_AR="$ac_prog" | ||
10712 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
10713 | break 2 | ||
10714 | fi | ||
10715 | @@ -6684,6 +6941,10 @@ else | ||
10716 | $as_echo "no" >&6; } | ||
10717 | fi | ||
10718 | |||
10719 | + | ||
10720 | + test -n "$ac_ct_AR" && break | ||
10721 | +done | ||
10722 | + | ||
10723 | if test "x$ac_ct_AR" = x; then | ||
10724 | AR="false" | ||
10725 | else | ||
10726 | @@ -6695,16 +6956,72 @@ ac_tool_warned=yes ;; | ||
10727 | esac | ||
10728 | AR=$ac_ct_AR | ||
10729 | fi | ||
10730 | -else | ||
10731 | - AR="$ac_cv_prog_AR" | ||
10732 | fi | ||
10733 | |||
10734 | -test -z "$AR" && AR=ar | ||
10735 | -test -z "$AR_FLAGS" && AR_FLAGS=cru | ||
10736 | +: ${AR=ar} | ||
10737 | +: ${AR_FLAGS=cru} | ||
10738 | + | ||
10739 | + | ||
10740 | + | ||
10741 | + | ||
10742 | + | ||
10743 | + | ||
10744 | + | ||
10745 | + | ||
10746 | + | ||
10747 | + | ||
10748 | + | ||
10749 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 | ||
10750 | +$as_echo_n "checking for archiver @FILE support... " >&6; } | ||
10751 | +if ${lt_cv_ar_at_file+:} false; then : | ||
10752 | + $as_echo_n "(cached) " >&6 | ||
10753 | +else | ||
10754 | + lt_cv_ar_at_file=no | ||
10755 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
10756 | +/* end confdefs.h. */ | ||
10757 | + | ||
10758 | +int | ||
10759 | +main () | ||
10760 | +{ | ||
10761 | |||
10762 | + ; | ||
10763 | + return 0; | ||
10764 | +} | ||
10765 | +_ACEOF | ||
10766 | +if ac_fn_c_try_compile "$LINENO"; then : | ||
10767 | + echo conftest.$ac_objext > conftest.lst | ||
10768 | + lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5' | ||
10769 | + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 | ||
10770 | + (eval $lt_ar_try) 2>&5 | ||
10771 | + ac_status=$? | ||
10772 | + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 | ||
10773 | + test $ac_status = 0; } | ||
10774 | + if test "$ac_status" -eq 0; then | ||
10775 | + # Ensure the archiver fails upon bogus file names. | ||
10776 | + rm -f conftest.$ac_objext libconftest.a | ||
10777 | + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 | ||
10778 | + (eval $lt_ar_try) 2>&5 | ||
10779 | + ac_status=$? | ||
10780 | + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 | ||
10781 | + test $ac_status = 0; } | ||
10782 | + if test "$ac_status" -ne 0; then | ||
10783 | + lt_cv_ar_at_file=@ | ||
10784 | + fi | ||
10785 | + fi | ||
10786 | + rm -f conftest.* libconftest.a | ||
10787 | |||
10788 | +fi | ||
10789 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
10790 | |||
10791 | +fi | ||
10792 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 | ||
10793 | +$as_echo "$lt_cv_ar_at_file" >&6; } | ||
10794 | |||
10795 | +if test "x$lt_cv_ar_at_file" = xno; then | ||
10796 | + archiver_list_spec= | ||
10797 | +else | ||
10798 | + archiver_list_spec=$lt_cv_ar_at_file | ||
10799 | +fi | ||
10800 | |||
10801 | |||
10802 | |||
10803 | @@ -7046,8 +7363,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'" | ||
10805 | |||
10806 | # Transform an extracted symbol line into symbol name and symbol address | ||
10807 | -lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" | ||
10808 | -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'" | ||
10809 | +lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" | ||
10810 | +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'" | ||
10811 | |||
10812 | # Handle CRLF in mingw tool chain | ||
10813 | opt_cr= | ||
10814 | @@ -7083,6 +7400,7 @@ for ac_symprfx in "" "_"; do | ||
10815 | else | ||
10816 | lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" | ||
10817 | fi | ||
10818 | + lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" | ||
10819 | |||
10820 | # Check to see that the pipe works correctly. | ||
10821 | pipe_works=no | ||
10822 | @@ -7124,6 +7442,18 @@ _LT_EOF | ||
10823 | if $GREP ' nm_test_var$' "$nlist" >/dev/null; then | ||
10824 | if $GREP ' nm_test_func$' "$nlist" >/dev/null; then | ||
10825 | cat <<_LT_EOF > conftest.$ac_ext | ||
10826 | +/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ | ||
10827 | +#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) | ||
10828 | +/* DATA imports from DLLs on WIN32 con't be const, because runtime | ||
10829 | + relocations are performed -- see ld's documentation on pseudo-relocs. */ | ||
10830 | +# define LT_DLSYM_CONST | ||
10831 | +#elif defined(__osf__) | ||
10832 | +/* This system does not cope well with relocations in const data. */ | ||
10833 | +# define LT_DLSYM_CONST | ||
10834 | +#else | ||
10835 | +# define LT_DLSYM_CONST const | ||
10836 | +#endif | ||
10837 | + | ||
10838 | #ifdef __cplusplus | ||
10839 | extern "C" { | ||
10840 | #endif | ||
10841 | @@ -7135,7 +7465,7 @@ _LT_EOF | ||
10842 | cat <<_LT_EOF >> conftest.$ac_ext | ||
10843 | |||
10844 | /* The mapping between symbol names and symbols. */ | ||
10845 | -const struct { | ||
10846 | +LT_DLSYM_CONST struct { | ||
10847 | const char *name; | ||
10848 | void *address; | ||
10849 | } | ||
10850 | @@ -7161,8 +7491,8 @@ static const void *lt_preloaded_setup() { | ||
10851 | _LT_EOF | ||
10852 | # Now try linking the two files. | ||
10853 | mv conftest.$ac_objext conftstm.$ac_objext | ||
10854 | - lt_save_LIBS="$LIBS" | ||
10855 | - lt_save_CFLAGS="$CFLAGS" | ||
10856 | + lt_globsym_save_LIBS=$LIBS | ||
10857 | + lt_globsym_save_CFLAGS=$CFLAGS | ||
10858 | LIBS="conftstm.$ac_objext" | ||
10859 | CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" | ||
10860 | if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 | ||
10861 | @@ -7172,8 +7502,8 @@ _LT_EOF | ||
10862 | test $ac_status = 0; } && test -s conftest${ac_exeext}; then | ||
10863 | pipe_works=yes | ||
10864 | fi | ||
10865 | - LIBS="$lt_save_LIBS" | ||
10866 | - CFLAGS="$lt_save_CFLAGS" | ||
10867 | + LIBS=$lt_globsym_save_LIBS | ||
10868 | + CFLAGS=$lt_globsym_save_CFLAGS | ||
10869 | else | ||
10870 | echo "cannot find nm_test_func in $nlist" >&5 | ||
10871 | fi | ||
10872 | @@ -7210,6 +7540,16 @@ else | ||
10873 | $as_echo "ok" >&6; } | ||
10874 | fi | ||
10875 | |||
10876 | +# Response file support. | ||
10877 | +if test "$lt_cv_nm_interface" = "MS dumpbin"; then | ||
10878 | + nm_file_list_spec='@' | ||
10879 | +elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then | ||
10880 | + nm_file_list_spec='@' | ||
10881 | +fi | ||
10882 | + | ||
10883 | + | ||
10884 | + | ||
10885 | + | ||
10886 | |||
10887 | |||
10888 | |||
10889 | @@ -7226,6 +7566,45 @@ fi | ||
10890 | |||
10891 | |||
10892 | |||
10893 | + | ||
10894 | + | ||
10895 | + | ||
10896 | + | ||
10897 | + | ||
10898 | + | ||
10899 | + | ||
10900 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 | ||
10901 | +$as_echo_n "checking for sysroot... " >&6; } | ||
10902 | + | ||
10903 | +# Check whether --with-libtool-sysroot was given. | ||
10904 | +if test "${with_libtool_sysroot+set}" = set; then : | ||
10905 | + withval=$with_libtool_sysroot; | ||
10906 | +else | ||
10907 | + with_libtool_sysroot=no | ||
10908 | +fi | ||
10909 | + | ||
10910 | + | ||
10911 | +lt_sysroot= | ||
10912 | +case ${with_libtool_sysroot} in #( | ||
10913 | + yes) | ||
10914 | + if test "$GCC" = yes; then | ||
10915 | + lt_sysroot=`$CC --print-sysroot 2>/dev/null` | ||
10916 | + fi | ||
10917 | + ;; #( | ||
10918 | + /*) | ||
10919 | + lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"` | ||
10920 | + ;; #( | ||
10921 | + no|'') | ||
10922 | + ;; #( | ||
10923 | + *) | ||
10924 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5 | ||
10925 | +$as_echo "${with_libtool_sysroot}" >&6; } | ||
10926 | + as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 | ||
10927 | + ;; | ||
10928 | +esac | ||
10929 | + | ||
10930 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 | ||
10931 | +$as_echo "${lt_sysroot:-no}" >&6; } | ||
10932 | |||
10933 | |||
10934 | |||
10935 | @@ -7437,6 +7816,123 @@ esac | ||
10936 | |||
10937 | need_locks="$enable_libtool_lock" | ||
10938 | |||
10939 | +if test -n "$ac_tool_prefix"; then | ||
10940 | + # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args. | ||
10941 | +set dummy ${ac_tool_prefix}mt; ac_word=$2 | ||
10942 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
10943 | +$as_echo_n "checking for $ac_word... " >&6; } | ||
10944 | +if ${ac_cv_prog_MANIFEST_TOOL+:} false; then : | ||
10945 | + $as_echo_n "(cached) " >&6 | ||
10946 | +else | ||
10947 | + if test -n "$MANIFEST_TOOL"; then | ||
10948 | + ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test. | ||
10949 | +else | ||
10950 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | ||
10951 | +for as_dir in $PATH | ||
10952 | +do | ||
10953 | + IFS=$as_save_IFS | ||
10954 | + test -z "$as_dir" && as_dir=. | ||
10955 | + for ac_exec_ext in '' $ac_executable_extensions; do | ||
10956 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | ||
10957 | + ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" | ||
10958 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
10959 | + break 2 | ||
10960 | + fi | ||
10961 | +done | ||
10962 | + done | ||
10963 | +IFS=$as_save_IFS | ||
10964 | + | ||
10965 | +fi | ||
10966 | +fi | ||
10967 | +MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL | ||
10968 | +if test -n "$MANIFEST_TOOL"; then | ||
10969 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5 | ||
10970 | +$as_echo "$MANIFEST_TOOL" >&6; } | ||
10971 | +else | ||
10972 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
10973 | +$as_echo "no" >&6; } | ||
10974 | +fi | ||
10975 | + | ||
10976 | + | ||
10977 | +fi | ||
10978 | +if test -z "$ac_cv_prog_MANIFEST_TOOL"; then | ||
10979 | + ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL | ||
10980 | + # Extract the first word of "mt", so it can be a program name with args. | ||
10981 | +set dummy mt; ac_word=$2 | ||
10982 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
10983 | +$as_echo_n "checking for $ac_word... " >&6; } | ||
10984 | +if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then : | ||
10985 | + $as_echo_n "(cached) " >&6 | ||
10986 | +else | ||
10987 | + if test -n "$ac_ct_MANIFEST_TOOL"; then | ||
10988 | + ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test. | ||
10989 | +else | ||
10990 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | ||
10991 | +for as_dir in $PATH | ||
10992 | +do | ||
10993 | + IFS=$as_save_IFS | ||
10994 | + test -z "$as_dir" && as_dir=. | ||
10995 | + for ac_exec_ext in '' $ac_executable_extensions; do | ||
10996 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | ||
10997 | + ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" | ||
10998 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
10999 | + break 2 | ||
11000 | + fi | ||
11001 | +done | ||
11002 | + done | ||
11003 | +IFS=$as_save_IFS | ||
11004 | + | ||
11005 | +fi | ||
11006 | +fi | ||
11007 | +ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL | ||
11008 | +if test -n "$ac_ct_MANIFEST_TOOL"; then | ||
11009 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5 | ||
11010 | +$as_echo "$ac_ct_MANIFEST_TOOL" >&6; } | ||
11011 | +else | ||
11012 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
11013 | +$as_echo "no" >&6; } | ||
11014 | +fi | ||
11015 | + | ||
11016 | + if test "x$ac_ct_MANIFEST_TOOL" = x; then | ||
11017 | + MANIFEST_TOOL=":" | ||
11018 | + else | ||
11019 | + case $cross_compiling:$ac_tool_warned in | ||
11020 | +yes:) | ||
11021 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 | ||
11022 | +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} | ||
11023 | +ac_tool_warned=yes ;; | ||
11024 | +esac | ||
11025 | + MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL | ||
11026 | + fi | ||
11027 | +else | ||
11028 | + MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL" | ||
11029 | +fi | ||
11030 | + | ||
11031 | +test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt | ||
11032 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5 | ||
11033 | +$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; } | ||
11034 | +if ${lt_cv_path_mainfest_tool+:} false; then : | ||
11035 | + $as_echo_n "(cached) " >&6 | ||
11036 | +else | ||
11037 | + lt_cv_path_mainfest_tool=no | ||
11038 | + echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5 | ||
11039 | + $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out | ||
11040 | + cat conftest.err >&5 | ||
11041 | + if $GREP 'Manifest Tool' conftest.out > /dev/null; then | ||
11042 | + lt_cv_path_mainfest_tool=yes | ||
11043 | + fi | ||
11044 | + rm -f conftest* | ||
11045 | +fi | ||
11046 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5 | ||
11047 | +$as_echo "$lt_cv_path_mainfest_tool" >&6; } | ||
11048 | +if test "x$lt_cv_path_mainfest_tool" != xyes; then | ||
11049 | + MANIFEST_TOOL=: | ||
11050 | +fi | ||
11051 | + | ||
11052 | + | ||
11053 | + | ||
11054 | + | ||
11055 | + | ||
11056 | |||
11057 | case $host_os in | ||
11058 | rhapsody* | darwin*) | ||
11059 | @@ -8000,6 +8496,8 @@ _LT_EOF | ||
11060 | $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 | ||
11061 | echo "$AR cru libconftest.a conftest.o" >&5 | ||
11062 | $AR cru libconftest.a conftest.o 2>&5 | ||
11063 | + echo "$RANLIB libconftest.a" >&5 | ||
11064 | + $RANLIB libconftest.a 2>&5 | ||
11065 | cat > conftest.c << _LT_EOF | ||
11066 | int main() { return 0;} | ||
11067 | _LT_EOF | ||
11068 | @@ -8165,7 +8663,8 @@ fi | ||
11069 | LIBTOOL_DEPS="$ltmain" | ||
11070 | |||
11071 | # Always use our own libtool. | ||
11072 | -LIBTOOL='$(SHELL) $(top_builddir)/libtool' | ||
11073 | +LIBTOOL='$(SHELL) $(top_builddir)' | ||
11074 | +LIBTOOL="$LIBTOOL/${host_alias}-libtool" | ||
11075 | |||
11076 | |||
11077 | |||
11078 | @@ -8254,7 +8753,7 @@ aix3*) | ||
11079 | esac | ||
11080 | |||
11081 | # Global variables: | ||
11082 | -ofile=libtool | ||
11083 | +ofile=${host_alias}-libtool | ||
11084 | can_build_shared=yes | ||
11085 | |||
11086 | # All known linkers require a `.a' archive for static linking (except MSVC, | ||
11087 | @@ -8552,8 +9051,6 @@ fi | ||
11088 | lt_prog_compiler_pic= | ||
11089 | lt_prog_compiler_static= | ||
11090 | |||
11091 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 | ||
11092 | -$as_echo_n "checking for $compiler option to produce PIC... " >&6; } | ||
11093 | |||
11094 | if test "$GCC" = yes; then | ||
11095 | lt_prog_compiler_wl='-Wl,' | ||
11096 | @@ -8719,6 +9216,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } | ||
11097 | lt_prog_compiler_pic='--shared' | ||
11098 | lt_prog_compiler_static='--static' | ||
11099 | ;; | ||
11100 | + nagfor*) | ||
11101 | + # NAG Fortran compiler | ||
11102 | + lt_prog_compiler_wl='-Wl,-Wl,,' | ||
11103 | + lt_prog_compiler_pic='-PIC' | ||
11104 | + lt_prog_compiler_static='-Bstatic' | ||
11105 | + ;; | ||
11106 | pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) | ||
11107 | # Portland Group compilers (*not* the Pentium gcc compiler, | ||
11108 | # which looks to be a dead project) | ||
11109 | @@ -8781,7 +9284,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } | ||
11110 | lt_prog_compiler_pic='-KPIC' | ||
11111 | lt_prog_compiler_static='-Bstatic' | ||
11112 | case $cc_basename in | ||
11113 | - f77* | f90* | f95*) | ||
11114 | + f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) | ||
11115 | lt_prog_compiler_wl='-Qoption ld ';; | ||
11116 | *) | ||
11117 | lt_prog_compiler_wl='-Wl,';; | ||
11118 | @@ -8838,13 +9341,17 @@ case $host_os in | ||
11119 | lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" | ||
11120 | ;; | ||
11121 | esac | ||
11122 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5 | ||
11123 | -$as_echo "$lt_prog_compiler_pic" >&6; } | ||
11124 | - | ||
11125 | - | ||
11126 | - | ||
11127 | - | ||
11128 | |||
11129 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 | ||
11130 | +$as_echo_n "checking for $compiler option to produce PIC... " >&6; } | ||
11131 | +if ${lt_cv_prog_compiler_pic+:} false; then : | ||
11132 | + $as_echo_n "(cached) " >&6 | ||
11133 | +else | ||
11134 | + lt_cv_prog_compiler_pic=$lt_prog_compiler_pic | ||
11135 | +fi | ||
11136 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5 | ||
11137 | +$as_echo "$lt_cv_prog_compiler_pic" >&6; } | ||
11138 | +lt_prog_compiler_pic=$lt_cv_prog_compiler_pic | ||
11139 | |||
11140 | # | ||
11141 | # Check to make sure the PIC flag actually works. | ||
11142 | @@ -8905,6 +9412,11 @@ fi | ||
11143 | |||
11144 | |||
11145 | |||
11146 | + | ||
11147 | + | ||
11148 | + | ||
11149 | + | ||
11150 | + | ||
11151 | # | ||
11152 | # Check to make sure the static flag actually works. | ||
11153 | # | ||
11154 | @@ -9255,7 +9767,8 @@ _LT_EOF | ||
11155 | allow_undefined_flag=unsupported | ||
11156 | always_export_symbols=no | ||
11157 | enable_shared_with_static_runtimes=yes | ||
11158 | - export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' | ||
11159 | + 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' | ||
11160 | + exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' | ||
11161 | |||
11162 | 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' | ||
11164 | @@ -9354,12 +9867,12 @@ _LT_EOF | ||
11165 | whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' | ||
11166 | hardcode_libdir_flag_spec= | ||
11167 | hardcode_libdir_flag_spec_ld='-rpath $libdir' | ||
11168 | - archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' | ||
11169 | + archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' | ||
11170 | if test "x$supports_anon_versioning" = xyes; then | ||
11171 | archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ | ||
11172 | cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ | ||
11173 | echo "local: *; };" >> $output_objdir/$libname.ver~ | ||
11174 | - $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' | ||
11175 | + $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' | ||
11176 | fi | ||
11177 | ;; | ||
11178 | esac | ||
11179 | @@ -9373,8 +9886,8 @@ _LT_EOF | ||
11180 | archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' | ||
11181 | wlarc= | ||
11182 | else | ||
11183 | - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' | ||
11184 | - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' | ||
11185 | + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' | ||
11186 | + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' | ||
11187 | fi | ||
11188 | ;; | ||
11189 | |||
11190 | @@ -9392,8 +9905,8 @@ _LT_EOF | ||
11191 | |||
11192 | _LT_EOF | ||
11193 | elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then | ||
11194 | - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' | ||
11195 | - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' | ||
11196 | + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' | ||
11197 | + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' | ||
11198 | else | ||
11199 | ld_shlibs=no | ||
11200 | fi | ||
11201 | @@ -9439,8 +9952,8 @@ _LT_EOF | ||
11202 | |||
11203 | *) | ||
11204 | if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then | ||
11205 | - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' | ||
11206 | - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' | ||
11207 | + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' | ||
11208 | + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' | ||
11209 | else | ||
11210 | ld_shlibs=no | ||
11211 | fi | ||
11212 | @@ -9570,7 +10083,13 @@ _LT_EOF | ||
11213 | allow_undefined_flag='-berok' | ||
11214 | # Determine the default libpath from the value encoded in an | ||
11215 | # empty executable. | ||
11216 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
11217 | + if test "${lt_cv_aix_libpath+set}" = set; then | ||
11218 | + aix_libpath=$lt_cv_aix_libpath | ||
11219 | +else | ||
11220 | + if ${lt_cv_aix_libpath_+:} false; then : | ||
11221 | + $as_echo_n "(cached) " >&6 | ||
11222 | +else | ||
11223 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
11224 | /* end confdefs.h. */ | ||
11225 | |||
11226 | int | ||
11227 | @@ -9583,22 +10102,29 @@ main () | ||
11228 | _ACEOF | ||
11229 | if ac_fn_c_try_link "$LINENO"; then : | ||
11230 | |||
11231 | -lt_aix_libpath_sed=' | ||
11232 | - /Import File Strings/,/^$/ { | ||
11233 | - /^0/ { | ||
11234 | - s/^0 *\(.*\)$/\1/ | ||
11235 | - p | ||
11236 | - } | ||
11237 | - }' | ||
11238 | -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | ||
11239 | -# Check for a 64-bit object if we didn't find anything. | ||
11240 | -if test -z "$aix_libpath"; then | ||
11241 | - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | ||
11242 | -fi | ||
11243 | + lt_aix_libpath_sed=' | ||
11244 | + /Import File Strings/,/^$/ { | ||
11245 | + /^0/ { | ||
11246 | + s/^0 *\([^ ]*\) *$/\1/ | ||
11247 | + p | ||
11248 | + } | ||
11249 | + }' | ||
11250 | + lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | ||
11251 | + # Check for a 64-bit object if we didn't find anything. | ||
11252 | + if test -z "$lt_cv_aix_libpath_"; then | ||
11253 | + lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | ||
11254 | + fi | ||
11255 | fi | ||
11256 | rm -f core conftest.err conftest.$ac_objext \ | ||
11257 | conftest$ac_exeext conftest.$ac_ext | ||
11258 | -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | ||
11259 | + if test -z "$lt_cv_aix_libpath_"; then | ||
11260 | + lt_cv_aix_libpath_="/usr/lib:/lib" | ||
11261 | + fi | ||
11262 | + | ||
11263 | +fi | ||
11264 | + | ||
11265 | + aix_libpath=$lt_cv_aix_libpath_ | ||
11266 | +fi | ||
11267 | |||
11268 | 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" | ||
11270 | @@ -9610,7 +10136,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | ||
11271 | else | ||
11272 | # Determine the default libpath from the value encoded in an | ||
11273 | # empty executable. | ||
11274 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
11275 | + if test "${lt_cv_aix_libpath+set}" = set; then | ||
11276 | + aix_libpath=$lt_cv_aix_libpath | ||
11277 | +else | ||
11278 | + if ${lt_cv_aix_libpath_+:} false; then : | ||
11279 | + $as_echo_n "(cached) " >&6 | ||
11280 | +else | ||
11281 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
11282 | /* end confdefs.h. */ | ||
11283 | |||
11284 | int | ||
11285 | @@ -9623,22 +10155,29 @@ main () | ||
11286 | _ACEOF | ||
11287 | if ac_fn_c_try_link "$LINENO"; then : | ||
11288 | |||
11289 | -lt_aix_libpath_sed=' | ||
11290 | - /Import File Strings/,/^$/ { | ||
11291 | - /^0/ { | ||
11292 | - s/^0 *\(.*\)$/\1/ | ||
11293 | - p | ||
11294 | - } | ||
11295 | - }' | ||
11296 | -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | ||
11297 | -# Check for a 64-bit object if we didn't find anything. | ||
11298 | -if test -z "$aix_libpath"; then | ||
11299 | - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | ||
11300 | -fi | ||
11301 | + lt_aix_libpath_sed=' | ||
11302 | + /Import File Strings/,/^$/ { | ||
11303 | + /^0/ { | ||
11304 | + s/^0 *\([^ ]*\) *$/\1/ | ||
11305 | + p | ||
11306 | + } | ||
11307 | + }' | ||
11308 | + lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | ||
11309 | + # Check for a 64-bit object if we didn't find anything. | ||
11310 | + if test -z "$lt_cv_aix_libpath_"; then | ||
11311 | + lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | ||
11312 | + fi | ||
11313 | fi | ||
11314 | rm -f core conftest.err conftest.$ac_objext \ | ||
11315 | conftest$ac_exeext conftest.$ac_ext | ||
11316 | -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | ||
11317 | + if test -z "$lt_cv_aix_libpath_"; then | ||
11318 | + lt_cv_aix_libpath_="/usr/lib:/lib" | ||
11319 | + fi | ||
11320 | + | ||
11321 | +fi | ||
11322 | + | ||
11323 | + aix_libpath=$lt_cv_aix_libpath_ | ||
11324 | +fi | ||
11325 | |||
11326 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" | ||
11327 | # Warning - without using the other run time loading flags, | ||
11328 | @@ -9683,20 +10222,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | ||
11329 | # Microsoft Visual C++. | ||
11330 | # hardcode_libdir_flag_spec is actually meaningless, as there is | ||
11331 | # no search path for DLLs. | ||
11332 | - hardcode_libdir_flag_spec=' ' | ||
11333 | - allow_undefined_flag=unsupported | ||
11334 | - # Tell ltmain to make .lib files, not .a files. | ||
11335 | - libext=lib | ||
11336 | - # Tell ltmain to make .dll files, not .so files. | ||
11337 | - shrext_cmds=".dll" | ||
11338 | - # FIXME: Setting linknames here is a bad hack. | ||
11339 | - archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' | ||
11340 | - # The linker will automatically build a .lib file if we build a DLL. | ||
11341 | - old_archive_from_new_cmds='true' | ||
11342 | - # FIXME: Should let the user specify the lib program. | ||
11343 | - old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' | ||
11344 | - fix_srcfile_path='`cygpath -w "$srcfile"`' | ||
11345 | - enable_shared_with_static_runtimes=yes | ||
11346 | + case $cc_basename in | ||
11347 | + cl*) | ||
11348 | + # Native MSVC | ||
11349 | + hardcode_libdir_flag_spec=' ' | ||
11350 | + allow_undefined_flag=unsupported | ||
11351 | + always_export_symbols=yes | ||
11352 | + file_list_spec='@' | ||
11353 | + # Tell ltmain to make .lib files, not .a files. | ||
11354 | + libext=lib | ||
11355 | + # Tell ltmain to make .dll files, not .so files. | ||
11356 | + shrext_cmds=".dll" | ||
11357 | + # FIXME: Setting linknames here is a bad hack. | ||
11358 | + archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' | ||
11359 | + archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then | ||
11360 | + sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; | ||
11361 | + else | ||
11362 | + sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; | ||
11363 | + fi~ | ||
11364 | + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ | ||
11365 | + linknames=' | ||
11366 | + # The linker will not automatically build a static lib if we build a DLL. | ||
11367 | + # _LT_TAGVAR(old_archive_from_new_cmds, )='true' | ||
11368 | + enable_shared_with_static_runtimes=yes | ||
11369 | + export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' | ||
11370 | + # Don't use ranlib | ||
11371 | + old_postinstall_cmds='chmod 644 $oldlib' | ||
11372 | + postlink_cmds='lt_outputfile="@OUTPUT@"~ | ||
11373 | + lt_tool_outputfile="@TOOL_OUTPUT@"~ | ||
11374 | + case $lt_outputfile in | ||
11375 | + *.exe|*.EXE) ;; | ||
11376 | + *) | ||
11377 | + lt_outputfile="$lt_outputfile.exe" | ||
11378 | + lt_tool_outputfile="$lt_tool_outputfile.exe" | ||
11379 | + ;; | ||
11380 | + esac~ | ||
11381 | + if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then | ||
11382 | + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; | ||
11383 | + $RM "$lt_outputfile.manifest"; | ||
11384 | + fi' | ||
11385 | + ;; | ||
11386 | + *) | ||
11387 | + # Assume MSVC wrapper | ||
11388 | + hardcode_libdir_flag_spec=' ' | ||
11389 | + allow_undefined_flag=unsupported | ||
11390 | + # Tell ltmain to make .lib files, not .a files. | ||
11391 | + libext=lib | ||
11392 | + # Tell ltmain to make .dll files, not .so files. | ||
11393 | + shrext_cmds=".dll" | ||
11394 | + # FIXME: Setting linknames here is a bad hack. | ||
11395 | + archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' | ||
11396 | + # The linker will automatically build a .lib file if we build a DLL. | ||
11397 | + old_archive_from_new_cmds='true' | ||
11398 | + # FIXME: Should let the user specify the lib program. | ||
11399 | + old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' | ||
11400 | + enable_shared_with_static_runtimes=yes | ||
11401 | + ;; | ||
11402 | + esac | ||
11403 | ;; | ||
11404 | |||
11405 | darwin* | rhapsody*) | ||
11406 | @@ -9757,7 +10339,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | ||
11407 | |||
11408 | # FreeBSD 3 and greater uses gcc -shared to do shared libraries. | ||
11409 | freebsd* | dragonfly*) | ||
11410 | - archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' | ||
11411 | + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' | ||
11412 | hardcode_libdir_flag_spec='-R$libdir' | ||
11413 | hardcode_direct=yes | ||
11414 | hardcode_shlibpath_var=no | ||
11415 | @@ -9765,7 +10347,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | ||
11416 | |||
11417 | hpux9*) | ||
11418 | if test "$GCC" = yes; then | ||
11419 | - 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' | ||
11420 | + 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' | ||
11421 | 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' | ||
11423 | fi | ||
11424 | @@ -9781,7 +10363,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | ||
11425 | |||
11426 | hpux10*) | ||
11427 | if test "$GCC" = yes && test "$with_gnu_ld" = no; then | ||
11428 | - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' | ||
11429 | + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' | ||
11430 | else | ||
11431 | archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' | ||
11432 | fi | ||
11433 | @@ -9805,10 +10387,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' | ||
11435 | ;; | ||
11436 | ia64*) | ||
11437 | - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' | ||
11438 | + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' | ||
11439 | ;; | ||
11440 | *) | ||
11441 | - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' | ||
11442 | + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' | ||
11443 | ;; | ||
11444 | esac | ||
11445 | else | ||
11446 | @@ -9887,23 +10469,36 @@ fi | ||
11447 | |||
11448 | irix5* | irix6* | nonstopux*) | ||
11449 | if test "$GCC" = yes; then | ||
11450 | - 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' | ||
11451 | + 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' | ||
11452 | # Try to use the -exported_symbol ld option, if it does not | ||
11453 | # work, assume that -exports_file does not work either and | ||
11454 | # implicitly export all symbols. | ||
11455 | - save_LDFLAGS="$LDFLAGS" | ||
11456 | - LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" | ||
11457 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
11458 | + # This should be the same for all languages, so no per-tag cache variable. | ||
11459 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5 | ||
11460 | +$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; } | ||
11461 | +if ${lt_cv_irix_exported_symbol+:} false; then : | ||
11462 | + $as_echo_n "(cached) " >&6 | ||
11463 | +else | ||
11464 | + save_LDFLAGS="$LDFLAGS" | ||
11465 | + LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" | ||
11466 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
11467 | /* end confdefs.h. */ | ||
11468 | -int foo(void) {} | ||
11469 | +int foo (void) { return 0; } | ||
11470 | _ACEOF | ||
11471 | if ac_fn_c_try_link "$LINENO"; then : | ||
11472 | - 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' | ||
11473 | - | ||
11474 | + lt_cv_irix_exported_symbol=yes | ||
11475 | +else | ||
11476 | + lt_cv_irix_exported_symbol=no | ||
11477 | fi | ||
11478 | rm -f core conftest.err conftest.$ac_objext \ | ||
11479 | conftest$ac_exeext conftest.$ac_ext | ||
11480 | - LDFLAGS="$save_LDFLAGS" | ||
11481 | + LDFLAGS="$save_LDFLAGS" | ||
11482 | +fi | ||
11483 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5 | ||
11484 | +$as_echo "$lt_cv_irix_exported_symbol" >&6; } | ||
11485 | + if test "$lt_cv_irix_exported_symbol" = yes; then | ||
11486 | + 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' | ||
11487 | + fi | ||
11488 | 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' | ||
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' | ||
11491 | @@ -9988,7 +10583,7 @@ rm -f core conftest.err conftest.$ac_objext \ | ||
11492 | osf4* | osf5*) # as osf3* with the addition of -msym flag | ||
11493 | if test "$GCC" = yes; then | ||
11494 | allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' | ||
11495 | - 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' | ||
11496 | + 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' | ||
11497 | hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' | ||
11498 | else | ||
11499 | allow_undefined_flag=' -expect_unresolved \*' | ||
11500 | @@ -10007,9 +10602,9 @@ rm -f core conftest.err conftest.$ac_objext \ | ||
11501 | no_undefined_flag=' -z defs' | ||
11502 | if test "$GCC" = yes; then | ||
11503 | wlarc='${wl}' | ||
11504 | - archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' | ||
11505 | + archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' | ||
11506 | archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ | ||
11507 | - $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' | ||
11508 | + $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' | ||
11509 | else | ||
11510 | case `$CC -V 2>&1` in | ||
11511 | *"Compilers 5.0"*) | ||
11512 | @@ -10585,8 +11180,9 @@ cygwin* | mingw* | pw32* | cegcc*) | ||
11513 | need_version=no | ||
11514 | need_lib_prefix=no | ||
11515 | |||
11516 | - case $GCC,$host_os in | ||
11517 | - yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) | ||
11518 | + case $GCC,$cc_basename in | ||
11519 | + yes,*) | ||
11520 | + # gcc | ||
11521 | library_names_spec='$libname.dll.a' | ||
11522 | # DLL is installed to $(libdir)/../bin by postinstall_cmds | ||
11523 | postinstall_cmds='base_file=`basename \${file}`~ | ||
11524 | @@ -10619,13 +11215,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}' | ||
11526 | ;; | ||
11527 | esac | ||
11528 | + dynamic_linker='Win32 ld.exe' | ||
11529 | + ;; | ||
11530 | + | ||
11531 | + *,cl*) | ||
11532 | + # Native MSVC | ||
11533 | + libname_spec='$name' | ||
11534 | + soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' | ||
11535 | + library_names_spec='${libname}.dll.lib' | ||
11536 | + | ||
11537 | + case $build_os in | ||
11538 | + mingw*) | ||
11539 | + sys_lib_search_path_spec= | ||
11540 | + lt_save_ifs=$IFS | ||
11541 | + IFS=';' | ||
11542 | + for lt_path in $LIB | ||
11543 | + do | ||
11544 | + IFS=$lt_save_ifs | ||
11545 | + # Let DOS variable expansion print the short 8.3 style file name. | ||
11546 | + lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` | ||
11547 | + sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" | ||
11548 | + done | ||
11549 | + IFS=$lt_save_ifs | ||
11550 | + # Convert to MSYS style. | ||
11551 | + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` | ||
11552 | + ;; | ||
11553 | + cygwin*) | ||
11554 | + # Convert to unix form, then to dos form, then back to unix form | ||
11555 | + # but this time dos style (no spaces!) so that the unix form looks | ||
11556 | + # like /cygdrive/c/PROGRA~1:/cygdr... | ||
11557 | + sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` | ||
11558 | + sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` | ||
11559 | + sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` | ||
11560 | + ;; | ||
11561 | + *) | ||
11562 | + sys_lib_search_path_spec="$LIB" | ||
11563 | + if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then | ||
11564 | + # It is most probably a Windows format PATH. | ||
11565 | + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` | ||
11566 | + else | ||
11567 | + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` | ||
11568 | + fi | ||
11569 | + # FIXME: find the short name or the path components, as spaces are | ||
11570 | + # common. (e.g. "Program Files" -> "PROGRA~1") | ||
11571 | + ;; | ||
11572 | + esac | ||
11573 | + | ||
11574 | + # DLL is installed to $(libdir)/../bin by postinstall_cmds | ||
11575 | + postinstall_cmds='base_file=`basename \${file}`~ | ||
11576 | + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ | ||
11577 | + dldir=$destdir/`dirname \$dlpath`~ | ||
11578 | + test -d \$dldir || mkdir -p \$dldir~ | ||
11579 | + $install_prog $dir/$dlname \$dldir/$dlname' | ||
11580 | + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ | ||
11581 | + dlpath=$dir/\$dldll~ | ||
11582 | + $RM \$dlpath' | ||
11583 | + shlibpath_overrides_runpath=yes | ||
11584 | + dynamic_linker='Win32 link.exe' | ||
11585 | ;; | ||
11586 | |||
11587 | *) | ||
11588 | + # Assume MSVC wrapper | ||
11589 | library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' | ||
11590 | + dynamic_linker='Win32 ld.exe' | ||
11591 | ;; | ||
11592 | esac | ||
11593 | - dynamic_linker='Win32 ld.exe' | ||
11594 | # FIXME: first we should search . and the directory the executable is in | ||
11595 | shlibpath_var=PATH | ||
11596 | ;; | ||
11597 | @@ -10717,7 +11371,7 @@ haiku*) | ||
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 | @@ -11513,7 +12167,7 @@ else | ||
11607 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 | ||
11608 | lt_status=$lt_dlunknown | ||
11609 | cat > conftest.$ac_ext <<_LT_EOF | ||
11610 | -#line 11516 "configure" | ||
11611 | +#line $LINENO "configure" | ||
11612 | #include "confdefs.h" | ||
11613 | |||
11614 | #if HAVE_DLFCN_H | ||
11615 | @@ -11557,10 +12211,10 @@ else | ||
11616 | /* When -fvisbility=hidden is used, assume the code has been annotated | ||
11617 | correspondingly for the symbols needed. */ | ||
11618 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) | ||
11619 | -void fnord () __attribute__((visibility("default"))); | ||
11620 | +int fnord () __attribute__((visibility("default"))); | ||
11621 | #endif | ||
11622 | |||
11623 | -void fnord () { int i=42; } | ||
11624 | +int fnord () { return 42; } | ||
11625 | int main () | ||
11626 | { | ||
11627 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); | ||
11628 | @@ -11619,7 +12273,7 @@ else | ||
11629 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 | ||
11630 | lt_status=$lt_dlunknown | ||
11631 | cat > conftest.$ac_ext <<_LT_EOF | ||
11632 | -#line 11622 "configure" | ||
11633 | +#line $LINENO "configure" | ||
11634 | #include "confdefs.h" | ||
11635 | |||
11636 | #if HAVE_DLFCN_H | ||
11637 | @@ -11663,10 +12317,10 @@ else | ||
11638 | /* When -fvisbility=hidden is used, assume the code has been annotated | ||
11639 | correspondingly for the symbols needed. */ | ||
11640 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) | ||
11641 | -void fnord () __attribute__((visibility("default"))); | ||
11642 | +int fnord () __attribute__((visibility("default"))); | ||
11643 | #endif | ||
11644 | |||
11645 | -void fnord () { int i=42; } | ||
11646 | +int fnord () { return 42; } | ||
11647 | int main () | ||
11648 | { | ||
11649 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); | ||
11650 | @@ -14110,13 +14764,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' | ||
11651 | lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' | ||
11652 | lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' | ||
11653 | lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' | ||
11654 | +lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`' | ||
11655 | +lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`' | ||
11656 | reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`' | ||
11657 | reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`' | ||
11658 | OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`' | ||
11659 | deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`' | ||
11660 | file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`' | ||
11661 | +file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`' | ||
11662 | +want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`' | ||
11663 | +DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`' | ||
11664 | +sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`' | ||
11665 | AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`' | ||
11666 | AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`' | ||
11667 | +archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`' | ||
11668 | STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' | ||
11669 | RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' | ||
11670 | old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' | ||
11671 | @@ -14131,14 +14792,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"`' | ||
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"`' | ||
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"`' | ||
11675 | +nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`' | ||
11676 | +lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`' | ||
11677 | objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`' | ||
11678 | MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`' | ||
11679 | lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`' | ||
11680 | -lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' | ||
11681 | lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`' | ||
11682 | +lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' | ||
11683 | lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`' | ||
11684 | lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`' | ||
11685 | need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`' | ||
11686 | +MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`' | ||
11687 | DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' | ||
11688 | NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' | ||
11689 | LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' | ||
11690 | @@ -14171,12 +14835,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q | ||
11691 | hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' | ||
11692 | inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' | ||
11693 | link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' | ||
11694 | -fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`' | ||
11695 | always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`' | ||
11696 | export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`' | ||
11697 | exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`' | ||
11698 | include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`' | ||
11699 | prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`' | ||
11700 | +postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`' | ||
11701 | 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"`' | ||
11703 | need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' | ||
11704 | @@ -14231,8 +14895,13 @@ reload_flag \ | ||
11705 | OBJDUMP \ | ||
11706 | deplibs_check_method \ | ||
11707 | file_magic_cmd \ | ||
11708 | +file_magic_glob \ | ||
11709 | +want_nocaseglob \ | ||
11710 | +DLLTOOL \ | ||
11711 | +sharedlib_from_linklib_cmd \ | ||
11712 | AR \ | ||
11713 | AR_FLAGS \ | ||
11714 | +archiver_list_spec \ | ||
11715 | STRIP \ | ||
11716 | RANLIB \ | ||
11717 | CC \ | ||
11718 | @@ -14242,12 +14911,14 @@ lt_cv_sys_global_symbol_pipe \ | ||
11719 | lt_cv_sys_global_symbol_to_cdecl \ | ||
11720 | lt_cv_sys_global_symbol_to_c_name_address \ | ||
11721 | lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ | ||
11722 | +nm_file_list_spec \ | ||
11723 | lt_prog_compiler_no_builtin_flag \ | ||
11724 | -lt_prog_compiler_wl \ | ||
11725 | lt_prog_compiler_pic \ | ||
11726 | +lt_prog_compiler_wl \ | ||
11727 | lt_prog_compiler_static \ | ||
11728 | lt_cv_prog_compiler_c_o \ | ||
11729 | need_locks \ | ||
11730 | +MANIFEST_TOOL \ | ||
11731 | DSYMUTIL \ | ||
11732 | NMEDIT \ | ||
11733 | LIPO \ | ||
11734 | @@ -14263,7 +14934,6 @@ no_undefined_flag \ | ||
11735 | hardcode_libdir_flag_spec \ | ||
11736 | hardcode_libdir_flag_spec_ld \ | ||
11737 | hardcode_libdir_separator \ | ||
11738 | -fix_srcfile_path \ | ||
11739 | exclude_expsyms \ | ||
11740 | include_expsyms \ | ||
11741 | file_list_spec \ | ||
11742 | @@ -14299,6 +14969,7 @@ module_cmds \ | ||
11743 | module_expsym_cmds \ | ||
11744 | export_symbols_cmds \ | ||
11745 | prelink_cmds \ | ||
11746 | +postlink_cmds \ | ||
11747 | postinstall_cmds \ | ||
11748 | postuninstall_cmds \ | ||
11749 | finish_cmds \ | ||
11750 | @@ -15055,7 +15726,8 @@ $as_echo X"$file" | | ||
11751 | # NOTE: Changes made to this file will be lost: look at ltmain.sh. | ||
11752 | # | ||
11753 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, | ||
11754 | -# 2006, 2007, 2008, 2009 Free Software Foundation, Inc. | ||
11755 | +# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, | ||
11756 | +# Inc. | ||
11757 | # Written by Gordon Matzigkeit, 1996 | ||
11758 | # | ||
11759 | # This file is part of GNU Libtool. | ||
11760 | @@ -15158,19 +15830,42 @@ SP2NL=$lt_lt_SP2NL | ||
11761 | # turn newlines into spaces. | ||
11762 | NL2SP=$lt_lt_NL2SP | ||
11763 | |||
11764 | +# convert \$build file names to \$host format. | ||
11765 | +to_host_file_cmd=$lt_cv_to_host_file_cmd | ||
11766 | + | ||
11767 | +# convert \$build files to toolchain format. | ||
11768 | +to_tool_file_cmd=$lt_cv_to_tool_file_cmd | ||
11769 | + | ||
11770 | # An object symbol dumper. | ||
11771 | OBJDUMP=$lt_OBJDUMP | ||
11772 | |||
11773 | # Method to check whether dependent libraries are shared objects. | ||
11774 | deplibs_check_method=$lt_deplibs_check_method | ||
11775 | |||
11776 | -# Command to use when deplibs_check_method == "file_magic". | ||
11777 | +# Command to use when deplibs_check_method = "file_magic". | ||
11778 | file_magic_cmd=$lt_file_magic_cmd | ||
11779 | |||
11780 | +# How to find potential files when deplibs_check_method = "file_magic". | ||
11781 | +file_magic_glob=$lt_file_magic_glob | ||
11782 | + | ||
11783 | +# Find potential files using nocaseglob when deplibs_check_method = "file_magic". | ||
11784 | +want_nocaseglob=$lt_want_nocaseglob | ||
11785 | + | ||
11786 | +# DLL creation program. | ||
11787 | +DLLTOOL=$lt_DLLTOOL | ||
11788 | + | ||
11789 | +# Command to associate shared and link libraries. | ||
11790 | +sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd | ||
11791 | + | ||
11792 | # The archiver. | ||
11793 | AR=$lt_AR | ||
11794 | + | ||
11795 | +# Flags to create an archive. | ||
11796 | AR_FLAGS=$lt_AR_FLAGS | ||
11797 | |||
11798 | +# How to feed a file listing to the archiver. | ||
11799 | +archiver_list_spec=$lt_archiver_list_spec | ||
11800 | + | ||
11801 | # A symbol stripping program. | ||
11802 | STRIP=$lt_STRIP | ||
11803 | |||
11804 | @@ -15200,6 +15895,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. | ||
11806 | global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix | ||
11807 | |||
11808 | +# Specify filename containing input files for \$NM. | ||
11809 | +nm_file_list_spec=$lt_nm_file_list_spec | ||
11810 | + | ||
11811 | +# The root where to search for dependent libraries,and in which our libraries should be installed. | ||
11812 | +lt_sysroot=$lt_sysroot | ||
11813 | + | ||
11814 | # The name of the directory that contains temporary libtool files. | ||
11815 | objdir=$objdir | ||
11816 | |||
11817 | @@ -15209,6 +15910,9 @@ MAGIC_CMD=$MAGIC_CMD | ||
11818 | # Must we lock files when doing compilation? | ||
11819 | need_locks=$lt_need_locks | ||
11820 | |||
11821 | +# Manifest tool. | ||
11822 | +MANIFEST_TOOL=$lt_MANIFEST_TOOL | ||
11823 | + | ||
11824 | # Tool to manipulate archived DWARF debug symbol files on Mac OS X. | ||
11825 | DSYMUTIL=$lt_DSYMUTIL | ||
11826 | |||
11827 | @@ -15323,12 +16027,12 @@ with_gcc=$GCC | ||
11828 | # Compiler flag to turn off builtin functions. | ||
11829 | no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag | ||
11830 | |||
11831 | -# How to pass a linker flag through the compiler. | ||
11832 | -wl=$lt_lt_prog_compiler_wl | ||
11833 | - | ||
11834 | # Additional compiler flags for building library objects. | ||
11835 | pic_flag=$lt_lt_prog_compiler_pic | ||
11836 | |||
11837 | +# How to pass a linker flag through the compiler. | ||
11838 | +wl=$lt_lt_prog_compiler_wl | ||
11839 | + | ||
11840 | # Compiler flag to prevent dynamic linking. | ||
11841 | link_static_flag=$lt_lt_prog_compiler_static | ||
11842 | |||
11843 | @@ -15415,9 +16119,6 @@ inherit_rpath=$inherit_rpath | ||
11844 | # Whether libtool must link a program against all its dependency libraries. | ||
11845 | link_all_deplibs=$link_all_deplibs | ||
11846 | |||
11847 | -# Fix the shell variable \$srcfile for the compiler. | ||
11848 | -fix_srcfile_path=$lt_fix_srcfile_path | ||
11849 | - | ||
11850 | # Set to "yes" if exported symbols are required. | ||
11851 | always_export_symbols=$always_export_symbols | ||
11852 | |||
11853 | @@ -15433,6 +16134,9 @@ include_expsyms=$lt_include_expsyms | ||
11854 | # Commands necessary for linking programs (against libraries) with templates. | ||
11855 | prelink_cmds=$lt_prelink_cmds | ||
11856 | |||
11857 | +# Commands necessary for finishing linking programs. | ||
11858 | +postlink_cmds=$lt_postlink_cmds | ||
11859 | + | ||
11860 | # Specify filename containing input files. | ||
11861 | file_list_spec=$lt_file_list_spec | ||
11862 | |||
11863 | @@ -15465,210 +16169,169 @@ ltmain="$ac_aux_dir/ltmain.sh" | ||
11864 | # 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 | ||
11866 | # is reportedly fixed, but why not run on old versions too? | ||
11867 | - sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ | ||
11868 | - || (rm -f "$cfgfile"; exit 1) | ||
11869 | - | ||
11870 | - case $xsi_shell in | ||
11871 | - yes) | ||
11872 | - cat << \_LT_EOF >> "$cfgfile" | ||
11873 | - | ||
11874 | -# func_dirname file append nondir_replacement | ||
11875 | -# Compute the dirname of FILE. If nonempty, add APPEND to the result, | ||
11876 | -# otherwise set result to NONDIR_REPLACEMENT. | ||
11877 | -func_dirname () | ||
11878 | -{ | ||
11879 | - case ${1} in | ||
11880 | - */*) func_dirname_result="${1%/*}${2}" ;; | ||
11881 | - * ) func_dirname_result="${3}" ;; | ||
11882 | - esac | ||
11883 | -} | ||
11884 | - | ||
11885 | -# func_basename file | ||
11886 | -func_basename () | ||
11887 | -{ | ||
11888 | - func_basename_result="${1##*/}" | ||
11889 | -} | ||
11890 | - | ||
11891 | -# func_dirname_and_basename file append nondir_replacement | ||
11892 | -# perform func_basename and func_dirname in a single function | ||
11893 | -# call: | ||
11894 | -# dirname: Compute the dirname of FILE. If nonempty, | ||
11895 | -# add APPEND to the result, otherwise set result | ||
11896 | -# to NONDIR_REPLACEMENT. | ||
11897 | -# value returned in "$func_dirname_result" | ||
11898 | -# basename: Compute filename of FILE. | ||
11899 | -# value retuned in "$func_basename_result" | ||
11900 | -# Implementation must be kept synchronized with func_dirname | ||
11901 | -# and func_basename. For efficiency, we do not delegate to | ||
11902 | -# those functions but instead duplicate the functionality here. | ||
11903 | -func_dirname_and_basename () | ||
11904 | -{ | ||
11905 | - case ${1} in | ||
11906 | - */*) func_dirname_result="${1%/*}${2}" ;; | ||
11907 | - * ) func_dirname_result="${3}" ;; | ||
11908 | - esac | ||
11909 | - func_basename_result="${1##*/}" | ||
11910 | -} | ||
11911 | - | ||
11912 | -# func_stripname prefix suffix name | ||
11913 | -# strip PREFIX and SUFFIX off of NAME. | ||
11914 | -# PREFIX and SUFFIX must not contain globbing or regex special | ||
11915 | -# characters, hashes, percent signs, but SUFFIX may contain a leading | ||
11916 | -# dot (in which case that matches only a dot). | ||
11917 | -func_stripname () | ||
11918 | -{ | ||
11919 | - # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are | ||
11920 | - # positional parameters, so assign one to ordinary parameter first. | ||
11921 | - func_stripname_result=${3} | ||
11922 | - func_stripname_result=${func_stripname_result#"${1}"} | ||
11923 | - func_stripname_result=${func_stripname_result%"${2}"} | ||
11924 | -} | ||
11925 | - | ||
11926 | -# func_opt_split | ||
11927 | -func_opt_split () | ||
11928 | -{ | ||
11929 | - func_opt_split_opt=${1%%=*} | ||
11930 | - func_opt_split_arg=${1#*=} | ||
11931 | -} | ||
11932 | - | ||
11933 | -# func_lo2o object | ||
11934 | -func_lo2o () | ||
11935 | -{ | ||
11936 | - case ${1} in | ||
11937 | - *.lo) func_lo2o_result=${1%.lo}.${objext} ;; | ||
11938 | - *) func_lo2o_result=${1} ;; | ||
11939 | - esac | ||
11940 | -} | ||
11941 | - | ||
11942 | -# func_xform libobj-or-source | ||
11943 | -func_xform () | ||
11944 | -{ | ||
11945 | - func_xform_result=${1%.*}.lo | ||
11946 | -} | ||
11947 | - | ||
11948 | -# func_arith arithmetic-term... | ||
11949 | -func_arith () | ||
11950 | -{ | ||
11951 | - func_arith_result=$(( $* )) | ||
11952 | -} | ||
11953 | - | ||
11954 | -# func_len string | ||
11955 | -# STRING may not start with a hyphen. | ||
11956 | -func_len () | ||
11957 | -{ | ||
11958 | - func_len_result=${#1} | ||
11959 | -} | ||
11960 | - | ||
11961 | -_LT_EOF | ||
11962 | - ;; | ||
11963 | - *) # Bourne compatible functions. | ||
11964 | - cat << \_LT_EOF >> "$cfgfile" | ||
11965 | - | ||
11966 | -# func_dirname file append nondir_replacement | ||
11967 | -# Compute the dirname of FILE. If nonempty, add APPEND to the result, | ||
11968 | -# otherwise set result to NONDIR_REPLACEMENT. | ||
11969 | -func_dirname () | ||
11970 | -{ | ||
11971 | - # Extract subdirectory from the argument. | ||
11972 | - func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` | ||
11973 | - if test "X$func_dirname_result" = "X${1}"; then | ||
11974 | - func_dirname_result="${3}" | ||
11975 | - else | ||
11976 | - func_dirname_result="$func_dirname_result${2}" | ||
11977 | - fi | ||
11978 | -} | ||
11979 | - | ||
11980 | -# func_basename file | ||
11981 | -func_basename () | ||
11982 | -{ | ||
11983 | - func_basename_result=`$ECHO "${1}" | $SED "$basename"` | ||
11984 | -} | ||
11985 | - | ||
11986 | - | ||
11987 | -# func_stripname prefix suffix name | ||
11988 | -# strip PREFIX and SUFFIX off of NAME. | ||
11989 | -# PREFIX and SUFFIX must not contain globbing or regex special | ||
11990 | -# characters, hashes, percent signs, but SUFFIX may contain a leading | ||
11991 | -# dot (in which case that matches only a dot). | ||
11992 | -# func_strip_suffix prefix name | ||
11993 | -func_stripname () | ||
11994 | -{ | ||
11995 | - case ${2} in | ||
11996 | - .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; | ||
11997 | - *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; | ||
11998 | - esac | ||
11999 | -} | ||
12000 | - | ||
12001 | -# sed scripts: | ||
12002 | -my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q' | ||
12003 | -my_sed_long_arg='1s/^-[^=]*=//' | ||
12004 | - | ||
12005 | -# func_opt_split | ||
12006 | -func_opt_split () | ||
12007 | -{ | ||
12008 | - func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"` | ||
12009 | - func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"` | ||
12010 | -} | ||
12011 | - | ||
12012 | -# func_lo2o object | ||
12013 | -func_lo2o () | ||
12014 | -{ | ||
12015 | - func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` | ||
12016 | -} | ||
12017 | - | ||
12018 | -# func_xform libobj-or-source | ||
12019 | -func_xform () | ||
12020 | -{ | ||
12021 | - func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'` | ||
12022 | -} | ||
12023 | - | ||
12024 | -# func_arith arithmetic-term... | ||
12025 | -func_arith () | ||
12026 | -{ | ||
12027 | - func_arith_result=`expr "$@"` | ||
12028 | -} | ||
12029 | - | ||
12030 | -# func_len string | ||
12031 | -# STRING may not start with a hyphen. | ||
12032 | -func_len () | ||
12033 | -{ | ||
12034 | - func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len` | ||
12035 | -} | ||
12036 | - | ||
12037 | -_LT_EOF | ||
12038 | -esac | ||
12039 | - | ||
12040 | -case $lt_shell_append in | ||
12041 | - yes) | ||
12042 | - cat << \_LT_EOF >> "$cfgfile" | ||
12043 | - | ||
12044 | -# func_append var value | ||
12045 | -# Append VALUE to the end of shell variable VAR. | ||
12046 | -func_append () | ||
12047 | -{ | ||
12048 | - eval "$1+=\$2" | ||
12049 | -} | ||
12050 | -_LT_EOF | ||
12051 | - ;; | ||
12052 | - *) | ||
12053 | - cat << \_LT_EOF >> "$cfgfile" | ||
12054 | - | ||
12055 | -# func_append var value | ||
12056 | -# Append VALUE to the end of shell variable VAR. | ||
12057 | -func_append () | ||
12058 | -{ | ||
12059 | - eval "$1=\$$1\$2" | ||
12060 | -} | ||
12061 | - | ||
12062 | -_LT_EOF | ||
12063 | - ;; | ||
12064 | - esac | ||
12065 | - | ||
12066 | - | ||
12067 | - sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ | ||
12068 | - || (rm -f "$cfgfile"; exit 1) | ||
12069 | - | ||
12070 | - mv -f "$cfgfile" "$ofile" || | ||
12071 | + sed '$q' "$ltmain" >> "$cfgfile" \ | ||
12072 | + || (rm -f "$cfgfile"; exit 1) | ||
12073 | + | ||
12074 | + if test x"$xsi_shell" = xyes; then | ||
12075 | + sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ | ||
12076 | +func_dirname ()\ | ||
12077 | +{\ | ||
12078 | +\ case ${1} in\ | ||
12079 | +\ */*) func_dirname_result="${1%/*}${2}" ;;\ | ||
12080 | +\ * ) func_dirname_result="${3}" ;;\ | ||
12081 | +\ esac\ | ||
12082 | +} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \ | ||
12083 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
12084 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
12085 | +test 0 -eq $? || _lt_function_replace_fail=: | ||
12086 | + | ||
12087 | + | ||
12088 | + sed -e '/^func_basename ()$/,/^} # func_basename /c\ | ||
12089 | +func_basename ()\ | ||
12090 | +{\ | ||
12091 | +\ func_basename_result="${1##*/}"\ | ||
12092 | +} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \ | ||
12093 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
12094 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
12095 | +test 0 -eq $? || _lt_function_replace_fail=: | ||
12096 | + | ||
12097 | + | ||
12098 | + sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\ | ||
12099 | +func_dirname_and_basename ()\ | ||
12100 | +{\ | ||
12101 | +\ case ${1} in\ | ||
12102 | +\ */*) func_dirname_result="${1%/*}${2}" ;;\ | ||
12103 | +\ * ) func_dirname_result="${3}" ;;\ | ||
12104 | +\ esac\ | ||
12105 | +\ func_basename_result="${1##*/}"\ | ||
12106 | +} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \ | ||
12107 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
12108 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
12109 | +test 0 -eq $? || _lt_function_replace_fail=: | ||
12110 | + | ||
12111 | + | ||
12112 | + sed -e '/^func_stripname ()$/,/^} # func_stripname /c\ | ||
12113 | +func_stripname ()\ | ||
12114 | +{\ | ||
12115 | +\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\ | ||
12116 | +\ # positional parameters, so assign one to ordinary parameter first.\ | ||
12117 | +\ func_stripname_result=${3}\ | ||
12118 | +\ func_stripname_result=${func_stripname_result#"${1}"}\ | ||
12119 | +\ func_stripname_result=${func_stripname_result%"${2}"}\ | ||
12120 | +} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \ | ||
12121 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
12122 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
12123 | +test 0 -eq $? || _lt_function_replace_fail=: | ||
12124 | + | ||
12125 | + | ||
12126 | + sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\ | ||
12127 | +func_split_long_opt ()\ | ||
12128 | +{\ | ||
12129 | +\ func_split_long_opt_name=${1%%=*}\ | ||
12130 | +\ func_split_long_opt_arg=${1#*=}\ | ||
12131 | +} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \ | ||
12132 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
12133 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
12134 | +test 0 -eq $? || _lt_function_replace_fail=: | ||
12135 | + | ||
12136 | + | ||
12137 | + sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\ | ||
12138 | +func_split_short_opt ()\ | ||
12139 | +{\ | ||
12140 | +\ func_split_short_opt_arg=${1#??}\ | ||
12141 | +\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\ | ||
12142 | +} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \ | ||
12143 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
12144 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
12145 | +test 0 -eq $? || _lt_function_replace_fail=: | ||
12146 | + | ||
12147 | + | ||
12148 | + sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\ | ||
12149 | +func_lo2o ()\ | ||
12150 | +{\ | ||
12151 | +\ case ${1} in\ | ||
12152 | +\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\ | ||
12153 | +\ *) func_lo2o_result=${1} ;;\ | ||
12154 | +\ esac\ | ||
12155 | +} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \ | ||
12156 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
12157 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
12158 | +test 0 -eq $? || _lt_function_replace_fail=: | ||
12159 | + | ||
12160 | + | ||
12161 | + sed -e '/^func_xform ()$/,/^} # func_xform /c\ | ||
12162 | +func_xform ()\ | ||
12163 | +{\ | ||
12164 | + func_xform_result=${1%.*}.lo\ | ||
12165 | +} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \ | ||
12166 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
12167 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
12168 | +test 0 -eq $? || _lt_function_replace_fail=: | ||
12169 | + | ||
12170 | + | ||
12171 | + sed -e '/^func_arith ()$/,/^} # func_arith /c\ | ||
12172 | +func_arith ()\ | ||
12173 | +{\ | ||
12174 | + func_arith_result=$(( $* ))\ | ||
12175 | +} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \ | ||
12176 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
12177 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
12178 | +test 0 -eq $? || _lt_function_replace_fail=: | ||
12179 | + | ||
12180 | + | ||
12181 | + sed -e '/^func_len ()$/,/^} # func_len /c\ | ||
12182 | +func_len ()\ | ||
12183 | +{\ | ||
12184 | + func_len_result=${#1}\ | ||
12185 | +} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \ | ||
12186 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
12187 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
12188 | +test 0 -eq $? || _lt_function_replace_fail=: | ||
12189 | + | ||
12190 | +fi | ||
12191 | + | ||
12192 | +if test x"$lt_shell_append" = xyes; then | ||
12193 | + sed -e '/^func_append ()$/,/^} # func_append /c\ | ||
12194 | +func_append ()\ | ||
12195 | +{\ | ||
12196 | + eval "${1}+=\\${2}"\ | ||
12197 | +} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \ | ||
12198 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
12199 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
12200 | +test 0 -eq $? || _lt_function_replace_fail=: | ||
12201 | + | ||
12202 | + | ||
12203 | + sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\ | ||
12204 | +func_append_quoted ()\ | ||
12205 | +{\ | ||
12206 | +\ func_quote_for_eval "${2}"\ | ||
12207 | +\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\ | ||
12208 | +} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \ | ||
12209 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
12210 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
12211 | +test 0 -eq $? || _lt_function_replace_fail=: | ||
12212 | + | ||
12213 | + | ||
12214 | + # Save a `func_append' function call where possible by direct use of '+=' | ||
12215 | + sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ | ||
12216 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
12217 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
12218 | + test 0 -eq $? || _lt_function_replace_fail=: | ||
12219 | +else | ||
12220 | + # Save a `func_append' function call even when '+=' is not available | ||
12221 | + sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ | ||
12222 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
12223 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
12224 | + test 0 -eq $? || _lt_function_replace_fail=: | ||
12225 | +fi | ||
12226 | + | ||
12227 | +if test x"$_lt_function_replace_fail" = x":"; then | ||
12228 | + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 | ||
12229 | +$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} | ||
12230 | +fi | ||
12231 | + | ||
12232 | + | ||
12233 | + mv -f "$cfgfile" "$ofile" || | ||
12234 | (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") | ||
12235 | chmod +x "$ofile" | ||
12236 | |||
12237 | diff --git a/libtool.m4 b/libtool.m4 | ||
12238 | index 434530059fa..e45fdc6998c 100644 | ||
12239 | --- a/libtool.m4 | ||
12240 | +++ b/libtool.m4 | ||
12241 | @@ -1,7 +1,8 @@ | ||
12242 | # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- | ||
12243 | # | ||
12244 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, | ||
12245 | -# 2006, 2007, 2008, 2009 Free Software Foundation, Inc. | ||
12246 | +# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, | ||
12247 | +# Inc. | ||
12248 | # Written by Gordon Matzigkeit, 1996 | ||
12249 | # | ||
12250 | # This file is free software; the Free Software Foundation gives | ||
12251 | @@ -10,7 +11,8 @@ | ||
12252 | |||
12253 | m4_define([_LT_COPYING], [dnl | ||
12254 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, | ||
12255 | -# 2006, 2007, 2008, 2009 Free Software Foundation, Inc. | ||
12256 | +# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, | ||
12257 | +# Inc. | ||
12258 | # Written by Gordon Matzigkeit, 1996 | ||
12259 | # | ||
12260 | # This file is part of GNU Libtool. | ||
12261 | @@ -37,7 +39,7 @@ m4_define([_LT_COPYING], [dnl | ||
12262 | # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. | ||
12263 | ]) | ||
12264 | |||
12265 | -# serial 56 LT_INIT | ||
12266 | +# serial 57 LT_INIT | ||
12267 | |||
12268 | |||
12269 | # LT_PREREQ(VERSION) | ||
12270 | @@ -92,7 +94,8 @@ _LT_SET_OPTIONS([$0], [$1]) | ||
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 | ||
12282 | m4_require([_LT_FILEUTILS_DEFAULTS])dnl | ||
12283 | m4_require([_LT_CHECK_SHELL_FEATURES])dnl | ||
12284 | +m4_require([_LT_PATH_CONVERSION_FUNCTIONS])dnl | ||
12285 | m4_require([_LT_CMD_RELOAD])dnl | ||
12286 | m4_require([_LT_CHECK_MAGIC_METHOD])dnl | ||
12287 | +m4_require([_LT_CHECK_SHAREDLIB_FROM_LINKLIB])dnl | ||
12288 | m4_require([_LT_CMD_OLD_ARCHIVE])dnl | ||
12289 | m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl | ||
12290 | +m4_require([_LT_WITH_SYSROOT])dnl | ||
12291 | |||
12292 | _LT_CONFIG_LIBTOOL_INIT([ | ||
12293 | # See if we are running on zsh, and set the options which allow our | ||
12294 | @@ -199,7 +205,7 @@ aix3*) | ||
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]) | ||
12305 | configured by $[0], generated by m4_PACKAGE_STRING. | ||
12306 | |||
12307 | -Copyright (C) 2009 Free Software Foundation, Inc. | ||
12308 | +Copyright (C) 2010 Free Software Foundation, Inc. | ||
12309 | This config.lt script is free software; the Free Software Foundation | ||
12310 | gives unlimited permision to copy, distribute and modify it." | ||
12311 | |||
12312 | @@ -746,15 +752,12 @@ _LT_EOF | ||
12313 | # 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 | ||
12315 | # is reportedly fixed, but why not run on old versions too? | ||
12316 | - sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ | ||
12317 | - || (rm -f "$cfgfile"; exit 1) | ||
12318 | + sed '$q' "$ltmain" >> "$cfgfile" \ | ||
12319 | + || (rm -f "$cfgfile"; exit 1) | ||
12320 | |||
12321 | - _LT_PROG_XSI_SHELLFNS | ||
12322 | + _LT_PROG_REPLACE_SHELLFNS | ||
12323 | |||
12324 | - sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ | ||
12325 | - || (rm -f "$cfgfile"; exit 1) | ||
12326 | - | ||
12327 | - mv -f "$cfgfile" "$ofile" || | ||
12328 | + mv -f "$cfgfile" "$ofile" || | ||
12329 | (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") | ||
12330 | chmod +x "$ofile" | ||
12331 | ], | ||
12332 | @@ -980,6 +983,8 @@ _LT_EOF | ||
12333 | $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 | ||
12335 | $AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD | ||
12336 | + echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD | ||
12337 | + $RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD | ||
12338 | cat > conftest.c << _LT_EOF | ||
12339 | int main() { return 0;} | ||
12340 | _LT_EOF | ||
12341 | @@ -1069,30 +1074,41 @@ m4_defun([_LT_DARWIN_LINKER_FEATURES], | ||
12342 | fi | ||
12343 | ]) | ||
12344 | |||
12345 | -# _LT_SYS_MODULE_PATH_AIX | ||
12346 | -# ----------------------- | ||
12347 | +# _LT_SYS_MODULE_PATH_AIX([TAGNAME]) | ||
12348 | +# ---------------------------------- | ||
12349 | # Links a minimal program and checks the executable | ||
12350 | # for the system default hardcoded library path. In most cases, | ||
12351 | # this is /usr/lib:/lib, but when the MPI compilers are used | ||
12352 | # the location of the communication and MPI libs are included too. | ||
12353 | # If we don't find anything, use the default library path according | ||
12354 | # to the aix ld manual. | ||
12355 | +# Store the results from the different compilers for each TAGNAME. | ||
12356 | +# Allow to override them for all tags through lt_cv_aix_libpath. | ||
12357 | m4_defun([_LT_SYS_MODULE_PATH_AIX], | ||
12358 | [m4_require([_LT_DECL_SED])dnl | ||
12359 | -AC_LINK_IFELSE([AC_LANG_SOURCE([AC_LANG_PROGRAM])],[ | ||
12360 | -lt_aix_libpath_sed=' | ||
12361 | - /Import File Strings/,/^$/ { | ||
12362 | - /^0/ { | ||
12363 | - s/^0 *\(.*\)$/\1/ | ||
12364 | - p | ||
12365 | - } | ||
12366 | - }' | ||
12367 | -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | ||
12368 | -# Check for a 64-bit object if we didn't find anything. | ||
12369 | -if test -z "$aix_libpath"; then | ||
12370 | - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | ||
12371 | -fi],[]) | ||
12372 | -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | ||
12373 | +if test "${lt_cv_aix_libpath+set}" = set; then | ||
12374 | + aix_libpath=$lt_cv_aix_libpath | ||
12375 | +else | ||
12376 | + AC_CACHE_VAL([_LT_TAGVAR([lt_cv_aix_libpath_], [$1])], | ||
12377 | + [AC_LINK_IFELSE([AC_LANG_PROGRAM],[ | ||
12378 | + lt_aix_libpath_sed='[ | ||
12379 | + /Import File Strings/,/^$/ { | ||
12380 | + /^0/ { | ||
12381 | + s/^0 *\([^ ]*\) *$/\1/ | ||
12382 | + p | ||
12383 | + } | ||
12384 | + }]' | ||
12385 | + _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | ||
12386 | + # Check for a 64-bit object if we didn't find anything. | ||
12387 | + if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then | ||
12388 | + _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | ||
12389 | + fi],[]) | ||
12390 | + if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then | ||
12391 | + _LT_TAGVAR([lt_cv_aix_libpath_], [$1])="/usr/lib:/lib" | ||
12392 | + fi | ||
12393 | + ]) | ||
12394 | + aix_libpath=$_LT_TAGVAR([lt_cv_aix_libpath_], [$1]) | ||
12395 | +fi | ||
12396 | ])# _LT_SYS_MODULE_PATH_AIX | ||
12397 | |||
12398 | |||
12399 | @@ -1117,7 +1133,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO | ||
12400 | |||
12401 | AC_MSG_CHECKING([how to print strings]) | ||
12402 | # Test print first, because it will be a builtin if present. | ||
12403 | -if test "X`print -r -- -n 2>/dev/null`" = X-n && \ | ||
12404 | +if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ | ||
12405 | test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then | ||
12406 | ECHO='print -r --' | ||
12407 | 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]) | ||
12409 | ])# _LT_PROG_ECHO_BACKSLASH | ||
12410 | |||
12411 | |||
12412 | +# _LT_WITH_SYSROOT | ||
12413 | +# ---------------- | ||
12414 | +AC_DEFUN([_LT_WITH_SYSROOT], | ||
12415 | +[AC_MSG_CHECKING([for sysroot]) | ||
12416 | +AC_ARG_WITH([libtool-sysroot], | ||
12417 | +[ --with-libtool-sysroot[=DIR] Search for dependent libraries within DIR | ||
12418 | + (or the compiler's sysroot if not specified).], | ||
12419 | +[], [with_libtool_sysroot=no]) | ||
12420 | + | ||
12421 | +dnl lt_sysroot will always be passed unquoted. We quote it here | ||
12422 | +dnl in case the user passed a directory name. | ||
12423 | +lt_sysroot= | ||
12424 | +case ${with_libtool_sysroot} in #( | ||
12425 | + yes) | ||
12426 | + if test "$GCC" = yes; then | ||
12427 | + lt_sysroot=`$CC --print-sysroot 2>/dev/null` | ||
12428 | + fi | ||
12429 | + ;; #( | ||
12430 | + /*) | ||
12431 | + lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"` | ||
12432 | + ;; #( | ||
12433 | + no|'') | ||
12434 | + ;; #( | ||
12435 | + *) | ||
12436 | + AC_MSG_RESULT([${with_libtool_sysroot}]) | ||
12437 | + AC_MSG_ERROR([The sysroot must be an absolute path.]) | ||
12438 | + ;; | ||
12439 | +esac | ||
12440 | + | ||
12441 | + AC_MSG_RESULT([${lt_sysroot:-no}]) | ||
12442 | +_LT_DECL([], [lt_sysroot], [0], [The root where to search for ]dnl | ||
12443 | +[dependent libraries, and in which our libraries should be installed.])]) | ||
12444 | + | ||
12445 | # _LT_ENABLE_LOCK | ||
12446 | # --------------- | ||
12447 | m4_defun([_LT_ENABLE_LOCK], | ||
12448 | @@ -1320,14 +1369,47 @@ need_locks="$enable_libtool_lock" | ||
12449 | ])# _LT_ENABLE_LOCK | ||
12450 | |||
12451 | |||
12452 | +# _LT_PROG_AR | ||
12453 | +# ----------- | ||
12454 | +m4_defun([_LT_PROG_AR], | ||
12455 | +[AC_CHECK_TOOLS(AR, [ar], false) | ||
12456 | +: ${AR=ar} | ||
12457 | +: ${AR_FLAGS=cru} | ||
12458 | +_LT_DECL([], [AR], [1], [The archiver]) | ||
12459 | +_LT_DECL([], [AR_FLAGS], [1], [Flags to create an archive]) | ||
12460 | + | ||
12461 | +AC_CACHE_CHECK([for archiver @FILE support], [lt_cv_ar_at_file], | ||
12462 | + [lt_cv_ar_at_file=no | ||
12463 | + AC_COMPILE_IFELSE([AC_LANG_PROGRAM], | ||
12464 | + [echo conftest.$ac_objext > conftest.lst | ||
12465 | + lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&AS_MESSAGE_LOG_FD' | ||
12466 | + AC_TRY_EVAL([lt_ar_try]) | ||
12467 | + if test "$ac_status" -eq 0; then | ||
12468 | + # Ensure the archiver fails upon bogus file names. | ||
12469 | + rm -f conftest.$ac_objext libconftest.a | ||
12470 | + AC_TRY_EVAL([lt_ar_try]) | ||
12471 | + if test "$ac_status" -ne 0; then | ||
12472 | + lt_cv_ar_at_file=@ | ||
12473 | + fi | ||
12474 | + fi | ||
12475 | + rm -f conftest.* libconftest.a | ||
12476 | + ]) | ||
12477 | + ]) | ||
12478 | + | ||
12479 | +if test "x$lt_cv_ar_at_file" = xno; then | ||
12480 | + archiver_list_spec= | ||
12481 | +else | ||
12482 | + archiver_list_spec=$lt_cv_ar_at_file | ||
12483 | +fi | ||
12484 | +_LT_DECL([], [archiver_list_spec], [1], | ||
12485 | + [How to feed a file listing to the archiver]) | ||
12486 | +])# _LT_PROG_AR | ||
12487 | + | ||
12488 | + | ||
12489 | # _LT_CMD_OLD_ARCHIVE | ||
12490 | # ------------------- | ||
12491 | m4_defun([_LT_CMD_OLD_ARCHIVE], | ||
12492 | -[AC_CHECK_TOOL(AR, ar, false) | ||
12493 | -test -z "$AR" && AR=ar | ||
12494 | -test -z "$AR_FLAGS" && AR_FLAGS=cru | ||
12495 | -_LT_DECL([], [AR], [1], [The archiver]) | ||
12496 | -_LT_DECL([], [AR_FLAGS], [1]) | ||
12497 | +[_LT_PROG_AR | ||
12498 | |||
12499 | AC_CHECK_TOOL(STRIP, strip, :) | ||
12500 | test -z "$STRIP" && STRIP=: | ||
12501 | @@ -1623,7 +1705,7 @@ else | ||
12502 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 | ||
12503 | lt_status=$lt_dlunknown | ||
12504 | cat > conftest.$ac_ext <<_LT_EOF | ||
12505 | -[#line __oline__ "configure" | ||
12506 | +[#line $LINENO "configure" | ||
12507 | #include "confdefs.h" | ||
12508 | |||
12509 | #if HAVE_DLFCN_H | ||
12510 | @@ -1667,10 +1749,10 @@ else | ||
12511 | /* When -fvisbility=hidden is used, assume the code has been annotated | ||
12512 | correspondingly for the symbols needed. */ | ||
12513 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) | ||
12514 | -void fnord () __attribute__((visibility("default"))); | ||
12515 | +int fnord () __attribute__((visibility("default"))); | ||
12516 | #endif | ||
12517 | |||
12518 | -void fnord () { int i=42; } | ||
12519 | +int fnord () { return 42; } | ||
12520 | int main () | ||
12521 | { | ||
12522 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); | ||
12523 | @@ -2210,8 +2292,9 @@ cygwin* | mingw* | pw32* | cegcc*) | ||
12524 | need_version=no | ||
12525 | need_lib_prefix=no | ||
12526 | |||
12527 | - case $GCC,$host_os in | ||
12528 | - yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) | ||
12529 | + case $GCC,$cc_basename in | ||
12530 | + yes,*) | ||
12531 | + # gcc | ||
12532 | library_names_spec='$libname.dll.a' | ||
12533 | # DLL is installed to $(libdir)/../bin by postinstall_cmds | ||
12534 | postinstall_cmds='base_file=`basename \${file}`~ | ||
12535 | @@ -2244,13 +2327,71 @@ m4_if([$1], [],[ | ||
12536 | library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' | ||
12537 | ;; | ||
12538 | esac | ||
12539 | + dynamic_linker='Win32 ld.exe' | ||
12540 | + ;; | ||
12541 | + | ||
12542 | + *,cl*) | ||
12543 | + # Native MSVC | ||
12544 | + libname_spec='$name' | ||
12545 | + soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' | ||
12546 | + library_names_spec='${libname}.dll.lib' | ||
12547 | + | ||
12548 | + case $build_os in | ||
12549 | + mingw*) | ||
12550 | + sys_lib_search_path_spec= | ||
12551 | + lt_save_ifs=$IFS | ||
12552 | + IFS=';' | ||
12553 | + for lt_path in $LIB | ||
12554 | + do | ||
12555 | + IFS=$lt_save_ifs | ||
12556 | + # Let DOS variable expansion print the short 8.3 style file name. | ||
12557 | + lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` | ||
12558 | + sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" | ||
12559 | + done | ||
12560 | + IFS=$lt_save_ifs | ||
12561 | + # Convert to MSYS style. | ||
12562 | + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([[a-zA-Z]]\\):| /\\1|g' -e 's|^ ||'` | ||
12563 | + ;; | ||
12564 | + cygwin*) | ||
12565 | + # Convert to unix form, then to dos form, then back to unix form | ||
12566 | + # but this time dos style (no spaces!) so that the unix form looks | ||
12567 | + # like /cygdrive/c/PROGRA~1:/cygdr... | ||
12568 | + sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` | ||
12569 | + sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` | ||
12570 | + sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` | ||
12571 | + ;; | ||
12572 | + *) | ||
12573 | + sys_lib_search_path_spec="$LIB" | ||
12574 | + if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then | ||
12575 | + # It is most probably a Windows format PATH. | ||
12576 | + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` | ||
12577 | + else | ||
12578 | + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` | ||
12579 | + fi | ||
12580 | + # FIXME: find the short name or the path components, as spaces are | ||
12581 | + # common. (e.g. "Program Files" -> "PROGRA~1") | ||
12582 | + ;; | ||
12583 | + esac | ||
12584 | + | ||
12585 | + # DLL is installed to $(libdir)/../bin by postinstall_cmds | ||
12586 | + postinstall_cmds='base_file=`basename \${file}`~ | ||
12587 | + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ | ||
12588 | + dldir=$destdir/`dirname \$dlpath`~ | ||
12589 | + test -d \$dldir || mkdir -p \$dldir~ | ||
12590 | + $install_prog $dir/$dlname \$dldir/$dlname' | ||
12591 | + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ | ||
12592 | + dlpath=$dir/\$dldll~ | ||
12593 | + $RM \$dlpath' | ||
12594 | + shlibpath_overrides_runpath=yes | ||
12595 | + dynamic_linker='Win32 link.exe' | ||
12596 | ;; | ||
12597 | |||
12598 | *) | ||
12599 | + # Assume MSVC wrapper | ||
12600 | library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib' | ||
12601 | + dynamic_linker='Win32 ld.exe' | ||
12602 | ;; | ||
12603 | esac | ||
12604 | - dynamic_linker='Win32 ld.exe' | ||
12605 | # FIXME: first we should search . and the directory the executable is in | ||
12606 | shlibpath_var=PATH | ||
12607 | ;; | ||
12608 | @@ -2342,7 +2483,7 @@ haiku*) | ||
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 | @@ -2950,6 +3091,11 @@ case $reload_flag in | ||
12618 | esac | ||
12619 | reload_cmds='$LD$reload_flag -o $output$reload_objs' | ||
12620 | case $host_os in | ||
12621 | + cygwin* | mingw* | pw32* | cegcc*) | ||
12622 | + if test "$GCC" != yes; then | ||
12623 | + reload_cmds=false | ||
12624 | + fi | ||
12625 | + ;; | ||
12626 | darwin*) | ||
12627 | if test "$GCC" = yes; then | ||
12628 | reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' | ||
12629 | @@ -3016,7 +3162,8 @@ mingw* | pw32*) | ||
12630 | lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' | ||
12631 | lt_cv_file_magic_cmd='func_win32_libid' | ||
12632 | else | ||
12633 | - lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' | ||
12634 | + # Keep this pattern in sync with the one in func_win32_libid. | ||
12635 | + lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' | ||
12636 | lt_cv_file_magic_cmd='$OBJDUMP -f' | ||
12637 | fi | ||
12638 | ;; | ||
12639 | @@ -3167,6 +3314,21 @@ tpf*) | ||
12640 | ;; | ||
12641 | esac | ||
12642 | ]) | ||
12643 | + | ||
12644 | +file_magic_glob= | ||
12645 | +want_nocaseglob=no | ||
12646 | +if test "$build" = "$host"; then | ||
12647 | + case $host_os in | ||
12648 | + mingw* | pw32*) | ||
12649 | + if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then | ||
12650 | + want_nocaseglob=yes | ||
12651 | + else | ||
12652 | + file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[[\1]]\/[[\1]]\/g;/g"` | ||
12653 | + fi | ||
12654 | + ;; | ||
12655 | + esac | ||
12656 | +fi | ||
12657 | + | ||
12658 | file_magic_cmd=$lt_cv_file_magic_cmd | ||
12659 | deplibs_check_method=$lt_cv_deplibs_check_method | ||
12660 | test -z "$deplibs_check_method" && deplibs_check_method=unknown | ||
12661 | @@ -3174,7 +3336,11 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown | ||
12662 | _LT_DECL([], [deplibs_check_method], [1], | ||
12663 | [Method to check whether dependent libraries are shared objects]) | ||
12664 | _LT_DECL([], [file_magic_cmd], [1], | ||
12665 | - [Command to use when deplibs_check_method == "file_magic"]) | ||
12666 | + [Command to use when deplibs_check_method = "file_magic"]) | ||
12667 | +_LT_DECL([], [file_magic_glob], [1], | ||
12668 | + [How to find potential files when deplibs_check_method = "file_magic"]) | ||
12669 | +_LT_DECL([], [want_nocaseglob], [1], | ||
12670 | + [Find potential files using nocaseglob when deplibs_check_method = "file_magic"]) | ||
12671 | ])# _LT_CHECK_MAGIC_METHOD | ||
12672 | |||
12673 | |||
12674 | @@ -3277,6 +3443,67 @@ dnl aclocal-1.4 backwards compatibility: | ||
12675 | dnl AC_DEFUN([AM_PROG_NM], []) | ||
12676 | dnl AC_DEFUN([AC_PROG_NM], []) | ||
12677 | |||
12678 | +# _LT_CHECK_SHAREDLIB_FROM_LINKLIB | ||
12679 | +# -------------------------------- | ||
12680 | +# how to determine the name of the shared library | ||
12681 | +# associated with a specific link library. | ||
12682 | +# -- PORTME fill in with the dynamic library characteristics | ||
12683 | +m4_defun([_LT_CHECK_SHAREDLIB_FROM_LINKLIB], | ||
12684 | +[m4_require([_LT_DECL_EGREP]) | ||
12685 | +m4_require([_LT_DECL_OBJDUMP]) | ||
12686 | +m4_require([_LT_DECL_DLLTOOL]) | ||
12687 | +AC_CACHE_CHECK([how to associate runtime and link libraries], | ||
12688 | +lt_cv_sharedlib_from_linklib_cmd, | ||
12689 | +[lt_cv_sharedlib_from_linklib_cmd='unknown' | ||
12690 | + | ||
12691 | +case $host_os in | ||
12692 | +cygwin* | mingw* | pw32* | cegcc*) | ||
12693 | + # two different shell functions defined in ltmain.sh | ||
12694 | + # decide which to use based on capabilities of $DLLTOOL | ||
12695 | + case `$DLLTOOL --help 2>&1` in | ||
12696 | + *--identify-strict*) | ||
12697 | + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib | ||
12698 | + ;; | ||
12699 | + *) | ||
12700 | + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback | ||
12701 | + ;; | ||
12702 | + esac | ||
12703 | + ;; | ||
12704 | +*) | ||
12705 | + # fallback: assume linklib IS sharedlib | ||
12706 | + lt_cv_sharedlib_from_linklib_cmd="$ECHO" | ||
12707 | + ;; | ||
12708 | +esac | ||
12709 | +]) | ||
12710 | +sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd | ||
12711 | +test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO | ||
12712 | + | ||
12713 | +_LT_DECL([], [sharedlib_from_linklib_cmd], [1], | ||
12714 | + [Command to associate shared and link libraries]) | ||
12715 | +])# _LT_CHECK_SHAREDLIB_FROM_LINKLIB | ||
12716 | + | ||
12717 | + | ||
12718 | +# _LT_PATH_MANIFEST_TOOL | ||
12719 | +# ---------------------- | ||
12720 | +# locate the manifest tool | ||
12721 | +m4_defun([_LT_PATH_MANIFEST_TOOL], | ||
12722 | +[AC_CHECK_TOOL(MANIFEST_TOOL, mt, :) | ||
12723 | +test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt | ||
12724 | +AC_CACHE_CHECK([if $MANIFEST_TOOL is a manifest tool], [lt_cv_path_mainfest_tool], | ||
12725 | + [lt_cv_path_mainfest_tool=no | ||
12726 | + echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&AS_MESSAGE_LOG_FD | ||
12727 | + $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out | ||
12728 | + cat conftest.err >&AS_MESSAGE_LOG_FD | ||
12729 | + if $GREP 'Manifest Tool' conftest.out > /dev/null; then | ||
12730 | + lt_cv_path_mainfest_tool=yes | ||
12731 | + fi | ||
12732 | + rm -f conftest*]) | ||
12733 | +if test "x$lt_cv_path_mainfest_tool" != xyes; then | ||
12734 | + MANIFEST_TOOL=: | ||
12735 | +fi | ||
12736 | +_LT_DECL([], [MANIFEST_TOOL], [1], [Manifest tool])dnl | ||
12737 | +])# _LT_PATH_MANIFEST_TOOL | ||
12738 | + | ||
12739 | |||
12740 | # LT_LIB_M | ||
12741 | # -------- | ||
12742 | @@ -3403,8 +3630,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'" | ||
12744 | |||
12745 | # Transform an extracted symbol line into symbol name and symbol address | ||
12746 | -lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p'" | ||
12747 | -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'" | ||
12748 | +lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p'" | ||
12749 | +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'" | ||
12750 | |||
12751 | # Handle CRLF in mingw tool chain | ||
12752 | opt_cr= | ||
12753 | @@ -3440,6 +3667,7 @@ for ac_symprfx in "" "_"; do | ||
12754 | else | ||
12755 | lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" | ||
12756 | fi | ||
12757 | + lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" | ||
12758 | |||
12759 | # Check to see that the pipe works correctly. | ||
12760 | pipe_works=no | ||
12761 | @@ -3473,6 +3701,18 @@ _LT_EOF | ||
12762 | if $GREP ' nm_test_var$' "$nlist" >/dev/null; then | ||
12763 | if $GREP ' nm_test_func$' "$nlist" >/dev/null; then | ||
12764 | cat <<_LT_EOF > conftest.$ac_ext | ||
12765 | +/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ | ||
12766 | +#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) | ||
12767 | +/* DATA imports from DLLs on WIN32 con't be const, because runtime | ||
12768 | + relocations are performed -- see ld's documentation on pseudo-relocs. */ | ||
12769 | +# define LT@&t@_DLSYM_CONST | ||
12770 | +#elif defined(__osf__) | ||
12771 | +/* This system does not cope well with relocations in const data. */ | ||
12772 | +# define LT@&t@_DLSYM_CONST | ||
12773 | +#else | ||
12774 | +# define LT@&t@_DLSYM_CONST const | ||
12775 | +#endif | ||
12776 | + | ||
12777 | #ifdef __cplusplus | ||
12778 | extern "C" { | ||
12779 | #endif | ||
12780 | @@ -3484,7 +3724,7 @@ _LT_EOF | ||
12781 | cat <<_LT_EOF >> conftest.$ac_ext | ||
12782 | |||
12783 | /* The mapping between symbol names and symbols. */ | ||
12784 | -const struct { | ||
12785 | +LT@&t@_DLSYM_CONST struct { | ||
12786 | const char *name; | ||
12787 | void *address; | ||
12788 | } | ||
12789 | @@ -3510,15 +3750,15 @@ static const void *lt_preloaded_setup() { | ||
12790 | _LT_EOF | ||
12791 | # Now try linking the two files. | ||
12792 | mv conftest.$ac_objext conftstm.$ac_objext | ||
12793 | - lt_save_LIBS="$LIBS" | ||
12794 | - lt_save_CFLAGS="$CFLAGS" | ||
12795 | + lt_globsym_save_LIBS=$LIBS | ||
12796 | + lt_globsym_save_CFLAGS=$CFLAGS | ||
12797 | LIBS="conftstm.$ac_objext" | ||
12798 | CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)" | ||
12799 | if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then | ||
12800 | pipe_works=yes | ||
12801 | fi | ||
12802 | - LIBS="$lt_save_LIBS" | ||
12803 | - CFLAGS="$lt_save_CFLAGS" | ||
12804 | + LIBS=$lt_globsym_save_LIBS | ||
12805 | + CFLAGS=$lt_globsym_save_CFLAGS | ||
12806 | else | ||
12807 | echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD | ||
12808 | fi | ||
12809 | @@ -3551,6 +3791,13 @@ else | ||
12810 | AC_MSG_RESULT(ok) | ||
12811 | fi | ||
12812 | |||
12813 | +# Response file support. | ||
12814 | +if test "$lt_cv_nm_interface" = "MS dumpbin"; then | ||
12815 | + nm_file_list_spec='@' | ||
12816 | +elif $NM --help 2>/dev/null | grep '[[@]]FILE' >/dev/null; then | ||
12817 | + nm_file_list_spec='@' | ||
12818 | +fi | ||
12819 | + | ||
12820 | _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]) | ||
12822 | _LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1], | ||
12823 | @@ -3561,6 +3808,8 @@ _LT_DECL([global_symbol_to_c_name_address], | ||
12824 | _LT_DECL([global_symbol_to_c_name_address_lib_prefix], | ||
12825 | [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]) | ||
12827 | +_LT_DECL([], [nm_file_list_spec], [1], | ||
12828 | + [Specify filename containing input files for $NM]) | ||
12829 | ]) # _LT_CMD_GLOBAL_SYMBOLS | ||
12830 | |||
12831 | |||
12832 | @@ -3572,7 +3821,6 @@ _LT_TAGVAR(lt_prog_compiler_wl, $1)= | ||
12833 | _LT_TAGVAR(lt_prog_compiler_pic, $1)= | ||
12834 | _LT_TAGVAR(lt_prog_compiler_static, $1)= | ||
12835 | |||
12836 | -AC_MSG_CHECKING([for $compiler option to produce PIC]) | ||
12837 | m4_if([$1], [CXX], [ | ||
12838 | # C++ specific cases for pic, static, wl, etc. | ||
12839 | if test "$GXX" = yes; then | ||
12840 | @@ -3678,6 +3926,12 @@ m4_if([$1], [CXX], [ | ||
12841 | ;; | ||
12842 | esac | ||
12843 | ;; | ||
12844 | + mingw* | cygwin* | os2* | pw32* | cegcc*) | ||
12845 | + # This hack is so that the source file can tell whether it is being | ||
12846 | + # built for inclusion in a dll (and should export symbols for example). | ||
12847 | + m4_if([$1], [GCJ], [], | ||
12848 | + [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) | ||
12849 | + ;; | ||
12850 | dgux*) | ||
12851 | case $cc_basename in | ||
12852 | ec++*) | ||
12853 | @@ -3830,7 +4084,7 @@ m4_if([$1], [CXX], [ | ||
12854 | ;; | ||
12855 | solaris*) | ||
12856 | case $cc_basename in | ||
12857 | - CC*) | ||
12858 | + CC* | sunCC*) | ||
12859 | # Sun C++ 4.2, 5.x and Centerline C++ | ||
12860 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' | ||
12861 | _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' | ||
12862 | @@ -4053,6 +4307,12 @@ m4_if([$1], [CXX], [ | ||
12863 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared' | ||
12864 | _LT_TAGVAR(lt_prog_compiler_static, $1)='--static' | ||
12865 | ;; | ||
12866 | + nagfor*) | ||
12867 | + # NAG Fortran compiler | ||
12868 | + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,-Wl,,' | ||
12869 | + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' | ||
12870 | + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' | ||
12871 | + ;; | ||
12872 | pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) | ||
12873 | # Portland Group compilers (*not* the Pentium gcc compiler, | ||
12874 | # which looks to be a dead project) | ||
12875 | @@ -4115,7 +4375,7 @@ m4_if([$1], [CXX], [ | ||
12876 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' | ||
12877 | _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' | ||
12878 | case $cc_basename in | ||
12879 | - f77* | f90* | f95*) | ||
12880 | + f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) | ||
12881 | _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';; | ||
12882 | *) | ||
12883 | _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';; | ||
12884 | @@ -4172,9 +4432,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],[])])" | ||
12886 | ;; | ||
12887 | esac | ||
12888 | -AC_MSG_RESULT([$_LT_TAGVAR(lt_prog_compiler_pic, $1)]) | ||
12889 | -_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1], | ||
12890 | - [How to pass a linker flag through the compiler]) | ||
12891 | + | ||
12892 | +AC_CACHE_CHECK([for $compiler option to produce PIC], | ||
12893 | + [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)], | ||
12894 | + [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_prog_compiler_pic, $1)]) | ||
12895 | +_LT_TAGVAR(lt_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_cv_prog_compiler_pic, $1) | ||
12896 | |||
12897 | # | ||
12898 | # Check to make sure the PIC flag actually works. | ||
12899 | @@ -4193,6 +4455,8 @@ fi | ||
12900 | _LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1], | ||
12901 | [Additional compiler flags for building library objects]) | ||
12902 | |||
12903 | +_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1], | ||
12904 | + [How to pass a linker flag through the compiler]) | ||
12905 | # | ||
12906 | # Check to make sure the static flag actually works. | ||
12907 | # | ||
12908 | @@ -4213,6 +4477,7 @@ _LT_TAGDECL([link_static_flag], [lt_prog_compiler_static], [1], | ||
12909 | m4_defun([_LT_LINKER_SHLIBS], | ||
12910 | [AC_REQUIRE([LT_PATH_LD])dnl | ||
12911 | AC_REQUIRE([LT_PATH_NM])dnl | ||
12912 | +m4_require([_LT_PATH_MANIFEST_TOOL])dnl | ||
12913 | m4_require([_LT_FILEUTILS_DEFAULTS])dnl | ||
12914 | m4_require([_LT_DECL_EGREP])dnl | ||
12915 | m4_require([_LT_DECL_SED])dnl | ||
12916 | @@ -4221,6 +4486,7 @@ m4_require([_LT_TAG_COMPILER])dnl | ||
12917 | AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) | ||
12918 | m4_if([$1], [CXX], [ | ||
12919 | _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' | ||
12920 | + _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] | ||
12921 | case $host_os in | ||
12922 | aix[[4-9]]*) | ||
12923 | # If we're using GNU nm, then we don't want the "-C" option. | ||
12924 | @@ -4235,15 +4501,20 @@ m4_if([$1], [CXX], [ | ||
12925 | ;; | ||
12926 | pw32*) | ||
12927 | _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds" | ||
12928 | - ;; | ||
12929 | + ;; | ||
12930 | cygwin* | mingw* | cegcc*) | ||
12931 | - _LT_TAGVAR(export_symbols_cmds, $1)='$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' | ||
12932 | - ;; | ||
12933 | + case $cc_basename in | ||
12934 | + cl*) ;; | ||
12935 | + *) | ||
12936 | + _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols' | ||
12937 | + _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'] | ||
12938 | + ;; | ||
12939 | + esac | ||
12940 | + ;; | ||
12941 | *) | ||
12942 | _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' | ||
12943 | - ;; | ||
12944 | + ;; | ||
12945 | esac | ||
12946 | - _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] | ||
12947 | ], [ | ||
12948 | runpath_var= | ||
12949 | _LT_TAGVAR(allow_undefined_flag, $1)= | ||
12950 | @@ -4411,7 +4682,8 @@ _LT_EOF | ||
12951 | _LT_TAGVAR(allow_undefined_flag, $1)=unsupported | ||
12952 | _LT_TAGVAR(always_export_symbols, $1)=no | ||
12953 | _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes | ||
12954 | - _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols' | ||
12955 | + _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols' | ||
12956 | + _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'] | ||
12957 | |||
12958 | 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' | ||
12960 | @@ -4510,12 +4782,12 @@ _LT_EOF | ||
12961 | _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive' | ||
12962 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= | ||
12963 | _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir' | ||
12964 | - _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' | ||
12965 | + _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' | ||
12966 | if test "x$supports_anon_versioning" = xyes; then | ||
12967 | _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ | ||
12968 | cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ | ||
12969 | echo "local: *; };" >> $output_objdir/$libname.ver~ | ||
12970 | - $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' | ||
12971 | + $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' | ||
12972 | fi | ||
12973 | ;; | ||
12974 | esac | ||
12975 | @@ -4529,8 +4801,8 @@ _LT_EOF | ||
12976 | _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' | ||
12977 | wlarc= | ||
12978 | else | ||
12979 | - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' | ||
12980 | - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' | ||
12981 | + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' | ||
12982 | + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' | ||
12983 | fi | ||
12984 | ;; | ||
12985 | |||
12986 | @@ -4548,8 +4820,8 @@ _LT_EOF | ||
12987 | |||
12988 | _LT_EOF | ||
12989 | elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then | ||
12990 | - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' | ||
12991 | - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' | ||
12992 | + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' | ||
12993 | + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' | ||
12994 | else | ||
12995 | _LT_TAGVAR(ld_shlibs, $1)=no | ||
12996 | fi | ||
12997 | @@ -4595,8 +4867,8 @@ _LT_EOF | ||
12998 | |||
12999 | *) | ||
13000 | if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then | ||
13001 | - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' | ||
13002 | - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' | ||
13003 | + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' | ||
13004 | + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' | ||
13005 | else | ||
13006 | _LT_TAGVAR(ld_shlibs, $1)=no | ||
13007 | fi | ||
13008 | @@ -4726,7 +4998,7 @@ _LT_EOF | ||
13009 | _LT_TAGVAR(allow_undefined_flag, $1)='-berok' | ||
13010 | # Determine the default libpath from the value encoded in an | ||
13011 | # empty executable. | ||
13012 | - _LT_SYS_MODULE_PATH_AIX | ||
13013 | + _LT_SYS_MODULE_PATH_AIX([$1]) | ||
13014 | _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" | ||
13016 | else | ||
13017 | @@ -4737,7 +5009,7 @@ _LT_EOF | ||
13018 | else | ||
13019 | # Determine the default libpath from the value encoded in an | ||
13020 | # empty executable. | ||
13021 | - _LT_SYS_MODULE_PATH_AIX | ||
13022 | + _LT_SYS_MODULE_PATH_AIX([$1]) | ||
13023 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" | ||
13024 | # Warning - without using the other run time loading flags, | ||
13025 | # -berok will link without error, but may produce a broken library. | ||
13026 | @@ -4781,20 +5053,63 @@ _LT_EOF | ||
13027 | # Microsoft Visual C++. | ||
13028 | # hardcode_libdir_flag_spec is actually meaningless, as there is | ||
13029 | # no search path for DLLs. | ||
13030 | - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' | ||
13031 | - _LT_TAGVAR(allow_undefined_flag, $1)=unsupported | ||
13032 | - # Tell ltmain to make .lib files, not .a files. | ||
13033 | - libext=lib | ||
13034 | - # Tell ltmain to make .dll files, not .so files. | ||
13035 | - shrext_cmds=".dll" | ||
13036 | - # FIXME: Setting linknames here is a bad hack. | ||
13037 | - _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' | ||
13038 | - # The linker will automatically build a .lib file if we build a DLL. | ||
13039 | - _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' | ||
13040 | - # FIXME: Should let the user specify the lib program. | ||
13041 | - _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs' | ||
13042 | - _LT_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`' | ||
13043 | - _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes | ||
13044 | + case $cc_basename in | ||
13045 | + cl*) | ||
13046 | + # Native MSVC | ||
13047 | + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' | ||
13048 | + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported | ||
13049 | + _LT_TAGVAR(always_export_symbols, $1)=yes | ||
13050 | + _LT_TAGVAR(file_list_spec, $1)='@' | ||
13051 | + # Tell ltmain to make .lib files, not .a files. | ||
13052 | + libext=lib | ||
13053 | + # Tell ltmain to make .dll files, not .so files. | ||
13054 | + shrext_cmds=".dll" | ||
13055 | + # FIXME: Setting linknames here is a bad hack. | ||
13056 | + _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' | ||
13057 | + _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then | ||
13058 | + sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; | ||
13059 | + else | ||
13060 | + sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; | ||
13061 | + fi~ | ||
13062 | + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ | ||
13063 | + linknames=' | ||
13064 | + # The linker will not automatically build a static lib if we build a DLL. | ||
13065 | + # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' | ||
13066 | + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes | ||
13067 | + _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1,DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols' | ||
13068 | + # Don't use ranlib | ||
13069 | + _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib' | ||
13070 | + _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~ | ||
13071 | + lt_tool_outputfile="@TOOL_OUTPUT@"~ | ||
13072 | + case $lt_outputfile in | ||
13073 | + *.exe|*.EXE) ;; | ||
13074 | + *) | ||
13075 | + lt_outputfile="$lt_outputfile.exe" | ||
13076 | + lt_tool_outputfile="$lt_tool_outputfile.exe" | ||
13077 | + ;; | ||
13078 | + esac~ | ||
13079 | + if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then | ||
13080 | + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; | ||
13081 | + $RM "$lt_outputfile.manifest"; | ||
13082 | + fi' | ||
13083 | + ;; | ||
13084 | + *) | ||
13085 | + # Assume MSVC wrapper | ||
13086 | + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' | ||
13087 | + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported | ||
13088 | + # Tell ltmain to make .lib files, not .a files. | ||
13089 | + libext=lib | ||
13090 | + # Tell ltmain to make .dll files, not .so files. | ||
13091 | + shrext_cmds=".dll" | ||
13092 | + # FIXME: Setting linknames here is a bad hack. | ||
13093 | + _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' | ||
13094 | + # The linker will automatically build a .lib file if we build a DLL. | ||
13095 | + _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' | ||
13096 | + # FIXME: Should let the user specify the lib program. | ||
13097 | + _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs' | ||
13098 | + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes | ||
13099 | + ;; | ||
13100 | + esac | ||
13101 | ;; | ||
13102 | |||
13103 | darwin* | rhapsody*) | ||
13104 | @@ -4828,7 +5143,7 @@ _LT_EOF | ||
13105 | |||
13106 | # FreeBSD 3 and greater uses gcc -shared to do shared libraries. | ||
13107 | freebsd* | dragonfly*) | ||
13108 | - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' | ||
13109 | + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' | ||
13110 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' | ||
13111 | _LT_TAGVAR(hardcode_direct, $1)=yes | ||
13112 | _LT_TAGVAR(hardcode_shlibpath_var, $1)=no | ||
13113 | @@ -4836,7 +5151,7 @@ _LT_EOF | ||
13114 | |||
13115 | hpux9*) | ||
13116 | if test "$GCC" = yes; then | ||
13117 | - _LT_TAGVAR(archive_cmds, $1)='$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' | ||
13118 | + _LT_TAGVAR(archive_cmds, $1)='$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' | ||
13119 | 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' | ||
13121 | fi | ||
13122 | @@ -4852,7 +5167,7 @@ _LT_EOF | ||
13123 | |||
13124 | hpux10*) | ||
13125 | if test "$GCC" = yes && test "$with_gnu_ld" = no; then | ||
13126 | - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' | ||
13127 | + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' | ||
13128 | else | ||
13129 | _LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' | ||
13130 | fi | ||
13131 | @@ -4876,10 +5191,10 @@ _LT_EOF | ||
13132 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' | ||
13133 | ;; | ||
13134 | ia64*) | ||
13135 | - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' | ||
13136 | + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' | ||
13137 | ;; | ||
13138 | *) | ||
13139 | - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' | ||
13140 | + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' | ||
13141 | ;; | ||
13142 | esac | ||
13143 | else | ||
13144 | @@ -4926,16 +5241,31 @@ _LT_EOF | ||
13145 | |||
13146 | irix5* | irix6* | nonstopux*) | ||
13147 | if test "$GCC" = yes; then | ||
13148 | - _LT_TAGVAR(archive_cmds, $1)='$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' | ||
13149 | + _LT_TAGVAR(archive_cmds, $1)='$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' | ||
13150 | # Try to use the -exported_symbol ld option, if it does not | ||
13151 | # work, assume that -exports_file does not work either and | ||
13152 | # implicitly export all symbols. | ||
13153 | - save_LDFLAGS="$LDFLAGS" | ||
13154 | - LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" | ||
13155 | - AC_LINK_IFELSE([AC_LANG_SOURCE([int foo(void) {}])], | ||
13156 | - _LT_TAGVAR(archive_expsym_cmds, $1)='$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' | ||
13157 | - ) | ||
13158 | - LDFLAGS="$save_LDFLAGS" | ||
13159 | + # This should be the same for all languages, so no per-tag cache variable. | ||
13160 | + AC_CACHE_CHECK([whether the $host_os linker accepts -exported_symbol], | ||
13161 | + [lt_cv_irix_exported_symbol], | ||
13162 | + [save_LDFLAGS="$LDFLAGS" | ||
13163 | + LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" | ||
13164 | + AC_LINK_IFELSE( | ||
13165 | + [AC_LANG_SOURCE( | ||
13166 | + [AC_LANG_CASE([C], [[int foo (void) { return 0; }]], | ||
13167 | + [C++], [[int foo (void) { return 0; }]], | ||
13168 | + [Fortran 77], [[ | ||
13169 | + subroutine foo | ||
13170 | + end]], | ||
13171 | + [Fortran], [[ | ||
13172 | + subroutine foo | ||
13173 | + end]])])], | ||
13174 | + [lt_cv_irix_exported_symbol=yes], | ||
13175 | + [lt_cv_irix_exported_symbol=no]) | ||
13176 | + LDFLAGS="$save_LDFLAGS"]) | ||
13177 | + if test "$lt_cv_irix_exported_symbol" = yes; then | ||
13178 | + _LT_TAGVAR(archive_expsym_cmds, $1)='$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' | ||
13179 | + fi | ||
13180 | 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' | ||
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' | ||
13183 | @@ -5020,7 +5350,7 @@ _LT_EOF | ||
13184 | osf4* | osf5*) # as osf3* with the addition of -msym flag | ||
13185 | if test "$GCC" = yes; then | ||
13186 | _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' | ||
13187 | - _LT_TAGVAR(archive_cmds, $1)='$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' | ||
13188 | + _LT_TAGVAR(archive_cmds, $1)='$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' | ||
13189 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' | ||
13190 | else | ||
13191 | _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' | ||
13192 | @@ -5039,9 +5369,9 @@ _LT_EOF | ||
13193 | _LT_TAGVAR(no_undefined_flag, $1)=' -z defs' | ||
13194 | if test "$GCC" = yes; then | ||
13195 | wlarc='${wl}' | ||
13196 | - _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' | ||
13197 | + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' | ||
13198 | _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ | ||
13199 | - $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' | ||
13200 | + $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' | ||
13201 | else | ||
13202 | case `$CC -V 2>&1` in | ||
13203 | *"Compilers 5.0"*) | ||
13204 | @@ -5313,8 +5643,6 @@ _LT_TAGDECL([], [inherit_rpath], [0], | ||
13205 | to runtime path list]) | ||
13206 | _LT_TAGDECL([], [link_all_deplibs], [0], | ||
13207 | [Whether libtool must link a program against all its dependency libraries]) | ||
13208 | -_LT_TAGDECL([], [fix_srcfile_path], [1], | ||
13209 | - [Fix the shell variable $srcfile for the compiler]) | ||
13210 | _LT_TAGDECL([], [always_export_symbols], [0], | ||
13211 | [Set to "yes" if exported symbols are required]) | ||
13212 | _LT_TAGDECL([], [export_symbols_cmds], [2], | ||
13213 | @@ -5325,6 +5653,8 @@ _LT_TAGDECL([], [include_expsyms], [1], | ||
13214 | [Symbols that must always be exported]) | ||
13215 | _LT_TAGDECL([], [prelink_cmds], [2], | ||
13216 | [Commands necessary for linking programs (against libraries) with templates]) | ||
13217 | +_LT_TAGDECL([], [postlink_cmds], [2], | ||
13218 | + [Commands necessary for finishing linking programs]) | ||
13219 | _LT_TAGDECL([], [file_list_spec], [1], | ||
13220 | [Specify filename containing input files]) | ||
13221 | dnl FIXME: Not yet implemented | ||
13222 | @@ -5426,6 +5756,7 @@ CC="$lt_save_CC" | ||
13223 | m4_defun([_LT_LANG_CXX_CONFIG], | ||
13224 | [m4_require([_LT_FILEUTILS_DEFAULTS])dnl | ||
13225 | m4_require([_LT_DECL_EGREP])dnl | ||
13226 | +m4_require([_LT_PATH_MANIFEST_TOOL])dnl | ||
13227 | if test -n "$CXX" && ( test "X$CXX" != "Xno" && | ||
13228 | ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || | ||
13229 | (test "X$CXX" != "Xg++"))) ; then | ||
13230 | @@ -5487,6 +5818,7 @@ if test "$_lt_caught_CXX_error" != yes; then | ||
13231 | |||
13232 | # Allow CC to be a program name with arguments. | ||
13233 | lt_save_CC=$CC | ||
13234 | + lt_save_CFLAGS=$CFLAGS | ||
13235 | lt_save_LD=$LD | ||
13236 | lt_save_GCC=$GCC | ||
13237 | GCC=$GXX | ||
13238 | @@ -5504,6 +5836,7 @@ if test "$_lt_caught_CXX_error" != yes; then | ||
13239 | fi | ||
13240 | test -z "${LDCXX+set}" || LD=$LDCXX | ||
13241 | CC=${CXX-"c++"} | ||
13242 | + CFLAGS=$CXXFLAGS | ||
13243 | compiler=$CC | ||
13244 | _LT_TAGVAR(compiler, $1)=$CC | ||
13245 | _LT_CC_BASENAME([$compiler]) | ||
13246 | @@ -5667,7 +6000,7 @@ if test "$_lt_caught_CXX_error" != yes; then | ||
13247 | _LT_TAGVAR(allow_undefined_flag, $1)='-berok' | ||
13248 | # Determine the default libpath from the value encoded in an empty | ||
13249 | # executable. | ||
13250 | - _LT_SYS_MODULE_PATH_AIX | ||
13251 | + _LT_SYS_MODULE_PATH_AIX([$1]) | ||
13252 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" | ||
13253 | |||
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" | ||
13255 | @@ -5679,7 +6012,7 @@ if test "$_lt_caught_CXX_error" != yes; then | ||
13256 | else | ||
13257 | # Determine the default libpath from the value encoded in an | ||
13258 | # empty executable. | ||
13259 | - _LT_SYS_MODULE_PATH_AIX | ||
13260 | + _LT_SYS_MODULE_PATH_AIX([$1]) | ||
13261 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" | ||
13262 | # Warning - without using the other run time loading flags, | ||
13263 | # -berok will link without error, but may produce a broken library. | ||
13264 | @@ -5721,29 +6054,75 @@ if test "$_lt_caught_CXX_error" != yes; then | ||
13265 | ;; | ||
13266 | |||
13267 | cygwin* | mingw* | pw32* | cegcc*) | ||
13268 | - # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, | ||
13269 | - # as there is no search path for DLLs. | ||
13270 | - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' | ||
13271 | - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols' | ||
13272 | - _LT_TAGVAR(allow_undefined_flag, $1)=unsupported | ||
13273 | - _LT_TAGVAR(always_export_symbols, $1)=no | ||
13274 | - _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes | ||
13275 | - | ||
13276 | - if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then | ||
13277 | - _LT_TAGVAR(archive_cmds, $1)='$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' | ||
13278 | - # If the export-symbols file already is a .def file (1st line | ||
13279 | - # is EXPORTS), use it as is; otherwise, prepend... | ||
13280 | - _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then | ||
13281 | - cp $export_symbols $output_objdir/$soname.def; | ||
13282 | - else | ||
13283 | - echo EXPORTS > $output_objdir/$soname.def; | ||
13284 | - cat $export_symbols >> $output_objdir/$soname.def; | ||
13285 | - fi~ | ||
13286 | - $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' | ||
13287 | - else | ||
13288 | - _LT_TAGVAR(ld_shlibs, $1)=no | ||
13289 | - fi | ||
13290 | - ;; | ||
13291 | + case $GXX,$cc_basename in | ||
13292 | + ,cl* | no,cl*) | ||
13293 | + # Native MSVC | ||
13294 | + # hardcode_libdir_flag_spec is actually meaningless, as there is | ||
13295 | + # no search path for DLLs. | ||
13296 | + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' | ||
13297 | + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported | ||
13298 | + _LT_TAGVAR(always_export_symbols, $1)=yes | ||
13299 | + _LT_TAGVAR(file_list_spec, $1)='@' | ||
13300 | + # Tell ltmain to make .lib files, not .a files. | ||
13301 | + libext=lib | ||
13302 | + # Tell ltmain to make .dll files, not .so files. | ||
13303 | + shrext_cmds=".dll" | ||
13304 | + # FIXME: Setting linknames here is a bad hack. | ||
13305 | + _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' | ||
13306 | + _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then | ||
13307 | + $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; | ||
13308 | + else | ||
13309 | + $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; | ||
13310 | + fi~ | ||
13311 | + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ | ||
13312 | + linknames=' | ||
13313 | + # The linker will not automatically build a static lib if we build a DLL. | ||
13314 | + # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' | ||
13315 | + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes | ||
13316 | + # Don't use ranlib | ||
13317 | + _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib' | ||
13318 | + _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~ | ||
13319 | + lt_tool_outputfile="@TOOL_OUTPUT@"~ | ||
13320 | + case $lt_outputfile in | ||
13321 | + *.exe|*.EXE) ;; | ||
13322 | + *) | ||
13323 | + lt_outputfile="$lt_outputfile.exe" | ||
13324 | + lt_tool_outputfile="$lt_tool_outputfile.exe" | ||
13325 | + ;; | ||
13326 | + esac~ | ||
13327 | + func_to_tool_file "$lt_outputfile"~ | ||
13328 | + if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then | ||
13329 | + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; | ||
13330 | + $RM "$lt_outputfile.manifest"; | ||
13331 | + fi' | ||
13332 | + ;; | ||
13333 | + *) | ||
13334 | + # g++ | ||
13335 | + # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, | ||
13336 | + # as there is no search path for DLLs. | ||
13337 | + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' | ||
13338 | + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols' | ||
13339 | + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported | ||
13340 | + _LT_TAGVAR(always_export_symbols, $1)=no | ||
13341 | + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes | ||
13342 | + | ||
13343 | + if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then | ||
13344 | + _LT_TAGVAR(archive_cmds, $1)='$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' | ||
13345 | + # If the export-symbols file already is a .def file (1st line | ||
13346 | + # is EXPORTS), use it as is; otherwise, prepend... | ||
13347 | + _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then | ||
13348 | + cp $export_symbols $output_objdir/$soname.def; | ||
13349 | + else | ||
13350 | + echo EXPORTS > $output_objdir/$soname.def; | ||
13351 | + cat $export_symbols >> $output_objdir/$soname.def; | ||
13352 | + fi~ | ||
13353 | + $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' | ||
13354 | + else | ||
13355 | + _LT_TAGVAR(ld_shlibs, $1)=no | ||
13356 | + fi | ||
13357 | + ;; | ||
13358 | + esac | ||
13359 | + ;; | ||
13360 | darwin* | rhapsody*) | ||
13361 | _LT_DARWIN_LINKER_FEATURES($1) | ||
13362 | ;; | ||
13363 | @@ -5818,7 +6197,7 @@ if test "$_lt_caught_CXX_error" != yes; then | ||
13364 | ;; | ||
13365 | *) | ||
13366 | if test "$GXX" = yes; then | ||
13367 | - _LT_TAGVAR(archive_cmds, $1)='$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' | ||
13368 | + _LT_TAGVAR(archive_cmds, $1)='$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' | ||
13369 | else | ||
13370 | # FIXME: insert proper C++ library support | ||
13371 | _LT_TAGVAR(ld_shlibs, $1)=no | ||
13372 | @@ -5889,10 +6268,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' | ||
13374 | ;; | ||
13375 | 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' | ||
13377 | + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' | ||
13378 | ;; | ||
13379 | *) | ||
13380 | - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' | ||
13381 | + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' | ||
13382 | ;; | ||
13383 | esac | ||
13384 | fi | ||
13385 | @@ -5933,9 +6312,9 @@ if test "$_lt_caught_CXX_error" != yes; then | ||
13386 | *) | ||
13387 | if test "$GXX" = yes; then | ||
13388 | if test "$with_gnu_ld" = no; then | ||
13389 | - _LT_TAGVAR(archive_cmds, $1)='$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' | ||
13390 | + _LT_TAGVAR(archive_cmds, $1)='$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' | ||
13391 | else | ||
13392 | - _LT_TAGVAR(archive_cmds, $1)='$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' | ||
13393 | + _LT_TAGVAR(archive_cmds, $1)='$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' | ||
13394 | fi | ||
13395 | fi | ||
13396 | _LT_TAGVAR(link_all_deplibs, $1)=yes | ||
13397 | @@ -6005,20 +6384,20 @@ 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 | @@ -6213,7 +6592,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' | ||
13424 | ;; | ||
13425 | *) | ||
13426 | - _LT_TAGVAR(archive_cmds, $1)='$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' | ||
13427 | + _LT_TAGVAR(archive_cmds, $1)='$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' | ||
13428 | ;; | ||
13429 | esac | ||
13430 | |||
13431 | @@ -6259,7 +6638,7 @@ if test "$_lt_caught_CXX_error" != yes; then | ||
13432 | |||
13433 | solaris*) | ||
13434 | case $cc_basename in | ||
13435 | - CC*) | ||
13436 | + CC* | sunCC*) | ||
13437 | # Sun C++ 4.2, 5.x and Centerline C++ | ||
13438 | _LT_TAGVAR(archive_cmds_need_lc,$1)=yes | ||
13439 | _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs' | ||
13440 | @@ -6300,9 +6679,9 @@ if test "$_lt_caught_CXX_error" != yes; then | ||
13441 | if test "$GXX" = yes && test "$with_gnu_ld" = no; then | ||
13442 | _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs' | ||
13443 | if $CC --version | $GREP -v '^2\.7' > /dev/null; then | ||
13444 | - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' | ||
13445 | + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' | ||
13446 | _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ | ||
13447 | - $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' | ||
13448 | + $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' | ||
13449 | |||
13450 | # Commands to make compiler produce verbose output that lists | ||
13451 | # what "hidden" libraries, object files and flags are used when | ||
13452 | @@ -6431,6 +6810,7 @@ if test "$_lt_caught_CXX_error" != yes; then | ||
13453 | fi # test -n "$compiler" | ||
13454 | |||
13455 | CC=$lt_save_CC | ||
13456 | + CFLAGS=$lt_save_CFLAGS | ||
13457 | LDCXX=$LD | ||
13458 | LD=$lt_save_LD | ||
13459 | GCC=$lt_save_GCC | ||
13460 | @@ -6445,6 +6825,29 @@ AC_LANG_POP | ||
13461 | ])# _LT_LANG_CXX_CONFIG | ||
13462 | |||
13463 | |||
13464 | +# _LT_FUNC_STRIPNAME_CNF | ||
13465 | +# ---------------------- | ||
13466 | +# func_stripname_cnf prefix suffix name | ||
13467 | +# strip PREFIX and SUFFIX off of NAME. | ||
13468 | +# PREFIX and SUFFIX must not contain globbing or regex special | ||
13469 | +# characters, hashes, percent signs, but SUFFIX may contain a leading | ||
13470 | +# dot (in which case that matches only a dot). | ||
13471 | +# | ||
13472 | +# This function is identical to the (non-XSI) version of func_stripname, | ||
13473 | +# except this one can be used by m4 code that may be executed by configure, | ||
13474 | +# rather than the libtool script. | ||
13475 | +m4_defun([_LT_FUNC_STRIPNAME_CNF],[dnl | ||
13476 | +AC_REQUIRE([_LT_DECL_SED]) | ||
13477 | +AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH]) | ||
13478 | +func_stripname_cnf () | ||
13479 | +{ | ||
13480 | + case ${2} in | ||
13481 | + .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; | ||
13482 | + *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; | ||
13483 | + esac | ||
13484 | +} # func_stripname_cnf | ||
13485 | +])# _LT_FUNC_STRIPNAME_CNF | ||
13486 | + | ||
13487 | # _LT_SYS_HIDDEN_LIBDEPS([TAGNAME]) | ||
13488 | # --------------------------------- | ||
13489 | # Figure out "hidden" library dependencies from verbose | ||
13490 | @@ -6453,6 +6856,7 @@ AC_LANG_POP | ||
13491 | # objects, libraries and library flags. | ||
13492 | m4_defun([_LT_SYS_HIDDEN_LIBDEPS], | ||
13493 | [m4_require([_LT_FILEUTILS_DEFAULTS])dnl | ||
13494 | +AC_REQUIRE([_LT_FUNC_STRIPNAME_CNF])dnl | ||
13495 | # Dependencies to place before and after the object being linked: | ||
13496 | _LT_TAGVAR(predep_objects, $1)= | ||
13497 | _LT_TAGVAR(postdep_objects, $1)= | ||
13498 | @@ -6503,6 +6907,13 @@ public class foo { | ||
13499 | }; | ||
13500 | _LT_EOF | ||
13501 | ]) | ||
13502 | + | ||
13503 | +_lt_libdeps_save_CFLAGS=$CFLAGS | ||
13504 | +case "$CC $CFLAGS " in #( | ||
13505 | +*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;; | ||
13506 | +*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;; | ||
13507 | +esac | ||
13508 | + | ||
13509 | dnl Parse the compiler output and extract the necessary | ||
13510 | dnl objects, libraries and library flags. | ||
13511 | if AC_TRY_EVAL(ac_compile); then | ||
13512 | @@ -6514,7 +6925,7 @@ if AC_TRY_EVAL(ac_compile); then | ||
13513 | pre_test_object_deps_done=no | ||
13514 | |||
13515 | for p in `eval "$output_verbose_link_cmd"`; do | ||
13516 | - case $p in | ||
13517 | + case ${prev}${p} in | ||
13518 | |||
13519 | -L* | -R* | -l*) | ||
13520 | # Some compilers place space between "-{L,R}" and the path. | ||
13521 | @@ -6523,13 +6934,22 @@ if AC_TRY_EVAL(ac_compile); then | ||
13522 | test $p = "-R"; then | ||
13523 | prev=$p | ||
13524 | continue | ||
13525 | - else | ||
13526 | - prev= | ||
13527 | fi | ||
13528 | |||
13529 | + # Expand the sysroot to ease extracting the directories later. | ||
13530 | + if test -z "$prev"; then | ||
13531 | + case $p in | ||
13532 | + -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;; | ||
13533 | + -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;; | ||
13534 | + -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;; | ||
13535 | + esac | ||
13536 | + fi | ||
13537 | + case $p in | ||
13538 | + =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;; | ||
13539 | + esac | ||
13540 | if test "$pre_test_object_deps_done" = no; then | ||
13541 | - case $p in | ||
13542 | - -L* | -R*) | ||
13543 | + case ${prev} in | ||
13544 | + -L | -R) | ||
13545 | # Internal compiler library paths should come after those | ||
13546 | # provided the user. The postdeps already come after the | ||
13547 | # user supplied libs so there is no need to process them. | ||
13548 | @@ -6549,8 +6969,10 @@ if AC_TRY_EVAL(ac_compile); then | ||
13549 | _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}" | ||
13550 | fi | ||
13551 | fi | ||
13552 | + prev= | ||
13553 | ;; | ||
13554 | |||
13555 | + *.lto.$objext) ;; # Ignore GCC LTO objects | ||
13556 | *.$objext) | ||
13557 | # This assumes that the test object file only shows up | ||
13558 | # once in the compiler output. | ||
13559 | @@ -6586,6 +7008,7 @@ else | ||
13560 | fi | ||
13561 | |||
13562 | $RM -f confest.$objext | ||
13563 | +CFLAGS=$_lt_libdeps_save_CFLAGS | ||
13564 | |||
13565 | # PORTME: override above test on systems where it is broken | ||
13566 | m4_if([$1], [CXX], | ||
13567 | @@ -6622,7 +7045,7 @@ linux*) | ||
13568 | |||
13569 | solaris*) | ||
13570 | case $cc_basename in | ||
13571 | - CC*) | ||
13572 | + CC* | sunCC*) | ||
13573 | # The more standards-conforming stlport4 library is | ||
13574 | # incompatible with the Cstd library. Avoid specifying | ||
13575 | # it if it's in CXXFLAGS. Ignore libCrun as | ||
13576 | @@ -6735,7 +7158,9 @@ if test "$_lt_disable_F77" != yes; then | ||
13577 | # Allow CC to be a program name with arguments. | ||
13578 | lt_save_CC="$CC" | ||
13579 | lt_save_GCC=$GCC | ||
13580 | + lt_save_CFLAGS=$CFLAGS | ||
13581 | CC=${F77-"f77"} | ||
13582 | + CFLAGS=$FFLAGS | ||
13583 | compiler=$CC | ||
13584 | _LT_TAGVAR(compiler, $1)=$CC | ||
13585 | _LT_CC_BASENAME([$compiler]) | ||
13586 | @@ -6789,6 +7214,7 @@ if test "$_lt_disable_F77" != yes; then | ||
13587 | |||
13588 | GCC=$lt_save_GCC | ||
13589 | CC="$lt_save_CC" | ||
13590 | + CFLAGS="$lt_save_CFLAGS" | ||
13591 | fi # test "$_lt_disable_F77" != yes | ||
13592 | |||
13593 | AC_LANG_POP | ||
13594 | @@ -6865,7 +7291,9 @@ if test "$_lt_disable_FC" != yes; then | ||
13595 | # Allow CC to be a program name with arguments. | ||
13596 | lt_save_CC="$CC" | ||
13597 | lt_save_GCC=$GCC | ||
13598 | + lt_save_CFLAGS=$CFLAGS | ||
13599 | CC=${FC-"f95"} | ||
13600 | + CFLAGS=$FCFLAGS | ||
13601 | compiler=$CC | ||
13602 | GCC=$ac_cv_fc_compiler_gnu | ||
13603 | |||
13604 | @@ -6921,7 +7349,8 @@ if test "$_lt_disable_FC" != yes; then | ||
13605 | fi # test -n "$compiler" | ||
13606 | |||
13607 | GCC=$lt_save_GCC | ||
13608 | - CC="$lt_save_CC" | ||
13609 | + CC=$lt_save_CC | ||
13610 | + CFLAGS=$lt_save_CFLAGS | ||
13611 | fi # test "$_lt_disable_FC" != yes | ||
13612 | |||
13613 | AC_LANG_POP | ||
13614 | @@ -6958,10 +7387,12 @@ _LT_COMPILER_BOILERPLATE | ||
13615 | _LT_LINKER_BOILERPLATE | ||
13616 | |||
13617 | # Allow CC to be a program name with arguments. | ||
13618 | -lt_save_CC="$CC" | ||
13619 | +lt_save_CC=$CC | ||
13620 | +lt_save_CFLAGS=$CFLAGS | ||
13621 | lt_save_GCC=$GCC | ||
13622 | GCC=yes | ||
13623 | CC=${GCJ-"gcj"} | ||
13624 | +CFLAGS=$GCJFLAGS | ||
13625 | compiler=$CC | ||
13626 | _LT_TAGVAR(compiler, $1)=$CC | ||
13627 | _LT_TAGVAR(LD, $1)="$LD" | ||
13628 | @@ -6992,7 +7423,8 @@ fi | ||
13629 | AC_LANG_RESTORE | ||
13630 | |||
13631 | GCC=$lt_save_GCC | ||
13632 | -CC="$lt_save_CC" | ||
13633 | +CC=$lt_save_CC | ||
13634 | +CFLAGS=$lt_save_CFLAGS | ||
13635 | ])# _LT_LANG_GCJ_CONFIG | ||
13636 | |||
13637 | |||
13638 | @@ -7027,9 +7459,11 @@ _LT_LINKER_BOILERPLATE | ||
13639 | |||
13640 | # Allow CC to be a program name with arguments. | ||
13641 | lt_save_CC="$CC" | ||
13642 | +lt_save_CFLAGS=$CFLAGS | ||
13643 | lt_save_GCC=$GCC | ||
13644 | GCC= | ||
13645 | CC=${RC-"windres"} | ||
13646 | +CFLAGS= | ||
13647 | compiler=$CC | ||
13648 | _LT_TAGVAR(compiler, $1)=$CC | ||
13649 | _LT_CC_BASENAME([$compiler]) | ||
13650 | @@ -7042,7 +7476,8 @@ fi | ||
13651 | |||
13652 | GCC=$lt_save_GCC | ||
13653 | AC_LANG_RESTORE | ||
13654 | -CC="$lt_save_CC" | ||
13655 | +CC=$lt_save_CC | ||
13656 | +CFLAGS=$lt_save_CFLAGS | ||
13657 | ])# _LT_LANG_RC_CONFIG | ||
13658 | |||
13659 | |||
13660 | @@ -7101,6 +7536,15 @@ _LT_DECL([], [OBJDUMP], [1], [An object symbol dumper]) | ||
13661 | AC_SUBST([OBJDUMP]) | ||
13662 | ]) | ||
13663 | |||
13664 | +# _LT_DECL_DLLTOOL | ||
13665 | +# ---------------- | ||
13666 | +# Ensure DLLTOOL variable is set. | ||
13667 | +m4_defun([_LT_DECL_DLLTOOL], | ||
13668 | +[AC_CHECK_TOOL(DLLTOOL, dlltool, false) | ||
13669 | +test -z "$DLLTOOL" && DLLTOOL=dlltool | ||
13670 | +_LT_DECL([], [DLLTOOL], [1], [DLL creation program]) | ||
13671 | +AC_SUBST([DLLTOOL]) | ||
13672 | +]) | ||
13673 | |||
13674 | # _LT_DECL_SED | ||
13675 | # ------------ | ||
13676 | @@ -7194,8 +7638,8 @@ m4_defun([_LT_CHECK_SHELL_FEATURES], | ||
13677 | # Try some XSI features | ||
13678 | xsi_shell=no | ||
13679 | ( _lt_dummy="a/b/c" | ||
13680 | - test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ | ||
13681 | - = c,a/b,, \ | ||
13682 | + test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ | ||
13683 | + = c,a/b,b/c, \ | ||
13684 | && eval 'test $(( 1 + 1 )) -eq 2 \ | ||
13685 | && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ | ||
13686 | && xsi_shell=yes | ||
13687 | @@ -7234,206 +7678,162 @@ _LT_DECL([NL2SP], [lt_NL2SP], [1], [turn newlines into spaces])dnl | ||
13688 | ])# _LT_CHECK_SHELL_FEATURES | ||
13689 | |||
13690 | |||
13691 | -# _LT_PROG_XSI_SHELLFNS | ||
13692 | -# --------------------- | ||
13693 | -# Bourne and XSI compatible variants of some useful shell functions. | ||
13694 | -m4_defun([_LT_PROG_XSI_SHELLFNS], | ||
13695 | -[case $xsi_shell in | ||
13696 | - yes) | ||
13697 | - cat << \_LT_EOF >> "$cfgfile" | ||
13698 | - | ||
13699 | -# func_dirname file append nondir_replacement | ||
13700 | -# Compute the dirname of FILE. If nonempty, add APPEND to the result, | ||
13701 | -# otherwise set result to NONDIR_REPLACEMENT. | ||
13702 | -func_dirname () | ||
13703 | -{ | ||
13704 | - case ${1} in | ||
13705 | - */*) func_dirname_result="${1%/*}${2}" ;; | ||
13706 | - * ) func_dirname_result="${3}" ;; | ||
13707 | - esac | ||
13708 | -} | ||
13709 | - | ||
13710 | -# func_basename file | ||
13711 | -func_basename () | ||
13712 | -{ | ||
13713 | - func_basename_result="${1##*/}" | ||
13714 | -} | ||
13715 | - | ||
13716 | -# func_dirname_and_basename file append nondir_replacement | ||
13717 | -# perform func_basename and func_dirname in a single function | ||
13718 | -# call: | ||
13719 | -# dirname: Compute the dirname of FILE. If nonempty, | ||
13720 | -# add APPEND to the result, otherwise set result | ||
13721 | -# to NONDIR_REPLACEMENT. | ||
13722 | -# value returned in "$func_dirname_result" | ||
13723 | -# basename: Compute filename of FILE. | ||
13724 | -# value retuned in "$func_basename_result" | ||
13725 | -# Implementation must be kept synchronized with func_dirname | ||
13726 | -# and func_basename. For efficiency, we do not delegate to | ||
13727 | -# those functions but instead duplicate the functionality here. | ||
13728 | -func_dirname_and_basename () | ||
13729 | -{ | ||
13730 | - case ${1} in | ||
13731 | - */*) func_dirname_result="${1%/*}${2}" ;; | ||
13732 | - * ) func_dirname_result="${3}" ;; | ||
13733 | - esac | ||
13734 | - func_basename_result="${1##*/}" | ||
13735 | -} | ||
13736 | - | ||
13737 | -# func_stripname prefix suffix name | ||
13738 | -# strip PREFIX and SUFFIX off of NAME. | ||
13739 | -# PREFIX and SUFFIX must not contain globbing or regex special | ||
13740 | -# characters, hashes, percent signs, but SUFFIX may contain a leading | ||
13741 | -# dot (in which case that matches only a dot). | ||
13742 | -func_stripname () | ||
13743 | -{ | ||
13744 | - # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are | ||
13745 | - # positional parameters, so assign one to ordinary parameter first. | ||
13746 | - func_stripname_result=${3} | ||
13747 | - func_stripname_result=${func_stripname_result#"${1}"} | ||
13748 | - func_stripname_result=${func_stripname_result%"${2}"} | ||
13749 | -} | ||
13750 | - | ||
13751 | -# func_opt_split | ||
13752 | -func_opt_split () | ||
13753 | -{ | ||
13754 | - func_opt_split_opt=${1%%=*} | ||
13755 | - func_opt_split_arg=${1#*=} | ||
13756 | -} | ||
13757 | - | ||
13758 | -# func_lo2o object | ||
13759 | -func_lo2o () | ||
13760 | -{ | ||
13761 | - case ${1} in | ||
13762 | - *.lo) func_lo2o_result=${1%.lo}.${objext} ;; | ||
13763 | - *) func_lo2o_result=${1} ;; | ||
13764 | - esac | ||
13765 | -} | ||
13766 | - | ||
13767 | -# func_xform libobj-or-source | ||
13768 | -func_xform () | ||
13769 | -{ | ||
13770 | - func_xform_result=${1%.*}.lo | ||
13771 | -} | ||
13772 | - | ||
13773 | -# func_arith arithmetic-term... | ||
13774 | -func_arith () | ||
13775 | -{ | ||
13776 | - func_arith_result=$(( $[*] )) | ||
13777 | -} | ||
13778 | - | ||
13779 | -# func_len string | ||
13780 | -# STRING may not start with a hyphen. | ||
13781 | -func_len () | ||
13782 | -{ | ||
13783 | - func_len_result=${#1} | ||
13784 | -} | ||
13785 | +# _LT_PROG_FUNCTION_REPLACE (FUNCNAME, REPLACEMENT-BODY) | ||
13786 | +# ------------------------------------------------------ | ||
13787 | +# In `$cfgfile', look for function FUNCNAME delimited by `^FUNCNAME ()$' and | ||
13788 | +# '^} FUNCNAME ', and replace its body with REPLACEMENT-BODY. | ||
13789 | +m4_defun([_LT_PROG_FUNCTION_REPLACE], | ||
13790 | +[dnl { | ||
13791 | +sed -e '/^$1 ()$/,/^} # $1 /c\ | ||
13792 | +$1 ()\ | ||
13793 | +{\ | ||
13794 | +m4_bpatsubsts([$2], [$], [\\], [^\([ ]\)], [\\\1]) | ||
13795 | +} # Extended-shell $1 implementation' "$cfgfile" > $cfgfile.tmp \ | ||
13796 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
13797 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
13798 | +test 0 -eq $? || _lt_function_replace_fail=: | ||
13799 | +]) | ||
13800 | |||
13801 | -_LT_EOF | ||
13802 | - ;; | ||
13803 | - *) # Bourne compatible functions. | ||
13804 | - cat << \_LT_EOF >> "$cfgfile" | ||
13805 | |||
13806 | -# func_dirname file append nondir_replacement | ||
13807 | -# Compute the dirname of FILE. If nonempty, add APPEND to the result, | ||
13808 | -# otherwise set result to NONDIR_REPLACEMENT. | ||
13809 | -func_dirname () | ||
13810 | -{ | ||
13811 | - # Extract subdirectory from the argument. | ||
13812 | - func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` | ||
13813 | - if test "X$func_dirname_result" = "X${1}"; then | ||
13814 | - func_dirname_result="${3}" | ||
13815 | - else | ||
13816 | - func_dirname_result="$func_dirname_result${2}" | ||
13817 | - fi | ||
13818 | -} | ||
13819 | +# _LT_PROG_REPLACE_SHELLFNS | ||
13820 | +# ------------------------- | ||
13821 | +# Replace existing portable implementations of several shell functions with | ||
13822 | +# equivalent extended shell implementations where those features are available.. | ||
13823 | +m4_defun([_LT_PROG_REPLACE_SHELLFNS], | ||
13824 | +[if test x"$xsi_shell" = xyes; then | ||
13825 | + _LT_PROG_FUNCTION_REPLACE([func_dirname], [dnl | ||
13826 | + case ${1} in | ||
13827 | + */*) func_dirname_result="${1%/*}${2}" ;; | ||
13828 | + * ) func_dirname_result="${3}" ;; | ||
13829 | + esac]) | ||
13830 | + | ||
13831 | + _LT_PROG_FUNCTION_REPLACE([func_basename], [dnl | ||
13832 | + func_basename_result="${1##*/}"]) | ||
13833 | + | ||
13834 | + _LT_PROG_FUNCTION_REPLACE([func_dirname_and_basename], [dnl | ||
13835 | + case ${1} in | ||
13836 | + */*) func_dirname_result="${1%/*}${2}" ;; | ||
13837 | + * ) func_dirname_result="${3}" ;; | ||
13838 | + esac | ||
13839 | + func_basename_result="${1##*/}"]) | ||
13840 | |||
13841 | -# func_basename file | ||
13842 | -func_basename () | ||
13843 | -{ | ||
13844 | - func_basename_result=`$ECHO "${1}" | $SED "$basename"` | ||
13845 | -} | ||
13846 | + _LT_PROG_FUNCTION_REPLACE([func_stripname], [dnl | ||
13847 | + # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are | ||
13848 | + # positional parameters, so assign one to ordinary parameter first. | ||
13849 | + func_stripname_result=${3} | ||
13850 | + func_stripname_result=${func_stripname_result#"${1}"} | ||
13851 | + func_stripname_result=${func_stripname_result%"${2}"}]) | ||
13852 | |||
13853 | -dnl func_dirname_and_basename | ||
13854 | -dnl A portable version of this function is already defined in general.m4sh | ||
13855 | -dnl so there is no need for it here. | ||
13856 | + _LT_PROG_FUNCTION_REPLACE([func_split_long_opt], [dnl | ||
13857 | + func_split_long_opt_name=${1%%=*} | ||
13858 | + func_split_long_opt_arg=${1#*=}]) | ||
13859 | |||
13860 | -# func_stripname prefix suffix name | ||
13861 | -# strip PREFIX and SUFFIX off of NAME. | ||
13862 | -# PREFIX and SUFFIX must not contain globbing or regex special | ||
13863 | -# characters, hashes, percent signs, but SUFFIX may contain a leading | ||
13864 | -# dot (in which case that matches only a dot). | ||
13865 | -# func_strip_suffix prefix name | ||
13866 | -func_stripname () | ||
13867 | -{ | ||
13868 | - case ${2} in | ||
13869 | - .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; | ||
13870 | - *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; | ||
13871 | - esac | ||
13872 | -} | ||
13873 | + _LT_PROG_FUNCTION_REPLACE([func_split_short_opt], [dnl | ||
13874 | + func_split_short_opt_arg=${1#??} | ||
13875 | + func_split_short_opt_name=${1%"$func_split_short_opt_arg"}]) | ||
13876 | |||
13877 | -# sed scripts: | ||
13878 | -my_sed_long_opt='1s/^\(-[[^=]]*\)=.*/\1/;q' | ||
13879 | -my_sed_long_arg='1s/^-[[^=]]*=//' | ||
13880 | + _LT_PROG_FUNCTION_REPLACE([func_lo2o], [dnl | ||
13881 | + case ${1} in | ||
13882 | + *.lo) func_lo2o_result=${1%.lo}.${objext} ;; | ||
13883 | + *) func_lo2o_result=${1} ;; | ||
13884 | + esac]) | ||
13885 | |||
13886 | -# func_opt_split | ||
13887 | -func_opt_split () | ||
13888 | -{ | ||
13889 | - func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"` | ||
13890 | - func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"` | ||
13891 | -} | ||
13892 | + _LT_PROG_FUNCTION_REPLACE([func_xform], [ func_xform_result=${1%.*}.lo]) | ||
13893 | |||
13894 | -# func_lo2o object | ||
13895 | -func_lo2o () | ||
13896 | -{ | ||
13897 | - func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` | ||
13898 | -} | ||
13899 | + _LT_PROG_FUNCTION_REPLACE([func_arith], [ func_arith_result=$(( $[*] ))]) | ||
13900 | |||
13901 | -# func_xform libobj-or-source | ||
13902 | -func_xform () | ||
13903 | -{ | ||
13904 | - func_xform_result=`$ECHO "${1}" | $SED 's/\.[[^.]]*$/.lo/'` | ||
13905 | -} | ||
13906 | + _LT_PROG_FUNCTION_REPLACE([func_len], [ func_len_result=${#1}]) | ||
13907 | +fi | ||
13908 | |||
13909 | -# func_arith arithmetic-term... | ||
13910 | -func_arith () | ||
13911 | -{ | ||
13912 | - func_arith_result=`expr "$[@]"` | ||
13913 | -} | ||
13914 | +if test x"$lt_shell_append" = xyes; then | ||
13915 | + _LT_PROG_FUNCTION_REPLACE([func_append], [ eval "${1}+=\\${2}"]) | ||
13916 | |||
13917 | -# func_len string | ||
13918 | -# STRING may not start with a hyphen. | ||
13919 | -func_len () | ||
13920 | -{ | ||
13921 | - func_len_result=`expr "$[1]" : ".*" 2>/dev/null || echo $max_cmd_len` | ||
13922 | -} | ||
13923 | + _LT_PROG_FUNCTION_REPLACE([func_append_quoted], [dnl | ||
13924 | + func_quote_for_eval "${2}" | ||
13925 | +dnl m4 expansion turns \\\\ into \\, and then the shell eval turns that into \ | ||
13926 | + eval "${1}+=\\\\ \\$func_quote_for_eval_result"]) | ||
13927 | |||
13928 | -_LT_EOF | ||
13929 | -esac | ||
13930 | + # Save a `func_append' function call where possible by direct use of '+=' | ||
13931 | + sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ | ||
13932 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
13933 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
13934 | + test 0 -eq $? || _lt_function_replace_fail=: | ||
13935 | +else | ||
13936 | + # Save a `func_append' function call even when '+=' is not available | ||
13937 | + sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ | ||
13938 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
13939 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
13940 | + test 0 -eq $? || _lt_function_replace_fail=: | ||
13941 | +fi | ||
13942 | |||
13943 | -case $lt_shell_append in | ||
13944 | - yes) | ||
13945 | - cat << \_LT_EOF >> "$cfgfile" | ||
13946 | +if test x"$_lt_function_replace_fail" = x":"; then | ||
13947 | + AC_MSG_WARN([Unable to substitute extended shell functions in $ofile]) | ||
13948 | +fi | ||
13949 | +]) | ||
13950 | |||
13951 | -# func_append var value | ||
13952 | -# Append VALUE to the end of shell variable VAR. | ||
13953 | -func_append () | ||
13954 | -{ | ||
13955 | - eval "$[1]+=\$[2]" | ||
13956 | -} | ||
13957 | -_LT_EOF | ||
13958 | +# _LT_PATH_CONVERSION_FUNCTIONS | ||
13959 | +# ----------------------------- | ||
13960 | +# Determine which file name conversion functions should be used by | ||
13961 | +# func_to_host_file (and, implicitly, by func_to_host_path). These are needed | ||
13962 | +# for certain cross-compile configurations and native mingw. | ||
13963 | +m4_defun([_LT_PATH_CONVERSION_FUNCTIONS], | ||
13964 | +[AC_REQUIRE([AC_CANONICAL_HOST])dnl | ||
13965 | +AC_REQUIRE([AC_CANONICAL_BUILD])dnl | ||
13966 | +AC_MSG_CHECKING([how to convert $build file names to $host format]) | ||
13967 | +AC_CACHE_VAL(lt_cv_to_host_file_cmd, | ||
13968 | +[case $host in | ||
13969 | + *-*-mingw* ) | ||
13970 | + case $build in | ||
13971 | + *-*-mingw* ) # actually msys | ||
13972 | + lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 | ||
13973 | + ;; | ||
13974 | + *-*-cygwin* ) | ||
13975 | + lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 | ||
13976 | + ;; | ||
13977 | + * ) # otherwise, assume *nix | ||
13978 | + lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 | ||
13979 | + ;; | ||
13980 | + esac | ||
13981 | ;; | ||
13982 | - *) | ||
13983 | - cat << \_LT_EOF >> "$cfgfile" | ||
13984 | - | ||
13985 | -# func_append var value | ||
13986 | -# Append VALUE to the end of shell variable VAR. | ||
13987 | -func_append () | ||
13988 | -{ | ||
13989 | - eval "$[1]=\$$[1]\$[2]" | ||
13990 | -} | ||
13991 | - | ||
13992 | -_LT_EOF | ||
13993 | + *-*-cygwin* ) | ||
13994 | + case $build in | ||
13995 | + *-*-mingw* ) # actually msys | ||
13996 | + lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin | ||
13997 | + ;; | ||
13998 | + *-*-cygwin* ) | ||
13999 | + lt_cv_to_host_file_cmd=func_convert_file_noop | ||
14000 | + ;; | ||
14001 | + * ) # otherwise, assume *nix | ||
14002 | + lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin | ||
14003 | + ;; | ||
14004 | + esac | ||
14005 | ;; | ||
14006 | - esac | ||
14007 | + * ) # unhandled hosts (and "normal" native builds) | ||
14008 | + lt_cv_to_host_file_cmd=func_convert_file_noop | ||
14009 | + ;; | ||
14010 | +esac | ||
14011 | +]) | ||
14012 | +to_host_file_cmd=$lt_cv_to_host_file_cmd | ||
14013 | +AC_MSG_RESULT([$lt_cv_to_host_file_cmd]) | ||
14014 | +_LT_DECL([to_host_file_cmd], [lt_cv_to_host_file_cmd], | ||
14015 | + [0], [convert $build file names to $host format])dnl | ||
14016 | + | ||
14017 | +AC_MSG_CHECKING([how to convert $build file names to toolchain format]) | ||
14018 | +AC_CACHE_VAL(lt_cv_to_tool_file_cmd, | ||
14019 | +[#assume ordinary cross tools, or native build. | ||
14020 | +lt_cv_to_tool_file_cmd=func_convert_file_noop | ||
14021 | +case $host in | ||
14022 | + *-*-mingw* ) | ||
14023 | + case $build in | ||
14024 | + *-*-mingw* ) # actually msys | ||
14025 | + lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 | ||
14026 | + ;; | ||
14027 | + esac | ||
14028 | + ;; | ||
14029 | +esac | ||
14030 | ]) | ||
14031 | +to_tool_file_cmd=$lt_cv_to_tool_file_cmd | ||
14032 | +AC_MSG_RESULT([$lt_cv_to_tool_file_cmd]) | ||
14033 | +_LT_DECL([to_tool_file_cmd], [lt_cv_to_tool_file_cmd], | ||
14034 | + [0], [convert $build files to toolchain format])dnl | ||
14035 | +])# _LT_PATH_CONVERSION_FUNCTIONS | ||
14036 | diff --git a/ltmain.sh b/ltmain.sh | ||
14037 | index 9503ec85d70..70e856e0659 100644 | ||
14038 | --- a/ltmain.sh | ||
14039 | +++ b/ltmain.sh | ||
14040 | @@ -1,10 +1,9 @@ | ||
14041 | -# Generated from ltmain.m4sh. | ||
14042 | |||
14043 | -# libtool (GNU libtool 1.3134 2009-11-29) 2.2.7a | ||
14044 | +# libtool (GNU libtool) 2.4 | ||
14045 | # Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996 | ||
14046 | |||
14047 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, | ||
14048 | -# 2007, 2008, 2009 Free Software Foundation, Inc. | ||
14049 | +# 2007, 2008, 2009, 2010 Free Software Foundation, Inc. | ||
14050 | # This is free software; see the source for copying conditions. There is NO | ||
14051 | # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. | ||
14052 | |||
14053 | @@ -38,7 +37,6 @@ | ||
14054 | # -n, --dry-run display commands without modifying any files | ||
14055 | # --features display basic configuration information and exit | ||
14056 | # --mode=MODE use operation mode MODE | ||
14057 | -# --no-finish let install mode avoid finish commands | ||
14058 | # --preserve-dup-deps don't remove duplicate dependency libraries | ||
14059 | # --quiet, --silent don't print informational messages | ||
14060 | # --no-quiet, --no-silent | ||
14061 | @@ -71,17 +69,19 @@ | ||
14062 | # compiler: $LTCC | ||
14063 | # compiler flags: $LTCFLAGS | ||
14064 | # linker: $LD (gnu? $with_gnu_ld) | ||
14065 | -# $progname: (GNU libtool 1.3134 2009-11-29) 2.2.7a | ||
14066 | +# $progname: (GNU libtool) 2.4 | ||
14067 | # automake: $automake_version | ||
14068 | # autoconf: $autoconf_version | ||
14069 | # | ||
14070 | # Report bugs to <bug-libtool@gnu.org>. | ||
14071 | +# GNU libtool home page: <http://www.gnu.org/software/libtool/>. | ||
14072 | +# General help using GNU software: <http://www.gnu.org/gethelp/>. | ||
14073 | |||
14074 | PROGRAM=libtool | ||
14075 | PACKAGE=libtool | ||
14076 | -VERSION=2.2.7a | ||
14077 | -TIMESTAMP=" 1.3134 2009-11-29" | ||
14078 | -package_revision=1.3134 | ||
14079 | +VERSION=2.4 | ||
14080 | +TIMESTAMP="" | ||
14081 | +package_revision=1.3293 | ||
14082 | |||
14083 | # Be Bourne compatible | ||
14084 | if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then | ||
14085 | @@ -106,9 +106,6 @@ _LTECHO_EOF' | ||
14086 | } | ||
14087 | |||
14088 | # NLS nuisances: We save the old values to restore during execute mode. | ||
14089 | -# Only set LANG and LC_ALL to C if already set. | ||
14090 | -# These must not be set unconditionally because not all systems understand | ||
14091 | -# e.g. LANG=C (notably SCO). | ||
14092 | lt_user_locale= | ||
14093 | lt_safe_locale= | ||
14094 | for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES | ||
14095 | @@ -121,15 +118,13 @@ do | ||
14096 | lt_safe_locale=\"$lt_var=C; \$lt_safe_locale\" | ||
14097 | fi" | ||
14098 | done | ||
14099 | +LC_ALL=C | ||
14100 | +LANGUAGE=C | ||
14101 | +export LANGUAGE LC_ALL | ||
14102 | |||
14103 | $lt_unset CDPATH | ||
14104 | |||
14105 | |||
14106 | - | ||
14107 | - | ||
14108 | - | ||
14109 | - | ||
14110 | - | ||
14111 | # Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh | ||
14112 | # is ksh but when the shell is invoked as "sh" and the current value of | ||
14113 | # the _XPG environment variable is not equal to 1 (one), the special | ||
14114 | @@ -140,7 +135,7 @@ progpath="$0" | ||
14115 | |||
14116 | |||
14117 | : ${CP="cp -f"} | ||
14118 | -: ${ECHO=$as_echo} | ||
14119 | +test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'} | ||
14120 | : ${EGREP="/bin/grep -E"} | ||
14121 | : ${FGREP="/bin/grep -F"} | ||
14122 | : ${GREP="/bin/grep"} | ||
14123 | @@ -149,7 +144,7 @@ progpath="$0" | ||
14124 | : ${MKDIR="mkdir"} | ||
14125 | : ${MV="mv -f"} | ||
14126 | : ${RM="rm -f"} | ||
14127 | -: ${SED="/mount/endor/wildenhu/local-x86_64/bin/sed"} | ||
14128 | +: ${SED="/bin/sed"} | ||
14129 | : ${SHELL="${CONFIG_SHELL-/bin/sh}"} | ||
14130 | : ${Xsed="$SED -e 1s/^X//"} | ||
14131 | |||
14132 | @@ -169,6 +164,27 @@ IFS=" $lt_nl" | ||
14133 | dirname="s,/[^/]*$,," | ||
14134 | basename="s,^.*/,," | ||
14135 | |||
14136 | +# func_dirname file append nondir_replacement | ||
14137 | +# Compute the dirname of FILE. If nonempty, add APPEND to the result, | ||
14138 | +# otherwise set result to NONDIR_REPLACEMENT. | ||
14139 | +func_dirname () | ||
14140 | +{ | ||
14141 | + func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` | ||
14142 | + if test "X$func_dirname_result" = "X${1}"; then | ||
14143 | + func_dirname_result="${3}" | ||
14144 | + else | ||
14145 | + func_dirname_result="$func_dirname_result${2}" | ||
14146 | + fi | ||
14147 | +} # func_dirname may be replaced by extended shell implementation | ||
14148 | + | ||
14149 | + | ||
14150 | +# func_basename file | ||
14151 | +func_basename () | ||
14152 | +{ | ||
14153 | + func_basename_result=`$ECHO "${1}" | $SED "$basename"` | ||
14154 | +} # func_basename may be replaced by extended shell implementation | ||
14155 | + | ||
14156 | + | ||
14157 | # func_dirname_and_basename file append nondir_replacement | ||
14158 | # perform func_basename and func_dirname in a single function | ||
14159 | # call: | ||
14160 | @@ -183,17 +199,31 @@ basename="s,^.*/,," | ||
14161 | # those functions but instead duplicate the functionality here. | ||
14162 | func_dirname_and_basename () | ||
14163 | { | ||
14164 | - # Extract subdirectory from the argument. | ||
14165 | - func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"` | ||
14166 | - if test "X$func_dirname_result" = "X${1}"; then | ||
14167 | - func_dirname_result="${3}" | ||
14168 | - else | ||
14169 | - func_dirname_result="$func_dirname_result${2}" | ||
14170 | - fi | ||
14171 | - func_basename_result=`$ECHO "${1}" | $SED -e "$basename"` | ||
14172 | -} | ||
14173 | + # Extract subdirectory from the argument. | ||
14174 | + func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"` | ||
14175 | + if test "X$func_dirname_result" = "X${1}"; then | ||
14176 | + func_dirname_result="${3}" | ||
14177 | + else | ||
14178 | + func_dirname_result="$func_dirname_result${2}" | ||
14179 | + fi | ||
14180 | + func_basename_result=`$ECHO "${1}" | $SED -e "$basename"` | ||
14181 | +} # func_dirname_and_basename may be replaced by extended shell implementation | ||
14182 | + | ||
14183 | + | ||
14184 | +# func_stripname prefix suffix name | ||
14185 | +# strip PREFIX and SUFFIX off of NAME. | ||
14186 | +# PREFIX and SUFFIX must not contain globbing or regex special | ||
14187 | +# characters, hashes, percent signs, but SUFFIX may contain a leading | ||
14188 | +# dot (in which case that matches only a dot). | ||
14189 | +# func_strip_suffix prefix name | ||
14190 | +func_stripname () | ||
14191 | +{ | ||
14192 | + case ${2} in | ||
14193 | + .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; | ||
14194 | + *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; | ||
14195 | + esac | ||
14196 | +} # func_stripname may be replaced by extended shell implementation | ||
14197 | |||
14198 | -# Generated shell functions inserted here. | ||
14199 | |||
14200 | # These SED scripts presuppose an absolute path with a trailing slash. | ||
14201 | pathcar='s,^/\([^/]*\).*$,\1,' | ||
14202 | @@ -376,6 +406,15 @@ sed_quote_subst='s/\([`"$\\]\)/\\\1/g' | ||
14203 | # Same as above, but do not quote variable references. | ||
14204 | double_quote_subst='s/\(["`\\]\)/\\\1/g' | ||
14205 | |||
14206 | +# Sed substitution that turns a string into a regex matching for the | ||
14207 | +# string literally. | ||
14208 | +sed_make_literal_regex='s,[].[^$\\*\/],\\&,g' | ||
14209 | + | ||
14210 | +# Sed substitution that converts a w32 file name or path | ||
14211 | +# which contains forward slashes, into one that contains | ||
14212 | +# (escaped) backslashes. A very naive implementation. | ||
14213 | +lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g' | ||
14214 | + | ||
14215 | # Re-`\' parameter expansions in output of double_quote_subst that were | ||
14216 | # `\'-ed in input to the same. If an odd number of `\' preceded a '$' | ||
14217 | # in input to double_quote_subst, that '$' was protected from expansion. | ||
14218 | @@ -404,7 +443,7 @@ opt_warning=: | ||
14219 | # name if it has been set yet. | ||
14220 | func_echo () | ||
14221 | { | ||
14222 | - $ECHO "$progname${mode+: }$mode: $*" | ||
14223 | + $ECHO "$progname: ${opt_mode+$opt_mode: }$*" | ||
14224 | } | ||
14225 | |||
14226 | # func_verbose arg... | ||
14227 | @@ -430,14 +469,14 @@ func_echo_all () | ||
14228 | # Echo program name prefixed message to standard error. | ||
14229 | func_error () | ||
14230 | { | ||
14231 | - $ECHO "$progname${mode+: }$mode: "${1+"$@"} 1>&2 | ||
14232 | + $ECHO "$progname: ${opt_mode+$opt_mode: }"${1+"$@"} 1>&2 | ||
14233 | } | ||
14234 | |||
14235 | # func_warning arg... | ||
14236 | # Echo program name prefixed warning message to standard error. | ||
14237 | func_warning () | ||
14238 | { | ||
14239 | - $opt_warning && $ECHO "$progname${mode+: }$mode: warning: "${1+"$@"} 1>&2 | ||
14240 | + $opt_warning && $ECHO "$progname: ${opt_mode+$opt_mode: }warning: "${1+"$@"} 1>&2 | ||
14241 | |||
14242 | # bash bug again: | ||
14243 | : | ||
14244 | @@ -656,19 +695,35 @@ func_show_eval_locale () | ||
14245 | fi | ||
14246 | } | ||
14247 | |||
14248 | - | ||
14249 | - | ||
14250 | +# func_tr_sh | ||
14251 | +# Turn $1 into a string suitable for a shell variable name. | ||
14252 | +# Result is stored in $func_tr_sh_result. All characters | ||
14253 | +# not in the set a-zA-Z0-9_ are replaced with '_'. Further, | ||
14254 | +# if $1 begins with a digit, a '_' is prepended as well. | ||
14255 | +func_tr_sh () | ||
14256 | +{ | ||
14257 | + case $1 in | ||
14258 | + [0-9]* | *[!a-zA-Z0-9_]*) | ||
14259 | + func_tr_sh_result=`$ECHO "$1" | $SED 's/^\([0-9]\)/_\1/; s/[^a-zA-Z0-9_]/_/g'` | ||
14260 | + ;; | ||
14261 | + * ) | ||
14262 | + func_tr_sh_result=$1 | ||
14263 | + ;; | ||
14264 | + esac | ||
14265 | +} | ||
14266 | |||
14267 | |||
14268 | # func_version | ||
14269 | # Echo version message to standard output and exit. | ||
14270 | func_version () | ||
14271 | { | ||
14272 | + $opt_debug | ||
14273 | + | ||
14274 | $SED -n '/(C)/!b go | ||
14275 | :more | ||
14276 | /\./!{ | ||
14277 | N | ||
14278 | - s/\n# // | ||
14279 | + s/\n# / / | ||
14280 | b more | ||
14281 | } | ||
14282 | :go | ||
14283 | @@ -685,7 +740,9 @@ func_version () | ||
14284 | # Echo short help message to standard output and exit. | ||
14285 | func_usage () | ||
14286 | { | ||
14287 | - $SED -n '/^# Usage:/,/^# *-h/ { | ||
14288 | + $opt_debug | ||
14289 | + | ||
14290 | + $SED -n '/^# Usage:/,/^# *.*--help/ { | ||
14291 | s/^# // | ||
14292 | s/^# *$// | ||
14293 | s/\$progname/'$progname'/ | ||
14294 | @@ -701,7 +758,10 @@ func_usage () | ||
14295 | # unless 'noexit' is passed as argument. | ||
14296 | func_help () | ||
14297 | { | ||
14298 | + $opt_debug | ||
14299 | + | ||
14300 | $SED -n '/^# Usage:/,/# Report bugs to/ { | ||
14301 | |||
14302 | s/^# // | ||
14303 | s/^# *$// | ||
14304 | s*\$progname*'$progname'* | ||
14305 | @@ -714,7 +774,11 @@ func_help () | ||
14306 | s/\$automake_version/'"`(automake --version) 2>/dev/null |$SED 1q`"'/ | ||
14307 | s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/ | ||
14308 | p | ||
14309 | - }' < "$progpath" | ||
14310 | + d | ||
14311 | + } | ||
14312 | + /^# .* home page:/b print | ||
14313 | + /^# General help using/b print | ||
14314 | + ' < "$progpath" | ||
14315 | ret=$? | ||
14316 | if test -z "$1"; then | ||
14317 | exit $ret | ||
14318 | @@ -726,12 +790,39 @@ func_help () | ||
14319 | # exit_cmd. | ||
14320 | func_missing_arg () | ||
14321 | { | ||
14322 | - func_error "missing argument for $1" | ||
14323 | + $opt_debug | ||
14324 | + | ||
14325 | + func_error "missing argument for $1." | ||
14326 | exit_cmd=exit | ||
14327 | } | ||
14328 | |||
14329 | -exit_cmd=: | ||
14330 | |||
14331 | +# func_split_short_opt shortopt | ||
14332 | +# Set func_split_short_opt_name and func_split_short_opt_arg shell | ||
14333 | +# variables after splitting SHORTOPT after the 2nd character. | ||
14334 | +func_split_short_opt () | ||
14335 | +{ | ||
14336 | + my_sed_short_opt='1s/^\(..\).*$/\1/;q' | ||
14337 | + my_sed_short_rest='1s/^..\(.*\)$/\1/;q' | ||
14338 | + | ||
14339 | + func_split_short_opt_name=`$ECHO "$1" | $SED "$my_sed_short_opt"` | ||
14340 | + func_split_short_opt_arg=`$ECHO "$1" | $SED "$my_sed_short_rest"` | ||
14341 | +} # func_split_short_opt may be replaced by extended shell implementation | ||
14342 | + | ||
14343 | + | ||
14344 | +# func_split_long_opt longopt | ||
14345 | +# Set func_split_long_opt_name and func_split_long_opt_arg shell | ||
14346 | +# variables after splitting LONGOPT at the `=' sign. | ||
14347 | +func_split_long_opt () | ||
14348 | +{ | ||
14349 | + my_sed_long_opt='1s/^\(--[^=]*\)=.*/\1/;q' | ||
14350 | + my_sed_long_arg='1s/^--[^=]*=//' | ||
14351 | + | ||
14352 | + func_split_long_opt_name=`$ECHO "$1" | $SED "$my_sed_long_opt"` | ||
14353 | + func_split_long_opt_arg=`$ECHO "$1" | $SED "$my_sed_long_arg"` | ||
14354 | +} # func_split_long_opt may be replaced by extended shell implementation | ||
14355 | + | ||
14356 | +exit_cmd=: | ||
14357 | |||
14358 | |||
14359 | |||
14360 | @@ -741,26 +832,64 @@ magic="%%%MAGIC variable%%%" | ||
14361 | magic_exe="%%%MAGIC EXE variable%%%" | ||
14362 | |||
14363 | # Global variables. | ||
14364 | -# $mode is unset | ||
14365 | nonopt= | ||
14366 | -execute_dlfiles= | ||
14367 | preserve_args= | ||
14368 | lo2o="s/\\.lo\$/.${objext}/" | ||
14369 | o2lo="s/\\.${objext}\$/.lo/" | ||
14370 | extracted_archives= | ||
14371 | extracted_serial=0 | ||
14372 | |||
14373 | -opt_dry_run=false | ||
14374 | -opt_finish=: | ||
14375 | -opt_duplicate_deps=false | ||
14376 | -opt_silent=false | ||
14377 | -opt_debug=: | ||
14378 | - | ||
14379 | # If this variable is set in any of the actions, the command in it | ||
14380 | # will be execed at the end. This prevents here-documents from being | ||
14381 | # left over by shells. | ||
14382 | exec_cmd= | ||
14383 | |||
14384 | +# func_append var value | ||
14385 | +# Append VALUE to the end of shell variable VAR. | ||
14386 | +func_append () | ||
14387 | +{ | ||
14388 | + eval "${1}=\$${1}\${2}" | ||
14389 | +} # func_append may be replaced by extended shell implementation | ||
14390 | + | ||
14391 | +# func_append_quoted var value | ||
14392 | +# Quote VALUE and append to the end of shell variable VAR, separated | ||
14393 | +# by a space. | ||
14394 | +func_append_quoted () | ||
14395 | +{ | ||
14396 | + func_quote_for_eval "${2}" | ||
14397 | + eval "${1}=\$${1}\\ \$func_quote_for_eval_result" | ||
14398 | +} # func_append_quoted may be replaced by extended shell implementation | ||
14399 | + | ||
14400 | + | ||
14401 | +# func_arith arithmetic-term... | ||
14402 | +func_arith () | ||
14403 | +{ | ||
14404 | + func_arith_result=`expr "${@}"` | ||
14405 | +} # func_arith may be replaced by extended shell implementation | ||
14406 | + | ||
14407 | + | ||
14408 | +# func_len string | ||
14409 | +# STRING may not start with a hyphen. | ||
14410 | +func_len () | ||
14411 | +{ | ||
14412 | + func_len_result=`expr "${1}" : ".*" 2>/dev/null || echo $max_cmd_len` | ||
14413 | +} # func_len may be replaced by extended shell implementation | ||
14414 | + | ||
14415 | + | ||
14416 | +# func_lo2o object | ||
14417 | +func_lo2o () | ||
14418 | +{ | ||
14419 | + func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` | ||
14420 | +} # func_lo2o may be replaced by extended shell implementation | ||
14421 | + | ||
14422 | + | ||
14423 | +# func_xform libobj-or-source | ||
14424 | +func_xform () | ||
14425 | +{ | ||
14426 | + func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'` | ||
14427 | +} # func_xform may be replaced by extended shell implementation | ||
14428 | + | ||
14429 | + | ||
14430 | # func_fatal_configuration arg... | ||
14431 | # Echo program name prefixed message to standard error, followed by | ||
14432 | # a configuration failure hint, and exit. | ||
14433 | @@ -850,130 +979,204 @@ func_enable_tag () | ||
14434 | esac | ||
14435 | } | ||
14436 | |||
14437 | -# Parse options once, thoroughly. This comes as soon as possible in | ||
14438 | -# the script to make things like `libtool --version' happen quickly. | ||
14439 | +# func_check_version_match | ||
14440 | +# Ensure that we are using m4 macros, and libtool script from the same | ||
14441 | +# release of libtool. | ||
14442 | +func_check_version_match () | ||
14443 | { | ||
14444 | + if test "$package_revision" != "$macro_revision"; then | ||
14445 | + if test "$VERSION" != "$macro_version"; then | ||
14446 | + if test -z "$macro_version"; then | ||
14447 | + cat >&2 <<_LT_EOF | ||
14448 | +$progname: Version mismatch error. This is $PACKAGE $VERSION, but the | ||
14449 | +$progname: definition of this LT_INIT comes from an older release. | ||
14450 | +$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION | ||
14451 | +$progname: and run autoconf again. | ||
14452 | +_LT_EOF | ||
14453 | + else | ||
14454 | + cat >&2 <<_LT_EOF | ||
14455 | +$progname: Version mismatch error. This is $PACKAGE $VERSION, but the | ||
14456 | +$progname: definition of this LT_INIT comes from $PACKAGE $macro_version. | ||
14457 | +$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION | ||
14458 | +$progname: and run autoconf again. | ||
14459 | +_LT_EOF | ||
14460 | + fi | ||
14461 | + else | ||
14462 | + cat >&2 <<_LT_EOF | ||
14463 | +$progname: Version mismatch error. This is $PACKAGE $VERSION, revision $package_revision, | ||
14464 | +$progname: but the definition of this LT_INIT comes from revision $macro_revision. | ||
14465 | +$progname: You should recreate aclocal.m4 with macros from revision $package_revision | ||
14466 | +$progname: of $PACKAGE $VERSION and run autoconf again. | ||
14467 | +_LT_EOF | ||
14468 | + fi | ||
14469 | |||
14470 | - # Shorthand for --mode=foo, only valid as the first argument | ||
14471 | - case $1 in | ||
14472 | - clean|clea|cle|cl) | ||
14473 | - shift; set dummy --mode clean ${1+"$@"}; shift | ||
14474 | - ;; | ||
14475 | - compile|compil|compi|comp|com|co|c) | ||
14476 | - shift; set dummy --mode compile ${1+"$@"}; shift | ||
14477 | - ;; | ||
14478 | - execute|execut|execu|exec|exe|ex|e) | ||
14479 | - shift; set dummy --mode execute ${1+"$@"}; shift | ||
14480 | - ;; | ||
14481 | - finish|finis|fini|fin|fi|f) | ||
14482 | - shift; set dummy --mode finish ${1+"$@"}; shift | ||
14483 | - ;; | ||
14484 | - install|instal|insta|inst|ins|in|i) | ||
14485 | - shift; set dummy --mode install ${1+"$@"}; shift | ||
14486 | - ;; | ||
14487 | - link|lin|li|l) | ||
14488 | - shift; set dummy --mode link ${1+"$@"}; shift | ||
14489 | - ;; | ||
14490 | - uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u) | ||
14491 | - shift; set dummy --mode uninstall ${1+"$@"}; shift | ||
14492 | - ;; | ||
14493 | - esac | ||
14494 | + exit $EXIT_MISMATCH | ||
14495 | + fi | ||
14496 | +} | ||
14497 | + | ||
14498 | + | ||
14499 | +# Shorthand for --mode=foo, only valid as the first argument | ||
14500 | +case $1 in | ||
14501 | +clean|clea|cle|cl) | ||
14502 | + shift; set dummy --mode clean ${1+"$@"}; shift | ||
14503 | + ;; | ||
14504 | +compile|compil|compi|comp|com|co|c) | ||
14505 | + shift; set dummy --mode compile ${1+"$@"}; shift | ||
14506 | + ;; | ||
14507 | +execute|execut|execu|exec|exe|ex|e) | ||
14508 | + shift; set dummy --mode execute ${1+"$@"}; shift | ||
14509 | + ;; | ||
14510 | +finish|finis|fini|fin|fi|f) | ||
14511 | + shift; set dummy --mode finish ${1+"$@"}; shift | ||
14512 | + ;; | ||
14513 | +install|instal|insta|inst|ins|in|i) | ||
14514 | + shift; set dummy --mode install ${1+"$@"}; shift | ||
14515 | + ;; | ||
14516 | +link|lin|li|l) | ||
14517 | + shift; set dummy --mode link ${1+"$@"}; shift | ||
14518 | + ;; | ||
14519 | +uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u) | ||
14520 | + shift; set dummy --mode uninstall ${1+"$@"}; shift | ||
14521 | + ;; | ||
14522 | +esac | ||
14523 | |||
14524 | - # Parse non-mode specific arguments: | ||
14525 | - while test "$#" -gt 0; do | ||
14526 | + | ||
14527 | + | ||
14528 | +# Option defaults: | ||
14529 | +opt_debug=: | ||
14530 | +opt_dry_run=false | ||
14531 | +opt_config=false | ||
14532 | +opt_preserve_dup_deps=false | ||
14533 | +opt_features=false | ||
14534 | +opt_finish=false | ||
14535 | +opt_help=false | ||
14536 | +opt_help_all=false | ||
14537 | +opt_silent=: | ||
14538 | +opt_verbose=: | ||
14539 | +opt_silent=false | ||
14540 | +opt_verbose=false | ||
14541 | + | ||
14542 | + | ||
14543 | +# Parse options once, thoroughly. This comes as soon as possible in the | ||
14544 | +# script to make things like `--version' happen as quickly as we can. | ||
14545 | +{ | ||
14546 | + # this just eases exit handling | ||
14547 | + while test $# -gt 0; do | ||
14548 | opt="$1" | ||
14549 | shift | ||
14550 | - | ||
14551 | case $opt in | ||
14552 | - --config) func_config ;; | ||
14553 | - | ||
14554 | - --debug) preserve_args="$preserve_args $opt" | ||
14555 | + --debug|-x) opt_debug='set -x' | ||
14556 | func_echo "enabling shell trace mode" | ||
14557 | - opt_debug='set -x' | ||
14558 | $opt_debug | ||
14559 | ;; | ||
14560 | - | ||
14561 | - -dlopen) test "$#" -eq 0 && func_missing_arg "$opt" && break | ||
14562 | - execute_dlfiles="$execute_dlfiles $1" | ||
14563 | - shift | ||
14564 | + --dry-run|--dryrun|-n) | ||
14565 | + opt_dry_run=: | ||
14566 | ;; | ||
14567 | - | ||
14568 | - --dry-run | -n) opt_dry_run=: ;; | ||
14569 | - --features) func_features ;; | ||
14570 | - --finish) mode="finish" ;; | ||
14571 | - --no-finish) opt_finish=false ;; | ||
14572 | - | ||
14573 | - --mode) test "$#" -eq 0 && func_missing_arg "$opt" && break | ||
14574 | - case $1 in | ||
14575 | - # Valid mode arguments: | ||
14576 | - clean) ;; | ||
14577 | - compile) ;; | ||
14578 | - execute) ;; | ||
14579 | - finish) ;; | ||
14580 | - install) ;; | ||
14581 | - link) ;; | ||
14582 | - relink) ;; | ||
14583 | - uninstall) ;; | ||
14584 | - | ||
14585 | - # Catch anything else as an error | ||
14586 | - *) func_error "invalid argument for $opt" | ||
14587 | - exit_cmd=exit | ||
14588 | - break | ||
14589 | - ;; | ||
14590 | - esac | ||
14591 | - | ||
14592 | - mode="$1" | ||
14593 | + --config) | ||
14594 | + opt_config=: | ||
14595 | +func_config | ||
14596 | + ;; | ||
14597 | + --dlopen|-dlopen) | ||
14598 | + optarg="$1" | ||
14599 | + opt_dlopen="${opt_dlopen+$opt_dlopen | ||
14600 | +}$optarg" | ||
14601 | shift | ||
14602 | ;; | ||
14603 | - | ||
14604 | --preserve-dup-deps) | ||
14605 | - opt_duplicate_deps=: ;; | ||
14606 | - | ||
14607 | - --quiet|--silent) preserve_args="$preserve_args $opt" | ||
14608 | - opt_silent=: | ||
14609 | - opt_verbose=false | ||
14610 | + opt_preserve_dup_deps=: | ||
14611 | ;; | ||
14612 | - | ||
14613 | - --no-quiet|--no-silent) | ||
14614 | - preserve_args="$preserve_args $opt" | ||
14615 | - opt_silent=false | ||
14616 | + --features) | ||
14617 | + opt_features=: | ||
14618 | +func_features | ||
14619 | ;; | ||
14620 | - | ||
14621 | - --verbose| -v) preserve_args="$preserve_args $opt" | ||
14622 | + --finish) | ||
14623 | + opt_finish=: | ||
14624 | +set dummy --mode finish ${1+"$@"}; shift | ||
14625 | + ;; | ||
14626 | + --help) | ||
14627 | + opt_help=: | ||
14628 | + ;; | ||
14629 | + --help-all) | ||
14630 | + opt_help_all=: | ||
14631 | +opt_help=': help-all' | ||
14632 | + ;; | ||
14633 | + --mode) | ||
14634 | + test $# = 0 && func_missing_arg $opt && break | ||
14635 | + optarg="$1" | ||
14636 | + opt_mode="$optarg" | ||
14637 | +case $optarg in | ||
14638 | + # Valid mode arguments: | ||
14639 | + clean|compile|execute|finish|install|link|relink|uninstall) ;; | ||
14640 | + | ||
14641 | + # Catch anything else as an error | ||
14642 | + *) func_error "invalid argument for $opt" | ||
14643 | + exit_cmd=exit | ||
14644 | + break | ||
14645 | + ;; | ||
14646 | +esac | ||
14647 | + shift | ||
14648 | + ;; | ||
14649 | + --no-silent|--no-quiet) | ||
14650 | opt_silent=false | ||
14651 | - opt_verbose=: | ||
14652 | +func_append preserve_args " $opt" | ||
14653 | ;; | ||
14654 | - | ||
14655 | - --no-verbose) preserve_args="$preserve_args $opt" | ||
14656 | + --no-verbose) | ||
14657 | opt_verbose=false | ||
14658 | +func_append preserve_args " $opt" | ||
14659 | ;; | ||
14660 | - | ||
14661 | - --tag) test "$#" -eq 0 && func_missing_arg "$opt" && break | ||
14662 | - preserve_args="$preserve_args $opt $1" | ||
14663 | - func_enable_tag "$1" # tagname is set here | ||
14664 | + --silent|--quiet) | ||
14665 | + opt_silent=: | ||
14666 | +func_append preserve_args " $opt" | ||
14667 | + opt_verbose=false | ||
14668 | + ;; | ||
14669 | + --verbose|-v) | ||
14670 | + opt_verbose=: | ||
14671 | +func_append preserve_args " $opt" | ||
14672 | +opt_silent=false | ||
14673 | + ;; | ||
14674 | + --tag) | ||
14675 | + test $# = 0 && func_missing_arg $opt && break | ||
14676 | + optarg="$1" | ||
14677 | + opt_tag="$optarg" | ||
14678 | +func_append preserve_args " $opt $optarg" | ||
14679 | +func_enable_tag "$optarg" | ||
14680 | shift | ||
14681 | ;; | ||
14682 | |||
14683 | + -\?|-h) func_usage ;; | ||
14684 | + --help) func_help ;; | ||
14685 | + --version) func_version ;; | ||
14686 | + | ||
14687 | # Separate optargs to long options: | ||
14688 | - -dlopen=*|--mode=*|--tag=*) | ||
14689 | - func_opt_split "$opt" | ||
14690 | - set dummy "$func_opt_split_opt" "$func_opt_split_arg" ${1+"$@"} | ||
14691 | + --*=*) | ||
14692 | + func_split_long_opt "$opt" | ||
14693 | + set dummy "$func_split_long_opt_name" "$func_split_long_opt_arg" ${1+"$@"} | ||
14694 | shift | ||
14695 | ;; | ||
14696 | |||
14697 | - -\?|-h) func_usage ;; | ||
14698 | - --help) opt_help=: ;; | ||
14699 | - --help-all) opt_help=': help-all' ;; | ||
14700 | - --version) func_version ;; | ||
14701 | - | ||
14702 | - -*) func_fatal_help "unrecognized option \`$opt'" ;; | ||
14703 | - | ||
14704 | - *) nonopt="$opt" | ||
14705 | - break | ||
14706 | + # Separate non-argument short options: | ||
14707 | + -\?*|-h*|-n*|-v*) | ||
14708 | + func_split_short_opt "$opt" | ||
14709 | + set dummy "$func_split_short_opt_name" "-$func_split_short_opt_arg" ${1+"$@"} | ||
14710 | + shift | ||
14711 | ;; | ||
14712 | + | ||
14713 | + --) break ;; | ||
14714 | + -*) func_fatal_help "unrecognized option \`$opt'" ;; | ||
14715 | + *) set dummy "$opt" ${1+"$@"}; shift; break ;; | ||
14716 | esac | ||
14717 | done | ||
14718 | |||
14719 | + # Validate options: | ||
14720 | + | ||
14721 | + # save first non-option argument | ||
14722 | + if test "$#" -gt 0; then | ||
14723 | + nonopt="$opt" | ||
14724 | + shift | ||
14725 | + fi | ||
14726 | + | ||
14727 | + # preserve --debug | ||
14728 | + test "$opt_debug" = : || func_append preserve_args " --debug" | ||
14729 | |||
14730 | case $host in | ||
14731 | *cygwin* | *mingw* | *pw32* | *cegcc* | *solaris2* ) | ||
14732 | @@ -981,82 +1184,44 @@ func_enable_tag () | ||
14733 | opt_duplicate_compiler_generated_deps=: | ||
14734 | ;; | ||
14735 | *) | ||
14736 | - opt_duplicate_compiler_generated_deps=$opt_duplicate_deps | ||
14737 | + opt_duplicate_compiler_generated_deps=$opt_preserve_dup_deps | ||
14738 | ;; | ||
14739 | esac | ||
14740 | |||
14741 | - # Having warned about all mis-specified options, bail out if | ||
14742 | - # anything was wrong. | ||
14743 | - $exit_cmd $EXIT_FAILURE | ||
14744 | -} | ||
14745 | + $opt_help || { | ||
14746 | + # Sanity checks first: | ||
14747 | + func_check_version_match | ||
14748 | |||
14749 | -# func_check_version_match | ||
14750 | -# Ensure that we are using m4 macros, and libtool script from the same | ||
14751 | -# release of libtool. | ||
14752 | -func_check_version_match () | ||
14753 | -{ | ||
14754 | - if test "$package_revision" != "$macro_revision"; then | ||
14755 | - if test "$VERSION" != "$macro_version"; then | ||
14756 | - if test -z "$macro_version"; then | ||
14757 | - cat >&2 <<_LT_EOF | ||
14758 | -$progname: Version mismatch error. This is $PACKAGE $VERSION, but the | ||
14759 | -$progname: definition of this LT_INIT comes from an older release. | ||
14760 | -$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION | ||
14761 | -$progname: and run autoconf again. | ||
14762 | -_LT_EOF | ||
14763 | - else | ||
14764 | - cat >&2 <<_LT_EOF | ||
14765 | -$progname: Version mismatch error. This is $PACKAGE $VERSION, but the | ||
14766 | -$progname: definition of this LT_INIT comes from $PACKAGE $macro_version. | ||
14767 | -$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION | ||
14768 | -$progname: and run autoconf again. | ||
14769 | -_LT_EOF | ||
14770 | - fi | ||
14771 | - else | ||
14772 | - cat >&2 <<_LT_EOF | ||
14773 | -$progname: Version mismatch error. This is $PACKAGE $VERSION, revision $package_revision, | ||
14774 | -$progname: but the definition of this LT_INIT comes from revision $macro_revision. | ||
14775 | -$progname: You should recreate aclocal.m4 with macros from revision $package_revision | ||
14776 | -$progname: of $PACKAGE $VERSION and run autoconf again. | ||
14777 | -_LT_EOF | ||
14778 | + if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then | ||
14779 | + func_fatal_configuration "not configured to build any kind of library" | ||
14780 | fi | ||
14781 | |||
14782 | - exit $EXIT_MISMATCH | ||
14783 | - fi | ||
14784 | -} | ||
14785 | - | ||
14786 | + # Darwin sucks | ||
14787 | + eval std_shrext=\"$shrext_cmds\" | ||
14788 | |||
14789 | -## ----------- ## | ||
14790 | -## Main. ## | ||
14791 | -## ----------- ## | ||
14792 | - | ||
14793 | -$opt_help || { | ||
14794 | - # Sanity checks first: | ||
14795 | - func_check_version_match | ||
14796 | - | ||
14797 | - if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then | ||
14798 | - func_fatal_configuration "not configured to build any kind of library" | ||
14799 | - fi | ||
14800 | + # Only execute mode is allowed to have -dlopen flags. | ||
14801 | + if test -n "$opt_dlopen" && test "$opt_mode" != execute; then | ||
14802 | + func_error "unrecognized option \`-dlopen'" | ||
14803 | + $ECHO "$help" 1>&2 | ||
14804 | + exit $EXIT_FAILURE | ||
14805 | + fi | ||
14806 | |||
14807 | - test -z "$mode" && func_fatal_error "error: you must specify a MODE." | ||
14808 | + # Change the help message to a mode-specific one. | ||
14809 | + generic_help="$help" | ||
14810 | + help="Try \`$progname --help --mode=$opt_mode' for more information." | ||
14811 | + } | ||
14812 | |||
14813 | |||
14814 | - # Darwin sucks | ||
14815 | - eval "std_shrext=\"$shrext_cmds\"" | ||
14816 | + # Bail if the options were screwed | ||
14817 | + $exit_cmd $EXIT_FAILURE | ||
14818 | +} | ||
14819 | |||
14820 | |||
14821 | - # Only execute mode is allowed to have -dlopen flags. | ||
14822 | - if test -n "$execute_dlfiles" && test "$mode" != execute; then | ||
14823 | - func_error "unrecognized option \`-dlopen'" | ||
14824 | - $ECHO "$help" 1>&2 | ||
14825 | - exit $EXIT_FAILURE | ||
14826 | - fi | ||
14827 | |||
14828 | - # Change the help message to a mode-specific one. | ||
14829 | - generic_help="$help" | ||
14830 | - help="Try \`$progname --help --mode=$mode' for more information." | ||
14831 | -} | ||
14832 | |||
14833 | +## ----------- ## | ||
14834 | +## Main. ## | ||
14835 | +## ----------- ## | ||
14836 | |||
14837 | # func_lalib_p file | ||
14838 | # True iff FILE is a libtool `.la' library or `.lo' object file. | ||
14839 | @@ -1121,12 +1286,9 @@ func_ltwrapper_executable_p () | ||
14840 | # temporary ltwrapper_script. | ||
14841 | func_ltwrapper_scriptname () | ||
14842 | { | ||
14843 | - func_ltwrapper_scriptname_result="" | ||
14844 | - if func_ltwrapper_executable_p "$1"; then | ||
14845 | - func_dirname_and_basename "$1" "" "." | ||
14846 | - func_stripname '' '.exe' "$func_basename_result" | ||
14847 | - func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper" | ||
14848 | - fi | ||
14849 | + func_dirname_and_basename "$1" "" "." | ||
14850 | + func_stripname '' '.exe' "$func_basename_result" | ||
14851 | + func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper" | ||
14852 | } | ||
14853 | |||
14854 | # func_ltwrapper_p file | ||
14855 | @@ -1149,7 +1311,7 @@ func_execute_cmds () | ||
14856 | save_ifs=$IFS; IFS='~' | ||
14857 | for cmd in $1; do | ||
14858 | IFS=$save_ifs | ||
14859 | - eval "cmd=\"$cmd\"" | ||
14860 | + eval cmd=\"$cmd\" | ||
14861 | func_show_eval "$cmd" "${2-:}" | ||
14862 | done | ||
14863 | IFS=$save_ifs | ||
14864 | @@ -1172,6 +1334,37 @@ func_source () | ||
14865 | } | ||
14866 | |||
14867 | |||
14868 | +# func_resolve_sysroot PATH | ||
14869 | +# Replace a leading = in PATH with a sysroot. Store the result into | ||
14870 | +# func_resolve_sysroot_result | ||
14871 | +func_resolve_sysroot () | ||
14872 | +{ | ||
14873 | + func_resolve_sysroot_result=$1 | ||
14874 | + case $func_resolve_sysroot_result in | ||
14875 | + =*) | ||
14876 | + func_stripname '=' '' "$func_resolve_sysroot_result" | ||
14877 | + func_resolve_sysroot_result=$lt_sysroot$func_stripname_result | ||
14878 | + ;; | ||
14879 | + esac | ||
14880 | +} | ||
14881 | + | ||
14882 | +# func_replace_sysroot PATH | ||
14883 | +# If PATH begins with the sysroot, replace it with = and | ||
14884 | +# store the result into func_replace_sysroot_result. | ||
14885 | +func_replace_sysroot () | ||
14886 | +{ | ||
14887 | + case "$lt_sysroot:$1" in | ||
14888 | + ?*:"$lt_sysroot"*) | ||
14889 | + func_stripname "$lt_sysroot" '' "$1" | ||
14890 | + func_replace_sysroot_result="=$func_stripname_result" | ||
14891 | + ;; | ||
14892 | + *) | ||
14893 | + # Including no sysroot. | ||
14894 | + func_replace_sysroot_result=$1 | ||
14895 | + ;; | ||
14896 | + esac | ||
14897 | +} | ||
14898 | + | ||
14899 | # func_infer_tag arg | ||
14900 | # Infer tagged configuration to use if any are available and | ||
14901 | # if one wasn't chosen via the "--tag" command line option. | ||
14902 | @@ -1184,8 +1377,7 @@ func_infer_tag () | ||
14903 | if test -n "$available_tags" && test -z "$tagname"; then | ||
14904 | CC_quoted= | ||
14905 | for arg in $CC; do | ||
14906 | - func_quote_for_eval "$arg" | ||
14907 | - CC_quoted="$CC_quoted $func_quote_for_eval_result" | ||
14908 | + func_append_quoted CC_quoted "$arg" | ||
14909 | done | ||
14910 | CC_expanded=`func_echo_all $CC` | ||
14911 | CC_quoted_expanded=`func_echo_all $CC_quoted` | ||
14912 | @@ -1204,8 +1396,7 @@ func_infer_tag () | ||
14913 | CC_quoted= | ||
14914 | for arg in $CC; do | ||
14915 | # Double-quote args containing other shell metacharacters. | ||
14916 | - func_quote_for_eval "$arg" | ||
14917 | - CC_quoted="$CC_quoted $func_quote_for_eval_result" | ||
14918 | + func_append_quoted CC_quoted "$arg" | ||
14919 | done | ||
14920 | CC_expanded=`func_echo_all $CC` | ||
14921 | CC_quoted_expanded=`func_echo_all $CC_quoted` | ||
14922 | @@ -1274,6 +1465,486 @@ EOF | ||
14923 | } | ||
14924 | } | ||
14925 | |||
14926 | + | ||
14927 | +################################################## | ||
14928 | +# FILE NAME AND PATH CONVERSION HELPER FUNCTIONS # | ||
14929 | +################################################## | ||
14930 | + | ||
14931 | +# func_convert_core_file_wine_to_w32 ARG | ||
14932 | +# Helper function used by file name conversion functions when $build is *nix, | ||
14933 | +# and $host is mingw, cygwin, or some other w32 environment. Relies on a | ||
14934 | +# correctly configured wine environment available, with the winepath program | ||
14935 | +# in $build's $PATH. | ||
14936 | +# | ||
14937 | +# ARG is the $build file name to be converted to w32 format. | ||
14938 | +# Result is available in $func_convert_core_file_wine_to_w32_result, and will | ||
14939 | +# be empty on error (or when ARG is empty) | ||
14940 | +func_convert_core_file_wine_to_w32 () | ||
14941 | +{ | ||
14942 | + $opt_debug | ||
14943 | + func_convert_core_file_wine_to_w32_result="$1" | ||
14944 | + if test -n "$1"; then | ||
14945 | + # Unfortunately, winepath does not exit with a non-zero error code, so we | ||
14946 | + # are forced to check the contents of stdout. On the other hand, if the | ||
14947 | + # command is not found, the shell will set an exit code of 127 and print | ||
14948 | + # *an error message* to stdout. So we must check for both error code of | ||
14949 | + # zero AND non-empty stdout, which explains the odd construction: | ||
14950 | + func_convert_core_file_wine_to_w32_tmp=`winepath -w "$1" 2>/dev/null` | ||
14951 | + if test "$?" -eq 0 && test -n "${func_convert_core_file_wine_to_w32_tmp}"; then | ||
14952 | + func_convert_core_file_wine_to_w32_result=`$ECHO "$func_convert_core_file_wine_to_w32_tmp" | | ||
14953 | + $SED -e "$lt_sed_naive_backslashify"` | ||
14954 | + else | ||
14955 | + func_convert_core_file_wine_to_w32_result= | ||
14956 | + fi | ||
14957 | + fi | ||
14958 | +} | ||
14959 | +# end: func_convert_core_file_wine_to_w32 | ||
14960 | + | ||
14961 | + | ||
14962 | +# func_convert_core_path_wine_to_w32 ARG | ||
14963 | +# Helper function used by path conversion functions when $build is *nix, and | ||
14964 | +# $host is mingw, cygwin, or some other w32 environment. Relies on a correctly | ||
14965 | +# configured wine environment available, with the winepath program in $build's | ||
14966 | +# $PATH. Assumes ARG has no leading or trailing path separator characters. | ||
14967 | +# | ||
14968 | +# ARG is path to be converted from $build format to win32. | ||
14969 | +# Result is available in $func_convert_core_path_wine_to_w32_result. | ||
14970 | +# Unconvertible file (directory) names in ARG are skipped; if no directory names | ||
14971 | +# are convertible, then the result may be empty. | ||
14972 | +func_convert_core_path_wine_to_w32 () | ||
14973 | +{ | ||
14974 | + $opt_debug | ||
14975 | + # unfortunately, winepath doesn't convert paths, only file names | ||
14976 | + func_convert_core_path_wine_to_w32_result="" | ||
14977 | + if test -n "$1"; then | ||
14978 | + oldIFS=$IFS | ||
14979 | + IFS=: | ||
14980 | + for func_convert_core_path_wine_to_w32_f in $1; do | ||
14981 | + IFS=$oldIFS | ||
14982 | + func_convert_core_file_wine_to_w32 "$func_convert_core_path_wine_to_w32_f" | ||
14983 | + if test -n "$func_convert_core_file_wine_to_w32_result" ; then | ||
14984 | + if test -z "$func_convert_core_path_wine_to_w32_result"; then | ||
14985 | + func_convert_core_path_wine_to_w32_result="$func_convert_core_file_wine_to_w32_result" | ||
14986 | + else | ||
14987 | + func_append func_convert_core_path_wine_to_w32_result ";$func_convert_core_file_wine_to_w32_result" | ||
14988 | + fi | ||
14989 | + fi | ||
14990 | + done | ||
14991 | + IFS=$oldIFS | ||
14992 | + fi | ||
14993 | +} | ||
14994 | +# end: func_convert_core_path_wine_to_w32 | ||
14995 | + | ||
14996 | + | ||
14997 | +# func_cygpath ARGS... | ||
14998 | +# Wrapper around calling the cygpath program via LT_CYGPATH. This is used when | ||
14999 | +# when (1) $build is *nix and Cygwin is hosted via a wine environment; or (2) | ||
15000 | +# $build is MSYS and $host is Cygwin, or (3) $build is Cygwin. In case (1) or | ||
15001 | +# (2), returns the Cygwin file name or path in func_cygpath_result (input | ||
15002 | +# file name or path is assumed to be in w32 format, as previously converted | ||
15003 | +# from $build's *nix or MSYS format). In case (3), returns the w32 file name | ||
15004 | +# or path in func_cygpath_result (input file name or path is assumed to be in | ||
15005 | +# Cygwin format). Returns an empty string on error. | ||
15006 | +# | ||
15007 | +# ARGS are passed to cygpath, with the last one being the file name or path to | ||
15008 | +# be converted. | ||
15009 | +# | ||
15010 | +# Specify the absolute *nix (or w32) name to cygpath in the LT_CYGPATH | ||
15011 | +# environment variable; do not put it in $PATH. | ||
15012 | +func_cygpath () | ||
15013 | +{ | ||
15014 | + $opt_debug | ||
15015 | + if test -n "$LT_CYGPATH" && test -f "$LT_CYGPATH"; then | ||
15016 | + func_cygpath_result=`$LT_CYGPATH "$@" 2>/dev/null` | ||
15017 | + if test "$?" -ne 0; then | ||
15018 | + # on failure, ensure result is empty | ||
15019 | + func_cygpath_result= | ||
15020 | + fi | ||
15021 | + else | ||
15022 | + func_cygpath_result= | ||
15023 | + func_error "LT_CYGPATH is empty or specifies non-existent file: \`$LT_CYGPATH'" | ||
15024 | + fi | ||
15025 | +} | ||
15026 | +#end: func_cygpath | ||
15027 | + | ||
15028 | + | ||
15029 | +# func_convert_core_msys_to_w32 ARG | ||
15030 | +# Convert file name or path ARG from MSYS format to w32 format. Return | ||
15031 | +# result in func_convert_core_msys_to_w32_result. | ||
15032 | +func_convert_core_msys_to_w32 () | ||
15033 | +{ | ||
15034 | + $opt_debug | ||
15035 | + # awkward: cmd appends spaces to result | ||
15036 | + func_convert_core_msys_to_w32_result=`( cmd //c echo "$1" ) 2>/dev/null | | ||
15037 | + $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"` | ||
15038 | +} | ||
15039 | +#end: func_convert_core_msys_to_w32 | ||
15040 | + | ||
15041 | + | ||
15042 | +# func_convert_file_check ARG1 ARG2 | ||
15043 | +# Verify that ARG1 (a file name in $build format) was converted to $host | ||
15044 | +# format in ARG2. Otherwise, emit an error message, but continue (resetting | ||
15045 | +# func_to_host_file_result to ARG1). | ||
15046 | +func_convert_file_check () | ||
15047 | +{ | ||
15048 | + $opt_debug | ||
15049 | + if test -z "$2" && test -n "$1" ; then | ||
15050 | + func_error "Could not determine host file name corresponding to" | ||
15051 | + func_error " \`$1'" | ||
15052 | + func_error "Continuing, but uninstalled executables may not work." | ||
15053 | + # Fallback: | ||
15054 | + func_to_host_file_result="$1" | ||
15055 | + fi | ||
15056 | +} | ||
15057 | +# end func_convert_file_check | ||
15058 | + | ||
15059 | + | ||
15060 | +# func_convert_path_check FROM_PATHSEP TO_PATHSEP FROM_PATH TO_PATH | ||
15061 | +# Verify that FROM_PATH (a path in $build format) was converted to $host | ||
15062 | +# format in TO_PATH. Otherwise, emit an error message, but continue, resetting | ||
15063 | +# func_to_host_file_result to a simplistic fallback value (see below). | ||
15064 | +func_convert_path_check () | ||
15065 | +{ | ||
15066 | + $opt_debug | ||
15067 | + if test -z "$4" && test -n "$3"; then | ||
15068 | + func_error "Could not determine the host path corresponding to" | ||
15069 | + func_error " \`$3'" | ||
15070 | + func_error "Continuing, but uninstalled executables may not work." | ||
15071 | + # Fallback. This is a deliberately simplistic "conversion" and | ||
15072 | + # should not be "improved". See libtool.info. | ||
15073 | + if test "x$1" != "x$2"; then | ||
15074 | + lt_replace_pathsep_chars="s|$1|$2|g" | ||
15075 | + func_to_host_path_result=`echo "$3" | | ||
15076 | + $SED -e "$lt_replace_pathsep_chars"` | ||
15077 | + else | ||
15078 | + func_to_host_path_result="$3" | ||
15079 | + fi | ||
15080 | + fi | ||
15081 | +} | ||
15082 | +# end func_convert_path_check | ||
15083 | + | ||
15084 | + | ||
15085 | +# func_convert_path_front_back_pathsep FRONTPAT BACKPAT REPL ORIG | ||
15086 | +# Modifies func_to_host_path_result by prepending REPL if ORIG matches FRONTPAT | ||
15087 | +# and appending REPL if ORIG matches BACKPAT. | ||
15088 | +func_convert_path_front_back_pathsep () | ||
15089 | +{ | ||
15090 | + $opt_debug | ||
15091 | + case $4 in | ||
15092 | + $1 ) func_to_host_path_result="$3$func_to_host_path_result" | ||
15093 | + ;; | ||
15094 | + esac | ||
15095 | + case $4 in | ||
15096 | + $2 ) func_append func_to_host_path_result "$3" | ||
15097 | + ;; | ||
15098 | + esac | ||
15099 | +} | ||
15100 | +# end func_convert_path_front_back_pathsep | ||
15101 | + | ||
15102 | + | ||
15103 | +################################################## | ||
15104 | +# $build to $host FILE NAME CONVERSION FUNCTIONS # | ||
15105 | +################################################## | ||
15106 | +# invoked via `$to_host_file_cmd ARG' | ||
15107 | +# | ||
15108 | +# In each case, ARG is the path to be converted from $build to $host format. | ||
15109 | +# Result will be available in $func_to_host_file_result. | ||
15110 | + | ||
15111 | + | ||
15112 | +# func_to_host_file ARG | ||
15113 | +# Converts the file name ARG from $build format to $host format. Return result | ||
15114 | +# in func_to_host_file_result. | ||
15115 | +func_to_host_file () | ||
15116 | +{ | ||
15117 | + $opt_debug | ||
15118 | + $to_host_file_cmd "$1" | ||
15119 | +} | ||
15120 | +# end func_to_host_file | ||
15121 | + | ||
15122 | + | ||
15123 | +# func_to_tool_file ARG LAZY | ||
15124 | +# converts the file name ARG from $build format to toolchain format. Return | ||
15125 | +# result in func_to_tool_file_result. If the conversion in use is listed | ||
15126 | +# in (the comma separated) LAZY, no conversion takes place. | ||
15127 | +func_to_tool_file () | ||
15128 | +{ | ||
15129 | + $opt_debug | ||
15130 | + case ,$2, in | ||
15131 | + *,"$to_tool_file_cmd",*) | ||
15132 | + func_to_tool_file_result=$1 | ||
15133 | + ;; | ||
15134 | + *) | ||
15135 | + $to_tool_file_cmd "$1" | ||
15136 | + func_to_tool_file_result=$func_to_host_file_result | ||
15137 | + ;; | ||
15138 | + esac | ||
15139 | +} | ||
15140 | +# end func_to_tool_file | ||
15141 | + | ||
15142 | + | ||
15143 | +# func_convert_file_noop ARG | ||
15144 | +# Copy ARG to func_to_host_file_result. | ||
15145 | +func_convert_file_noop () | ||
15146 | +{ | ||
15147 | + func_to_host_file_result="$1" | ||
15148 | +} | ||
15149 | +# end func_convert_file_noop | ||
15150 | + | ||
15151 | + | ||
15152 | +# func_convert_file_msys_to_w32 ARG | ||
15153 | +# Convert file name ARG from (mingw) MSYS to (mingw) w32 format; automatic | ||
15154 | +# conversion to w32 is not available inside the cwrapper. Returns result in | ||
15155 | +# func_to_host_file_result. | ||
15156 | +func_convert_file_msys_to_w32 () | ||
15157 | +{ | ||
15158 | + $opt_debug | ||
15159 | + func_to_host_file_result="$1" | ||
15160 | + if test -n "$1"; then | ||
15161 | + func_convert_core_msys_to_w32 "$1" | ||
15162 | + func_to_host_file_result="$func_convert_core_msys_to_w32_result" | ||
15163 | + fi | ||
15164 | + func_convert_file_check "$1" "$func_to_host_file_result" | ||
15165 | +} | ||
15166 | +# end func_convert_file_msys_to_w32 | ||
15167 | + | ||
15168 | + | ||
15169 | +# func_convert_file_cygwin_to_w32 ARG | ||
15170 | +# Convert file name ARG from Cygwin to w32 format. Returns result in | ||
15171 | +# func_to_host_file_result. | ||
15172 | +func_convert_file_cygwin_to_w32 () | ||
15173 | +{ | ||
15174 | + $opt_debug | ||
15175 | + func_to_host_file_result="$1" | ||
15176 | + if test -n "$1"; then | ||
15177 | + # because $build is cygwin, we call "the" cygpath in $PATH; no need to use | ||
15178 | + # LT_CYGPATH in this case. | ||
15179 | + func_to_host_file_result=`cygpath -m "$1"` | ||
15180 | + fi | ||
15181 | + func_convert_file_check "$1" "$func_to_host_file_result" | ||
15182 | +} | ||
15183 | +# end func_convert_file_cygwin_to_w32 | ||
15184 | + | ||
15185 | + | ||
15186 | +# func_convert_file_nix_to_w32 ARG | ||
15187 | +# Convert file name ARG from *nix to w32 format. Requires a wine environment | ||
15188 | +# and a working winepath. Returns result in func_to_host_file_result. | ||
15189 | +func_convert_file_nix_to_w32 () | ||
15190 | +{ | ||
15191 | + $opt_debug | ||
15192 | + func_to_host_file_result="$1" | ||
15193 | + if test -n "$1"; then | ||
15194 | + func_convert_core_file_wine_to_w32 "$1" | ||
15195 | + func_to_host_file_result="$func_convert_core_file_wine_to_w32_result" | ||
15196 | + fi | ||
15197 | + func_convert_file_check "$1" "$func_to_host_file_result" | ||
15198 | +} | ||
15199 | +# end func_convert_file_nix_to_w32 | ||
15200 | + | ||
15201 | + | ||
15202 | +# func_convert_file_msys_to_cygwin ARG | ||
15203 | +# Convert file name ARG from MSYS to Cygwin format. Requires LT_CYGPATH set. | ||
15204 | +# Returns result in func_to_host_file_result. | ||
15205 | +func_convert_file_msys_to_cygwin () | ||
15206 | +{ | ||
15207 | + $opt_debug | ||
15208 | + func_to_host_file_result="$1" | ||
15209 | + if test -n "$1"; then | ||
15210 | + func_convert_core_msys_to_w32 "$1" | ||
15211 | + func_cygpath -u "$func_convert_core_msys_to_w32_result" | ||
15212 | + func_to_host_file_result="$func_cygpath_result" | ||
15213 | + fi | ||
15214 | + func_convert_file_check "$1" "$func_to_host_file_result" | ||
15215 | +} | ||
15216 | +# end func_convert_file_msys_to_cygwin | ||
15217 | + | ||
15218 | + | ||
15219 | +# func_convert_file_nix_to_cygwin ARG | ||
15220 | +# Convert file name ARG from *nix to Cygwin format. Requires Cygwin installed | ||
15221 | +# in a wine environment, working winepath, and LT_CYGPATH set. Returns result | ||
15222 | +# in func_to_host_file_result. | ||
15223 | +func_convert_file_nix_to_cygwin () | ||
15224 | +{ | ||
15225 | + $opt_debug | ||
15226 | + func_to_host_file_result="$1" | ||
15227 | + if test -n "$1"; then | ||
15228 | + # convert from *nix to w32, then use cygpath to convert from w32 to cygwin. | ||
15229 | + func_convert_core_file_wine_to_w32 "$1" | ||
15230 | + func_cygpath -u "$func_convert_core_file_wine_to_w32_result" | ||
15231 | + func_to_host_file_result="$func_cygpath_result" | ||
15232 | + fi | ||
15233 | + func_convert_file_check "$1" "$func_to_host_file_result" | ||
15234 | +} | ||
15235 | +# end func_convert_file_nix_to_cygwin | ||
15236 | + | ||
15237 | + | ||
15238 | +############################################# | ||
15239 | +# $build to $host PATH CONVERSION FUNCTIONS # | ||
15240 | +############################################# | ||
15241 | +# invoked via `$to_host_path_cmd ARG' | ||
15242 | +# | ||
15243 | +# In each case, ARG is the path to be converted from $build to $host format. | ||
15244 | +# The result will be available in $func_to_host_path_result. | ||
15245 | +# | ||
15246 | +# Path separators are also converted from $build format to $host format. If | ||
15247 | +# ARG begins or ends with a path separator character, it is preserved (but | ||
15248 | +# converted to $host format) on output. | ||
15249 | +# | ||
15250 | +# All path conversion functions are named using the following convention: | ||
15251 | +# file name conversion function : func_convert_file_X_to_Y () | ||
15252 | +# path conversion function : func_convert_path_X_to_Y () | ||
15253 | +# where, for any given $build/$host combination the 'X_to_Y' value is the | ||
15254 | +# same. If conversion functions are added for new $build/$host combinations, | ||
15255 | +# the two new functions must follow this pattern, or func_init_to_host_path_cmd | ||
15256 | +# will break. | ||
15257 | + | ||
15258 | + | ||
15259 | +# func_init_to_host_path_cmd | ||
15260 | +# Ensures that function "pointer" variable $to_host_path_cmd is set to the | ||
15261 | +# appropriate value, based on the value of $to_host_file_cmd. | ||
15262 | +to_host_path_cmd= | ||
15263 | +func_init_to_host_path_cmd () | ||
15264 | +{ | ||
15265 | + $opt_debug | ||
15266 | + if test -z "$to_host_path_cmd"; then | ||
15267 | + func_stripname 'func_convert_file_' '' "$to_host_file_cmd" | ||
15268 | + to_host_path_cmd="func_convert_path_${func_stripname_result}" | ||
15269 | + fi | ||
15270 | +} | ||
15271 | + | ||
15272 | + | ||
15273 | +# func_to_host_path ARG | ||
15274 | +# Converts the path ARG from $build format to $host format. Return result | ||
15275 | +# in func_to_host_path_result. | ||
15276 | +func_to_host_path () | ||
15277 | +{ | ||
15278 | + $opt_debug | ||
15279 | + func_init_to_host_path_cmd | ||
15280 | + $to_host_path_cmd "$1" | ||
15281 | +} | ||
15282 | +# end func_to_host_path | ||
15283 | + | ||
15284 | + | ||
15285 | +# func_convert_path_noop ARG | ||
15286 | +# Copy ARG to func_to_host_path_result. | ||
15287 | +func_convert_path_noop () | ||
15288 | +{ | ||
15289 | + func_to_host_path_result="$1" | ||
15290 | +} | ||
15291 | +# end func_convert_path_noop | ||
15292 | + | ||
15293 | + | ||
15294 | +# func_convert_path_msys_to_w32 ARG | ||
15295 | +# Convert path ARG from (mingw) MSYS to (mingw) w32 format; automatic | ||
15296 | +# conversion to w32 is not available inside the cwrapper. Returns result in | ||
15297 | +# func_to_host_path_result. | ||
15298 | +func_convert_path_msys_to_w32 () | ||
15299 | +{ | ||
15300 | + $opt_debug | ||
15301 | + func_to_host_path_result="$1" | ||
15302 | + if test -n "$1"; then | ||
15303 | + # Remove leading and trailing path separator characters from ARG. MSYS | ||
15304 | + # behavior is inconsistent here; cygpath turns them into '.;' and ';.'; | ||
15305 | + # and winepath ignores them completely. | ||
15306 | + func_stripname : : "$1" | ||
15307 | + func_to_host_path_tmp1=$func_stripname_result | ||
15308 | + func_convert_core_msys_to_w32 "$func_to_host_path_tmp1" | ||
15309 | + func_to_host_path_result="$func_convert_core_msys_to_w32_result" | ||
15310 | + func_convert_path_check : ";" \ | ||
15311 | + "$func_to_host_path_tmp1" "$func_to_host_path_result" | ||
15312 | + func_convert_path_front_back_pathsep ":*" "*:" ";" "$1" | ||
15313 | + fi | ||
15314 | +} | ||
15315 | +# end func_convert_path_msys_to_w32 | ||
15316 | + | ||
15317 | + | ||
15318 | +# func_convert_path_cygwin_to_w32 ARG | ||
15319 | +# Convert path ARG from Cygwin to w32 format. Returns result in | ||
15320 | +# func_to_host_file_result. | ||
15321 | +func_convert_path_cygwin_to_w32 () | ||
15322 | +{ | ||
15323 | + $opt_debug | ||
15324 | + func_to_host_path_result="$1" | ||
15325 | + if test -n "$1"; then | ||
15326 | + # See func_convert_path_msys_to_w32: | ||
15327 | + func_stripname : : "$1" | ||
15328 | + func_to_host_path_tmp1=$func_stripname_result | ||
15329 | + func_to_host_path_result=`cygpath -m -p "$func_to_host_path_tmp1"` | ||
15330 | + func_convert_path_check : ";" \ | ||
15331 | + "$func_to_host_path_tmp1" "$func_to_host_path_result" | ||
15332 | + func_convert_path_front_back_pathsep ":*" "*:" ";" "$1" | ||
15333 | + fi | ||
15334 | +} | ||
15335 | +# end func_convert_path_cygwin_to_w32 | ||
15336 | + | ||
15337 | + | ||
15338 | +# func_convert_path_nix_to_w32 ARG | ||
15339 | +# Convert path ARG from *nix to w32 format. Requires a wine environment and | ||
15340 | +# a working winepath. Returns result in func_to_host_file_result. | ||
15341 | +func_convert_path_nix_to_w32 () | ||
15342 | +{ | ||
15343 | + $opt_debug | ||
15344 | + func_to_host_path_result="$1" | ||
15345 | + if test -n "$1"; then | ||
15346 | + # See func_convert_path_msys_to_w32: | ||
15347 | + func_stripname : : "$1" | ||
15348 | + func_to_host_path_tmp1=$func_stripname_result | ||
15349 | + func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1" | ||
15350 | + func_to_host_path_result="$func_convert_core_path_wine_to_w32_result" | ||
15351 | + func_convert_path_check : ";" \ | ||
15352 | + "$func_to_host_path_tmp1" "$func_to_host_path_result" | ||
15353 | + func_convert_path_front_back_pathsep ":*" "*:" ";" "$1" | ||
15354 | + fi | ||
15355 | +} | ||
15356 | +# end func_convert_path_nix_to_w32 | ||
15357 | + | ||
15358 | + | ||
15359 | +# func_convert_path_msys_to_cygwin ARG | ||
15360 | +# Convert path ARG from MSYS to Cygwin format. Requires LT_CYGPATH set. | ||
15361 | +# Returns result in func_to_host_file_result. | ||
15362 | +func_convert_path_msys_to_cygwin () | ||
15363 | +{ | ||
15364 | + $opt_debug | ||
15365 | + func_to_host_path_result="$1" | ||
15366 | + if test -n "$1"; then | ||
15367 | + # See func_convert_path_msys_to_w32: | ||
15368 | + func_stripname : : "$1" | ||
15369 | + func_to_host_path_tmp1=$func_stripname_result | ||
15370 | + func_convert_core_msys_to_w32 "$func_to_host_path_tmp1" | ||
15371 | + func_cygpath -u -p "$func_convert_core_msys_to_w32_result" | ||
15372 | + func_to_host_path_result="$func_cygpath_result" | ||
15373 | + func_convert_path_check : : \ | ||
15374 | + "$func_to_host_path_tmp1" "$func_to_host_path_result" | ||
15375 | + func_convert_path_front_back_pathsep ":*" "*:" : "$1" | ||
15376 | + fi | ||
15377 | +} | ||
15378 | +# end func_convert_path_msys_to_cygwin | ||
15379 | + | ||
15380 | + | ||
15381 | +# func_convert_path_nix_to_cygwin ARG | ||
15382 | +# Convert path ARG from *nix to Cygwin format. Requires Cygwin installed in a | ||
15383 | +# a wine environment, working winepath, and LT_CYGPATH set. Returns result in | ||
15384 | +# func_to_host_file_result. | ||
15385 | +func_convert_path_nix_to_cygwin () | ||
15386 | +{ | ||
15387 | + $opt_debug | ||
15388 | + func_to_host_path_result="$1" | ||
15389 | + if test -n "$1"; then | ||
15390 | + # Remove leading and trailing path separator characters from | ||
15391 | + # ARG. msys behavior is inconsistent here, cygpath turns them | ||
15392 | + # into '.;' and ';.', and winepath ignores them completely. | ||
15393 | + func_stripname : : "$1" | ||
15394 | + func_to_host_path_tmp1=$func_stripname_result | ||
15395 | + func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1" | ||
15396 | + func_cygpath -u -p "$func_convert_core_path_wine_to_w32_result" | ||
15397 | + func_to_host_path_result="$func_cygpath_result" | ||
15398 | + func_convert_path_check : : \ | ||
15399 | + "$func_to_host_path_tmp1" "$func_to_host_path_result" | ||
15400 | + func_convert_path_front_back_pathsep ":*" "*:" : "$1" | ||
15401 | + fi | ||
15402 | +} | ||
15403 | +# end func_convert_path_nix_to_cygwin | ||
15404 | + | ||
15405 | + | ||
15406 | # func_mode_compile arg... | ||
15407 | func_mode_compile () | ||
15408 | { | ||
15409 | @@ -1314,12 +1985,12 @@ func_mode_compile () | ||
15410 | ;; | ||
15411 | |||
15412 | -pie | -fpie | -fPIE) | ||
15413 | - pie_flag="$pie_flag $arg" | ||
15414 | + func_append pie_flag " $arg" | ||
15415 | continue | ||
15416 | ;; | ||
15417 | |||
15418 | -shared | -static | -prefer-pic | -prefer-non-pic) | ||
15419 | - later="$later $arg" | ||
15420 | + func_append later " $arg" | ||
15421 | continue | ||
15422 | ;; | ||
15423 | |||
15424 | @@ -1340,15 +2011,14 @@ func_mode_compile () | ||
15425 | save_ifs="$IFS"; IFS=',' | ||
15426 | for arg in $args; do | ||
15427 | IFS="$save_ifs" | ||
15428 | - func_quote_for_eval "$arg" | ||
15429 | - lastarg="$lastarg $func_quote_for_eval_result" | ||
15430 | + func_append_quoted lastarg "$arg" | ||
15431 | done | ||
15432 | IFS="$save_ifs" | ||
15433 | func_stripname ' ' '' "$lastarg" | ||
15434 | lastarg=$func_stripname_result | ||
15435 | |||
15436 | # Add the arguments to base_compile. | ||
15437 | - base_compile="$base_compile $lastarg" | ||
15438 | + func_append base_compile " $lastarg" | ||
15439 | continue | ||
15440 | ;; | ||
15441 | |||
15442 | @@ -1364,8 +2034,7 @@ func_mode_compile () | ||
15443 | esac # case $arg_mode | ||
15444 | |||
15445 | # Aesthetically quote the previous argument. | ||
15446 | - func_quote_for_eval "$lastarg" | ||
15447 | - base_compile="$base_compile $func_quote_for_eval_result" | ||
15448 | + func_append_quoted base_compile "$lastarg" | ||
15449 | done # for arg | ||
15450 | |||
15451 | case $arg_mode in | ||
15452 | @@ -1496,17 +2165,16 @@ compiler." | ||
15453 | $opt_dry_run || $RM $removelist | ||
15454 | exit $EXIT_FAILURE | ||
15455 | fi | ||
15456 | - removelist="$removelist $output_obj" | ||
15457 | + func_append removelist " $output_obj" | ||
15458 | $ECHO "$srcfile" > "$lockfile" | ||
15459 | fi | ||
15460 | |||
15461 | $opt_dry_run || $RM $removelist | ||
15462 | - removelist="$removelist $lockfile" | ||
15463 | + func_append removelist " $lockfile" | ||
15464 | trap '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' 1 2 15 | ||
15465 | |||
15466 | - if test -n "$fix_srcfile_path"; then | ||
15467 | - eval "srcfile=\"$fix_srcfile_path\"" | ||
15468 | - fi | ||
15469 | + func_to_tool_file "$srcfile" func_convert_file_msys_to_w32 | ||
15470 | + srcfile=$func_to_tool_file_result | ||
15471 | func_quote_for_eval "$srcfile" | ||
15472 | qsrcfile=$func_quote_for_eval_result | ||
15473 | |||
15474 | @@ -1526,7 +2194,7 @@ compiler." | ||
15475 | |||
15476 | if test -z "$output_obj"; then | ||
15477 | # Place PIC objects in $objdir | ||
15478 | - command="$command -o $lobj" | ||
15479 | + func_append command " -o $lobj" | ||
15480 | fi | ||
15481 | |||
15482 | func_show_eval_locale "$command" \ | ||
15483 | @@ -1573,11 +2241,11 @@ compiler." | ||
15484 | command="$base_compile $qsrcfile $pic_flag" | ||
15485 | fi | ||
15486 | if test "$compiler_c_o" = yes; then | ||
15487 | - command="$command -o $obj" | ||
15488 | + func_append command " -o $obj" | ||
15489 | fi | ||
15490 | |||
15491 | # Suppress compiler output if we already did a PIC compilation. | ||
15492 | - command="$command$suppress_output" | ||
15493 | + func_append command "$suppress_output" | ||
15494 | func_show_eval_locale "$command" \ | ||
15495 | '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' | ||
15496 | |||
15497 | @@ -1622,13 +2290,13 @@ compiler." | ||
15498 | } | ||
15499 | |||
15500 | $opt_help || { | ||
15501 | - test "$mode" = compile && func_mode_compile ${1+"$@"} | ||
15502 | + test "$opt_mode" = compile && func_mode_compile ${1+"$@"} | ||
15503 | } | ||
15504 | |||
15505 | func_mode_help () | ||
15506 | { | ||
15507 | # We need to display help for each of the modes. | ||
15508 | - case $mode in | ||
15509 | + case $opt_mode in | ||
15510 | "") | ||
15511 | # Generic help is extracted from the usage comments | ||
15512 | # at the start of this file. | ||
15513 | @@ -1659,8 +2327,8 @@ This mode accepts the following additional options: | ||
15514 | |||
15515 | -o OUTPUT-FILE set the output file name to OUTPUT-FILE | ||
15516 | -no-suppress do not suppress compiler output for multiple passes | ||
15517 | - -prefer-pic try to building PIC objects only | ||
15518 | - -prefer-non-pic try to building non-PIC objects only | ||
15519 | + -prefer-pic try to build PIC objects only | ||
15520 | + -prefer-non-pic try to build non-PIC objects only | ||
15521 | -shared do not build a \`.o' file suitable for static linking | ||
15522 | -static only build a \`.o' file suitable for static linking | ||
15523 | -Wc,FLAG pass FLAG directly to the compiler | ||
15524 | @@ -1804,7 +2472,7 @@ Otherwise, only FILE itself is deleted using RM." | ||
15525 | ;; | ||
15526 | |||
15527 | *) | ||
15528 | - func_fatal_help "invalid operation mode \`$mode'" | ||
15529 | + func_fatal_help "invalid operation mode \`$opt_mode'" | ||
15530 | ;; | ||
15531 | esac | ||
15532 | |||
15533 | @@ -1819,13 +2487,13 @@ if $opt_help; then | ||
15534 | else | ||
15535 | { | ||
15536 | func_help noexit | ||
15537 | - for mode in compile link execute install finish uninstall clean; do | ||
15538 | + for opt_mode in compile link execute install finish uninstall clean; do | ||
15539 | func_mode_help | ||
15540 | done | ||
15541 | } | sed -n '1p; 2,$s/^Usage:/ or: /p' | ||
15542 | { | ||
15543 | func_help noexit | ||
15544 | - for mode in compile link execute install finish uninstall clean; do | ||
15545 | + for opt_mode in compile link execute install finish uninstall clean; do | ||
15546 | echo | ||
15547 | func_mode_help | ||
15548 | done | ||
15549 | @@ -1854,13 +2522,16 @@ func_mode_execute () | ||
15550 | func_fatal_help "you must specify a COMMAND" | ||
15551 | |||
15552 | # Handle -dlopen flags immediately. | ||
15553 | - for file in $execute_dlfiles; do | ||
15554 | + for file in $opt_dlopen; do | ||
15555 | test -f "$file" \ | ||
15556 | || func_fatal_help "\`$file' is not a file" | ||
15557 | |||
15558 | dir= | ||
15559 | case $file in | ||
15560 | *.la) | ||
15561 | + func_resolve_sysroot "$file" | ||
15562 | + file=$func_resolve_sysroot_result | ||
15563 | + | ||
15564 | # Check to see that this really is a libtool archive. | ||
15565 | func_lalib_unsafe_p "$file" \ | ||
15566 | || func_fatal_help "\`$lib' is not a valid libtool archive" | ||
15567 | @@ -1882,7 +2553,7 @@ func_mode_execute () | ||
15568 | dir="$func_dirname_result" | ||
15569 | |||
15570 | if test -f "$dir/$objdir/$dlname"; then | ||
15571 | - dir="$dir/$objdir" | ||
15572 | + func_append dir "/$objdir" | ||
15573 | else | ||
15574 | if test ! -f "$dir/$dlname"; then | ||
15575 | func_fatal_error "cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" | ||
15576 | @@ -1907,10 +2578,10 @@ func_mode_execute () | ||
15577 | test -n "$absdir" && dir="$absdir" | ||
15578 | |||
15579 | # Now add the directory to shlibpath_var. | ||
15580 | - if eval test -z \"\$$shlibpath_var\"; then | ||
15581 | - eval $shlibpath_var=\$dir | ||
15582 | + if eval "test -z \"\$$shlibpath_var\""; then | ||
15583 | + eval "$shlibpath_var=\"\$dir\"" | ||
15584 | else | ||
15585 | - eval $shlibpath_var=\$dir:\$$shlibpath_var | ||
15586 | + eval "$shlibpath_var=\"\$dir:\$$shlibpath_var\"" | ||
15587 | fi | ||
15588 | done | ||
15589 | |||
15590 | @@ -1939,8 +2610,7 @@ func_mode_execute () | ||
15591 | ;; | ||
15592 | esac | ||
15593 | # Quote arguments (to preserve shell metacharacters). | ||
15594 | - func_quote_for_eval "$file" | ||
15595 | - args="$args $func_quote_for_eval_result" | ||
15596 | + func_append_quoted args "$file" | ||
15597 | done | ||
15598 | |||
15599 | if test "X$opt_dry_run" = Xfalse; then | ||
15600 | @@ -1972,22 +2642,59 @@ func_mode_execute () | ||
15601 | fi | ||
15602 | } | ||
15603 | |||
15604 | -test "$mode" = execute && func_mode_execute ${1+"$@"} | ||
15605 | +test "$opt_mode" = execute && func_mode_execute ${1+"$@"} | ||
15606 | |||
15607 | |||
15608 | # func_mode_finish arg... | ||
15609 | func_mode_finish () | ||
15610 | { | ||
15611 | $opt_debug | ||
15612 | - libdirs="$nonopt" | ||
15613 | + libs= | ||
15614 | + libdirs= | ||
15615 | admincmds= | ||
15616 | |||
15617 | - if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then | ||
15618 | - for dir | ||
15619 | - do | ||
15620 | - libdirs="$libdirs $dir" | ||
15621 | - done | ||
15622 | + for opt in "$nonopt" ${1+"$@"} | ||
15623 | + do | ||
15624 | + if test -d "$opt"; then | ||
15625 | + func_append libdirs " $opt" | ||
15626 | |||
15627 | + elif test -f "$opt"; then | ||
15628 | + if func_lalib_unsafe_p "$opt"; then | ||
15629 | + func_append libs " $opt" | ||
15630 | + else | ||
15631 | + func_warning "\`$opt' is not a valid libtool archive" | ||
15632 | + fi | ||
15633 | + | ||
15634 | + else | ||
15635 | + func_fatal_error "invalid argument \`$opt'" | ||
15636 | + fi | ||
15637 | + done | ||
15638 | + | ||
15639 | + if test -n "$libs"; then | ||
15640 | + if test -n "$lt_sysroot"; then | ||
15641 | + sysroot_regex=`$ECHO "$lt_sysroot" | $SED "$sed_make_literal_regex"` | ||
15642 | + sysroot_cmd="s/\([ ']\)$sysroot_regex/\1/g;" | ||
15643 | + else | ||
15644 | + sysroot_cmd= | ||
15645 | + fi | ||
15646 | + | ||
15647 | + # Remove sysroot references | ||
15648 | + if $opt_dry_run; then | ||
15649 | + for lib in $libs; do | ||
15650 | + echo "removing references to $lt_sysroot and \`=' prefixes from $lib" | ||
15651 | + done | ||
15652 | + else | ||
15653 | + tmpdir=`func_mktempdir` | ||
15654 | + for lib in $libs; do | ||
15655 | + sed -e "${sysroot_cmd} s/\([ ']-[LR]\)=/\1/g; s/\([ ']\)=/\1/g" $lib \ | ||
15656 | + > $tmpdir/tmp-la | ||
15657 | + mv -f $tmpdir/tmp-la $lib | ||
15658 | + done | ||
15659 | + ${RM}r "$tmpdir" | ||
15660 | + fi | ||
15661 | + fi | ||
15662 | + | ||
15663 | + if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then | ||
15664 | for libdir in $libdirs; do | ||
15665 | if test -n "$finish_cmds"; then | ||
15666 | # Do each command in the finish commands. | ||
15667 | @@ -1997,7 +2704,7 @@ func_mode_finish () | ||
15668 | if test -n "$finish_eval"; then | ||
15669 | # Do the single finish_eval. | ||
15670 | eval cmds=\"$finish_eval\" | ||
15671 | - $opt_dry_run || eval "$cmds" || admincmds="$admincmds | ||
15672 | + $opt_dry_run || eval "$cmds" || func_append admincmds " | ||
15673 | $cmds" | ||
15674 | fi | ||
15675 | done | ||
15676 | @@ -2006,53 +2713,55 @@ func_mode_finish () | ||
15677 | # Exit here if they wanted silent mode. | ||
15678 | $opt_silent && exit $EXIT_SUCCESS | ||
15679 | |||
15680 | - echo "----------------------------------------------------------------------" | ||
15681 | - echo "Libraries have been installed in:" | ||
15682 | - for libdir in $libdirs; do | ||
15683 | - $ECHO " $libdir" | ||
15684 | - done | ||
15685 | - echo | ||
15686 | - echo "If you ever happen to want to link against installed libraries" | ||
15687 | - echo "in a given directory, LIBDIR, you must either use libtool, and" | ||
15688 | - echo "specify the full pathname of the library, or use the \`-LLIBDIR'" | ||
15689 | - echo "flag during linking and do at least one of the following:" | ||
15690 | - if test -n "$shlibpath_var"; then | ||
15691 | - echo " - add LIBDIR to the \`$shlibpath_var' environment variable" | ||
15692 | - echo " during execution" | ||
15693 | - fi | ||
15694 | - if test -n "$runpath_var"; then | ||
15695 | - echo " - add LIBDIR to the \`$runpath_var' environment variable" | ||
15696 | - echo " during linking" | ||
15697 | - fi | ||
15698 | - if test -n "$hardcode_libdir_flag_spec"; then | ||
15699 | - libdir=LIBDIR | ||
15700 | - eval "flag=\"$hardcode_libdir_flag_spec\"" | ||
15701 | + if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then | ||
15702 | + echo "----------------------------------------------------------------------" | ||
15703 | + echo "Libraries have been installed in:" | ||
15704 | + for libdir in $libdirs; do | ||
15705 | + $ECHO " $libdir" | ||
15706 | + done | ||
15707 | + echo | ||
15708 | + echo "If you ever happen to want to link against installed libraries" | ||
15709 | + echo "in a given directory, LIBDIR, you must either use libtool, and" | ||
15710 | + echo "specify the full pathname of the library, or use the \`-LLIBDIR'" | ||
15711 | + echo "flag during linking and do at least one of the following:" | ||
15712 | + if test -n "$shlibpath_var"; then | ||
15713 | + echo " - add LIBDIR to the \`$shlibpath_var' environment variable" | ||
15714 | + echo " during execution" | ||
15715 | + fi | ||
15716 | + if test -n "$runpath_var"; then | ||
15717 | + echo " - add LIBDIR to the \`$runpath_var' environment variable" | ||
15718 | + echo " during linking" | ||
15719 | + fi | ||
15720 | + if test -n "$hardcode_libdir_flag_spec"; then | ||
15721 | + libdir=LIBDIR | ||
15722 | + eval flag=\"$hardcode_libdir_flag_spec\" | ||
15723 | |||
15724 | - $ECHO " - use the \`$flag' linker flag" | ||
15725 | - fi | ||
15726 | - if test -n "$admincmds"; then | ||
15727 | - $ECHO " - have your system administrator run these commands:$admincmds" | ||
15728 | - fi | ||
15729 | - if test -f /etc/ld.so.conf; then | ||
15730 | - echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'" | ||
15731 | - fi | ||
15732 | - echo | ||
15733 | + $ECHO " - use the \`$flag' linker flag" | ||
15734 | + fi | ||
15735 | + if test -n "$admincmds"; then | ||
15736 | + $ECHO " - have your system administrator run these commands:$admincmds" | ||
15737 | + fi | ||
15738 | + if test -f /etc/ld.so.conf; then | ||
15739 | + echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'" | ||
15740 | + fi | ||
15741 | + echo | ||
15742 | |||
15743 | - echo "See any operating system documentation about shared libraries for" | ||
15744 | - case $host in | ||
15745 | - solaris2.[6789]|solaris2.1[0-9]) | ||
15746 | - echo "more information, such as the ld(1), crle(1) and ld.so(8) manual" | ||
15747 | - echo "pages." | ||
15748 | - ;; | ||
15749 | - *) | ||
15750 | - echo "more information, such as the ld(1) and ld.so(8) manual pages." | ||
15751 | - ;; | ||
15752 | - esac | ||
15753 | - echo "----------------------------------------------------------------------" | ||
15754 | + echo "See any operating system documentation about shared libraries for" | ||
15755 | + case $host in | ||
15756 | + solaris2.[6789]|solaris2.1[0-9]) | ||
15757 | + echo "more information, such as the ld(1), crle(1) and ld.so(8) manual" | ||
15758 | + echo "pages." | ||
15759 | + ;; | ||
15760 | + *) | ||
15761 | + echo "more information, such as the ld(1) and ld.so(8) manual pages." | ||
15762 | + ;; | ||
15763 | + esac | ||
15764 | + echo "----------------------------------------------------------------------" | ||
15765 | + fi | ||
15766 | exit $EXIT_SUCCESS | ||
15767 | } | ||
15768 | |||
15769 | -test "$mode" = finish && func_mode_finish ${1+"$@"} | ||
15770 | +test "$opt_mode" = finish && func_mode_finish ${1+"$@"} | ||
15771 | |||
15772 | |||
15773 | # func_mode_install arg... | ||
15774 | @@ -2077,7 +2786,7 @@ func_mode_install () | ||
15775 | # The real first argument should be the name of the installation program. | ||
15776 | # Aesthetically quote it. | ||
15777 | func_quote_for_eval "$arg" | ||
15778 | - install_prog="$install_prog$func_quote_for_eval_result" | ||
15779 | + func_append install_prog "$func_quote_for_eval_result" | ||
15780 | install_shared_prog=$install_prog | ||
15781 | case " $install_prog " in | ||
15782 | *[\\\ /]cp\ *) install_cp=: ;; | ||
15783 | @@ -2097,7 +2806,7 @@ func_mode_install () | ||
15784 | do | ||
15785 | arg2= | ||
15786 | if test -n "$dest"; then | ||
15787 | - files="$files $dest" | ||
15788 | + func_append files " $dest" | ||
15789 | dest=$arg | ||
15790 | continue | ||
15791 | fi | ||
15792 | @@ -2135,11 +2844,11 @@ func_mode_install () | ||
15793 | |||
15794 | # Aesthetically quote the argument. | ||
15795 | func_quote_for_eval "$arg" | ||
15796 | - install_prog="$install_prog $func_quote_for_eval_result" | ||
15797 | + func_append install_prog " $func_quote_for_eval_result" | ||
15798 | if test -n "$arg2"; then | ||
15799 | func_quote_for_eval "$arg2" | ||
15800 | fi | ||
15801 | - install_shared_prog="$install_shared_prog $func_quote_for_eval_result" | ||
15802 | + func_append install_shared_prog " $func_quote_for_eval_result" | ||
15803 | done | ||
15804 | |||
15805 | test -z "$install_prog" && \ | ||
15806 | @@ -2151,7 +2860,7 @@ func_mode_install () | ||
15807 | if test -n "$install_override_mode" && $no_mode; then | ||
15808 | if $install_cp; then :; else | ||
15809 | func_quote_for_eval "$install_override_mode" | ||
15810 | - install_shared_prog="$install_shared_prog -m $func_quote_for_eval_result" | ||
15811 | + func_append install_shared_prog " -m $func_quote_for_eval_result" | ||
15812 | fi | ||
15813 | fi | ||
15814 | |||
15815 | @@ -2209,10 +2918,13 @@ func_mode_install () | ||
15816 | case $file in | ||
15817 | *.$libext) | ||
15818 | # Do the static libraries later. | ||
15819 | - staticlibs="$staticlibs $file" | ||
15820 | + func_append staticlibs " $file" | ||
15821 | ;; | ||
15822 | |||
15823 | *.la) | ||
15824 | + func_resolve_sysroot "$file" | ||
15825 | + file=$func_resolve_sysroot_result | ||
15826 | + | ||
15827 | # Check to see that this really is a libtool archive. | ||
15828 | func_lalib_unsafe_p "$file" \ | ||
15829 | || func_fatal_help "\`$file' is not a valid libtool archive" | ||
15830 | @@ -2226,23 +2938,30 @@ func_mode_install () | ||
15831 | if test "X$destdir" = "X$libdir"; then | ||
15832 | case "$current_libdirs " in | ||
15833 | *" $libdir "*) ;; | ||
15834 | - *) current_libdirs="$current_libdirs $libdir" ;; | ||
15835 | + *) func_append current_libdirs " $libdir" ;; | ||
15836 | esac | ||
15837 | else | ||
15838 | # Note the libdir as a future libdir. | ||
15839 | case "$future_libdirs " in | ||
15840 | *" $libdir "*) ;; | ||
15841 | - *) future_libdirs="$future_libdirs $libdir" ;; | ||
15842 | + *) func_append future_libdirs " $libdir" ;; | ||
15843 | esac | ||
15844 | fi | ||
15845 | |||
15846 | func_dirname "$file" "/" "" | ||
15847 | dir="$func_dirname_result" | ||
15848 | - dir="$dir$objdir" | ||
15849 | + func_append dir "$objdir" | ||
15850 | |||
15851 | if test -n "$relink_command"; then | ||
15852 | + # Strip any trailing slash from the destination. | ||
15853 | + func_stripname '' '/' "$libdir" | ||
15854 | + destlibdir=$func_stripname_result | ||
15855 | + | ||
15856 | + func_stripname '' '/' "$destdir" | ||
15857 | + s_destdir=$func_stripname_result | ||
15858 | + | ||
15859 | # Determine the prefix the user has applied to our future dir. | ||
15860 | - inst_prefix_dir=`$ECHO "$destdir" | $SED -e "s%$libdir\$%%"` | ||
15861 | + inst_prefix_dir=`$ECHO "X$s_destdir" | $Xsed -e "s%$destlibdir\$%%"` | ||
15862 | |||
15863 | # Don't allow the user to place us outside of our expected | ||
15864 | # location b/c this prevents finding dependent libraries that | ||
15865 | @@ -2315,7 +3034,7 @@ func_mode_install () | ||
15866 | func_show_eval "$install_prog $instname $destdir/$name" 'exit $?' | ||
15867 | |||
15868 | # Maybe install the static library, too. | ||
15869 | - test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library" | ||
15870 | + test -n "$old_library" && func_append staticlibs " $dir/$old_library" | ||
15871 | ;; | ||
15872 | |||
15873 | *.lo) | ||
15874 | @@ -2503,7 +3222,7 @@ func_mode_install () | ||
15875 | test -n "$future_libdirs" && \ | ||
15876 | func_warning "remember to run \`$progname --finish$future_libdirs'" | ||
15877 | |||
15878 | - if test -n "$current_libdirs" && $opt_finish; then | ||
15879 | + if test -n "$current_libdirs"; then | ||
15880 | # Maybe just do a dry run. | ||
15881 | $opt_dry_run && current_libdirs=" -n$current_libdirs" | ||
15882 | exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs' | ||
15883 | @@ -2512,7 +3231,7 @@ func_mode_install () | ||
15884 | fi | ||
15885 | } | ||
15886 | |||
15887 | -test "$mode" = install && func_mode_install ${1+"$@"} | ||
15888 | +test "$opt_mode" = install && func_mode_install ${1+"$@"} | ||
15889 | |||
15890 | |||
15891 | # func_generate_dlsyms outputname originator pic_p | ||
15892 | @@ -2559,6 +3278,18 @@ extern \"C\" { | ||
15893 | #pragma GCC diagnostic ignored \"-Wstrict-prototypes\" | ||
15894 | #endif | ||
15895 | |||
15896 | +/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ | ||
15897 | +#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) | ||
15898 | +/* DATA imports from DLLs on WIN32 con't be const, because runtime | ||
15899 | + relocations are performed -- see ld's documentation on pseudo-relocs. */ | ||
15900 | +# define LT_DLSYM_CONST | ||
15901 | +#elif defined(__osf__) | ||
15902 | +/* This system does not cope well with relocations in const data. */ | ||
15903 | +# define LT_DLSYM_CONST | ||
15904 | +#else | ||
15905 | +# define LT_DLSYM_CONST const | ||
15906 | +#endif | ||
15907 | + | ||
15908 | /* External symbol declarations for the compiler. */\ | ||
15909 | " | ||
15910 | |||
15911 | @@ -2570,21 +3301,22 @@ extern \"C\" { | ||
15912 | # Add our own program objects to the symbol list. | ||
15913 | progfiles=`$ECHO "$objs$old_deplibs" | $SP2NL | $SED "$lo2o" | $NL2SP` | ||
15914 | for progfile in $progfiles; do | ||
15915 | - func_verbose "extracting global C symbols from \`$progfile'" | ||
15916 | - $opt_dry_run || eval "$NM $progfile | $global_symbol_pipe >> '$nlist'" | ||
15917 | + func_to_tool_file "$progfile" func_convert_file_msys_to_w32 | ||
15918 | + func_verbose "extracting global C symbols from \`$func_to_tool_file_result'" | ||
15919 | + $opt_dry_run || eval "$NM $func_to_tool_file_result | $global_symbol_pipe >> '$nlist'" | ||
15920 | done | ||
15921 | |||
15922 | if test -n "$exclude_expsyms"; then | ||
15923 | $opt_dry_run || { | ||
15924 | - $EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T | ||
15925 | - $MV "$nlist"T "$nlist" | ||
15926 | + eval '$EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T' | ||
15927 | + eval '$MV "$nlist"T "$nlist"' | ||
15928 | } | ||
15929 | fi | ||
15930 | |||
15931 | if test -n "$export_symbols_regex"; then | ||
15932 | $opt_dry_run || { | ||
15933 | - $EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T | ||
15934 | - $MV "$nlist"T "$nlist" | ||
15935 | + eval '$EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T' | ||
15936 | + eval '$MV "$nlist"T "$nlist"' | ||
15937 | } | ||
15938 | fi | ||
15939 | |||
15940 | @@ -2593,23 +3325,23 @@ extern \"C\" { | ||
15941 | export_symbols="$output_objdir/$outputname.exp" | ||
15942 | $opt_dry_run || { | ||
15943 | $RM $export_symbols | ||
15944 | - ${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' < "$nlist" > "$export_symbols" | ||
15945 | + eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"' | ||
15946 | case $host in | ||
15947 | *cygwin* | *mingw* | *cegcc* ) | ||
15948 | - echo EXPORTS > "$output_objdir/$outputname.def" | ||
15949 | - cat "$export_symbols" >> "$output_objdir/$outputname.def" | ||
15950 | + eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' | ||
15951 | + eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"' | ||
15952 | ;; | ||
15953 | esac | ||
15954 | } | ||
15955 | else | ||
15956 | $opt_dry_run || { | ||
15957 | - ${SED} -e 's/\([].[*^$]\)/\\\1/g' -e 's/^/ /' -e 's/$/$/' < "$export_symbols" > "$output_objdir/$outputname.exp" | ||
15958 | - $GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T | ||
15959 | - $MV "$nlist"T "$nlist" | ||
15960 | + eval "${SED} -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"' | ||
15961 | + eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T' | ||
15962 | + eval '$MV "$nlist"T "$nlist"' | ||
15963 | case $host in | ||
15964 | *cygwin* | *mingw* | *cegcc* ) | ||
15965 | - echo EXPORTS > "$output_objdir/$outputname.def" | ||
15966 | - cat "$nlist" >> "$output_objdir/$outputname.def" | ||
15967 | + eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' | ||
15968 | + eval 'cat "$nlist" >> "$output_objdir/$outputname.def"' | ||
15969 | ;; | ||
15970 | esac | ||
15971 | } | ||
15972 | @@ -2620,10 +3352,52 @@ extern \"C\" { | ||
15973 | func_verbose "extracting global C symbols from \`$dlprefile'" | ||
15974 | func_basename "$dlprefile" | ||
15975 | name="$func_basename_result" | ||
15976 | - $opt_dry_run || { | ||
15977 | - $ECHO ": $name " >> "$nlist" | ||
15978 | - eval "$NM $dlprefile 2>/dev/null | $global_symbol_pipe >> '$nlist'" | ||
15979 | - } | ||
15980 | + case $host in | ||
15981 | + *cygwin* | *mingw* | *cegcc* ) | ||
15982 | + # if an import library, we need to obtain dlname | ||
15983 | + if func_win32_import_lib_p "$dlprefile"; then | ||
15984 | + func_tr_sh "$dlprefile" | ||
15985 | + eval "curr_lafile=\$libfile_$func_tr_sh_result" | ||
15986 | + dlprefile_dlbasename="" | ||
15987 | + if test -n "$curr_lafile" && func_lalib_p "$curr_lafile"; then | ||
15988 | + # Use subshell, to avoid clobbering current variable values | ||
15989 | + dlprefile_dlname=`source "$curr_lafile" && echo "$dlname"` | ||
15990 | + if test -n "$dlprefile_dlname" ; then | ||
15991 | + func_basename "$dlprefile_dlname" | ||
15992 | + dlprefile_dlbasename="$func_basename_result" | ||
15993 | + else | ||
15994 | + # no lafile. user explicitly requested -dlpreopen <import library>. | ||
15995 | + $sharedlib_from_linklib_cmd "$dlprefile" | ||
15996 | + dlprefile_dlbasename=$sharedlib_from_linklib_result | ||
15997 | + fi | ||
15998 | + fi | ||
15999 | + $opt_dry_run || { | ||
16000 | + if test -n "$dlprefile_dlbasename" ; then | ||
16001 | + eval '$ECHO ": $dlprefile_dlbasename" >> "$nlist"' | ||
16002 | + else | ||
16003 | + func_warning "Could not compute DLL name from $name" | ||
16004 | + eval '$ECHO ": $name " >> "$nlist"' | ||
16005 | + fi | ||
16006 | + func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32 | ||
16007 | + eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe | | ||
16008 | + $SED -e '/I __imp/d' -e 's/I __nm_/D /;s/_nm__//' >> '$nlist'" | ||
16009 | + } | ||
16010 | + else # not an import lib | ||
16011 | + $opt_dry_run || { | ||
16012 | + eval '$ECHO ": $name " >> "$nlist"' | ||
16013 | + func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32 | ||
16014 | + eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'" | ||
16015 | + } | ||
16016 | + fi | ||
16017 | + ;; | ||
16018 | + *) | ||
16019 | + $opt_dry_run || { | ||
16020 | + eval '$ECHO ": $name " >> "$nlist"' | ||
16021 | + func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32 | ||
16022 | + eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'" | ||
16023 | + } | ||
16024 | + ;; | ||
16025 | + esac | ||
16026 | done | ||
16027 | |||
16028 | $opt_dry_run || { | ||
16029 | @@ -2661,26 +3435,9 @@ typedef struct { | ||
16030 | const char *name; | ||
16031 | void *address; | ||
16032 | } lt_dlsymlist; | ||
16033 | -" | ||
16034 | - case $host in | ||
16035 | - *cygwin* | *mingw* | *cegcc* ) | ||
16036 | - echo >> "$output_objdir/$my_dlsyms" "\ | ||
16037 | -/* DATA imports from DLLs on WIN32 con't be const, because | ||
16038 | - runtime relocations are performed -- see ld's documentation | ||
16039 | - on pseudo-relocs. */" | ||
16040 | - lt_dlsym_const= ;; | ||
16041 | - *osf5*) | ||
16042 | - echo >> "$output_objdir/$my_dlsyms" "\ | ||
16043 | -/* This system does not cope well with relocations in const data */" | ||
16044 | - lt_dlsym_const= ;; | ||
16045 | - *) | ||
16046 | - lt_dlsym_const=const ;; | ||
16047 | - esac | ||
16048 | - | ||
16049 | - echo >> "$output_objdir/$my_dlsyms" "\ | ||
16050 | -extern $lt_dlsym_const lt_dlsymlist | ||
16051 | +extern LT_DLSYM_CONST lt_dlsymlist | ||
16052 | lt_${my_prefix}_LTX_preloaded_symbols[]; | ||
16053 | -$lt_dlsym_const lt_dlsymlist | ||
16054 | +LT_DLSYM_CONST lt_dlsymlist | ||
16055 | lt_${my_prefix}_LTX_preloaded_symbols[] = | ||
16056 | {\ | ||
16057 | { \"$my_originator\", (void *) 0 }," | ||
16058 | @@ -2736,7 +3493,7 @@ static const void *lt_preloaded_setup() { | ||
16059 | for arg in $LTCFLAGS; do | ||
16060 | case $arg in | ||
16061 | -pie | -fpie | -fPIE) ;; | ||
16062 | - *) symtab_cflags="$symtab_cflags $arg" ;; | ||
16063 | + *) func_append symtab_cflags " $arg" ;; | ||
16064 | esac | ||
16065 | done | ||
16066 | |||
16067 | @@ -2796,9 +3553,11 @@ func_win32_libid () | ||
16068 | win32_libid_type="x86 archive import" | ||
16069 | ;; | ||
16070 | *ar\ archive*) # could be an import, or static | ||
16071 | - if $OBJDUMP -f "$1" | $SED -e '10q' 2>/dev/null | | ||
16072 | - $EGREP 'file format (pe-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then | ||
16073 | - win32_nmres=`$NM -f posix -A "$1" | | ||
16074 | + # Keep the egrep pattern in sync with the one in _LT_CHECK_MAGIC_METHOD. | ||
16075 | + if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | | ||
16076 | + $EGREP 'file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then | ||
16077 | + func_to_tool_file "$1" func_convert_file_msys_to_w32 | ||
16078 | + win32_nmres=`eval $NM -f posix -A \"$func_to_tool_file_result\" | | ||
16079 | $SED -n -e ' | ||
16080 | 1,100{ | ||
16081 | / I /{ | ||
16082 | @@ -2827,6 +3586,131 @@ func_win32_libid () | ||
16083 | $ECHO "$win32_libid_type" | ||
16084 | } | ||
16085 | |||
16086 | +# func_cygming_dll_for_implib ARG | ||
16087 | +# | ||
16088 | +# Platform-specific function to extract the | ||
16089 | +# name of the DLL associated with the specified | ||
16090 | +# import library ARG. | ||
16091 | +# Invoked by eval'ing the libtool variable | ||
16092 | +# $sharedlib_from_linklib_cmd | ||
16093 | +# Result is available in the variable | ||
16094 | +# $sharedlib_from_linklib_result | ||
16095 | +func_cygming_dll_for_implib () | ||
16096 | +{ | ||
16097 | + $opt_debug | ||
16098 | + sharedlib_from_linklib_result=`$DLLTOOL --identify-strict --identify "$1"` | ||
16099 | +} | ||
16100 | + | ||
16101 | +# func_cygming_dll_for_implib_fallback_core SECTION_NAME LIBNAMEs | ||
16102 | +# | ||
16103 | +# The is the core of a fallback implementation of a | ||
16104 | +# platform-specific function to extract the name of the | ||
16105 | +# DLL associated with the specified import library LIBNAME. | ||
16106 | +# | ||
16107 | +# SECTION_NAME is either .idata$6 or .idata$7, depending | ||
16108 | +# on the platform and compiler that created the implib. | ||
16109 | +# | ||
16110 | +# Echos the name of the DLL associated with the | ||
16111 | +# specified import library. | ||
16112 | +func_cygming_dll_for_implib_fallback_core () | ||
16113 | +{ | ||
16114 | + $opt_debug | ||
16115 | + match_literal=`$ECHO "$1" | $SED "$sed_make_literal_regex"` | ||
16116 | + $OBJDUMP -s --section "$1" "$2" 2>/dev/null | | ||
16117 | + $SED '/^Contents of section '"$match_literal"':/{ | ||
16118 | + # Place marker at beginning of archive member dllname section | ||
16119 | + s/.*/====MARK====/ | ||
16120 | + p | ||
16121 | + d | ||
16122 | + } | ||
16123 | + # These lines can sometimes be longer than 43 characters, but | ||
16124 | + # are always uninteresting | ||
16125 | + /:[ ]*file format pe[i]\{,1\}-/d | ||
16126 | + /^In archive [^:]*:/d | ||
16127 | + # Ensure marker is printed | ||
16128 | + /^====MARK====/p | ||
16129 | + # Remove all lines with less than 43 characters | ||
16130 | + /^.\{43\}/!d | ||
16131 | + # From remaining lines, remove first 43 characters | ||
16132 | + s/^.\{43\}//' | | ||
16133 | + $SED -n ' | ||
16134 | + # Join marker and all lines until next marker into a single line | ||
16135 | + /^====MARK====/ b para | ||
16136 | + H | ||
16137 | + $ b para | ||
16138 | + b | ||
16139 | + :para | ||
16140 | + x | ||
16141 | + s/\n//g | ||
16142 | + # Remove the marker | ||
16143 | + s/^====MARK====// | ||
16144 | + # Remove trailing dots and whitespace | ||
16145 | + s/[\. \t]*$// | ||
16146 | |||
16147 | + /./p' | | ||
16148 | + # we now have a list, one entry per line, of the stringified | ||
16149 | + # contents of the appropriate section of all members of the | ||
16150 | + # archive which possess that section. Heuristic: eliminate | ||
16151 | + # all those which have a first or second character that is | ||
16152 | + # a '.' (that is, objdump's representation of an unprintable | ||
16153 | + # character.) This should work for all archives with less than | ||
16154 | + # 0x302f exports -- but will fail for DLLs whose name actually | ||
16155 | + # begins with a literal '.' or a single character followed by | ||
16156 | + # a '.'. | ||
16157 | + # | ||
16158 | + # Of those that remain, print the first one. | ||
16159 | + $SED -e '/^\./d;/^.\./d;q' | ||
16160 | +} | ||
16161 | + | ||
16162 | +# func_cygming_gnu_implib_p ARG | ||
16163 | +# This predicate returns with zero status (TRUE) if | ||
16164 | +# ARG is a GNU/binutils-style import library. Returns | ||
16165 | +# with nonzero status (FALSE) otherwise. | ||
16166 | +func_cygming_gnu_implib_p () | ||
16167 | +{ | ||
16168 | + $opt_debug | ||
16169 | + func_to_tool_file "$1" func_convert_file_msys_to_w32 | ||
16170 | + func_cygming_gnu_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $EGREP ' (_head_[A-Za-z0-9_]+_[ad]l*|[A-Za-z0-9_]+_[ad]l*_iname)$'` | ||
16171 | + test -n "$func_cygming_gnu_implib_tmp" | ||
16172 | +} | ||
16173 | + | ||
16174 | +# func_cygming_ms_implib_p ARG | ||
16175 | +# This predicate returns with zero status (TRUE) if | ||
16176 | +# ARG is an MS-style import library. Returns | ||
16177 | +# with nonzero status (FALSE) otherwise. | ||
16178 | +func_cygming_ms_implib_p () | ||
16179 | +{ | ||
16180 | + $opt_debug | ||
16181 | + func_to_tool_file "$1" func_convert_file_msys_to_w32 | ||
16182 | + func_cygming_ms_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $GREP '_NULL_IMPORT_DESCRIPTOR'` | ||
16183 | + test -n "$func_cygming_ms_implib_tmp" | ||
16184 | +} | ||
16185 | + | ||
16186 | +# func_cygming_dll_for_implib_fallback ARG | ||
16187 | +# Platform-specific function to extract the | ||
16188 | +# name of the DLL associated with the specified | ||
16189 | +# import library ARG. | ||
16190 | +# | ||
16191 | +# This fallback implementation is for use when $DLLTOOL | ||
16192 | +# does not support the --identify-strict option. | ||
16193 | +# Invoked by eval'ing the libtool variable | ||
16194 | +# $sharedlib_from_linklib_cmd | ||
16195 | +# Result is available in the variable | ||
16196 | +# $sharedlib_from_linklib_result | ||
16197 | +func_cygming_dll_for_implib_fallback () | ||
16198 | +{ | ||
16199 | + $opt_debug | ||
16200 | + if func_cygming_gnu_implib_p "$1" ; then | ||
16201 | + # binutils import library | ||
16202 | + sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$7' "$1"` | ||
16203 | + elif func_cygming_ms_implib_p "$1" ; then | ||
16204 | + # ms-generated import library | ||
16205 | + sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$6' "$1"` | ||
16206 | + else | ||
16207 | + # unknown | ||
16208 | + sharedlib_from_linklib_result="" | ||
16209 | + fi | ||
16210 | +} | ||
16211 | |||
16212 | |||
16213 | # 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 () | ||
16233 | _LTECHO_EOF' | ||
16234 | } | ||
16235 | ECHO=\"$qECHO\" | ||
16236 | - fi\ | ||
16237 | + fi | ||
16238 | + | ||
16239 | +# Very basic option parsing. These options are (a) specific to | ||
16240 | +# the libtool wrapper, (b) are identical between the wrapper | ||
16241 | +# /script/ and the wrapper /executable/ which is used only on | ||
16242 | +# windows platforms, and (c) all begin with the string "--lt-" | ||
16243 | +# (application programs are unlikely to have options which match | ||
16244 | +# this pattern). | ||
16245 | +# | ||
16246 | +# There are only two supported options: --lt-debug and | ||
16247 | +# --lt-dump-script. There is, deliberately, no --lt-help. | ||
16248 | +# | ||
16249 | +# The first argument to this parsing function should be the | ||
16250 | +# script's $0 value, followed by "$@". | ||
16251 | +lt_option_debug= | ||
16252 | +func_parse_lt_options () | ||
16253 | +{ | ||
16254 | + lt_script_arg0=\$0 | ||
16255 | + shift | ||
16256 | + for lt_opt | ||
16257 | + do | ||
16258 | + case \"\$lt_opt\" in | ||
16259 | + --lt-debug) lt_option_debug=1 ;; | ||
16260 | + --lt-dump-script) | ||
16261 | + lt_dump_D=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%/[^/]*$%%'\` | ||
16262 | + test \"X\$lt_dump_D\" = \"X\$lt_script_arg0\" && lt_dump_D=. | ||
16263 | + lt_dump_F=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%^.*/%%'\` | ||
16264 | + cat \"\$lt_dump_D/\$lt_dump_F\" | ||
16265 | + exit 0 | ||
16266 | + ;; | ||
16267 | + --lt-*) | ||
16268 | + \$ECHO \"Unrecognized --lt- option: '\$lt_opt'\" 1>&2 | ||
16269 | + exit 1 | ||
16270 | + ;; | ||
16271 | + esac | ||
16272 | + done | ||
16273 | + | ||
16274 | + # Print the debug banner immediately: | ||
16275 | + if test -n \"\$lt_option_debug\"; then | ||
16276 | + echo \"${outputname}:${output}:\${LINENO}: libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\" 1>&2 | ||
16277 | + fi | ||
16278 | +} | ||
16279 | + | ||
16280 | +# Used when --lt-debug. Prints its arguments to stdout | ||
16281 | +# (redirection is the responsibility of the caller) | ||
16282 | +func_lt_dump_args () | ||
16283 | +{ | ||
16284 | + lt_dump_args_N=1; | ||
16285 | + for lt_arg | ||
16286 | + do | ||
16287 | + \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[\$lt_dump_args_N]: \$lt_arg\" | ||
16288 | + lt_dump_args_N=\`expr \$lt_dump_args_N + 1\` | ||
16289 | + done | ||
16290 | +} | ||
16291 | + | ||
16292 | +# Core function for launching the target application | ||
16293 | +func_exec_program_core () | ||
16294 | +{ | ||
16295 | +" | ||
16296 | + case $host in | ||
16297 | + # Backslashes separate directories on plain windows | ||
16298 | + *-*-mingw | *-*-os2* | *-cegcc*) | ||
16299 | + $ECHO "\ | ||
16300 | + if test -n \"\$lt_option_debug\"; then | ||
16301 | + \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir\\\\\$program\" 1>&2 | ||
16302 | + func_lt_dump_args \${1+\"\$@\"} 1>&2 | ||
16303 | + fi | ||
16304 | + exec \"\$progdir\\\\\$program\" \${1+\"\$@\"} | ||
16305 | +" | ||
16306 | + ;; | ||
16307 | + | ||
16308 | + *) | ||
16309 | + $ECHO "\ | ||
16310 | + if test -n \"\$lt_option_debug\"; then | ||
16311 | + \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir/\$program\" 1>&2 | ||
16312 | + func_lt_dump_args \${1+\"\$@\"} 1>&2 | ||
16313 | + fi | ||
16314 | + exec \"\$progdir/\$program\" \${1+\"\$@\"} | ||
16315 | +" | ||
16316 | + ;; | ||
16317 | + esac | ||
16318 | + $ECHO "\ | ||
16319 | + \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2 | ||
16320 | + exit 1 | ||
16321 | +} | ||
16322 | + | ||
16323 | +# A function to encapsulate launching the target application | ||
16324 | +# Strips options in the --lt-* namespace from \$@ and | ||
16325 | +# launches target application with the remaining arguments. | ||
16326 | +func_exec_program () | ||
16327 | +{ | ||
16328 | + for lt_wr_arg | ||
16329 | + do | ||
16330 | + case \$lt_wr_arg in | ||
16331 | + --lt-*) ;; | ||
16332 | + *) set x \"\$@\" \"\$lt_wr_arg\"; shift;; | ||
16333 | + esac | ||
16334 | + shift | ||
16335 | + done | ||
16336 | + func_exec_program_core \${1+\"\$@\"} | ||
16337 | +} | ||
16338 | + | ||
16339 | + # Parse options | ||
16340 | + func_parse_lt_options \"\$0\" \${1+\"\$@\"} | ||
16341 | |||
16342 | # Find the directory that this script lives in. | ||
16343 | thisdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*$%%'\` | ||
16344 | @@ -3078,7 +4065,7 @@ _LTECHO_EOF' | ||
16345 | |||
16346 | # relink executable if necessary | ||
16347 | if test -n \"\$relink_command\"; then | ||
16348 | - if relink_command_output=\`eval \"\$relink_command\" 2>&1\`; then : | ||
16349 | + if relink_command_output=\`eval \$relink_command 2>&1\`; then : | ||
16350 | else | ||
16351 | $ECHO \"\$relink_command_output\" >&2 | ||
16352 | $RM \"\$progdir/\$file\" | ||
16353 | @@ -3102,6 +4089,18 @@ _LTECHO_EOF' | ||
16354 | |||
16355 | if test -f \"\$progdir/\$program\"; then" | ||
16356 | |||
16357 | + # fixup the dll searchpath if we need to. | ||
16358 | + # | ||
16359 | + # Fix the DLL searchpath if we need to. Do this before prepending | ||
16360 | + # to shlibpath, because on Windows, both are PATH and uninstalled | ||
16361 | + # libraries must come first. | ||
16362 | + if test -n "$dllsearchpath"; then | ||
16363 | + $ECHO "\ | ||
16364 | + # Add the dll search path components to the executable PATH | ||
16365 | + PATH=$dllsearchpath:\$PATH | ||
16366 | +" | ||
16367 | + fi | ||
16368 | + | ||
16369 | # Export our shlibpath_var if we have one. | ||
16370 | if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then | ||
16371 | $ECHO "\ | ||
16372 | @@ -3116,35 +4115,10 @@ _LTECHO_EOF' | ||
16373 | " | ||
16374 | fi | ||
16375 | |||
16376 | - # fixup the dll searchpath if we need to. | ||
16377 | - if test -n "$dllsearchpath"; then | ||
16378 | - $ECHO "\ | ||
16379 | - # Add the dll search path components to the executable PATH | ||
16380 | - PATH=$dllsearchpath:\$PATH | ||
16381 | -" | ||
16382 | - fi | ||
16383 | - | ||
16384 | $ECHO "\ | ||
16385 | if test \"\$libtool_execute_magic\" != \"$magic\"; then | ||
16386 | # Run the actual program with our arguments. | ||
16387 | -" | ||
16388 | - case $host in | ||
16389 | - # Backslashes separate directories on plain windows | ||
16390 | - *-*-mingw | *-*-os2* | *-cegcc*) | ||
16391 | - $ECHO "\ | ||
16392 | - exec \"\$progdir\\\\\$program\" \${1+\"\$@\"} | ||
16393 | -" | ||
16394 | - ;; | ||
16395 | - | ||
16396 | - *) | ||
16397 | - $ECHO "\ | ||
16398 | - exec \"\$progdir/\$program\" \${1+\"\$@\"} | ||
16399 | -" | ||
16400 | - ;; | ||
16401 | - esac | ||
16402 | - $ECHO "\ | ||
16403 | - \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2 | ||
16404 | - exit 1 | ||
16405 | + func_exec_program \${1+\"\$@\"} | ||
16406 | fi | ||
16407 | else | ||
16408 | # The program doesn't exist. | ||
16409 | @@ -3158,166 +4132,6 @@ fi\ | ||
16410 | } | ||
16411 | |||
16412 | |||
16413 | -# func_to_host_path arg | ||
16414 | -# | ||
16415 | -# Convert paths to host format when used with build tools. | ||
16416 | -# Intended for use with "native" mingw (where libtool itself | ||
16417 | -# is running under the msys shell), or in the following cross- | ||
16418 | -# build environments: | ||
16419 | -# $build $host | ||
16420 | -# mingw (msys) mingw [e.g. native] | ||
16421 | -# cygwin mingw | ||
16422 | -# *nix + wine mingw | ||
16423 | -# where wine is equipped with the `winepath' executable. | ||
16424 | -# In the native mingw case, the (msys) shell automatically | ||
16425 | -# converts paths for any non-msys applications it launches, | ||
16426 | -# but that facility isn't available from inside the cwrapper. | ||
16427 | -# Similar accommodations are necessary for $host mingw and | ||
16428 | -# $build cygwin. Calling this function does no harm for other | ||
16429 | -# $host/$build combinations not listed above. | ||
16430 | -# | ||
16431 | -# ARG is the path (on $build) that should be converted to | ||
16432 | -# the proper representation for $host. The result is stored | ||
16433 | -# in $func_to_host_path_result. | ||
16434 | -func_to_host_path () | ||
16435 | -{ | ||
16436 | - func_to_host_path_result="$1" | ||
16437 | - if test -n "$1"; then | ||
16438 | - case $host in | ||
16439 | - *mingw* ) | ||
16440 | - lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g' | ||
16441 | - case $build in | ||
16442 | - *mingw* ) # actually, msys | ||
16443 | - # awkward: cmd appends spaces to result | ||
16444 | - func_to_host_path_result=`( cmd //c echo "$1" ) 2>/dev/null | | ||
16445 | - $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"` | ||
16446 | - ;; | ||
16447 | - *cygwin* ) | ||
16448 | - func_to_host_path_result=`cygpath -w "$1" | | ||
16449 | - $SED -e "$lt_sed_naive_backslashify"` | ||
16450 | - ;; | ||
16451 | - * ) | ||
16452 | - # Unfortunately, winepath does not exit with a non-zero | ||
16453 | - # error code, so we are forced to check the contents of | ||
16454 | - # stdout. On the other hand, if the command is not | ||
16455 | - # found, the shell will set an exit code of 127 and print | ||
16456 | - # *an error message* to stdout. So we must check for both | ||
16457 | - # error code of zero AND non-empty stdout, which explains | ||
16458 | - # the odd construction: | ||
16459 | - func_to_host_path_tmp1=`winepath -w "$1" 2>/dev/null` | ||
16460 | - if test "$?" -eq 0 && test -n "${func_to_host_path_tmp1}"; then | ||
16461 | - func_to_host_path_result=`$ECHO "$func_to_host_path_tmp1" | | ||
16462 | - $SED -e "$lt_sed_naive_backslashify"` | ||
16463 | - else | ||
16464 | - # Allow warning below. | ||
16465 | - func_to_host_path_result= | ||
16466 | - fi | ||
16467 | - ;; | ||
16468 | - esac | ||
16469 | - if test -z "$func_to_host_path_result" ; then | ||
16470 | - func_error "Could not determine host path corresponding to" | ||
16471 | - func_error " \`$1'" | ||
16472 | - func_error "Continuing, but uninstalled executables may not work." | ||
16473 | - # Fallback: | ||
16474 | - func_to_host_path_result="$1" | ||
16475 | - fi | ||
16476 | - ;; | ||
16477 | - esac | ||
16478 | - fi | ||
16479 | -} | ||
16480 | -# end: func_to_host_path | ||
16481 | - | ||
16482 | -# func_to_host_pathlist arg | ||
16483 | -# | ||
16484 | -# Convert pathlists to host format when used with build tools. | ||
16485 | -# See func_to_host_path(), above. This function supports the | ||
16486 | -# following $build/$host combinations (but does no harm for | ||
16487 | -# combinations not listed here): | ||
16488 | -# $build $host | ||
16489 | -# mingw (msys) mingw [e.g. native] | ||
16490 | -# cygwin mingw | ||
16491 | -# *nix + wine mingw | ||
16492 | -# | ||
16493 | -# Path separators are also converted from $build format to | ||
16494 | -# $host format. If ARG begins or ends with a path separator | ||
16495 | -# character, it is preserved (but converted to $host format) | ||
16496 | -# on output. | ||
16497 | -# | ||
16498 | -# ARG is a pathlist (on $build) that should be converted to | ||
16499 | -# the proper representation on $host. The result is stored | ||
16500 | -# in $func_to_host_pathlist_result. | ||
16501 | -func_to_host_pathlist () | ||
16502 | -{ | ||
16503 | - func_to_host_pathlist_result="$1" | ||
16504 | - if test -n "$1"; then | ||
16505 | - case $host in | ||
16506 | - *mingw* ) | ||
16507 | - lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g' | ||
16508 | - # Remove leading and trailing path separator characters from | ||
16509 | - # ARG. msys behavior is inconsistent here, cygpath turns them | ||
16510 | - # into '.;' and ';.', and winepath ignores them completely. | ||
16511 | - func_stripname : : "$1" | ||
16512 | - func_to_host_pathlist_tmp1=$func_stripname_result | ||
16513 | - case $build in | ||
16514 | - *mingw* ) # Actually, msys. | ||
16515 | - # Awkward: cmd appends spaces to result. | ||
16516 | - func_to_host_pathlist_result=` | ||
16517 | - ( cmd //c echo "$func_to_host_pathlist_tmp1" ) 2>/dev/null | | ||
16518 | - $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"` | ||
16519 | - ;; | ||
16520 | - *cygwin* ) | ||
16521 | - func_to_host_pathlist_result=`cygpath -w -p "$func_to_host_pathlist_tmp1" | | ||
16522 | - $SED -e "$lt_sed_naive_backslashify"` | ||
16523 | - ;; | ||
16524 | - * ) | ||
16525 | - # unfortunately, winepath doesn't convert pathlists | ||
16526 | - func_to_host_pathlist_result="" | ||
16527 | - func_to_host_pathlist_oldIFS=$IFS | ||
16528 | - IFS=: | ||
16529 | - for func_to_host_pathlist_f in $func_to_host_pathlist_tmp1 ; do | ||
16530 | - IFS=$func_to_host_pathlist_oldIFS | ||
16531 | - if test -n "$func_to_host_pathlist_f" ; then | ||
16532 | - func_to_host_path "$func_to_host_pathlist_f" | ||
16533 | - if test -n "$func_to_host_path_result" ; then | ||
16534 | - if test -z "$func_to_host_pathlist_result" ; then | ||
16535 | - func_to_host_pathlist_result="$func_to_host_path_result" | ||
16536 | - else | ||
16537 | - func_append func_to_host_pathlist_result ";$func_to_host_path_result" | ||
16538 | - fi | ||
16539 | - fi | ||
16540 | - fi | ||
16541 | - done | ||
16542 | - IFS=$func_to_host_pathlist_oldIFS | ||
16543 | - ;; | ||
16544 | - esac | ||
16545 | - if test -z "$func_to_host_pathlist_result"; then | ||
16546 | - func_error "Could not determine the host path(s) corresponding to" | ||
16547 | - func_error " \`$1'" | ||
16548 | - func_error "Continuing, but uninstalled executables may not work." | ||
16549 | - # Fallback. This may break if $1 contains DOS-style drive | ||
16550 | - # specifications. The fix is not to complicate the expression | ||
16551 | - # below, but for the user to provide a working wine installation | ||
16552 | - # with winepath so that path translation in the cross-to-mingw | ||
16553 | - # case works properly. | ||
16554 | - lt_replace_pathsep_nix_to_dos="s|:|;|g" | ||
16555 | - func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp1" |\ | ||
16556 | - $SED -e "$lt_replace_pathsep_nix_to_dos"` | ||
16557 | - fi | ||
16558 | - # Now, add the leading and trailing path separators back | ||
16559 | - case "$1" in | ||
16560 | - :* ) func_to_host_pathlist_result=";$func_to_host_pathlist_result" | ||
16561 | - ;; | ||
16562 | - esac | ||
16563 | - case "$1" in | ||
16564 | - *: ) func_append func_to_host_pathlist_result ";" | ||
16565 | - ;; | ||
16566 | - esac | ||
16567 | - ;; | ||
16568 | - esac | ||
16569 | - fi | ||
16570 | -} | ||
16571 | -# end: func_to_host_pathlist | ||
16572 | - | ||
16573 | # func_emit_cwrapperexe_src | ||
16574 | # emit the source code for a wrapper executable on stdout | ||
16575 | # Must ONLY be called from within func_mode_link because | ||
16576 | @@ -3334,10 +4148,6 @@ func_emit_cwrapperexe_src () | ||
16577 | |||
16578 | This wrapper executable should never be moved out of the build directory. | ||
16579 | If it is, it will not operate correctly. | ||
16580 | - | ||
16581 | - Currently, it simply execs the wrapper *script* "$SHELL $output", | ||
16582 | - but could eventually absorb all of the scripts functionality and | ||
16583 | - exec $objdir/$outputname directly. | ||
16584 | */ | ||
16585 | EOF | ||
16586 | cat <<"EOF" | ||
16587 | @@ -3462,22 +4272,13 @@ int setenv (const char *, const char *, int); | ||
16588 | if (stale) { free ((void *) stale); stale = 0; } \ | ||
16589 | } while (0) | ||
16590 | |||
16591 | -#undef LTWRAPPER_DEBUGPRINTF | ||
16592 | -#if defined LT_DEBUGWRAPPER | ||
16593 | -# define LTWRAPPER_DEBUGPRINTF(args) ltwrapper_debugprintf args | ||
16594 | -static void | ||
16595 | -ltwrapper_debugprintf (const char *fmt, ...) | ||
16596 | -{ | ||
16597 | - va_list args; | ||
16598 | - va_start (args, fmt); | ||
16599 | - (void) vfprintf (stderr, fmt, args); | ||
16600 | - va_end (args); | ||
16601 | -} | ||
16602 | +#if defined(LT_DEBUGWRAPPER) | ||
16603 | +static int lt_debug = 1; | ||
16604 | #else | ||
16605 | -# define LTWRAPPER_DEBUGPRINTF(args) | ||
16606 | +static int lt_debug = 0; | ||
16607 | #endif | ||
16608 | |||
16609 | -const char *program_name = NULL; | ||
16610 | +const char *program_name = "libtool-wrapper"; /* in case xstrdup fails */ | ||
16611 | |||
16612 | void *xmalloc (size_t num); | ||
16613 | char *xstrdup (const char *string); | ||
16614 | @@ -3487,7 +4288,10 @@ char *chase_symlinks (const char *pathspec); | ||
16615 | int make_executable (const char *path); | ||
16616 | int check_executable (const char *path); | ||
16617 | char *strendzap (char *str, const char *pat); | ||
16618 | -void lt_fatal (const char *message, ...); | ||
16619 | +void lt_debugprintf (const char *file, int line, const char *fmt, ...); | ||
16620 | +void lt_fatal (const char *file, int line, const char *message, ...); | ||
16621 | +static const char *nonnull (const char *s); | ||
16622 | +static const char *nonempty (const char *s); | ||
16623 | void lt_setenv (const char *name, const char *value); | ||
16624 | char *lt_extend_str (const char *orig_value, const char *add, int to_end); | ||
16625 | void lt_update_exe_path (const char *name, const char *value); | ||
16626 | @@ -3497,14 +4301,14 @@ void lt_dump_script (FILE *f); | ||
16627 | EOF | ||
16628 | |||
16629 | cat <<EOF | ||
16630 | -const char * MAGIC_EXE = "$magic_exe"; | ||
16631 | +volatile const char * MAGIC_EXE = "$magic_exe"; | ||
16632 | const char * LIB_PATH_VARNAME = "$shlibpath_var"; | ||
16633 | EOF | ||
16634 | |||
16635 | if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then | ||
16636 | - func_to_host_pathlist "$temp_rpath" | ||
16637 | + func_to_host_path "$temp_rpath" | ||
16638 | cat <<EOF | ||
16639 | -const char * LIB_PATH_VALUE = "$func_to_host_pathlist_result"; | ||
16640 | +const char * LIB_PATH_VALUE = "$func_to_host_path_result"; | ||
16641 | EOF | ||
16642 | else | ||
16643 | cat <<"EOF" | ||
16644 | @@ -3513,10 +4317,10 @@ EOF | ||
16645 | fi | ||
16646 | |||
16647 | if test -n "$dllsearchpath"; then | ||
16648 | - func_to_host_pathlist "$dllsearchpath:" | ||
16649 | + func_to_host_path "$dllsearchpath:" | ||
16650 | cat <<EOF | ||
16651 | const char * EXE_PATH_VARNAME = "PATH"; | ||
16652 | -const char * EXE_PATH_VALUE = "$func_to_host_pathlist_result"; | ||
16653 | +const char * EXE_PATH_VALUE = "$func_to_host_path_result"; | ||
16654 | EOF | ||
16655 | else | ||
16656 | cat <<"EOF" | ||
16657 | @@ -3539,12 +4343,10 @@ EOF | ||
16658 | cat <<"EOF" | ||
16659 | |||
16660 | #define LTWRAPPER_OPTION_PREFIX "--lt-" | ||
16661 | -#define LTWRAPPER_OPTION_PREFIX_LENGTH 5 | ||
16662 | |||
16663 | -static const size_t opt_prefix_len = LTWRAPPER_OPTION_PREFIX_LENGTH; | ||
16664 | static const char *ltwrapper_option_prefix = LTWRAPPER_OPTION_PREFIX; | ||
16665 | - | ||
16666 | static const char *dumpscript_opt = LTWRAPPER_OPTION_PREFIX "dump-script"; | ||
16667 | +static const char *debug_opt = LTWRAPPER_OPTION_PREFIX "debug"; | ||
16668 | |||
16669 | int | ||
16670 | main (int argc, char *argv[]) | ||
16671 | @@ -3561,10 +4363,13 @@ main (int argc, char *argv[]) | ||
16672 | int i; | ||
16673 | |||
16674 | program_name = (char *) xstrdup (base_name (argv[0])); | ||
16675 | - LTWRAPPER_DEBUGPRINTF (("(main) argv[0] : %s\n", argv[0])); | ||
16676 | - LTWRAPPER_DEBUGPRINTF (("(main) program_name : %s\n", program_name)); | ||
16677 | + newargz = XMALLOC (char *, argc + 1); | ||
16678 | |||
16679 | - /* very simple arg parsing; don't want to rely on getopt */ | ||
16680 | + /* very simple arg parsing; don't want to rely on getopt | ||
16681 | + * also, copy all non cwrapper options to newargz, except | ||
16682 | + * argz[0], which is handled differently | ||
16683 | + */ | ||
16684 | + newargc=0; | ||
16685 | for (i = 1; i < argc; i++) | ||
16686 | { | ||
16687 | if (strcmp (argv[i], dumpscript_opt) == 0) | ||
16688 | @@ -3581,21 +4386,54 @@ EOF | ||
16689 | lt_dump_script (stdout); | ||
16690 | return 0; | ||
16691 | } | ||
16692 | + if (strcmp (argv[i], debug_opt) == 0) | ||
16693 | + { | ||
16694 | + lt_debug = 1; | ||
16695 | + continue; | ||
16696 | + } | ||
16697 | + if (strcmp (argv[i], ltwrapper_option_prefix) == 0) | ||
16698 | + { | ||
16699 | + /* however, if there is an option in the LTWRAPPER_OPTION_PREFIX | ||
16700 | + namespace, but it is not one of the ones we know about and | ||
16701 | + have already dealt with, above (inluding dump-script), then | ||
16702 | + report an error. Otherwise, targets might begin to believe | ||
16703 | + they are allowed to use options in the LTWRAPPER_OPTION_PREFIX | ||
16704 | + namespace. The first time any user complains about this, we'll | ||
16705 | + need to make LTWRAPPER_OPTION_PREFIX a configure-time option | ||
16706 | + or a configure.ac-settable value. | ||
16707 | + */ | ||
16708 | + lt_fatal (__FILE__, __LINE__, | ||
16709 | + "unrecognized %s option: '%s'", | ||
16710 | + ltwrapper_option_prefix, argv[i]); | ||
16711 | + } | ||
16712 | + /* otherwise ... */ | ||
16713 | + newargz[++newargc] = xstrdup (argv[i]); | ||
16714 | } | ||
16715 | + newargz[++newargc] = NULL; | ||
16716 | + | ||
16717 | +EOF | ||
16718 | + cat <<EOF | ||
16719 | + /* The GNU banner must be the first non-error debug message */ | ||
16720 | + lt_debugprintf (__FILE__, __LINE__, "libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\n"); | ||
16721 | +EOF | ||
16722 | + cat <<"EOF" | ||
16723 | + lt_debugprintf (__FILE__, __LINE__, "(main) argv[0]: %s\n", argv[0]); | ||
16724 | + lt_debugprintf (__FILE__, __LINE__, "(main) program_name: %s\n", program_name); | ||
16725 | |||
16726 | - newargz = XMALLOC (char *, argc + 1); | ||
16727 | tmp_pathspec = find_executable (argv[0]); | ||
16728 | if (tmp_pathspec == NULL) | ||
16729 | - lt_fatal ("Couldn't find %s", argv[0]); | ||
16730 | - LTWRAPPER_DEBUGPRINTF (("(main) found exe (before symlink chase) at : %s\n", | ||
16731 | - tmp_pathspec)); | ||
16732 | + lt_fatal (__FILE__, __LINE__, "couldn't find %s", argv[0]); | ||
16733 | + lt_debugprintf (__FILE__, __LINE__, | ||
16734 | + "(main) found exe (before symlink chase) at: %s\n", | ||
16735 | + tmp_pathspec); | ||
16736 | |||
16737 | actual_cwrapper_path = chase_symlinks (tmp_pathspec); | ||
16738 | - LTWRAPPER_DEBUGPRINTF (("(main) found exe (after symlink chase) at : %s\n", | ||
16739 | - actual_cwrapper_path)); | ||
16740 | + lt_debugprintf (__FILE__, __LINE__, | ||
16741 | + "(main) found exe (after symlink chase) at: %s\n", | ||
16742 | + actual_cwrapper_path); | ||
16743 | XFREE (tmp_pathspec); | ||
16744 | |||
16745 | - actual_cwrapper_name = xstrdup( base_name (actual_cwrapper_path)); | ||
16746 | + actual_cwrapper_name = xstrdup (base_name (actual_cwrapper_path)); | ||
16747 | strendzap (actual_cwrapper_path, actual_cwrapper_name); | ||
16748 | |||
16749 | /* wrapper name transforms */ | ||
16750 | @@ -3613,8 +4451,9 @@ EOF | ||
16751 | target_name = tmp_pathspec; | ||
16752 | tmp_pathspec = 0; | ||
16753 | |||
16754 | - LTWRAPPER_DEBUGPRINTF (("(main) libtool target name: %s\n", | ||
16755 | - target_name)); | ||
16756 | + lt_debugprintf (__FILE__, __LINE__, | ||
16757 | + "(main) libtool target name: %s\n", | ||
16758 | + target_name); | ||
16759 | EOF | ||
16760 | |||
16761 | cat <<EOF | ||
16762 | @@ -3664,35 +4503,19 @@ EOF | ||
16763 | |||
16764 | lt_setenv ("BIN_SH", "xpg4"); /* for Tru64 */ | ||
16765 | lt_setenv ("DUALCASE", "1"); /* for MSK sh */ | ||
16766 | - lt_update_lib_path (LIB_PATH_VARNAME, LIB_PATH_VALUE); | ||
16767 | + /* Update the DLL searchpath. EXE_PATH_VALUE ($dllsearchpath) must | ||
16768 | + be prepended before (that is, appear after) LIB_PATH_VALUE ($temp_rpath) | ||
16769 | + because on Windows, both *_VARNAMEs are PATH but uninstalled | ||
16770 | + libraries must come first. */ | ||
16771 | lt_update_exe_path (EXE_PATH_VARNAME, EXE_PATH_VALUE); | ||
16772 | + lt_update_lib_path (LIB_PATH_VARNAME, LIB_PATH_VALUE); | ||
16773 | |||
16774 | - newargc=0; | ||
16775 | - for (i = 1; i < argc; i++) | ||
16776 | - { | ||
16777 | - if (strncmp (argv[i], ltwrapper_option_prefix, opt_prefix_len) == 0) | ||
16778 | - { | ||
16779 | - /* however, if there is an option in the LTWRAPPER_OPTION_PREFIX | ||
16780 | - namespace, but it is not one of the ones we know about and | ||
16781 | - have already dealt with, above (inluding dump-script), then | ||
16782 | - report an error. Otherwise, targets might begin to believe | ||
16783 | - they are allowed to use options in the LTWRAPPER_OPTION_PREFIX | ||
16784 | - namespace. The first time any user complains about this, we'll | ||
16785 | - need to make LTWRAPPER_OPTION_PREFIX a configure-time option | ||
16786 | - or a configure.ac-settable value. | ||
16787 | - */ | ||
16788 | - lt_fatal ("Unrecognized option in %s namespace: '%s'", | ||
16789 | - ltwrapper_option_prefix, argv[i]); | ||
16790 | - } | ||
16791 | - /* otherwise ... */ | ||
16792 | - newargz[++newargc] = xstrdup (argv[i]); | ||
16793 | - } | ||
16794 | - newargz[++newargc] = NULL; | ||
16795 | - | ||
16796 | - LTWRAPPER_DEBUGPRINTF (("(main) lt_argv_zero : %s\n", (lt_argv_zero ? lt_argv_zero : "<NULL>"))); | ||
16797 | + lt_debugprintf (__FILE__, __LINE__, "(main) lt_argv_zero: %s\n", | ||
16798 | + nonnull (lt_argv_zero)); | ||
16799 | for (i = 0; i < newargc; i++) | ||
16800 | { | ||
16801 | - LTWRAPPER_DEBUGPRINTF (("(main) newargz[%d] : %s\n", i, (newargz[i] ? newargz[i] : "<NULL>"))); | ||
16802 | + lt_debugprintf (__FILE__, __LINE__, "(main) newargz[%d]: %s\n", | ||
16803 | + i, nonnull (newargz[i])); | ||
16804 | } | ||
16805 | |||
16806 | EOF | ||
16807 | @@ -3706,7 +4529,9 @@ EOF | ||
16808 | if (rval == -1) | ||
16809 | { | ||
16810 | /* failed to start process */ | ||
16811 | - LTWRAPPER_DEBUGPRINTF (("(main) failed to launch target \"%s\": errno = %d\n", lt_argv_zero, errno)); | ||
16812 | + lt_debugprintf (__FILE__, __LINE__, | ||
16813 | + "(main) failed to launch target \"%s\": %s\n", | ||
16814 | + lt_argv_zero, nonnull (strerror (errno))); | ||
16815 | return 127; | ||
16816 | } | ||
16817 | return rval; | ||
16818 | @@ -3728,7 +4553,7 @@ xmalloc (size_t num) | ||
16819 | { | ||
16820 | void *p = (void *) malloc (num); | ||
16821 | if (!p) | ||
16822 | - lt_fatal ("Memory exhausted"); | ||
16823 | + lt_fatal (__FILE__, __LINE__, "memory exhausted"); | ||
16824 | |||
16825 | return p; | ||
16826 | } | ||
16827 | @@ -3762,8 +4587,8 @@ check_executable (const char *path) | ||
16828 | { | ||
16829 | struct stat st; | ||
16830 | |||
16831 | - LTWRAPPER_DEBUGPRINTF (("(check_executable) : %s\n", | ||
16832 | - path ? (*path ? path : "EMPTY!") : "NULL!")); | ||
16833 | + lt_debugprintf (__FILE__, __LINE__, "(check_executable): %s\n", | ||
16834 | + nonempty (path)); | ||
16835 | if ((!path) || (!*path)) | ||
16836 | return 0; | ||
16837 | |||
16838 | @@ -3780,8 +4605,8 @@ make_executable (const char *path) | ||
16839 | int rval = 0; | ||
16840 | struct stat st; | ||
16841 | |||
16842 | - LTWRAPPER_DEBUGPRINTF (("(make_executable) : %s\n", | ||
16843 | - path ? (*path ? path : "EMPTY!") : "NULL!")); | ||
16844 | + lt_debugprintf (__FILE__, __LINE__, "(make_executable): %s\n", | ||
16845 | + nonempty (path)); | ||
16846 | if ((!path) || (!*path)) | ||
16847 | return 0; | ||
16848 | |||
16849 | @@ -3807,8 +4632,8 @@ find_executable (const char *wrapper) | ||
16850 | int tmp_len; | ||
16851 | char *concat_name; | ||
16852 | |||
16853 | - LTWRAPPER_DEBUGPRINTF (("(find_executable) : %s\n", | ||
16854 | - wrapper ? (*wrapper ? wrapper : "EMPTY!") : "NULL!")); | ||
16855 | + lt_debugprintf (__FILE__, __LINE__, "(find_executable): %s\n", | ||
16856 | + nonempty (wrapper)); | ||
16857 | |||
16858 | if ((wrapper == NULL) || (*wrapper == '\0')) | ||
16859 | return NULL; | ||
16860 | @@ -3861,7 +4686,8 @@ find_executable (const char *wrapper) | ||
16861 | { | ||
16862 | /* empty path: current directory */ | ||
16863 | if (getcwd (tmp, LT_PATHMAX) == NULL) | ||
16864 | - lt_fatal ("getcwd failed"); | ||
16865 | + lt_fatal (__FILE__, __LINE__, "getcwd failed: %s", | ||
16866 | + nonnull (strerror (errno))); | ||
16867 | tmp_len = strlen (tmp); | ||
16868 | concat_name = | ||
16869 | XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1); | ||
16870 | @@ -3886,7 +4712,8 @@ find_executable (const char *wrapper) | ||
16871 | } | ||
16872 | /* Relative path | not found in path: prepend cwd */ | ||
16873 | if (getcwd (tmp, LT_PATHMAX) == NULL) | ||
16874 | - lt_fatal ("getcwd failed"); | ||
16875 | + lt_fatal (__FILE__, __LINE__, "getcwd failed: %s", | ||
16876 | + nonnull (strerror (errno))); | ||
16877 | tmp_len = strlen (tmp); | ||
16878 | concat_name = XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1); | ||
16879 | memcpy (concat_name, tmp, tmp_len); | ||
16880 | @@ -3912,8 +4739,9 @@ chase_symlinks (const char *pathspec) | ||
16881 | int has_symlinks = 0; | ||
16882 | while (strlen (tmp_pathspec) && !has_symlinks) | ||
16883 | { | ||
16884 | - LTWRAPPER_DEBUGPRINTF (("checking path component for symlinks: %s\n", | ||
16885 | - tmp_pathspec)); | ||
16886 | + lt_debugprintf (__FILE__, __LINE__, | ||
16887 | + "checking path component for symlinks: %s\n", | ||
16888 | + tmp_pathspec); | ||
16889 | if (lstat (tmp_pathspec, &s) == 0) | ||
16890 | { | ||
16891 | if (S_ISLNK (s.st_mode) != 0) | ||
16892 | @@ -3935,8 +4763,9 @@ chase_symlinks (const char *pathspec) | ||
16893 | } | ||
16894 | else | ||
16895 | { | ||
16896 | - char *errstr = strerror (errno); | ||
16897 | - lt_fatal ("Error accessing file %s (%s)", tmp_pathspec, errstr); | ||
16898 | + lt_fatal (__FILE__, __LINE__, | ||
16899 | + "error accessing file \"%s\": %s", | ||
16900 | + tmp_pathspec, nonnull (strerror (errno))); | ||
16901 | } | ||
16902 | } | ||
16903 | XFREE (tmp_pathspec); | ||
16904 | @@ -3949,7 +4778,8 @@ chase_symlinks (const char *pathspec) | ||
16905 | tmp_pathspec = realpath (pathspec, buf); | ||
16906 | if (tmp_pathspec == 0) | ||
16907 | { | ||
16908 | - lt_fatal ("Could not follow symlinks for %s", pathspec); | ||
16909 | + lt_fatal (__FILE__, __LINE__, | ||
16910 | + "could not follow symlinks for %s", pathspec); | ||
16911 | } | ||
16912 | return xstrdup (tmp_pathspec); | ||
16913 | #endif | ||
16914 | @@ -3975,11 +4805,25 @@ strendzap (char *str, const char *pat) | ||
16915 | return str; | ||
16916 | } | ||
16917 | |||
16918 | +void | ||
16919 | +lt_debugprintf (const char *file, int line, const char *fmt, ...) | ||
16920 | +{ | ||
16921 | + va_list args; | ||
16922 | + if (lt_debug) | ||
16923 | + { | ||
16924 | + (void) fprintf (stderr, "%s:%s:%d: ", program_name, file, line); | ||
16925 | + va_start (args, fmt); | ||
16926 | + (void) vfprintf (stderr, fmt, args); | ||
16927 | + va_end (args); | ||
16928 | + } | ||
16929 | +} | ||
16930 | + | ||
16931 | static void | ||
16932 | -lt_error_core (int exit_status, const char *mode, | ||
16933 | +lt_error_core (int exit_status, const char *file, | ||
16934 | + int line, const char *mode, | ||
16935 | const char *message, va_list ap) | ||
16936 | { | ||
16937 | - fprintf (stderr, "%s: %s: ", program_name, mode); | ||
16938 | + fprintf (stderr, "%s:%s:%d: %s: ", program_name, file, line, mode); | ||
16939 | vfprintf (stderr, message, ap); | ||
16940 | fprintf (stderr, ".\n"); | ||
16941 | |||
16942 | @@ -3988,20 +4832,32 @@ lt_error_core (int exit_status, const char *mode, | ||
16943 | } | ||
16944 | |||
16945 | void | ||
16946 | -lt_fatal (const char *message, ...) | ||
16947 | +lt_fatal (const char *file, int line, const char *message, ...) | ||
16948 | { | ||
16949 | va_list ap; | ||
16950 | va_start (ap, message); | ||
16951 | - lt_error_core (EXIT_FAILURE, "FATAL", message, ap); | ||
16952 | + lt_error_core (EXIT_FAILURE, file, line, "FATAL", message, ap); | ||
16953 | va_end (ap); | ||
16954 | } | ||
16955 | |||
16956 | +static const char * | ||
16957 | +nonnull (const char *s) | ||
16958 | +{ | ||
16959 | + return s ? s : "(null)"; | ||
16960 | +} | ||
16961 | + | ||
16962 | +static const char * | ||
16963 | +nonempty (const char *s) | ||
16964 | +{ | ||
16965 | + return (s && !*s) ? "(empty)" : nonnull (s); | ||
16966 | +} | ||
16967 | + | ||
16968 | void | ||
16969 | lt_setenv (const char *name, const char *value) | ||
16970 | { | ||
16971 | - LTWRAPPER_DEBUGPRINTF (("(lt_setenv) setting '%s' to '%s'\n", | ||
16972 | - (name ? name : "<NULL>"), | ||
16973 | - (value ? value : "<NULL>"))); | ||
16974 | + lt_debugprintf (__FILE__, __LINE__, | ||
16975 | + "(lt_setenv) setting '%s' to '%s'\n", | ||
16976 | + nonnull (name), nonnull (value)); | ||
16977 | { | ||
16978 | #ifdef HAVE_SETENV | ||
16979 | /* always make a copy, for consistency with !HAVE_SETENV */ | ||
16980 | @@ -4049,9 +4905,9 @@ lt_extend_str (const char *orig_value, const char *add, int to_end) | ||
16981 | void | ||
16982 | lt_update_exe_path (const char *name, const char *value) | ||
16983 | { | ||
16984 | - LTWRAPPER_DEBUGPRINTF (("(lt_update_exe_path) modifying '%s' by prepending '%s'\n", | ||
16985 | - (name ? name : "<NULL>"), | ||
16986 | - (value ? value : "<NULL>"))); | ||
16987 | + lt_debugprintf (__FILE__, __LINE__, | ||
16988 | + "(lt_update_exe_path) modifying '%s' by prepending '%s'\n", | ||
16989 | + nonnull (name), nonnull (value)); | ||
16990 | |||
16991 | if (name && *name && value && *value) | ||
16992 | { | ||
16993 | @@ -4070,9 +4926,9 @@ lt_update_exe_path (const char *name, const char *value) | ||
16994 | void | ||
16995 | lt_update_lib_path (const char *name, const char *value) | ||
16996 | { | ||
16997 | - LTWRAPPER_DEBUGPRINTF (("(lt_update_lib_path) modifying '%s' by prepending '%s'\n", | ||
16998 | - (name ? name : "<NULL>"), | ||
16999 | - (value ? value : "<NULL>"))); | ||
17000 | + lt_debugprintf (__FILE__, __LINE__, | ||
17001 | + "(lt_update_lib_path) modifying '%s' by prepending '%s'\n", | ||
17002 | + nonnull (name), nonnull (value)); | ||
17003 | |||
17004 | if (name && *name && value && *value) | ||
17005 | { | ||
17006 | @@ -4222,7 +5078,7 @@ EOF | ||
17007 | func_win32_import_lib_p () | ||
17008 | { | ||
17009 | $opt_debug | ||
17010 | - case `eval "$file_magic_cmd \"\$1\" 2>/dev/null" | $SED -e 10q` in | ||
17011 | + case `eval $file_magic_cmd \"\$1\" 2>/dev/null | $SED -e 10q` in | ||
17012 | *import*) : ;; | ||
17013 | *) false ;; | ||
17014 | esac | ||
17015 | @@ -4401,9 +5257,9 @@ func_mode_link () | ||
17016 | ;; | ||
17017 | *) | ||
17018 | if test "$prev" = dlfiles; then | ||
17019 | - dlfiles="$dlfiles $arg" | ||
17020 | + func_append dlfiles " $arg" | ||
17021 | else | ||
17022 | - dlprefiles="$dlprefiles $arg" | ||
17023 | + func_append dlprefiles " $arg" | ||
17024 | fi | ||
17025 | prev= | ||
17026 | continue | ||
17027 | @@ -4427,7 +5283,7 @@ func_mode_link () | ||
17028 | *-*-darwin*) | ||
17029 | case "$deplibs " in | ||
17030 | *" $qarg.ltframework "*) ;; | ||
17031 | - *) deplibs="$deplibs $qarg.ltframework" # this is fixed later | ||
17032 | + *) func_append deplibs " $qarg.ltframework" # this is fixed later | ||
17033 | ;; | ||
17034 | esac | ||
17035 | ;; | ||
17036 | @@ -4446,7 +5302,7 @@ func_mode_link () | ||
17037 | moreargs= | ||
17038 | for fil in `cat "$save_arg"` | ||
17039 | do | ||
17040 | -# moreargs="$moreargs $fil" | ||
17041 | +# func_append moreargs " $fil" | ||
17042 | arg=$fil | ||
17043 | # A libtool-controlled object. | ||
17044 | |||
17045 | @@ -4475,7 +5331,7 @@ func_mode_link () | ||
17046 | |||
17047 | if test "$prev" = dlfiles; then | ||
17048 | if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then | ||
17049 | - dlfiles="$dlfiles $pic_object" | ||
17050 | + func_append dlfiles " $pic_object" | ||
17051 | prev= | ||
17052 | continue | ||
17053 | else | ||
17054 | @@ -4487,7 +5343,7 @@ func_mode_link () | ||
17055 | # CHECK ME: I think I busted this. -Ossama | ||
17056 | if test "$prev" = dlprefiles; then | ||
17057 | # Preload the old-style object. | ||
17058 | - dlprefiles="$dlprefiles $pic_object" | ||
17059 | + func_append dlprefiles " $pic_object" | ||
17060 | prev= | ||
17061 | fi | ||
17062 | |||
17063 | @@ -4557,12 +5413,12 @@ func_mode_link () | ||
17064 | if test "$prev" = rpath; then | ||
17065 | case "$rpath " in | ||
17066 | *" $arg "*) ;; | ||
17067 | - *) rpath="$rpath $arg" ;; | ||
17068 | + *) func_append rpath " $arg" ;; | ||
17069 | esac | ||
17070 | else | ||
17071 | case "$xrpath " in | ||
17072 | *" $arg "*) ;; | ||
17073 | - *) xrpath="$xrpath $arg" ;; | ||
17074 | + *) func_append xrpath " $arg" ;; | ||
17075 | esac | ||
17076 | fi | ||
17077 | prev= | ||
17078 | @@ -4574,28 +5430,28 @@ func_mode_link () | ||
17079 | continue | ||
17080 | ;; | ||
17081 | weak) | ||
17082 | - weak_libs="$weak_libs $arg" | ||
17083 | + func_append weak_libs " $arg" | ||
17084 | prev= | ||
17085 | continue | ||
17086 | ;; | ||
17087 | xcclinker) | ||
17088 | - linker_flags="$linker_flags $qarg" | ||
17089 | - compiler_flags="$compiler_flags $qarg" | ||
17090 | + func_append linker_flags " $qarg" | ||
17091 | + func_append compiler_flags " $qarg" | ||
17092 | prev= | ||
17093 | func_append compile_command " $qarg" | ||
17094 | func_append finalize_command " $qarg" | ||
17095 | continue | ||
17096 | ;; | ||
17097 | xcompiler) | ||
17098 | - compiler_flags="$compiler_flags $qarg" | ||
17099 | + func_append compiler_flags " $qarg" | ||
17100 | prev= | ||
17101 | func_append compile_command " $qarg" | ||
17102 | func_append finalize_command " $qarg" | ||
17103 | continue | ||
17104 | ;; | ||
17105 | xlinker) | ||
17106 | - linker_flags="$linker_flags $qarg" | ||
17107 | - compiler_flags="$compiler_flags $wl$qarg" | ||
17108 | + func_append linker_flags " $qarg" | ||
17109 | + func_append compiler_flags " $wl$qarg" | ||
17110 | prev= | ||
17111 | func_append compile_command " $wl$qarg" | ||
17112 | func_append finalize_command " $wl$qarg" | ||
17113 | @@ -4686,15 +5542,16 @@ func_mode_link () | ||
17114 | ;; | ||
17115 | |||
17116 | -L*) | ||
17117 | - func_stripname '-L' '' "$arg" | ||
17118 | - dir=$func_stripname_result | ||
17119 | - if test -z "$dir"; then | ||
17120 | + func_stripname "-L" '' "$arg" | ||
17121 | + if test -z "$func_stripname_result"; then | ||
17122 | if test "$#" -gt 0; then | ||
17123 | func_fatal_error "require no space between \`-L' and \`$1'" | ||
17124 | else | ||
17125 | func_fatal_error "need path for \`-L' option" | ||
17126 | fi | ||
17127 | fi | ||
17128 | + func_resolve_sysroot "$func_stripname_result" | ||
17129 | + dir=$func_resolve_sysroot_result | ||
17130 | # We need an absolute path. | ||
17131 | case $dir in | ||
17132 | [\\/]* | [A-Za-z]:[\\/]*) ;; | ||
17133 | @@ -4706,10 +5563,16 @@ func_mode_link () | ||
17134 | ;; | ||
17135 | esac | ||
17136 | case "$deplibs " in | ||
17137 | - *" -L$dir "*) ;; | ||
17138 | + *" -L$dir "* | *" $arg "*) | ||
17139 | + # Will only happen for absolute or sysroot arguments | ||
17140 | + ;; | ||
17141 | *) | ||
17142 | - deplibs="$deplibs -L$dir" | ||
17143 | - lib_search_path="$lib_search_path $dir" | ||
17144 | + # Preserve sysroot, but never include relative directories | ||
17145 | + case $dir in | ||
17146 | + [\\/]* | [A-Za-z]:[\\/]* | =*) func_append deplibs " $arg" ;; | ||
17147 | + *) func_append deplibs " -L$dir" ;; | ||
17148 | + esac | ||
17149 | + func_append lib_search_path " $dir" | ||
17150 | ;; | ||
17151 | esac | ||
17152 | case $host in | ||
17153 | @@ -4718,12 +5581,12 @@ func_mode_link () | ||
17154 | case :$dllsearchpath: in | ||
17155 | *":$dir:"*) ;; | ||
17156 | ::) dllsearchpath=$dir;; | ||
17157 | - *) dllsearchpath="$dllsearchpath:$dir";; | ||
17158 | + *) func_append dllsearchpath ":$dir";; | ||
17159 | esac | ||
17160 | case :$dllsearchpath: in | ||
17161 | *":$testbindir:"*) ;; | ||
17162 | ::) dllsearchpath=$testbindir;; | ||
17163 | - *) dllsearchpath="$dllsearchpath:$testbindir";; | ||
17164 | + *) func_append dllsearchpath ":$testbindir";; | ||
17165 | esac | ||
17166 | ;; | ||
17167 | esac | ||
17168 | @@ -4747,7 +5610,7 @@ func_mode_link () | ||
17169 | ;; | ||
17170 | *-*-rhapsody* | *-*-darwin1.[012]) | ||
17171 | # Rhapsody C and math libraries are in the System framework | ||
17172 | - deplibs="$deplibs System.ltframework" | ||
17173 | + func_append deplibs " System.ltframework" | ||
17174 | continue | ||
17175 | ;; | ||
17176 | *-*-sco3.2v5* | *-*-sco5v6*) | ||
17177 | @@ -4758,9 +5621,6 @@ func_mode_link () | ||
17178 | # Compiler inserts libc in the correct place for threads to work | ||
17179 | test "X$arg" = "X-lc" && continue | ||
17180 | ;; | ||
17181 | - *-*-linux*) | ||
17182 | - test "X$arg" = "X-lc" && continue | ||
17183 | - ;; | ||
17184 | esac | ||
17185 | elif test "X$arg" = "X-lc_r"; then | ||
17186 | case $host in | ||
17187 | @@ -4770,7 +5630,7 @@ func_mode_link () | ||
17188 | ;; | ||
17189 | esac | ||
17190 | fi | ||
17191 | - deplibs="$deplibs $arg" | ||
17192 | + func_append deplibs " $arg" | ||
17193 | continue | ||
17194 | ;; | ||
17195 | |||
17196 | @@ -4782,8 +5642,8 @@ func_mode_link () | ||
17197 | # Tru64 UNIX uses -model [arg] to determine the layout of C++ | ||
17198 | # classes, name mangling, and exception handling. | ||
17199 | # Darwin uses the -arch flag to determine output architecture. | ||
17200 | - -model|-arch|-isysroot) | ||
17201 | - compiler_flags="$compiler_flags $arg" | ||
17202 | + -model|-arch|-isysroot|--sysroot) | ||
17203 | + func_append compiler_flags " $arg" | ||
17204 | func_append compile_command " $arg" | ||
17205 | func_append finalize_command " $arg" | ||
17206 | prev=xcompiler | ||
17207 | @@ -4791,12 +5651,12 @@ func_mode_link () | ||
17208 | ;; | ||
17209 | |||
17210 | -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads) | ||
17211 | - compiler_flags="$compiler_flags $arg" | ||
17212 | + func_append compiler_flags " $arg" | ||
17213 | func_append compile_command " $arg" | ||
17214 | func_append finalize_command " $arg" | ||
17215 | case "$new_inherited_linker_flags " in | ||
17216 | *" $arg "*) ;; | ||
17217 | - * ) new_inherited_linker_flags="$new_inherited_linker_flags $arg" ;; | ||
17218 | + * ) func_append new_inherited_linker_flags " $arg" ;; | ||
17219 | esac | ||
17220 | continue | ||
17221 | ;; | ||
17222 | @@ -4863,13 +5723,17 @@ func_mode_link () | ||
17223 | # We need an absolute path. | ||
17224 | case $dir in | ||
17225 | [\\/]* | [A-Za-z]:[\\/]*) ;; | ||
17226 | + =*) | ||
17227 | + func_stripname '=' '' "$dir" | ||
17228 | + dir=$lt_sysroot$func_stripname_result | ||
17229 | + ;; | ||
17230 | *) | ||
17231 | func_fatal_error "only absolute run-paths are allowed" | ||
17232 | ;; | ||
17233 | esac | ||
17234 | case "$xrpath " in | ||
17235 | *" $dir "*) ;; | ||
17236 | - *) xrpath="$xrpath $dir" ;; | ||
17237 | + *) func_append xrpath " $dir" ;; | ||
17238 | esac | ||
17239 | continue | ||
17240 | ;; | ||
17241 | @@ -4922,8 +5786,8 @@ func_mode_link () | ||
17242 | for flag in $args; do | ||
17243 | IFS="$save_ifs" | ||
17244 | func_quote_for_eval "$flag" | ||
17245 | - arg="$arg $func_quote_for_eval_result" | ||
17246 | - compiler_flags="$compiler_flags $func_quote_for_eval_result" | ||
17247 | + func_append arg " $func_quote_for_eval_result" | ||
17248 | + func_append compiler_flags " $func_quote_for_eval_result" | ||
17249 | done | ||
17250 | IFS="$save_ifs" | ||
17251 | func_stripname ' ' '' "$arg" | ||
17252 | @@ -4938,9 +5802,9 @@ func_mode_link () | ||
17253 | for flag in $args; do | ||
17254 | IFS="$save_ifs" | ||
17255 | func_quote_for_eval "$flag" | ||
17256 | - arg="$arg $wl$func_quote_for_eval_result" | ||
17257 | - compiler_flags="$compiler_flags $wl$func_quote_for_eval_result" | ||
17258 | - linker_flags="$linker_flags $func_quote_for_eval_result" | ||
17259 | + func_append arg " $wl$func_quote_for_eval_result" | ||
17260 | + func_append compiler_flags " $wl$func_quote_for_eval_result" | ||
17261 | + func_append linker_flags " $func_quote_for_eval_result" | ||
17262 | done | ||
17263 | IFS="$save_ifs" | ||
17264 | func_stripname ' ' '' "$arg" | ||
17265 | @@ -4968,24 +5832,27 @@ func_mode_link () | ||
17266 | arg="$func_quote_for_eval_result" | ||
17267 | ;; | ||
17268 | |||
17269 | - # -64, -mips[0-9] enable 64-bit mode on the SGI compiler | ||
17270 | - # -r[0-9][0-9]* specifies the processor on the SGI compiler | ||
17271 | - # -xarch=*, -xtarget=* enable 64-bit mode on the Sun compiler | ||
17272 | - # +DA*, +DD* enable 64-bit mode on the HP compiler | ||
17273 | - # -q* pass through compiler args for the IBM compiler | ||
17274 | - # -m*, -t[45]*, -txscale* pass through architecture-specific | ||
17275 | - # compiler args for GCC | ||
17276 | - # -F/path gives path to uninstalled frameworks, gcc on darwin | ||
17277 | - # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC | ||
17278 | - # @file GCC response files | ||
17279 | - # -tp=* Portland pgcc target processor selection | ||
17280 | + # Flags to be passed through unchanged, with rationale: | ||
17281 | + # -64, -mips[0-9] enable 64-bit mode for the SGI compiler | ||
17282 | + # -r[0-9][0-9]* specify processor for the SGI compiler | ||
17283 | + # -xarch=*, -xtarget=* enable 64-bit mode for the Sun compiler | ||
17284 | + # +DA*, +DD* enable 64-bit mode for the HP compiler | ||
17285 | + # -q* compiler args for the IBM compiler | ||
17286 | + # -m*, -t[45]*, -txscale* architecture-specific flags for GCC | ||
17287 | + # -F/path path to uninstalled frameworks, gcc on darwin | ||
17288 | + # -p, -pg, --coverage, -fprofile-* profiling flags for GCC | ||
17289 | + # @file GCC response files | ||
17290 | + # -tp=* Portland pgcc target processor selection | ||
17291 | + # --sysroot=* for sysroot support | ||
17292 | + # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization | ||
17293 | -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ | ||
17294 | - -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*) | ||
17295 | + -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \ | ||
17296 | + -O*|-flto*|-fwhopr*|-fuse-linker-plugin) | ||
17297 | func_quote_for_eval "$arg" | ||
17298 | arg="$func_quote_for_eval_result" | ||
17299 | func_append compile_command " $arg" | ||
17300 | func_append finalize_command " $arg" | ||
17301 | - compiler_flags="$compiler_flags $arg" | ||
17302 | + func_append compiler_flags " $arg" | ||
17303 | continue | ||
17304 | ;; | ||
17305 | |||
17306 | @@ -4997,7 +5864,7 @@ func_mode_link () | ||
17307 | |||
17308 | *.$objext) | ||
17309 | # A standard object. | ||
17310 | - objs="$objs $arg" | ||
17311 | + func_append objs " $arg" | ||
17312 | ;; | ||
17313 | |||
17314 | *.lo) | ||
17315 | @@ -5028,7 +5895,7 @@ func_mode_link () | ||
17316 | |||
17317 | if test "$prev" = dlfiles; then | ||
17318 | if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then | ||
17319 | - dlfiles="$dlfiles $pic_object" | ||
17320 | + func_append dlfiles " $pic_object" | ||
17321 | prev= | ||
17322 | continue | ||
17323 | else | ||
17324 | @@ -5040,7 +5907,7 @@ func_mode_link () | ||
17325 | # CHECK ME: I think I busted this. -Ossama | ||
17326 | if test "$prev" = dlprefiles; then | ||
17327 | # Preload the old-style object. | ||
17328 | - dlprefiles="$dlprefiles $pic_object" | ||
17329 | + func_append dlprefiles " $pic_object" | ||
17330 | prev= | ||
17331 | fi | ||
17332 | |||
17333 | @@ -5085,24 +5952,25 @@ func_mode_link () | ||
17334 | |||
17335 | *.$libext) | ||
17336 | # An archive. | ||
17337 | - deplibs="$deplibs $arg" | ||
17338 | - old_deplibs="$old_deplibs $arg" | ||
17339 | + func_append deplibs " $arg" | ||
17340 | + func_append old_deplibs " $arg" | ||
17341 | continue | ||
17342 | ;; | ||
17343 | |||
17344 | *.la) | ||
17345 | # A libtool-controlled library. | ||
17346 | |||
17347 | + func_resolve_sysroot "$arg" | ||
17348 | if test "$prev" = dlfiles; then | ||
17349 | # This library was specified with -dlopen. | ||
17350 | - dlfiles="$dlfiles $arg" | ||
17351 | + func_append dlfiles " $func_resolve_sysroot_result" | ||
17352 | prev= | ||
17353 | elif test "$prev" = dlprefiles; then | ||
17354 | # The library was specified with -dlpreopen. | ||
17355 | - dlprefiles="$dlprefiles $arg" | ||
17356 | + func_append dlprefiles " $func_resolve_sysroot_result" | ||
17357 | prev= | ||
17358 | else | ||
17359 | - deplibs="$deplibs $arg" | ||
17360 | + func_append deplibs " $func_resolve_sysroot_result" | ||
17361 | fi | ||
17362 | continue | ||
17363 | ;; | ||
17364 | @@ -5127,7 +5995,7 @@ func_mode_link () | ||
17365 | func_fatal_help "the \`$prevarg' option requires an argument" | ||
17366 | |||
17367 | if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then | ||
17368 | - eval "arg=\"$export_dynamic_flag_spec\"" | ||
17369 | + eval arg=\"$export_dynamic_flag_spec\" | ||
17370 | func_append compile_command " $arg" | ||
17371 | func_append finalize_command " $arg" | ||
17372 | fi | ||
17373 | @@ -5144,11 +6012,13 @@ func_mode_link () | ||
17374 | else | ||
17375 | shlib_search_path= | ||
17376 | fi | ||
17377 | - eval "sys_lib_search_path=\"$sys_lib_search_path_spec\"" | ||
17378 | - eval "sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\"" | ||
17379 | + eval sys_lib_search_path=\"$sys_lib_search_path_spec\" | ||
17380 | + eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\" | ||
17381 | |||
17382 | func_dirname "$output" "/" "" | ||
17383 | output_objdir="$func_dirname_result$objdir" | ||
17384 | + func_to_tool_file "$output_objdir/" | ||
17385 | + tool_output_objdir=$func_to_tool_file_result | ||
17386 | # Create the object directory. | ||
17387 | func_mkdir_p "$output_objdir" | ||
17388 | |||
17389 | @@ -5169,12 +6039,12 @@ func_mode_link () | ||
17390 | # Find all interdependent deplibs by searching for libraries | ||
17391 | # that are linked more than once (e.g. -la -lb -la) | ||
17392 | for deplib in $deplibs; do | ||
17393 | - if $opt_duplicate_deps ; then | ||
17394 | + if $opt_preserve_dup_deps ; then | ||
17395 | case "$libs " in | ||
17396 | - *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; | ||
17397 | + *" $deplib "*) func_append specialdeplibs " $deplib" ;; | ||
17398 | esac | ||
17399 | fi | ||
17400 | - libs="$libs $deplib" | ||
17401 | + func_append libs " $deplib" | ||
17402 | done | ||
17403 | |||
17404 | if test "$linkmode" = lib; then | ||
17405 | @@ -5187,9 +6057,9 @@ func_mode_link () | ||
17406 | if $opt_duplicate_compiler_generated_deps; then | ||
17407 | for pre_post_dep in $predeps $postdeps; do | ||
17408 | case "$pre_post_deps " in | ||
17409 | - *" $pre_post_dep "*) specialdeplibs="$specialdeplibs $pre_post_deps" ;; | ||
17410 | + *" $pre_post_dep "*) func_append specialdeplibs " $pre_post_deps" ;; | ||
17411 | esac | ||
17412 | - pre_post_deps="$pre_post_deps $pre_post_dep" | ||
17413 | + func_append pre_post_deps " $pre_post_dep" | ||
17414 | done | ||
17415 | fi | ||
17416 | pre_post_deps= | ||
17417 | @@ -5256,8 +6126,9 @@ func_mode_link () | ||
17418 | for lib in $dlprefiles; do | ||
17419 | # Ignore non-libtool-libs | ||
17420 | dependency_libs= | ||
17421 | + func_resolve_sysroot "$lib" | ||
17422 | case $lib in | ||
17423 | - *.la) func_source "$lib" ;; | ||
17424 | + *.la) func_source "$func_resolve_sysroot_result" ;; | ||
17425 | esac | ||
17426 | |||
17427 | # Collect preopened libtool deplibs, except any this library | ||
17428 | @@ -5267,7 +6138,7 @@ func_mode_link () | ||
17429 | deplib_base=$func_basename_result | ||
17430 | case " $weak_libs " in | ||
17431 | *" $deplib_base "*) ;; | ||
17432 | - *) deplibs="$deplibs $deplib" ;; | ||
17433 | + *) func_append deplibs " $deplib" ;; | ||
17434 | esac | ||
17435 | done | ||
17436 | done | ||
17437 | @@ -5288,11 +6159,11 @@ func_mode_link () | ||
17438 | compile_deplibs="$deplib $compile_deplibs" | ||
17439 | finalize_deplibs="$deplib $finalize_deplibs" | ||
17440 | else | ||
17441 | - compiler_flags="$compiler_flags $deplib" | ||
17442 | + func_append compiler_flags " $deplib" | ||
17443 | if test "$linkmode" = lib ; then | ||
17444 | case "$new_inherited_linker_flags " in | ||
17445 | *" $deplib "*) ;; | ||
17446 | - * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;; | ||
17447 | + * ) func_append new_inherited_linker_flags " $deplib" ;; | ||
17448 | esac | ||
17449 | fi | ||
17450 | fi | ||
17451 | @@ -5377,7 +6248,7 @@ func_mode_link () | ||
17452 | if test "$linkmode" = lib ; then | ||
17453 | case "$new_inherited_linker_flags " in | ||
17454 | *" $deplib "*) ;; | ||
17455 | - * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;; | ||
17456 | + * ) func_append new_inherited_linker_flags " $deplib" ;; | ||
17457 | esac | ||
17458 | fi | ||
17459 | fi | ||
17460 | @@ -5390,7 +6261,8 @@ func_mode_link () | ||
17461 | test "$pass" = conv && continue | ||
17462 | newdependency_libs="$deplib $newdependency_libs" | ||
17463 | func_stripname '-L' '' "$deplib" | ||
17464 | - newlib_search_path="$newlib_search_path $func_stripname_result" | ||
17465 | + func_resolve_sysroot "$func_stripname_result" | ||
17466 | + func_append newlib_search_path " $func_resolve_sysroot_result" | ||
17467 | ;; | ||
17468 | prog) | ||
17469 | if test "$pass" = conv; then | ||
17470 | @@ -5404,7 +6276,8 @@ func_mode_link () | ||
17471 | finalize_deplibs="$deplib $finalize_deplibs" | ||
17472 | fi | ||
17473 | func_stripname '-L' '' "$deplib" | ||
17474 | - newlib_search_path="$newlib_search_path $func_stripname_result" | ||
17475 | + func_resolve_sysroot "$func_stripname_result" | ||
17476 | + func_append newlib_search_path " $func_resolve_sysroot_result" | ||
17477 | ;; | ||
17478 | *) | ||
17479 | func_warning "\`-L' is ignored for archives/objects" | ||
17480 | @@ -5415,17 +6288,21 @@ func_mode_link () | ||
17481 | -R*) | ||
17482 | if test "$pass" = link; then | ||
17483 | func_stripname '-R' '' "$deplib" | ||
17484 | - dir=$func_stripname_result | ||
17485 | + func_resolve_sysroot "$func_stripname_result" | ||
17486 | + dir=$func_resolve_sysroot_result | ||
17487 | # Make sure the xrpath contains only unique directories. | ||
17488 | case "$xrpath " in | ||
17489 | *" $dir "*) ;; | ||
17490 | - *) xrpath="$xrpath $dir" ;; | ||
17491 | + *) func_append xrpath " $dir" ;; | ||
17492 | esac | ||
17493 | fi | ||
17494 | deplibs="$deplib $deplibs" | ||
17495 | continue | ||
17496 | ;; | ||
17497 | - *.la) lib="$deplib" ;; | ||
17498 | + *.la) | ||
17499 | + func_resolve_sysroot "$deplib" | ||
17500 | + lib=$func_resolve_sysroot_result | ||
17501 | + ;; | ||
17502 | *.$libext) | ||
17503 | if test "$pass" = conv; then | ||
17504 | deplibs="$deplib $deplibs" | ||
17505 | @@ -5488,11 +6365,11 @@ func_mode_link () | ||
17506 | if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then | ||
17507 | # If there is no dlopen support or we're linking statically, | ||
17508 | # we need to preload. | ||
17509 | - newdlprefiles="$newdlprefiles $deplib" | ||
17510 | + func_append newdlprefiles " $deplib" | ||
17511 | compile_deplibs="$deplib $compile_deplibs" | ||
17512 | finalize_deplibs="$deplib $finalize_deplibs" | ||
17513 | else | ||
17514 | - newdlfiles="$newdlfiles $deplib" | ||
17515 | + func_append newdlfiles " $deplib" | ||
17516 | fi | ||
17517 | fi | ||
17518 | continue | ||
17519 | @@ -5538,7 +6415,7 @@ func_mode_link () | ||
17520 | for tmp_inherited_linker_flag in $tmp_inherited_linker_flags; do | ||
17521 | case " $new_inherited_linker_flags " in | ||
17522 | *" $tmp_inherited_linker_flag "*) ;; | ||
17523 | - *) new_inherited_linker_flags="$new_inherited_linker_flags $tmp_inherited_linker_flag";; | ||
17524 | + *) func_append new_inherited_linker_flags " $tmp_inherited_linker_flag";; | ||
17525 | esac | ||
17526 | done | ||
17527 | fi | ||
17528 | @@ -5546,8 +6423,8 @@ func_mode_link () | ||
17529 | if test "$linkmode,$pass" = "lib,link" || | ||
17530 | test "$linkmode,$pass" = "prog,scan" || | ||
17531 | { test "$linkmode" != prog && test "$linkmode" != lib; }; then | ||
17532 | - test -n "$dlopen" && dlfiles="$dlfiles $dlopen" | ||
17533 | - test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen" | ||
17534 | + test -n "$dlopen" && func_append dlfiles " $dlopen" | ||
17535 | + test -n "$dlpreopen" && func_append dlprefiles " $dlpreopen" | ||
17536 | fi | ||
17537 | |||
17538 | if test "$pass" = conv; then | ||
17539 | @@ -5558,20 +6435,20 @@ func_mode_link () | ||
17540 | func_fatal_error "cannot find name of link library for \`$lib'" | ||
17541 | fi | ||
17542 | # It is a libtool convenience library, so add in its objects. | ||
17543 | - convenience="$convenience $ladir/$objdir/$old_library" | ||
17544 | - old_convenience="$old_convenience $ladir/$objdir/$old_library" | ||
17545 | + func_append convenience " $ladir/$objdir/$old_library" | ||
17546 | + func_append old_convenience " $ladir/$objdir/$old_library" | ||
17547 | elif test "$linkmode" != prog && test "$linkmode" != lib; then | ||
17548 | func_fatal_error "\`$lib' is not a convenience library" | ||
17549 | fi | ||
17550 | tmp_libs= | ||
17551 | for deplib in $dependency_libs; do | ||
17552 | deplibs="$deplib $deplibs" | ||
17553 | - if $opt_duplicate_deps ; then | ||
17554 | + if $opt_preserve_dup_deps ; then | ||
17555 | case "$tmp_libs " in | ||
17556 | - *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; | ||
17557 | + *" $deplib "*) func_append specialdeplibs " $deplib" ;; | ||
17558 | esac | ||
17559 | fi | ||
17560 | - tmp_libs="$tmp_libs $deplib" | ||
17561 | + func_append tmp_libs " $deplib" | ||
17562 | done | ||
17563 | continue | ||
17564 | fi # $pass = conv | ||
17565 | @@ -5579,9 +6456,15 @@ func_mode_link () | ||
17566 | |||
17567 | # Get the name of the library we link against. | ||
17568 | linklib= | ||
17569 | - for l in $old_library $library_names; do | ||
17570 | - linklib="$l" | ||
17571 | - done | ||
17572 | + if test -n "$old_library" && | ||
17573 | + { test "$prefer_static_libs" = yes || | ||
17574 | + test "$prefer_static_libs,$installed" = "built,no"; }; then | ||
17575 | + linklib=$old_library | ||
17576 | + else | ||
17577 | + for l in $old_library $library_names; do | ||
17578 | + linklib="$l" | ||
17579 | + done | ||
17580 | + fi | ||
17581 | if test -z "$linklib"; then | ||
17582 | func_fatal_error "cannot find name of link library for \`$lib'" | ||
17583 | fi | ||
17584 | @@ -5598,9 +6481,9 @@ func_mode_link () | ||
17585 | # statically, we need to preload. We also need to preload any | ||
17586 | # dependent libraries so libltdl's deplib preloader doesn't | ||
17587 | # bomb out in the load deplibs phase. | ||
17588 | - dlprefiles="$dlprefiles $lib $dependency_libs" | ||
17589 | + func_append dlprefiles " $lib $dependency_libs" | ||
17590 | else | ||
17591 | - newdlfiles="$newdlfiles $lib" | ||
17592 | + func_append newdlfiles " $lib" | ||
17593 | fi | ||
17594 | continue | ||
17595 | fi # $pass = dlopen | ||
17596 | @@ -5622,14 +6505,14 @@ func_mode_link () | ||
17597 | |||
17598 | # Find the relevant object directory and library name. | ||
17599 | if test "X$installed" = Xyes; then | ||
17600 | - if test ! -f "$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then | ||
17601 | + if test ! -f "$lt_sysroot$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then | ||
17602 | func_warning "library \`$lib' was moved." | ||
17603 | dir="$ladir" | ||
17604 | absdir="$abs_ladir" | ||
17605 | libdir="$abs_ladir" | ||
17606 | else | ||
17607 | - dir="$libdir" | ||
17608 | - absdir="$libdir" | ||
17609 | + dir="$lt_sysroot$libdir" | ||
17610 | + absdir="$lt_sysroot$libdir" | ||
17611 | fi | ||
17612 | test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes | ||
17613 | else | ||
17614 | @@ -5637,12 +6520,12 @@ func_mode_link () | ||
17615 | dir="$ladir" | ||
17616 | absdir="$abs_ladir" | ||
17617 | # Remove this search path later | ||
17618 | - notinst_path="$notinst_path $abs_ladir" | ||
17619 | + func_append notinst_path " $abs_ladir" | ||
17620 | else | ||
17621 | dir="$ladir/$objdir" | ||
17622 | absdir="$abs_ladir/$objdir" | ||
17623 | # Remove this search path later | ||
17624 | - notinst_path="$notinst_path $abs_ladir" | ||
17625 | + func_append notinst_path " $abs_ladir" | ||
17626 | fi | ||
17627 | fi # $installed = yes | ||
17628 | func_stripname 'lib' '.la' "$laname" | ||
17629 | @@ -5653,20 +6536,46 @@ func_mode_link () | ||
17630 | if test -z "$libdir" && test "$linkmode" = prog; then | ||
17631 | func_fatal_error "only libraries may -dlpreopen a convenience library: \`$lib'" | ||
17632 | fi | ||
17633 | - # Prefer using a static library (so that no silly _DYNAMIC symbols | ||
17634 | - # are required to link). | ||
17635 | - if test -n "$old_library"; then | ||
17636 | - newdlprefiles="$newdlprefiles $dir/$old_library" | ||
17637 | - # Keep a list of preopened convenience libraries to check | ||
17638 | - # that they are being used correctly in the link pass. | ||
17639 | - test -z "$libdir" && \ | ||
17640 | - dlpreconveniencelibs="$dlpreconveniencelibs $dir/$old_library" | ||
17641 | - # Otherwise, use the dlname, so that lt_dlopen finds it. | ||
17642 | - elif test -n "$dlname"; then | ||
17643 | - newdlprefiles="$newdlprefiles $dir/$dlname" | ||
17644 | - else | ||
17645 | - newdlprefiles="$newdlprefiles $dir/$linklib" | ||
17646 | - fi | ||
17647 | + case "$host" in | ||
17648 | + # special handling for platforms with PE-DLLs. | ||
17649 | + *cygwin* | *mingw* | *cegcc* ) | ||
17650 | + # Linker will automatically link against shared library if both | ||
17651 | + # static and shared are present. Therefore, ensure we extract | ||
17652 | + # symbols from the import library if a shared library is present | ||
17653 | + # (otherwise, the dlopen module name will be incorrect). We do | ||
17654 | + # this by putting the import library name into $newdlprefiles. | ||
17655 | + # We recover the dlopen module name by 'saving' the la file | ||
17656 | + # name in a special purpose variable, and (later) extracting the | ||
17657 | + # dlname from the la file. | ||
17658 | + if test -n "$dlname"; then | ||
17659 | + func_tr_sh "$dir/$linklib" | ||
17660 | + eval "libfile_$func_tr_sh_result=\$abs_ladir/\$laname" | ||
17661 | + func_append newdlprefiles " $dir/$linklib" | ||
17662 | + else | ||
17663 | + func_append newdlprefiles " $dir/$old_library" | ||
17664 | + # Keep a list of preopened convenience libraries to check | ||
17665 | + # that they are being used correctly in the link pass. | ||
17666 | + test -z "$libdir" && \ | ||
17667 | + func_append dlpreconveniencelibs " $dir/$old_library" | ||
17668 | + fi | ||
17669 | + ;; | ||
17670 | + * ) | ||
17671 | + # Prefer using a static library (so that no silly _DYNAMIC symbols | ||
17672 | + # are required to link). | ||
17673 | + if test -n "$old_library"; then | ||
17674 | + func_append newdlprefiles " $dir/$old_library" | ||
17675 | + # Keep a list of preopened convenience libraries to check | ||
17676 | + # that they are being used correctly in the link pass. | ||
17677 | + test -z "$libdir" && \ | ||
17678 | + func_append dlpreconveniencelibs " $dir/$old_library" | ||
17679 | + # Otherwise, use the dlname, so that lt_dlopen finds it. | ||
17680 | + elif test -n "$dlname"; then | ||
17681 | + func_append newdlprefiles " $dir/$dlname" | ||
17682 | + else | ||
17683 | + func_append newdlprefiles " $dir/$linklib" | ||
17684 | + fi | ||
17685 | + ;; | ||
17686 | + esac | ||
17687 | fi # $pass = dlpreopen | ||
17688 | |||
17689 | if test -z "$libdir"; then | ||
17690 | @@ -5684,7 +6593,7 @@ func_mode_link () | ||
17691 | |||
17692 | |||
17693 | if test "$linkmode" = prog && test "$pass" != link; then | ||
17694 | - newlib_search_path="$newlib_search_path $ladir" | ||
17695 | + func_append newlib_search_path " $ladir" | ||
17696 | deplibs="$lib $deplibs" | ||
17697 | |||
17698 | linkalldeplibs=no | ||
17699 | @@ -5697,7 +6606,8 @@ func_mode_link () | ||
17700 | for deplib in $dependency_libs; do | ||
17701 | case $deplib in | ||
17702 | -L*) func_stripname '-L' '' "$deplib" | ||
17703 | - newlib_search_path="$newlib_search_path $func_stripname_result" | ||
17704 | + func_resolve_sysroot "$func_stripname_result" | ||
17705 | + func_append newlib_search_path " $func_resolve_sysroot_result" | ||
17706 | ;; | ||
17707 | esac | ||
17708 | # Need to link against all dependency_libs? | ||
17709 | @@ -5708,12 +6618,12 @@ func_mode_link () | ||
17710 | # or/and link against static libraries | ||
17711 | newdependency_libs="$deplib $newdependency_libs" | ||
17712 | fi | ||
17713 | - if $opt_duplicate_deps ; then | ||
17714 | + if $opt_preserve_dup_deps ; then | ||
17715 | case "$tmp_libs " in | ||
17716 | - *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; | ||
17717 | + *" $deplib "*) func_append specialdeplibs " $deplib" ;; | ||
17718 | esac | ||
17719 | fi | ||
17720 | - tmp_libs="$tmp_libs $deplib" | ||
17721 | + func_append tmp_libs " $deplib" | ||
17722 | done # for deplib | ||
17723 | continue | ||
17724 | fi # $linkmode = prog... | ||
17725 | @@ -5728,7 +6638,7 @@ func_mode_link () | ||
17726 | # Make sure the rpath contains only unique directories. | ||
17727 | case "$temp_rpath:" in | ||
17728 | *"$absdir:"*) ;; | ||
17729 | - *) temp_rpath="$temp_rpath$absdir:" ;; | ||
17730 | + *) func_append temp_rpath "$absdir:" ;; | ||
17731 | esac | ||
17732 | fi | ||
17733 | |||
17734 | @@ -5740,7 +6650,7 @@ func_mode_link () | ||
17735 | *) | ||
17736 | case "$compile_rpath " in | ||
17737 | *" $absdir "*) ;; | ||
17738 | - *) compile_rpath="$compile_rpath $absdir" | ||
17739 | + *) func_append compile_rpath " $absdir" ;; | ||
17740 | esac | ||
17741 | ;; | ||
17742 | esac | ||
17743 | @@ -5749,7 +6659,7 @@ func_mode_link () | ||
17744 | *) | ||
17745 | case "$finalize_rpath " in | ||
17746 | *" $libdir "*) ;; | ||
17747 | - *) finalize_rpath="$finalize_rpath $libdir" | ||
17748 | + *) func_append finalize_rpath " $libdir" ;; | ||
17749 | esac | ||
17750 | ;; | ||
17751 | esac | ||
17752 | @@ -5774,12 +6684,12 @@ func_mode_link () | ||
17753 | case $host in | ||
17754 | *cygwin* | *mingw* | *cegcc*) | ||
17755 | # No point in relinking DLLs because paths are not encoded | ||
17756 | - notinst_deplibs="$notinst_deplibs $lib" | ||
17757 | + func_append notinst_deplibs " $lib" | ||
17758 | need_relink=no | ||
17759 | ;; | ||
17760 | *) | ||
17761 | if test "$installed" = no; then | ||
17762 | - notinst_deplibs="$notinst_deplibs $lib" | ||
17763 | + func_append notinst_deplibs " $lib" | ||
17764 | need_relink=yes | ||
17765 | fi | ||
17766 | ;; | ||
17767 | @@ -5814,7 +6724,7 @@ func_mode_link () | ||
17768 | *) | ||
17769 | case "$compile_rpath " in | ||
17770 | *" $absdir "*) ;; | ||
17771 | - *) compile_rpath="$compile_rpath $absdir" | ||
17772 | + *) func_append compile_rpath " $absdir" ;; | ||
17773 | esac | ||
17774 | ;; | ||
17775 | esac | ||
17776 | @@ -5823,7 +6733,7 @@ func_mode_link () | ||
17777 | *) | ||
17778 | case "$finalize_rpath " in | ||
17779 | *" $libdir "*) ;; | ||
17780 | - *) finalize_rpath="$finalize_rpath $libdir" | ||
17781 | + *) func_append finalize_rpath " $libdir" ;; | ||
17782 | esac | ||
17783 | ;; | ||
17784 | esac | ||
17785 | @@ -5835,7 +6745,7 @@ func_mode_link () | ||
17786 | shift | ||
17787 | realname="$1" | ||
17788 | shift | ||
17789 | - eval "libname=\"$libname_spec\"" | ||
17790 | + libname=`eval "\\$ECHO \"$libname_spec\""` | ||
17791 | # use dlname if we got it. it's perfectly good, no? | ||
17792 | if test -n "$dlname"; then | ||
17793 | soname="$dlname" | ||
17794 | @@ -5848,7 +6758,7 @@ func_mode_link () | ||
17795 | versuffix="-$major" | ||
17796 | ;; | ||
17797 | esac | ||
17798 | - eval "soname=\"$soname_spec\"" | ||
17799 | + eval soname=\"$soname_spec\" | ||
17800 | else | ||
17801 | soname="$realname" | ||
17802 | fi | ||
17803 | @@ -5877,7 +6787,7 @@ func_mode_link () | ||
17804 | linklib=$newlib | ||
17805 | fi # test -n "$old_archive_from_expsyms_cmds" | ||
17806 | |||
17807 | - if test "$linkmode" = prog || test "$mode" != relink; then | ||
17808 | + if test "$linkmode" = prog || test "$opt_mode" != relink; then | ||
17809 | add_shlibpath= | ||
17810 | add_dir= | ||
17811 | add= | ||
17812 | @@ -5933,7 +6843,7 @@ func_mode_link () | ||
17813 | if test -n "$inst_prefix_dir"; then | ||
17814 | case $libdir in | ||
17815 | [\\/]*) | ||
17816 | - add_dir="$add_dir -L$inst_prefix_dir$libdir" | ||
17817 | + func_append add_dir " -L$inst_prefix_dir$libdir" | ||
17818 | ;; | ||
17819 | esac | ||
17820 | fi | ||
17821 | @@ -5955,7 +6865,7 @@ func_mode_link () | ||
17822 | if test -n "$add_shlibpath"; then | ||
17823 | case :$compile_shlibpath: in | ||
17824 | *":$add_shlibpath:"*) ;; | ||
17825 | - *) compile_shlibpath="$compile_shlibpath$add_shlibpath:" ;; | ||
17826 | + *) func_append compile_shlibpath "$add_shlibpath:" ;; | ||
17827 | esac | ||
17828 | fi | ||
17829 | if test "$linkmode" = prog; then | ||
17830 | @@ -5969,13 +6879,13 @@ func_mode_link () | ||
17831 | test "$hardcode_shlibpath_var" = yes; then | ||
17832 | case :$finalize_shlibpath: in | ||
17833 | *":$libdir:"*) ;; | ||
17834 | - *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;; | ||
17835 | + *) func_append finalize_shlibpath "$libdir:" ;; | ||
17836 | esac | ||
17837 | fi | ||
17838 | fi | ||
17839 | fi | ||
17840 | |||
17841 | - if test "$linkmode" = prog || test "$mode" = relink; then | ||
17842 | + if test "$linkmode" = prog || test "$opt_mode" = relink; then | ||
17843 | add_shlibpath= | ||
17844 | add_dir= | ||
17845 | add= | ||
17846 | @@ -5989,7 +6899,7 @@ func_mode_link () | ||
17847 | elif test "$hardcode_shlibpath_var" = yes; then | ||
17848 | case :$finalize_shlibpath: in | ||
17849 | *":$libdir:"*) ;; | ||
17850 | - *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;; | ||
17851 | + *) func_append finalize_shlibpath "$libdir:" ;; | ||
17852 | esac | ||
17853 | add="-l$name" | ||
17854 | elif test "$hardcode_automatic" = yes; then | ||
17855 | @@ -6001,12 +6911,12 @@ func_mode_link () | ||
17856 | fi | ||
17857 | else | ||
17858 | # We cannot seem to hardcode it, guess we'll fake it. | ||
17859 | - add_dir="-L$libdir" | ||
17860 | + add_dir="-L$lt_sysroot$libdir" | ||
17861 | # Try looking first in the location we're being installed to. | ||
17862 | if test -n "$inst_prefix_dir"; then | ||
17863 | case $libdir in | ||
17864 | [\\/]*) | ||
17865 | - add_dir="$add_dir -L$inst_prefix_dir$libdir" | ||
17866 | + func_append add_dir " -L$inst_prefix_dir$libdir" | ||
17867 | ;; | ||
17868 | esac | ||
17869 | fi | ||
17870 | @@ -6083,27 +6993,33 @@ func_mode_link () | ||
17871 | temp_xrpath=$func_stripname_result | ||
17872 | case " $xrpath " in | ||
17873 | *" $temp_xrpath "*) ;; | ||
17874 | - *) xrpath="$xrpath $temp_xrpath";; | ||
17875 | + *) func_append xrpath " $temp_xrpath";; | ||
17876 | esac;; | ||
17877 | - *) temp_deplibs="$temp_deplibs $libdir";; | ||
17878 | + *) func_append temp_deplibs " $libdir";; | ||
17879 | esac | ||
17880 | done | ||
17881 | dependency_libs="$temp_deplibs" | ||
17882 | fi | ||
17883 | |||
17884 | - newlib_search_path="$newlib_search_path $absdir" | ||
17885 | + func_append newlib_search_path " $absdir" | ||
17886 | # Link against this library | ||
17887 | test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs" | ||
17888 | # ... and its dependency_libs | ||
17889 | tmp_libs= | ||
17890 | for deplib in $dependency_libs; do | ||
17891 | newdependency_libs="$deplib $newdependency_libs" | ||
17892 | - if $opt_duplicate_deps ; then | ||
17893 | + case $deplib in | ||
17894 | + -L*) func_stripname '-L' '' "$deplib" | ||
17895 | + func_resolve_sysroot "$func_stripname_result";; | ||
17896 | + *) func_resolve_sysroot "$deplib" ;; | ||
17897 | + esac | ||
17898 | + if $opt_preserve_dup_deps ; then | ||
17899 | case "$tmp_libs " in | ||
17900 | - *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; | ||
17901 | + *" $func_resolve_sysroot_result "*) | ||
17902 | + func_append specialdeplibs " $func_resolve_sysroot_result" ;; | ||
17903 | esac | ||
17904 | fi | ||
17905 | - tmp_libs="$tmp_libs $deplib" | ||
17906 | + func_append tmp_libs " $func_resolve_sysroot_result" | ||
17907 | done | ||
17908 | |||
17909 | if test "$link_all_deplibs" != no; then | ||
17910 | @@ -6113,8 +7029,10 @@ func_mode_link () | ||
17911 | case $deplib in | ||
17912 | -L*) path="$deplib" ;; | ||
17913 | *.la) | ||
17914 | + func_resolve_sysroot "$deplib" | ||
17915 | + deplib=$func_resolve_sysroot_result | ||
17916 | func_dirname "$deplib" "" "." | ||
17917 | - dir="$func_dirname_result" | ||
17918 | + dir=$func_dirname_result | ||
17919 | # We need an absolute path. | ||
17920 | case $dir in | ||
17921 | [\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;; | ||
17922 | @@ -6130,7 +7048,7 @@ func_mode_link () | ||
17923 | case $host in | ||
17924 | *-*-darwin*) | ||
17925 | depdepl= | ||
17926 | - deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib` | ||
17927 | + eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib` | ||
17928 | if test -n "$deplibrary_names" ; then | ||
17929 | for tmp in $deplibrary_names ; do | ||
17930 | depdepl=$tmp | ||
17931 | @@ -6141,8 +7059,8 @@ func_mode_link () | ||
17932 | if test -z "$darwin_install_name"; then | ||
17933 | darwin_install_name=`${OTOOL64} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'` | ||
17934 | fi | ||
17935 | - compiler_flags="$compiler_flags ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}" | ||
17936 | - linker_flags="$linker_flags -dylib_file ${darwin_install_name}:${depdepl}" | ||
17937 | + func_append compiler_flags " ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}" | ||
17938 | + func_append linker_flags " -dylib_file ${darwin_install_name}:${depdepl}" | ||
17939 | path= | ||
17940 | fi | ||
17941 | fi | ||
17942 | @@ -6152,7 +7070,7 @@ func_mode_link () | ||
17943 | ;; | ||
17944 | esac | ||
17945 | else | ||
17946 | - libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` | ||
17947 | + eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` | ||
17948 | test -z "$libdir" && \ | ||
17949 | func_fatal_error "\`$deplib' is not a valid libtool archive" | ||
17950 | test "$absdir" != "$libdir" && \ | ||
17951 | @@ -6192,7 +7110,7 @@ func_mode_link () | ||
17952 | for dir in $newlib_search_path; do | ||
17953 | case "$lib_search_path " in | ||
17954 | *" $dir "*) ;; | ||
17955 | - *) lib_search_path="$lib_search_path $dir" ;; | ||
17956 | + *) func_append lib_search_path " $dir" ;; | ||
17957 | esac | ||
17958 | done | ||
17959 | newlib_search_path= | ||
17960 | @@ -6205,7 +7123,7 @@ func_mode_link () | ||
17961 | fi | ||
17962 | for var in $vars dependency_libs; do | ||
17963 | # Add libraries to $var in reverse order | ||
17964 | - eval tmp_libs=\$$var | ||
17965 | + eval tmp_libs=\"\$$var\" | ||
17966 | new_libs= | ||
17967 | for deplib in $tmp_libs; do | ||
17968 | # FIXME: Pedantically, this is the right thing to do, so | ||
17969 | @@ -6250,13 +7168,13 @@ func_mode_link () | ||
17970 | -L*) | ||
17971 | case " $tmp_libs " in | ||
17972 | *" $deplib "*) ;; | ||
17973 | - *) tmp_libs="$tmp_libs $deplib" ;; | ||
17974 | + *) func_append tmp_libs " $deplib" ;; | ||
17975 | esac | ||
17976 | ;; | ||
17977 | - *) tmp_libs="$tmp_libs $deplib" ;; | ||
17978 | + *) func_append tmp_libs " $deplib" ;; | ||
17979 | esac | ||
17980 | done | ||
17981 | - eval $var=\$tmp_libs | ||
17982 | + eval $var=\"$tmp_libs\" | ||
17983 | done # for var | ||
17984 | fi | ||
17985 | # Last step: remove runtime libs from dependency_libs | ||
17986 | @@ -6269,7 +7187,7 @@ func_mode_link () | ||
17987 | ;; | ||
17988 | esac | ||
17989 | if test -n "$i" ; then | ||
17990 | - tmp_libs="$tmp_libs $i" | ||
17991 | + func_append tmp_libs " $i" | ||
17992 | fi | ||
17993 | done | ||
17994 | dependency_libs=$tmp_libs | ||
17995 | @@ -6310,7 +7228,7 @@ func_mode_link () | ||
17996 | # Now set the variables for building old libraries. | ||
17997 | build_libtool_libs=no | ||
17998 | oldlibs="$output" | ||
17999 | - objs="$objs$old_deplibs" | ||
18000 | + func_append objs "$old_deplibs" | ||
18001 | ;; | ||
18002 | |||
18003 | lib) | ||
18004 | @@ -6319,8 +7237,8 @@ func_mode_link () | ||
18005 | lib*) | ||
18006 | func_stripname 'lib' '.la' "$outputname" | ||
18007 | name=$func_stripname_result | ||
18008 | - eval "shared_ext=\"$shrext_cmds\"" | ||
18009 | - eval "libname=\"$libname_spec\"" | ||
18010 | + eval shared_ext=\"$shrext_cmds\" | ||
18011 | + eval libname=\"$libname_spec\" | ||
18012 | ;; | ||
18013 | *) | ||
18014 | test "$module" = no && \ | ||
18015 | @@ -6330,8 +7248,8 @@ func_mode_link () | ||
18016 | # Add the "lib" prefix for modules if required | ||
18017 | func_stripname '' '.la' "$outputname" | ||
18018 | name=$func_stripname_result | ||
18019 | - eval "shared_ext=\"$shrext_cmds\"" | ||
18020 | - eval "libname=\"$libname_spec\"" | ||
18021 | + eval shared_ext=\"$shrext_cmds\" | ||
18022 | + eval libname=\"$libname_spec\" | ||
18023 | else | ||
18024 | func_stripname '' '.la' "$outputname" | ||
18025 | libname=$func_stripname_result | ||
18026 | @@ -6346,7 +7264,7 @@ func_mode_link () | ||
18027 | echo | ||
18028 | $ECHO "*** Warning: Linking the shared library $output against the non-libtool" | ||
18029 | $ECHO "*** objects $objs is not portable!" | ||
18030 | - libobjs="$libobjs $objs" | ||
18031 | + func_append libobjs " $objs" | ||
18032 | fi | ||
18033 | fi | ||
18034 | |||
18035 | @@ -6544,7 +7462,7 @@ func_mode_link () | ||
18036 | done | ||
18037 | |||
18038 | # Make executables depend on our current version. | ||
18039 | - verstring="$verstring:${current}.0" | ||
18040 | + func_append verstring ":${current}.0" | ||
18041 | ;; | ||
18042 | |||
18043 | qnx) | ||
18044 | @@ -6612,10 +7530,10 @@ func_mode_link () | ||
18045 | fi | ||
18046 | |||
18047 | func_generate_dlsyms "$libname" "$libname" "yes" | ||
18048 | - libobjs="$libobjs $symfileobj" | ||
18049 | + func_append libobjs " $symfileobj" | ||
18050 | test "X$libobjs" = "X " && libobjs= | ||
18051 | |||
18052 | - if test "$mode" != relink; then | ||
18053 | + if test "$opt_mode" != relink; then | ||
18054 | # Remove our outputs, but don't remove object files since they | ||
18055 | # may have been created when compiling PIC objects. | ||
18056 | removelist= | ||
18057 | @@ -6631,7 +7549,7 @@ func_mode_link () | ||
18058 | continue | ||
18059 | fi | ||
18060 | fi | ||
18061 | - removelist="$removelist $p" | ||
18062 | + func_append removelist " $p" | ||
18063 | ;; | ||
18064 | *) ;; | ||
18065 | esac | ||
18066 | @@ -6642,7 +7560,7 @@ func_mode_link () | ||
18067 | |||
18068 | # Now set the variables for building old libraries. | ||
18069 | if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then | ||
18070 | - oldlibs="$oldlibs $output_objdir/$libname.$libext" | ||
18071 | + func_append oldlibs " $output_objdir/$libname.$libext" | ||
18072 | |||
18073 | # Transform .lo files to .o files. | ||
18074 | oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; $lo2o" | $NL2SP` | ||
18075 | @@ -6659,10 +7577,11 @@ func_mode_link () | ||
18076 | # If the user specified any rpath flags, then add them. | ||
18077 | temp_xrpath= | ||
18078 | for libdir in $xrpath; do | ||
18079 | - temp_xrpath="$temp_xrpath -R$libdir" | ||
18080 | + func_replace_sysroot "$libdir" | ||
18081 | + func_append temp_xrpath " -R$func_replace_sysroot_result" | ||
18082 | case "$finalize_rpath " in | ||
18083 | *" $libdir "*) ;; | ||
18084 | - *) finalize_rpath="$finalize_rpath $libdir" ;; | ||
18085 | + *) func_append finalize_rpath " $libdir" ;; | ||
18086 | esac | ||
18087 | done | ||
18088 | if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then | ||
18089 | @@ -6676,7 +7595,7 @@ func_mode_link () | ||
18090 | for lib in $old_dlfiles; do | ||
18091 | case " $dlprefiles $dlfiles " in | ||
18092 | *" $lib "*) ;; | ||
18093 | - *) dlfiles="$dlfiles $lib" ;; | ||
18094 | + *) func_append dlfiles " $lib" ;; | ||
18095 | esac | ||
18096 | done | ||
18097 | |||
18098 | @@ -6686,7 +7605,7 @@ func_mode_link () | ||
18099 | for lib in $old_dlprefiles; do | ||
18100 | case "$dlprefiles " in | ||
18101 | *" $lib "*) ;; | ||
18102 | - *) dlprefiles="$dlprefiles $lib" ;; | ||
18103 | + *) func_append dlprefiles " $lib" ;; | ||
18104 | esac | ||
18105 | done | ||
18106 | |||
18107 | @@ -6698,7 +7617,7 @@ func_mode_link () | ||
18108 | ;; | ||
18109 | *-*-rhapsody* | *-*-darwin1.[012]) | ||
18110 | # Rhapsody C library is in the System framework | ||
18111 | - deplibs="$deplibs System.ltframework" | ||
18112 | + func_append deplibs " System.ltframework" | ||
18113 | ;; | ||
18114 | *-*-netbsd*) | ||
18115 | # Don't link with libc until the a.out ld.so is fixed. | ||
18116 | @@ -6715,7 +7634,7 @@ func_mode_link () | ||
18117 | *) | ||
18118 | # Add libc to deplibs on all other systems if necessary. | ||
18119 | if test "$build_libtool_need_lc" = "yes"; then | ||
18120 | - deplibs="$deplibs -lc" | ||
18121 | + func_append deplibs " -lc" | ||
18122 | fi | ||
18123 | ;; | ||
18124 | esac | ||
18125 | @@ -6764,18 +7683,18 @@ EOF | ||
18126 | if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then | ||
18127 | case " $predeps $postdeps " in | ||
18128 | *" $i "*) | ||
18129 | - newdeplibs="$newdeplibs $i" | ||
18130 | + func_append newdeplibs " $i" | ||
18131 | i="" | ||
18132 | ;; | ||
18133 | esac | ||
18134 | fi | ||
18135 | if test -n "$i" ; then | ||
18136 | - eval "libname=\"$libname_spec\"" | ||
18137 | - eval "deplib_matches=\"$library_names_spec\"" | ||
18138 | + libname=`eval "\\$ECHO \"$libname_spec\""` | ||
18139 | + deplib_matches=`eval "\\$ECHO \"$library_names_spec\""` | ||
18140 | set dummy $deplib_matches; shift | ||
18141 | deplib_match=$1 | ||
18142 | if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then | ||
18143 | - newdeplibs="$newdeplibs $i" | ||
18144 | + func_append newdeplibs " $i" | ||
18145 | else | ||
18146 | droppeddeps=yes | ||
18147 | echo | ||
18148 | @@ -6789,7 +7708,7 @@ EOF | ||
18149 | fi | ||
18150 | ;; | ||
18151 | *) | ||
18152 | - newdeplibs="$newdeplibs $i" | ||
18153 | + func_append newdeplibs " $i" | ||
18154 | ;; | ||
18155 | esac | ||
18156 | done | ||
18157 | @@ -6807,18 +7726,18 @@ EOF | ||
18158 | if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then | ||
18159 | case " $predeps $postdeps " in | ||
18160 | *" $i "*) | ||
18161 | - newdeplibs="$newdeplibs $i" | ||
18162 | + func_append newdeplibs " $i" | ||
18163 | i="" | ||
18164 | ;; | ||
18165 | esac | ||
18166 | fi | ||
18167 | if test -n "$i" ; then | ||
18168 | - eval "libname=\"$libname_spec\"" | ||
18169 | - eval "deplib_matches=\"$library_names_spec\"" | ||
18170 | + libname=`eval "\\$ECHO \"$libname_spec\""` | ||
18171 | + deplib_matches=`eval "\\$ECHO \"$library_names_spec\""` | ||
18172 | set dummy $deplib_matches; shift | ||
18173 | deplib_match=$1 | ||
18174 | if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then | ||
18175 | - newdeplibs="$newdeplibs $i" | ||
18176 | + func_append newdeplibs " $i" | ||
18177 | else | ||
18178 | droppeddeps=yes | ||
18179 | echo | ||
18180 | @@ -6840,7 +7759,7 @@ EOF | ||
18181 | fi | ||
18182 | ;; | ||
18183 | *) | ||
18184 | - newdeplibs="$newdeplibs $i" | ||
18185 | + func_append newdeplibs " $i" | ||
18186 | ;; | ||
18187 | esac | ||
18188 | done | ||
18189 | @@ -6857,15 +7776,27 @@ EOF | ||
18190 | if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then | ||
18191 | case " $predeps $postdeps " in | ||
18192 | *" $a_deplib "*) | ||
18193 | - newdeplibs="$newdeplibs $a_deplib" | ||
18194 | + func_append newdeplibs " $a_deplib" | ||
18195 | a_deplib="" | ||
18196 | ;; | ||
18197 | esac | ||
18198 | fi | ||
18199 | if test -n "$a_deplib" ; then | ||
18200 | - eval "libname=\"$libname_spec\"" | ||
18201 | + libname=`eval "\\$ECHO \"$libname_spec\""` | ||
18202 | + if test -n "$file_magic_glob"; then | ||
18203 | + libnameglob=`func_echo_all "$libname" | $SED -e $file_magic_glob` | ||
18204 | + else | ||
18205 | + libnameglob=$libname | ||
18206 | + fi | ||
18207 | + test "$want_nocaseglob" = yes && nocaseglob=`shopt -p nocaseglob` | ||
18208 | for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do | ||
18209 | - potential_libs=`ls $i/$libname[.-]* 2>/dev/null` | ||
18210 | + if test "$want_nocaseglob" = yes; then | ||
18211 | + shopt -s nocaseglob | ||
18212 | + potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null` | ||
18213 | + $nocaseglob | ||
18214 | + else | ||
18215 | + potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null` | ||
18216 | + fi | ||
18217 | for potent_lib in $potential_libs; do | ||
18218 | # Follow soft links. | ||
18219 | if ls -lLd "$potent_lib" 2>/dev/null | | ||
18220 | @@ -6885,10 +7816,10 @@ EOF | ||
18221 | *) potlib=`$ECHO "$potlib" | $SED 's,[^/]*$,,'`"$potliblink";; | ||
18222 | esac | ||
18223 | done | ||
18224 | - if eval "$file_magic_cmd \"\$potlib\"" 2>/dev/null | | ||
18225 | + if eval $file_magic_cmd \"\$potlib\" 2>/dev/null | | ||
18226 | $SED -e 10q | | ||
18227 | $EGREP "$file_magic_regex" > /dev/null; then | ||
18228 | - newdeplibs="$newdeplibs $a_deplib" | ||
18229 | + func_append newdeplibs " $a_deplib" | ||
18230 | a_deplib="" | ||
18231 | break 2 | ||
18232 | fi | ||
18233 | @@ -6913,7 +7844,7 @@ EOF | ||
18234 | ;; | ||
18235 | *) | ||
18236 | # Add a -L argument. | ||
18237 | - newdeplibs="$newdeplibs $a_deplib" | ||
18238 | + func_append newdeplibs " $a_deplib" | ||
18239 | ;; | ||
18240 | esac | ||
18241 | done # Gone through all deplibs. | ||
18242 | @@ -6929,20 +7860,20 @@ EOF | ||
18243 | if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then | ||
18244 | case " $predeps $postdeps " in | ||
18245 | *" $a_deplib "*) | ||
18246 | - newdeplibs="$newdeplibs $a_deplib" | ||
18247 | + func_append newdeplibs " $a_deplib" | ||
18248 | a_deplib="" | ||
18249 | ;; | ||
18250 | esac | ||
18251 | fi | ||
18252 | if test -n "$a_deplib" ; then | ||
18253 | - eval "libname=\"$libname_spec\"" | ||
18254 | + libname=`eval "\\$ECHO \"$libname_spec\""` | ||
18255 | for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do | ||
18256 | potential_libs=`ls $i/$libname[.-]* 2>/dev/null` | ||
18257 | for potent_lib in $potential_libs; do | ||
18258 | potlib="$potent_lib" # see symlink-check above in file_magic test | ||
18259 | if eval "\$ECHO \"$potent_lib\"" 2>/dev/null | $SED 10q | \ | ||
18260 | $EGREP "$match_pattern_regex" > /dev/null; then | ||
18261 | - newdeplibs="$newdeplibs $a_deplib" | ||
18262 | + func_append newdeplibs " $a_deplib" | ||
18263 | a_deplib="" | ||
18264 | break 2 | ||
18265 | fi | ||
18266 | @@ -6967,7 +7898,7 @@ EOF | ||
18267 | ;; | ||
18268 | *) | ||
18269 | # Add a -L argument. | ||
18270 | - newdeplibs="$newdeplibs $a_deplib" | ||
18271 | + func_append newdeplibs " $a_deplib" | ||
18272 | ;; | ||
18273 | esac | ||
18274 | done # Gone through all deplibs. | ||
18275 | @@ -7071,7 +8002,7 @@ EOF | ||
18276 | *) | ||
18277 | case " $deplibs " in | ||
18278 | *" -L$path/$objdir "*) | ||
18279 | - new_libs="$new_libs -L$path/$objdir" ;; | ||
18280 | + func_append new_libs " -L$path/$objdir" ;; | ||
18281 | esac | ||
18282 | ;; | ||
18283 | esac | ||
18284 | @@ -7081,10 +8012,10 @@ EOF | ||
18285 | -L*) | ||
18286 | case " $new_libs " in | ||
18287 | *" $deplib "*) ;; | ||
18288 | - *) new_libs="$new_libs $deplib" ;; | ||
18289 | + *) func_append new_libs " $deplib" ;; | ||
18290 | esac | ||
18291 | ;; | ||
18292 | - *) new_libs="$new_libs $deplib" ;; | ||
18293 | + *) func_append new_libs " $deplib" ;; | ||
18294 | esac | ||
18295 | done | ||
18296 | deplibs="$new_libs" | ||
18297 | @@ -7101,10 +8032,12 @@ EOF | ||
18298 | hardcode_libdirs= | ||
18299 | dep_rpath= | ||
18300 | rpath="$finalize_rpath" | ||
18301 | - test "$mode" != relink && rpath="$compile_rpath$rpath" | ||
18302 | + test "$opt_mode" != relink && rpath="$compile_rpath$rpath" | ||
18303 | for libdir in $rpath; do | ||
18304 | if test -n "$hardcode_libdir_flag_spec"; then | ||
18305 | if test -n "$hardcode_libdir_separator"; then | ||
18306 | + func_replace_sysroot "$libdir" | ||
18307 | + libdir=$func_replace_sysroot_result | ||
18308 | if test -z "$hardcode_libdirs"; then | ||
18309 | hardcode_libdirs="$libdir" | ||
18310 | else | ||
18311 | @@ -7113,18 +8046,18 @@ EOF | ||
18312 | *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) | ||
18313 | ;; | ||
18314 | *) | ||
18315 | - hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" | ||
18316 | + func_append hardcode_libdirs "$hardcode_libdir_separator$libdir" | ||
18317 | ;; | ||
18318 | esac | ||
18319 | fi | ||
18320 | else | ||
18321 | - eval "flag=\"$hardcode_libdir_flag_spec\"" | ||
18322 | - dep_rpath="$dep_rpath $flag" | ||
18323 | + eval flag=\"$hardcode_libdir_flag_spec\" | ||
18324 | + func_append dep_rpath " $flag" | ||
18325 | fi | ||
18326 | elif test -n "$runpath_var"; then | ||
18327 | case "$perm_rpath " in | ||
18328 | *" $libdir "*) ;; | ||
18329 | - *) perm_rpath="$perm_rpath $libdir" ;; | ||
18330 | + *) func_apped perm_rpath " $libdir" ;; | ||
18331 | esac | ||
18332 | fi | ||
18333 | done | ||
18334 | @@ -7133,40 +8066,38 @@ EOF | ||
18335 | test -n "$hardcode_libdirs"; then | ||
18336 | libdir="$hardcode_libdirs" | ||
18337 | if test -n "$hardcode_libdir_flag_spec_ld"; then | ||
18338 | - eval "dep_rpath=\"$hardcode_libdir_flag_spec_ld\"" | ||
18339 | + eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\" | ||
18340 | else | ||
18341 | - eval "dep_rpath=\"$hardcode_libdir_flag_spec\"" | ||
18342 | + eval dep_rpath=\"$hardcode_libdir_flag_spec\" | ||
18343 | fi | ||
18344 | fi | ||
18345 | if test -n "$runpath_var" && test -n "$perm_rpath"; then | ||
18346 | # We should set the runpath_var. | ||
18347 | rpath= | ||
18348 | for dir in $perm_rpath; do | ||
18349 | - rpath="$rpath$dir:" | ||
18350 | + func_append rpath "$dir:" | ||
18351 | done | ||
18352 | - eval $runpath_var=\$rpath\$$runpath_var | ||
18353 | - export $runpath_var | ||
18354 | + eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var" | ||
18355 | fi | ||
18356 | test -n "$dep_rpath" && deplibs="$dep_rpath $deplibs" | ||
18357 | fi | ||
18358 | |||
18359 | shlibpath="$finalize_shlibpath" | ||
18360 | - test "$mode" != relink && shlibpath="$compile_shlibpath$shlibpath" | ||
18361 | + test "$opt_mode" != relink && shlibpath="$compile_shlibpath$shlibpath" | ||
18362 | if test -n "$shlibpath"; then | ||
18363 | - eval $shlibpath_var=\$shlibpath\$$shlibpath_var | ||
18364 | - export $shlibpath_var | ||
18365 | + eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var" | ||
18366 | fi | ||
18367 | |||
18368 | # Get the real and link names of the library. | ||
18369 | - eval "shared_ext=\"$shrext_cmds\"" | ||
18370 | - eval "library_names=\"$library_names_spec\"" | ||
18371 | + eval shared_ext=\"$shrext_cmds\" | ||
18372 | + eval library_names=\"$library_names_spec\" | ||
18373 | set dummy $library_names | ||
18374 | shift | ||
18375 | realname="$1" | ||
18376 | shift | ||
18377 | |||
18378 | if test -n "$soname_spec"; then | ||
18379 | - eval "soname=\"$soname_spec\"" | ||
18380 | + eval soname=\"$soname_spec\" | ||
18381 | else | ||
18382 | soname="$realname" | ||
18383 | fi | ||
18384 | @@ -7178,7 +8109,7 @@ EOF | ||
18385 | linknames= | ||
18386 | for link | ||
18387 | do | ||
18388 | - linknames="$linknames $link" | ||
18389 | + func_append linknames " $link" | ||
18390 | done | ||
18391 | |||
18392 | # Use standard objects if they are pic | ||
18393 | @@ -7189,7 +8120,7 @@ EOF | ||
18394 | if test -n "$export_symbols" && test -n "$include_expsyms"; then | ||
18395 | $opt_dry_run || cp "$export_symbols" "$output_objdir/$libname.uexp" | ||
18396 | export_symbols="$output_objdir/$libname.uexp" | ||
18397 | - delfiles="$delfiles $export_symbols" | ||
18398 | + func_append delfiles " $export_symbols" | ||
18399 | fi | ||
18400 | |||
18401 | orig_export_symbols= | ||
18402 | @@ -7220,13 +8151,45 @@ EOF | ||
18403 | $opt_dry_run || $RM $export_symbols | ||
18404 | cmds=$export_symbols_cmds | ||
18405 | save_ifs="$IFS"; IFS='~' | ||
18406 | - for cmd in $cmds; do | ||
18407 | + for cmd1 in $cmds; do | ||
18408 | IFS="$save_ifs" | ||
18409 | - eval "cmd=\"$cmd\"" | ||
18410 | - func_len " $cmd" | ||
18411 | - len=$func_len_result | ||
18412 | - if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then | ||
18413 | + # Take the normal branch if the nm_file_list_spec branch | ||
18414 | + # doesn't work or if tool conversion is not needed. | ||
18415 | + case $nm_file_list_spec~$to_tool_file_cmd in | ||
18416 | + *~func_convert_file_noop | *~func_convert_file_msys_to_w32 | ~*) | ||
18417 | + try_normal_branch=yes | ||
18418 | + eval cmd=\"$cmd1\" | ||
18419 | + func_len " $cmd" | ||
18420 | + len=$func_len_result | ||
18421 | + ;; | ||
18422 | + *) | ||
18423 | + try_normal_branch=no | ||
18424 | + ;; | ||
18425 | + esac | ||
18426 | + if test "$try_normal_branch" = yes \ | ||
18427 | + && { test "$len" -lt "$max_cmd_len" \ | ||
18428 | + || test "$max_cmd_len" -le -1; } | ||
18429 | + then | ||
18430 | + func_show_eval "$cmd" 'exit $?' | ||
18431 | + skipped_export=false | ||
18432 | + elif test -n "$nm_file_list_spec"; then | ||
18433 | + func_basename "$output" | ||
18434 | + output_la=$func_basename_result | ||
18435 | + save_libobjs=$libobjs | ||
18436 | + save_output=$output | ||
18437 | + output=${output_objdir}/${output_la}.nm | ||
18438 | + func_to_tool_file "$output" | ||
18439 | + libobjs=$nm_file_list_spec$func_to_tool_file_result | ||
18440 | + func_append delfiles " $output" | ||
18441 | + func_verbose "creating $NM input file list: $output" | ||
18442 | + for obj in $save_libobjs; do | ||
18443 | + func_to_tool_file "$obj" | ||
18444 | + $ECHO "$func_to_tool_file_result" | ||
18445 | + done > "$output" | ||
18446 | + eval cmd=\"$cmd1\" | ||
18447 | func_show_eval "$cmd" 'exit $?' | ||
18448 | + output=$save_output | ||
18449 | + libobjs=$save_libobjs | ||
18450 | skipped_export=false | ||
18451 | else | ||
18452 | # The command line is too long to execute in one step. | ||
18453 | @@ -7248,7 +8211,7 @@ EOF | ||
18454 | if test -n "$export_symbols" && test -n "$include_expsyms"; then | ||
18455 | tmp_export_symbols="$export_symbols" | ||
18456 | test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols" | ||
18457 | - $opt_dry_run || $ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols" | ||
18458 | + $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"' | ||
18459 | fi | ||
18460 | |||
18461 | if test "X$skipped_export" != "X:" && test -n "$orig_export_symbols"; then | ||
18462 | @@ -7260,7 +8223,7 @@ EOF | ||
18463 | # global variables. join(1) would be nice here, but unfortunately | ||
18464 | # isn't a blessed tool. | ||
18465 | $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter | ||
18466 | - delfiles="$delfiles $export_symbols $output_objdir/$libname.filter" | ||
18467 | + func_append delfiles " $export_symbols $output_objdir/$libname.filter" | ||
18468 | export_symbols=$output_objdir/$libname.def | ||
18469 | $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols | ||
18470 | fi | ||
18471 | @@ -7270,7 +8233,7 @@ EOF | ||
18472 | case " $convenience " in | ||
18473 | *" $test_deplib "*) ;; | ||
18474 | *) | ||
18475 | - tmp_deplibs="$tmp_deplibs $test_deplib" | ||
18476 | + func_append tmp_deplibs " $test_deplib" | ||
18477 | ;; | ||
18478 | esac | ||
18479 | done | ||
18480 | @@ -7286,43 +8249,43 @@ EOF | ||
18481 | fi | ||
18482 | if test -n "$whole_archive_flag_spec"; then | ||
18483 | save_libobjs=$libobjs | ||
18484 | - eval "libobjs=\"\$libobjs $whole_archive_flag_spec\"" | ||
18485 | + eval libobjs=\"\$libobjs $whole_archive_flag_spec\" | ||
18486 | test "X$libobjs" = "X " && libobjs= | ||
18487 | else | ||
18488 | gentop="$output_objdir/${outputname}x" | ||
18489 | - generated="$generated $gentop" | ||
18490 | + func_append generated " $gentop" | ||
18491 | |||
18492 | func_extract_archives $gentop $convenience | ||
18493 | - libobjs="$libobjs $func_extract_archives_result" | ||
18494 | + func_append libobjs " $func_extract_archives_result" | ||
18495 | test "X$libobjs" = "X " && libobjs= | ||
18496 | fi | ||
18497 | fi | ||
18498 | |||
18499 | if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then | ||
18500 | - eval "flag=\"$thread_safe_flag_spec\"" | ||
18501 | - linker_flags="$linker_flags $flag" | ||
18502 | + eval flag=\"$thread_safe_flag_spec\" | ||
18503 | + func_append linker_flags " $flag" | ||
18504 | fi | ||
18505 | |||
18506 | # Make a backup of the uninstalled library when relinking | ||
18507 | - if test "$mode" = relink; then | ||
18508 | - $opt_dry_run || (cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U) || exit $? | ||
18509 | + if test "$opt_mode" = relink; then | ||
18510 | + $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U)' || exit $? | ||
18511 | fi | ||
18512 | |||
18513 | # Do each of the archive commands. | ||
18514 | if test "$module" = yes && test -n "$module_cmds" ; then | ||
18515 | if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then | ||
18516 | - eval "test_cmds=\"$module_expsym_cmds\"" | ||
18517 | + eval test_cmds=\"$module_expsym_cmds\" | ||
18518 | cmds=$module_expsym_cmds | ||
18519 | else | ||
18520 | - eval "test_cmds=\"$module_cmds\"" | ||
18521 | + eval test_cmds=\"$module_cmds\" | ||
18522 | cmds=$module_cmds | ||
18523 | fi | ||
18524 | else | ||
18525 | if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then | ||
18526 | - eval "test_cmds=\"$archive_expsym_cmds\"" | ||
18527 | + eval test_cmds=\"$archive_expsym_cmds\" | ||
18528 | cmds=$archive_expsym_cmds | ||
18529 | else | ||
18530 | - eval "test_cmds=\"$archive_cmds\"" | ||
18531 | + eval test_cmds=\"$archive_cmds\" | ||
18532 | cmds=$archive_cmds | ||
18533 | fi | ||
18534 | fi | ||
18535 | @@ -7366,10 +8329,13 @@ EOF | ||
18536 | echo 'INPUT (' > $output | ||
18537 | for obj in $save_libobjs | ||
18538 | do | ||
18539 | - $ECHO "$obj" >> $output | ||
18540 | + func_to_tool_file "$obj" | ||
18541 | + $ECHO "$func_to_tool_file_result" >> $output | ||
18542 | done | ||
18543 | echo ')' >> $output | ||
18544 | - delfiles="$delfiles $output" | ||
18545 | + func_append delfiles " $output" | ||
18546 | + func_to_tool_file "$output" | ||
18547 | + output=$func_to_tool_file_result | ||
18548 | elif test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "X$file_list_spec" != X; then | ||
18549 | output=${output_objdir}/${output_la}.lnk | ||
18550 | func_verbose "creating linker input file list: $output" | ||
18551 | @@ -7383,15 +8349,17 @@ EOF | ||
18552 | fi | ||
18553 | for obj | ||
18554 | do | ||
18555 | - $ECHO "$obj" >> $output | ||
18556 | + func_to_tool_file "$obj" | ||
18557 | + $ECHO "$func_to_tool_file_result" >> $output | ||
18558 | done | ||
18559 | - delfiles="$delfiles $output" | ||
18560 | - output=$firstobj\"$file_list_spec$output\" | ||
18561 | + func_append delfiles " $output" | ||
18562 | + func_to_tool_file "$output" | ||
18563 | + output=$firstobj\"$file_list_spec$func_to_tool_file_result\" | ||
18564 | else | ||
18565 | if test -n "$save_libobjs"; then | ||
18566 | func_verbose "creating reloadable object files..." | ||
18567 | output=$output_objdir/$output_la-${k}.$objext | ||
18568 | - eval "test_cmds=\"$reload_cmds\"" | ||
18569 | + eval test_cmds=\"$reload_cmds\" | ||
18570 | func_len " $test_cmds" | ||
18571 | len0=$func_len_result | ||
18572 | len=$len0 | ||
18573 | @@ -7411,12 +8379,12 @@ EOF | ||
18574 | if test "$k" -eq 1 ; then | ||
18575 | # The first file doesn't have a previous command to add. | ||
18576 | reload_objs=$objlist | ||
18577 | - eval "concat_cmds=\"$reload_cmds\"" | ||
18578 | + eval concat_cmds=\"$reload_cmds\" | ||
18579 | else | ||
18580 | # All subsequent reloadable object files will link in | ||
18581 | # the last one created. | ||
18582 | reload_objs="$objlist $last_robj" | ||
18583 | - eval "concat_cmds=\"\$concat_cmds~$reload_cmds~\$RM $last_robj\"" | ||
18584 | + eval concat_cmds=\"\$concat_cmds~$reload_cmds~\$RM $last_robj\" | ||
18585 | fi | ||
18586 | last_robj=$output_objdir/$output_la-${k}.$objext | ||
18587 | func_arith $k + 1 | ||
18588 | @@ -7433,11 +8401,11 @@ EOF | ||
18589 | # files will link in the last one created. | ||
18590 | test -z "$concat_cmds" || concat_cmds=$concat_cmds~ | ||
18591 | reload_objs="$objlist $last_robj" | ||
18592 | - eval "concat_cmds=\"\${concat_cmds}$reload_cmds\"" | ||
18593 | + eval concat_cmds=\"\${concat_cmds}$reload_cmds\" | ||
18594 | if test -n "$last_robj"; then | ||
18595 | - eval "concat_cmds=\"\${concat_cmds}~\$RM $last_robj\"" | ||
18596 | + eval concat_cmds=\"\${concat_cmds}~\$RM $last_robj\" | ||
18597 | fi | ||
18598 | - delfiles="$delfiles $output" | ||
18599 | + func_append delfiles " $output" | ||
18600 | |||
18601 | else | ||
18602 | output= | ||
18603 | @@ -7450,9 +8418,9 @@ EOF | ||
18604 | libobjs=$output | ||
18605 | # Append the command to create the export file. | ||
18606 | test -z "$concat_cmds" || concat_cmds=$concat_cmds~ | ||
18607 | - eval "concat_cmds=\"\$concat_cmds$export_symbols_cmds\"" | ||
18608 | + eval concat_cmds=\"\$concat_cmds$export_symbols_cmds\" | ||
18609 | if test -n "$last_robj"; then | ||
18610 | - eval "concat_cmds=\"\$concat_cmds~\$RM $last_robj\"" | ||
18611 | + eval concat_cmds=\"\$concat_cmds~\$RM $last_robj\" | ||
18612 | fi | ||
18613 | fi | ||
18614 | |||
18615 | @@ -7471,7 +8439,7 @@ EOF | ||
18616 | lt_exit=$? | ||
18617 | |||
18618 | # Restore the uninstalled library and exit | ||
18619 | - if test "$mode" = relink; then | ||
18620 | + if test "$opt_mode" = relink; then | ||
18621 | ( cd "$output_objdir" && \ | ||
18622 | $RM "${realname}T" && \ | ||
18623 | $MV "${realname}U" "$realname" ) | ||
18624 | @@ -7492,7 +8460,7 @@ EOF | ||
18625 | if test -n "$export_symbols" && test -n "$include_expsyms"; then | ||
18626 | tmp_export_symbols="$export_symbols" | ||
18627 | test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols" | ||
18628 | - $opt_dry_run || $ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols" | ||
18629 | + $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"' | ||
18630 | fi | ||
18631 | |||
18632 | if test -n "$orig_export_symbols"; then | ||
18633 | @@ -7504,7 +8472,7 @@ EOF | ||
18634 | # global variables. join(1) would be nice here, but unfortunately | ||
18635 | # isn't a blessed tool. | ||
18636 | $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter | ||
18637 | - delfiles="$delfiles $export_symbols $output_objdir/$libname.filter" | ||
18638 | + func_append delfiles " $export_symbols $output_objdir/$libname.filter" | ||
18639 | export_symbols=$output_objdir/$libname.def | ||
18640 | $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols | ||
18641 | fi | ||
18642 | @@ -7515,7 +8483,7 @@ EOF | ||
18643 | output=$save_output | ||
18644 | |||
18645 | if test -n "$convenience" && test -n "$whole_archive_flag_spec"; then | ||
18646 | - eval "libobjs=\"\$libobjs $whole_archive_flag_spec\"" | ||
18647 | + eval libobjs=\"\$libobjs $whole_archive_flag_spec\" | ||
18648 | test "X$libobjs" = "X " && libobjs= | ||
18649 | fi | ||
18650 | # Expand the library linking commands again to reset the | ||
18651 | @@ -7539,23 +8507,23 @@ EOF | ||
18652 | |||
18653 | if test -n "$delfiles"; then | ||
18654 | # Append the command to remove temporary files to $cmds. | ||
18655 | - eval "cmds=\"\$cmds~\$RM $delfiles\"" | ||
18656 | + eval cmds=\"\$cmds~\$RM $delfiles\" | ||
18657 | fi | ||
18658 | |||
18659 | # Add any objects from preloaded convenience libraries | ||
18660 | if test -n "$dlprefiles"; then | ||
18661 | gentop="$output_objdir/${outputname}x" | ||
18662 | - generated="$generated $gentop" | ||
18663 | + func_append generated " $gentop" | ||
18664 | |||
18665 | func_extract_archives $gentop $dlprefiles | ||
18666 | - libobjs="$libobjs $func_extract_archives_result" | ||
18667 | + func_append libobjs " $func_extract_archives_result" | ||
18668 | test "X$libobjs" = "X " && libobjs= | ||
18669 | fi | ||
18670 | |||
18671 | save_ifs="$IFS"; IFS='~' | ||
18672 | for cmd in $cmds; do | ||
18673 | IFS="$save_ifs" | ||
18674 | - eval "cmd=\"$cmd\"" | ||
18675 | + eval cmd=\"$cmd\" | ||
18676 | $opt_silent || { | ||
18677 | func_quote_for_expand "$cmd" | ||
18678 | eval "func_echo $func_quote_for_expand_result" | ||
18679 | @@ -7564,7 +8532,7 @@ EOF | ||
18680 | lt_exit=$? | ||
18681 | |||
18682 | # Restore the uninstalled library and exit | ||
18683 | - if test "$mode" = relink; then | ||
18684 | + if test "$opt_mode" = relink; then | ||
18685 | ( cd "$output_objdir" && \ | ||
18686 | $RM "${realname}T" && \ | ||
18687 | $MV "${realname}U" "$realname" ) | ||
18688 | @@ -7576,8 +8544,8 @@ EOF | ||
18689 | IFS="$save_ifs" | ||
18690 | |||
18691 | # Restore the uninstalled library and exit | ||
18692 | - if test "$mode" = relink; then | ||
18693 | - $opt_dry_run || (cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname) || exit $? | ||
18694 | + if test "$opt_mode" = relink; then | ||
18695 | + $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname)' || exit $? | ||
18696 | |||
18697 | if test -n "$convenience"; then | ||
18698 | if test -z "$whole_archive_flag_spec"; then | ||
18699 | @@ -7656,17 +8624,20 @@ EOF | ||
18700 | |||
18701 | if test -n "$convenience"; then | ||
18702 | if test -n "$whole_archive_flag_spec"; then | ||
18703 | - eval "tmp_whole_archive_flags=\"$whole_archive_flag_spec\"" | ||
18704 | + eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\" | ||
18705 | reload_conv_objs=$reload_objs\ `$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'` | ||
18706 | else | ||
18707 | gentop="$output_objdir/${obj}x" | ||
18708 | - generated="$generated $gentop" | ||
18709 | + func_append generated " $gentop" | ||
18710 | |||
18711 | func_extract_archives $gentop $convenience | ||
18712 | reload_conv_objs="$reload_objs $func_extract_archives_result" | ||
18713 | fi | ||
18714 | fi | ||
18715 | |||
18716 | + # If we're not building shared, we need to use non_pic_objs | ||
18717 | + test "$build_libtool_libs" != yes && libobjs="$non_pic_objects" | ||
18718 | + | ||
18719 | # Create the old-style object. | ||
18720 | reload_objs="$objs$old_deplibs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; /\.lib$/d; $lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test | ||
18721 | |||
18722 | @@ -7690,7 +8661,7 @@ EOF | ||
18723 | # Create an invalid libtool object if no PIC, so that we don't | ||
18724 | # accidentally link it into a program. | ||
18725 | # $show "echo timestamp > $libobj" | ||
18726 | - # $opt_dry_run || echo timestamp > $libobj || exit $? | ||
18727 | + # $opt_dry_run || eval "echo timestamp > $libobj" || exit $? | ||
18728 | exit $EXIT_SUCCESS | ||
18729 | fi | ||
18730 | |||
18731 | @@ -7740,8 +8711,8 @@ EOF | ||
18732 | if test "$tagname" = CXX ; then | ||
18733 | case ${MACOSX_DEPLOYMENT_TARGET-10.0} in | ||
18734 | 10.[0123]) | ||
18735 | - compile_command="$compile_command ${wl}-bind_at_load" | ||
18736 | - finalize_command="$finalize_command ${wl}-bind_at_load" | ||
18737 | + func_append compile_command " ${wl}-bind_at_load" | ||
18738 | + func_append finalize_command " ${wl}-bind_at_load" | ||
18739 | ;; | ||
18740 | esac | ||
18741 | fi | ||
18742 | @@ -7761,7 +8732,7 @@ EOF | ||
18743 | *) | ||
18744 | case " $compile_deplibs " in | ||
18745 | *" -L$path/$objdir "*) | ||
18746 | - new_libs="$new_libs -L$path/$objdir" ;; | ||
18747 | + func_append new_libs " -L$path/$objdir" ;; | ||
18748 | esac | ||
18749 | ;; | ||
18750 | esac | ||
18751 | @@ -7771,17 +8742,17 @@ EOF | ||
18752 | -L*) | ||
18753 | case " $new_libs " in | ||
18754 | *" $deplib "*) ;; | ||
18755 | - *) new_libs="$new_libs $deplib" ;; | ||
18756 | + *) func_append new_libs " $deplib" ;; | ||
18757 | esac | ||
18758 | ;; | ||
18759 | - *) new_libs="$new_libs $deplib" ;; | ||
18760 | + *) func_append new_libs " $deplib" ;; | ||
18761 | esac | ||
18762 | done | ||
18763 | compile_deplibs="$new_libs" | ||
18764 | |||
18765 | |||
18766 | - compile_command="$compile_command $compile_deplibs" | ||
18767 | - finalize_command="$finalize_command $finalize_deplibs" | ||
18768 | + func_append compile_command " $compile_deplibs" | ||
18769 | + func_append finalize_command " $finalize_deplibs" | ||
18770 | |||
18771 | if test -n "$rpath$xrpath"; then | ||
18772 | # If the user specified any rpath flags, then add them. | ||
18773 | @@ -7789,7 +8760,7 @@ EOF | ||
18774 | # This is the magic to use -rpath. | ||
18775 | case "$finalize_rpath " in | ||
18776 | *" $libdir "*) ;; | ||
18777 | - *) finalize_rpath="$finalize_rpath $libdir" ;; | ||
18778 | + *) func_append finalize_rpath " $libdir" ;; | ||
18779 | esac | ||
18780 | done | ||
18781 | fi | ||
18782 | @@ -7808,18 +8779,18 @@ EOF | ||
18783 | *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) | ||
18784 | ;; | ||
18785 | *) | ||
18786 | - hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" | ||
18787 | + func_append hardcode_libdirs "$hardcode_libdir_separator$libdir" | ||
18788 | ;; | ||
18789 | esac | ||
18790 | fi | ||
18791 | else | ||
18792 | - eval "flag=\"$hardcode_libdir_flag_spec\"" | ||
18793 | - rpath="$rpath $flag" | ||
18794 | + eval flag=\"$hardcode_libdir_flag_spec\" | ||
18795 | + func_append rpath " $flag" | ||
18796 | fi | ||
18797 | elif test -n "$runpath_var"; then | ||
18798 | case "$perm_rpath " in | ||
18799 | *" $libdir "*) ;; | ||
18800 | - *) perm_rpath="$perm_rpath $libdir" ;; | ||
18801 | + *) func_append perm_rpath " $libdir" ;; | ||
18802 | esac | ||
18803 | fi | ||
18804 | case $host in | ||
18805 | @@ -7828,12 +8799,12 @@ EOF | ||
18806 | case :$dllsearchpath: in | ||
18807 | *":$libdir:"*) ;; | ||
18808 | ::) dllsearchpath=$libdir;; | ||
18809 | - *) dllsearchpath="$dllsearchpath:$libdir";; | ||
18810 | + *) func_append dllsearchpath ":$libdir";; | ||
18811 | esac | ||
18812 | case :$dllsearchpath: in | ||
18813 | *":$testbindir:"*) ;; | ||
18814 | ::) dllsearchpath=$testbindir;; | ||
18815 | - *) dllsearchpath="$dllsearchpath:$testbindir";; | ||
18816 | + *) func_append dllsearchpath ":$testbindir";; | ||
18817 | esac | ||
18818 | ;; | ||
18819 | esac | ||
18820 | @@ -7842,7 +8813,7 @@ EOF | ||
18821 | if test -n "$hardcode_libdir_separator" && | ||
18822 | test -n "$hardcode_libdirs"; then | ||
18823 | libdir="$hardcode_libdirs" | ||
18824 | - eval "rpath=\" $hardcode_libdir_flag_spec\"" | ||
18825 | + eval rpath=\" $hardcode_libdir_flag_spec\" | ||
18826 | fi | ||
18827 | compile_rpath="$rpath" | ||
18828 | |||
18829 | @@ -7859,18 +8830,18 @@ EOF | ||
18830 | *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) | ||
18831 | ;; | ||
18832 | *) | ||
18833 | - hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" | ||
18834 | + func_append hardcode_libdirs "$hardcode_libdir_separator$libdir" | ||
18835 | ;; | ||
18836 | esac | ||
18837 | fi | ||
18838 | else | ||
18839 | - eval "flag=\"$hardcode_libdir_flag_spec\"" | ||
18840 | - rpath="$rpath $flag" | ||
18841 | + eval flag=\"$hardcode_libdir_flag_spec\" | ||
18842 | + func_append rpath " $flag" | ||
18843 | fi | ||
18844 | elif test -n "$runpath_var"; then | ||
18845 | case "$finalize_perm_rpath " in | ||
18846 | *" $libdir "*) ;; | ||
18847 | - *) finalize_perm_rpath="$finalize_perm_rpath $libdir" ;; | ||
18848 | + *) func_append finalize_perm_rpath " $libdir" ;; | ||
18849 | esac | ||
18850 | fi | ||
18851 | done | ||
18852 | @@ -7878,7 +8849,7 @@ EOF | ||
18853 | if test -n "$hardcode_libdir_separator" && | ||
18854 | test -n "$hardcode_libdirs"; then | ||
18855 | libdir="$hardcode_libdirs" | ||
18856 | - eval "rpath=\" $hardcode_libdir_flag_spec\"" | ||
18857 | + eval rpath=\" $hardcode_libdir_flag_spec\" | ||
18858 | fi | ||
18859 | finalize_rpath="$rpath" | ||
18860 | |||
18861 | @@ -7921,6 +8892,12 @@ EOF | ||
18862 | exit_status=0 | ||
18863 | func_show_eval "$link_command" 'exit_status=$?' | ||
18864 | |||
18865 | + if test -n "$postlink_cmds"; then | ||
18866 | + func_to_tool_file "$output" | ||
18867 | + postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'` | ||
18868 | + func_execute_cmds "$postlink_cmds" 'exit $?' | ||
18869 | + fi | ||
18870 | + | ||
18871 | # Delete the generated files. | ||
18872 | if test -f "$output_objdir/${outputname}S.${objext}"; then | ||
18873 | func_show_eval '$RM "$output_objdir/${outputname}S.${objext}"' | ||
18874 | @@ -7943,7 +8920,7 @@ EOF | ||
18875 | # We should set the runpath_var. | ||
18876 | rpath= | ||
18877 | for dir in $perm_rpath; do | ||
18878 | - rpath="$rpath$dir:" | ||
18879 | + func_append rpath "$dir:" | ||
18880 | done | ||
18881 | compile_var="$runpath_var=\"$rpath\$$runpath_var\" " | ||
18882 | fi | ||
18883 | @@ -7951,7 +8928,7 @@ EOF | ||
18884 | # We should set the runpath_var. | ||
18885 | rpath= | ||
18886 | for dir in $finalize_perm_rpath; do | ||
18887 | - rpath="$rpath$dir:" | ||
18888 | + func_append rpath "$dir:" | ||
18889 | done | ||
18890 | finalize_var="$runpath_var=\"$rpath\$$runpath_var\" " | ||
18891 | fi | ||
18892 | @@ -7966,6 +8943,13 @@ EOF | ||
18893 | $opt_dry_run || $RM $output | ||
18894 | # Link the executable and exit | ||
18895 | func_show_eval "$link_command" 'exit $?' | ||
18896 | + | ||
18897 | + if test -n "$postlink_cmds"; then | ||
18898 | + func_to_tool_file "$output" | ||
18899 | + postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'` | ||
18900 | + func_execute_cmds "$postlink_cmds" 'exit $?' | ||
18901 | + fi | ||
18902 | + | ||
18903 | exit $EXIT_SUCCESS | ||
18904 | fi | ||
18905 | |||
18906 | @@ -7999,6 +8983,12 @@ EOF | ||
18907 | |||
18908 | func_show_eval "$link_command" 'exit $?' | ||
18909 | |||
18910 | + if test -n "$postlink_cmds"; then | ||
18911 | + func_to_tool_file "$output_objdir/$outputname" | ||
18912 | + postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'` | ||
18913 | + func_execute_cmds "$postlink_cmds" 'exit $?' | ||
18914 | + fi | ||
18915 | + | ||
18916 | # Now create the wrapper script. | ||
18917 | func_verbose "creating $output" | ||
18918 | |||
18919 | @@ -8096,7 +9086,7 @@ EOF | ||
18920 | else | ||
18921 | oldobjs="$old_deplibs $non_pic_objects" | ||
18922 | if test "$preload" = yes && test -f "$symfileobj"; then | ||
18923 | - oldobjs="$oldobjs $symfileobj" | ||
18924 | + func_append oldobjs " $symfileobj" | ||
18925 | fi | ||
18926 | fi | ||
18927 | addlibs="$old_convenience" | ||
18928 | @@ -8104,10 +9094,10 @@ EOF | ||
18929 | |||
18930 | if test -n "$addlibs"; then | ||
18931 | gentop="$output_objdir/${outputname}x" | ||
18932 | - generated="$generated $gentop" | ||
18933 | + func_append generated " $gentop" | ||
18934 | |||
18935 | func_extract_archives $gentop $addlibs | ||
18936 | - oldobjs="$oldobjs $func_extract_archives_result" | ||
18937 | + func_append oldobjs " $func_extract_archives_result" | ||
18938 | fi | ||
18939 | |||
18940 | # Do each command in the archive commands. | ||
18941 | @@ -8118,10 +9108,10 @@ EOF | ||
18942 | # Add any objects from preloaded convenience libraries | ||
18943 | if test -n "$dlprefiles"; then | ||
18944 | gentop="$output_objdir/${outputname}x" | ||
18945 | - generated="$generated $gentop" | ||
18946 | + func_append generated " $gentop" | ||
18947 | |||
18948 | func_extract_archives $gentop $dlprefiles | ||
18949 | - oldobjs="$oldobjs $func_extract_archives_result" | ||
18950 | + func_append oldobjs " $func_extract_archives_result" | ||
18951 | fi | ||
18952 | |||
18953 | # POSIX demands no paths to be encoded in archives. We have | ||
18954 | @@ -8139,7 +9129,7 @@ EOF | ||
18955 | else | ||
18956 | echo "copying selected object files to avoid basename conflicts..." | ||
18957 | gentop="$output_objdir/${outputname}x" | ||
18958 | - generated="$generated $gentop" | ||
18959 | + func_append generated " $gentop" | ||
18960 | func_mkdir_p "$gentop" | ||
18961 | save_oldobjs=$oldobjs | ||
18962 | oldobjs= | ||
18963 | @@ -8163,18 +9153,28 @@ EOF | ||
18964 | esac | ||
18965 | done | ||
18966 | func_show_eval "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj" | ||
18967 | - oldobjs="$oldobjs $gentop/$newobj" | ||
18968 | + func_append oldobjs " $gentop/$newobj" | ||
18969 | ;; | ||
18970 | - *) oldobjs="$oldobjs $obj" ;; | ||
18971 | + *) func_append oldobjs " $obj" ;; | ||
18972 | esac | ||
18973 | done | ||
18974 | fi | ||
18975 | - eval "cmds=\"$old_archive_cmds\"" | ||
18976 | + eval cmds=\"$old_archive_cmds\" | ||
18977 | |||
18978 | func_len " $cmds" | ||
18979 | len=$func_len_result | ||
18980 | if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then | ||
18981 | cmds=$old_archive_cmds | ||
18982 | + elif test -n "$archiver_list_spec"; then | ||
18983 | + func_verbose "using command file archive linking..." | ||
18984 | + for obj in $oldobjs | ||
18985 | + do | ||
18986 | + func_to_tool_file "$obj" | ||
18987 | + $ECHO "$func_to_tool_file_result" | ||
18988 | + done > $output_objdir/$libname.libcmd | ||
18989 | + func_to_tool_file "$output_objdir/$libname.libcmd" | ||
18990 | + oldobjs=" $archiver_list_spec$func_to_tool_file_result" | ||
18991 | + cmds=$old_archive_cmds | ||
18992 | else | ||
18993 | # the command line is too long to link in one step, link in parts | ||
18994 | func_verbose "using piecewise archive linking..." | ||
18995 | @@ -8189,7 +9189,7 @@ EOF | ||
18996 | do | ||
18997 | last_oldobj=$obj | ||
18998 | done | ||
18999 | - eval "test_cmds=\"$old_archive_cmds\"" | ||
19000 | + eval test_cmds=\"$old_archive_cmds\" | ||
19001 | func_len " $test_cmds" | ||
19002 | len0=$func_len_result | ||
19003 | len=$len0 | ||
19004 | @@ -8208,7 +9208,7 @@ EOF | ||
19005 | RANLIB=$save_RANLIB | ||
19006 | fi | ||
19007 | test -z "$concat_cmds" || concat_cmds=$concat_cmds~ | ||
19008 | - eval "concat_cmds=\"\${concat_cmds}$old_archive_cmds\"" | ||
19009 | + eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\" | ||
19010 | objlist= | ||
19011 | len=$len0 | ||
19012 | fi | ||
19013 | @@ -8216,9 +9216,9 @@ EOF | ||
19014 | RANLIB=$save_RANLIB | ||
19015 | oldobjs=$objlist | ||
19016 | if test "X$oldobjs" = "X" ; then | ||
19017 | - eval "cmds=\"\$concat_cmds\"" | ||
19018 | + eval cmds=\"\$concat_cmds\" | ||
19019 | else | ||
19020 | - eval "cmds=\"\$concat_cmds~\$old_archive_cmds\"" | ||
19021 | + eval cmds=\"\$concat_cmds~\$old_archive_cmds\" | ||
19022 | fi | ||
19023 | fi | ||
19024 | fi | ||
19025 | @@ -8268,12 +9268,23 @@ EOF | ||
19026 | *.la) | ||
19027 | func_basename "$deplib" | ||
19028 | name="$func_basename_result" | ||
19029 | - libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` | ||
19030 | + func_resolve_sysroot "$deplib" | ||
19031 | + eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result` | ||
19032 | test -z "$libdir" && \ | ||
19033 | func_fatal_error "\`$deplib' is not a valid libtool archive" | ||
19034 | - newdependency_libs="$newdependency_libs $libdir/$name" | ||
19035 | + func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name" | ||
19036 | + ;; | ||
19037 | + -L*) | ||
19038 | + func_stripname -L '' "$deplib" | ||
19039 | + func_replace_sysroot "$func_stripname_result" | ||
19040 | + func_append newdependency_libs " -L$func_replace_sysroot_result" | ||
19041 | ;; | ||
19042 | - *) newdependency_libs="$newdependency_libs $deplib" ;; | ||
19043 | + -R*) | ||
19044 | + func_stripname -R '' "$deplib" | ||
19045 | + func_replace_sysroot "$func_stripname_result" | ||
19046 | + func_append newdependency_libs " -R$func_replace_sysroot_result" | ||
19047 | + ;; | ||
19048 | + *) func_append newdependency_libs " $deplib" ;; | ||
19049 | esac | ||
19050 | done | ||
19051 | dependency_libs="$newdependency_libs" | ||
19052 | @@ -8284,12 +9295,14 @@ EOF | ||
19053 | *.la) | ||
19054 | func_basename "$lib" | ||
19055 | name="$func_basename_result" | ||
19056 | - libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` | ||
19057 | + func_resolve_sysroot "$lib" | ||
19058 | + eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result` | ||
19059 | + | ||
19060 | test -z "$libdir" && \ | ||
19061 | func_fatal_error "\`$lib' is not a valid libtool archive" | ||
19062 | - newdlfiles="$newdlfiles $libdir/$name" | ||
19063 | + func_append newdlfiles " ${lt_sysroot:+=}$libdir/$name" | ||
19064 | ;; | ||
19065 | - *) newdlfiles="$newdlfiles $lib" ;; | ||
19066 | + *) func_append newdlfiles " $lib" ;; | ||
19067 | esac | ||
19068 | done | ||
19069 | dlfiles="$newdlfiles" | ||
19070 | @@ -8303,10 +9316,11 @@ EOF | ||
19071 | # the library: | ||
19072 | func_basename "$lib" | ||
19073 | name="$func_basename_result" | ||
19074 | - libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` | ||
19075 | + func_resolve_sysroot "$lib" | ||
19076 | + eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result` | ||
19077 | test -z "$libdir" && \ | ||
19078 | func_fatal_error "\`$lib' is not a valid libtool archive" | ||
19079 | - newdlprefiles="$newdlprefiles $libdir/$name" | ||
19080 | + func_append newdlprefiles " ${lt_sysroot:+=}$libdir/$name" | ||
19081 | ;; | ||
19082 | esac | ||
19083 | done | ||
19084 | @@ -8318,7 +9332,7 @@ EOF | ||
19085 | [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; | ||
19086 | *) abs=`pwd`"/$lib" ;; | ||
19087 | esac | ||
19088 | - newdlfiles="$newdlfiles $abs" | ||
19089 | + func_append newdlfiles " $abs" | ||
19090 | done | ||
19091 | dlfiles="$newdlfiles" | ||
19092 | newdlprefiles= | ||
19093 | @@ -8327,7 +9341,7 @@ EOF | ||
19094 | [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; | ||
19095 | *) abs=`pwd`"/$lib" ;; | ||
19096 | esac | ||
19097 | - newdlprefiles="$newdlprefiles $abs" | ||
19098 | + func_append newdlprefiles " $abs" | ||
19099 | done | ||
19100 | dlprefiles="$newdlprefiles" | ||
19101 | fi | ||
19102 | @@ -8412,7 +9426,7 @@ relink_command=\"$relink_command\"" | ||
19103 | exit $EXIT_SUCCESS | ||
19104 | } | ||
19105 | |||
19106 | -{ test "$mode" = link || test "$mode" = relink; } && | ||
19107 | +{ test "$opt_mode" = link || test "$opt_mode" = relink; } && | ||
19108 | func_mode_link ${1+"$@"} | ||
19109 | |||
19110 | |||
19111 | @@ -8432,9 +9446,9 @@ func_mode_uninstall () | ||
19112 | for arg | ||
19113 | do | ||
19114 | case $arg in | ||
19115 | - -f) RM="$RM $arg"; rmforce=yes ;; | ||
19116 | - -*) RM="$RM $arg" ;; | ||
19117 | - *) files="$files $arg" ;; | ||
19118 | + -f) func_append RM " $arg"; rmforce=yes ;; | ||
19119 | + -*) func_append RM " $arg" ;; | ||
19120 | + *) func_append files " $arg" ;; | ||
19121 | esac | ||
19122 | done | ||
19123 | |||
19124 | @@ -8443,24 +9457,23 @@ func_mode_uninstall () | ||
19125 | |||
19126 | rmdirs= | ||
19127 | |||
19128 | - origobjdir="$objdir" | ||
19129 | for file in $files; do | ||
19130 | func_dirname "$file" "" "." | ||
19131 | dir="$func_dirname_result" | ||
19132 | if test "X$dir" = X.; then | ||
19133 | - objdir="$origobjdir" | ||
19134 | + odir="$objdir" | ||
19135 | else | ||
19136 | - objdir="$dir/$origobjdir" | ||
19137 | + odir="$dir/$objdir" | ||
19138 | fi | ||
19139 | func_basename "$file" | ||
19140 | name="$func_basename_result" | ||
19141 | - test "$mode" = uninstall && objdir="$dir" | ||
19142 | + test "$opt_mode" = uninstall && odir="$dir" | ||
19143 | |||
19144 | - # Remember objdir for removal later, being careful to avoid duplicates | ||
19145 | - if test "$mode" = clean; then | ||
19146 | + # Remember odir for removal later, being careful to avoid duplicates | ||
19147 | + if test "$opt_mode" = clean; then | ||
19148 | case " $rmdirs " in | ||
19149 | - *" $objdir "*) ;; | ||
19150 | - *) rmdirs="$rmdirs $objdir" ;; | ||
19151 | + *" $odir "*) ;; | ||
19152 | + *) func_append rmdirs " $odir" ;; | ||
19153 | esac | ||
19154 | fi | ||
19155 | |||
19156 | @@ -8486,18 +9499,17 @@ func_mode_uninstall () | ||
19157 | |||
19158 | # Delete the libtool libraries and symlinks. | ||
19159 | for n in $library_names; do | ||
19160 | - rmfiles="$rmfiles $objdir/$n" | ||
19161 | + func_append rmfiles " $odir/$n" | ||
19162 | done | ||
19163 | - test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library" | ||
19164 | + test -n "$old_library" && func_append rmfiles " $odir/$old_library" | ||
19165 | |||
19166 | - case "$mode" in | ||
19167 | + case "$opt_mode" in | ||
19168 | clean) | ||
19169 | - case " $library_names " in | ||
19170 | - # " " in the beginning catches empty $dlname | ||
19171 | + case " $library_names " in | ||
19172 | *" $dlname "*) ;; | ||
19173 | - *) rmfiles="$rmfiles $objdir/$dlname" ;; | ||
19174 | + *) test -n "$dlname" && func_append rmfiles " $odir/$dlname" ;; | ||
19175 | esac | ||
19176 | - test -n "$libdir" && rmfiles="$rmfiles $objdir/$name $objdir/${name}i" | ||
19177 | + test -n "$libdir" && func_append rmfiles " $odir/$name $odir/${name}i" | ||
19178 | ;; | ||
19179 | uninstall) | ||
19180 | if test -n "$library_names"; then | ||
19181 | @@ -8525,19 +9537,19 @@ func_mode_uninstall () | ||
19182 | # Add PIC object to the list of files to remove. | ||
19183 | if test -n "$pic_object" && | ||
19184 | test "$pic_object" != none; then | ||
19185 | - rmfiles="$rmfiles $dir/$pic_object" | ||
19186 | + func_append rmfiles " $dir/$pic_object" | ||
19187 | fi | ||
19188 | |||
19189 | # Add non-PIC object to the list of files to remove. | ||
19190 | if test -n "$non_pic_object" && | ||
19191 | test "$non_pic_object" != none; then | ||
19192 | - rmfiles="$rmfiles $dir/$non_pic_object" | ||
19193 | + func_append rmfiles " $dir/$non_pic_object" | ||
19194 | fi | ||
19195 | fi | ||
19196 | ;; | ||
19197 | |||
19198 | *) | ||
19199 | - if test "$mode" = clean ; then | ||
19200 | + if test "$opt_mode" = clean ; then | ||
19201 | noexename=$name | ||
19202 | case $file in | ||
19203 | *.exe) | ||
19204 | @@ -8547,7 +9559,7 @@ func_mode_uninstall () | ||
19205 | noexename=$func_stripname_result | ||
19206 | # $file with .exe has already been added to rmfiles, | ||
19207 | # add $file without .exe | ||
19208 | - rmfiles="$rmfiles $file" | ||
19209 | + func_append rmfiles " $file" | ||
19210 | ;; | ||
19211 | esac | ||
19212 | # Do a test to see if this is a libtool program. | ||
19213 | @@ -8556,7 +9568,7 @@ func_mode_uninstall () | ||
19214 | func_ltwrapper_scriptname "$file" | ||
19215 | relink_command= | ||
19216 | func_source $func_ltwrapper_scriptname_result | ||
19217 | - rmfiles="$rmfiles $func_ltwrapper_scriptname_result" | ||
19218 | + func_append rmfiles " $func_ltwrapper_scriptname_result" | ||
19219 | else | ||
19220 | relink_command= | ||
19221 | func_source $dir/$noexename | ||
19222 | @@ -8564,12 +9576,12 @@ func_mode_uninstall () | ||
19223 | |||
19224 | # note $name still contains .exe if it was in $file originally | ||
19225 | # as does the version of $file that was added into $rmfiles | ||
19226 | - rmfiles="$rmfiles $objdir/$name $objdir/${name}S.${objext}" | ||
19227 | + func_append rmfiles " $odir/$name $odir/${name}S.${objext}" | ||
19228 | if test "$fast_install" = yes && test -n "$relink_command"; then | ||
19229 | - rmfiles="$rmfiles $objdir/lt-$name" | ||
19230 | + func_append rmfiles " $odir/lt-$name" | ||
19231 | fi | ||
19232 | if test "X$noexename" != "X$name" ; then | ||
19233 | - rmfiles="$rmfiles $objdir/lt-${noexename}.c" | ||
19234 | + func_append rmfiles " $odir/lt-${noexename}.c" | ||
19235 | fi | ||
19236 | fi | ||
19237 | fi | ||
19238 | @@ -8577,7 +9589,6 @@ func_mode_uninstall () | ||
19239 | esac | ||
19240 | func_show_eval "$RM $rmfiles" 'exit_status=1' | ||
19241 | done | ||
19242 | - objdir="$origobjdir" | ||
19243 | |||
19244 | # Try to remove the ${objdir}s in the directories where we deleted files | ||
19245 | for dir in $rmdirs; do | ||
19246 | @@ -8589,16 +9600,16 @@ func_mode_uninstall () | ||
19247 | exit $exit_status | ||
19248 | } | ||
19249 | |||
19250 | -{ test "$mode" = uninstall || test "$mode" = clean; } && | ||
19251 | +{ test "$opt_mode" = uninstall || test "$opt_mode" = clean; } && | ||
19252 | func_mode_uninstall ${1+"$@"} | ||
19253 | |||
19254 | -test -z "$mode" && { | ||
19255 | +test -z "$opt_mode" && { | ||
19256 | help="$generic_help" | ||
19257 | func_fatal_help "you must specify a MODE" | ||
19258 | } | ||
19259 | |||
19260 | test -z "$exec_cmd" && \ | ||
19261 | - func_fatal_help "invalid operation mode \`$mode'" | ||
19262 | + func_fatal_help "invalid operation mode \`$opt_mode'" | ||
19263 | |||
19264 | if test -n "$exec_cmd"; then | ||
19265 | eval exec "$exec_cmd" | ||
19266 | diff --git a/ltoptions.m4 b/ltoptions.m4 | ||
19267 | index 5ef12ced2a8..17cfd51c0b3 100644 | ||
19268 | --- a/ltoptions.m4 | ||
19269 | +++ b/ltoptions.m4 | ||
19270 | @@ -8,7 +8,7 @@ | ||
19271 | # unlimited permission to copy and/or distribute it, with or without | ||
19272 | # modifications, as long as this notice is preserved. | ||
19273 | |||
19274 | -# serial 6 ltoptions.m4 | ||
19275 | +# serial 7 ltoptions.m4 | ||
19276 | |||
19277 | # This is to help aclocal find these macros, as it can't see m4_define. | ||
19278 | AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])]) | ||
19279 | diff --git a/ltversion.m4 b/ltversion.m4 | ||
19280 | index bf87f77132d..9c7b5d41185 100644 | ||
19281 | --- a/ltversion.m4 | ||
19282 | +++ b/ltversion.m4 | ||
19283 | @@ -7,17 +7,17 @@ | ||
19284 | # unlimited permission to copy and/or distribute it, with or without | ||
19285 | # modifications, as long as this notice is preserved. | ||
19286 | |||
19287 | -# Generated from ltversion.in. | ||
19288 | +# @configure_input@ | ||
19289 | |||
19290 | -# serial 3134 ltversion.m4 | ||
19291 | +# serial 3293 ltversion.m4 | ||
19292 | # This file is part of GNU Libtool | ||
19293 | |||
19294 | -m4_define([LT_PACKAGE_VERSION], [2.2.7a]) | ||
19295 | -m4_define([LT_PACKAGE_REVISION], [1.3134]) | ||
19296 | +m4_define([LT_PACKAGE_VERSION], [2.4]) | ||
19297 | +m4_define([LT_PACKAGE_REVISION], [1.3293]) | ||
19298 | |||
19299 | AC_DEFUN([LTVERSION_VERSION], | ||
19300 | -[macro_version='2.2.7a' | ||
19301 | -macro_revision='1.3134' | ||
19302 | +[macro_version='2.4' | ||
19303 | +macro_revision='1.3293' | ||
19304 | _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) | ||
19305 | _LT_DECL(, macro_revision, 0) | ||
19306 | ]) | ||
19307 | diff --git a/lt~obsolete.m4 b/lt~obsolete.m4 | ||
19308 | index bf92b5e0790..c573da90c5c 100644 | ||
19309 | --- a/lt~obsolete.m4 | ||
19310 | +++ b/lt~obsolete.m4 | ||
19311 | @@ -7,7 +7,7 @@ | ||
19312 | # unlimited permission to copy and/or distribute it, with or without | ||
19313 | # modifications, as long as this notice is preserved. | ||
19314 | |||
19315 | -# serial 4 lt~obsolete.m4 | ||
19316 | +# serial 5 lt~obsolete.m4 | ||
19317 | |||
19318 | # These exist entirely to fool aclocal when bootstrapping libtool. | ||
19319 | # | ||
19320 | diff --git a/opcodes/configure b/opcodes/configure | ||
19321 | index 8d1e561c942..a0291dfbfa7 100755 | ||
19322 | --- a/opcodes/configure | ||
19323 | +++ b/opcodes/configure | ||
19324 | @@ -680,6 +680,9 @@ OTOOL | ||
19325 | LIPO | ||
19326 | NMEDIT | ||
19327 | DSYMUTIL | ||
19328 | +MANIFEST_TOOL | ||
19329 | +ac_ct_AR | ||
19330 | +DLLTOOL | ||
19331 | OBJDUMP | ||
19332 | LN_S | ||
19333 | NM | ||
19334 | @@ -798,6 +801,7 @@ enable_static | ||
19335 | with_pic | ||
19336 | enable_fast_install | ||
19337 | with_gnu_ld | ||
19338 | +with_libtool_sysroot | ||
19339 | enable_libtool_lock | ||
19340 | enable_targets | ||
19341 | enable_werror | ||
19342 | @@ -1462,6 +1466,8 @@ Optional Packages: | ||
19343 | --with-pic try to use only PIC/non-PIC objects [default=use | ||
19344 | both] | ||
19345 | --with-gnu-ld assume the C compiler uses GNU ld [default=no] | ||
19346 | + --with-libtool-sysroot=DIR Search for dependent libraries within DIR | ||
19347 | + (or the compiler's sysroot if not specified). | ||
19348 | |||
19349 | Some influential environment variables: | ||
19350 | CC C compiler command | ||
19351 | @@ -5403,8 +5409,8 @@ esac | ||
19352 | |||
19353 | |||
19354 | |||
19355 | -macro_version='2.2.7a' | ||
19356 | -macro_revision='1.3134' | ||
19357 | +macro_version='2.4' | ||
19358 | +macro_revision='1.3293' | ||
19359 | |||
19360 | |||
19361 | |||
19362 | @@ -5444,7 +5450,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO | ||
19363 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 | ||
19364 | $as_echo_n "checking how to print strings... " >&6; } | ||
19365 | # Test print first, because it will be a builtin if present. | ||
19366 | -if test "X`print -r -- -n 2>/dev/null`" = X-n && \ | ||
19367 | +if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ | ||
19368 | test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then | ||
19369 | ECHO='print -r --' | ||
19370 | 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; | ||
19372 | # Try some XSI features | ||
19373 | xsi_shell=no | ||
19374 | ( _lt_dummy="a/b/c" | ||
19375 | - test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ | ||
19376 | - = c,a/b,, \ | ||
19377 | + test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ | ||
19378 | + = c,a/b,b/c, \ | ||
19379 | && eval 'test $(( 1 + 1 )) -eq 2 \ | ||
19380 | && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ | ||
19381 | && xsi_shell=yes | ||
19382 | @@ -6180,6 +6186,80 @@ esac | ||
19383 | |||
19384 | |||
19385 | |||
19386 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5 | ||
19387 | +$as_echo_n "checking how to convert $build file names to $host format... " >&6; } | ||
19388 | +if ${lt_cv_to_host_file_cmd+:} false; then : | ||
19389 | + $as_echo_n "(cached) " >&6 | ||
19390 | +else | ||
19391 | + case $host in | ||
19392 | + *-*-mingw* ) | ||
19393 | + case $build in | ||
19394 | + *-*-mingw* ) # actually msys | ||
19395 | + lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 | ||
19396 | + ;; | ||
19397 | + *-*-cygwin* ) | ||
19398 | + lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 | ||
19399 | + ;; | ||
19400 | + * ) # otherwise, assume *nix | ||
19401 | + lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 | ||
19402 | + ;; | ||
19403 | + esac | ||
19404 | + ;; | ||
19405 | + *-*-cygwin* ) | ||
19406 | + case $build in | ||
19407 | + *-*-mingw* ) # actually msys | ||
19408 | + lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin | ||
19409 | + ;; | ||
19410 | + *-*-cygwin* ) | ||
19411 | + lt_cv_to_host_file_cmd=func_convert_file_noop | ||
19412 | + ;; | ||
19413 | + * ) # otherwise, assume *nix | ||
19414 | + lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin | ||
19415 | + ;; | ||
19416 | + esac | ||
19417 | + ;; | ||
19418 | + * ) # unhandled hosts (and "normal" native builds) | ||
19419 | + lt_cv_to_host_file_cmd=func_convert_file_noop | ||
19420 | + ;; | ||
19421 | +esac | ||
19422 | + | ||
19423 | +fi | ||
19424 | + | ||
19425 | +to_host_file_cmd=$lt_cv_to_host_file_cmd | ||
19426 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5 | ||
19427 | +$as_echo "$lt_cv_to_host_file_cmd" >&6; } | ||
19428 | + | ||
19429 | + | ||
19430 | + | ||
19431 | + | ||
19432 | + | ||
19433 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5 | ||
19434 | +$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; } | ||
19435 | +if ${lt_cv_to_tool_file_cmd+:} false; then : | ||
19436 | + $as_echo_n "(cached) " >&6 | ||
19437 | +else | ||
19438 | + #assume ordinary cross tools, or native build. | ||
19439 | +lt_cv_to_tool_file_cmd=func_convert_file_noop | ||
19440 | +case $host in | ||
19441 | + *-*-mingw* ) | ||
19442 | + case $build in | ||
19443 | + *-*-mingw* ) # actually msys | ||
19444 | + lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 | ||
19445 | + ;; | ||
19446 | + esac | ||
19447 | + ;; | ||
19448 | +esac | ||
19449 | + | ||
19450 | +fi | ||
19451 | + | ||
19452 | +to_tool_file_cmd=$lt_cv_to_tool_file_cmd | ||
19453 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5 | ||
19454 | +$as_echo "$lt_cv_to_tool_file_cmd" >&6; } | ||
19455 | + | ||
19456 | + | ||
19457 | + | ||
19458 | + | ||
19459 | + | ||
19460 | { $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; } | ||
19462 | if ${lt_cv_ld_reload_flag+:} false; then : | ||
19463 | @@ -6196,6 +6276,11 @@ case $reload_flag in | ||
19464 | esac | ||
19465 | reload_cmds='$LD$reload_flag -o $output$reload_objs' | ||
19466 | case $host_os in | ||
19467 | + cygwin* | mingw* | pw32* | cegcc*) | ||
19468 | + if test "$GCC" != yes; then | ||
19469 | + reload_cmds=false | ||
19470 | + fi | ||
19471 | + ;; | ||
19472 | darwin*) | ||
19473 | if test "$GCC" = yes; then | ||
19474 | reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' | ||
19475 | @@ -6364,7 +6449,8 @@ mingw* | pw32*) | ||
19476 | lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' | ||
19477 | lt_cv_file_magic_cmd='func_win32_libid' | ||
19478 | else | ||
19479 | - lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' | ||
19480 | + # Keep this pattern in sync with the one in func_win32_libid. | ||
19481 | + lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' | ||
19482 | lt_cv_file_magic_cmd='$OBJDUMP -f' | ||
19483 | fi | ||
19484 | ;; | ||
19485 | @@ -6518,6 +6604,21 @@ esac | ||
19486 | fi | ||
19487 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 | ||
19488 | $as_echo "$lt_cv_deplibs_check_method" >&6; } | ||
19489 | + | ||
19490 | +file_magic_glob= | ||
19491 | +want_nocaseglob=no | ||
19492 | +if test "$build" = "$host"; then | ||
19493 | + case $host_os in | ||
19494 | + mingw* | pw32*) | ||
19495 | + if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then | ||
19496 | + want_nocaseglob=yes | ||
19497 | + else | ||
19498 | + file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"` | ||
19499 | + fi | ||
19500 | + ;; | ||
19501 | + esac | ||
19502 | +fi | ||
19503 | + | ||
19504 | file_magic_cmd=$lt_cv_file_magic_cmd | ||
19505 | deplibs_check_method=$lt_cv_deplibs_check_method | ||
19506 | test -z "$deplibs_check_method" && deplibs_check_method=unknown | ||
19507 | @@ -6531,11 +6632,164 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown | ||
19508 | |||
19509 | |||
19510 | |||
19511 | + | ||
19512 | + | ||
19513 | + | ||
19514 | + | ||
19515 | + | ||
19516 | + | ||
19517 | + | ||
19518 | + | ||
19519 | + | ||
19520 | + | ||
19521 | |||
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. | ||
19527 | +set dummy ${ac_tool_prefix}dlltool; ac_word=$2 | ||
19528 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
19529 | +$as_echo_n "checking for $ac_word... " >&6; } | ||
19530 | +if ${ac_cv_prog_DLLTOOL+:} false; then : | ||
19531 | + $as_echo_n "(cached) " >&6 | ||
19532 | +else | ||
19533 | + if test -n "$DLLTOOL"; then | ||
19534 | + ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. | ||
19535 | +else | ||
19536 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | ||
19537 | +for as_dir in $PATH | ||
19538 | +do | ||
19539 | + IFS=$as_save_IFS | ||
19540 | + test -z "$as_dir" && as_dir=. | ||
19541 | + for ac_exec_ext in '' $ac_executable_extensions; do | ||
19542 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | ||
19543 | + ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" | ||
19544 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
19545 | + break 2 | ||
19546 | + fi | ||
19547 | +done | ||
19548 | + done | ||
19549 | +IFS=$as_save_IFS | ||
19550 | + | ||
19551 | +fi | ||
19552 | +fi | ||
19553 | +DLLTOOL=$ac_cv_prog_DLLTOOL | ||
19554 | +if test -n "$DLLTOOL"; then | ||
19555 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 | ||
19556 | +$as_echo "$DLLTOOL" >&6; } | ||
19557 | +else | ||
19558 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
19559 | +$as_echo "no" >&6; } | ||
19560 | +fi | ||
19561 | + | ||
19562 | + | ||
19563 | +fi | ||
19564 | +if test -z "$ac_cv_prog_DLLTOOL"; then | ||
19565 | + ac_ct_DLLTOOL=$DLLTOOL | ||
19566 | + # Extract the first word of "dlltool", so it can be a program name with args. | ||
19567 | +set dummy dlltool; ac_word=$2 | ||
19568 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
19569 | +$as_echo_n "checking for $ac_word... " >&6; } | ||
19570 | +if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then : | ||
19571 | + $as_echo_n "(cached) " >&6 | ||
19572 | +else | ||
19573 | + if test -n "$ac_ct_DLLTOOL"; then | ||
19574 | + ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. | ||
19575 | +else | ||
19576 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | ||
19577 | +for as_dir in $PATH | ||
19578 | +do | ||
19579 | + IFS=$as_save_IFS | ||
19580 | + test -z "$as_dir" && as_dir=. | ||
19581 | + for ac_exec_ext in '' $ac_executable_extensions; do | ||
19582 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | ||
19583 | + ac_cv_prog_ac_ct_DLLTOOL="dlltool" | ||
19584 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
19585 | + break 2 | ||
19586 | + fi | ||
19587 | +done | ||
19588 | + done | ||
19589 | +IFS=$as_save_IFS | ||
19590 | + | ||
19591 | +fi | ||
19592 | +fi | ||
19593 | +ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL | ||
19594 | +if test -n "$ac_ct_DLLTOOL"; then | ||
19595 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 | ||
19596 | +$as_echo "$ac_ct_DLLTOOL" >&6; } | ||
19597 | +else | ||
19598 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
19599 | +$as_echo "no" >&6; } | ||
19600 | +fi | ||
19601 | + | ||
19602 | + if test "x$ac_ct_DLLTOOL" = x; then | ||
19603 | + DLLTOOL="false" | ||
19604 | + else | ||
19605 | + case $cross_compiling:$ac_tool_warned in | ||
19606 | +yes:) | ||
19607 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 | ||
19608 | +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} | ||
19609 | +ac_tool_warned=yes ;; | ||
19610 | +esac | ||
19611 | + DLLTOOL=$ac_ct_DLLTOOL | ||
19612 | + fi | ||
19613 | +else | ||
19614 | + DLLTOOL="$ac_cv_prog_DLLTOOL" | ||
19615 | +fi | ||
19616 | + | ||
19617 | +test -z "$DLLTOOL" && DLLTOOL=dlltool | ||
19618 | + | ||
19619 | + | ||
19620 | + | ||
19621 | + | ||
19622 | + | ||
19623 | + | ||
19624 | + | ||
19625 | + | ||
19626 | + | ||
19627 | + | ||
19628 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5 | ||
19629 | +$as_echo_n "checking how to associate runtime and link libraries... " >&6; } | ||
19630 | +if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then : | ||
19631 | + $as_echo_n "(cached) " >&6 | ||
19632 | +else | ||
19633 | + lt_cv_sharedlib_from_linklib_cmd='unknown' | ||
19634 | + | ||
19635 | +case $host_os in | ||
19636 | +cygwin* | mingw* | pw32* | cegcc*) | ||
19637 | + # two different shell functions defined in ltmain.sh | ||
19638 | + # decide which to use based on capabilities of $DLLTOOL | ||
19639 | + case `$DLLTOOL --help 2>&1` in | ||
19640 | + *--identify-strict*) | ||
19641 | + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib | ||
19642 | + ;; | ||
19643 | + *) | ||
19644 | + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback | ||
19645 | + ;; | ||
19646 | + esac | ||
19647 | + ;; | ||
19648 | +*) | ||
19649 | + # fallback: assume linklib IS sharedlib | ||
19650 | + lt_cv_sharedlib_from_linklib_cmd="$ECHO" | ||
19651 | + ;; | ||
19652 | +esac | ||
19653 | + | ||
19654 | +fi | ||
19655 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5 | ||
19656 | +$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; } | ||
19657 | +sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd | ||
19658 | +test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO | ||
19659 | + | ||
19660 | + | ||
19661 | + | ||
19662 | + | ||
19663 | + | ||
19664 | + | ||
19665 | + | ||
19666 | +if test -n "$ac_tool_prefix"; then | ||
19667 | + for ac_prog in ar | ||
19668 | + do | ||
19669 | + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. | ||
19670 | +set dummy $ac_tool_prefix$ac_prog; ac_word=$2 | ||
19671 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
19672 | $as_echo_n "checking for $ac_word... " >&6; } | ||
19673 | if ${ac_cv_prog_AR+:} false; then : | ||
19674 | @@ -6551,7 +6805,7 @@ do | ||
19675 | test -z "$as_dir" && as_dir=. | ||
19676 | for ac_exec_ext in '' $ac_executable_extensions; do | ||
19677 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | ||
19678 | - ac_cv_prog_AR="${ac_tool_prefix}ar" | ||
19679 | + ac_cv_prog_AR="$ac_tool_prefix$ac_prog" | ||
19680 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
19681 | break 2 | ||
19682 | fi | ||
19683 | @@ -6571,11 +6825,15 @@ $as_echo "no" >&6; } | ||
19684 | fi | ||
19685 | |||
19686 | |||
19687 | + test -n "$AR" && break | ||
19688 | + done | ||
19689 | fi | ||
19690 | -if test -z "$ac_cv_prog_AR"; then | ||
19691 | +if test -z "$AR"; then | ||
19692 | ac_ct_AR=$AR | ||
19693 | - # Extract the first word of "ar", so it can be a program name with args. | ||
19694 | -set dummy ar; ac_word=$2 | ||
19695 | + for ac_prog in ar | ||
19696 | +do | ||
19697 | + # Extract the first word of "$ac_prog", so it can be a program name with args. | ||
19698 | +set dummy $ac_prog; ac_word=$2 | ||
19699 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
19700 | $as_echo_n "checking for $ac_word... " >&6; } | ||
19701 | if ${ac_cv_prog_ac_ct_AR+:} false; then : | ||
19702 | @@ -6591,7 +6849,7 @@ do | ||
19703 | test -z "$as_dir" && as_dir=. | ||
19704 | for ac_exec_ext in '' $ac_executable_extensions; do | ||
19705 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | ||
19706 | - ac_cv_prog_ac_ct_AR="ar" | ||
19707 | + ac_cv_prog_ac_ct_AR="$ac_prog" | ||
19708 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
19709 | break 2 | ||
19710 | fi | ||
19711 | @@ -6610,6 +6868,10 @@ else | ||
19712 | $as_echo "no" >&6; } | ||
19713 | fi | ||
19714 | |||
19715 | + | ||
19716 | + test -n "$ac_ct_AR" && break | ||
19717 | +done | ||
19718 | + | ||
19719 | if test "x$ac_ct_AR" = x; then | ||
19720 | AR="false" | ||
19721 | else | ||
19722 | @@ -6621,16 +6883,72 @@ ac_tool_warned=yes ;; | ||
19723 | esac | ||
19724 | AR=$ac_ct_AR | ||
19725 | fi | ||
19726 | -else | ||
19727 | - AR="$ac_cv_prog_AR" | ||
19728 | fi | ||
19729 | |||
19730 | -test -z "$AR" && AR=ar | ||
19731 | -test -z "$AR_FLAGS" && AR_FLAGS=cru | ||
19732 | +: ${AR=ar} | ||
19733 | +: ${AR_FLAGS=cru} | ||
19734 | + | ||
19735 | + | ||
19736 | + | ||
19737 | + | ||
19738 | + | ||
19739 | + | ||
19740 | + | ||
19741 | + | ||
19742 | + | ||
19743 | + | ||
19744 | + | ||
19745 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 | ||
19746 | +$as_echo_n "checking for archiver @FILE support... " >&6; } | ||
19747 | +if ${lt_cv_ar_at_file+:} false; then : | ||
19748 | + $as_echo_n "(cached) " >&6 | ||
19749 | +else | ||
19750 | + lt_cv_ar_at_file=no | ||
19751 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
19752 | +/* end confdefs.h. */ | ||
19753 | + | ||
19754 | +int | ||
19755 | +main () | ||
19756 | +{ | ||
19757 | |||
19758 | + ; | ||
19759 | + return 0; | ||
19760 | +} | ||
19761 | +_ACEOF | ||
19762 | +if ac_fn_c_try_compile "$LINENO"; then : | ||
19763 | + echo conftest.$ac_objext > conftest.lst | ||
19764 | + lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5' | ||
19765 | + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 | ||
19766 | + (eval $lt_ar_try) 2>&5 | ||
19767 | + ac_status=$? | ||
19768 | + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 | ||
19769 | + test $ac_status = 0; } | ||
19770 | + if test "$ac_status" -eq 0; then | ||
19771 | + # Ensure the archiver fails upon bogus file names. | ||
19772 | + rm -f conftest.$ac_objext libconftest.a | ||
19773 | + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 | ||
19774 | + (eval $lt_ar_try) 2>&5 | ||
19775 | + ac_status=$? | ||
19776 | + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 | ||
19777 | + test $ac_status = 0; } | ||
19778 | + if test "$ac_status" -ne 0; then | ||
19779 | + lt_cv_ar_at_file=@ | ||
19780 | + fi | ||
19781 | + fi | ||
19782 | + rm -f conftest.* libconftest.a | ||
19783 | |||
19784 | +fi | ||
19785 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
19786 | |||
19787 | +fi | ||
19788 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 | ||
19789 | +$as_echo "$lt_cv_ar_at_file" >&6; } | ||
19790 | |||
19791 | +if test "x$lt_cv_ar_at_file" = xno; then | ||
19792 | + archiver_list_spec= | ||
19793 | +else | ||
19794 | + archiver_list_spec=$lt_cv_ar_at_file | ||
19795 | +fi | ||
19796 | |||
19797 | |||
19798 | |||
19799 | @@ -6972,8 +7290,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'" | ||
19801 | |||
19802 | # Transform an extracted symbol line into symbol name and symbol address | ||
19803 | -lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" | ||
19804 | -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'" | ||
19805 | +lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" | ||
19806 | +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'" | ||
19807 | |||
19808 | # Handle CRLF in mingw tool chain | ||
19809 | opt_cr= | ||
19810 | @@ -7009,6 +7327,7 @@ for ac_symprfx in "" "_"; do | ||
19811 | else | ||
19812 | lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" | ||
19813 | fi | ||
19814 | + lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" | ||
19815 | |||
19816 | # Check to see that the pipe works correctly. | ||
19817 | pipe_works=no | ||
19818 | @@ -7050,6 +7369,18 @@ _LT_EOF | ||
19819 | if $GREP ' nm_test_var$' "$nlist" >/dev/null; then | ||
19820 | if $GREP ' nm_test_func$' "$nlist" >/dev/null; then | ||
19821 | cat <<_LT_EOF > conftest.$ac_ext | ||
19822 | +/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ | ||
19823 | +#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) | ||
19824 | +/* DATA imports from DLLs on WIN32 con't be const, because runtime | ||
19825 | + relocations are performed -- see ld's documentation on pseudo-relocs. */ | ||
19826 | +# define LT_DLSYM_CONST | ||
19827 | +#elif defined(__osf__) | ||
19828 | +/* This system does not cope well with relocations in const data. */ | ||
19829 | +# define LT_DLSYM_CONST | ||
19830 | +#else | ||
19831 | +# define LT_DLSYM_CONST const | ||
19832 | +#endif | ||
19833 | + | ||
19834 | #ifdef __cplusplus | ||
19835 | extern "C" { | ||
19836 | #endif | ||
19837 | @@ -7061,7 +7392,7 @@ _LT_EOF | ||
19838 | cat <<_LT_EOF >> conftest.$ac_ext | ||
19839 | |||
19840 | /* The mapping between symbol names and symbols. */ | ||
19841 | -const struct { | ||
19842 | +LT_DLSYM_CONST struct { | ||
19843 | const char *name; | ||
19844 | void *address; | ||
19845 | } | ||
19846 | @@ -7087,8 +7418,8 @@ static const void *lt_preloaded_setup() { | ||
19847 | _LT_EOF | ||
19848 | # Now try linking the two files. | ||
19849 | mv conftest.$ac_objext conftstm.$ac_objext | ||
19850 | - lt_save_LIBS="$LIBS" | ||
19851 | - lt_save_CFLAGS="$CFLAGS" | ||
19852 | + lt_globsym_save_LIBS=$LIBS | ||
19853 | + lt_globsym_save_CFLAGS=$CFLAGS | ||
19854 | LIBS="conftstm.$ac_objext" | ||
19855 | CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" | ||
19856 | if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 | ||
19857 | @@ -7098,8 +7429,8 @@ _LT_EOF | ||
19858 | test $ac_status = 0; } && test -s conftest${ac_exeext}; then | ||
19859 | pipe_works=yes | ||
19860 | fi | ||
19861 | - LIBS="$lt_save_LIBS" | ||
19862 | - CFLAGS="$lt_save_CFLAGS" | ||
19863 | + LIBS=$lt_globsym_save_LIBS | ||
19864 | + CFLAGS=$lt_globsym_save_CFLAGS | ||
19865 | else | ||
19866 | echo "cannot find nm_test_func in $nlist" >&5 | ||
19867 | fi | ||
19868 | @@ -7136,6 +7467,16 @@ else | ||
19869 | $as_echo "ok" >&6; } | ||
19870 | fi | ||
19871 | |||
19872 | +# Response file support. | ||
19873 | +if test "$lt_cv_nm_interface" = "MS dumpbin"; then | ||
19874 | + nm_file_list_spec='@' | ||
19875 | +elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then | ||
19876 | + nm_file_list_spec='@' | ||
19877 | +fi | ||
19878 | + | ||
19879 | + | ||
19880 | + | ||
19881 | + | ||
19882 | |||
19883 | |||
19884 | |||
19885 | @@ -7152,6 +7493,45 @@ fi | ||
19886 | |||
19887 | |||
19888 | |||
19889 | + | ||
19890 | + | ||
19891 | + | ||
19892 | + | ||
19893 | + | ||
19894 | + | ||
19895 | + | ||
19896 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 | ||
19897 | +$as_echo_n "checking for sysroot... " >&6; } | ||
19898 | + | ||
19899 | +# Check whether --with-libtool-sysroot was given. | ||
19900 | +if test "${with_libtool_sysroot+set}" = set; then : | ||
19901 | + withval=$with_libtool_sysroot; | ||
19902 | +else | ||
19903 | + with_libtool_sysroot=no | ||
19904 | +fi | ||
19905 | + | ||
19906 | + | ||
19907 | +lt_sysroot= | ||
19908 | +case ${with_libtool_sysroot} in #( | ||
19909 | + yes) | ||
19910 | + if test "$GCC" = yes; then | ||
19911 | + lt_sysroot=`$CC --print-sysroot 2>/dev/null` | ||
19912 | + fi | ||
19913 | + ;; #( | ||
19914 | + /*) | ||
19915 | + lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"` | ||
19916 | + ;; #( | ||
19917 | + no|'') | ||
19918 | + ;; #( | ||
19919 | + *) | ||
19920 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5 | ||
19921 | +$as_echo "${with_libtool_sysroot}" >&6; } | ||
19922 | + as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 | ||
19923 | + ;; | ||
19924 | +esac | ||
19925 | + | ||
19926 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 | ||
19927 | +$as_echo "${lt_sysroot:-no}" >&6; } | ||
19928 | |||
19929 | |||
19930 | |||
19931 | @@ -7363,6 +7743,123 @@ esac | ||
19932 | |||
19933 | need_locks="$enable_libtool_lock" | ||
19934 | |||
19935 | +if test -n "$ac_tool_prefix"; then | ||
19936 | + # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args. | ||
19937 | +set dummy ${ac_tool_prefix}mt; ac_word=$2 | ||
19938 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
19939 | +$as_echo_n "checking for $ac_word... " >&6; } | ||
19940 | +if ${ac_cv_prog_MANIFEST_TOOL+:} false; then : | ||
19941 | + $as_echo_n "(cached) " >&6 | ||
19942 | +else | ||
19943 | + if test -n "$MANIFEST_TOOL"; then | ||
19944 | + ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test. | ||
19945 | +else | ||
19946 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | ||
19947 | +for as_dir in $PATH | ||
19948 | +do | ||
19949 | + IFS=$as_save_IFS | ||
19950 | + test -z "$as_dir" && as_dir=. | ||
19951 | + for ac_exec_ext in '' $ac_executable_extensions; do | ||
19952 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | ||
19953 | + ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" | ||
19954 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
19955 | + break 2 | ||
19956 | + fi | ||
19957 | +done | ||
19958 | + done | ||
19959 | +IFS=$as_save_IFS | ||
19960 | + | ||
19961 | +fi | ||
19962 | +fi | ||
19963 | +MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL | ||
19964 | +if test -n "$MANIFEST_TOOL"; then | ||
19965 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5 | ||
19966 | +$as_echo "$MANIFEST_TOOL" >&6; } | ||
19967 | +else | ||
19968 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
19969 | +$as_echo "no" >&6; } | ||
19970 | +fi | ||
19971 | + | ||
19972 | + | ||
19973 | +fi | ||
19974 | +if test -z "$ac_cv_prog_MANIFEST_TOOL"; then | ||
19975 | + ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL | ||
19976 | + # Extract the first word of "mt", so it can be a program name with args. | ||
19977 | +set dummy mt; ac_word=$2 | ||
19978 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
19979 | +$as_echo_n "checking for $ac_word... " >&6; } | ||
19980 | +if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then : | ||
19981 | + $as_echo_n "(cached) " >&6 | ||
19982 | +else | ||
19983 | + if test -n "$ac_ct_MANIFEST_TOOL"; then | ||
19984 | + ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test. | ||
19985 | +else | ||
19986 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | ||
19987 | +for as_dir in $PATH | ||
19988 | +do | ||
19989 | + IFS=$as_save_IFS | ||
19990 | + test -z "$as_dir" && as_dir=. | ||
19991 | + for ac_exec_ext in '' $ac_executable_extensions; do | ||
19992 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | ||
19993 | + ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" | ||
19994 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
19995 | + break 2 | ||
19996 | + fi | ||
19997 | +done | ||
19998 | + done | ||
19999 | +IFS=$as_save_IFS | ||
20000 | + | ||
20001 | +fi | ||
20002 | +fi | ||
20003 | +ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL | ||
20004 | +if test -n "$ac_ct_MANIFEST_TOOL"; then | ||
20005 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5 | ||
20006 | +$as_echo "$ac_ct_MANIFEST_TOOL" >&6; } | ||
20007 | +else | ||
20008 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
20009 | +$as_echo "no" >&6; } | ||
20010 | +fi | ||
20011 | + | ||
20012 | + if test "x$ac_ct_MANIFEST_TOOL" = x; then | ||
20013 | + MANIFEST_TOOL=":" | ||
20014 | + else | ||
20015 | + case $cross_compiling:$ac_tool_warned in | ||
20016 | +yes:) | ||
20017 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 | ||
20018 | +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} | ||
20019 | +ac_tool_warned=yes ;; | ||
20020 | +esac | ||
20021 | + MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL | ||
20022 | + fi | ||
20023 | +else | ||
20024 | + MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL" | ||
20025 | +fi | ||
20026 | + | ||
20027 | +test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt | ||
20028 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5 | ||
20029 | +$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; } | ||
20030 | +if ${lt_cv_path_mainfest_tool+:} false; then : | ||
20031 | + $as_echo_n "(cached) " >&6 | ||
20032 | +else | ||
20033 | + lt_cv_path_mainfest_tool=no | ||
20034 | + echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5 | ||
20035 | + $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out | ||
20036 | + cat conftest.err >&5 | ||
20037 | + if $GREP 'Manifest Tool' conftest.out > /dev/null; then | ||
20038 | + lt_cv_path_mainfest_tool=yes | ||
20039 | + fi | ||
20040 | + rm -f conftest* | ||
20041 | +fi | ||
20042 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5 | ||
20043 | +$as_echo "$lt_cv_path_mainfest_tool" >&6; } | ||
20044 | +if test "x$lt_cv_path_mainfest_tool" != xyes; then | ||
20045 | + MANIFEST_TOOL=: | ||
20046 | +fi | ||
20047 | + | ||
20048 | + | ||
20049 | + | ||
20050 | + | ||
20051 | + | ||
20052 | |||
20053 | case $host_os in | ||
20054 | rhapsody* | darwin*) | ||
20055 | @@ -7926,6 +8423,8 @@ _LT_EOF | ||
20056 | $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 | ||
20057 | echo "$AR cru libconftest.a conftest.o" >&5 | ||
20058 | $AR cru libconftest.a conftest.o 2>&5 | ||
20059 | + echo "$RANLIB libconftest.a" >&5 | ||
20060 | + $RANLIB libconftest.a 2>&5 | ||
20061 | cat > conftest.c << _LT_EOF | ||
20062 | int main() { return 0;} | ||
20063 | _LT_EOF | ||
20064 | @@ -8091,7 +8590,8 @@ 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= | ||
20085 | lt_prog_compiler_static= | ||
20086 | |||
20087 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 | ||
20088 | -$as_echo_n "checking for $compiler option to produce PIC... " >&6; } | ||
20089 | |||
20090 | if test "$GCC" = yes; then | ||
20091 | lt_prog_compiler_wl='-Wl,' | ||
20092 | @@ -8645,6 +9143,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } | ||
20093 | lt_prog_compiler_pic='--shared' | ||
20094 | lt_prog_compiler_static='--static' | ||
20095 | ;; | ||
20096 | + nagfor*) | ||
20097 | + # NAG Fortran compiler | ||
20098 | + lt_prog_compiler_wl='-Wl,-Wl,,' | ||
20099 | + lt_prog_compiler_pic='-PIC' | ||
20100 | + lt_prog_compiler_static='-Bstatic' | ||
20101 | + ;; | ||
20102 | pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) | ||
20103 | # Portland Group compilers (*not* the Pentium gcc compiler, | ||
20104 | # which looks to be a dead project) | ||
20105 | @@ -8707,7 +9211,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } | ||
20106 | lt_prog_compiler_pic='-KPIC' | ||
20107 | lt_prog_compiler_static='-Bstatic' | ||
20108 | case $cc_basename in | ||
20109 | - f77* | f90* | f95*) | ||
20110 | + f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) | ||
20111 | lt_prog_compiler_wl='-Qoption ld ';; | ||
20112 | *) | ||
20113 | lt_prog_compiler_wl='-Wl,';; | ||
20114 | @@ -8764,13 +9268,17 @@ case $host_os in | ||
20115 | lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" | ||
20116 | ;; | ||
20117 | esac | ||
20118 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5 | ||
20119 | -$as_echo "$lt_prog_compiler_pic" >&6; } | ||
20120 | - | ||
20121 | - | ||
20122 | - | ||
20123 | - | ||
20124 | |||
20125 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 | ||
20126 | +$as_echo_n "checking for $compiler option to produce PIC... " >&6; } | ||
20127 | +if ${lt_cv_prog_compiler_pic+:} false; then : | ||
20128 | + $as_echo_n "(cached) " >&6 | ||
20129 | +else | ||
20130 | + lt_cv_prog_compiler_pic=$lt_prog_compiler_pic | ||
20131 | +fi | ||
20132 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5 | ||
20133 | +$as_echo "$lt_cv_prog_compiler_pic" >&6; } | ||
20134 | +lt_prog_compiler_pic=$lt_cv_prog_compiler_pic | ||
20135 | |||
20136 | # | ||
20137 | # Check to make sure the PIC flag actually works. | ||
20138 | @@ -8831,6 +9339,11 @@ fi | ||
20139 | |||
20140 | |||
20141 | |||
20142 | + | ||
20143 | + | ||
20144 | + | ||
20145 | + | ||
20146 | + | ||
20147 | # | ||
20148 | # Check to make sure the static flag actually works. | ||
20149 | # | ||
20150 | @@ -9181,7 +9694,8 @@ _LT_EOF | ||
20151 | allow_undefined_flag=unsupported | ||
20152 | always_export_symbols=no | ||
20153 | enable_shared_with_static_runtimes=yes | ||
20154 | - export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' | ||
20155 | + 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' | ||
20156 | + exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' | ||
20157 | |||
20158 | 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' | ||
20160 | @@ -9280,12 +9794,12 @@ _LT_EOF | ||
20161 | whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' | ||
20162 | hardcode_libdir_flag_spec= | ||
20163 | hardcode_libdir_flag_spec_ld='-rpath $libdir' | ||
20164 | - archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' | ||
20165 | + archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' | ||
20166 | if test "x$supports_anon_versioning" = xyes; then | ||
20167 | archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ | ||
20168 | cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ | ||
20169 | echo "local: *; };" >> $output_objdir/$libname.ver~ | ||
20170 | - $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' | ||
20171 | + $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' | ||
20172 | fi | ||
20173 | ;; | ||
20174 | esac | ||
20175 | @@ -9299,8 +9813,8 @@ _LT_EOF | ||
20176 | archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' | ||
20177 | wlarc= | ||
20178 | else | ||
20179 | - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' | ||
20180 | - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' | ||
20181 | + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' | ||
20182 | + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' | ||
20183 | fi | ||
20184 | ;; | ||
20185 | |||
20186 | @@ -9318,8 +9832,8 @@ _LT_EOF | ||
20187 | |||
20188 | _LT_EOF | ||
20189 | elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then | ||
20190 | - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' | ||
20191 | - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' | ||
20192 | + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' | ||
20193 | + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' | ||
20194 | else | ||
20195 | ld_shlibs=no | ||
20196 | fi | ||
20197 | @@ -9365,8 +9879,8 @@ _LT_EOF | ||
20198 | |||
20199 | *) | ||
20200 | if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then | ||
20201 | - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' | ||
20202 | - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' | ||
20203 | + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' | ||
20204 | + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' | ||
20205 | else | ||
20206 | ld_shlibs=no | ||
20207 | fi | ||
20208 | @@ -9496,7 +10010,13 @@ _LT_EOF | ||
20209 | allow_undefined_flag='-berok' | ||
20210 | # Determine the default libpath from the value encoded in an | ||
20211 | # empty executable. | ||
20212 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
20213 | + if test "${lt_cv_aix_libpath+set}" = set; then | ||
20214 | + aix_libpath=$lt_cv_aix_libpath | ||
20215 | +else | ||
20216 | + if ${lt_cv_aix_libpath_+:} false; then : | ||
20217 | + $as_echo_n "(cached) " >&6 | ||
20218 | +else | ||
20219 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
20220 | /* end confdefs.h. */ | ||
20221 | |||
20222 | int | ||
20223 | @@ -9509,22 +10029,29 @@ main () | ||
20224 | _ACEOF | ||
20225 | if ac_fn_c_try_link "$LINENO"; then : | ||
20226 | |||
20227 | -lt_aix_libpath_sed=' | ||
20228 | - /Import File Strings/,/^$/ { | ||
20229 | - /^0/ { | ||
20230 | - s/^0 *\(.*\)$/\1/ | ||
20231 | - p | ||
20232 | - } | ||
20233 | - }' | ||
20234 | -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | ||
20235 | -# Check for a 64-bit object if we didn't find anything. | ||
20236 | -if test -z "$aix_libpath"; then | ||
20237 | - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | ||
20238 | -fi | ||
20239 | + lt_aix_libpath_sed=' | ||
20240 | + /Import File Strings/,/^$/ { | ||
20241 | + /^0/ { | ||
20242 | + s/^0 *\([^ ]*\) *$/\1/ | ||
20243 | + p | ||
20244 | + } | ||
20245 | + }' | ||
20246 | + lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | ||
20247 | + # Check for a 64-bit object if we didn't find anything. | ||
20248 | + if test -z "$lt_cv_aix_libpath_"; then | ||
20249 | + lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | ||
20250 | + fi | ||
20251 | fi | ||
20252 | rm -f core conftest.err conftest.$ac_objext \ | ||
20253 | conftest$ac_exeext conftest.$ac_ext | ||
20254 | -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | ||
20255 | + if test -z "$lt_cv_aix_libpath_"; then | ||
20256 | + lt_cv_aix_libpath_="/usr/lib:/lib" | ||
20257 | + fi | ||
20258 | + | ||
20259 | +fi | ||
20260 | + | ||
20261 | + aix_libpath=$lt_cv_aix_libpath_ | ||
20262 | +fi | ||
20263 | |||
20264 | 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" | ||
20266 | @@ -9536,7 +10063,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | ||
20267 | else | ||
20268 | # Determine the default libpath from the value encoded in an | ||
20269 | # empty executable. | ||
20270 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
20271 | + if test "${lt_cv_aix_libpath+set}" = set; then | ||
20272 | + aix_libpath=$lt_cv_aix_libpath | ||
20273 | +else | ||
20274 | + if ${lt_cv_aix_libpath_+:} false; then : | ||
20275 | + $as_echo_n "(cached) " >&6 | ||
20276 | +else | ||
20277 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
20278 | /* end confdefs.h. */ | ||
20279 | |||
20280 | int | ||
20281 | @@ -9549,22 +10082,29 @@ main () | ||
20282 | _ACEOF | ||
20283 | if ac_fn_c_try_link "$LINENO"; then : | ||
20284 | |||
20285 | -lt_aix_libpath_sed=' | ||
20286 | - /Import File Strings/,/^$/ { | ||
20287 | - /^0/ { | ||
20288 | - s/^0 *\(.*\)$/\1/ | ||
20289 | - p | ||
20290 | - } | ||
20291 | - }' | ||
20292 | -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | ||
20293 | -# Check for a 64-bit object if we didn't find anything. | ||
20294 | -if test -z "$aix_libpath"; then | ||
20295 | - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | ||
20296 | -fi | ||
20297 | + lt_aix_libpath_sed=' | ||
20298 | + /Import File Strings/,/^$/ { | ||
20299 | + /^0/ { | ||
20300 | + s/^0 *\([^ ]*\) *$/\1/ | ||
20301 | + p | ||
20302 | + } | ||
20303 | + }' | ||
20304 | + lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | ||
20305 | + # Check for a 64-bit object if we didn't find anything. | ||
20306 | + if test -z "$lt_cv_aix_libpath_"; then | ||
20307 | + lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | ||
20308 | + fi | ||
20309 | fi | ||
20310 | rm -f core conftest.err conftest.$ac_objext \ | ||
20311 | conftest$ac_exeext conftest.$ac_ext | ||
20312 | -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | ||
20313 | + if test -z "$lt_cv_aix_libpath_"; then | ||
20314 | + lt_cv_aix_libpath_="/usr/lib:/lib" | ||
20315 | + fi | ||
20316 | + | ||
20317 | +fi | ||
20318 | + | ||
20319 | + aix_libpath=$lt_cv_aix_libpath_ | ||
20320 | +fi | ||
20321 | |||
20322 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" | ||
20323 | # 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 | ||
20325 | # Microsoft Visual C++. | ||
20326 | # hardcode_libdir_flag_spec is actually meaningless, as there is | ||
20327 | # no search path for DLLs. | ||
20328 | - hardcode_libdir_flag_spec=' ' | ||
20329 | - allow_undefined_flag=unsupported | ||
20330 | - # Tell ltmain to make .lib files, not .a files. | ||
20331 | - libext=lib | ||
20332 | - # Tell ltmain to make .dll files, not .so files. | ||
20333 | - shrext_cmds=".dll" | ||
20334 | - # FIXME: Setting linknames here is a bad hack. | ||
20335 | - archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' | ||
20336 | - # The linker will automatically build a .lib file if we build a DLL. | ||
20337 | - old_archive_from_new_cmds='true' | ||
20338 | - # FIXME: Should let the user specify the lib program. | ||
20339 | - old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' | ||
20340 | - fix_srcfile_path='`cygpath -w "$srcfile"`' | ||
20341 | - enable_shared_with_static_runtimes=yes | ||
20342 | + case $cc_basename in | ||
20343 | + cl*) | ||
20344 | + # Native MSVC | ||
20345 | + hardcode_libdir_flag_spec=' ' | ||
20346 | + allow_undefined_flag=unsupported | ||
20347 | + always_export_symbols=yes | ||
20348 | + file_list_spec='@' | ||
20349 | + # Tell ltmain to make .lib files, not .a files. | ||
20350 | + libext=lib | ||
20351 | + # Tell ltmain to make .dll files, not .so files. | ||
20352 | + shrext_cmds=".dll" | ||
20353 | + # FIXME: Setting linknames here is a bad hack. | ||
20354 | + archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' | ||
20355 | + archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then | ||
20356 | + sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; | ||
20357 | + else | ||
20358 | + sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; | ||
20359 | + fi~ | ||
20360 | + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ | ||
20361 | + linknames=' | ||
20362 | + # The linker will not automatically build a static lib if we build a DLL. | ||
20363 | + # _LT_TAGVAR(old_archive_from_new_cmds, )='true' | ||
20364 | + enable_shared_with_static_runtimes=yes | ||
20365 | + export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' | ||
20366 | + # Don't use ranlib | ||
20367 | + old_postinstall_cmds='chmod 644 $oldlib' | ||
20368 | + postlink_cmds='lt_outputfile="@OUTPUT@"~ | ||
20369 | + lt_tool_outputfile="@TOOL_OUTPUT@"~ | ||
20370 | + case $lt_outputfile in | ||
20371 | + *.exe|*.EXE) ;; | ||
20372 | + *) | ||
20373 | + lt_outputfile="$lt_outputfile.exe" | ||
20374 | + lt_tool_outputfile="$lt_tool_outputfile.exe" | ||
20375 | + ;; | ||
20376 | + esac~ | ||
20377 | + if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then | ||
20378 | + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; | ||
20379 | + $RM "$lt_outputfile.manifest"; | ||
20380 | + fi' | ||
20381 | + ;; | ||
20382 | + *) | ||
20383 | + # Assume MSVC wrapper | ||
20384 | + hardcode_libdir_flag_spec=' ' | ||
20385 | + allow_undefined_flag=unsupported | ||
20386 | + # Tell ltmain to make .lib files, not .a files. | ||
20387 | + libext=lib | ||
20388 | + # Tell ltmain to make .dll files, not .so files. | ||
20389 | + shrext_cmds=".dll" | ||
20390 | + # FIXME: Setting linknames here is a bad hack. | ||
20391 | + archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' | ||
20392 | + # The linker will automatically build a .lib file if we build a DLL. | ||
20393 | + old_archive_from_new_cmds='true' | ||
20394 | + # FIXME: Should let the user specify the lib program. | ||
20395 | + old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' | ||
20396 | + enable_shared_with_static_runtimes=yes | ||
20397 | + ;; | ||
20398 | + esac | ||
20399 | ;; | ||
20400 | |||
20401 | darwin* | rhapsody*) | ||
20402 | @@ -9683,7 +10266,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | ||
20403 | |||
20404 | # FreeBSD 3 and greater uses gcc -shared to do shared libraries. | ||
20405 | freebsd* | dragonfly*) | ||
20406 | - archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' | ||
20407 | + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' | ||
20408 | hardcode_libdir_flag_spec='-R$libdir' | ||
20409 | hardcode_direct=yes | ||
20410 | hardcode_shlibpath_var=no | ||
20411 | @@ -9691,7 +10274,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | ||
20412 | |||
20413 | hpux9*) | ||
20414 | if test "$GCC" = yes; then | ||
20415 | - 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' | ||
20416 | + 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' | ||
20417 | 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' | ||
20419 | fi | ||
20420 | @@ -9707,7 +10290,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | ||
20421 | |||
20422 | hpux10*) | ||
20423 | if test "$GCC" = yes && test "$with_gnu_ld" = no; then | ||
20424 | - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' | ||
20425 | + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' | ||
20426 | else | ||
20427 | archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' | ||
20428 | fi | ||
20429 | @@ -9731,10 +10314,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' | ||
20431 | ;; | ||
20432 | ia64*) | ||
20433 | - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' | ||
20434 | + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' | ||
20435 | ;; | ||
20436 | *) | ||
20437 | - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' | ||
20438 | + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' | ||
20439 | ;; | ||
20440 | esac | ||
20441 | else | ||
20442 | @@ -9813,23 +10396,36 @@ fi | ||
20443 | |||
20444 | irix5* | irix6* | nonstopux*) | ||
20445 | if test "$GCC" = yes; then | ||
20446 | - 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' | ||
20447 | + 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' | ||
20448 | # Try to use the -exported_symbol ld option, if it does not | ||
20449 | # work, assume that -exports_file does not work either and | ||
20450 | # implicitly export all symbols. | ||
20451 | - save_LDFLAGS="$LDFLAGS" | ||
20452 | - LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" | ||
20453 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
20454 | + # This should be the same for all languages, so no per-tag cache variable. | ||
20455 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5 | ||
20456 | +$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; } | ||
20457 | +if ${lt_cv_irix_exported_symbol+:} false; then : | ||
20458 | + $as_echo_n "(cached) " >&6 | ||
20459 | +else | ||
20460 | + save_LDFLAGS="$LDFLAGS" | ||
20461 | + LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" | ||
20462 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
20463 | /* end confdefs.h. */ | ||
20464 | -int foo(void) {} | ||
20465 | +int foo (void) { return 0; } | ||
20466 | _ACEOF | ||
20467 | if ac_fn_c_try_link "$LINENO"; then : | ||
20468 | - 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' | ||
20469 | - | ||
20470 | + lt_cv_irix_exported_symbol=yes | ||
20471 | +else | ||
20472 | + lt_cv_irix_exported_symbol=no | ||
20473 | fi | ||
20474 | rm -f core conftest.err conftest.$ac_objext \ | ||
20475 | conftest$ac_exeext conftest.$ac_ext | ||
20476 | - LDFLAGS="$save_LDFLAGS" | ||
20477 | + LDFLAGS="$save_LDFLAGS" | ||
20478 | +fi | ||
20479 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5 | ||
20480 | +$as_echo "$lt_cv_irix_exported_symbol" >&6; } | ||
20481 | + if test "$lt_cv_irix_exported_symbol" = yes; then | ||
20482 | + 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' | ||
20483 | + fi | ||
20484 | 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' | ||
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' | ||
20487 | @@ -9914,7 +10510,7 @@ rm -f core conftest.err conftest.$ac_objext \ | ||
20488 | osf4* | osf5*) # as osf3* with the addition of -msym flag | ||
20489 | if test "$GCC" = yes; then | ||
20490 | allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' | ||
20491 | - 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' | ||
20492 | + 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' | ||
20493 | hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' | ||
20494 | else | ||
20495 | allow_undefined_flag=' -expect_unresolved \*' | ||
20496 | @@ -9933,9 +10529,9 @@ rm -f core conftest.err conftest.$ac_objext \ | ||
20497 | no_undefined_flag=' -z defs' | ||
20498 | if test "$GCC" = yes; then | ||
20499 | wlarc='${wl}' | ||
20500 | - archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' | ||
20501 | + archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' | ||
20502 | archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ | ||
20503 | - $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' | ||
20504 | + $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' | ||
20505 | else | ||
20506 | case `$CC -V 2>&1` in | ||
20507 | *"Compilers 5.0"*) | ||
20508 | @@ -10511,8 +11107,9 @@ cygwin* | mingw* | pw32* | cegcc*) | ||
20509 | need_version=no | ||
20510 | need_lib_prefix=no | ||
20511 | |||
20512 | - case $GCC,$host_os in | ||
20513 | - yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) | ||
20514 | + case $GCC,$cc_basename in | ||
20515 | + yes,*) | ||
20516 | + # gcc | ||
20517 | library_names_spec='$libname.dll.a' | ||
20518 | # DLL is installed to $(libdir)/../bin by postinstall_cmds | ||
20519 | postinstall_cmds='base_file=`basename \${file}`~ | ||
20520 | @@ -10545,13 +11142,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}' | ||
20522 | ;; | ||
20523 | esac | ||
20524 | + dynamic_linker='Win32 ld.exe' | ||
20525 | + ;; | ||
20526 | + | ||
20527 | + *,cl*) | ||
20528 | + # Native MSVC | ||
20529 | + libname_spec='$name' | ||
20530 | + soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' | ||
20531 | + library_names_spec='${libname}.dll.lib' | ||
20532 | + | ||
20533 | + case $build_os in | ||
20534 | + mingw*) | ||
20535 | + sys_lib_search_path_spec= | ||
20536 | + lt_save_ifs=$IFS | ||
20537 | + IFS=';' | ||
20538 | + for lt_path in $LIB | ||
20539 | + do | ||
20540 | + IFS=$lt_save_ifs | ||
20541 | + # Let DOS variable expansion print the short 8.3 style file name. | ||
20542 | + lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` | ||
20543 | + sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" | ||
20544 | + done | ||
20545 | + IFS=$lt_save_ifs | ||
20546 | + # Convert to MSYS style. | ||
20547 | + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` | ||
20548 | + ;; | ||
20549 | + cygwin*) | ||
20550 | + # Convert to unix form, then to dos form, then back to unix form | ||
20551 | + # but this time dos style (no spaces!) so that the unix form looks | ||
20552 | + # like /cygdrive/c/PROGRA~1:/cygdr... | ||
20553 | + sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` | ||
20554 | + sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` | ||
20555 | + sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` | ||
20556 | + ;; | ||
20557 | + *) | ||
20558 | + sys_lib_search_path_spec="$LIB" | ||
20559 | + if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then | ||
20560 | + # It is most probably a Windows format PATH. | ||
20561 | + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` | ||
20562 | + else | ||
20563 | + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` | ||
20564 | + fi | ||
20565 | + # FIXME: find the short name or the path components, as spaces are | ||
20566 | + # common. (e.g. "Program Files" -> "PROGRA~1") | ||
20567 | + ;; | ||
20568 | + esac | ||
20569 | + | ||
20570 | + # DLL is installed to $(libdir)/../bin by postinstall_cmds | ||
20571 | + postinstall_cmds='base_file=`basename \${file}`~ | ||
20572 | + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ | ||
20573 | + dldir=$destdir/`dirname \$dlpath`~ | ||
20574 | + test -d \$dldir || mkdir -p \$dldir~ | ||
20575 | + $install_prog $dir/$dlname \$dldir/$dlname' | ||
20576 | + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ | ||
20577 | + dlpath=$dir/\$dldll~ | ||
20578 | + $RM \$dlpath' | ||
20579 | + shlibpath_overrides_runpath=yes | ||
20580 | + dynamic_linker='Win32 link.exe' | ||
20581 | ;; | ||
20582 | |||
20583 | *) | ||
20584 | + # Assume MSVC wrapper | ||
20585 | library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' | ||
20586 | + dynamic_linker='Win32 ld.exe' | ||
20587 | ;; | ||
20588 | esac | ||
20589 | - dynamic_linker='Win32 ld.exe' | ||
20590 | # FIXME: first we should search . and the directory the executable is in | ||
20591 | shlibpath_var=PATH | ||
20592 | ;; | ||
20593 | @@ -10643,7 +11298,7 @@ haiku*) | ||
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 | @@ -11439,7 +12094,7 @@ else | ||
20603 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 | ||
20604 | lt_status=$lt_dlunknown | ||
20605 | cat > conftest.$ac_ext <<_LT_EOF | ||
20606 | -#line 11442 "configure" | ||
20607 | +#line $LINENO "configure" | ||
20608 | #include "confdefs.h" | ||
20609 | |||
20610 | #if HAVE_DLFCN_H | ||
20611 | @@ -11483,10 +12138,10 @@ else | ||
20612 | /* When -fvisbility=hidden is used, assume the code has been annotated | ||
20613 | correspondingly for the symbols needed. */ | ||
20614 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) | ||
20615 | -void fnord () __attribute__((visibility("default"))); | ||
20616 | +int fnord () __attribute__((visibility("default"))); | ||
20617 | #endif | ||
20618 | |||
20619 | -void fnord () { int i=42; } | ||
20620 | +int fnord () { return 42; } | ||
20621 | int main () | ||
20622 | { | ||
20623 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); | ||
20624 | @@ -11545,7 +12200,7 @@ else | ||
20625 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 | ||
20626 | lt_status=$lt_dlunknown | ||
20627 | cat > conftest.$ac_ext <<_LT_EOF | ||
20628 | -#line 11548 "configure" | ||
20629 | +#line $LINENO "configure" | ||
20630 | #include "confdefs.h" | ||
20631 | |||
20632 | #if HAVE_DLFCN_H | ||
20633 | @@ -11589,10 +12244,10 @@ else | ||
20634 | /* When -fvisbility=hidden is used, assume the code has been annotated | ||
20635 | correspondingly for the symbols needed. */ | ||
20636 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) | ||
20637 | -void fnord () __attribute__((visibility("default"))); | ||
20638 | +int fnord () __attribute__((visibility("default"))); | ||
20639 | #endif | ||
20640 | |||
20641 | -void fnord () { int i=42; } | ||
20642 | +int fnord () { return 42; } | ||
20643 | int main () | ||
20644 | { | ||
20645 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); | ||
20646 | @@ -13756,13 +14411,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' | ||
20647 | lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' | ||
20648 | lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' | ||
20649 | lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' | ||
20650 | +lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`' | ||
20651 | +lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`' | ||
20652 | reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`' | ||
20653 | reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`' | ||
20654 | OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`' | ||
20655 | deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`' | ||
20656 | file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`' | ||
20657 | +file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`' | ||
20658 | +want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`' | ||
20659 | +DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`' | ||
20660 | +sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`' | ||
20661 | AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`' | ||
20662 | AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`' | ||
20663 | +archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`' | ||
20664 | STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' | ||
20665 | RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' | ||
20666 | old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' | ||
20667 | @@ -13777,14 +14439,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"`' | ||
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"`' | ||
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"`' | ||
20671 | +nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`' | ||
20672 | +lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`' | ||
20673 | objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`' | ||
20674 | MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`' | ||
20675 | lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`' | ||
20676 | -lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' | ||
20677 | lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`' | ||
20678 | +lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' | ||
20679 | lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`' | ||
20680 | lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`' | ||
20681 | need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`' | ||
20682 | +MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`' | ||
20683 | DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' | ||
20684 | NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' | ||
20685 | LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' | ||
20686 | @@ -13817,12 +14482,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q | ||
20687 | hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' | ||
20688 | inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' | ||
20689 | link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' | ||
20690 | -fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`' | ||
20691 | always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`' | ||
20692 | export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`' | ||
20693 | exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`' | ||
20694 | include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`' | ||
20695 | prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`' | ||
20696 | +postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`' | ||
20697 | 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"`' | ||
20699 | need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' | ||
20700 | @@ -13877,8 +14542,13 @@ reload_flag \ | ||
20701 | OBJDUMP \ | ||
20702 | deplibs_check_method \ | ||
20703 | file_magic_cmd \ | ||
20704 | +file_magic_glob \ | ||
20705 | +want_nocaseglob \ | ||
20706 | +DLLTOOL \ | ||
20707 | +sharedlib_from_linklib_cmd \ | ||
20708 | AR \ | ||
20709 | AR_FLAGS \ | ||
20710 | +archiver_list_spec \ | ||
20711 | STRIP \ | ||
20712 | RANLIB \ | ||
20713 | CC \ | ||
20714 | @@ -13888,12 +14558,14 @@ lt_cv_sys_global_symbol_pipe \ | ||
20715 | lt_cv_sys_global_symbol_to_cdecl \ | ||
20716 | lt_cv_sys_global_symbol_to_c_name_address \ | ||
20717 | lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ | ||
20718 | +nm_file_list_spec \ | ||
20719 | lt_prog_compiler_no_builtin_flag \ | ||
20720 | -lt_prog_compiler_wl \ | ||
20721 | lt_prog_compiler_pic \ | ||
20722 | +lt_prog_compiler_wl \ | ||
20723 | lt_prog_compiler_static \ | ||
20724 | lt_cv_prog_compiler_c_o \ | ||
20725 | need_locks \ | ||
20726 | +MANIFEST_TOOL \ | ||
20727 | DSYMUTIL \ | ||
20728 | NMEDIT \ | ||
20729 | LIPO \ | ||
20730 | @@ -13909,7 +14581,6 @@ no_undefined_flag \ | ||
20731 | hardcode_libdir_flag_spec \ | ||
20732 | hardcode_libdir_flag_spec_ld \ | ||
20733 | hardcode_libdir_separator \ | ||
20734 | -fix_srcfile_path \ | ||
20735 | exclude_expsyms \ | ||
20736 | include_expsyms \ | ||
20737 | file_list_spec \ | ||
20738 | @@ -13945,6 +14616,7 @@ module_cmds \ | ||
20739 | module_expsym_cmds \ | ||
20740 | export_symbols_cmds \ | ||
20741 | prelink_cmds \ | ||
20742 | +postlink_cmds \ | ||
20743 | postinstall_cmds \ | ||
20744 | postuninstall_cmds \ | ||
20745 | finish_cmds \ | ||
20746 | @@ -14710,7 +15382,8 @@ $as_echo X"$file" | | ||
20747 | # NOTE: Changes made to this file will be lost: look at ltmain.sh. | ||
20748 | # | ||
20749 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, | ||
20750 | -# 2006, 2007, 2008, 2009 Free Software Foundation, Inc. | ||
20751 | +# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, | ||
20752 | +# Inc. | ||
20753 | # Written by Gordon Matzigkeit, 1996 | ||
20754 | # | ||
20755 | # This file is part of GNU Libtool. | ||
20756 | @@ -14813,19 +15486,42 @@ SP2NL=$lt_lt_SP2NL | ||
20757 | # turn newlines into spaces. | ||
20758 | NL2SP=$lt_lt_NL2SP | ||
20759 | |||
20760 | +# convert \$build file names to \$host format. | ||
20761 | +to_host_file_cmd=$lt_cv_to_host_file_cmd | ||
20762 | + | ||
20763 | +# convert \$build files to toolchain format. | ||
20764 | +to_tool_file_cmd=$lt_cv_to_tool_file_cmd | ||
20765 | + | ||
20766 | # An object symbol dumper. | ||
20767 | OBJDUMP=$lt_OBJDUMP | ||
20768 | |||
20769 | # Method to check whether dependent libraries are shared objects. | ||
20770 | deplibs_check_method=$lt_deplibs_check_method | ||
20771 | |||
20772 | -# Command to use when deplibs_check_method == "file_magic". | ||
20773 | +# Command to use when deplibs_check_method = "file_magic". | ||
20774 | file_magic_cmd=$lt_file_magic_cmd | ||
20775 | |||
20776 | +# How to find potential files when deplibs_check_method = "file_magic". | ||
20777 | +file_magic_glob=$lt_file_magic_glob | ||
20778 | + | ||
20779 | +# Find potential files using nocaseglob when deplibs_check_method = "file_magic". | ||
20780 | +want_nocaseglob=$lt_want_nocaseglob | ||
20781 | + | ||
20782 | +# DLL creation program. | ||
20783 | +DLLTOOL=$lt_DLLTOOL | ||
20784 | + | ||
20785 | +# Command to associate shared and link libraries. | ||
20786 | +sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd | ||
20787 | + | ||
20788 | # The archiver. | ||
20789 | AR=$lt_AR | ||
20790 | + | ||
20791 | +# Flags to create an archive. | ||
20792 | AR_FLAGS=$lt_AR_FLAGS | ||
20793 | |||
20794 | +# How to feed a file listing to the archiver. | ||
20795 | +archiver_list_spec=$lt_archiver_list_spec | ||
20796 | + | ||
20797 | # A symbol stripping program. | ||
20798 | STRIP=$lt_STRIP | ||
20799 | |||
20800 | @@ -14855,6 +15551,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. | ||
20802 | global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix | ||
20803 | |||
20804 | +# Specify filename containing input files for \$NM. | ||
20805 | +nm_file_list_spec=$lt_nm_file_list_spec | ||
20806 | + | ||
20807 | +# The root where to search for dependent libraries,and in which our libraries should be installed. | ||
20808 | +lt_sysroot=$lt_sysroot | ||
20809 | + | ||
20810 | # The name of the directory that contains temporary libtool files. | ||
20811 | objdir=$objdir | ||
20812 | |||
20813 | @@ -14864,6 +15566,9 @@ MAGIC_CMD=$MAGIC_CMD | ||
20814 | # Must we lock files when doing compilation? | ||
20815 | need_locks=$lt_need_locks | ||
20816 | |||
20817 | +# Manifest tool. | ||
20818 | +MANIFEST_TOOL=$lt_MANIFEST_TOOL | ||
20819 | + | ||
20820 | # Tool to manipulate archived DWARF debug symbol files on Mac OS X. | ||
20821 | DSYMUTIL=$lt_DSYMUTIL | ||
20822 | |||
20823 | @@ -14978,12 +15683,12 @@ with_gcc=$GCC | ||
20824 | # Compiler flag to turn off builtin functions. | ||
20825 | no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag | ||
20826 | |||
20827 | -# How to pass a linker flag through the compiler. | ||
20828 | -wl=$lt_lt_prog_compiler_wl | ||
20829 | - | ||
20830 | # Additional compiler flags for building library objects. | ||
20831 | pic_flag=$lt_lt_prog_compiler_pic | ||
20832 | |||
20833 | +# How to pass a linker flag through the compiler. | ||
20834 | +wl=$lt_lt_prog_compiler_wl | ||
20835 | + | ||
20836 | # Compiler flag to prevent dynamic linking. | ||
20837 | link_static_flag=$lt_lt_prog_compiler_static | ||
20838 | |||
20839 | @@ -15070,9 +15775,6 @@ inherit_rpath=$inherit_rpath | ||
20840 | # Whether libtool must link a program against all its dependency libraries. | ||
20841 | link_all_deplibs=$link_all_deplibs | ||
20842 | |||
20843 | -# Fix the shell variable \$srcfile for the compiler. | ||
20844 | -fix_srcfile_path=$lt_fix_srcfile_path | ||
20845 | - | ||
20846 | # Set to "yes" if exported symbols are required. | ||
20847 | always_export_symbols=$always_export_symbols | ||
20848 | |||
20849 | @@ -15088,6 +15790,9 @@ include_expsyms=$lt_include_expsyms | ||
20850 | # Commands necessary for linking programs (against libraries) with templates. | ||
20851 | prelink_cmds=$lt_prelink_cmds | ||
20852 | |||
20853 | +# Commands necessary for finishing linking programs. | ||
20854 | +postlink_cmds=$lt_postlink_cmds | ||
20855 | + | ||
20856 | # Specify filename containing input files. | ||
20857 | file_list_spec=$lt_file_list_spec | ||
20858 | |||
20859 | @@ -15120,210 +15825,169 @@ ltmain="$ac_aux_dir/ltmain.sh" | ||
20860 | # 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 | ||
20862 | # is reportedly fixed, but why not run on old versions too? | ||
20863 | - sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ | ||
20864 | - || (rm -f "$cfgfile"; exit 1) | ||
20865 | - | ||
20866 | - case $xsi_shell in | ||
20867 | - yes) | ||
20868 | - cat << \_LT_EOF >> "$cfgfile" | ||
20869 | - | ||
20870 | -# func_dirname file append nondir_replacement | ||
20871 | -# Compute the dirname of FILE. If nonempty, add APPEND to the result, | ||
20872 | -# otherwise set result to NONDIR_REPLACEMENT. | ||
20873 | -func_dirname () | ||
20874 | -{ | ||
20875 | - case ${1} in | ||
20876 | - */*) func_dirname_result="${1%/*}${2}" ;; | ||
20877 | - * ) func_dirname_result="${3}" ;; | ||
20878 | - esac | ||
20879 | -} | ||
20880 | - | ||
20881 | -# func_basename file | ||
20882 | -func_basename () | ||
20883 | -{ | ||
20884 | - func_basename_result="${1##*/}" | ||
20885 | -} | ||
20886 | - | ||
20887 | -# func_dirname_and_basename file append nondir_replacement | ||
20888 | -# perform func_basename and func_dirname in a single function | ||
20889 | -# call: | ||
20890 | -# dirname: Compute the dirname of FILE. If nonempty, | ||
20891 | -# add APPEND to the result, otherwise set result | ||
20892 | -# to NONDIR_REPLACEMENT. | ||
20893 | -# value returned in "$func_dirname_result" | ||
20894 | -# basename: Compute filename of FILE. | ||
20895 | -# value retuned in "$func_basename_result" | ||
20896 | -# Implementation must be kept synchronized with func_dirname | ||
20897 | -# and func_basename. For efficiency, we do not delegate to | ||
20898 | -# those functions but instead duplicate the functionality here. | ||
20899 | -func_dirname_and_basename () | ||
20900 | -{ | ||
20901 | - case ${1} in | ||
20902 | - */*) func_dirname_result="${1%/*}${2}" ;; | ||
20903 | - * ) func_dirname_result="${3}" ;; | ||
20904 | - esac | ||
20905 | - func_basename_result="${1##*/}" | ||
20906 | -} | ||
20907 | - | ||
20908 | -# func_stripname prefix suffix name | ||
20909 | -# strip PREFIX and SUFFIX off of NAME. | ||
20910 | -# PREFIX and SUFFIX must not contain globbing or regex special | ||
20911 | -# characters, hashes, percent signs, but SUFFIX may contain a leading | ||
20912 | -# dot (in which case that matches only a dot). | ||
20913 | -func_stripname () | ||
20914 | -{ | ||
20915 | - # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are | ||
20916 | - # positional parameters, so assign one to ordinary parameter first. | ||
20917 | - func_stripname_result=${3} | ||
20918 | - func_stripname_result=${func_stripname_result#"${1}"} | ||
20919 | - func_stripname_result=${func_stripname_result%"${2}"} | ||
20920 | -} | ||
20921 | - | ||
20922 | -# func_opt_split | ||
20923 | -func_opt_split () | ||
20924 | -{ | ||
20925 | - func_opt_split_opt=${1%%=*} | ||
20926 | - func_opt_split_arg=${1#*=} | ||
20927 | -} | ||
20928 | - | ||
20929 | -# func_lo2o object | ||
20930 | -func_lo2o () | ||
20931 | -{ | ||
20932 | - case ${1} in | ||
20933 | - *.lo) func_lo2o_result=${1%.lo}.${objext} ;; | ||
20934 | - *) func_lo2o_result=${1} ;; | ||
20935 | - esac | ||
20936 | -} | ||
20937 | - | ||
20938 | -# func_xform libobj-or-source | ||
20939 | -func_xform () | ||
20940 | -{ | ||
20941 | - func_xform_result=${1%.*}.lo | ||
20942 | -} | ||
20943 | - | ||
20944 | -# func_arith arithmetic-term... | ||
20945 | -func_arith () | ||
20946 | -{ | ||
20947 | - func_arith_result=$(( $* )) | ||
20948 | -} | ||
20949 | - | ||
20950 | -# func_len string | ||
20951 | -# STRING may not start with a hyphen. | ||
20952 | -func_len () | ||
20953 | -{ | ||
20954 | - func_len_result=${#1} | ||
20955 | -} | ||
20956 | - | ||
20957 | -_LT_EOF | ||
20958 | - ;; | ||
20959 | - *) # Bourne compatible functions. | ||
20960 | - cat << \_LT_EOF >> "$cfgfile" | ||
20961 | - | ||
20962 | -# func_dirname file append nondir_replacement | ||
20963 | -# Compute the dirname of FILE. If nonempty, add APPEND to the result, | ||
20964 | -# otherwise set result to NONDIR_REPLACEMENT. | ||
20965 | -func_dirname () | ||
20966 | -{ | ||
20967 | - # Extract subdirectory from the argument. | ||
20968 | - func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` | ||
20969 | - if test "X$func_dirname_result" = "X${1}"; then | ||
20970 | - func_dirname_result="${3}" | ||
20971 | - else | ||
20972 | - func_dirname_result="$func_dirname_result${2}" | ||
20973 | - fi | ||
20974 | -} | ||
20975 | - | ||
20976 | -# func_basename file | ||
20977 | -func_basename () | ||
20978 | -{ | ||
20979 | - func_basename_result=`$ECHO "${1}" | $SED "$basename"` | ||
20980 | -} | ||
20981 | - | ||
20982 | - | ||
20983 | -# func_stripname prefix suffix name | ||
20984 | -# strip PREFIX and SUFFIX off of NAME. | ||
20985 | -# PREFIX and SUFFIX must not contain globbing or regex special | ||
20986 | -# characters, hashes, percent signs, but SUFFIX may contain a leading | ||
20987 | -# dot (in which case that matches only a dot). | ||
20988 | -# func_strip_suffix prefix name | ||
20989 | -func_stripname () | ||
20990 | -{ | ||
20991 | - case ${2} in | ||
20992 | - .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; | ||
20993 | - *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; | ||
20994 | - esac | ||
20995 | -} | ||
20996 | - | ||
20997 | -# sed scripts: | ||
20998 | -my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q' | ||
20999 | -my_sed_long_arg='1s/^-[^=]*=//' | ||
21000 | - | ||
21001 | -# func_opt_split | ||
21002 | -func_opt_split () | ||
21003 | -{ | ||
21004 | - func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"` | ||
21005 | - func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"` | ||
21006 | -} | ||
21007 | - | ||
21008 | -# func_lo2o object | ||
21009 | -func_lo2o () | ||
21010 | -{ | ||
21011 | - func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` | ||
21012 | -} | ||
21013 | - | ||
21014 | -# func_xform libobj-or-source | ||
21015 | -func_xform () | ||
21016 | -{ | ||
21017 | - func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'` | ||
21018 | -} | ||
21019 | - | ||
21020 | -# func_arith arithmetic-term... | ||
21021 | -func_arith () | ||
21022 | -{ | ||
21023 | - func_arith_result=`expr "$@"` | ||
21024 | -} | ||
21025 | - | ||
21026 | -# func_len string | ||
21027 | -# STRING may not start with a hyphen. | ||
21028 | -func_len () | ||
21029 | -{ | ||
21030 | - func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len` | ||
21031 | -} | ||
21032 | - | ||
21033 | -_LT_EOF | ||
21034 | -esac | ||
21035 | - | ||
21036 | -case $lt_shell_append in | ||
21037 | - yes) | ||
21038 | - cat << \_LT_EOF >> "$cfgfile" | ||
21039 | - | ||
21040 | -# func_append var value | ||
21041 | -# Append VALUE to the end of shell variable VAR. | ||
21042 | -func_append () | ||
21043 | -{ | ||
21044 | - eval "$1+=\$2" | ||
21045 | -} | ||
21046 | -_LT_EOF | ||
21047 | - ;; | ||
21048 | - *) | ||
21049 | - cat << \_LT_EOF >> "$cfgfile" | ||
21050 | - | ||
21051 | -# func_append var value | ||
21052 | -# Append VALUE to the end of shell variable VAR. | ||
21053 | -func_append () | ||
21054 | -{ | ||
21055 | - eval "$1=\$$1\$2" | ||
21056 | -} | ||
21057 | - | ||
21058 | -_LT_EOF | ||
21059 | - ;; | ||
21060 | - esac | ||
21061 | - | ||
21062 | - | ||
21063 | - sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ | ||
21064 | - || (rm -f "$cfgfile"; exit 1) | ||
21065 | - | ||
21066 | - mv -f "$cfgfile" "$ofile" || | ||
21067 | + sed '$q' "$ltmain" >> "$cfgfile" \ | ||
21068 | + || (rm -f "$cfgfile"; exit 1) | ||
21069 | + | ||
21070 | + if test x"$xsi_shell" = xyes; then | ||
21071 | + sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ | ||
21072 | +func_dirname ()\ | ||
21073 | +{\ | ||
21074 | +\ case ${1} in\ | ||
21075 | +\ */*) func_dirname_result="${1%/*}${2}" ;;\ | ||
21076 | +\ * ) func_dirname_result="${3}" ;;\ | ||
21077 | +\ esac\ | ||
21078 | +} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \ | ||
21079 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
21080 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
21081 | +test 0 -eq $? || _lt_function_replace_fail=: | ||
21082 | + | ||
21083 | + | ||
21084 | + sed -e '/^func_basename ()$/,/^} # func_basename /c\ | ||
21085 | +func_basename ()\ | ||
21086 | +{\ | ||
21087 | +\ func_basename_result="${1##*/}"\ | ||
21088 | +} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \ | ||
21089 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
21090 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
21091 | +test 0 -eq $? || _lt_function_replace_fail=: | ||
21092 | + | ||
21093 | + | ||
21094 | + sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\ | ||
21095 | +func_dirname_and_basename ()\ | ||
21096 | +{\ | ||
21097 | +\ case ${1} in\ | ||
21098 | +\ */*) func_dirname_result="${1%/*}${2}" ;;\ | ||
21099 | +\ * ) func_dirname_result="${3}" ;;\ | ||
21100 | +\ esac\ | ||
21101 | +\ func_basename_result="${1##*/}"\ | ||
21102 | +} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \ | ||
21103 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
21104 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
21105 | +test 0 -eq $? || _lt_function_replace_fail=: | ||
21106 | + | ||
21107 | + | ||
21108 | + sed -e '/^func_stripname ()$/,/^} # func_stripname /c\ | ||
21109 | +func_stripname ()\ | ||
21110 | +{\ | ||
21111 | +\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\ | ||
21112 | +\ # positional parameters, so assign one to ordinary parameter first.\ | ||
21113 | +\ func_stripname_result=${3}\ | ||
21114 | +\ func_stripname_result=${func_stripname_result#"${1}"}\ | ||
21115 | +\ func_stripname_result=${func_stripname_result%"${2}"}\ | ||
21116 | +} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \ | ||
21117 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
21118 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
21119 | +test 0 -eq $? || _lt_function_replace_fail=: | ||
21120 | + | ||
21121 | + | ||
21122 | + sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\ | ||
21123 | +func_split_long_opt ()\ | ||
21124 | +{\ | ||
21125 | +\ func_split_long_opt_name=${1%%=*}\ | ||
21126 | +\ func_split_long_opt_arg=${1#*=}\ | ||
21127 | +} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \ | ||
21128 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
21129 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
21130 | +test 0 -eq $? || _lt_function_replace_fail=: | ||
21131 | + | ||
21132 | + | ||
21133 | + sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\ | ||
21134 | +func_split_short_opt ()\ | ||
21135 | +{\ | ||
21136 | +\ func_split_short_opt_arg=${1#??}\ | ||
21137 | +\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\ | ||
21138 | +} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \ | ||
21139 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
21140 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
21141 | +test 0 -eq $? || _lt_function_replace_fail=: | ||
21142 | + | ||
21143 | + | ||
21144 | + sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\ | ||
21145 | +func_lo2o ()\ | ||
21146 | +{\ | ||
21147 | +\ case ${1} in\ | ||
21148 | +\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\ | ||
21149 | +\ *) func_lo2o_result=${1} ;;\ | ||
21150 | +\ esac\ | ||
21151 | +} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \ | ||
21152 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
21153 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
21154 | +test 0 -eq $? || _lt_function_replace_fail=: | ||
21155 | + | ||
21156 | + | ||
21157 | + sed -e '/^func_xform ()$/,/^} # func_xform /c\ | ||
21158 | +func_xform ()\ | ||
21159 | +{\ | ||
21160 | + func_xform_result=${1%.*}.lo\ | ||
21161 | +} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \ | ||
21162 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
21163 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
21164 | +test 0 -eq $? || _lt_function_replace_fail=: | ||
21165 | + | ||
21166 | + | ||
21167 | + sed -e '/^func_arith ()$/,/^} # func_arith /c\ | ||
21168 | +func_arith ()\ | ||
21169 | +{\ | ||
21170 | + func_arith_result=$(( $* ))\ | ||
21171 | +} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \ | ||
21172 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
21173 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
21174 | +test 0 -eq $? || _lt_function_replace_fail=: | ||
21175 | + | ||
21176 | + | ||
21177 | + sed -e '/^func_len ()$/,/^} # func_len /c\ | ||
21178 | +func_len ()\ | ||
21179 | +{\ | ||
21180 | + func_len_result=${#1}\ | ||
21181 | +} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \ | ||
21182 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
21183 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
21184 | +test 0 -eq $? || _lt_function_replace_fail=: | ||
21185 | + | ||
21186 | +fi | ||
21187 | + | ||
21188 | +if test x"$lt_shell_append" = xyes; then | ||
21189 | + sed -e '/^func_append ()$/,/^} # func_append /c\ | ||
21190 | +func_append ()\ | ||
21191 | +{\ | ||
21192 | + eval "${1}+=\\${2}"\ | ||
21193 | +} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \ | ||
21194 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
21195 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
21196 | +test 0 -eq $? || _lt_function_replace_fail=: | ||
21197 | + | ||
21198 | + | ||
21199 | + sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\ | ||
21200 | +func_append_quoted ()\ | ||
21201 | +{\ | ||
21202 | +\ func_quote_for_eval "${2}"\ | ||
21203 | +\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\ | ||
21204 | +} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \ | ||
21205 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
21206 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
21207 | +test 0 -eq $? || _lt_function_replace_fail=: | ||
21208 | + | ||
21209 | + | ||
21210 | + # Save a `func_append' function call where possible by direct use of '+=' | ||
21211 | + sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ | ||
21212 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
21213 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
21214 | + test 0 -eq $? || _lt_function_replace_fail=: | ||
21215 | +else | ||
21216 | + # Save a `func_append' function call even when '+=' is not available | ||
21217 | + sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ | ||
21218 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
21219 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
21220 | + test 0 -eq $? || _lt_function_replace_fail=: | ||
21221 | +fi | ||
21222 | + | ||
21223 | +if test x"$_lt_function_replace_fail" = x":"; then | ||
21224 | + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 | ||
21225 | +$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} | ||
21226 | +fi | ||
21227 | + | ||
21228 | + | ||
21229 | + mv -f "$cfgfile" "$ofile" || | ||
21230 | (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") | ||
21231 | chmod +x "$ofile" | ||
21232 | |||
21233 | diff --git a/zlib/configure b/zlib/configure | ||
21234 | index de6fa7e9960..cce448b6a53 100755 | ||
21235 | --- a/zlib/configure | ||
21236 | +++ b/zlib/configure | ||
21237 | @@ -646,8 +646,11 @@ OTOOL | ||
21238 | LIPO | ||
21239 | NMEDIT | ||
21240 | DSYMUTIL | ||
21241 | +MANIFEST_TOOL | ||
21242 | RANLIB | ||
21243 | +ac_ct_AR | ||
21244 | AR | ||
21245 | +DLLTOOL | ||
21246 | OBJDUMP | ||
21247 | LN_S | ||
21248 | NM | ||
21249 | @@ -774,6 +777,7 @@ enable_static | ||
21250 | with_pic | ||
21251 | enable_fast_install | ||
21252 | with_gnu_ld | ||
21253 | +with_libtool_sysroot | ||
21254 | enable_libtool_lock | ||
21255 | enable_host_shared | ||
21256 | ' | ||
21257 | @@ -1428,6 +1432,8 @@ Optional Packages: | ||
21258 | --with-pic try to use only PIC/non-PIC objects [default=use | ||
21259 | both] | ||
21260 | --with-gnu-ld assume the C compiler uses GNU ld [default=no] | ||
21261 | + --with-libtool-sysroot=DIR Search for dependent libraries within DIR | ||
21262 | + (or the compiler's sysroot if not specified). | ||
21263 | |||
21264 | Some influential environment variables: | ||
21265 | CC C compiler command | ||
21266 | @@ -4147,8 +4153,8 @@ esac | ||
21267 | |||
21268 | |||
21269 | |||
21270 | -macro_version='2.2.7a' | ||
21271 | -macro_revision='1.3134' | ||
21272 | +macro_version='2.4' | ||
21273 | +macro_revision='1.3293' | ||
21274 | |||
21275 | |||
21276 | |||
21277 | @@ -4188,7 +4194,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO | ||
21278 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 | ||
21279 | $as_echo_n "checking how to print strings... " >&6; } | ||
21280 | # Test print first, because it will be a builtin if present. | ||
21281 | -if test "X`print -r -- -n 2>/dev/null`" = X-n && \ | ||
21282 | +if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ | ||
21283 | test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then | ||
21284 | ECHO='print -r --' | ||
21285 | 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; | ||
21287 | # Try some XSI features | ||
21288 | xsi_shell=no | ||
21289 | ( _lt_dummy="a/b/c" | ||
21290 | - test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ | ||
21291 | - = c,a/b,, \ | ||
21292 | + test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ | ||
21293 | + = c,a/b,b/c, \ | ||
21294 | && eval 'test $(( 1 + 1 )) -eq 2 \ | ||
21295 | && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ | ||
21296 | && xsi_shell=yes | ||
21297 | @@ -5054,6 +5060,80 @@ esac | ||
21298 | |||
21299 | |||
21300 | |||
21301 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5 | ||
21302 | +$as_echo_n "checking how to convert $build file names to $host format... " >&6; } | ||
21303 | +if ${lt_cv_to_host_file_cmd+:} false; then : | ||
21304 | + $as_echo_n "(cached) " >&6 | ||
21305 | +else | ||
21306 | + case $host in | ||
21307 | + *-*-mingw* ) | ||
21308 | + case $build in | ||
21309 | + *-*-mingw* ) # actually msys | ||
21310 | + lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 | ||
21311 | + ;; | ||
21312 | + *-*-cygwin* ) | ||
21313 | + lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 | ||
21314 | + ;; | ||
21315 | + * ) # otherwise, assume *nix | ||
21316 | + lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 | ||
21317 | + ;; | ||
21318 | + esac | ||
21319 | + ;; | ||
21320 | + *-*-cygwin* ) | ||
21321 | + case $build in | ||
21322 | + *-*-mingw* ) # actually msys | ||
21323 | + lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin | ||
21324 | + ;; | ||
21325 | + *-*-cygwin* ) | ||
21326 | + lt_cv_to_host_file_cmd=func_convert_file_noop | ||
21327 | + ;; | ||
21328 | + * ) # otherwise, assume *nix | ||
21329 | + lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin | ||
21330 | + ;; | ||
21331 | + esac | ||
21332 | + ;; | ||
21333 | + * ) # unhandled hosts (and "normal" native builds) | ||
21334 | + lt_cv_to_host_file_cmd=func_convert_file_noop | ||
21335 | + ;; | ||
21336 | +esac | ||
21337 | + | ||
21338 | +fi | ||
21339 | + | ||
21340 | +to_host_file_cmd=$lt_cv_to_host_file_cmd | ||
21341 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5 | ||
21342 | +$as_echo "$lt_cv_to_host_file_cmd" >&6; } | ||
21343 | + | ||
21344 | + | ||
21345 | + | ||
21346 | + | ||
21347 | + | ||
21348 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5 | ||
21349 | +$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; } | ||
21350 | +if ${lt_cv_to_tool_file_cmd+:} false; then : | ||
21351 | + $as_echo_n "(cached) " >&6 | ||
21352 | +else | ||
21353 | + #assume ordinary cross tools, or native build. | ||
21354 | +lt_cv_to_tool_file_cmd=func_convert_file_noop | ||
21355 | +case $host in | ||
21356 | + *-*-mingw* ) | ||
21357 | + case $build in | ||
21358 | + *-*-mingw* ) # actually msys | ||
21359 | + lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 | ||
21360 | + ;; | ||
21361 | + esac | ||
21362 | + ;; | ||
21363 | +esac | ||
21364 | + | ||
21365 | +fi | ||
21366 | + | ||
21367 | +to_tool_file_cmd=$lt_cv_to_tool_file_cmd | ||
21368 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5 | ||
21369 | +$as_echo "$lt_cv_to_tool_file_cmd" >&6; } | ||
21370 | + | ||
21371 | + | ||
21372 | + | ||
21373 | + | ||
21374 | + | ||
21375 | { $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; } | ||
21377 | if ${lt_cv_ld_reload_flag+:} false; then : | ||
21378 | @@ -5070,6 +5150,11 @@ case $reload_flag in | ||
21379 | esac | ||
21380 | reload_cmds='$LD$reload_flag -o $output$reload_objs' | ||
21381 | case $host_os in | ||
21382 | + cygwin* | mingw* | pw32* | cegcc*) | ||
21383 | + if test "$GCC" != yes; then | ||
21384 | + reload_cmds=false | ||
21385 | + fi | ||
21386 | + ;; | ||
21387 | darwin*) | ||
21388 | if test "$GCC" = yes; then | ||
21389 | reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' | ||
21390 | @@ -5238,7 +5323,8 @@ mingw* | pw32*) | ||
21391 | lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' | ||
21392 | lt_cv_file_magic_cmd='func_win32_libid' | ||
21393 | else | ||
21394 | - lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' | ||
21395 | + # Keep this pattern in sync with the one in func_win32_libid. | ||
21396 | + lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' | ||
21397 | lt_cv_file_magic_cmd='$OBJDUMP -f' | ||
21398 | fi | ||
21399 | ;; | ||
21400 | @@ -5392,6 +5478,21 @@ esac | ||
21401 | fi | ||
21402 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 | ||
21403 | $as_echo "$lt_cv_deplibs_check_method" >&6; } | ||
21404 | + | ||
21405 | +file_magic_glob= | ||
21406 | +want_nocaseglob=no | ||
21407 | +if test "$build" = "$host"; then | ||
21408 | + case $host_os in | ||
21409 | + mingw* | pw32*) | ||
21410 | + if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then | ||
21411 | + want_nocaseglob=yes | ||
21412 | + else | ||
21413 | + file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"` | ||
21414 | + fi | ||
21415 | + ;; | ||
21416 | + esac | ||
21417 | +fi | ||
21418 | + | ||
21419 | file_magic_cmd=$lt_cv_file_magic_cmd | ||
21420 | deplibs_check_method=$lt_cv_deplibs_check_method | ||
21421 | test -z "$deplibs_check_method" && deplibs_check_method=unknown | ||
21422 | @@ -5405,11 +5506,165 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown | ||
21423 | |||
21424 | |||
21425 | |||
21426 | + | ||
21427 | + | ||
21428 | + | ||
21429 | + | ||
21430 | + | ||
21431 | + | ||
21432 | + | ||
21433 | + | ||
21434 | + | ||
21435 | + | ||
21436 | |||
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. | ||
21442 | +set dummy ${ac_tool_prefix}dlltool; ac_word=$2 | ||
21443 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
21444 | +$as_echo_n "checking for $ac_word... " >&6; } | ||
21445 | +if ${ac_cv_prog_DLLTOOL+:} false; then : | ||
21446 | + $as_echo_n "(cached) " >&6 | ||
21447 | +else | ||
21448 | + if test -n "$DLLTOOL"; then | ||
21449 | + ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. | ||
21450 | +else | ||
21451 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | ||
21452 | +for as_dir in $PATH | ||
21453 | +do | ||
21454 | + IFS=$as_save_IFS | ||
21455 | + test -z "$as_dir" && as_dir=. | ||
21456 | + for ac_exec_ext in '' $ac_executable_extensions; do | ||
21457 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | ||
21458 | + ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" | ||
21459 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
21460 | + break 2 | ||
21461 | + fi | ||
21462 | +done | ||
21463 | + done | ||
21464 | +IFS=$as_save_IFS | ||
21465 | + | ||
21466 | +fi | ||
21467 | +fi | ||
21468 | +DLLTOOL=$ac_cv_prog_DLLTOOL | ||
21469 | +if test -n "$DLLTOOL"; then | ||
21470 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 | ||
21471 | +$as_echo "$DLLTOOL" >&6; } | ||
21472 | +else | ||
21473 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
21474 | +$as_echo "no" >&6; } | ||
21475 | +fi | ||
21476 | + | ||
21477 | + | ||
21478 | +fi | ||
21479 | +if test -z "$ac_cv_prog_DLLTOOL"; then | ||
21480 | + ac_ct_DLLTOOL=$DLLTOOL | ||
21481 | + # Extract the first word of "dlltool", so it can be a program name with args. | ||
21482 | +set dummy dlltool; ac_word=$2 | ||
21483 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
21484 | +$as_echo_n "checking for $ac_word... " >&6; } | ||
21485 | +if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then : | ||
21486 | + $as_echo_n "(cached) " >&6 | ||
21487 | +else | ||
21488 | + if test -n "$ac_ct_DLLTOOL"; then | ||
21489 | + ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. | ||
21490 | +else | ||
21491 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | ||
21492 | +for as_dir in $PATH | ||
21493 | +do | ||
21494 | + IFS=$as_save_IFS | ||
21495 | + test -z "$as_dir" && as_dir=. | ||
21496 | + for ac_exec_ext in '' $ac_executable_extensions; do | ||
21497 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | ||
21498 | + ac_cv_prog_ac_ct_DLLTOOL="dlltool" | ||
21499 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
21500 | + break 2 | ||
21501 | + fi | ||
21502 | +done | ||
21503 | + done | ||
21504 | +IFS=$as_save_IFS | ||
21505 | + | ||
21506 | +fi | ||
21507 | +fi | ||
21508 | +ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL | ||
21509 | +if test -n "$ac_ct_DLLTOOL"; then | ||
21510 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 | ||
21511 | +$as_echo "$ac_ct_DLLTOOL" >&6; } | ||
21512 | +else | ||
21513 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
21514 | +$as_echo "no" >&6; } | ||
21515 | +fi | ||
21516 | + | ||
21517 | + if test "x$ac_ct_DLLTOOL" = x; then | ||
21518 | + DLLTOOL="false" | ||
21519 | + else | ||
21520 | + case $cross_compiling:$ac_tool_warned in | ||
21521 | +yes:) | ||
21522 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 | ||
21523 | +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} | ||
21524 | +ac_tool_warned=yes ;; | ||
21525 | +esac | ||
21526 | + DLLTOOL=$ac_ct_DLLTOOL | ||
21527 | + fi | ||
21528 | +else | ||
21529 | + DLLTOOL="$ac_cv_prog_DLLTOOL" | ||
21530 | +fi | ||
21531 | + | ||
21532 | +test -z "$DLLTOOL" && DLLTOOL=dlltool | ||
21533 | + | ||
21534 | + | ||
21535 | + | ||
21536 | + | ||
21537 | + | ||
21538 | + | ||
21539 | + | ||
21540 | + | ||
21541 | + | ||
21542 | + | ||
21543 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5 | ||
21544 | +$as_echo_n "checking how to associate runtime and link libraries... " >&6; } | ||
21545 | +if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then : | ||
21546 | + $as_echo_n "(cached) " >&6 | ||
21547 | +else | ||
21548 | + lt_cv_sharedlib_from_linklib_cmd='unknown' | ||
21549 | + | ||
21550 | +case $host_os in | ||
21551 | +cygwin* | mingw* | pw32* | cegcc*) | ||
21552 | + # two different shell functions defined in ltmain.sh | ||
21553 | + # decide which to use based on capabilities of $DLLTOOL | ||
21554 | + case `$DLLTOOL --help 2>&1` in | ||
21555 | + *--identify-strict*) | ||
21556 | + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib | ||
21557 | + ;; | ||
21558 | + *) | ||
21559 | + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback | ||
21560 | + ;; | ||
21561 | + esac | ||
21562 | + ;; | ||
21563 | +*) | ||
21564 | + # fallback: assume linklib IS sharedlib | ||
21565 | + lt_cv_sharedlib_from_linklib_cmd="$ECHO" | ||
21566 | + ;; | ||
21567 | +esac | ||
21568 | + | ||
21569 | +fi | ||
21570 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5 | ||
21571 | +$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; } | ||
21572 | +sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd | ||
21573 | +test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO | ||
21574 | + | ||
21575 | + | ||
21576 | + | ||
21577 | + | ||
21578 | + | ||
21579 | + | ||
21580 | + | ||
21581 | + | ||
21582 | +if test -n "$ac_tool_prefix"; then | ||
21583 | + for ac_prog in ar | ||
21584 | + do | ||
21585 | + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. | ||
21586 | +set dummy $ac_tool_prefix$ac_prog; ac_word=$2 | ||
21587 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
21588 | $as_echo_n "checking for $ac_word... " >&6; } | ||
21589 | if ${ac_cv_prog_AR+:} false; then : | ||
21590 | @@ -5425,7 +5680,7 @@ do | ||
21591 | test -z "$as_dir" && as_dir=. | ||
21592 | for ac_exec_ext in '' $ac_executable_extensions; do | ||
21593 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | ||
21594 | - ac_cv_prog_AR="${ac_tool_prefix}ar" | ||
21595 | + ac_cv_prog_AR="$ac_tool_prefix$ac_prog" | ||
21596 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
21597 | break 2 | ||
21598 | fi | ||
21599 | @@ -5445,11 +5700,15 @@ $as_echo "no" >&6; } | ||
21600 | fi | ||
21601 | |||
21602 | |||
21603 | + test -n "$AR" && break | ||
21604 | + done | ||
21605 | fi | ||
21606 | -if test -z "$ac_cv_prog_AR"; then | ||
21607 | +if test -z "$AR"; then | ||
21608 | ac_ct_AR=$AR | ||
21609 | - # Extract the first word of "ar", so it can be a program name with args. | ||
21610 | -set dummy ar; ac_word=$2 | ||
21611 | + for ac_prog in ar | ||
21612 | +do | ||
21613 | + # Extract the first word of "$ac_prog", so it can be a program name with args. | ||
21614 | +set dummy $ac_prog; ac_word=$2 | ||
21615 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
21616 | $as_echo_n "checking for $ac_word... " >&6; } | ||
21617 | if ${ac_cv_prog_ac_ct_AR+:} false; then : | ||
21618 | @@ -5465,7 +5724,7 @@ do | ||
21619 | test -z "$as_dir" && as_dir=. | ||
21620 | for ac_exec_ext in '' $ac_executable_extensions; do | ||
21621 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | ||
21622 | - ac_cv_prog_ac_ct_AR="ar" | ||
21623 | + ac_cv_prog_ac_ct_AR="$ac_prog" | ||
21624 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
21625 | break 2 | ||
21626 | fi | ||
21627 | @@ -5484,6 +5743,10 @@ else | ||
21628 | $as_echo "no" >&6; } | ||
21629 | fi | ||
21630 | |||
21631 | + | ||
21632 | + test -n "$ac_ct_AR" && break | ||
21633 | +done | ||
21634 | + | ||
21635 | if test "x$ac_ct_AR" = x; then | ||
21636 | AR="false" | ||
21637 | else | ||
21638 | @@ -5495,16 +5758,72 @@ ac_tool_warned=yes ;; | ||
21639 | esac | ||
21640 | AR=$ac_ct_AR | ||
21641 | fi | ||
21642 | -else | ||
21643 | - AR="$ac_cv_prog_AR" | ||
21644 | fi | ||
21645 | |||
21646 | -test -z "$AR" && AR=ar | ||
21647 | -test -z "$AR_FLAGS" && AR_FLAGS=cru | ||
21648 | +: ${AR=ar} | ||
21649 | +: ${AR_FLAGS=cru} | ||
21650 | + | ||
21651 | + | ||
21652 | + | ||
21653 | + | ||
21654 | + | ||
21655 | + | ||
21656 | + | ||
21657 | + | ||
21658 | + | ||
21659 | + | ||
21660 | + | ||
21661 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 | ||
21662 | +$as_echo_n "checking for archiver @FILE support... " >&6; } | ||
21663 | +if ${lt_cv_ar_at_file+:} false; then : | ||
21664 | + $as_echo_n "(cached) " >&6 | ||
21665 | +else | ||
21666 | + lt_cv_ar_at_file=no | ||
21667 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
21668 | +/* end confdefs.h. */ | ||
21669 | + | ||
21670 | +int | ||
21671 | +main () | ||
21672 | +{ | ||
21673 | |||
21674 | + ; | ||
21675 | + return 0; | ||
21676 | +} | ||
21677 | +_ACEOF | ||
21678 | +if ac_fn_c_try_compile "$LINENO"; then : | ||
21679 | + echo conftest.$ac_objext > conftest.lst | ||
21680 | + lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5' | ||
21681 | + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 | ||
21682 | + (eval $lt_ar_try) 2>&5 | ||
21683 | + ac_status=$? | ||
21684 | + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 | ||
21685 | + test $ac_status = 0; } | ||
21686 | + if test "$ac_status" -eq 0; then | ||
21687 | + # Ensure the archiver fails upon bogus file names. | ||
21688 | + rm -f conftest.$ac_objext libconftest.a | ||
21689 | + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 | ||
21690 | + (eval $lt_ar_try) 2>&5 | ||
21691 | + ac_status=$? | ||
21692 | + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 | ||
21693 | + test $ac_status = 0; } | ||
21694 | + if test "$ac_status" -ne 0; then | ||
21695 | + lt_cv_ar_at_file=@ | ||
21696 | + fi | ||
21697 | + fi | ||
21698 | + rm -f conftest.* libconftest.a | ||
21699 | |||
21700 | +fi | ||
21701 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
21702 | |||
21703 | +fi | ||
21704 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 | ||
21705 | +$as_echo "$lt_cv_ar_at_file" >&6; } | ||
21706 | |||
21707 | +if test "x$lt_cv_ar_at_file" = xno; then | ||
21708 | + archiver_list_spec= | ||
21709 | +else | ||
21710 | + archiver_list_spec=$lt_cv_ar_at_file | ||
21711 | +fi | ||
21712 | |||
21713 | |||
21714 | |||
21715 | @@ -5846,8 +6165,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'" | ||
21717 | |||
21718 | # Transform an extracted symbol line into symbol name and symbol address | ||
21719 | -lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" | ||
21720 | -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'" | ||
21721 | +lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" | ||
21722 | +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'" | ||
21723 | |||
21724 | # Handle CRLF in mingw tool chain | ||
21725 | opt_cr= | ||
21726 | @@ -5883,6 +6202,7 @@ for ac_symprfx in "" "_"; do | ||
21727 | else | ||
21728 | lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" | ||
21729 | fi | ||
21730 | + lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" | ||
21731 | |||
21732 | # Check to see that the pipe works correctly. | ||
21733 | pipe_works=no | ||
21734 | @@ -5924,6 +6244,18 @@ _LT_EOF | ||
21735 | if $GREP ' nm_test_var$' "$nlist" >/dev/null; then | ||
21736 | if $GREP ' nm_test_func$' "$nlist" >/dev/null; then | ||
21737 | cat <<_LT_EOF > conftest.$ac_ext | ||
21738 | +/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ | ||
21739 | +#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) | ||
21740 | +/* DATA imports from DLLs on WIN32 con't be const, because runtime | ||
21741 | + relocations are performed -- see ld's documentation on pseudo-relocs. */ | ||
21742 | +# define LT_DLSYM_CONST | ||
21743 | +#elif defined(__osf__) | ||
21744 | +/* This system does not cope well with relocations in const data. */ | ||
21745 | +# define LT_DLSYM_CONST | ||
21746 | +#else | ||
21747 | +# define LT_DLSYM_CONST const | ||
21748 | +#endif | ||
21749 | + | ||
21750 | #ifdef __cplusplus | ||
21751 | extern "C" { | ||
21752 | #endif | ||
21753 | @@ -5935,7 +6267,7 @@ _LT_EOF | ||
21754 | cat <<_LT_EOF >> conftest.$ac_ext | ||
21755 | |||
21756 | /* The mapping between symbol names and symbols. */ | ||
21757 | -const struct { | ||
21758 | +LT_DLSYM_CONST struct { | ||
21759 | const char *name; | ||
21760 | void *address; | ||
21761 | } | ||
21762 | @@ -5961,8 +6293,8 @@ static const void *lt_preloaded_setup() { | ||
21763 | _LT_EOF | ||
21764 | # Now try linking the two files. | ||
21765 | mv conftest.$ac_objext conftstm.$ac_objext | ||
21766 | - lt_save_LIBS="$LIBS" | ||
21767 | - lt_save_CFLAGS="$CFLAGS" | ||
21768 | + lt_globsym_save_LIBS=$LIBS | ||
21769 | + lt_globsym_save_CFLAGS=$CFLAGS | ||
21770 | LIBS="conftstm.$ac_objext" | ||
21771 | CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" | ||
21772 | if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 | ||
21773 | @@ -5972,8 +6304,8 @@ _LT_EOF | ||
21774 | test $ac_status = 0; } && test -s conftest${ac_exeext}; then | ||
21775 | pipe_works=yes | ||
21776 | fi | ||
21777 | - LIBS="$lt_save_LIBS" | ||
21778 | - CFLAGS="$lt_save_CFLAGS" | ||
21779 | + LIBS=$lt_globsym_save_LIBS | ||
21780 | + CFLAGS=$lt_globsym_save_CFLAGS | ||
21781 | else | ||
21782 | echo "cannot find nm_test_func in $nlist" >&5 | ||
21783 | fi | ||
21784 | @@ -6010,6 +6342,19 @@ else | ||
21785 | $as_echo "ok" >&6; } | ||
21786 | fi | ||
21787 | |||
21788 | +# Response file support. | ||
21789 | +if test "$lt_cv_nm_interface" = "MS dumpbin"; then | ||
21790 | + nm_file_list_spec='@' | ||
21791 | +elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then | ||
21792 | + nm_file_list_spec='@' | ||
21793 | +fi | ||
21794 | + | ||
21795 | + | ||
21796 | + | ||
21797 | + | ||
21798 | + | ||
21799 | + | ||
21800 | + | ||
21801 | |||
21802 | |||
21803 | |||
21804 | @@ -6027,6 +6372,41 @@ fi | ||
21805 | |||
21806 | |||
21807 | |||
21808 | + | ||
21809 | + | ||
21810 | + | ||
21811 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 | ||
21812 | +$as_echo_n "checking for sysroot... " >&6; } | ||
21813 | + | ||
21814 | +# Check whether --with-libtool-sysroot was given. | ||
21815 | +if test "${with_libtool_sysroot+set}" = set; then : | ||
21816 | + withval=$with_libtool_sysroot; | ||
21817 | +else | ||
21818 | + with_libtool_sysroot=no | ||
21819 | +fi | ||
21820 | + | ||
21821 | + | ||
21822 | +lt_sysroot= | ||
21823 | +case ${with_libtool_sysroot} in #( | ||
21824 | + yes) | ||
21825 | + if test "$GCC" = yes; then | ||
21826 | + lt_sysroot=`$CC --print-sysroot 2>/dev/null` | ||
21827 | + fi | ||
21828 | + ;; #( | ||
21829 | + /*) | ||
21830 | + lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"` | ||
21831 | + ;; #( | ||
21832 | + no|'') | ||
21833 | + ;; #( | ||
21834 | + *) | ||
21835 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5 | ||
21836 | +$as_echo "${with_libtool_sysroot}" >&6; } | ||
21837 | + as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 | ||
21838 | + ;; | ||
21839 | +esac | ||
21840 | + | ||
21841 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 | ||
21842 | +$as_echo "${lt_sysroot:-no}" >&6; } | ||
21843 | |||
21844 | |||
21845 | |||
21846 | @@ -6241,6 +6621,123 @@ esac | ||
21847 | |||
21848 | need_locks="$enable_libtool_lock" | ||
21849 | |||
21850 | +if test -n "$ac_tool_prefix"; then | ||
21851 | + # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args. | ||
21852 | +set dummy ${ac_tool_prefix}mt; ac_word=$2 | ||
21853 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
21854 | +$as_echo_n "checking for $ac_word... " >&6; } | ||
21855 | +if ${ac_cv_prog_MANIFEST_TOOL+:} false; then : | ||
21856 | + $as_echo_n "(cached) " >&6 | ||
21857 | +else | ||
21858 | + if test -n "$MANIFEST_TOOL"; then | ||
21859 | + ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test. | ||
21860 | +else | ||
21861 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | ||
21862 | +for as_dir in $PATH | ||
21863 | +do | ||
21864 | + IFS=$as_save_IFS | ||
21865 | + test -z "$as_dir" && as_dir=. | ||
21866 | + for ac_exec_ext in '' $ac_executable_extensions; do | ||
21867 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | ||
21868 | + ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" | ||
21869 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
21870 | + break 2 | ||
21871 | + fi | ||
21872 | +done | ||
21873 | + done | ||
21874 | +IFS=$as_save_IFS | ||
21875 | + | ||
21876 | +fi | ||
21877 | +fi | ||
21878 | +MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL | ||
21879 | +if test -n "$MANIFEST_TOOL"; then | ||
21880 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5 | ||
21881 | +$as_echo "$MANIFEST_TOOL" >&6; } | ||
21882 | +else | ||
21883 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
21884 | +$as_echo "no" >&6; } | ||
21885 | +fi | ||
21886 | + | ||
21887 | + | ||
21888 | +fi | ||
21889 | +if test -z "$ac_cv_prog_MANIFEST_TOOL"; then | ||
21890 | + ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL | ||
21891 | + # Extract the first word of "mt", so it can be a program name with args. | ||
21892 | +set dummy mt; ac_word=$2 | ||
21893 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
21894 | +$as_echo_n "checking for $ac_word... " >&6; } | ||
21895 | +if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then : | ||
21896 | + $as_echo_n "(cached) " >&6 | ||
21897 | +else | ||
21898 | + if test -n "$ac_ct_MANIFEST_TOOL"; then | ||
21899 | + ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test. | ||
21900 | +else | ||
21901 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | ||
21902 | +for as_dir in $PATH | ||
21903 | +do | ||
21904 | + IFS=$as_save_IFS | ||
21905 | + test -z "$as_dir" && as_dir=. | ||
21906 | + for ac_exec_ext in '' $ac_executable_extensions; do | ||
21907 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | ||
21908 | + ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" | ||
21909 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
21910 | + break 2 | ||
21911 | + fi | ||
21912 | +done | ||
21913 | + done | ||
21914 | +IFS=$as_save_IFS | ||
21915 | + | ||
21916 | +fi | ||
21917 | +fi | ||
21918 | +ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL | ||
21919 | +if test -n "$ac_ct_MANIFEST_TOOL"; then | ||
21920 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5 | ||
21921 | +$as_echo "$ac_ct_MANIFEST_TOOL" >&6; } | ||
21922 | +else | ||
21923 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
21924 | +$as_echo "no" >&6; } | ||
21925 | +fi | ||
21926 | + | ||
21927 | + if test "x$ac_ct_MANIFEST_TOOL" = x; then | ||
21928 | + MANIFEST_TOOL=":" | ||
21929 | + else | ||
21930 | + case $cross_compiling:$ac_tool_warned in | ||
21931 | +yes:) | ||
21932 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 | ||
21933 | +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} | ||
21934 | +ac_tool_warned=yes ;; | ||
21935 | +esac | ||
21936 | + MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL | ||
21937 | + fi | ||
21938 | +else | ||
21939 | + MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL" | ||
21940 | +fi | ||
21941 | + | ||
21942 | +test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt | ||
21943 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5 | ||
21944 | +$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; } | ||
21945 | +if ${lt_cv_path_mainfest_tool+:} false; then : | ||
21946 | + $as_echo_n "(cached) " >&6 | ||
21947 | +else | ||
21948 | + lt_cv_path_mainfest_tool=no | ||
21949 | + echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5 | ||
21950 | + $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out | ||
21951 | + cat conftest.err >&5 | ||
21952 | + if $GREP 'Manifest Tool' conftest.out > /dev/null; then | ||
21953 | + lt_cv_path_mainfest_tool=yes | ||
21954 | + fi | ||
21955 | + rm -f conftest* | ||
21956 | +fi | ||
21957 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5 | ||
21958 | +$as_echo "$lt_cv_path_mainfest_tool" >&6; } | ||
21959 | +if test "x$lt_cv_path_mainfest_tool" != xyes; then | ||
21960 | + MANIFEST_TOOL=: | ||
21961 | +fi | ||
21962 | + | ||
21963 | + | ||
21964 | + | ||
21965 | + | ||
21966 | + | ||
21967 | |||
21968 | case $host_os in | ||
21969 | rhapsody* | darwin*) | ||
21970 | @@ -6807,6 +7304,8 @@ _LT_EOF | ||
21971 | $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 | ||
21972 | echo "$AR cru libconftest.a conftest.o" >&5 | ||
21973 | $AR cru libconftest.a conftest.o 2>&5 | ||
21974 | + echo "$RANLIB libconftest.a" >&5 | ||
21975 | + $RANLIB libconftest.a 2>&5 | ||
21976 | cat > conftest.c << _LT_EOF | ||
21977 | int main() { return 0;} | ||
21978 | _LT_EOF | ||
21979 | @@ -7269,7 +7768,8 @@ 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= | ||
22000 | lt_prog_compiler_static= | ||
22001 | |||
22002 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 | ||
22003 | -$as_echo_n "checking for $compiler option to produce PIC... " >&6; } | ||
22004 | |||
22005 | if test "$GCC" = yes; then | ||
22006 | lt_prog_compiler_wl='-Wl,' | ||
22007 | @@ -7823,6 +8321,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } | ||
22008 | lt_prog_compiler_pic='--shared' | ||
22009 | lt_prog_compiler_static='--static' | ||
22010 | ;; | ||
22011 | + nagfor*) | ||
22012 | + # NAG Fortran compiler | ||
22013 | + lt_prog_compiler_wl='-Wl,-Wl,,' | ||
22014 | + lt_prog_compiler_pic='-PIC' | ||
22015 | + lt_prog_compiler_static='-Bstatic' | ||
22016 | + ;; | ||
22017 | pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) | ||
22018 | # Portland Group compilers (*not* the Pentium gcc compiler, | ||
22019 | # which looks to be a dead project) | ||
22020 | @@ -7885,7 +8389,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } | ||
22021 | lt_prog_compiler_pic='-KPIC' | ||
22022 | lt_prog_compiler_static='-Bstatic' | ||
22023 | case $cc_basename in | ||
22024 | - f77* | f90* | f95*) | ||
22025 | + f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) | ||
22026 | lt_prog_compiler_wl='-Qoption ld ';; | ||
22027 | *) | ||
22028 | lt_prog_compiler_wl='-Wl,';; | ||
22029 | @@ -7942,13 +8446,17 @@ case $host_os in | ||
22030 | lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" | ||
22031 | ;; | ||
22032 | esac | ||
22033 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5 | ||
22034 | -$as_echo "$lt_prog_compiler_pic" >&6; } | ||
22035 | - | ||
22036 | - | ||
22037 | - | ||
22038 | - | ||
22039 | |||
22040 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 | ||
22041 | +$as_echo_n "checking for $compiler option to produce PIC... " >&6; } | ||
22042 | +if ${lt_cv_prog_compiler_pic+:} false; then : | ||
22043 | + $as_echo_n "(cached) " >&6 | ||
22044 | +else | ||
22045 | + lt_cv_prog_compiler_pic=$lt_prog_compiler_pic | ||
22046 | +fi | ||
22047 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5 | ||
22048 | +$as_echo "$lt_cv_prog_compiler_pic" >&6; } | ||
22049 | +lt_prog_compiler_pic=$lt_cv_prog_compiler_pic | ||
22050 | |||
22051 | # | ||
22052 | # Check to make sure the PIC flag actually works. | ||
22053 | @@ -8009,6 +8517,11 @@ fi | ||
22054 | |||
22055 | |||
22056 | |||
22057 | + | ||
22058 | + | ||
22059 | + | ||
22060 | + | ||
22061 | + | ||
22062 | # | ||
22063 | # Check to make sure the static flag actually works. | ||
22064 | # | ||
22065 | @@ -8359,7 +8872,8 @@ _LT_EOF | ||
22066 | allow_undefined_flag=unsupported | ||
22067 | always_export_symbols=no | ||
22068 | enable_shared_with_static_runtimes=yes | ||
22069 | - export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' | ||
22070 | + 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' | ||
22071 | + exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' | ||
22072 | |||
22073 | 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' | ||
22075 | @@ -8458,12 +8972,12 @@ _LT_EOF | ||
22076 | whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' | ||
22077 | hardcode_libdir_flag_spec= | ||
22078 | hardcode_libdir_flag_spec_ld='-rpath $libdir' | ||
22079 | - archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' | ||
22080 | + archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' | ||
22081 | if test "x$supports_anon_versioning" = xyes; then | ||
22082 | archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ | ||
22083 | cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ | ||
22084 | echo "local: *; };" >> $output_objdir/$libname.ver~ | ||
22085 | - $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' | ||
22086 | + $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' | ||
22087 | fi | ||
22088 | ;; | ||
22089 | esac | ||
22090 | @@ -8477,8 +8991,8 @@ _LT_EOF | ||
22091 | archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' | ||
22092 | wlarc= | ||
22093 | else | ||
22094 | - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' | ||
22095 | - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' | ||
22096 | + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' | ||
22097 | + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' | ||
22098 | fi | ||
22099 | ;; | ||
22100 | |||
22101 | @@ -8496,8 +9010,8 @@ _LT_EOF | ||
22102 | |||
22103 | _LT_EOF | ||
22104 | elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then | ||
22105 | - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' | ||
22106 | - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' | ||
22107 | + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' | ||
22108 | + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' | ||
22109 | else | ||
22110 | ld_shlibs=no | ||
22111 | fi | ||
22112 | @@ -8543,8 +9057,8 @@ _LT_EOF | ||
22113 | |||
22114 | *) | ||
22115 | if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then | ||
22116 | - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' | ||
22117 | - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' | ||
22118 | + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' | ||
22119 | + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' | ||
22120 | else | ||
22121 | ld_shlibs=no | ||
22122 | fi | ||
22123 | @@ -8674,7 +9188,13 @@ _LT_EOF | ||
22124 | allow_undefined_flag='-berok' | ||
22125 | # Determine the default libpath from the value encoded in an | ||
22126 | # empty executable. | ||
22127 | - if test x$gcc_no_link = xyes; then | ||
22128 | + if test "${lt_cv_aix_libpath+set}" = set; then | ||
22129 | + aix_libpath=$lt_cv_aix_libpath | ||
22130 | +else | ||
22131 | + if ${lt_cv_aix_libpath_+:} false; then : | ||
22132 | + $as_echo_n "(cached) " >&6 | ||
22133 | +else | ||
22134 | + if test x$gcc_no_link = xyes; then | ||
22135 | as_fn_error $? "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5 | ||
22136 | fi | ||
22137 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
22138 | @@ -8690,22 +9210,29 @@ main () | ||
22139 | _ACEOF | ||
22140 | if ac_fn_c_try_link "$LINENO"; then : | ||
22141 | |||
22142 | -lt_aix_libpath_sed=' | ||
22143 | - /Import File Strings/,/^$/ { | ||
22144 | - /^0/ { | ||
22145 | - s/^0 *\(.*\)$/\1/ | ||
22146 | - p | ||
22147 | - } | ||
22148 | - }' | ||
22149 | -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | ||
22150 | -# Check for a 64-bit object if we didn't find anything. | ||
22151 | -if test -z "$aix_libpath"; then | ||
22152 | - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | ||
22153 | -fi | ||
22154 | + lt_aix_libpath_sed=' | ||
22155 | + /Import File Strings/,/^$/ { | ||
22156 | + /^0/ { | ||
22157 | + s/^0 *\([^ ]*\) *$/\1/ | ||
22158 | + p | ||
22159 | + } | ||
22160 | + }' | ||
22161 | + lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | ||
22162 | + # Check for a 64-bit object if we didn't find anything. | ||
22163 | + if test -z "$lt_cv_aix_libpath_"; then | ||
22164 | + lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | ||
22165 | + fi | ||
22166 | fi | ||
22167 | rm -f core conftest.err conftest.$ac_objext \ | ||
22168 | conftest$ac_exeext conftest.$ac_ext | ||
22169 | -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | ||
22170 | + if test -z "$lt_cv_aix_libpath_"; then | ||
22171 | + lt_cv_aix_libpath_="/usr/lib:/lib" | ||
22172 | + fi | ||
22173 | + | ||
22174 | +fi | ||
22175 | + | ||
22176 | + aix_libpath=$lt_cv_aix_libpath_ | ||
22177 | +fi | ||
22178 | |||
22179 | 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" | ||
22181 | @@ -8717,7 +9244,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | ||
22182 | else | ||
22183 | # Determine the default libpath from the value encoded in an | ||
22184 | # empty executable. | ||
22185 | - if test x$gcc_no_link = xyes; then | ||
22186 | + if test "${lt_cv_aix_libpath+set}" = set; then | ||
22187 | + aix_libpath=$lt_cv_aix_libpath | ||
22188 | +else | ||
22189 | + if ${lt_cv_aix_libpath_+:} false; then : | ||
22190 | + $as_echo_n "(cached) " >&6 | ||
22191 | +else | ||
22192 | + if test x$gcc_no_link = xyes; then | ||
22193 | as_fn_error $? "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5 | ||
22194 | fi | ||
22195 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
22196 | @@ -8733,22 +9266,29 @@ main () | ||
22197 | _ACEOF | ||
22198 | if ac_fn_c_try_link "$LINENO"; then : | ||
22199 | |||
22200 | -lt_aix_libpath_sed=' | ||
22201 | - /Import File Strings/,/^$/ { | ||
22202 | - /^0/ { | ||
22203 | - s/^0 *\(.*\)$/\1/ | ||
22204 | - p | ||
22205 | - } | ||
22206 | - }' | ||
22207 | -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | ||
22208 | -# Check for a 64-bit object if we didn't find anything. | ||
22209 | -if test -z "$aix_libpath"; then | ||
22210 | - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | ||
22211 | -fi | ||
22212 | + lt_aix_libpath_sed=' | ||
22213 | + /Import File Strings/,/^$/ { | ||
22214 | + /^0/ { | ||
22215 | + s/^0 *\([^ ]*\) *$/\1/ | ||
22216 | + p | ||
22217 | + } | ||
22218 | + }' | ||
22219 | + lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | ||
22220 | + # Check for a 64-bit object if we didn't find anything. | ||
22221 | + if test -z "$lt_cv_aix_libpath_"; then | ||
22222 | + lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | ||
22223 | + fi | ||
22224 | fi | ||
22225 | rm -f core conftest.err conftest.$ac_objext \ | ||
22226 | conftest$ac_exeext conftest.$ac_ext | ||
22227 | -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | ||
22228 | + if test -z "$lt_cv_aix_libpath_"; then | ||
22229 | + lt_cv_aix_libpath_="/usr/lib:/lib" | ||
22230 | + fi | ||
22231 | + | ||
22232 | +fi | ||
22233 | + | ||
22234 | + aix_libpath=$lt_cv_aix_libpath_ | ||
22235 | +fi | ||
22236 | |||
22237 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" | ||
22238 | # 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 | ||
22240 | # Microsoft Visual C++. | ||
22241 | # hardcode_libdir_flag_spec is actually meaningless, as there is | ||
22242 | # no search path for DLLs. | ||
22243 | - hardcode_libdir_flag_spec=' ' | ||
22244 | - allow_undefined_flag=unsupported | ||
22245 | - # Tell ltmain to make .lib files, not .a files. | ||
22246 | - libext=lib | ||
22247 | - # Tell ltmain to make .dll files, not .so files. | ||
22248 | - shrext_cmds=".dll" | ||
22249 | - # FIXME: Setting linknames here is a bad hack. | ||
22250 | - archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' | ||
22251 | - # The linker will automatically build a .lib file if we build a DLL. | ||
22252 | - old_archive_from_new_cmds='true' | ||
22253 | - # FIXME: Should let the user specify the lib program. | ||
22254 | - old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' | ||
22255 | - fix_srcfile_path='`cygpath -w "$srcfile"`' | ||
22256 | - enable_shared_with_static_runtimes=yes | ||
22257 | + case $cc_basename in | ||
22258 | + cl*) | ||
22259 | + # Native MSVC | ||
22260 | + hardcode_libdir_flag_spec=' ' | ||
22261 | + allow_undefined_flag=unsupported | ||
22262 | + always_export_symbols=yes | ||
22263 | + file_list_spec='@' | ||
22264 | + # Tell ltmain to make .lib files, not .a files. | ||
22265 | + libext=lib | ||
22266 | + # Tell ltmain to make .dll files, not .so files. | ||
22267 | + shrext_cmds=".dll" | ||
22268 | + # FIXME: Setting linknames here is a bad hack. | ||
22269 | + archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' | ||
22270 | + archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then | ||
22271 | + sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; | ||
22272 | + else | ||
22273 | + sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; | ||
22274 | + fi~ | ||
22275 | + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ | ||
22276 | + linknames=' | ||
22277 | + # The linker will not automatically build a static lib if we build a DLL. | ||
22278 | + # _LT_TAGVAR(old_archive_from_new_cmds, )='true' | ||
22279 | + enable_shared_with_static_runtimes=yes | ||
22280 | + export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' | ||
22281 | + # Don't use ranlib | ||
22282 | + old_postinstall_cmds='chmod 644 $oldlib' | ||
22283 | + postlink_cmds='lt_outputfile="@OUTPUT@"~ | ||
22284 | + lt_tool_outputfile="@TOOL_OUTPUT@"~ | ||
22285 | + case $lt_outputfile in | ||
22286 | + *.exe|*.EXE) ;; | ||
22287 | + *) | ||
22288 | + lt_outputfile="$lt_outputfile.exe" | ||
22289 | + lt_tool_outputfile="$lt_tool_outputfile.exe" | ||
22290 | + ;; | ||
22291 | + esac~ | ||
22292 | + if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then | ||
22293 | + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; | ||
22294 | + $RM "$lt_outputfile.manifest"; | ||
22295 | + fi' | ||
22296 | + ;; | ||
22297 | + *) | ||
22298 | + # Assume MSVC wrapper | ||
22299 | + hardcode_libdir_flag_spec=' ' | ||
22300 | + allow_undefined_flag=unsupported | ||
22301 | + # Tell ltmain to make .lib files, not .a files. | ||
22302 | + libext=lib | ||
22303 | + # Tell ltmain to make .dll files, not .so files. | ||
22304 | + shrext_cmds=".dll" | ||
22305 | + # FIXME: Setting linknames here is a bad hack. | ||
22306 | + archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' | ||
22307 | + # The linker will automatically build a .lib file if we build a DLL. | ||
22308 | + old_archive_from_new_cmds='true' | ||
22309 | + # FIXME: Should let the user specify the lib program. | ||
22310 | + old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' | ||
22311 | + enable_shared_with_static_runtimes=yes | ||
22312 | + ;; | ||
22313 | + esac | ||
22314 | ;; | ||
22315 | |||
22316 | darwin* | rhapsody*) | ||
22317 | @@ -8867,7 +9450,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | ||
22318 | |||
22319 | # FreeBSD 3 and greater uses gcc -shared to do shared libraries. | ||
22320 | freebsd* | dragonfly*) | ||
22321 | - archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' | ||
22322 | + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' | ||
22323 | hardcode_libdir_flag_spec='-R$libdir' | ||
22324 | hardcode_direct=yes | ||
22325 | hardcode_shlibpath_var=no | ||
22326 | @@ -8875,7 +9458,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | ||
22327 | |||
22328 | hpux9*) | ||
22329 | if test "$GCC" = yes; then | ||
22330 | - 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' | ||
22331 | + 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' | ||
22332 | 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' | ||
22334 | fi | ||
22335 | @@ -8891,7 +9474,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | ||
22336 | |||
22337 | hpux10*) | ||
22338 | if test "$GCC" = yes && test "$with_gnu_ld" = no; then | ||
22339 | - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' | ||
22340 | + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' | ||
22341 | else | ||
22342 | archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' | ||
22343 | fi | ||
22344 | @@ -8915,10 +9498,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' | ||
22346 | ;; | ||
22347 | ia64*) | ||
22348 | - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' | ||
22349 | + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' | ||
22350 | ;; | ||
22351 | *) | ||
22352 | - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' | ||
22353 | + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' | ||
22354 | ;; | ||
22355 | esac | ||
22356 | else | ||
22357 | @@ -8997,26 +9580,39 @@ fi | ||
22358 | |||
22359 | irix5* | irix6* | nonstopux*) | ||
22360 | if test "$GCC" = yes; then | ||
22361 | - 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' | ||
22362 | + 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' | ||
22363 | # Try to use the -exported_symbol ld option, if it does not | ||
22364 | # work, assume that -exports_file does not work either and | ||
22365 | # implicitly export all symbols. | ||
22366 | - save_LDFLAGS="$LDFLAGS" | ||
22367 | - LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" | ||
22368 | - if test x$gcc_no_link = xyes; then | ||
22369 | + # This should be the same for all languages, so no per-tag cache variable. | ||
22370 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5 | ||
22371 | +$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; } | ||
22372 | +if ${lt_cv_irix_exported_symbol+:} false; then : | ||
22373 | + $as_echo_n "(cached) " >&6 | ||
22374 | +else | ||
22375 | + save_LDFLAGS="$LDFLAGS" | ||
22376 | + LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" | ||
22377 | + if test x$gcc_no_link = xyes; then | ||
22378 | as_fn_error $? "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5 | ||
22379 | fi | ||
22380 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
22381 | /* end confdefs.h. */ | ||
22382 | -int foo(void) {} | ||
22383 | +int foo (void) { return 0; } | ||
22384 | _ACEOF | ||
22385 | if ac_fn_c_try_link "$LINENO"; then : | ||
22386 | - 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' | ||
22387 | - | ||
22388 | + lt_cv_irix_exported_symbol=yes | ||
22389 | +else | ||
22390 | + lt_cv_irix_exported_symbol=no | ||
22391 | fi | ||
22392 | rm -f core conftest.err conftest.$ac_objext \ | ||
22393 | conftest$ac_exeext conftest.$ac_ext | ||
22394 | - LDFLAGS="$save_LDFLAGS" | ||
22395 | + LDFLAGS="$save_LDFLAGS" | ||
22396 | +fi | ||
22397 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5 | ||
22398 | +$as_echo "$lt_cv_irix_exported_symbol" >&6; } | ||
22399 | + if test "$lt_cv_irix_exported_symbol" = yes; then | ||
22400 | + 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' | ||
22401 | + fi | ||
22402 | 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' | ||
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' | ||
22405 | @@ -9101,7 +9697,7 @@ rm -f core conftest.err conftest.$ac_objext \ | ||
22406 | osf4* | osf5*) # as osf3* with the addition of -msym flag | ||
22407 | if test "$GCC" = yes; then | ||
22408 | allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' | ||
22409 | - 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' | ||
22410 | + 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' | ||
22411 | hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' | ||
22412 | else | ||
22413 | allow_undefined_flag=' -expect_unresolved \*' | ||
22414 | @@ -9120,9 +9716,9 @@ rm -f core conftest.err conftest.$ac_objext \ | ||
22415 | no_undefined_flag=' -z defs' | ||
22416 | if test "$GCC" = yes; then | ||
22417 | wlarc='${wl}' | ||
22418 | - archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' | ||
22419 | + archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' | ||
22420 | archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ | ||
22421 | - $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' | ||
22422 | + $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' | ||
22423 | else | ||
22424 | case `$CC -V 2>&1` in | ||
22425 | *"Compilers 5.0"*) | ||
22426 | @@ -9698,8 +10294,9 @@ cygwin* | mingw* | pw32* | cegcc*) | ||
22427 | need_version=no | ||
22428 | need_lib_prefix=no | ||
22429 | |||
22430 | - case $GCC,$host_os in | ||
22431 | - yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) | ||
22432 | + case $GCC,$cc_basename in | ||
22433 | + yes,*) | ||
22434 | + # gcc | ||
22435 | library_names_spec='$libname.dll.a' | ||
22436 | # DLL is installed to $(libdir)/../bin by postinstall_cmds | ||
22437 | postinstall_cmds='base_file=`basename \${file}`~ | ||
22438 | @@ -9732,13 +10329,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}' | ||
22440 | ;; | ||
22441 | esac | ||
22442 | + dynamic_linker='Win32 ld.exe' | ||
22443 | + ;; | ||
22444 | + | ||
22445 | + *,cl*) | ||
22446 | + # Native MSVC | ||
22447 | + libname_spec='$name' | ||
22448 | + soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' | ||
22449 | + library_names_spec='${libname}.dll.lib' | ||
22450 | + | ||
22451 | + case $build_os in | ||
22452 | + mingw*) | ||
22453 | + sys_lib_search_path_spec= | ||
22454 | + lt_save_ifs=$IFS | ||
22455 | + IFS=';' | ||
22456 | + for lt_path in $LIB | ||
22457 | + do | ||
22458 | + IFS=$lt_save_ifs | ||
22459 | + # Let DOS variable expansion print the short 8.3 style file name. | ||
22460 | + lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` | ||
22461 | + sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" | ||
22462 | + done | ||
22463 | + IFS=$lt_save_ifs | ||
22464 | + # Convert to MSYS style. | ||
22465 | + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` | ||
22466 | + ;; | ||
22467 | + cygwin*) | ||
22468 | + # Convert to unix form, then to dos form, then back to unix form | ||
22469 | + # but this time dos style (no spaces!) so that the unix form looks | ||
22470 | + # like /cygdrive/c/PROGRA~1:/cygdr... | ||
22471 | + sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` | ||
22472 | + sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` | ||
22473 | + sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` | ||
22474 | + ;; | ||
22475 | + *) | ||
22476 | + sys_lib_search_path_spec="$LIB" | ||
22477 | + if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then | ||
22478 | + # It is most probably a Windows format PATH. | ||
22479 | + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` | ||
22480 | + else | ||
22481 | + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` | ||
22482 | + fi | ||
22483 | + # FIXME: find the short name or the path components, as spaces are | ||
22484 | + # common. (e.g. "Program Files" -> "PROGRA~1") | ||
22485 | + ;; | ||
22486 | + esac | ||
22487 | + | ||
22488 | + # DLL is installed to $(libdir)/../bin by postinstall_cmds | ||
22489 | + postinstall_cmds='base_file=`basename \${file}`~ | ||
22490 | + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ | ||
22491 | + dldir=$destdir/`dirname \$dlpath`~ | ||
22492 | + test -d \$dldir || mkdir -p \$dldir~ | ||
22493 | + $install_prog $dir/$dlname \$dldir/$dlname' | ||
22494 | + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ | ||
22495 | + dlpath=$dir/\$dldll~ | ||
22496 | + $RM \$dlpath' | ||
22497 | + shlibpath_overrides_runpath=yes | ||
22498 | + dynamic_linker='Win32 link.exe' | ||
22499 | ;; | ||
22500 | |||
22501 | *) | ||
22502 | + # Assume MSVC wrapper | ||
22503 | library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' | ||
22504 | + dynamic_linker='Win32 ld.exe' | ||
22505 | ;; | ||
22506 | esac | ||
22507 | - dynamic_linker='Win32 ld.exe' | ||
22508 | # FIXME: first we should search . and the directory the executable is in | ||
22509 | shlibpath_var=PATH | ||
22510 | ;; | ||
22511 | @@ -9830,7 +10485,7 @@ haiku*) | ||
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 | @@ -10644,7 +11299,7 @@ else | ||
22521 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 | ||
22522 | lt_status=$lt_dlunknown | ||
22523 | cat > conftest.$ac_ext <<_LT_EOF | ||
22524 | -#line 10647 "configure" | ||
22525 | +#line $LINENO "configure" | ||
22526 | #include "confdefs.h" | ||
22527 | |||
22528 | #if HAVE_DLFCN_H | ||
22529 | @@ -10688,10 +11343,10 @@ else | ||
22530 | /* When -fvisbility=hidden is used, assume the code has been annotated | ||
22531 | correspondingly for the symbols needed. */ | ||
22532 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) | ||
22533 | -void fnord () __attribute__((visibility("default"))); | ||
22534 | +int fnord () __attribute__((visibility("default"))); | ||
22535 | #endif | ||
22536 | |||
22537 | -void fnord () { int i=42; } | ||
22538 | +int fnord () { return 42; } | ||
22539 | int main () | ||
22540 | { | ||
22541 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); | ||
22542 | @@ -10750,7 +11405,7 @@ else | ||
22543 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 | ||
22544 | lt_status=$lt_dlunknown | ||
22545 | cat > conftest.$ac_ext <<_LT_EOF | ||
22546 | -#line 10753 "configure" | ||
22547 | +#line $LINENO "configure" | ||
22548 | #include "confdefs.h" | ||
22549 | |||
22550 | #if HAVE_DLFCN_H | ||
22551 | @@ -10794,10 +11449,10 @@ else | ||
22552 | /* When -fvisbility=hidden is used, assume the code has been annotated | ||
22553 | correspondingly for the symbols needed. */ | ||
22554 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) | ||
22555 | -void fnord () __attribute__((visibility("default"))); | ||
22556 | +int fnord () __attribute__((visibility("default"))); | ||
22557 | #endif | ||
22558 | |||
22559 | -void fnord () { int i=42; } | ||
22560 | +int fnord () { return 42; } | ||
22561 | int main () | ||
22562 | { | ||
22563 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); | ||
22564 | @@ -12267,13 +12922,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' | ||
22565 | lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' | ||
22566 | lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' | ||
22567 | lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' | ||
22568 | +lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`' | ||
22569 | +lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`' | ||
22570 | reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`' | ||
22571 | reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`' | ||
22572 | OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`' | ||
22573 | deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`' | ||
22574 | file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`' | ||
22575 | +file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`' | ||
22576 | +want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`' | ||
22577 | +DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`' | ||
22578 | +sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`' | ||
22579 | AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`' | ||
22580 | AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`' | ||
22581 | +archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`' | ||
22582 | STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' | ||
22583 | RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' | ||
22584 | old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' | ||
22585 | @@ -12288,14 +12950,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"`' | ||
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"`' | ||
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"`' | ||
22589 | +nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`' | ||
22590 | +lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`' | ||
22591 | objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`' | ||
22592 | MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`' | ||
22593 | lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`' | ||
22594 | -lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' | ||
22595 | lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`' | ||
22596 | +lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' | ||
22597 | lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`' | ||
22598 | lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`' | ||
22599 | need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`' | ||
22600 | +MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`' | ||
22601 | DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' | ||
22602 | NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' | ||
22603 | LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' | ||
22604 | @@ -12328,12 +12993,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q | ||
22605 | hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' | ||
22606 | inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' | ||
22607 | link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' | ||
22608 | -fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`' | ||
22609 | always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`' | ||
22610 | export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`' | ||
22611 | exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`' | ||
22612 | include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`' | ||
22613 | prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`' | ||
22614 | +postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`' | ||
22615 | 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"`' | ||
22617 | need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' | ||
22618 | @@ -12388,8 +13053,13 @@ reload_flag \ | ||
22619 | OBJDUMP \ | ||
22620 | deplibs_check_method \ | ||
22621 | file_magic_cmd \ | ||
22622 | +file_magic_glob \ | ||
22623 | +want_nocaseglob \ | ||
22624 | +DLLTOOL \ | ||
22625 | +sharedlib_from_linklib_cmd \ | ||
22626 | AR \ | ||
22627 | AR_FLAGS \ | ||
22628 | +archiver_list_spec \ | ||
22629 | STRIP \ | ||
22630 | RANLIB \ | ||
22631 | CC \ | ||
22632 | @@ -12399,12 +13069,14 @@ lt_cv_sys_global_symbol_pipe \ | ||
22633 | lt_cv_sys_global_symbol_to_cdecl \ | ||
22634 | lt_cv_sys_global_symbol_to_c_name_address \ | ||
22635 | lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ | ||
22636 | +nm_file_list_spec \ | ||
22637 | lt_prog_compiler_no_builtin_flag \ | ||
22638 | -lt_prog_compiler_wl \ | ||
22639 | lt_prog_compiler_pic \ | ||
22640 | +lt_prog_compiler_wl \ | ||
22641 | lt_prog_compiler_static \ | ||
22642 | lt_cv_prog_compiler_c_o \ | ||
22643 | need_locks \ | ||
22644 | +MANIFEST_TOOL \ | ||
22645 | DSYMUTIL \ | ||
22646 | NMEDIT \ | ||
22647 | LIPO \ | ||
22648 | @@ -12420,7 +13092,6 @@ no_undefined_flag \ | ||
22649 | hardcode_libdir_flag_spec \ | ||
22650 | hardcode_libdir_flag_spec_ld \ | ||
22651 | hardcode_libdir_separator \ | ||
22652 | -fix_srcfile_path \ | ||
22653 | exclude_expsyms \ | ||
22654 | include_expsyms \ | ||
22655 | file_list_spec \ | ||
22656 | @@ -12456,6 +13127,7 @@ module_cmds \ | ||
22657 | module_expsym_cmds \ | ||
22658 | export_symbols_cmds \ | ||
22659 | prelink_cmds \ | ||
22660 | +postlink_cmds \ | ||
22661 | postinstall_cmds \ | ||
22662 | postuninstall_cmds \ | ||
22663 | finish_cmds \ | ||
22664 | @@ -13054,7 +13726,8 @@ $as_echo X"$file" | | ||
22665 | # NOTE: Changes made to this file will be lost: look at ltmain.sh. | ||
22666 | # | ||
22667 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, | ||
22668 | -# 2006, 2007, 2008, 2009 Free Software Foundation, Inc. | ||
22669 | +# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, | ||
22670 | +# Inc. | ||
22671 | # Written by Gordon Matzigkeit, 1996 | ||
22672 | # | ||
22673 | # This file is part of GNU Libtool. | ||
22674 | @@ -13157,19 +13830,42 @@ SP2NL=$lt_lt_SP2NL | ||
22675 | # turn newlines into spaces. | ||
22676 | NL2SP=$lt_lt_NL2SP | ||
22677 | |||
22678 | +# convert \$build file names to \$host format. | ||
22679 | +to_host_file_cmd=$lt_cv_to_host_file_cmd | ||
22680 | + | ||
22681 | +# convert \$build files to toolchain format. | ||
22682 | +to_tool_file_cmd=$lt_cv_to_tool_file_cmd | ||
22683 | + | ||
22684 | # An object symbol dumper. | ||
22685 | OBJDUMP=$lt_OBJDUMP | ||
22686 | |||
22687 | # Method to check whether dependent libraries are shared objects. | ||
22688 | deplibs_check_method=$lt_deplibs_check_method | ||
22689 | |||
22690 | -# Command to use when deplibs_check_method == "file_magic". | ||
22691 | +# Command to use when deplibs_check_method = "file_magic". | ||
22692 | file_magic_cmd=$lt_file_magic_cmd | ||
22693 | |||
22694 | +# How to find potential files when deplibs_check_method = "file_magic". | ||
22695 | +file_magic_glob=$lt_file_magic_glob | ||
22696 | + | ||
22697 | +# Find potential files using nocaseglob when deplibs_check_method = "file_magic". | ||
22698 | +want_nocaseglob=$lt_want_nocaseglob | ||
22699 | + | ||
22700 | +# DLL creation program. | ||
22701 | +DLLTOOL=$lt_DLLTOOL | ||
22702 | + | ||
22703 | +# Command to associate shared and link libraries. | ||
22704 | +sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd | ||
22705 | + | ||
22706 | # The archiver. | ||
22707 | AR=$lt_AR | ||
22708 | + | ||
22709 | +# Flags to create an archive. | ||
22710 | AR_FLAGS=$lt_AR_FLAGS | ||
22711 | |||
22712 | +# How to feed a file listing to the archiver. | ||
22713 | +archiver_list_spec=$lt_archiver_list_spec | ||
22714 | + | ||
22715 | # A symbol stripping program. | ||
22716 | STRIP=$lt_STRIP | ||
22717 | |||
22718 | @@ -13199,6 +13895,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. | ||
22720 | global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix | ||
22721 | |||
22722 | +# Specify filename containing input files for \$NM. | ||
22723 | +nm_file_list_spec=$lt_nm_file_list_spec | ||
22724 | + | ||
22725 | +# The root where to search for dependent libraries,and in which our libraries should be installed. | ||
22726 | +lt_sysroot=$lt_sysroot | ||
22727 | + | ||
22728 | # The name of the directory that contains temporary libtool files. | ||
22729 | objdir=$objdir | ||
22730 | |||
22731 | @@ -13208,6 +13910,9 @@ MAGIC_CMD=$MAGIC_CMD | ||
22732 | # Must we lock files when doing compilation? | ||
22733 | need_locks=$lt_need_locks | ||
22734 | |||
22735 | +# Manifest tool. | ||
22736 | +MANIFEST_TOOL=$lt_MANIFEST_TOOL | ||
22737 | + | ||
22738 | # Tool to manipulate archived DWARF debug symbol files on Mac OS X. | ||
22739 | DSYMUTIL=$lt_DSYMUTIL | ||
22740 | |||
22741 | @@ -13322,12 +14027,12 @@ with_gcc=$GCC | ||
22742 | # Compiler flag to turn off builtin functions. | ||
22743 | no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag | ||
22744 | |||
22745 | -# How to pass a linker flag through the compiler. | ||
22746 | -wl=$lt_lt_prog_compiler_wl | ||
22747 | - | ||
22748 | # Additional compiler flags for building library objects. | ||
22749 | pic_flag=$lt_lt_prog_compiler_pic | ||
22750 | |||
22751 | +# How to pass a linker flag through the compiler. | ||
22752 | +wl=$lt_lt_prog_compiler_wl | ||
22753 | + | ||
22754 | # Compiler flag to prevent dynamic linking. | ||
22755 | link_static_flag=$lt_lt_prog_compiler_static | ||
22756 | |||
22757 | @@ -13414,9 +14119,6 @@ inherit_rpath=$inherit_rpath | ||
22758 | # Whether libtool must link a program against all its dependency libraries. | ||
22759 | link_all_deplibs=$link_all_deplibs | ||
22760 | |||
22761 | -# Fix the shell variable \$srcfile for the compiler. | ||
22762 | -fix_srcfile_path=$lt_fix_srcfile_path | ||
22763 | - | ||
22764 | # Set to "yes" if exported symbols are required. | ||
22765 | always_export_symbols=$always_export_symbols | ||
22766 | |||
22767 | @@ -13432,6 +14134,9 @@ include_expsyms=$lt_include_expsyms | ||
22768 | # Commands necessary for linking programs (against libraries) with templates. | ||
22769 | prelink_cmds=$lt_prelink_cmds | ||
22770 | |||
22771 | +# Commands necessary for finishing linking programs. | ||
22772 | +postlink_cmds=$lt_postlink_cmds | ||
22773 | + | ||
22774 | # Specify filename containing input files. | ||
22775 | file_list_spec=$lt_file_list_spec | ||
22776 | |||
22777 | @@ -13464,210 +14169,169 @@ ltmain="$ac_aux_dir/ltmain.sh" | ||
22778 | # 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 | ||
22780 | # is reportedly fixed, but why not run on old versions too? | ||
22781 | - sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ | ||
22782 | - || (rm -f "$cfgfile"; exit 1) | ||
22783 | - | ||
22784 | - case $xsi_shell in | ||
22785 | - yes) | ||
22786 | - cat << \_LT_EOF >> "$cfgfile" | ||
22787 | - | ||
22788 | -# func_dirname file append nondir_replacement | ||
22789 | -# Compute the dirname of FILE. If nonempty, add APPEND to the result, | ||
22790 | -# otherwise set result to NONDIR_REPLACEMENT. | ||
22791 | -func_dirname () | ||
22792 | -{ | ||
22793 | - case ${1} in | ||
22794 | - */*) func_dirname_result="${1%/*}${2}" ;; | ||
22795 | - * ) func_dirname_result="${3}" ;; | ||
22796 | - esac | ||
22797 | -} | ||
22798 | - | ||
22799 | -# func_basename file | ||
22800 | -func_basename () | ||
22801 | -{ | ||
22802 | - func_basename_result="${1##*/}" | ||
22803 | -} | ||
22804 | - | ||
22805 | -# func_dirname_and_basename file append nondir_replacement | ||
22806 | -# perform func_basename and func_dirname in a single function | ||
22807 | -# call: | ||
22808 | -# dirname: Compute the dirname of FILE. If nonempty, | ||
22809 | -# add APPEND to the result, otherwise set result | ||
22810 | -# to NONDIR_REPLACEMENT. | ||
22811 | -# value returned in "$func_dirname_result" | ||
22812 | -# basename: Compute filename of FILE. | ||
22813 | -# value retuned in "$func_basename_result" | ||
22814 | -# Implementation must be kept synchronized with func_dirname | ||
22815 | -# and func_basename. For efficiency, we do not delegate to | ||
22816 | -# those functions but instead duplicate the functionality here. | ||
22817 | -func_dirname_and_basename () | ||
22818 | -{ | ||
22819 | - case ${1} in | ||
22820 | - */*) func_dirname_result="${1%/*}${2}" ;; | ||
22821 | - * ) func_dirname_result="${3}" ;; | ||
22822 | - esac | ||
22823 | - func_basename_result="${1##*/}" | ||
22824 | -} | ||
22825 | - | ||
22826 | -# func_stripname prefix suffix name | ||
22827 | -# strip PREFIX and SUFFIX off of NAME. | ||
22828 | -# PREFIX and SUFFIX must not contain globbing or regex special | ||
22829 | -# characters, hashes, percent signs, but SUFFIX may contain a leading | ||
22830 | -# dot (in which case that matches only a dot). | ||
22831 | -func_stripname () | ||
22832 | -{ | ||
22833 | - # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are | ||
22834 | - # positional parameters, so assign one to ordinary parameter first. | ||
22835 | - func_stripname_result=${3} | ||
22836 | - func_stripname_result=${func_stripname_result#"${1}"} | ||
22837 | - func_stripname_result=${func_stripname_result%"${2}"} | ||
22838 | -} | ||
22839 | - | ||
22840 | -# func_opt_split | ||
22841 | -func_opt_split () | ||
22842 | -{ | ||
22843 | - func_opt_split_opt=${1%%=*} | ||
22844 | - func_opt_split_arg=${1#*=} | ||
22845 | -} | ||
22846 | - | ||
22847 | -# func_lo2o object | ||
22848 | -func_lo2o () | ||
22849 | -{ | ||
22850 | - case ${1} in | ||
22851 | - *.lo) func_lo2o_result=${1%.lo}.${objext} ;; | ||
22852 | - *) func_lo2o_result=${1} ;; | ||
22853 | - esac | ||
22854 | -} | ||
22855 | - | ||
22856 | -# func_xform libobj-or-source | ||
22857 | -func_xform () | ||
22858 | -{ | ||
22859 | - func_xform_result=${1%.*}.lo | ||
22860 | -} | ||
22861 | - | ||
22862 | -# func_arith arithmetic-term... | ||
22863 | -func_arith () | ||
22864 | -{ | ||
22865 | - func_arith_result=$(( $* )) | ||
22866 | -} | ||
22867 | - | ||
22868 | -# func_len string | ||
22869 | -# STRING may not start with a hyphen. | ||
22870 | -func_len () | ||
22871 | -{ | ||
22872 | - func_len_result=${#1} | ||
22873 | -} | ||
22874 | - | ||
22875 | -_LT_EOF | ||
22876 | - ;; | ||
22877 | - *) # Bourne compatible functions. | ||
22878 | - cat << \_LT_EOF >> "$cfgfile" | ||
22879 | - | ||
22880 | -# func_dirname file append nondir_replacement | ||
22881 | -# Compute the dirname of FILE. If nonempty, add APPEND to the result, | ||
22882 | -# otherwise set result to NONDIR_REPLACEMENT. | ||
22883 | -func_dirname () | ||
22884 | -{ | ||
22885 | - # Extract subdirectory from the argument. | ||
22886 | - func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` | ||
22887 | - if test "X$func_dirname_result" = "X${1}"; then | ||
22888 | - func_dirname_result="${3}" | ||
22889 | - else | ||
22890 | - func_dirname_result="$func_dirname_result${2}" | ||
22891 | - fi | ||
22892 | -} | ||
22893 | - | ||
22894 | -# func_basename file | ||
22895 | -func_basename () | ||
22896 | -{ | ||
22897 | - func_basename_result=`$ECHO "${1}" | $SED "$basename"` | ||
22898 | -} | ||
22899 | - | ||
22900 | - | ||
22901 | -# func_stripname prefix suffix name | ||
22902 | -# strip PREFIX and SUFFIX off of NAME. | ||
22903 | -# PREFIX and SUFFIX must not contain globbing or regex special | ||
22904 | -# characters, hashes, percent signs, but SUFFIX may contain a leading | ||
22905 | -# dot (in which case that matches only a dot). | ||
22906 | -# func_strip_suffix prefix name | ||
22907 | -func_stripname () | ||
22908 | -{ | ||
22909 | - case ${2} in | ||
22910 | - .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; | ||
22911 | - *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; | ||
22912 | - esac | ||
22913 | -} | ||
22914 | - | ||
22915 | -# sed scripts: | ||
22916 | -my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q' | ||
22917 | -my_sed_long_arg='1s/^-[^=]*=//' | ||
22918 | - | ||
22919 | -# func_opt_split | ||
22920 | -func_opt_split () | ||
22921 | -{ | ||
22922 | - func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"` | ||
22923 | - func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"` | ||
22924 | -} | ||
22925 | - | ||
22926 | -# func_lo2o object | ||
22927 | -func_lo2o () | ||
22928 | -{ | ||
22929 | - func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` | ||
22930 | -} | ||
22931 | - | ||
22932 | -# func_xform libobj-or-source | ||
22933 | -func_xform () | ||
22934 | -{ | ||
22935 | - func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'` | ||
22936 | -} | ||
22937 | - | ||
22938 | -# func_arith arithmetic-term... | ||
22939 | -func_arith () | ||
22940 | -{ | ||
22941 | - func_arith_result=`expr "$@"` | ||
22942 | -} | ||
22943 | - | ||
22944 | -# func_len string | ||
22945 | -# STRING may not start with a hyphen. | ||
22946 | -func_len () | ||
22947 | -{ | ||
22948 | - func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len` | ||
22949 | -} | ||
22950 | - | ||
22951 | -_LT_EOF | ||
22952 | -esac | ||
22953 | - | ||
22954 | -case $lt_shell_append in | ||
22955 | - yes) | ||
22956 | - cat << \_LT_EOF >> "$cfgfile" | ||
22957 | - | ||
22958 | -# func_append var value | ||
22959 | -# Append VALUE to the end of shell variable VAR. | ||
22960 | -func_append () | ||
22961 | -{ | ||
22962 | - eval "$1+=\$2" | ||
22963 | -} | ||
22964 | -_LT_EOF | ||
22965 | - ;; | ||
22966 | - *) | ||
22967 | - cat << \_LT_EOF >> "$cfgfile" | ||
22968 | - | ||
22969 | -# func_append var value | ||
22970 | -# Append VALUE to the end of shell variable VAR. | ||
22971 | -func_append () | ||
22972 | -{ | ||
22973 | - eval "$1=\$$1\$2" | ||
22974 | -} | ||
22975 | - | ||
22976 | -_LT_EOF | ||
22977 | - ;; | ||
22978 | - esac | ||
22979 | - | ||
22980 | - | ||
22981 | - sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ | ||
22982 | - || (rm -f "$cfgfile"; exit 1) | ||
22983 | - | ||
22984 | - mv -f "$cfgfile" "$ofile" || | ||
22985 | + sed '$q' "$ltmain" >> "$cfgfile" \ | ||
22986 | + || (rm -f "$cfgfile"; exit 1) | ||
22987 | + | ||
22988 | + if test x"$xsi_shell" = xyes; then | ||
22989 | + sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ | ||
22990 | +func_dirname ()\ | ||
22991 | +{\ | ||
22992 | +\ case ${1} in\ | ||
22993 | +\ */*) func_dirname_result="${1%/*}${2}" ;;\ | ||
22994 | +\ * ) func_dirname_result="${3}" ;;\ | ||
22995 | +\ esac\ | ||
22996 | +} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \ | ||
22997 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
22998 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
22999 | +test 0 -eq $? || _lt_function_replace_fail=: | ||
23000 | + | ||
23001 | + | ||
23002 | + sed -e '/^func_basename ()$/,/^} # func_basename /c\ | ||
23003 | +func_basename ()\ | ||
23004 | +{\ | ||
23005 | +\ func_basename_result="${1##*/}"\ | ||
23006 | +} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \ | ||
23007 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
23008 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
23009 | +test 0 -eq $? || _lt_function_replace_fail=: | ||
23010 | + | ||
23011 | + | ||
23012 | + sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\ | ||
23013 | +func_dirname_and_basename ()\ | ||
23014 | +{\ | ||
23015 | +\ case ${1} in\ | ||
23016 | +\ */*) func_dirname_result="${1%/*}${2}" ;;\ | ||
23017 | +\ * ) func_dirname_result="${3}" ;;\ | ||
23018 | +\ esac\ | ||
23019 | +\ func_basename_result="${1##*/}"\ | ||
23020 | +} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \ | ||
23021 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
23022 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
23023 | +test 0 -eq $? || _lt_function_replace_fail=: | ||
23024 | + | ||
23025 | + | ||
23026 | + sed -e '/^func_stripname ()$/,/^} # func_stripname /c\ | ||
23027 | +func_stripname ()\ | ||
23028 | +{\ | ||
23029 | +\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\ | ||
23030 | +\ # positional parameters, so assign one to ordinary parameter first.\ | ||
23031 | +\ func_stripname_result=${3}\ | ||
23032 | +\ func_stripname_result=${func_stripname_result#"${1}"}\ | ||
23033 | +\ func_stripname_result=${func_stripname_result%"${2}"}\ | ||
23034 | +} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \ | ||
23035 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
23036 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
23037 | +test 0 -eq $? || _lt_function_replace_fail=: | ||
23038 | + | ||
23039 | + | ||
23040 | + sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\ | ||
23041 | +func_split_long_opt ()\ | ||
23042 | +{\ | ||
23043 | +\ func_split_long_opt_name=${1%%=*}\ | ||
23044 | +\ func_split_long_opt_arg=${1#*=}\ | ||
23045 | +} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \ | ||
23046 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
23047 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
23048 | +test 0 -eq $? || _lt_function_replace_fail=: | ||
23049 | + | ||
23050 | + | ||
23051 | + sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\ | ||
23052 | +func_split_short_opt ()\ | ||
23053 | +{\ | ||
23054 | +\ func_split_short_opt_arg=${1#??}\ | ||
23055 | +\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\ | ||
23056 | +} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \ | ||
23057 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
23058 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
23059 | +test 0 -eq $? || _lt_function_replace_fail=: | ||
23060 | + | ||
23061 | + | ||
23062 | + sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\ | ||
23063 | +func_lo2o ()\ | ||
23064 | +{\ | ||
23065 | +\ case ${1} in\ | ||
23066 | +\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\ | ||
23067 | +\ *) func_lo2o_result=${1} ;;\ | ||
23068 | +\ esac\ | ||
23069 | +} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \ | ||
23070 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
23071 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
23072 | +test 0 -eq $? || _lt_function_replace_fail=: | ||
23073 | + | ||
23074 | + | ||
23075 | + sed -e '/^func_xform ()$/,/^} # func_xform /c\ | ||
23076 | +func_xform ()\ | ||
23077 | +{\ | ||
23078 | + func_xform_result=${1%.*}.lo\ | ||
23079 | +} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \ | ||
23080 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
23081 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
23082 | +test 0 -eq $? || _lt_function_replace_fail=: | ||
23083 | + | ||
23084 | + | ||
23085 | + sed -e '/^func_arith ()$/,/^} # func_arith /c\ | ||
23086 | +func_arith ()\ | ||
23087 | +{\ | ||
23088 | + func_arith_result=$(( $* ))\ | ||
23089 | +} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \ | ||
23090 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
23091 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
23092 | +test 0 -eq $? || _lt_function_replace_fail=: | ||
23093 | + | ||
23094 | + | ||
23095 | + sed -e '/^func_len ()$/,/^} # func_len /c\ | ||
23096 | +func_len ()\ | ||
23097 | +{\ | ||
23098 | + func_len_result=${#1}\ | ||
23099 | +} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \ | ||
23100 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
23101 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
23102 | +test 0 -eq $? || _lt_function_replace_fail=: | ||
23103 | + | ||
23104 | +fi | ||
23105 | + | ||
23106 | +if test x"$lt_shell_append" = xyes; then | ||
23107 | + sed -e '/^func_append ()$/,/^} # func_append /c\ | ||
23108 | +func_append ()\ | ||
23109 | +{\ | ||
23110 | + eval "${1}+=\\${2}"\ | ||
23111 | +} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \ | ||
23112 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
23113 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
23114 | +test 0 -eq $? || _lt_function_replace_fail=: | ||
23115 | + | ||
23116 | + | ||
23117 | + sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\ | ||
23118 | +func_append_quoted ()\ | ||
23119 | +{\ | ||
23120 | +\ func_quote_for_eval "${2}"\ | ||
23121 | +\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\ | ||
23122 | +} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \ | ||
23123 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
23124 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
23125 | +test 0 -eq $? || _lt_function_replace_fail=: | ||
23126 | + | ||
23127 | + | ||
23128 | + # Save a `func_append' function call where possible by direct use of '+=' | ||
23129 | + sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ | ||
23130 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
23131 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
23132 | + test 0 -eq $? || _lt_function_replace_fail=: | ||
23133 | +else | ||
23134 | + # Save a `func_append' function call even when '+=' is not available | ||
23135 | + sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ | ||
23136 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
23137 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
23138 | + test 0 -eq $? || _lt_function_replace_fail=: | ||
23139 | +fi | ||
23140 | + | ||
23141 | +if test x"$_lt_function_replace_fail" = x":"; then | ||
23142 | + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 | ||
23143 | +$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} | ||
23144 | +fi | ||
23145 | + | ||
23146 | + | ||
23147 | + mv -f "$cfgfile" "$ofile" || | ||
23148 | (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") | ||
23149 | chmod +x "$ofile" | ||
23150 | |||
23151 | -- | ||
23152 | 2.28.0 | ||
23153 | |||
diff --git a/meta-microblaze/recipes-devtools/binutils/binutils/0014-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch b/meta-microblaze/recipes-devtools/binutils/binutils/0014-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch new file mode 100644 index 00000000..69a23837 --- /dev/null +++ b/meta-microblaze/recipes-devtools/binutils/binutils/0014-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch | |||
@@ -0,0 +1,52 @@ | |||
1 | From f791a5d84475c02356f16679b7f4ee9c9c3408aa Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Mon, 2 Mar 2015 01:42:38 +0000 | ||
4 | Subject: [PATCH 14/17] Fix rpath in libtool when sysroot is enabled | ||
5 | |||
6 | Enabling sysroot support in libtool exposed a bug where the final | ||
7 | library had an RPATH encoded into it which still pointed to the | ||
8 | sysroot. This works around the issue until it gets sorted out | ||
9 | upstream. | ||
10 | |||
11 | Fix suggested by Richard Purdie <richard.purdie@linuxfoundation.org> | ||
12 | |||
13 | Upstream-Status: Inappropriate [embedded specific] | ||
14 | |||
15 | Signed-off-by: Scott Garman <scott.a.garman@intel.com> | ||
16 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
17 | --- | ||
18 | ltmain.sh | 10 ++++++++-- | ||
19 | 1 file changed, 8 insertions(+), 2 deletions(-) | ||
20 | |||
21 | diff --git a/ltmain.sh b/ltmain.sh | ||
22 | index 70e856e0659..11ee684cccf 100644 | ||
23 | --- a/ltmain.sh | ||
24 | +++ b/ltmain.sh | ||
25 | @@ -8035,9 +8035,11 @@ EOF | ||
26 | test "$opt_mode" != relink && rpath="$compile_rpath$rpath" | ||
27 | for libdir in $rpath; do | ||
28 | if test -n "$hardcode_libdir_flag_spec"; then | ||
29 | + func_replace_sysroot "$libdir" | ||
30 | + libdir=$func_replace_sysroot_result | ||
31 | + func_stripname '=' '' "$libdir" | ||
32 | + libdir=$func_stripname_result | ||
33 | if test -n "$hardcode_libdir_separator"; then | ||
34 | - func_replace_sysroot "$libdir" | ||
35 | - libdir=$func_replace_sysroot_result | ||
36 | if test -z "$hardcode_libdirs"; then | ||
37 | hardcode_libdirs="$libdir" | ||
38 | else | ||
39 | @@ -8770,6 +8772,10 @@ EOF | ||
40 | hardcode_libdirs= | ||
41 | for libdir in $compile_rpath $finalize_rpath; do | ||
42 | if test -n "$hardcode_libdir_flag_spec"; then | ||
43 | + func_replace_sysroot "$libdir" | ||
44 | + libdir=$func_replace_sysroot_result | ||
45 | + func_stripname '=' '' "$libdir" | ||
46 | + libdir=$func_stripname_result | ||
47 | if test -n "$hardcode_libdir_separator"; then | ||
48 | if test -z "$hardcode_libdirs"; then | ||
49 | hardcode_libdirs="$libdir" | ||
50 | -- | ||
51 | 2.28.0 | ||
52 | |||
diff --git a/meta-microblaze/recipes-devtools/binutils/binutils/0015-sync-with-OE-libtool-changes.patch b/meta-microblaze/recipes-devtools/binutils/binutils/0015-sync-with-OE-libtool-changes.patch new file mode 100644 index 00000000..e848f146 --- /dev/null +++ b/meta-microblaze/recipes-devtools/binutils/binutils/0015-sync-with-OE-libtool-changes.patch | |||
@@ -0,0 +1,89 @@ | |||
1 | From e087f96e219d47c4d2244c3f32397e56d41bfdec Mon Sep 17 00:00:00 2001 | ||
2 | From: Ross Burton <ross.burton@intel.com> | ||
3 | Date: Mon, 6 Mar 2017 23:33:27 -0800 | ||
4 | Subject: [PATCH 15/17] sync with OE libtool changes | ||
5 | |||
6 | Apply these patches from our libtool patches as not only are redundant RPATHs a | ||
7 | waste of space but they can cause incorrect linking when native packages are | ||
8 | restored from sstate. | ||
9 | |||
10 | fix-rpath.patch: | ||
11 | We don't want to add RPATHS which match default linker | ||
12 | search paths, they're a waste of space. This patch | ||
13 | filters libtools list and removes the ones we don't need. | ||
14 | |||
15 | norm-rpath.patch: | ||
16 | Libtool may be passed link paths of the form "/usr/lib/../lib", which | ||
17 | fool its detection code into thinking it should be included as an | ||
18 | RPATH in the generated binary. Normalize before comparision. | ||
19 | |||
20 | Upstream-Status: Inappropriate | ||
21 | |||
22 | Signed-off-by: Ross Burton <ross.burton@intel.com> | ||
23 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
24 | --- | ||
25 | ltmain.sh | 34 ++++++++++++++++++++++++++++------ | ||
26 | 1 file changed, 28 insertions(+), 6 deletions(-) | ||
27 | |||
28 | diff --git a/ltmain.sh b/ltmain.sh | ||
29 | index 11ee684cccf..3b19ac15328 100644 | ||
30 | --- a/ltmain.sh | ||
31 | +++ b/ltmain.sh | ||
32 | @@ -8053,8 +8053,16 @@ EOF | ||
33 | esac | ||
34 | fi | ||
35 | else | ||
36 | - eval flag=\"$hardcode_libdir_flag_spec\" | ||
37 | - func_append dep_rpath " $flag" | ||
38 | + # We only want to hardcode in an rpath if it isn't in the | ||
39 | + # default dlsearch path. | ||
40 | + func_normal_abspath "$libdir" | ||
41 | + libdir_norm=$func_normal_abspath_result | ||
42 | + case " $sys_lib_dlsearch_path " in | ||
43 | + *" $libdir_norm "*) ;; | ||
44 | + *) eval flag=\"$hardcode_libdir_flag_spec\" | ||
45 | + func_append dep_rpath " $flag" | ||
46 | + ;; | ||
47 | + esac | ||
48 | fi | ||
49 | elif test -n "$runpath_var"; then | ||
50 | case "$perm_rpath " in | ||
51 | @@ -8790,8 +8798,16 @@ EOF | ||
52 | esac | ||
53 | fi | ||
54 | else | ||
55 | - eval flag=\"$hardcode_libdir_flag_spec\" | ||
56 | - func_append rpath " $flag" | ||
57 | + # We only want to hardcode in an rpath if it isn't in the | ||
58 | + # default dlsearch path. | ||
59 | + func_normal_abspath "$libdir" | ||
60 | + libdir_norm=$func_normal_abspath_result | ||
61 | + case " $sys_lib_dlsearch_path " in | ||
62 | + *" $libdir_norm "*) ;; | ||
63 | + *) eval flag=\"$hardcode_libdir_flag_spec\" | ||
64 | + rpath+=" $flag" | ||
65 | + ;; | ||
66 | + esac | ||
67 | fi | ||
68 | elif test -n "$runpath_var"; then | ||
69 | case "$perm_rpath " in | ||
70 | @@ -8841,8 +8857,14 @@ EOF | ||
71 | esac | ||
72 | fi | ||
73 | else | ||
74 | - eval flag=\"$hardcode_libdir_flag_spec\" | ||
75 | - func_append rpath " $flag" | ||
76 | + # We only want to hardcode in an rpath if it isn't in the | ||
77 | + # default dlsearch path. | ||
78 | + case " $sys_lib_dlsearch_path " in | ||
79 | + *" $libdir "*) ;; | ||
80 | + *) eval flag=\"$hardcode_libdir_flag_spec\" | ||
81 | + func_append rpath " $flag" | ||
82 | + ;; | ||
83 | + esac | ||
84 | fi | ||
85 | elif test -n "$runpath_var"; then | ||
86 | case "$finalize_perm_rpath " in | ||
87 | -- | ||
88 | 2.28.0 | ||
89 | |||
diff --git a/meta-microblaze/recipes-devtools/binutils/binutils/0016-Check-for-clang-before-checking-gcc-version.patch b/meta-microblaze/recipes-devtools/binutils/binutils/0016-Check-for-clang-before-checking-gcc-version.patch new file mode 100644 index 00000000..400b7982 --- /dev/null +++ b/meta-microblaze/recipes-devtools/binutils/binutils/0016-Check-for-clang-before-checking-gcc-version.patch | |||
@@ -0,0 +1,48 @@ | |||
1 | From ae5a7d622dc9addb2ca9fc85889c45964c025a9c Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Wed, 15 Apr 2020 14:17:20 -0700 | ||
4 | Subject: [PATCH 16/17] Check for clang before checking gcc version | ||
5 | |||
6 | Clang advertises itself to be gcc 4.2.1, so when compiling this test | ||
7 | here fails since gcc < 4.4.5 did not support -static-libstdc++ but thats | ||
8 | not true for clang, so its better to make an additional check for clang | ||
9 | before resorting to gcc version check. This should let clang enable | ||
10 | static libstdc++ linking | ||
11 | |||
12 | Upstream-Status: Pending | ||
13 | |||
14 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
15 | --- | ||
16 | configure | 2 +- | ||
17 | configure.ac | 2 +- | ||
18 | 2 files changed, 2 insertions(+), 2 deletions(-) | ||
19 | |||
20 | diff --git a/configure b/configure | ||
21 | index 6782f8b6ab8..72f5766b363 100755 | ||
22 | --- a/configure | ||
23 | +++ b/configure | ||
24 | @@ -5143,7 +5143,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu | ||
25 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
26 | /* end confdefs.h. */ | ||
27 | |||
28 | -#if (__GNUC__ < 4) || (__GNUC__ == 4 && __GNUC_MINOR__ < 5) | ||
29 | +#if !defined(__clang__) && ((__GNUC__ < 4) || (__GNUC__ == 4 && __GNUC_MINOR__ < 5)) | ||
30 | #error -static-libstdc++ not implemented | ||
31 | #endif | ||
32 | int main() {} | ||
33 | diff --git a/configure.ac b/configure.ac | ||
34 | index 55beb1dea46..3f9e613e2d9 100644 | ||
35 | --- a/configure.ac | ||
36 | +++ b/configure.ac | ||
37 | @@ -1312,7 +1312,7 @@ if test "$GCC" = yes; then | ||
38 | AC_MSG_CHECKING([whether g++ accepts -static-libstdc++ -static-libgcc]) | ||
39 | AC_LANG_PUSH(C++) | ||
40 | AC_LINK_IFELSE([AC_LANG_SOURCE([ | ||
41 | -#if (__GNUC__ < 4) || (__GNUC__ == 4 && __GNUC_MINOR__ < 5) | ||
42 | +#if !defined(__clang__) && ((__GNUC__ < 4) || (__GNUC__ == 4 && __GNUC_MINOR__ < 5)) | ||
43 | #error -static-libstdc++ not implemented | ||
44 | #endif | ||
45 | int main() {}])], | ||
46 | -- | ||
47 | 2.28.0 | ||
48 | |||
diff --git a/meta-microblaze/recipes-devtools/binutils/binutils/0017-gas-improve-reproducibility-for-stabs-debugging-data.patch b/meta-microblaze/recipes-devtools/binutils/binutils/0017-gas-improve-reproducibility-for-stabs-debugging-data.patch new file mode 100644 index 00000000..42e0c1c3 --- /dev/null +++ b/meta-microblaze/recipes-devtools/binutils/binutils/0017-gas-improve-reproducibility-for-stabs-debugging-data.patch | |||
@@ -0,0 +1,35 @@ | |||
1 | From aa6586e80fc6fcd739aa959a71e4cf064cdef072 Mon Sep 17 00:00:00 2001 | ||
2 | From: Denys Zagorui <dzagorui@cisco.com> | ||
3 | Date: Mon, 9 Nov 2020 15:39:10 +0000 | ||
4 | Subject: [PATCH] gas: improve reproducibility for stabs debugging data format | ||
5 | |||
6 | * config/obj-elf (obj_elf_init_stab_section): Improve | ||
7 | reproducibility for stabs debugging data format | ||
8 | |||
9 | Upstream-Status: Backport [https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=0541201782c006c09d029d18a45c6e743cfea906] | ||
10 | --- | ||
11 | gas/config/obj-elf.c | 3 ++- | ||
12 | 1 file changed, 2 insertions(+), 1 deletion(-) | ||
13 | |||
14 | diff --git a/gas/config/obj-elf.c b/gas/config/obj-elf.c | ||
15 | index de22b5a1da..2025df8542 100644 | ||
16 | --- a/gas/config/obj-elf.c | ||
17 | +++ b/gas/config/obj-elf.c | ||
18 | @@ -2374,12 +2374,13 @@ obj_elf_init_stab_section (segT seg) | ||
19 | p = frag_more (12); | ||
20 | /* Zero it out. */ | ||
21 | memset (p, 0, 12); | ||
22 | - file = as_where (NULL); | ||
23 | + file = remap_debug_filename (as_where (NULL)); | ||
24 | stabstr_name = concat (segment_name (seg), "str", (char *) NULL); | ||
25 | stroff = get_stab_string_offset (file, stabstr_name, TRUE); | ||
26 | know (stroff == 1 || (stroff == 0 && file[0] == '\0')); | ||
27 | md_number_to_chars (p, stroff, 4); | ||
28 | seg_info (seg)->stabu.p = p; | ||
29 | + xfree ((char *) file); | ||
30 | } | ||
31 | |||
32 | #endif | ||
33 | -- | ||
34 | 2.20.1 | ||
35 | |||
diff --git a/meta-microblaze/recipes-devtools/binutils/binutils/CVE-2020-35448.patch b/meta-microblaze/recipes-devtools/binutils/binutils/CVE-2020-35448.patch new file mode 100644 index 00000000..3bc64776 --- /dev/null +++ b/meta-microblaze/recipes-devtools/binutils/binutils/CVE-2020-35448.patch | |||
@@ -0,0 +1,85 @@ | |||
1 | From 6caa41daeb7aa17c400b7300fb78d207cf064d70 Mon Sep 17 00:00:00 2001 | ||
2 | From: Alan Modra <amodra@gmail.com> | ||
3 | Date: Fri, 4 Sep 2020 19:19:18 +0930 | ||
4 | Subject: [PATCH] PR26574, heap buffer overflow in | ||
5 | _bfd_elf_slurp_secondary_reloc_section | ||
6 | |||
7 | A horribly fuzzed object with section headers inside the ELF header. | ||
8 | Disallow that, and crazy reloc sizes. | ||
9 | |||
10 | PR 26574 | ||
11 | * elfcode.h (elf_object_p): Sanity check section header offset. | ||
12 | * elf.c (_bfd_elf_slurp_secondary_reloc_section): Sanity check | ||
13 | sh_entsize. | ||
14 | |||
15 | Upstream-Status: Backport | ||
16 | CVE: CVE-2020-35448 | ||
17 | |||
18 | Reference to upstream patch: | ||
19 | https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git; | ||
20 | h=8642dafaef21aa6747cec01df1977e9c52eb4679 | ||
21 | |||
22 | Signed-off-by: Yi Fan Yu <yifan.yu@windriver.com> | ||
23 | --- | ||
24 | bfd/elf.c | 4 +++- | ||
25 | bfd/elfcode.h | 8 ++++---- | ||
26 | 2 files changed, 7 insertions(+), 5 deletions(-) | ||
27 | |||
28 | diff --git a/bfd/elf.c b/bfd/elf.c | ||
29 | index fe375e7346..9f29166399 100644 | ||
30 | --- a/bfd/elf.c | ||
31 | +++ b/bfd/elf.c | ||
32 | @@ -12527,7 +12527,9 @@ _bfd_elf_slurp_secondary_reloc_section (bfd * abfd, | ||
33 | Elf_Internal_Shdr * hdr = & elf_section_data (relsec)->this_hdr; | ||
34 | |||
35 | if (hdr->sh_type == SHT_SECONDARY_RELOC | ||
36 | - && hdr->sh_info == (unsigned) elf_section_data (sec)->this_idx) | ||
37 | + && hdr->sh_info == (unsigned) elf_section_data (sec)->this_idx | ||
38 | + && (hdr->sh_entsize == ebd->s->sizeof_rel | ||
39 | + || hdr->sh_entsize == ebd->s->sizeof_rela)) | ||
40 | { | ||
41 | bfd_byte * native_relocs; | ||
42 | bfd_byte * native_reloc; | ||
43 | diff --git a/bfd/elfcode.h b/bfd/elfcode.h | ||
44 | index f4a7829f27..54ef890637 100644 | ||
45 | --- a/bfd/elfcode.h | ||
46 | +++ b/bfd/elfcode.h | ||
47 | @@ -568,7 +568,7 @@ elf_object_p (bfd *abfd) | ||
48 | |||
49 | /* If this is a relocatable file and there is no section header | ||
50 | table, then we're hosed. */ | ||
51 | - if (i_ehdrp->e_shoff == 0 && i_ehdrp->e_type == ET_REL) | ||
52 | + if (i_ehdrp->e_shoff < sizeof (x_ehdr) && i_ehdrp->e_type == ET_REL) | ||
53 | goto got_wrong_format_error; | ||
54 | |||
55 | /* As a simple sanity check, verify that what BFD thinks is the | ||
56 | @@ -578,7 +578,7 @@ elf_object_p (bfd *abfd) | ||
57 | goto got_wrong_format_error; | ||
58 | |||
59 | /* Further sanity check. */ | ||
60 | - if (i_ehdrp->e_shoff == 0 && i_ehdrp->e_shnum != 0) | ||
61 | + if (i_ehdrp->e_shoff < sizeof (x_ehdr) && i_ehdrp->e_shnum != 0) | ||
62 | goto got_wrong_format_error; | ||
63 | |||
64 | ebd = get_elf_backend_data (abfd); | ||
65 | @@ -615,7 +615,7 @@ elf_object_p (bfd *abfd) | ||
66 | && ebd->elf_osabi != ELFOSABI_NONE) | ||
67 | goto got_wrong_format_error; | ||
68 | |||
69 | - if (i_ehdrp->e_shoff != 0) | ||
70 | + if (i_ehdrp->e_shoff >= sizeof (x_ehdr)) | ||
71 | { | ||
72 | file_ptr where = (file_ptr) i_ehdrp->e_shoff; | ||
73 | |||
74 | @@ -807,7 +807,7 @@ elf_object_p (bfd *abfd) | ||
75 | } | ||
76 | } | ||
77 | |||
78 | - if (i_ehdrp->e_shstrndx != 0 && i_ehdrp->e_shoff != 0) | ||
79 | + if (i_ehdrp->e_shstrndx != 0 && i_ehdrp->e_shoff >= sizeof (x_ehdr)) | ||
80 | { | ||
81 | unsigned int num_sec; | ||
82 | |||
83 | -- | ||
84 | 2.29.2 | ||
85 | |||
diff --git a/meta-microblaze/recipes-devtools/binutils/binutils_2.35.1.bb b/meta-microblaze/recipes-devtools/binutils/binutils_2.35.1.bb new file mode 100644 index 00000000..ee197b87 --- /dev/null +++ b/meta-microblaze/recipes-devtools/binutils/binutils_2.35.1.bb | |||
@@ -0,0 +1,65 @@ | |||
1 | require binutils.inc | ||
2 | require binutils-${PV}.inc | ||
3 | |||
4 | DEPENDS += "flex bison zlib" | ||
5 | |||
6 | EXTRA_OECONF += "--with-sysroot=/ \ | ||
7 | --enable-install-libbfd \ | ||
8 | --enable-install-libiberty \ | ||
9 | --enable-shared \ | ||
10 | --with-system-zlib \ | ||
11 | " | ||
12 | |||
13 | EXTRA_OEMAKE:append:libc-musl = "\ | ||
14 | gt_cv_func_gnugettext1_libc=yes \ | ||
15 | gt_cv_func_gnugettext2_libc=yes \ | ||
16 | " | ||
17 | EXTRA_OECONF:class-native = "--enable-targets=all \ | ||
18 | --enable-64-bit-bfd \ | ||
19 | --enable-install-libiberty \ | ||
20 | --enable-install-libbfd \ | ||
21 | --disable-gdb \ | ||
22 | --disable-gdbserver \ | ||
23 | --disable-libdecnumber \ | ||
24 | --disable-readline \ | ||
25 | --disable-sim \ | ||
26 | --disable-werror" | ||
27 | |||
28 | # gcc9.0 end up mis-compiling libbfd.so with O2 which then crashes on target | ||
29 | # So remove -O2 and use -Os as workaround | ||
30 | SELECTED_OPTIMIZATION:remove:mipsarch = "-O2" | ||
31 | SELECTED_OPTIMIZATION:append:mipsarch = " -Os" | ||
32 | |||
33 | do_install:class-native () { | ||
34 | autotools_do_install | ||
35 | |||
36 | # Install the libiberty header | ||
37 | install -d ${D}${includedir} | ||
38 | install -m 644 ${S}/include/ansidecl.h ${D}${includedir} | ||
39 | install -m 644 ${S}/include/libiberty.h ${D}${includedir} | ||
40 | |||
41 | # We only want libiberty, libbfd and libopcodes | ||
42 | rm -rf ${D}${bindir} | ||
43 | rm -rf ${D}${prefix}/${TARGET_SYS} | ||
44 | rm -rf ${D}${prefix}/lib/ldscripts | ||
45 | rm -rf ${D}${prefix}/share/info | ||
46 | rm -rf ${D}${prefix}/share/locale | ||
47 | rm -rf ${D}${prefix}/share/man | ||
48 | rmdir ${D}${prefix}/share || : | ||
49 | rmdir ${D}/${libdir}/gcc-lib || : | ||
50 | rmdir ${D}/${libdir}64/gcc-lib || : | ||
51 | rmdir ${D}/${libdir} || : | ||
52 | rmdir ${D}/${libdir}64 || : | ||
53 | } | ||
54 | |||
55 | # Split out libbfd-*.so so including perf doesn't include extra stuff | ||
56 | PACKAGE_BEFORE_PN += "libbfd" | ||
57 | FILES:libbfd = "${libdir}/libbfd-*.so.* ${libdir}/libbfd-*.so" | ||
58 | |||
59 | SRC_URI:append:class-nativesdk = " file://0003-binutils-nativesdk-Search-for-alternative-ld.so.conf.patch " | ||
60 | |||
61 | USE_ALTERNATIVES_FOR:class-nativesdk = "" | ||
62 | FILES:${PN}:append:class-nativesdk = " ${bindir}" | ||
63 | |||
64 | BBCLASSEXTEND = "native nativesdk" | ||
65 | |||